Introduce multilib support, bug #496964.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 82 insertions, 15 deletions

diff --git a/sys-apps/acl/ChangeLog b/sys-apps/acl/ChangeLog
index 2f0655a9c147..3af59d456229 100644
--- a/sys-apps/acl/ChangeLog
+++ b/sys-apps/acl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/acl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.123 2014/01/17 04:23:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.124 2014/05/02 10:17:58 mgorny Exp $
+
+*acl-2.2.52-r1 (02 May 2014)
+
+  02 May 2014; Michał Górny <mgorny@gentoo.org> +acl-2.2.52-r1.ebuild:
+  Introduce multilib support, bug #496964.
 
   17 Jan 2014; Mike Frysinger <vapier@gentoo.org> acl-2.2.51.ebuild,
   acl-2.2.52.ebuild:
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 99289dbabe33..8b129ac7fd5a 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -10,23 +10,26 @@ DIST acl-2.2.52.src.tar.gz 386604 SHA256 179074bb0580c06c4b4137be4c5a92a70158327
 EBUILD acl-2.2.49-r1.ebuild 1897 SHA256 16eefd23183fa09115300c878491cb51c882b61d481a43862b6a1a9fd4c75f56 SHA512 b09e30cdf65e2211ff4e3369bde20a7812616ecbed61d2054b8c1b5a07de5c3a1084a78b3bea7d27d4549adea9048f5cf65ebc0e8339e4071b7177724eeba74b WHIRLPOOL d84b6c89cb57eadfa133fa5a461633500e93822a8b4693be31ab0f6443c1b5e66a826629b1a01e933217a3dc8b4acaed9bc81aac66d84f60b1f03c6815da1c23
 EBUILD acl-2.2.49.ebuild 1838 SHA256 6795b9767a3144983c2c03e787c40cb925bc9f901634e995e977ee9642acdae2 SHA512 b377d5651733b98d66e6d5f6810792d3fcbce6053cf4a19270b3cc3d626c8abe8640a1527e029abeadb47957e251867c6f614bd345ecfbc320fccf099b6b383c WHIRLPOOL 821bb4f5b5423474412845f3c6b987c185e7fd642d7f07f7de10c807321f49551585137140f0b41ae8a0110a6521256f243ba2cb2aeaacae2ed9a238bac5e429
 EBUILD acl-2.2.51.ebuild 1969 SHA256 bc8a4c5469cc71c6b4f1777ef24c312d63fa5ea7d8f06391ea1f950cb21e9deb SHA512 322a6663a70cb8dba1d306cb45fb664226c2a4df1845c1e9962785abd64ae6c71089c9760c95edec749e727f306cfbaaf7179520e9c1a5e9d987f5ec21c9f94a WHIRLPOOL 5df14b3fb62fe69936807f5a4d94c8ba3908c5ed3f7a2309c6f42ccf1181b2413e37736e9d804995dc6e0a4d5c911c5e26e7db535e577b54db3e9a3fc02b7de8
+EBUILD acl-2.2.52-r1.ebuild 1656 SHA256 f4d30bb32a1755ce2070d656ad22fd753150566dcad2a5600f489debcf5c342c SHA512 fa03a5c0835f9592e199d0c88a64c6a15e7394c29a0dee8e72e6ce286ba5f6f3af560ca9e25c26914091e40e6d3154aa15eb141468b644ee405a836137e90e25 WHIRLPOOL e5f8e22351895a10cd528e773a112ba9d114b4cce2b08cefc51ccade9373c25e5d8d1f384bef709918aded0b62a4d42d3f24aa4d87a8ec8f8597f263736d28f8
 EBUILD acl-2.2.52.ebuild 1341 SHA256 8c1009bb87d5b33c8da538eed9f4391fe60fa8a8e801dbd7bca23e5304cedd76 SHA512 d6de09478c8525f436655b3c705c5081d9c5d10c1bba63708b604415b78bf1ddb6585a178621c60e560b8097f4fb68956dd1cb4bdc86b5136ccbbf70acc44145 WHIRLPOOL 220a678ce7c81f25337cab4f0f8673c26f9b516e264f15b2f9fc99841dc77eed4fabb7d5fedf8fb9aaa3fca774690f35a186342ebb4e6733abc335b07bb40660
-MISC ChangeLog 15566 SHA256 d971bf0ad931d7b92ec7e4e269cca802ff7212bd69bef50980e44c132d781cc8 SHA512 3c340eaa1343d5930b2ff4604c0916b09df49c61dfaafda0d3503e9b8ebd39385ba5eecabbae9372940dd991f098cc41ec7dce289245fd3a15fb648f626130bf WHIRLPOOL 7847b6ebc7289de04b615cbd7d84f003ed8ad7bbf1c4fc8376d0cdeead02cfbcbffb4a8de74c14874c0fac2e709682621739298a84ab4317c495994bbfa44e1d
+MISC ChangeLog 15713 SHA256 96ee63f9c1201d4e674a4c5aa833f42fe7aa8e6763bfe3561a38798661d19b60 SHA512 6000574c6e55e020728fd2ffe8f8b87090c17db7db44f31eb4b83aac14a3f0c1179a87a2b6b50870737c78a824d639a8c6850fd396ec5c7deea4b38d26ecad96 WHIRLPOOL 3fc491c4d53c186e1a049d2d595f5815ef0eeffc403db16f2a423896d36bcb2111a5dbfcb8fb9487af98e713c7fdb75ab54790ceddc6fa45d182230558336a3a
 MISC metadata.xml 305 SHA256 1bf7de27ebdf1ebe33a4aa99b252ede33d14fd64e927aecb11c086e090674b9e SHA512 89e5e135ec6ee2925e48f5aa49e731be85f476b82414806328293999dfc51eff88329b3c8fe4b7543956a3654a703d910df9d4b533755b82321fd1f618013b8c WHIRLPOOL 94c8af5ed9e748eaa638e0f31fe0b7fd57926283f6294a8d879bb1297c7bd76b5d4b13180f4a8d2e7f5373b92cb5e96cdc891e025e087bbaf6b6b741c141e3a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2LA2AAoJEPGu1DbS6WIAz2MP/jGSxnm9a8i5kiN2c8N3l6tP
