gentoo auto-resync : 08:09:2024 - 12:29:27

7 files changed, 41 insertions, 69 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index cc1a3e414437..cc6645dfdb96 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index dbd014ea8a5d..4f4b40e21207 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,5 +1,5 @@
 DIST protontricks-1.10.5.tar.gz 163931 BLAKE2B 299fd6c77460de3d2fa1b585a1ad3dae857e4b78898c753007b358cc25b82918d33cb31c2028a4b1b562ee6c20b95ebafc532d97e2bc1fa5358464c6a4c1da5c SHA512 305b27ceaf428946a0ed09994173c861da1097c0bd21eebcc8b255bed3c4c50a920f0cc422601fbd44e0af373b71e928096fdd6f4cc2aa05c88126212fb4401f
 DIST protontricks-1.11.1.tar.gz 166843 BLAKE2B af6692b081d1d819bef39fd69c2108454b6dfcc29b004415a73aa0c0463e3887ddffe0e10864799f665f81fc90e5365accab1722af046f50a08bb7ba221f7e23 SHA512 eb0233180ba41c91ba78072ea2aabe9e8fea5b452fba0fd56aaf17e0282b0ee04e81d3665a7be546e3112382e0b574bb077af6b6be6ad2156dabc3112a1b831b
-EBUILD protontricks-1.10.5.ebuild 1392 BLAKE2B bcaa22442f44e84ff0fb0117aaf5435041df7d16238e41fd10619e980b7ce2f69bc92cecb4c083d9f127c93894197b39d0a295e410a20af5e483cf353164d382 SHA512 11a9db15347e952a110a90ccb4bb9de3bb9421d53abff6dfe4840d6aad65169a8728b6186f1d9405af24d503686d98c6c9f37537147ca73ad5741815093e441d
-EBUILD protontricks-1.11.1.ebuild 1393 BLAKE2B dba61e45813b3d7cbe12827f20ffcb953eb08a1bc2cd100b7b3d76466ae61d7d1f5aa015b747b0f5204480e99cea007cc135136c23655742eb37f51e9e7f7152 SHA512 85f87a608fb02f1277775aa9ed65906e339b3f65e29eb76c8d4951bb8189db260944c618050d7cf0b2376701a25e1d5342c6ddcb5ff5699eab74fc72f3a4dd9c
+EBUILD protontricks-1.10.5-r1.ebuild 1322 BLAKE2B 269c029122fae2822c7032c8b1fecd2ef6d64530ef24a8551c6a137f4e23c9e0b1c897b8c509281dc70fc88d1065f8805b3b4f479b57f067f954d36894d2f12b SHA512 08a62a4e1f0f9a7bd5b2f0c45c5c4df53844f46ee0b62027e863aa83a7f72c53d4aa4ce11f0a5b8eee9b72e966d5fff04a896656cf5001d6bfeba85602cbb094
+EBUILD protontricks-1.11.1-r1.ebuild 1323 BLAKE2B 089d58a31775fd4655d27bdf5e5bfcb2cf51a4ac1b904e7eb915029e59d53553ac22d3472b1b81fd0e2c40b0503bac73134ed6d66ecca56fd08dbdb0acb48d31 SHA512 96333354d2c87d17b2a8bbd76a4c43f1988aee5a6ac7767be0e9b10c85356833942291dcb56ccf22335a13b6dee00d1dc5d8dd330f3d1e22ae0e6ce17f7c14f8
 MISC metadata.xml 731 BLAKE2B 94233c1887f7210a93f4617c6ae3dbe1c7ffc5e9350767eca39e53844edfb4327f15572f154430f31a02e17f0378808b1b62ea684c5a0ad811477470305c3431 SHA512 5aac9d5f84078aed367ec009b1d9201fb5fda5a1d441117675c79df0d0b2f4cf130356aade083563e5eb5157662eaa26ba9a6b5b16352f7eccecb132cf541591
diff --git a/app-emulation/protontricks/protontricks-1.10.5.ebuild b/app-emulation/protontricks/protontricks-1.10.5-r1.ebuild
index 4c4ddf7953ad..70c4324ac6e7 100644
--- a/app-emulation/protontricks/protontricks-1.10.5.ebuild
+++ b/app-emulation/protontricks/protontricks-1.10.5-r1.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
@@ -17,18 +17,14 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="+gui"
 
