gentoo auto-resync : 12:10:2022 - 19:40:50

3 files changed, 3 insertions, 53 deletions

diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index aee80055fd66..ac108f7dbc6f 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1,6 +1,4 @@
 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 wine.eselect-1.2.2 19370 BLAKE2B 957eb84b7ccb24d12eba876a538f0420ab05506c87086b65c27326c80da9adcfbff032c7ecc7b5763012c6d72cc53f643f0d3ffe02687adb103517dedfad2f0e SHA512 6380e904ca824b1fe45cf651637f1cfe931f0c7519db49cb0794826ebbc8bdebc480fe7eb16601dc37123b44ea2d10aec49aa9fe622cad3e67ffb0f730292614
-EBUILD eselect-wine-1.2.2-r1.ebuild 1307 BLAKE2B 825c99f1838b3b5adccdd5b32db0a4fd10abea821e7c17b2b2e067638abc0b9701b7403108223aae95eab327adffd9e6c8d58897fca368e923d7a0e0562c03f7 SHA512 677e0e33a38f357a6c2b61ec9f73a90216a39c9ac24f246685944e93d3596c80c42b220bfd40d02396cb650cf18ccb50e927f5b85bccee68c44e02bcb165c73e
-EBUILD eselect-wine-1.2.2.ebuild 1271 BLAKE2B 18abe8ac6ec8844aaa55960702833da507fe8f7a5ec74c197520aed6d14eb5e9be5dcfcc4417cc372dd13dd79483ecfd026f4935c1608a76bc8307e3856af81e SHA512 2846fa7e5641ed5585f591335e526f9eb698f97349631afae18dcfc783641ed0f9708346241c0aff5419898de672133454183b05a4154e29ccc0e50b08fa93c5
+EBUILD eselect-wine-1.2.2-r1.ebuild 1282 BLAKE2B 3eeba89fe219b352d6b0ce155910aaa4aa36a831e0cb40650c8ffe5b5f26e1cacd3a9661f8c91be7c751e9e76554180eb69d0fd0a176f0a7b251998ecb2f3880 SHA512 13e7d32212515398ac9d00488a10d2b51568135dbb5bcae18c52706a373c08ce5c11196d8703d28ef94e4b74aa1a50d5d758ffb177950de29e5d4a0c59906479
 MISC metadata.xml 352 BLAKE2B f1327231dff33666a1fe443dd26542d9d25a67d47327a0255bf9b34377603583513dbe78e0c270576998b91279fb5f6cfca119cb8c632eaa9fe5f37ca35751b7 SHA512 8f4998376d93ea9705d5c4d36b360d1bf54332a1566fe61c07391f707cc0efc350a33ac91d42a8f8a6534327233c33fc8b8f1ea7142b28eb56b94e5621dc016c
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
index 5b3e569a49d6..7a4d765fd1c1 100644
--- a/app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-1.2.2-r1.ebuild
@@ -10,12 +10,11 @@ S="${WORKDIR}/NP-Hardass-eselect-wine-f18b76f9c90c"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="
 	app-admin/eselect
-	dev-util/desktop-file-utils
-	!app-emulation/wine:0"
+	dev-util/desktop-file-utils"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-proton.patch
diff --git a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
deleted file mode 100644
index b38ee9c21af7..000000000000
--- a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Manage active wine version"
-HOMEPAGE="https://bitbucket.org/NP-Hardass/eselect-wine"
-SRC_URI="https://bitbucket.org/NP-Hardass/${PN}/raw/v${PV}/wine.eselect -> wine.eselect-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="app-admin/eselect
-	dev-util/desktop-file-utils
-	!!app-emulation/wine:0"
-
-S=${WORKDIR}
-
-src_install() {
-	keepdir /etc/eselect/wine
-
-	insinto /usr/share/eselect/modules
-	newins "${DISTDIR}"/wine.eselect-${PV} wine.eselect
-}
-
-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 ${EPREFIX}/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
-}