-3lcuFd0+aaXGriGD+NHvl19JQRcw5ZSIQ7PDbLInpoggjqBwT78ah5M5hGa87jQl
-Gm58OxITGFeuo79RAgLdXhcTYrqEgsfbkJetR1sdq1r9FazR/1/FkrQWlO8GZw2G
-vYruKly3o7tXKLbP0DjeR9K/8PWj+h+s+4OLSqTgAJnZCV9bv5/SO8m63mzTA4aN
-aVhXT36+6xdPNLOsmsvrKq8jiOcrJ6z8CnVsQwM/C36KVCMpI9/FB3ubJqt4nZVY
-H7u0lBwwoZprFe69l0EfxY9qoPthfMupCAoUftcWbTQfivyVVYGNe5zNquOvufVU
-wB5SxdGqY+dQuEZfx5L0KMwT6Qr/L8fRmGCpZX+JEJJaHvoGO87aigQE1f5t0E2R
-5QSPq57HH6DD+y4Ch/UpcnFXOBCSNH5aiRM83ZfuIahfXAb2KJC6ONzYocJwjj6p
-N7D/SHMTkWXytwIp44HsQe/2zok56s+em+g8LlcVn+azVnpF4IB5vr5nuF7e+J3O
-Poyee7zUdr5L8atrt1n1IBe8sf0P87nqd44WjLnr4mqSeUgMkH4VArBgDx65k7IS
-heRxbqEoULOeoIczJcaprJ115oTl77shBgGJP+QHt4VWudxHds50FUTMDDPf/esX
-WnMI59KFL1kyg8eXC+g7
-=BNQ5
+iQJ8BAEBCABmBQJTY3DXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO+NkQAOFCXg3E6Q22nWZCZij+jjt9
+c+UZpjU3MQ7AvINusoqsiUAgnQyIvJCRoOgz3r4R8qfmk1JdwGP6J0CjkmLDGGwo
+RyjPpYNUrTGUn60jeWSdTrbiFL8DDhqSR/VqK3hTlxNRMPLtVJxHgbyKACSoOgmD
+s0uKTqaSceP+hePW3/p2FOYnxzwTWUpdU9bNT9sR7YvzYNLU4i0vhQ7pj1BWdPAm
+2OsvGXAorS6E1Ti4/6dZzXmZBMqC6/nSX0v6O9SBVGQX0dnIHsFSoH+PlpoPL/JZ
+fBqBFzJrAQd7kyodsRwYLiRqsWgOPE6Y5dniSfUDdNOgC8K1hL3qShaQAgxeKbdW
+lckTfxKJW/FC+TQcA7xBkJFsCE2E8W1Mbrq9QaK2Ic8vDSZMW4WqUxS3org/HhRO
+S2iw4tbPCTtEFNYZy/rMDqaB/fP64OvNQGsUM1Kc+fAC3mccpLX/2RqP4fBRXtXl
+f6ddKA9MG04o37NF5nFoLEcLV1knYdt5m8eLVvA6LNdE7yjoLk8c3r28pkpkIRaK
+OSYZmk6z1Z2z8bOvrfVI5ZbYARolC8ij+4NP+9Xa20DM3bPzgA80n03y+I4vUPDg
+53q3Ag7DxULhcW6M4RBvZmHuzJrZpvFDe8v8MfL1uCNejjgrEdVoXau7fKxLr+hI
+nap2QwmZ7hHh1u+1DNxI
+=y+Mt
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/acl/acl-2.2.52-r1.ebuild b/sys-apps/acl/acl-2.2.52-r1.ebuild
new file mode 100644
index 000000000000..a2c40e8fe87c
--- /dev/null
+++ b/sys-apps/acl/acl-2.2.52-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.52-r1.ebuild,v 1.1 2014/05/02 10:17:58 mgorny Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs multilib-minimal
+
+DESCRIPTION="access control list utilities, libraries and headers"
+HOMEPAGE="http://savannah.nongnu.org/projects/acl"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+IUSE="nls static-libs"
+
+RDEPEND=">=sys-apps/attr-2.4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+src_prepare() {
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
+		include/builddefs.in \
+		|| die
+	strip-linguas po
+
+	# same as https://savannah.nongnu.org/bugs/index.php?39736
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset PLATFORM #184564
+	export OPTIMIZER=${CFLAGS}
+	export DEBUG=-DNDEBUG
+
+	econf \
+		$(use_enable nls gettext) \
+		--enable-shared $(use_enable static-libs static) \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir) \
+		--bindir="${EPREFIX}"/bin
+}
+
+multilib_src_install() {
+	emake DIST_ROOT="${D}" install install-dev install-lib
+
+	# move shared libs to /
+	multilib_is_native_abi && gen_usr_ldscript -a acl
+}
+
+multilib_src_install_all() {
+	use static-libs || prune_libtool_files --all
+}