-RDEPEND="app-emulation/winetricks
+RDEPEND="
+	app-emulation/winetricks[gui?]
 	$(python_gen_cond_dep '
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/vdf[${PYTHON_USEDEP}]
 	')
-	gui? ( gnome-extra/zenity
-		|| (
-			app-emulation/winetricks[gtk]
-			app-emulation/winetricks[kde]
-		)
-	)"
+	gui? ( gnome-extra/zenity )"
 BDEPEND="$(python_gen_cond_dep '
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 ')"
diff --git a/app-emulation/protontricks/protontricks-1.11.1.ebuild b/app-emulation/protontricks/protontricks-1.11.1-r1.ebuild
index fc9689a51050..f936c815408b 100644
--- a/app-emulation/protontricks/protontricks-1.11.1.ebuild
+++ b/app-emulation/protontricks/protontricks-1.11.1-r1.ebuild
@@ -17,18 +17,14 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+gui"
 
-RDEPEND="app-emulation/winetricks
+RDEPEND="
+	app-emulation/winetricks[gui?]
 	$(python_gen_cond_dep '
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/vdf[${PYTHON_USEDEP}]
 	')
-	gui? ( gnome-extra/zenity
-		|| (
-			app-emulation/winetricks[gtk]
-			app-emulation/winetricks[kde]
-		)
-	)"
+	gui? ( gnome-extra/zenity )"
 BDEPEND="$(python_gen_cond_dep '
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 ')"
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 06724166aa0c..3f3b9893e1ad 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,5 +1,5 @@
 DIST winetricks-20240105.tar.gz 675763 BLAKE2B 0ca29d06ae35c95027ead0da2fa26b2950b4b4d495b61c972b9f93ae26fcadc7891931224bc2a8776e06f8bf2816e2fd5b84a0ef342de296aae20129dd5480b0 SHA512 254b505e1175477df3a27b361f227a02a2346a1b7ace255b6170e8bd463883dda8fef9fcbf2cd54606d69742fd6236f9aa58f589e2a34eb66bd04dfaa7bd6799
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
-EBUILD winetricks-20240105.ebuild 1995 BLAKE2B c8292c5eb0afc946b1bc32e6eb68a6c257fb56684ccb818737f5572beb16b3b0fe3f19928df5df033f6766481a3f073d9acc4c64c798d08222ed0802f3cfb441 SHA512 ffb6ec464fae417a64bed53c4ae146597c523fde898be22fc19dfe5eb79c234d82c68ddd47ad904c2b340ccd178950492c8190f055d0a5f97289e54bdf8179ca
-EBUILD winetricks-99999999.ebuild 1997 BLAKE2B 61c5281bcc5ed2115305a84c531126bb77a5dd2a4bc683cb12d656bc438c7f784a5578f498ef94fd4b8d9867f2b64543891743b6e9a1d6e729f117ce398d9286 SHA512 ffada1da81eb1980939716f0a98eaac95398b07854d247c7379280abee67eb91ec5c866b3d1912ff21bc520df91fb910cf170e265ccda0aef13b7f701c72b019
+EBUILD winetricks-20240105-r1.ebuild 1787 BLAKE2B bf3b468815fb0b2c6a4e5cda9ef1ad9093721525f2ebf55d283a971bc29cad997ad6a25940b5e371204fceeeb317ffb4238da139c5b2b643f781df3583457609 SHA512 c3cfd4aeb76a5c776ee8e42cf8810676de5091b8bef3a001cf9794d23e076d3cbaa861163690935e2f8d18e5d6714c0573775862b2667d68efe5b1be7e39c81c
+EBUILD winetricks-99999999.ebuild 1789 BLAKE2B f21bff305a40a6ac8163ea64f642414aa642d3a4b3ffa3c94b1b3dc1888371e04c45b042031f3ca61880ee32a97ab26247943547e2b4d83f0f77fee7bf372435 SHA512 f780ad1fad6d26deaf466de65190b775876026fb6974637c1b88d534e77faea5a112b8e5a73cf9387109b16f1ad1d59a5b8efef04c5785208c2efcad0f8878c5
 MISC metadata.xml 606 BLAKE2B b95580dca1dd182aacfb7108df0aa37ae546fc55109b34f9b3269d6285a3a36189cf53d35bcddbd6990fee4e27932214ae449c5640b3798953877c315c7996cc SHA512 c48f73e663174455324621d64b0402798b32050746a658b0e73b93f12c49221570a91deec90f9e69287f72f3b777c298c383524db1c4588d4a1745042d7fe95b
diff --git a/app-emulation/winetricks/winetricks-20240105.ebuild b/app-emulation/winetricks/winetricks-20240105-r1.ebuild
index c478f02e2cd3..b6d5aec199b7 100644
--- a/app-emulation/winetricks/winetricks-20240105.ebuild
+++ b/app-emulation/winetricks/winetricks-20240105-r1.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=8
 
+WTG="winetricks-gentoo-2012.11.24"
 inherit xdg
 
-if [[ ${PV} == "99999999" ]] ; then
+if [[ ${PV} == *99999999* ]] ; then
 	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
@@ -14,19 +15,14 @@ else
 	KEYWORDS="amd64 x86"
 fi
 
-wtg="winetricks-gentoo-2012.11.24"
-
-SRC_URI="${SRC_URI}
-	gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
-	kde? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
-"
+SRC_URI+=" gui? ( https://dev.gentoo.org/~chiitoo/distfiles/${WTG}.tar.bz2 )"
 
 DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
 HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="gtk kde rar test"
+IUSE="gui rar test"
 RESTRICT="!test? ( test )"
 
 # dev-util/shellcheck is not available for x86
@@ -42,16 +38,17 @@ BDEPEND="
 		)
 	)
 "
