[gentoo-commits] repo/gentoo:master commit in: app-emulation/winetricks/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     6976e5a4946297ac297914d2be5e5ae1455a2031
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  7 16:45:51 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  7 20:25:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6976e5a4

app-emulation/winetricks: Consolidate IUSE gtk,kde -> gui

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...999999.ebuild => winetricks-20240105-r1.ebuild} | 42 +++++++++-------------
 .../winetricks/winetricks-99999999.ebuild          | 40 ++++++++-------------
 2 files changed, 31 insertions(+), 51 deletions(-)

diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-20240105-r1.ebuild
similarity index 69%
copy from app-emulation/winetricks/winetricks-99999999.ebuild
copy to app-emulation/winetricks/winetricks-20240105-r1.ebuild
index 91fa5d31a9b7..b6d5aec199b7 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-20240105-r1.ebuild
@@ -3,30 +3,26 @@
 
 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=""
 else
 	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	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
 }