diff options
Diffstat (limited to 'app-eselect')
| -rw-r--r-- | app-eselect/Manifest.gz | bin | 6716 -> 6717 bytes | |||
| -rw-r--r-- | app-eselect/eselect-wine/Manifest | 4 | ||||
| -rw-r--r-- | app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild | 92 | ||||
| -rw-r--r-- | app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild | 2 |
4 files changed, 2 insertions, 96 deletions
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz Binary files differindex da525e3414df..220afd07d2e5 100644 --- a/app-eselect/Manifest.gz +++ b/app-eselect/Manifest.gz diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest index bb3c0dfa90ad..034cb01ac119 100644 --- a/app-eselect/eselect-wine/Manifest +++ b/app-eselect/eselect-wine/Manifest @@ -1,8 +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.bz2 7336 BLAKE2B facbad9bb4a937a310b1f81c5eb9fd1e29ce1a04cf524f7fd1f6322715d15e639fa27e99220cfc5b3659932d5ee57864a4615523e2dc5142da8ad7e9b49290fc SHA512 ec89b4b2fb3bf60e00983f7dd2c2aaa4c797005516f03573000482c5efa1f62e73d0bc149bb9203c5186a7a0a259d7461e95f077deadfd6791ea8d5bc5cb3c00 DIST eselect-wine-2.0.1.tar.bz2 7391 BLAKE2B 646b4f07988448c70d2bdb0057b4b5e4a36fbd8f6dd1475cb131c26b4d10afb1a274c53aba0f705497f840f45b53fda4307882c588b69bcf5e8754ad153ea4de SHA512 a90da162bfd80a9f2f9a688e765152e1b03f5d27742f67a8485546cb663547f2f6eea302e857454e3cf00632967b8d83e9578f6be36171178f7e78aa3adf3838 EBUILD eselect-wine-1.2.2-r1.ebuild 1282 BLAKE2B 3eeba89fe219b352d6b0ce155910aaa4aa36a831e0cb40650c8ffe5b5f26e1cacd3a9661f8c91be7c751e9e76554180eb69d0fd0a176f0a7b251998ecb2f3880 SHA512 13e7d32212515398ac9d00488a10d2b51568135dbb5bcae18c52706a373c08ce5c11196d8703d28ef94e4b74aa1a50d5d758ffb177950de29e5d4a0c59906479 -EBUILD eselect-wine-2.0.0.ebuild 3074 BLAKE2B 1c7d24298d6eb8d87940237ae6c9a459cb659c38307c99bd8cd89e2463cd91aa5c7e4f7c189e9e8a2215b9794093886b698bd21fd8c2387f0c05fe1c7fc877c7 SHA512 35c08260c377a5e976e0c8cff9e3255643b9cbd2b406f22b0fb1e3851e7bc49034b6de9a1ace05a66a9cffac1a72eb3c8ca52a64ea41529c70a1fe16e407fb76 -EBUILD eselect-wine-2.0.1.ebuild 3074 BLAKE2B 1c7d24298d6eb8d87940237ae6c9a459cb659c38307c99bd8cd89e2463cd91aa5c7e4f7c189e9e8a2215b9794093886b698bd21fd8c2387f0c05fe1c7fc877c7 SHA512 35c08260c377a5e976e0c8cff9e3255643b9cbd2b406f22b0fb1e3851e7bc49034b6de9a1ace05a66a9cffac1a72eb3c8ca52a64ea41529c70a1fe16e407fb76 +EBUILD eselect-wine-2.0.1.ebuild 3072 BLAKE2B 23025fd7aba36ffdbc57966f00c095d0d3d4c73a69945ab6a961d7b83dc46b49f87df9de720afa5f0901d71f5aaa9fde0b36193458600b48dd20942746e0b32a SHA512 14a5ad5ec2d612a98da8b7dbe93e3f8121d3451ec9532283489f498d6d8a773e0ea07f69d97130a00e4f0aad4281c2eb53dbbc432b1d7fed39595cde87661ad1 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 deleted file mode 100644 index 92c25353de07..000000000000 --- a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# 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://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="app-admin/eselect" - -pkg_pretend() { - # /usr/bin/wine and /usr/include/wine are removed by pkg_preinst's unset, - # but portage currently checks collisions and errors out /before/ preinst - if has_version '<app-eselect/eselect-wine-2' && - has collision-protect ${FEATURES} - then - eerror - eerror "!Warning! will likely need to either disable FEATURES=collision-protect or" - eerror "delete ${EROOT}/usr/bin/wine and ${EROOT}/usr/include/wine to merge ${P}" - eerror "(these files should be orphaned, so default FEATURES=protect-owned is fine)" - eerror - fi -} - -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 "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)." - elog "Note: if seen bin/wine or include/wine merge collisions, they are harmless." - 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/eselect-wine-2.0.1.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild index 92c25353de07..8a665f8d91e8 100644 --- a/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild +++ b/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND="app-admin/eselect" |