-DEPEND=""
-RDEPEND="${DEPEND}
+RDEPEND="
 	app-arch/cabextract
 	app-arch/p7zip
 	app-arch/unzip
 	net-misc/wget
 	virtual/wine
 	x11-misc/xdg-utils
-	gtk? ( gnome-extra/zenity )
-	kde? ( kde-apps/kdialog )
+	gui? ( || (
+		gnome-extra/zenity
+		kde-apps/kdialog:*
+	) )
 	rar? ( app-arch/unrar )
 "
 
@@ -65,16 +62,10 @@ RDEPEND="${DEPEND}
 QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
 
 src_unpack() {
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-
-		if use gtk || use kde; then
-			unpack ${wtg}.tar.bz2
-		fi
-
-	else
-		default
-	fi
+	case ${PV} in
+		*99999999*) git-r3_src_unpack ;&
+		*) default ;;
+	esac
 }
 
 src_test() {
@@ -84,8 +75,7 @@ src_test() {
 src_install() {
 	default
 
-	if ! use gtk && ! use kde; then
-		rm -r "${ED}"/usr/share/applications || die
-		rm -r "${ED}"/usr/share/icons || die
+	if ! use gui; then
+		rm -r "${ED}"/usr/share/{applications,icons} || die
 	fi
 }
diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild
index 91fa5d31a9b7..1a7b9025d53b 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=8
 
+WTG="winetricks-gentoo-2012.11.24"
 inherit xdg
 
-if [[ ${PV} == "99999999" ]] ; then
+if [[ ${PV} == *99999999* ]] ; then
 	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
@@ -14,19 +15,14 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-wtg="winetricks-gentoo-2012.11.24"
-
-SRC_URI="${SRC_URI}
-	gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
-	kde? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
-"
+SRC_URI+=" gui? ( https://dev.gentoo.org/~chiitoo/distfiles/${WTG}.tar.bz2 )"
 
 DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
 HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="gtk kde rar test"
+IUSE="gui rar test"
 RESTRICT="!test? ( test )"
 
 # dev-util/shellcheck is not available for x86
@@ -42,16 +38,17 @@ BDEPEND="
 		)
 	)
 "
-DEPEND=""
-RDEPEND="${DEPEND}
+RDEPEND="
 	app-arch/cabextract
 	app-arch/p7zip
 	app-arch/unzip
 	net-misc/wget
 	virtual/wine
 	x11-misc/xdg-utils
-	gtk? ( gnome-extra/zenity )
-	kde? ( kde-apps/kdialog )
+	gui? ( || (
+		gnome-extra/zenity
+		kde-apps/kdialog:*
+	) )
 	rar? ( app-arch/unrar )
 "
 
@@ -65,16 +62,10 @@ RDEPEND="${DEPEND}
 QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
 
 src_unpack() {
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-
-		if use gtk || use kde; then
-			unpack ${wtg}.tar.bz2
-		fi
-
-	else
-		default
-	fi
+	case ${PV} in
+		*99999999*) git-r3_src_unpack ;&
+		*) default ;;
+	esac
 }
 
 src_test() {
@@ -84,8 +75,7 @@ src_test() {
 src_install() {
 	default
 
-	if ! use gtk && ! use kde; then
-		rm -r "${ED}"/usr/share/applications || die
-		rm -r "${ED}"/usr/share/icons || die
+	if ! use gui; then
+		rm -r "${ED}"/usr/share/{applications,icons} || die
 	fi
 }