gentoo auto-resync : 26:09:2024 - 01:25:46

8 files changed, 29 insertions, 112 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index e2139bdc94c8..eae525cd4671 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/gnustep-neos-theme/Manifest b/x11-themes/gnustep-neos-theme/Manifest
index 8e377eb6d080..3c8c89ec52fa 100644
--- a/x11-themes/gnustep-neos-theme/Manifest
+++ b/x11-themes/gnustep-neos-theme/Manifest
@@ -1,3 +1,3 @@
 DIST Neos-0.1.theme.tar.gz 63018 BLAKE2B 3fc90eb3819a80b64b32d9fd30e8f9f2e48c96c7ea03117df81073f85f248790ce0463fe7c8ca23d5a5241b291ad92190632b95d60c33e54576342c156a373b2 SHA512 9c8c404d2a67c77f64dec94b9828ff54e48360357e7dab5d374481a0249998e93a23a32344bf8ebfb9c1a5822c553265903e6c6cb576be3e8123c68b114e2874
-EBUILD gnustep-neos-theme-0.1-r1.ebuild 704 BLAKE2B 6e16d0a44ce61f03100cbb75b299cc4ddf5ccd55998fcfd3068c45152931b263171bc78bda4795dcd3c5acb41f7b16275f9450744f6525aa755e892d4ce5094b SHA512 317a465b1a1ca0fa843b8b222f632a213f0c4fe75a26cfac601c10ff20381157335dabee04d421057e85f489ece12f87e02f759e5707276302a6ec14d091bc9c
+EBUILD gnustep-neos-theme-0.1-r2.ebuild 702 BLAKE2B f4fdd4cd59e80a6e5fc444380ffc145c0eddd0ff46dcbc91ae57a5763fc7899ebaf8cceca8c8bb63394d645fbf4880ba435896c8682a8c69b684a16fc6a0dffe SHA512 37ba46e15b4ec9f60367106e808985250bd1ce01a03b19fa399085734cba4f5f82885772945eb1d7c4587958d9319f488b88fd77332a81991bb4a5bc130bc860
 MISC metadata.xml 638 BLAKE2B 35296e11964476265672d13febebd217cf319413a6f2abf216076bd32fc686a2a801f9068caab3a6dc7a51c5061762f1a7984080e45437d6eaa0a5fc335ed548 SHA512 fa014c58478a0e331934c843287c86e2a89cc254d22edc4a450482e33ff5b51459f0be432abc87b6e8f7cd1369ee2ca4cdffac23bd0d3ac9cddd6997f6390496
diff --git a/x11-themes/gnustep-neos-theme/gnustep-neos-theme-0.1-r1.ebuild b/x11-themes/gnustep-neos-theme/gnustep-neos-theme-0.1-r2.ebuild
index fe713bff6ee8..7f7430ae03d1 100644
--- a/x11-themes/gnustep-neos-theme/gnustep-neos-theme-0.1-r1.ebuild
+++ b/x11-themes/gnustep-neos-theme/gnustep-neos-theme-0.1-r2.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit gnustep-2 vcs-clean
 
 DESCRIPTION="GNUstep theme closely following the original NeXT look and feel"
-HOMEPAGE="http://gap.nongnu.org/themes/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/Neos-${PV}.theme.tar.gz"
+HOMEPAGE="https://gap.nongnu.org/themes/index.html"
+SRC_URI="https://download.savannah.gnu.org/releases/gap/Neos-${PV}.theme.tar.gz"
+S=${WORKDIR}
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}
 
 RESTRICT="binchecks strip"
 
