gentoo auto-resync : 16:11:2022 - 18:55:17

3 files changed, 93 insertions, 3 deletions

diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index ac108f7dbc6f..fa7baa0a7864 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1,4 +1,6 @@
 AUX eselect-wine-1.2.2-proton.patch 160 BLAKE2B 6385b15daf83e1ee1cd8fa3a16fcf075d009f260845333dc16c31022a2f2cb2c529d298ccfd2d258232800586f8855433ee40116bf1af07935c53c7ee32f6521 SHA512 be0a0b3a7da99443a7e7f2ee8f93d90001a45321aaec66ab44eac58fa226eaf9abfd7e250919a48674e3d04f5917c2461f4d94bd53de8f2dd569bb6e25aefdd5
 DIST eselect-wine-1.2.2.tar.gz 4712 BLAKE2B 6ce92654cf2a5197c18bc84f8db52a11f198f81f0a8116f1986e74a1795ad475d22ff5a7cb9e9e31ce8ca813059b33cfbc52763110238cb378b15bebeb4b4271 SHA512 39f4d91461f72aeb07292dc7479c5cb7fc080b843bac57dec85c43d8751227e6953d32d52d4a14387d398b73120a32b79370d686c823f230dfd1d8b32ac8113a
+DIST eselect-wine-2.0.0.tar.xz 7440 BLAKE2B f889465985566c3cdb9035ec1eca79c506a39f6c3f05f7b20e3a2af70ab3202a6efdc2dc28468ee5b484aa037ebf034bf7ae881a5694459f37702291e8c14850 SHA512 7d5bf0d8abb0634adcbdcd1201eb8c69745e419dc484319e6af9446439b9595b00c6d1bb813390179e5e65843ec3a45079dd38ef7d92c1c97f86fd0aca095607
 EBUILD eselect-wine-1.2.2-r1.ebuild 1282 BLAKE2B 3eeba89fe219b352d6b0ce155910aaa4aa36a831e0cb40650c8ffe5b5f26e1cacd3a9661f8c91be7c751e9e76554180eb69d0fd0a176f0a7b251998ecb2f3880 SHA512 13e7d32212515398ac9d00488a10d2b51568135dbb5bcae18c52706a373c08ce5c11196d8703d28ef94e4b74aa1a50d5d758ffb177950de29e5d4a0c59906479
