[gentoo-commits] proj/eselect-wine:master commit in: /

[gentoo-commits] proj/eselect-wine:master commit in: /

[Ionen Wolkens]

commit:     4f225953bf397136c27786c17f39255cb9a6b81d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 21:08:11 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 21:11:33 2022 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-wine.git/commit/?id=4f225953

wine.eselect: adjust legacy check for 17.0 lib32/lib64 profile

Should have hardly any users left, but no real harm in adding
more legacy handling in the legacy checks function.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 wine.eselect | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/wine.eselect b/wine.eselect
index 42c6bac..720c24d 100644
--- a/wine.eselect
+++ b/wine.eselect
@@ -336,10 +336,13 @@ wine-legacy_checks() {
 		return 1
 	fi
 
-	if [[ -d ${WINEREL}/usr/lib64/${slot} ]]; then
+	# older wine ebuilds split between lib{,32} and lib64, this is unsupported
+	if [[ -d ${WINEREL}/usr/lib64/${slot} ]] &&
+		[[ ! -L ${WINEREL}/usr/lib || -d ${WINEREL}/usr/lib32/${slot} ]]
+	then
 		write_warning_msg "ignored legacy installation at ${EROOT}/usr/lib64/${slot}"
 		[[ -e ${WINEREL}/usr/bin/${slot} ]] &&
-			write_warning_msg "should still be usable by calling versioned ${EROOT}/usr/bin/${slot}"
+			write_warning_msg "-> should still be usable by calling the versioned ${EROOT}/usr/bin/${slot}"
 		return 1
 	fi
 }

[gentoo-commits] proj/eselect-wine:master commit in: /

[Ionen Wolkens]

commit:     32edf82b8945ed7facb1b2059340614a716ffa8c
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 00:23:20 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 00:23:20 2022 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-wine.git/commit/?id=32edf82b

v2.0.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 wine.eselect | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wine.eselect b/wine.eselect
index 720c24d..ff81c3d 100644
--- a/wine.eselect
+++ b/wine.eselect
@@ -4,7 +4,7 @@
 
 DESCRIPTION="Manage active Wine slots and variants"
 MAINTAINER="wine@gentoo.org"
-VERSION="2.0.0"
+VERSION="2.0.1"
 
 # Setup env and run $@ in ${EROOT}${WINEETC} to simplify path
 # handling (all other wine-* functions must be ran from this).

[gentoo-commits] proj/eselect-wine:master commit in: /

[Ionen Wolkens]

commit:     e2cd65c2a105013b47579fc9109122d3ef7c9ea1
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  5 20:29:53 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Dec  5 20:42:09 2022 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-wine.git/commit/?id=e2cd65c2

v2.0.2

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 wine.eselect | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wine.eselect b/wine.eselect
index db1d7ae..46610ea 100644
--- a/wine.eselect
+++ b/wine.eselect
@@ -4,7 +4,7 @@
 
 DESCRIPTION="Manage active Wine slots and variants"
 MAINTAINER="wine@gentoo.org"
-VERSION="2.0.1"
+VERSION="2.0.2"
 
 # Setup env and run $@ in ${EROOT}${WINEETC} to simplify path
 # handling (all other wine-* functions must be ran from this).

[gentoo-commits] proj/eselect-wine:master commit in: /

[Ionen Wolkens]

commit:     41df717a7240eb8ff29c629331e4269cec36ee54
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  5 20:29:21 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Dec  5 20:41:30 2022 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-wine.git/commit/?id=41df717a

wine.eselect: silence PATH warning with doas/sudo