diff --git a/x11-themes/gnustep-silver-theme/Manifest b/x11-themes/gnustep-silver-theme/Manifest
index 198dd1000a88..80a111b54aa8 100644
--- a/x11-themes/gnustep-silver-theme/Manifest
+++ b/x11-themes/gnustep-silver-theme/Manifest
@@ -1,3 +1,3 @@
 DIST Silver.theme-3.1.tar.gz 44371 BLAKE2B 9f7f55262e4d4d64475426cb9daeead392623e5dd9456e042f9add87af15126808738d60b7d4027e1c4a388baf682062c6ed4399111732e0291327c6cce69c96 SHA512 8b62e7d868bfa9b2a871de3688439af7a4d6fce8291ca458e80e8496f5ae6c0f06d693c93149cef61fcff596d34e9e71e919804211ba52f4621ec9deba0bb9e1
-EBUILD gnustep-silver-theme-3.1-r1.ebuild 481 BLAKE2B 0815b3d5bd7b395bef6b02cffd1393ba9cbecefc2503960d5f070f0e0e83f6ce5324f773db3b1fbeba84fcc220b4778ca7847a665eb44de2068a1466cb3df93c SHA512 6fccfdd69c4501f146724a71f99da5fefcf5929f1f7549685cfb7d99548e02056781b69a52d3df182ad7d57d155b2c60504cf9b9e97b8ddaf288623024fb593c
+EBUILD gnustep-silver-theme-3.1-r2.ebuild 483 BLAKE2B 275dd67987a3512ec5251be2ae72e92c2c784d4e5aa5beb85093d22da03d317a0386d76e2f303b6004402eabdf0050cdb888e0aafa23eba379d48a19baf031be SHA512 f3ef5fd78701036ccc71d262218d3d32109a32a91e11a73a28f46ac676ebd9e0fdea5628abd45093c8cb3fcc5a39ed3182ceea60f77c606b19014928e77f87a8
 MISC metadata.xml 489 BLAKE2B db79287615c4cfa8aca8e815aa85a10a57506aa4a0971c767d1371f2df3232d0aef926c6ddd0050737912bcb64f72bd353718e4fd79d003e5287a10bfc65eea6 SHA512 830febb9a26eb882c427f157fc52d60c230ac24913de27ac26f509621950dc634dca7311d87de70a073f36a9dee56caa426d1816c82d4b4b45091ec7324962fe
diff --git a/x11-themes/gnustep-silver-theme/gnustep-silver-theme-3.1-r1.ebuild b/x11-themes/gnustep-silver-theme/gnustep-silver-theme-3.1-r2.ebuild
index 2fd15948d9fc..d70937c1275c 100644
--- a/x11-themes/gnustep-silver-theme/gnustep-silver-theme-3.1-r1.ebuild
+++ b/x11-themes/gnustep-silver-theme/gnustep-silver-theme-3.1-r2.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit gnustep-2
 
 MY_P=Silver.theme-${PV}
