[gentoo-commits] proj/multilib-portage:master commit in: sys-apps/abi-wrapper/

["Nathan Phillip Brink" <binki@gentoo.org>]

commit:     727732911a27bba220b460ebc9fc68dce77df4ff
Author:     Nathan Phillip Brink <binki <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  1 19:10:56 2012 +0000
Commit:     Nathan Phillip Brink <binki <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 19:10:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=72773291

sys-apps/abi-wrapper: Add abi-wrapper-2.0_pre20120701, a native reimplementation of abi-wrapper which supports preserving argv[0] (for multicall binaries)

(Portage version: 2.2.0_alpha110-r1/git/Linux x86_64, signed Manifest commit with key 6BA81050)

---
 sys-apps/abi-wrapper/Manifest                      |   29 ++++++-----
 .../abi-wrapper/abi-wrapper-2.0_pre20120701.ebuild |   49 ++++++++++++++++++++
 2 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/sys-apps/abi-wrapper/Manifest b/sys-apps/abi-wrapper/Manifest
index 5f11476..e68ebb0 100644
--- a/sys-apps/abi-wrapper/Manifest
+++ b/sys-apps/abi-wrapper/Manifest
@@ -2,22 +2,25 @@
 Hash: SHA512
 
 AUX abi-wrapper 816 RMD160 3ec7cbf3a8ea0a00dbc0c154d06384a641b0c822 SHA1 7b037ba8696d8bbb976ec7aa236f8c3aad6dddbb SHA256 8c307880e0811b85c9d9c9b0b74fb54e1885e5380c7986e7b0576bf285488509
+DIST abi-wrapper 5167 RMD160 473d06fe033ec41a7326d62f68ddce10d01e11d5 SHA1 d0b54ed10b66aef1c1847a673ba974c5e889f824 SHA256 059f9771cf7627c6673d530e7f3fed2faac35828fcb9dfa66c314925e59b7978
+DIST abi-wrapper-2.0_pre20120701.tar.bz2 72703 RMD160 8d1de853dc9a94f6f72a523b8e98e8e74eb114a1 SHA1 07fdcc0520b28ed11ea2c1936ab871005069daa4 SHA256 d6632e61043a796790bb425f8874843cf4d66cb052594b2c7e92f7991902ff2b
 EBUILD abi-wrapper-1.0-r6.ebuild 1226 RMD160 6184447183d175455895e3ba9795b190f92ead62 SHA1 16150b25f14db8de3521ffa07b54ca469576af3d SHA256 4b940e60fd3746e535d8249a8f650e7151f7e38cb40abc9f05976860fc726050
+EBUILD abi-wrapper-2.0_pre20120701.ebuild 1721 RMD160 9cf36a8d899728f091bb85ceb0be9949ad3121b7 SHA1 6d40d054d60005ca96354b7d88a34f59d876998b SHA256 4aae6233e60243f409c94b47597a03428c1a03f6f9a84b9652340cb8dcc501fa
 MISC metadata.xml 342 RMD160 834225944e91651c3f0ad0a26195bc246c5bf1e8 SHA1 9ee4fd9405d63a5d1328f5b1267394c69ce411fb SHA256 f286fcd07a67ac1931037f7f8859fe5639764ea32e3e7c093f98a209a65522ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPbjpyAAoJEHQ6UuhrqBBQOJYP/0EDtyleMzzHvnXz1qFeR8/z
