From 01800d17fa0787337ac60d055970ebbb86dfe17a Mon Sep 17 00:00:00 2001 From: Thomas Sachau Date: Sun, 18 Apr 2021 12:50:41 +0200 Subject: sys-apps/abi-wrapper: Update EAPI, drop invalid KEYWORD Package-Manager: Portage-3.0.18, Repoman-3.0.3 Manifest-Sign-Key: 0xC05330B3211CA2D4 Signed-off-by: Thomas Sachau --- sys-apps/abi-wrapper/Manifest | 14 +++---- sys-apps/abi-wrapper/abi-wrapper-1.0-r6.ebuild | 4 +- .../abi-wrapper-2.0_pre20120702-r1.ebuild | 48 ++++++++++++++++++++++ .../abi-wrapper/abi-wrapper-2.0_pre20120702.ebuild | 48 ---------------------- 4 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 sys-apps/abi-wrapper/abi-wrapper-2.0_pre20120702-r1.ebuild delete mode 100644 sys-apps/abi-wrapper/abi-wrapper-2.0_pre20120702.ebuild diff --git a/sys-apps/abi-wrapper/Manifest b/sys-apps/abi-wrapper/Manifest index d54ef4f9b..d51799821 100644 --- a/sys-apps/abi-wrapper/Manifest +++ b/sys-apps/abi-wrapper/Manifest @@ -3,16 +3,16 @@ Hash: SHA256 AUX abi-wrapper 816 BLAKE2B eaa7e7c60ef0d5ef218a71841e80017fd71f494d83a413842cc13b072245fecb2535a8664fa63add52498be76a28c8cb54f6d6a7f57f2cbe0c4eff7053fe7a0a SHA512 e69b4a22b17a0b6cdab3ba8199ab1927c2b61587136a22890fe629a71faf2e43cbc0173d758ad35440af25d5543077d94463bdad0f769eb1997ca537d2d5e2ca DIST abi-wrapper-2.0_pre20120702.tar.bz2 72725 BLAKE2B c8532946dd4693282c1d0f8e141890d2317fe4e93bbb83807e9eb637b1f925d05a5b3ff59621d5e6ee15213ee487035562b61005cd5bc4d3b8bf1afe948b9e07 SHA512 de408ed87ab1602464355b1745eccda67e2a6ac7c9fae426c06d2cb1096267ab80800a1000ee96da4ecc2103a6a96db29701b93de87bcf6b6adef2935e8957a8 -EBUILD abi-wrapper-1.0-r6.ebuild 1196 BLAKE2B 05b5bf2d214b19f08595aa2eb4b0435a69a395be0816647eee79e18c3d78cf6770cce097975f34530f192b0fdd251aa4c7f53282b814b4875e7910c14efcbc90 SHA512 e4dde17d44f8035c1ef59e9d0ce99439117b461ac54441f15b8188d27b905690092e97636b74d36414fb7770941868d6698a19ff70747345ec4024ab53534333 -EBUILD abi-wrapper-2.0_pre20120702.ebuild 1614 BLAKE2B 6dfb14c55b6a60a54b161eb1a9f4406ea9a79afa1161710b53ee07e772877d452022ee318be2ea4b411c20ec2d902716066d555b07ef71a586add0b887dfb0ae SHA512 7a8c5b2a730bc5b790f7d719a8a6eade8962a0ee538f2738591c2fba0c5a013cfbf19e2eac7bda5affa42a3030fabd6b91d0cc51ade2872ebfcfcfef71d35708 +EBUILD abi-wrapper-1.0-r6.ebuild 1192 BLAKE2B 13235ef661a38e03cb7b06e003f49f26785c3c1702829cd784aa75b4e55c480d754f9ea0d36d47fa92699e6c4e1c780a1f9ff117f9e73e3c209845405e26dd2d SHA512 d141f15db08d1756086699f9135ce0baf1551210b2b1413ffa8221bcebe13d09bbf6c315e05ab63fa92912d923bfa646663bf3de0d71c2ee8b3a9f68b1af29f7 +EBUILD abi-wrapper-2.0_pre20120702-r1.ebuild 1570 BLAKE2B 8b86c4e8f72599f92c2ed59dacc66006653bb3373150931a5a14d137a4609bdff6cb349c76440ad4c13a69b102d7f43e00760a71db9f9d41b0b2252bb7603f12 SHA512 38363a79fdb6da795641352f694509093c925413ac30b707744a22b3cd619e8057a03b599bd25c4515d5c66b271fcb27d5c4c0960ff0257a45c03f771a3b29dd MISC metadata.xml 370 BLAKE2B 8e1a3c677bb9ae6841442ffb72e041a59b8abedd5d5b528e69f0ea6c146d4a743d71a51d4496d478b0b0cf535570690631ba8fc9cff9dbffd2d07743564362cf SHA512 e4ba8d48f01c4ee4ac92de8a0b30f76e899f68812aa1791837788b60693e02aafa9b26f4b1896c387776662a11698c29452377e2192c0bf5fbb8b8cf03f448d7 -----BEGIN PGP SIGNATURE----- -iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl5agMhfFIAAAAAALgAo +iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmB8DvZfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ -kGcNxQP/ddZKLOkBL6/Vn0kE7h3VE94dghFHkpGf0sd1H6LftBKENByaLexd6uR2 -Y5sMOA86rKnsVv+68UN8yEVsQYfBxIWeYzcpbeOtqdOv6U2YmJZLAOfTPXEsWrdx -zr+S1nxKcnSFjMbm495lFK0HLQ5xeYeRh+R+GGaKjeCvqazxkrE= -=4HHu +kGeRbgQAqkMWE5chCO8yYO5oX6IqI5az2fYXv9AtcY3n/N5IQXuSTps88a1LbL+5 +Bah1oEsK1xhyg0oJgdBQLRstOvIk6+qg89piXoI6fi+v52zSXwvOv3MsXQE8kFYh +2dTIpw/tfNxTIR/cryg60NruaUtF8/4K5KXWeUYZyilYJNJy3SM= +=9Qcj -----END PGP SIGNATURE----- diff --git a/sys-apps/abi-wrapper/abi-wrapper-1.0-r6.ebuild b/sys-apps/abi-wrapper/abi-wrapper-1.0-r6.ebuild index c722dba71..21753fd5a 100644 --- a/sys-apps/abi-wrapper/abi-wrapper-1.0-r6.ebuild +++ b/sys-apps/abi-wrapper/abi-wrapper-1.0-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=3 @@ -9,7 +9,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="" # nothing to strip diff --git a/sys-apps/abi-wrapper/abi-wrapper-2.0_pre20120702-r1.ebuild b/sys-apps/abi-wrapper/abi-wrapper-2.0_pre20120702-r1.ebuild new file mode 100644 index 000000000..627c6838a --- /dev/null +++ b/sys-apps/abi-wrapper/abi-wrapper-2.0_pre20120702-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib + +DESCRIPTION="Wraps binaries which have implementations for different ABIs" +HOMEPAGE="https://dev.gentoo.org/~binki/abi-wrapper.xhtml https://bitbucket.org/gentoo/abi-wrapper" +SRC_URI="ftp://mirror.ohnopub.net/mirror/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="doc" + +DEPEND="doc? ( app-text/txt2man )" + +src_configure() { + local myeconfargs=( + # Because portage resolves python's sys.executable value by + # reading the symlink repeatedly, portage will end up trying to + # directly execute "abi-wrapper" if abi-wrapper preserves + # argv[0]. Thus blacklist python from argv[0] preservation. + # https://github.com/gentoo/portage/blob/687d7193812e3ebbf2e32f984564381e915f21f9/pym/portage/__init__.py#L392 + # Portage does this because it is afraid that it may leave the + # python symlink in an inconstent state or replace it with an + # incompatible version of python, so portage needs to learn that + # abi-wrapper exists eventually... + MULTILIB_BINARIES_NO_CANONICAL='python*' + + # Ensure that the default ABI is prioritized. + MULTILIB_ABIS="${DEFAULT_ABI} ${MULTILIB_ABIS/${DEFAULT_ABI}}" + + # Support separate /usr. + --bindir="${EPREFIX}"/bin + --libexecdir="${EPREFIX}"/"$(get_libdir)" + ) + use doc || myeconfargs+=(TXT2MAN=false) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + dosym ../../bin/abi-wrapper /usr/bin/abi-wrapper +} diff --git a/sys-apps/abi-wrapper/abi-wrapper-2.0_pre20120702.ebuild b/sys-apps/abi-wrapper/abi-wrapper-2.0_pre20120702.ebuild deleted file mode 100644 index e23a267c1..000000000 --- a/sys-apps/abi-wrapper/abi-wrapper-2.0_pre20120702.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit autotools-utils multilib - -DESCRIPTION="Wraps binaries which have implementations for different ABIs" -HOMEPAGE="https://dev.gentoo.org/~binki/abi-wrapper.xhtml https://bitbucket.org/gentoo/abi-wrapper" -SRC_URI="ftp://mirror.ohnopub.net/mirror/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="doc" - -DEPEND="doc? ( app-text/txt2man )" - -src_configure() { - local myeconfargs=( - # Because portage resolves python's sys.executable value by - # reading the symlink repeatedly, portage will end up trying to - # directly execute "abi-wrapper" if abi-wrapper preserves - # argv[0]. Thus blacklist python from argv[0] preservation. - # https://github.com/gentoo/portage/blob/687d7193812e3ebbf2e32f984564381e915f21f9/pym/portage/__init__.py#L392 - # Portage does this because it is afraid that it may leave the - # python symlink in an inconstent state or replace it with an - # incompatible version of python, so portage needs to learn that - # abi-wrapper exists eventually... - MULTILIB_BINARIES_NO_CANONICAL='python*' - - # Ensure that the default ABI is prioritized. - MULTILIB_ABIS="${DEFAULT_ABI} ${MULTILIB_ABIS/${DEFAULT_ABI}}" - - # Support separate /usr. - --bindir="${EPREFIX}"/bin - --libexecdir="${EPREFIX}"/"$(get_libdir)" - ) - use doc || myeconfargs+=(TXT2MAN=false) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - dosym ../../bin/abi-wrapper /usr/bin/abi-wrapper -} -- cgit v1.2.3-65-gdbad