By default may still be noisy with shadow's su, but
util-linux's is more likely to keep wine's PATH.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 wine.eselect | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/wine.eselect b/wine.eselect
index ff81c3d..db1d7ae 100644
--- a/wine.eselect
+++ b/wine.eselect
@@ -28,9 +28,11 @@ wine-run() {
 
 	"${@}"
 
-	# hack wrt update given PATH is not updated in pkg_postinst (noisy)
-	[[ ${PATH} == @(|*:)"${EPREFIX}${WINEETC}/bin"*(/)@(|:*) || \
-		${1} == wine-update ]] ||
+	# try to warn about about missing PATH, but stay quiet with doas/sudo
+	# given may be using a temporary secure PATH (also skip with update
+	# given PATH is not updated when ran from ebuilds in pkg_postinst)
+	[[ ${PATH} == @(|*:)"${EPREFIX}${WINEETC}/bin"*(/)@(|:*) ||
+		-v DOAS_USER || -v SUDO_USER || ${1} == wine-update ]] ||
 		write_warning_msg "'${EPREFIX}${WINEETC}/bin' missing from PATH, may need to run '. ${EROOT}/etc/profile'"
 
 	${shopt_reset}

[gentoo-commits] proj/eselect-wine:master commit in: /

[Ionen Wolkens]

commit:     01585f91d19a9979e564ecb66bc108bc16da76f6
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 01:22:10 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 01:27:17 2023 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-wine.git/commit/?id=01585f91

wine.eselect: adjust portage PATH comment

Gave this another look given PATH handling changes in >=portage-3.0.44,
and the workaround is "nearly" unnecessary now but still triggers
(at least) on first merge of eselect-wine while PATH has not yet been
updated once yet.

May possibly be other cases where it's noisy, so decided to leave it
alone beside a minor comment update.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 wine.eselect | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wine.eselect b/wine.eselect
index 46610ea..e8ce744 100644
--- a/wine.eselect
+++ b/wine.eselect
@@ -30,7 +30,7 @@ wine-run() {
 
 	# try to warn about about missing PATH, but stay quiet with doas/sudo
 	# given may be using a temporary secure PATH (also skip with update
-	# given PATH is not updated when ran from ebuilds in pkg_postinst)
+	# as the PATH may not always be updated in ebuild phases yet)
 	[[ ${PATH} == @(|*:)"${EPREFIX}${WINEETC}/bin"*(/)@(|:*) ||
 		-v DOAS_USER || -v SUDO_USER || ${1} == wine-update ]] ||
 		write_warning_msg "'${EPREFIX}${WINEETC}/bin' missing from PATH, may need to run '. ${EROOT}/etc/profile'"

[gentoo-commits] proj/eselect-wine:master commit in: /

[Ionen Wolkens]

commit:     51fcd23de011a0f5daa9fb68b3f1a57225e26f47
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 15:13:05 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 15:13:56 2024 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-wine.git/commit/?id=51fcd23d

README.rst: note that variant names should not have hyphens

*Could* be supported but understanding -<version> with an arbitrary
amount of leading hyphens feels like an unnecessary complexification.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 README.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index ef069d2..1b32c60 100644
--- a/README.rst
+++ b/README.rst
@@ -46,4 +46,5 @@ In ebuilds, note ``(de)register`` or using ``pkg_prerm`` is deprecated, use::
         eselect wine update --if-unset || die
     }
 
-Any arbitrary ``wine-myvariant`` is supported for custom ebuilds.
+Any arbitrary ``wine-myvariant`` is supported for custom ebuilds, except that
+the variant name should not contain hyphens (``-``).

[gentoo-commits] proj/eselect-wine:master commit in: /

[Ionen Wolkens]

commit:     3642ed3997a16330dc1c861d354b7fb5f8941771
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 17:18:38 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 17:24:45 2025 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-wine.git/commit/?id=3642ed39

wine.eselect: update postrm migration example

The package manager spec (at least for current EAPI=8) does not
guarantee that IDEPEND will be available in pre/postrm.

Updating for what it's worth anyway, not overly important (aka not
worth a release) given dying in "post"rm is not much of an issue
compared to "pre"rm. The latter aborts removal, while the former
is just noisy on failure. Odds are nobody is seeing this message
anymore too unless trying to use very outdated broken ebuilds.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 wine.eselect | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wine.eselect b/wine.eselect
index e8ce744..bb5d4c9 100644
--- a/wine.eselect
+++ b/wine.eselect
@@ -374,7 +374,9 @@ do_register() {
 		eselect wine update --if-unset || die
 	}
 	pkg_postrm() { # /not/ prerm
-		eselect wine update --if-unset || die
+		if has_version -b app-eselect/eselect-wine; then
+			eselect wine update --if-unset || die
+		fi
 	}
 ' >&2
 }