-s447ZROZ1cnE6b0uKd4Oc3hbV/k7+bS4fBgeRPJblMs9IOC4TnwSlF9XhZlx84OO
-rD1byh+/f3AVtsrbY9IACQJjuk2IBvxqHKJbw3WdczS0q+uESbdENL2jYFI+cmMO
-xB+X0r2j5pt+yKw9GmVoSSkE8srgv2AYhTS0l2LKa0R/Gz41npB9qL/sMd/u4Zrp
-7dqm1ZUNP4+UhB4YTLFlPDBAoLNqzEwQs78x/fulHy+RoLeQVPl0MBln2PEKN0dx
-s8JK1jlPD+8PQPRau1KoGxDAOsuVIwgvB2+yeRh/Of1Ng0dOJL4CU+9egY0as7+f
-T72ZgnwMqRh6MD8fi8mF1+tZlBj9kUQAB3na/vlUzMHQ+6mzkyFh6EXhpX/MsfV/
-nGrFiRPNmnzvMI4MwYELndXPv9EguBlQf2n1fnOOafTFZVODkvCv6CAiap6B84tg
-8vNQdXBiGgGxPNnuqCHLymMHAxWhxlmfhcAS1aYy7uKiFl4u8a8wruxKWR4UynvI
-WdXKGGSNizwtW83R1iQmX/ycXx7aNf/dvi6W8GNXhOOHgvqWvlgyCRIbkOCx2d8A
-cLbioaB515POB7Z4guVzSdd41D2XTTFxZ4dR9zFrmp6+JMaPn2iAv15eLvL2hpuA
-xxdkFf/bIGXz4MtoTStL
-=jRrG
+iQIcBAEBCgAGBQJP8KDAAAoJEHQ6UuhrqBBQUKcP/0OcpaawUp3924YoWkqw/NUZ
+ld51T5eEeQTn3lLR7gzHGYOc4lCiWobil7Hksfg3rPOfmAR41cwEeegkDSfv8Dcv
+J4pplWGu3nDZ7YUWkPVgNPcVxkm+P5Je1ciTKqhs+k0gJatL+nMaMRMf7Af8L1CF
+ZyPfTzFDCF7piNblJAcjR5o6gFkRd5EOPRgll1wwDectDlYbnyojv+gohMx8YBVs
+ucH2E6MUmnz6gmr+XXYisH08y7zRfPV2JXdzBXDVejJ7aa4Ar7OQxFHZoIypOoFY
+upFXhC2pbBIkSX1LR7rkqjngHSdv9O7qr2jHxhID5JI+7K9gRwD43ViwZgnQhH69
+qutDLEI/p388UktUklpvCw4+QK3ZE3tS2gjWoFVYO4OT8PauoGfsb5H455Z3tNyR
+uIzMi//H2r1m/VMf6N+S+80VCJ0/5G0ibMDc9FhmT9jgwqedMpRQb1dAAL+yfR8F
+dNzDYi9kcuP/MCl14cMEoPct9fK2shkeIpsLpyQ6Yf6Fp0DBPo+19pmRticbZUjb
+U1p/Z7ATv08lEek0DlyHo9BKwYYPwhO6AAxG7DuDXYoiHPeY1AMUrp1nhsxg11lu
+iRnXFpoCbN8dtaq1Xs0q34WoFf0m3hyMr6W0+wOolEkAuhK280IEa9NiHYRnOD25
+ahv2Knkij5RBXy2yPhbx
+=6fZL
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/abi-wrapper/abi-wrapper-2.0_pre20120701.ebuild b/sys-apps/abi-wrapper/abi-wrapper-2.0_pre20120701.ebuild
new file mode 100644
index 0000000..0c1d90f
--- /dev/null
+++ b/sys-apps/abi-wrapper/abi-wrapper-2.0_pre20120701.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit autotools-utils multilib
+
+DESCRIPTION="Wraps binaries which have implementations for different ABIs"
+HOMEPAGE="http://gentoo.org/~binki/abi-wrapper.xhtml"
+SRC_URI="ftp://mirror.ohnopub.net/mirror/${PN}/${P}.tar.bz2 https://bitbucket.org/gentoo/abi-wrapper"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+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.
+		# http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=blob;f=pym/portage/__init__.py;h=46bdc961c04a01f9bd92af8b0751e43dfea2029d;hb=d44df83d9f00405a62b25439ddc1915e6366a300#l334
+		# 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
+}