-DESCRIPTION="a GNUstep silver theme"
-HOMEPAGE="http://wiki.gnustep.org/index.php/Silver.theme"
+DESCRIPTION="A silver theme for GNUstep"
+HOMEPAGE="https://mediawiki.gnustep.org/index.php/Silver.theme"
 SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
 
 pkg_postinst() {
 	elog "Use gnustep-apps/systempreferences to switch theme"
diff --git a/x11-themes/kvantum/Manifest b/x11-themes/kvantum/Manifest
index ca80c4dd4bb7..b5388c09e215 100644
--- a/x11-themes/kvantum/Manifest
+++ b/x11-themes/kvantum/Manifest
@@ -1,5 +1,3 @@
-DIST kvantum-1.0.10.tar.gz 2969117 BLAKE2B f2e9cc954a3a6cf4cac77d1e0b5a455faf95927cb78101113d99bf9a8e3d1875dff248909c1d95af028d5a369b517ad501e298e2c54fbd785d254afd7e30e465 SHA512 fb31f424a16c37eafaaa0a1cdddde165bcaa58ed6ea3ef76e77d689c2b8b47e516a651d066712eaf14b1344e4b30955ce6c955367caf25d51f2aaa2c8970b0fd
 DIST kvantum-1.1.2.tar.gz 3041246 BLAKE2B 7587adb7858fad2e4e3cf953fd4419d8a518d0e4b641afc426bc0c5417b91ff2d174af9c1e6d198d8eb979130f4704fb475bc0a84766957500e8913b6738706d SHA512 71c714df902ac4d7ac707e26842e2227eb7eeddad03af0bbd1ab1fcfa132204a9dd0453eafac3000cd3187dcb4ff03d64f01674c442f5a225e0c9b3652277f0e
-EBUILD kvantum-1.0.10.ebuild 1457 BLAKE2B a8a084ea322c639af90ddc8c75904882f6459797b05243341394bd8830eb86304b9495721e7bcd1557b3f7c92567d77e0bca293c551b63e333392dbc6fad063d SHA512 45d71e383c13f423510190073686e7f358bf010e2d9054c4c1d505720822bb1ff19c45dad1a3d08794ba51641132e12b7d72458fc603c49d3c8a3a0c9a46727d
-EBUILD kvantum-1.1.2-r1.ebuild 1610 BLAKE2B f4bb4e8f3088dd31cf4b8a352b47b7a2e3880ef3142eac4755fa89b076082def260ccf2c5bb96a2d6176da05f3efc8cff14a7edae77ecc71ded850ea5f0b5836 SHA512 b29cc6fea688b405a358d1e6e20b0dbd374bca8dd3d9174eaeea5cea9494359674d2eba2876164de416a453c23c3716b1888db4bc35a52ffef5ea1c7e44f5056
+EBUILD kvantum-1.1.2-r2.ebuild 1606 BLAKE2B c38d266c0c1cbe28bafb741e5cd3e53eedb8a9e91dfce77917deac27423db3e56f447122b6f250f2a21b17fbdf7234c5042c2b379dea144c75e7860e7cde6a19 SHA512 0f16ea93393411cecba0784cbe897ad360fe7bfe7b5dcab29d9afb7baea5df8bb4834191da7672e36a1993cf2f225da479773fb58723cf712a0e847ea19ba152
 MISC metadata.xml 247 BLAKE2B b22c4c30b10b7beb7b900d4f482453585e8bc75103a149c7deda453b1d489f0551de50822390507e8c01410c9ce42bad906b58ff240531ed0e3cbe85205e8b1d SHA512 f8b54205044777608007ff35f33b9a5383b69c80f580e899401d355bbb98f3c8a7f7c3e315179f7f6a5e77544d49152d3f1109327f1d65207b4e24085a332d29
diff --git a/x11-themes/kvantum/kvantum-1.0.10.ebuild b/x11-themes/kvantum/kvantum-1.0.10.ebuild
deleted file mode 100644
index 9c13749cad81..000000000000
--- a/x11-themes/kvantum/kvantum-1.0.10.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5MIN="5.15.0"
-QT6MIN="6.2.0"
-KF5MIN="5.82.0"
-
-inherit cmake xdg
-
-DESCRIPTION="SVG-based theme engine for Qt5, KDE Plasma and LXQt"
-HOMEPAGE="https://github.com/tsujan/Kvantum"
-SRC_URI="https://github.com/tsujan/${PN^}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN^}-${PV}/${PN^}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="qt6"
-
-RESTRICT="test" # no tests
-
-CDEPEND="
-	>=dev-qt/qtcore-${QT5MIN}:5
-	>=dev-qt/qtgui-${QT5MIN}:5
-	>=dev-qt/qtsvg-${QT5MIN}:5
-	>=dev-qt/qtwidgets-${QT5MIN}:5
-	>=dev-qt/qtx11extras-${QT5MIN}:5
-	>=kde-frameworks/kwindowsystem-${KF5MIN}:5
-	x11-libs/libX11
-	qt6? (
-		>=dev-qt/qtbase-${QT6MIN}:6[gui,widgets]
-		>=dev-qt/qtsvg-${QT6MIN}:6
-	)
-"
-DEPEND="
-	${CDEPEND}
-	x11-base/xorg-proto
-"
-RDEPEND="
-	${CDEPEND}
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	qt6? ( dev-qt/qttools:6[linguist] )
-"
-
-BUILD_DIR_QT6="${S}_qt6"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_QT4=OFF
-		-DENABLE_QT5=ON
-		-DWITHOUT_KF=OFF
-	)
-	cmake_src_configure
-
-	local mycmakeargs=(
-		-DENABLE_QT4=OFF
-		-DENABLE_QT5=OFF
-		-DWITHOUT_KF=ON
-	)
-	use qt6 && BUILD_DIR="${BUILD_DIR_QT6}" cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use qt6 && BUILD_DIR="${BUILD_DIR_QT6}" cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	use qt6 && BUILD_DIR="${BUILD_DIR_QT6}" cmake_src_install
-
-	einstalldocs
-}
diff --git a/x11-themes/kvantum/kvantum-1.1.2-r1.ebuild b/x11-themes/kvantum/kvantum-1.1.2-r2.ebuild
index 613768c26084..3ad29e04cb10 100644
--- a/x11-themes/kvantum/kvantum-1.1.2-r1.ebuild
+++ b/x11-themes/kvantum/kvantum-1.1.2-r2.ebuild
@@ -4,13 +4,11 @@
 EAPI=8
 
 # taken from Kvantum/style/CMakeLists.txt
