[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-wine/, app-eselect/eselect-wine/files/

[Ionen Wolkens]

commit:     2eb26731f2bb71287138145d5839a81be8fcf6cd
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 23:23:52 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Sep  3 19:46:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb26731

app-eselect/eselect-wine: EAPI6->8, add proton variant

Ideally needs a new release (and repo), but just doing a quick
revbump until that's sorted out.

Also switched SRC_URI to tarball wrt bug #868027, uses compression
and allows both Gentoo and users to have patches by being unpacked
in ${S} (the S= value is not nice, but this likely won't use
bitbucket anymore next release and be irrelevant).

Closes: https://bugs.gentoo.org/868027
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-eselect/eselect-wine/Manifest                  |  1 +
 .../eselect-wine/eselect-wine-1.2.2-r1.ebuild      | 50 ++++++++++++++++++++++
 .../files/eselect-wine-1.2.2-proton.patch          |  8 ++++
 3 files changed, 59 insertions(+)

diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index 8e0dc05f626f..0cff0f3f9795 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1 +1,2 @@
+DIST eselect-wine-1.2.2.tar.gz 4712 BLAKE2B 6ce92654cf2a5197c18bc84f8db52a11f198f81f0a8116f1986e74a1795ad475d22ff5a7cb9e9e31ce8ca813059b33cfbc52763110238cb378b15bebeb4b4271 SHA512 39f4d91461f72aeb07292dc7479c5cb7fc080b843bac57dec85c43d8751227e6953d32d52d4a14387d398b73120a32b79370d686c823f230dfd1d8b32ac8113a
 DIST wine.eselect-1.2.2 19370 BLAKE2B 957eb84b7ccb24d12eba876a538f0420ab05506c87086b65c27326c80da9adcfbff032c7ecc7b5763012c6d72cc53f643f0d3ffe02687adb103517dedfad2f0e SHA512 6380e904ca824b1fe45cf651637f1cfe931f0c7519db49cb0794826ebbc8bdebc480fe7eb16601dc37123b44ea2d10aec49aa9fe622cad3e67ffb0f730292614

diff --git a/app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild b/app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..5b3e569a49d6
--- /dev/null
+++ b/app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Manage active wine version"
+HOMEPAGE="https://bitbucket.org/NP-Hardass/eselect-wine"
+SRC_URI="https://bitbucket.org/NP-Hardass/eselect-wine/get/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/NP-Hardass-eselect-wine-f18b76f9c90c"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	app-admin/eselect
+	dev-util/desktop-file-utils
+	!app-emulation/wine:0"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-proton.patch
+)
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins wine.eselect
+
+	keepdir /etc/eselect/wine
+}
+
+pkg_postinst() {
+	# <eselect-wine-v0.3_rc7 installed symlinks with leading double-slashes.
+	# In /usr/include this breaks gcc build.
+	# https://bugs.gentoo.org/434180
+	if [[ $(readlink "${EROOT}"/usr/include/wine) == //* ]]; then
+		ewarn "Leading double slash in ${EROOT}/usr/include/wine symlink detected."
+		ewarn "Re-setting wine symlinks..."
+		eselect wine update --if-unset
+	fi
+}
+
+pkg_prerm() {
+	# Avoid conflicts with wine[-multislot] installed later
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		elog "${PN} is being uninstalled, removing symlinks"
+		eselect wine unset --all || die
+	else
+		einfo "${PN} is being updated/reinstalled, not modifying symlinks"
+	fi
+}

diff --git a/app-eselect/eselect-wine/files/eselect-wine-1.2.2-proton.patch b/app-eselect/eselect-wine/files/eselect-wine-1.2.2-proton.patch
new file mode 100644
index 000000000000..7adf263b2681
--- /dev/null
+++ b/app-eselect/eselect-wine/files/eselect-wine-1.2.2-proton.patch
@@ -0,0 +1,8 @@
+Temporary patch to add proton variant until a proper release
+to update these.
+--- a/wine.eselect
++++ b/wine.eselect
+@@ -14,2 +14,3 @@
+ 	staging
++	proton
+ 	d3d9