-MISC metadata.xml 352 BLAKE2B f1327231dff33666a1fe443dd26542d9d25a67d47327a0255bf9b34377603583513dbe78e0c270576998b91279fb5f6cfca119cb8c632eaa9fe5f37ca35751b7 SHA512 8f4998376d93ea9705d5c4d36b360d1bf54332a1566fe61c07391f707cc0efc350a33ac91d42a8f8a6534327233c33fc8b8f1ea7142b28eb56b94e5621dc016c
+EBUILD eselect-wine-2.0.0.ebuild 3010 BLAKE2B 0b30d4d3cfd8c472045042223a0d3a1069dd208ad96859335a1c9e5182e36a0667a93472d9e0fda548d852925b40a428ddb1ab5d0ee075201d8576082ed1bd3f SHA512 b6b742adb0eff37506c679d5346938fbbaebe5ab79a0cac191e04f6e8b6ca3b3d7fa5f7a413266111b1b1d1abedc69fa8e674934bd2915f964068810b5b1cf13
+MISC metadata.xml 343 BLAKE2B bc82c6a6549e8fa152586c247467e3f107920426b0be2758ad20ea1da273afd894aa4a9581f7520942092399c62d877117ceefd67b26b8e5778d832241e8a20f SHA512 9c9905ce98e2c43a285b8995d1e16016151416fc622a3f927751207c6820d661ea73a55c812fee6fbf7cd4e474f382f7a3ab277b4f06bb3f2e519bc3b9f876e1
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
new file mode 100644
index 000000000000..50b4a4c56409
--- /dev/null
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Manage active Wine slots and variants"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Wine"
+SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
+#SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2" # not up yet
+
+LICENSE="GPL-2+"
+SLOT="0"
+# rewrite that really needs testing so it doesn't break any bottles
+#KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-admin/eselect"
+
+pkg_pretend() {
+	# not-owned {bin,include}/wine is removed by pkg_preinst's unset, but
+	# portage currently checks collisions and errors out /before/ pkg_preinst
+	has_version '<app-eselect/eselect-wine-2' &&
+		has collision-protect ${FEATURES} &&
+		eerror "!Warning! may need to disable FEATURES=collision-protect to merge ${P}"
+}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins wine.eselect
+
+	keepdir /etc/eselect/wine
+
+	newenvd - 60${PN} <<-EOF
+		PATH="${EPREFIX}/etc/eselect/wine/bin"
+		MANPATH="${EPREFIX}/etc/eselect/wine/share/man"
+		XDG_DATA_DIRS="${EPREFIX}/etc/eselect/wine/share"
+	EOF
+
+	# links for building, e.g. wineasio (bug #657748)
+	dosym -r /etc/eselect/wine/wine /usr/lib/wine
+	dosym -r /etc/eselect/wine/include /usr/include/wine
+
+	# not required, but useful for e.g. binfmt that's not looking in PATH
+	# (not doing this for everything as it gets troublesome to track)
+	dosym -r /etc/eselect/wine/bin/wine /usr/bin/wine
+
+	einstalldocs
+}
+
+pkg_preinst() {
+	if has_version '<app-eselect/eselect-wine-2'; then
+		# keep copy of still-set 'active' to auto-select same slots
+		[[ ! -e ${EROOT}/etc/eselect/wine/active ]] ||
+			cp "${EROOT}"/etc/eselect/wine/{active,eselect-wine-migration} || die
+
+		# managed differently, need cleanup
+		eselect wine unset --all || die
+		rm -f "${EROOT}"/etc/eselect/wine/{active,installed,links/{any,vanilla,staging,proton,wine}} || die
+		rmdir "${EROOT}"/etc/eselect/wine/links 2>/dev/null
+
+		# some rare man dirs were created by old eselect, cleanup if now empty
+		rmdir "${EROOT}"/usr/share/man/{de,fr,pl}.UTF-8{/man1,} 2>/dev/null
+	fi
+
+	# lacking QA_BROKEN_SYMLINK, and rather avoid live /usr changes wrt
+	# bug #632576, nor create "owned" placeholders that will be clobbered
+	[[ -e ${EROOT}/etc/eselect/wine/bin/wine ]] ||
+		eqawarn "QA Note: broken symlinks QA is normal on first merge, targets created after"
+}
+
+pkg_postinst() {
+	eselect wine update --if-unset || die
+
+	rm -f "${EROOT}"/etc/eselect/wine/eselect-wine-migration || die # see preinst
+
+	if [[ ! ${REPLACING_VERSIONS##* } ]] ||
+		ver_test ${REPLACING_VERSIONS##* } -lt 2; then
+		elog
+		if [[ ${REPLACING_VERSIONS} ]]; then
+			elog "Note: if seen bin/wine or include/wine collision messages, it is harmless"
+			elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
+		fi
+		elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells."
+	fi
+}
+
+pkg_prerm() {
+	[[ ${REPLACED_BY_VERSION} ]] || eselect wine update --reset # no die
+}
diff --git a/app-eselect/eselect-wine/metadata.xml b/app-eselect/eselect-wine/metadata.xml
index 280cd5c41bf0..5db33c7f62f9 100644
--- a/app-eselect/eselect-wine/metadata.xml
+++ b/app-eselect/eselect-wine/metadata.xml
@@ -5,8 +5,8 @@
 		<email>wine@gentoo.org</email>
 		<name>Wine</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="bitbucket">np-hardass/eselect-wine</remote-id>
+		<remote-id type="gentoo">proj/eselect-wine</remote-id>
 	</upstream>
-	<stabilize-allarches/>
 </pkgmetadata>