-QT5MIN="5.15.0"
-QT6MIN="6.2.0"
-KF5MIN="5.82.0"
-
+QTMIN="6.2.0"
+KFMIN="6.0.0"
 inherit cmake multibuild xdg
 
-DESCRIPTION="SVG-based theme engine for Qt5, KDE Plasma and LXQt"
+DESCRIPTION="SVG-based theme engine for Qt, KDE Plasma and LXQt"
 HOMEPAGE="https://github.com/tsujan/Kvantum"
 SRC_URI="https://github.com/tsujan/${PN^}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
 S=${WORKDIR}/${PN^}-${PV}/${PN^}
@@ -18,21 +16,22 @@ S=${WORKDIR}/${PN^}-${PV}/${PN^}
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="kde +qt5"
-REQUIRED_USE="kde? ( qt5 )"
+IUSE="kde qt5"
+
 RESTRICT="test" # no tests
 
 RDEPEND="
-	>=dev-qt/qtbase-${QT6MIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QT6MIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,X]
+	>=dev-qt/qtsvg-${QTMIN}:6
 	x11-libs/libX11
+	kde? ( >=kde-frameworks/kwindowsystem-${KFMIN}:6 )
 	qt5? (
-		>=dev-qt/qtcore-${QT5MIN}:5
-		>=dev-qt/qtgui-${QT5MIN}:5
-		>=dev-qt/qtsvg-${QT5MIN}:5
-		>=dev-qt/qtwidgets-${QT5MIN}:5
-		>=dev-qt/qtx11extras-${QT5MIN}:5
-		kde? ( >=kde-frameworks/kwindowsystem-${KF5MIN}:5 )
+		>=dev-qt/qtcore-5.15.9:5
+		>=dev-qt/qtgui-5.15.9:5
+		>=dev-qt/qtsvg-5.15.9:5
+		>=dev-qt/qtwidgets-5.15.9:5
+		>=dev-qt/qtx11extras-5.15.9:5
+		kde? ( >=kde-frameworks/kwindowsystem-5.115.0:5 )
 	)
 "
 DEPEND="${RDEPEND}
@@ -60,7 +59,7 @@ src_configure() {
 		elif [[ ${MULTIBUILD_VARIANT} = qt6 ]]; then
 			mycmakeargs+=(
 				-DENABLE_QT5=OFF
-				-DWITHOUT_KF=ON
+				-DWITHOUT_KF=$(usex !kde)
 			)
 		fi
 		cmake_src_configure