diff --git a/app-editors/amp/Manifest b/app-editors/amp/Manifest index 6ecbda8b11..1f2d338e51 100644 --- a/app-editors/amp/Manifest +++ b/app-editors/amp/Manifest @@ -1,7 +1,7 @@ DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 DIST aho-corasick-1.0.5.crate 172064 BLAKE2B bab7767070b959e8e4c054bf505b9423d7fc8b02dc682b559f54db986abe72ddf83a069b4bb585d71b47de92d2fce66a1c151a0d29c4aae99378ca05c3d5eb50 SHA512 6b0a64dbfe0c166341a34cd169bc46d28e40f72db4d599a1aff5327a6e891408f39e8e92e983cf9396a8e8135f93e41550237ff3e5c8c05a5325688746fd814b -DIST amp-0.7.0.tar.gz 412101 BLAKE2B 1fa58823f03782269cf9673f666aed7c929defb39bf322108f386b7b0c1ec0ac77174bb2d4184f4d6d8983d7e9dc08681a41c3374fb78cc1a41bf635b41d9ad6 SHA512 de2eb6738090b228752c7f0e353bb9cdcf58ab1c1cb8d6d2734c1a2542c8edf5da4e71e91a4bb091d945f1fdd4b54a8c134045a3f03ed024a986a2d8d87f4e26 +DIST amp-0.7.1.tar.gz 415699 BLAKE2B 0c01980fed9cc3c63953f2a2d3d999441f79d45b696f076fd542ee44dc3f0fc9be6ff762b0a17f5be29f24ce86b2c93e457c6af7f27ca08f778310fa723684be SHA512 21227a5212777e5687af0357eb34ca6498f47eabbc9e37d2db3fef0de65dab8daf99a6270485b551b3a2660a0aedf90b494b2ea0cfd66027815dbde369b78497 DIST anes-0.1.6.crate 23857 BLAKE2B 9ef464a964709b408c7d7846b9b1e54e52d6ae8f21f22ccfe509ef7197d4694f439084dbdb01fdf88829d181965ea9d1452253789a46fdf6d0520e3413c50d61 SHA512 f9dfaaca9ca327881ec30efaf24e208daae668b1e9d6963c8b0ca9f9fd13be777c793076a87980429f0dfa4db28ef5331ce6652a76da4d5a87485b23fc2fde29 DIST anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3 DIST app_dirs2-2.5.5.crate 18308 BLAKE2B 020c3d3f4b6d2d850d8004bbd04f2e0e8f711fcafee4750734945bf4298e43488b49e8bdca5be3f2d23b54d3690e4ba87549f96895c35168ee4022b9edaeca80 SHA512 b14badd0fbd5f39a02ea51a1421734b12f45284f69665cb83e2f16ad2ba63659a9bd626fcc3d4aff8cf010226a68e18c400fd4329c40a0d198007bc6e4e93d28 @@ -58,7 +58,7 @@ DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e409 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386 DIST gethostname-0.2.3.crate 8174 BLAKE2B a7579a33f8180729787d2489f0936191a911b2ab085d151e6bf6ff8dae1bda0d6707a69c1d6ba829b2b087042bdb6eb676b77fd722a61423eeb37fcb30554f81 SHA512 c3ce5187057ea09def22331d2f67a97cb53759e8c45179687a8bf9c67d16fac5f58d6c1e553b4f74b702bae0baa7c70eb5ed71f99ded3d508338a4b1e9f115fa DIST gimli-0.28.0.crate 269277 BLAKE2B 4d651d9f71b826d06b3089cb09933f30d785801b8072228c9a5c9ed2011172c679e86205dd507cb1866634238b20721773e60410bd25fbcc5c3421c72ba565be SHA512 a5a861c7398ec655635a39c3a421ca5c9effb03f4980a000c342b81b9bf229481639a8a62c4396508a9800ec9d313317036a8e4e7da3add5adeca596f1c09d51 -DIST git2-0.18.1.crate 211466 BLAKE2B ce5a8175f734bcc2504015271768ff4bda7bd18f615e5ff2618d06f758f041827aa9e58afb8149cc290619cf4e0fbccca460e4d38bf6f3cbf08193a2548c16cc SHA512 3fb535e820365ac5aecc5a1cd3af869ea952ed6741a7890b095ac6f4509fdee7389949da45e4f66188b5e261fb4c47d49ffc1043b4b2b39020ea21e22bc69fa7 +DIST git2-0.19.0.crate 215910 BLAKE2B e6dfbc292dd580dfe2b5964745d73c29ab4e43d91af37893eb2b915c7967d557940284c388b5693c8f366d98979cfb43f184627319799a359b2ec40c6d875a83 SHA512 9d868ba1594ace291002c4a10dcd43f192dbb8c2070abd74883e57a7f53825c7a29080ecbe4279f6c7ee845c261bcbc93b10004b99df27de41cd29bd48e137e8 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e DIST half-1.8.2.crate 41874 BLAKE2B c3c5c01771f05b7af652abb8e5490dde7afd04de130537e67845fe7ed58904e7ad66c7286a4e7deca3641876a6d12c5b6e95883fee2809c8e685d2f79cf96610 SHA512 5eb128e41b8b7f9769a669834b2f8380b115395bf2a2a181732bf6c71234d978dbc4c527fddadaa7bd7fae9add77958b27616bfa1767fd123d3cfb887663292e DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356 @@ -76,7 +76,7 @@ DIST js-sys-0.3.66.crate 80765 BLAKE2B 366f2741a1f7bc76f78068e183080bc221d45fb9a DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 DIST libc-0.2.152.crate 740278 BLAKE2B 8eecde477063207d77b6894d6f9194c8dd10e55b69585e3d66296eaa0b9d3f6e2d033e667207182bf4c3cf31f6d38820c9187b2006f4b5ebee898adafb4b2751 SHA512 1722f6f52077efab90026aae3d10306f8c38ebba95366593c3c1adf707fae121ab450064ad9e8be5a667caf6af0b90fad4d1ca1009db0f2220093c44e33c4b5c -DIST libgit2-sys-0.16.1+1.7.1.crate 1773446 BLAKE2B 050b7832dd48c642c3a790481a296fe1b15bcfbddcffcb0f4792735bd135f6c499e5b6f90fe394ddd891c2c055af86041f0b0fcac26832975755a432dd0e44ac SHA512 746e80309af40af7f6d11a7d45721054a6b7f456e10af5b25ea5ddc3ae1f8d934196e9e3b9948f7d7b41b6d9dc45a660874029a39c1c3d67307daebae3f2cb69 +DIST libgit2-sys-0.17.0+1.8.1.crate 1812997 BLAKE2B 91f61437450398c24a7dbb85803665a0cba268615a0e9d8176e094a192b9e8441d5d985a430722ebdf8c003acd47d40dc5b9e464fb7dae8d9c12b3adbad796fe SHA512 4c37c30426dbba1d9981d65ee42210ec07e2dae73ce2d18beee17b161eb96de0c7b1696cc8b97fa514eb9fdcb8b853713cd19174fc55f033b6a9c1e25520f75b DIST libz-sys-1.1.12.crate 3030648 BLAKE2B ab8cb974481f86f7ef40eb27ee08ee5535cb914cb76608683b53b57e89d7c92ee4d0831d6d0977ec76476036fdb8c6374ebdf3daa639cfb627e0153d40ca752a SHA512 03daeb5f03193887b692cbe8d631c83ac632f3e92fca4f10e881058fea38d85e11c090de04be9d70d52a22dec669474a0044a3d45d4adeb3a0f39e3398cdac11 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707 @@ -134,7 +134,7 @@ DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb -DIST scribe-0.8.1.crate 30007 BLAKE2B 700afba13fcff3445795c10fb5941e78b205ff0319f51205c3fe1ad7e9db226395014a0419b51448e13ec03ee27792dfbd0e87504c280ecc2be6b25873d85dc3 SHA512 dc1b8ea72a9b17bcf58473374db0dffa0d1072cac48d01b74678c778baa470249279db4cd9468e66f2ecbff085028ecddcfc3cf43aa4847bc692053a03815ba3 +DIST scribe-0.8.4.crate 31797 BLAKE2B e87dcd7215b8831788d0bf9d0b220a93a7c5fe1a867d52af63cf70d004e933110dffaee8f06470a9c9a06f7f1b6f23f789028d90f676cd8bbf79e11819709a07 SHA512 b676a9d9cb984215f15e8725c5d1bf684dd559d31d85a946d3971a827016ee5105856c177da92514e74c62f0788e5508585963340e59918e31aa975ad299baa0 DIST serde-1.0.188.crate 76230 BLAKE2B 81e92adf17e3f2ce73c82e3069b8fd656211cfeb6755abd338b74d52f748f5bba6690abf5c83ea2a126fbd6187bc587b539f0ebcf621e928085876f28fbb9513 SHA512 7d42ce834bcd1034f8ccbcd6646cc93f8e189e344f29f4d7b0ab148ba11ce7848d0ab986dce7a0245fcd6893243f5768f7bc0ca9c24c75c53585ecc899d312d2 DIST serde_derive-1.0.188.crate 55563 BLAKE2B 3b24044915a704d9d8a2cae6e6547ecffea7ee3fd4260ddb2bf7fa38b23fd7fc597b61ac28bf65b9f0d45e18ffd6bc7596f5a3d602cc79835697fb3f5440242f SHA512 fa9132a319f7829e6afad65289031be99255466d76270875d9d81f82f63e53592eaef5452d0df38da92e9d0b6f2b37e91026635fff4bf597b0ae662b71b5eff0 DIST serde_json-1.0.106.crate 146672 BLAKE2B fa8ca9a6f692929d0579aef6fd80766d11f5ca553d20c01b504778559a32aaf0574753f94d3978859c3e96a67f6f297ffb1919f2f9df42f8375d643c31bc71c4 SHA512 7b0d06c71bda19bc9e0cd5cb43b932ce15c7769514ef31e0099bd147cc9389fb8827ffee23544a37f7a813ea0c4a99b8614b1b6ea5cd337a1513769db085474d diff --git a/app-editors/amp/amp-0.7.0-r1.ebuild b/app-editors/amp/amp-0.7.1.ebuild similarity index 93% rename from app-editors/amp/amp-0.7.0-r1.ebuild rename to app-editors/amp/amp-0.7.1.ebuild index 8f79316676..286643f4a2 100644 --- a/app-editors/amp/amp-0.7.0-r1.ebuild +++ b/app-editors/amp/amp-0.7.1.ebuild @@ -1,7 +1,7 @@ # Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Autogenerated by pycargoebuild 0.13.2 +# Autogenerated by pycargoebuild 0.13.4 EAPI=8 @@ -65,7 +65,7 @@ CRATES=" fuchsia-zircon@0.3.3 gethostname@0.2.3 gimli@0.28.0 - git2@0.18.1 + git2@0.19.0 glob@0.2.11 half@1.8.2 hashbrown@0.14.3 @@ -83,7 +83,7 @@ CRATES=" kernel32-sys@0.2.2 lazy_static@1.4.0 libc@0.2.152 - libgit2-sys@0.16.1+1.7.1 + libgit2-sys@0.17.0+1.8.1 libz-sys@1.1.12 line-wrap@0.1.1 linked-hash-map@0.5.6 @@ -141,7 +141,7 @@ CRATES=" safemem@0.3.3 same-file@1.0.6 scopeguard@1.2.0 - scribe@0.8.1 + scribe@0.8.4 serde@1.0.188 serde_derive@1.0.188 serde_json@1.0.106 @@ -236,28 +236,26 @@ SRC_URI=" ${CARGO_CRATE_URIS} " -LICENSE="GPL-3+" +LICENSE="GPL-3" # Dependent crate licenses LICENSE+=" Apache-2.0 BSD Boost-1.0 MIT Unicode-DFS-2016" SLOT="0" KEYWORDS="~amd64" -IUSE="doc" -DEPEND="dev-libs/libgit2:0/1.7" +DEPEND=" + dev-libs/libgit2:0/1.8 + dev-libs/oniguruma:= +" RDEPEND="${DEPEND}" PATCHES=( - # fix build with rust 1.80 - "${FILESDIR}/${P}-rust-1.80.patch" + "${FILESDIR}/${P}-update-git2.patch" ) QA_FLAGS_IGNORED="usr/bin/amp" -src_install() { - cargo_src_install - - if use doc; then - dodoc README.md CHANGELOG.md - dodoc -r documentation/* - fi +src_configure() { + export LIBGIT2_SYS_USE_PKG_CONFIG=1 + export RUSTONIG_SYSTEM_LIBONIG=1 + cargo_src_configure } diff --git a/app-editors/amp/files/amp-0.7.0-rust-1.80.patch b/app-editors/amp/files/amp-0.7.0-rust-1.80.patch deleted file mode 100644 index 12968ef048..0000000000 --- a/app-editors/amp/files/amp-0.7.0-rust-1.80.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://github.com/time-rs/time/issues/693 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -864,6 +864,12 @@ dependencies = [ - "minimal-lexical", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-traits" - version = "0.2.16" -@@ -1372,12 +1378,13 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.31" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", -+ "num-conv", - "powerfmt", - "serde", - "time-core", -@@ -1392,10 +1399,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.16" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - diff --git a/app-editors/amp/files/amp-0.7.1-update-git2.patch b/app-editors/amp/files/amp-0.7.1-update-git2.patch new file mode 100644 index 0000000000..1ca144d7a3 --- /dev/null +++ b/app-editors/amp/files/amp-0.7.1-update-git2.patch @@ -0,0 +1,42 @@ +https://github.com/jmacdonald/amp/commit/a32d6a36b2b554d3e4e7bab357087ca1b5bb7ac8 +From: Jordan MacDonald +Date: Sun, 3 Nov 2024 22:28:15 -0500 +Subject: [PATCH] Upgrade git2 dependency (#300) + +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -537,9 +537,9 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + + [[package]] + name = "git2" +-version = "0.18.1" ++version = "0.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" ++checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" + dependencies = [ + "bitflags 2.4.1", + "libc", +@@ -691,9 +691,9 @@ checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + + [[package]] + name = "libgit2-sys" +-version = "0.16.1+1.7.1" ++version = "0.17.0+1.8.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" ++checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" + dependencies = [ + "cc", + "libc", +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -38,7 +38,7 @@ version = "0.1" + features = ["mio-support"] + + [dependencies.git2] +-version = "0.18" ++version = "0.19" + # We use very little of the Git crate. Disabling its default features makes it + # as bare as possible, and sidesteps its openssl dependency, among others. + default-features = false # removes unused openssl dependency diff --git a/app-editors/amp/metadata.xml b/app-editors/amp/metadata.xml index 2aa125110e..5a512e5d29 100644 --- a/app-editors/amp/metadata.xml +++ b/app-editors/amp/metadata.xml @@ -3,7 +3,7 @@ + https://amp.rs/docs/ jmacdonald/amp - diff --git a/app-misc/anki-bin/anki-bin-24.06.3-r1.ebuild b/app-misc/anki-bin/anki-bin-24.06.3-r1.ebuild index 068a36f32b..f28c3fcbf1 100644 --- a/app-misc/anki-bin/anki-bin-24.06.3-r1.ebuild +++ b/app-misc/anki-bin/anki-bin-24.06.3-r1.ebuild @@ -60,9 +60,9 @@ RDEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/send2trash[${PYTHON_USEDEP}] dev-python/waitress[${PYTHON_USEDEP}] - >=dev-python/PyQt6-6.6.1[gui,network,opengl,quick,webchannel,widgets,${PYTHON_USEDEP}] - >=dev-python/PyQt6-sip-13.6.0[${PYTHON_USEDEP}] - >=dev-python/PyQt6-WebEngine-6.6.0[widgets,${PYTHON_USEDEP}]') + >=dev-python/pyqt6-6.6.1[gui,network,opengl,quick,webchannel,widgets,${PYTHON_USEDEP}] + >=dev-python/pyqt6-sip-13.6.0[${PYTHON_USEDEP}] + >=dev-python/pyqt6-webengine-6.6.0[widgets,${PYTHON_USEDEP}]') " BDEPEND="app-arch/unzip" @@ -100,9 +100,9 @@ pkg_postinst() { xdg_pkg_postinst optfeature "LaTeX in cards" "app-text/texlive[extra] app-text/dvipng" optfeature "sound support" media-video/mpv media-video/mplayer - optfeature "recording support" "media-sound/lame[frontend] dev-python/PyQt6[multimedia]" + optfeature "recording support" "media-sound/lame[frontend] dev-python/pyqt6[multimedia]" optfeature "faster database operations" dev-python/orjson - optfeature "compatibility with Qt5-dependent add-ons" dev-python/PyQt6[dbus,printsupport] + optfeature "compatibility with Qt5-dependent add-ons" dev-python/pyqt6[dbus,printsupport] optfeature "Vulkan driver" "media-libs/vulkan-loader dev-qt/qtbase:6[vulkan] dev-qt/qtdeclarative:6[vulkan] dev-qt/qtwebengine:6[vulkan]" diff --git a/app-misc/brightness-control/brightness-control-2.4.ebuild b/app-misc/brightness-control/brightness-control-2.4.ebuild index c44041a9fa..cd2bf0d6d0 100644 --- a/app-misc/brightness-control/brightness-control-2.4.ebuild +++ b/app-misc/brightness-control/brightness-control-2.4.ebuild @@ -20,7 +20,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND="$(python_gen_cond_dep \ - 'dev-python/QtPy[${PYTHON_USEDEP},gui,network,pyqt5,widgets]' + 'dev-python/qtpy[${PYTHON_USEDEP},gui,network,pyqt5,widgets]' )" distutils_enable_tests pytest diff --git a/app-misc/sherlock/sherlock-0.15.0.ebuild b/app-misc/sherlock/sherlock-0.15.0.ebuild index 81f0608489..0aeb0b8578 100644 --- a/app-misc/sherlock/sherlock-0.15.0.ebuild +++ b/app-misc/sherlock/sherlock-0.15.0.ebuild @@ -26,7 +26,7 @@ RDEPEND=" $(python_gen_cond_dep ' >=dev-python/certifi-2019.6.16[${PYTHON_USEDEP}] >=dev-python/colorama-0.4.1[${PYTHON_USEDEP}] - >=dev-python/PySocks-1.7.0[${PYTHON_USEDEP}] + >=dev-python/pysocks-1.7.0[${PYTHON_USEDEP}] >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] >=dev-python/requests-futures-1.00.0[${PYTHON_USEDEP}] >=dev-python/pandas-1.0.0[${PYTHON_USEDEP}] diff --git a/app-misc/sherlock/sherlock-9999.ebuild b/app-misc/sherlock/sherlock-9999.ebuild index 81f0608489..0aeb0b8578 100644 --- a/app-misc/sherlock/sherlock-9999.ebuild +++ b/app-misc/sherlock/sherlock-9999.ebuild @@ -26,7 +26,7 @@ RDEPEND=" $(python_gen_cond_dep ' >=dev-python/certifi-2019.6.16[${PYTHON_USEDEP}] >=dev-python/colorama-0.4.1[${PYTHON_USEDEP}] - >=dev-python/PySocks-1.7.0[${PYTHON_USEDEP}] + >=dev-python/pysocks-1.7.0[${PYTHON_USEDEP}] >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] >=dev-python/requests-futures-1.00.0[${PYTHON_USEDEP}] >=dev-python/pandas-1.0.0[${PYTHON_USEDEP}] diff --git a/app-misc/vocabsieve/vocabsieve-0.12.2.ebuild b/app-misc/vocabsieve/vocabsieve-0.12.2.ebuild index cccf2e9a9f..05b068bd72 100644 --- a/app-misc/vocabsieve/vocabsieve-0.12.2.ebuild +++ b/app-misc/vocabsieve/vocabsieve-0.12.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64" RDEPEND=" - dev-python/PyQt5[${PYTHON_USEDEP},multimedia] + dev-python/pyqt5[${PYTHON_USEDEP},multimedia] dev-python/loguru[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/simplemma[${PYTHON_USEDEP}] diff --git a/app-office/pyspread/pyspread-2.1.1.ebuild b/app-office/pyspread/pyspread-2.1.1.ebuild index 254f38998c..ee0b2dc0e4 100644 --- a/app-office/pyspread/pyspread-2.1.1.ebuild +++ b/app-office/pyspread/pyspread-2.1.1.ebuild @@ -21,7 +21,7 @@ KEYWORDS="~amd64" # >=dev-python/numpy-2 is incompatible. # https://gitlab.com/pyspread/pyspread/-/issues/125 RDEPEND=" - >=dev-python/PyQt5-5.10.0[gui,printsupport,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/pyqt5-5.10.0[gui,printsupport,svg,widgets,${PYTHON_USEDEP}] >=dev-python/markdown2-2.3[${PYTHON_USEDEP}] >=dev-python/matplotlib-1.1.1[${PYTHON_USEDEP}] PlotPyStack/guidata - Use dev-python/PyQt5 as Qt for Python implementation - Use dev-python/PyQt6 as Qt for Python implementation + Use dev-python/pyqt5 as Qt for Python implementation + Use dev-python/pyqt6 as Qt for Python implementation diff --git a/dev-python/guiqwt/guiqwt-4.4.5-r1.ebuild b/dev-python/guiqwt/guiqwt-4.4.5-r1.ebuild index adfb4c7e35..1abbe3b275 100644 --- a/dev-python/guiqwt/guiqwt-4.4.5-r1.ebuild +++ b/dev-python/guiqwt/guiqwt-4.4.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,6 +24,6 @@ RDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] dev-python/PythonQwt[${PYTHON_USEDEP}] - dev-python/QtPy[${PYTHON_USEDEP}] + dev-python/qtpy[${PYTHON_USEDEP}] dev-python/scipy[${PYTHON_USEDEP}] " diff --git a/dev-python/mkdocs-git-committers-plugin/mkdocs-git-committers-plugin-0.2.3.ebuild b/dev-python/mkdocs-git-committers-plugin/mkdocs-git-committers-plugin-0.2.3.ebuild index 6b6d71153a..f0c33a01c3 100644 --- a/dev-python/mkdocs-git-committers-plugin/mkdocs-git-committers-plugin-0.2.3.ebuild +++ b/dev-python/mkdocs-git-committers-plugin/mkdocs-git-committers-plugin-0.2.3.ebuild @@ -21,6 +21,6 @@ SLOT="0" KEYWORDS="~amd64" RDEPEND=" - dev-python/PyGithub[${PYTHON_USEDEP}] + dev-python/pygithub[${PYTHON_USEDEP}] >=dev-python/mkdocs-1.0[${PYTHON_USEDEP}] " diff --git a/dev-python/mkdocs-rss-plugin/mkdocs-rss-plugin-1.15.0.ebuild b/dev-python/mkdocs-rss-plugin/mkdocs-rss-plugin-1.15.0.ebuild index ecc8755fff..e9fd90b34c 100644 --- a/dev-python/mkdocs-rss-plugin/mkdocs-rss-plugin-1.15.0.ebuild +++ b/dev-python/mkdocs-rss-plugin/mkdocs-rss-plugin-1.15.0.ebuild @@ -33,8 +33,8 @@ KEYWORDS="~amd64" # RESTRICT="doc? ( network-sandbox )" BDEPEND=" - >=dev-python/GitPython-3.1[${PYTHON_USEDEP}] - =dev-python/gitpython-3.1[${PYTHON_USEDEP}] + =dev-python/mkdocs-1.5[${PYTHON_USEDEP}] =dev-python/cachecontrol-0.14[${PYTHON_USEDEP}] diff --git a/dev-python/pymemcache/pymemcache-4.0.0.ebuild b/dev-python/pymemcache/pymemcache-4.0.0.ebuild index b56ccd2712..06cc5dae6a 100644 --- a/dev-python/pymemcache/pymemcache-4.0.0.ebuild +++ b/dev-python/pymemcache/pymemcache-4.0.0.ebuild @@ -20,7 +20,7 @@ KEYWORDS="~amd64" BDEPEND=" test? ( ${DATABASES_DEPEND[memcached]} - dev-python/Faker[${PYTHON_USEDEP}] + dev-python/faker[${PYTHON_USEDEP}] dev-python/zstd[${PYTHON_USEDEP}] ) " diff --git a/dev-python/pywebview/pywebview-4.4.1-r1.ebuild b/dev-python/pywebview/pywebview-4.4.1-r1.ebuild index c30541e268..fafd60d172 100644 --- a/dev-python/pywebview/pywebview-4.4.1-r1.ebuild +++ b/dev-python/pywebview/pywebview-4.4.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,7 +27,7 @@ RDEPEND=" ) qt6? ( dev-python/pyside6[${PYTHON_USEDEP},webengine] - dev-python/QtPy[${PYTHON_USEDEP},webengine] + dev-python/qtpy[${PYTHON_USEDEP},webengine] ) " diff --git a/dev-python/pywebview/pywebview-5.1-r1.ebuild b/dev-python/pywebview/pywebview-5.1-r1.ebuild index 7a66a47491..fafd60d172 100644 --- a/dev-python/pywebview/pywebview-5.1-r1.ebuild +++ b/dev-python/pywebview/pywebview-5.1-r1.ebuild @@ -27,7 +27,7 @@ RDEPEND=" ) qt6? ( dev-python/pyside6[${PYTHON_USEDEP},webengine] - dev-python/QtPy[${PYTHON_USEDEP},webengine] + dev-python/qtpy[${PYTHON_USEDEP},webengine] ) " diff --git a/dev-python/termynal/Manifest b/dev-python/termynal/Manifest index 14ea6f7478..eb8fc4b2c0 100644 --- a/dev-python/termynal/Manifest +++ b/dev-python/termynal/Manifest @@ -1 +1 @@ -DIST termynal-0.12.1.gh.tar.gz 149652 BLAKE2B bcb66711efd3b306327e2010fd426bd22fb3a8f6d53ad6510f2ebd02d34879e05f6c8d82e5949a95b3a96a7cc43d24783897a6999644c0683a303404f0be23c7 SHA512 a8843acb52f5ee1cba3595445ff29972772b6ac006aad35f1fb8e2459073407ad32e044f4767d1ee191486af09fb11d62faa9dc70761e0ad779be6ecf65fc8c5 +DIST termynal-0.12.2.gh.tar.gz 171222 BLAKE2B 98d56aa220ed268379b41626d72834d7d86f76c6bfd489f52846d3c0530a7997affc477343ba30e82f253ffcd482c701d4ca0805bbdec9681f6e74a250cf0edb SHA512 2248d27ec13455a514fc57cd0317219e424ecb9c5a57166fe2c83162b62ecf1c2ebfe3de5be06d3ae71126ab903df8e3ef3e39acb558e3dbfa045ab456d52d7d diff --git a/dev-python/termynal/termynal-0.12.1.ebuild b/dev-python/termynal/termynal-0.12.2.ebuild similarity index 77% rename from dev-python/termynal/termynal-0.12.1.ebuild rename to dev-python/termynal/termynal-0.12.2.ebuild index 8b8b8f8ea9..dbddcdaa5e 100644 --- a/dev-python/termynal/termynal-0.12.1.ebuild +++ b/dev-python/termynal/termynal-0.12.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -DISTUTILS_USE_PEP517=poetry +DISTUTILS_USE_PEP517=hatchling PYTHON_COMPAT=( python3_{10..12} ) DOCS_BUILDER="mkdocs" @@ -31,11 +31,8 @@ RDEPEND=" " BDEPEND=" test? ( - >=dev-python/pytest-mock-3.11.1[${PYTHON_USEDEP}] - =dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}] - =dev-python/pytest-mock-3.14[${PYTHON_USEDEP}] + >=dev-python/pyyaml-6.0[${PYTHON_USEDEP}] ) " DEPEND="${RDEPEND}" diff --git a/dev-python/textual-dev/Manifest b/dev-python/textual-dev/Manifest index 30f679c4cb..43a26a84f2 100644 --- a/dev-python/textual-dev/Manifest +++ b/dev-python/textual-dev/Manifest @@ -1 +1 @@ -DIST textual_dev-1.6.1.tar.gz 25624 BLAKE2B a2f3e676f8a10388a95c467e3b1590e03c708b1ef09096bf02b66d10143792dfa89d630a8d8089926eb5e8ef87cfbea9c9c5aa379049a6fa6465ac9c1dad3234 SHA512 2c6854642eadcd0ca5b199e25d097205df75a06f5ad277461b468ff3d203e71476cf50957bdd2874bb25290d7fc8b9cd19bca5ec9f91331e2ba8da0a24248aed +DIST textual-dev-1.7.1.gh.tar.gz 73273 BLAKE2B 6a9aac72418772d32ff034468d1b1a2e7153e9c6d177b58d09a9731a0ee366dcbb45f780f28535a7a60141531f66f765c72359e391c2648f405b1510af3088a3 SHA512 421076c1e512d65f0fcb02f7f2889ed5c81ebff5abe59488f6cfe236f9ea24b3203a6cb42b837718bd8d457f9bdb1afaed5d5a87f50b2f6bd5e23fe39a29a91d diff --git a/dev-python/textual-dev/textual-dev-1.6.1.ebuild b/dev-python/textual-dev/textual-dev-1.7.1.ebuild similarity index 71% rename from dev-python/textual-dev/textual-dev-1.6.1.ebuild rename to dev-python/textual-dev/textual-dev-1.7.1.ebuild index 2f949f94ec..8227f9acd6 100644 --- a/dev-python/textual-dev/textual-dev-1.6.1.ebuild +++ b/dev-python/textual-dev/textual-dev-1.7.1.ebuild @@ -6,17 +6,19 @@ EAPI=8 DISTUTILS_USE_PEP517=poetry PYTHON_COMPAT=( python3_{10..13} ) -inherit distutils-r1 pypi +inherit distutils-r1 DESCRIPTION="Modern Text User Interface framework" HOMEPAGE="https://github.com/Textualize/textual-dev https://pypi.org/project/textual-dev/" +SRC_URI="https://github.com/Textualize/textual-dev/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" RDEPEND=" - >=dev-python/textual-0.36.0[${PYTHON_USEDEP}] + >=dev-python/textual-0.86.2[${PYTHON_USEDEP}] + >=dev-python/textual-serve-1.0.3[${PYTHON_USEDEP}] >=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}] >=dev-python/click-8.1.2[${PYTHON_USEDEP}] >=dev-python/msgpack-1.0.3[${PYTHON_USEDEP}] @@ -25,10 +27,8 @@ RDEPEND=" BDEPEND=" test? ( - ${RDEPEND} dev-python/pytest-aiohttp[${PYTHON_USEDEP}] - >=dev-python/time-machine-2.6.0[${PYTHON_USEDEP}] - + + + + gasc@eurecom.fr + Gasc Henri + + + textual-serve + Textualize/textual-serve + https://textual.textualize.io/ + + diff --git a/dev-python/textual-serve/textual-serve-1.1.0.ebuild b/dev-python/textual-serve/textual-serve-1.1.0.ebuild new file mode 100644 index 0000000000..508cf05ae0 --- /dev/null +++ b/dev-python/textual-serve/textual-serve-1.1.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..13} ) + +inherit distutils-r1 + +HASH="3ddc373822ff16a680d5dff647f52f0afcf552cf" +DESCRIPTION="Serve Textual apps locally" +HOMEPAGE="https://github.com/Textualize/textual-serve https://pypi.org/project/textual-serve/" +SRC_URI="https://github.com/Textualize/${PN}/archive/${HASH}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/${PN}-${HASH}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + >=dev-python/aiohttp-3.9.5[${PYTHON_USEDEP}] + >=dev-python/jinja2-3.1.4[${PYTHON_USEDEP}] + >=dev-python/textual-0.66.0[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-python/textual/Manifest b/dev-python/textual/Manifest index 8f716fa119..4e0c352379 100644 --- a/dev-python/textual/Manifest +++ b/dev-python/textual/Manifest @@ -1 +1 @@ -DIST textual-0.85.2.gh.tar.gz 29453817 BLAKE2B 7d84ad832b4294bb0e6ef27094970de70cfa92e1316fcf1812fd87a032918b7c9fd1d6b0f900ebd33239d0165ffce0148eb9cff028da7d64403779e3f3477649 SHA512 4d7b891fa357f540013f110d1501164cd641af52b75032850cbec6098309aa88ff21ecfbb84a90288a745eda08ddc6f99ea13ca204dd3ab588e36e72b9a6b075 +DIST textual-0.86.3.gh.tar.gz 29492586 BLAKE2B 78eb3b3e0904389286dbbd03b9d269b4ec5c1478f3d23321ea78a4d2eb04a17ee14f7ef77333699ff6833f91f4cdd1c3f38235094699dea18d1ce5217ed6c2ec SHA512 dc24f54a92aea4be7a65c1516a0f8dde34aa71a0d9ed9f1da7ac62dcbcd7af1dbe8aabb2d921e642bbb1cc44c4299b5e06c70ed59c402a810db2ca2ee316411a diff --git a/dev-python/textual/textual-0.85.2.ebuild b/dev-python/textual/textual-0.86.3.ebuild similarity index 92% rename from dev-python/textual/textual-0.85.2.ebuild rename to dev-python/textual/textual-0.86.3.ebuild index fae0d87664..98fe184e0a 100644 --- a/dev-python/textual/textual-0.85.2.ebuild +++ b/dev-python/textual/textual-0.86.3.ebuild @@ -28,16 +28,18 @@ KEYWORDS="~amd64" RDEPEND=" >=dev-python/markdown-it-py-2.1.0[${PYTHON_USEDEP}] + >=dev-python/platformdirs-3.6.0[${PYTHON_USEDEP}] + =dev-python/rich-13.3.3[${PYTHON_USEDEP}] " BDEPEND=" test? ( + dev-python/griffe[${PYTHON_USEDEP}] dev-python/httpx[${PYTHON_USEDEP}] - =dev-python/textual-dev-1*[${PYTHON_USEDEP}] + dev-python/platformdirs[${PYTHON_USEDEP}] dev-python/pytest-asyncio[${PYTHON_USEDEP}] dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/griffe[${PYTHON_USEDEP}] - dev-python/platformdirs[${PYTHON_USEDEP}] + =dev-python/textual-dev-1.7*[${PYTHON_USEDEP}] ) " # currently masked diff --git a/dev-python/tulir-telethon/tulir-telethon-1.35.0_alpha1.ebuild b/dev-python/tulir-telethon/tulir-telethon-1.35.0_alpha1.ebuild index dd878b8341..30c651973b 100644 --- a/dev-python/tulir-telethon/tulir-telethon-1.35.0_alpha1.ebuild +++ b/dev-python/tulir-telethon/tulir-telethon-1.35.0_alpha1.ebuild @@ -22,7 +22,7 @@ RDEPEND=" dev-python/hachoir[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] dev-python/pyaes[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/pysocks[${PYTHON_USEDEP}] dev-python/python-socks[${PYTHON_USEDEP}] dev-python/rsa[${PYTHON_USEDEP}] " diff --git a/dev-python/tulir-telethon/tulir-telethon-1.37.0_alpha1.ebuild b/dev-python/tulir-telethon/tulir-telethon-1.37.0_alpha1.ebuild index cf69a02fc4..73c76883a9 100644 --- a/dev-python/tulir-telethon/tulir-telethon-1.37.0_alpha1.ebuild +++ b/dev-python/tulir-telethon/tulir-telethon-1.37.0_alpha1.ebuild @@ -28,7 +28,7 @@ RDEPEND=" dev-python/hachoir[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] dev-python/pyaes[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/pysocks[${PYTHON_USEDEP}] dev-python/python-socks[${PYTHON_USEDEP}] dev-python/rsa[${PYTHON_USEDEP}] " diff --git a/dev-python/typing-inspect/typing-inspect-0.9.0.ebuild b/dev-python/typing-inspect/typing-inspect-0.9.0.ebuild index 5ace518964..d3e376b7a3 100644 --- a/dev-python/typing-inspect/typing-inspect-0.9.0.ebuild +++ b/dev-python/typing-inspect/typing-inspect-0.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" - >=dev-python/mypy_extensions-0.3.0[${PYTHON_USEDEP}] + >=dev-python/mypy-extensions-0.3.0[${PYTHON_USEDEP}] >=dev-python/typing-extensions-3.7.4.2[${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" diff --git a/games-misc/varlpenis/varlpenis-3.0.2.ebuild b/games-misc/varlpenis/varlpenis-3.0.4.ebuild similarity index 100% rename from games-misc/varlpenis/varlpenis-3.0.2.ebuild rename to games-misc/varlpenis/varlpenis-3.0.4.ebuild diff --git a/gui-apps/meteo-qt/meteo-qt-3.3.ebuild b/gui-apps/meteo-qt/meteo-qt-3.3.ebuild index 4423fd1813..5b3d0b13d6 100644 --- a/gui-apps/meteo-qt/meteo-qt-3.3.ebuild +++ b/gui-apps/meteo-qt/meteo-qt-3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,12 +18,12 @@ KEYWORDS="~amd64" RDEPEND=" $(python_gen_cond_dep ' - dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/pyqt5[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] ') " BDEPEND=" - dev-python/PyQt5 + dev-python/pyqt5 dev-qt/linguist-tools " diff --git a/gui-apps/meteo-qt/meteo-qt-3.4.ebuild b/gui-apps/meteo-qt/meteo-qt-3.4.ebuild index aa2f9f9ec8..5b3d0b13d6 100644 --- a/gui-apps/meteo-qt/meteo-qt-3.4.ebuild +++ b/gui-apps/meteo-qt/meteo-qt-3.4.ebuild @@ -18,12 +18,12 @@ KEYWORDS="~amd64" RDEPEND=" $(python_gen_cond_dep ' - dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/pyqt5[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] ') " BDEPEND=" - dev-python/PyQt5 + dev-python/pyqt5 dev-qt/linguist-tools " diff --git a/media-gfx/beeref/beeref-0.3.3.ebuild b/media-gfx/beeref/beeref-0.3.3.ebuild index 89902a7840..10ae153f15 100644 --- a/media-gfx/beeref/beeref-0.3.3.ebuild +++ b/media-gfx/beeref/beeref-0.3.3.ebuild @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~amd64" RDEPEND=" - >=dev-python/PyQt6-6.6.1 + >=dev-python/pyqt6-6.6.1 >=dev-python/rectangle-packer-2.0.2 >=dev-python/exif-1.6.0 >=dev-python/lxml-5.1.0 diff --git a/media-gfx/vimiv-qt/vimiv-qt-0.9.0.ebuild b/media-gfx/vimiv-qt/vimiv-qt-0.9.0.ebuild index 151ddf4632..e0c65ab321 100644 --- a/media-gfx/vimiv-qt/vimiv-qt-0.9.0.ebuild +++ b/media-gfx/vimiv-qt/vimiv-qt-0.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="debug" -RDEPEND=">=dev-python/PyQt5-5.13.2[${PYTHON_USEDEP}]" +RDEPEND=">=dev-python/pyqt5-5.13.2[${PYTHON_USEDEP}]" DOCS="README.md AUTHORS" distutils_enable_tests pytest diff --git a/media-sound/TauonMusicBox/TauonMusicBox-7.8.0-r1.ebuild b/media-sound/TauonMusicBox/TauonMusicBox-7.8.0-r1.ebuild index 1b0d76e54b..ebf00dfb40 100644 --- a/media-sound/TauonMusicBox/TauonMusicBox-7.8.0-r1.ebuild +++ b/media-sound/TauonMusicBox/TauonMusicBox-7.8.0-r1.ebuild @@ -45,7 +45,7 @@ DEPEND=" dev-python/musicbrainzngs[${PYTHON_USEDEP}] dev-python/natsort[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] - dev-python/PySDL2[${PYTHON_USEDEP}] + dev-python/pysdl2[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/setproctitle[${PYTHON_USEDEP}] dev-python/send2trash[${PYTHON_USEDEP}] diff --git a/media-sound/TauonMusicBox/TauonMusicBox-7.8.3.ebuild b/media-sound/TauonMusicBox/TauonMusicBox-7.8.3.ebuild index 817a5d6f39..d5da52c066 100644 --- a/media-sound/TauonMusicBox/TauonMusicBox-7.8.3.ebuild +++ b/media-sound/TauonMusicBox/TauonMusicBox-7.8.3.ebuild @@ -45,7 +45,7 @@ DEPEND=" dev-python/musicbrainzngs[${PYTHON_USEDEP}] dev-python/natsort[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] - dev-python/PySDL2[${PYTHON_USEDEP}] + dev-python/pysdl2[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/setproctitle[${PYTHON_USEDEP}] dev-python/send2trash[${PYTHON_USEDEP}] diff --git a/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild b/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild index 8369fe8675..7f9c9ace8a 100644 --- a/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild +++ b/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild @@ -42,7 +42,7 @@ DEPEND=" dev-python/musicbrainzngs[${PYTHON_USEDEP}] dev-python/natsort[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] - dev-python/PySDL2[${PYTHON_USEDEP}] + dev-python/pysdl2[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/setproctitle[${PYTHON_USEDEP}] dev-python/send2trash[${PYTHON_USEDEP}] diff --git a/media-sound/corrscope/corrscope-0.10.0-r1.ebuild b/media-sound/corrscope/corrscope-0.10.0-r1.ebuild index ea666260a9..b0de398d49 100644 --- a/media-sound/corrscope/corrscope-0.10.0-r1.ebuild +++ b/media-sound/corrscope/corrscope-0.10.0-r1.ebuild @@ -28,7 +28,7 @@ RDEPEND=" dev-python/appdirs[${PYTHON_USEDEP}] dev-python/atomicwrites[${PYTHON_USEDEP}] dev-python/colorspacious[${PYTHON_USEDEP}] - dev-python/QtPy[${PYTHON_USEDEP}] + dev-python/qtpy[${PYTHON_USEDEP}] ') media-video/ffmpeg " diff --git a/media-sound/corrscope/corrscope-0.10.1.ebuild b/media-sound/corrscope/corrscope-0.10.1.ebuild index 0b7326b813..3215d1c7c2 100644 --- a/media-sound/corrscope/corrscope-0.10.1.ebuild +++ b/media-sound/corrscope/corrscope-0.10.1.ebuild @@ -28,7 +28,7 @@ RDEPEND=" dev-python/appdirs[${PYTHON_USEDEP}] dev-python/atomicwrites[${PYTHON_USEDEP}] dev-python/colorspacious[${PYTHON_USEDEP}] - dev-python/QtPy[${PYTHON_USEDEP}] + dev-python/qtpy[${PYTHON_USEDEP}] ') media-video/ffmpeg " diff --git a/media-video/syncplay/syncplay-1.7.3.ebuild b/media-video/syncplay/syncplay-1.7.3.ebuild index 5a6696368e..7574d137d3 100644 --- a/media-video/syncplay/syncplay-1.7.3.ebuild +++ b/media-video/syncplay/syncplay-1.7.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,11 +29,11 @@ RDEPEND=" client? ( gui? ( $( python_gen_cond_dep \ - 'dev-python/QtPy[${PYTHON_USEDEP},gui,pyside2]' \ + 'dev-python/qtpy[${PYTHON_USEDEP},gui,pyside2]' \ python3_{10,11} ) $( python_gen_cond_dep \ - 'dev-python/QtPy[${PYTHON_USEDEP},gui,pyside6]' \ + 'dev-python/qtpy[${PYTHON_USEDEP},gui,pyside6]' \ python3_12 ) ) diff --git a/net-misc/maestral-qt/maestral-qt-1.9.3.ebuild b/net-misc/maestral-qt/maestral-qt-1.9.3.ebuild index 34ac19a1bf..cbab47efd5 100644 --- a/net-misc/maestral-qt/maestral-qt-1.9.3.ebuild +++ b/net-misc/maestral-qt/maestral-qt-1.9.3.ebuild @@ -23,7 +23,7 @@ RDEPEND=" >=dev-python/click-8.0.2[${PYTHON_USEDEP}] dev-python/markdown2[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] - dev-python/PyQt6[widgets,gui,svg,${PYTHON_USEDEP}] + dev-python/pyqt6[widgets,gui,svg,${PYTHON_USEDEP}] >=net-misc/maestral-${PV%_rc*}_rc0[${PYTHON_USEDEP}] " BDEPEND=" diff --git a/net-misc/maestral-qt/maestral-qt-1.9.4.ebuild b/net-misc/maestral-qt/maestral-qt-1.9.4.ebuild index 34ac19a1bf..cbab47efd5 100644 --- a/net-misc/maestral-qt/maestral-qt-1.9.4.ebuild +++ b/net-misc/maestral-qt/maestral-qt-1.9.4.ebuild @@ -23,7 +23,7 @@ RDEPEND=" >=dev-python/click-8.0.2[${PYTHON_USEDEP}] dev-python/markdown2[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] - dev-python/PyQt6[widgets,gui,svg,${PYTHON_USEDEP}] + dev-python/pyqt6[widgets,gui,svg,${PYTHON_USEDEP}] >=net-misc/maestral-${PV%_rc*}_rc0[${PYTHON_USEDEP}] " BDEPEND=" diff --git a/net-misc/maestral/maestral-1.9.3-r1.ebuild b/net-misc/maestral/maestral-1.9.3-r1.ebuild index 249d0019b7..e60b7083cb 100644 --- a/net-misc/maestral/maestral-1.9.3-r1.ebuild +++ b/net-misc/maestral/maestral-1.9.3-r1.ebuild @@ -29,7 +29,7 @@ RDEPEND=" >=dev-python/keyrings-alt-3.1.0[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] >=dev-python/pathspec-0.5.8[${PYTHON_USEDEP}] - >=dev-python/Pyro5-5.10[${PYTHON_USEDEP}] + >=dev-python/pyro5-5.10[${PYTHON_USEDEP}] >=dev-python/requests-2.16.2[${PYTHON_USEDEP}] dev-python/rich[${PYTHON_USEDEP}] dev-python/survey[${PYTHON_USEDEP}] diff --git a/net-misc/maestral/maestral-1.9.4.ebuild b/net-misc/maestral/maestral-1.9.4.ebuild index 249d0019b7..e60b7083cb 100644 --- a/net-misc/maestral/maestral-1.9.4.ebuild +++ b/net-misc/maestral/maestral-1.9.4.ebuild @@ -29,7 +29,7 @@ RDEPEND=" >=dev-python/keyrings-alt-3.1.0[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] >=dev-python/pathspec-0.5.8[${PYTHON_USEDEP}] - >=dev-python/Pyro5-5.10[${PYTHON_USEDEP}] + >=dev-python/pyro5-5.10[${PYTHON_USEDEP}] >=dev-python/requests-2.16.2[${PYTHON_USEDEP}] dev-python/rich[${PYTHON_USEDEP}] dev-python/survey[${PYTHON_USEDEP}] diff --git a/profiles/updates/1Q-2021 b/profiles/updates/1Q-2021 index 935078c2fa..49ad80d2c2 100644 --- a/profiles/updates/1Q-2021 +++ b/profiles/updates/1Q-2021 @@ -1,4 +1,3 @@ -move dev-python/faker dev-python/Faker move sci-geosciences/geographiclib sci-geosciences/GeographicLib move x11-libs/kimageannotator media-libs/kimageannotator move x11-libs/kcolorpicker media-libs/kcolorpicker diff --git a/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild b/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild index 633e6491c5..d264df14b6 100644 --- a/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild +++ b/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild @@ -31,7 +31,7 @@ BDEPEND=" RDEPEND=" gui? ( - dev-python/PyQt6[gui,widgets] + dev-python/pyqt6[gui,widgets] dev-python/pyyaml dev-python/argcomplete dev-python/darkdetect