From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1668658-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 3C32F158083
for <garchives@archives.gentoo.org>; Sat, 7 Sep 2024 21:26:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B0F10E2A11;
Sat, 7 Sep 2024 21:26:36 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9B3F2E2A11
for <gentoo-commits@lists.gentoo.org>; Sat, 7 Sep 2024 21:26:36 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 99C5C34305E
for <gentoo-commits@lists.gentoo.org>; Sat, 7 Sep 2024 21:26:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AD33A1D79
for <gentoo-commits@lists.gentoo.org>; Sat, 7 Sep 2024 21:26:33 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1725740744.6976e5a4946297ac297914d2be5e5ae1455a2031.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/winetricks/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/winetricks/winetricks-20240105-r1.ebuild app-emulation/winetricks/winetricks-99999999.ebuild
X-VCS-Directories: app-emulation/winetricks/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 6976e5a4946297ac297914d2be5e5ae1455a2031
X-VCS-Branch: master
Date: Sat, 7 Sep 2024 21:26:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0592195e-b7b5-4d1f-ac59-7a641eefa50d
X-Archives-Hash: 70aee1ef5956e16f8a4b494891215905
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
}