Convert to multilib and stack it for baselibs -r13. Bug #481362.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 81 insertions, 17 deletions

diff --git a/sys-libs/e2fsprogs-libs/ChangeLog b/sys-libs/e2fsprogs-libs/ChangeLog
index 8a3275b6701f..8c0d8613637e 100644
--- a/sys-libs/e2fsprogs-libs/ChangeLog
+++ b/sys-libs/e2fsprogs-libs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/e2fsprogs-libs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.106 2013/05/20 17:42:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.107 2013/08/21 15:50:48 aballier Exp $
+
+*e2fsprogs-libs-1.42.7-r1 (21 Aug 2013)
+
+  21 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  +e2fsprogs-libs-1.42.7-r1.ebuild:
+  Convert to multilib and stack it for baselibs -r13. Bug #481362.
 
   20 May 2013; Agostino Sarubbo <ago@gentoo.org> e2fsprogs-libs-1.42.7.ebuild:
   Stable for s390, wrt bug #467008
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 621df39eb4b7..8e9b497ab024 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX e2fsprogs-libs-1.42.5-ldflags.patch 1812 SHA256 909210a62600b71c1b1e6ae96b69cf9bbde72d7ac756a4ba61a4e8a22d4d9e82 SHA512 8f779e48049c9c9b93d5501d7d896db16dc5e6b8dddd1a43cb688ae7fa30b3eb2866c77efd7ddf43549b57a752be171c3e75b3774cbef1c8b62dff4769e298ce WHIRLPOOL 776fac0500f7b7dde2962ccebdcfb81b152c5b318f07d9a67c6fcd2f7cf009231bcfc48b7857c24de5bb26351f58c9c0a7829adb92e81a92144afc33deb122a2
 DIST e2fsprogs-libs-1.41.12.tar.gz 490781 SHA256 2f2dfc223c3ccaf7064abf13b692561fdc103fa5fbeea895253fe169b6598d2b SHA512 14c95c878adf0977018ba3257665995c14ed5bc83f1a0d9f11cbccbae9a133f0ae3dd4867f2dd25c85e893d8754a2631b2295fc34e47aebaadd28ed519bf9a23 WHIRLPOOL 9962a44ac4bdfa95dd47dc06d53343b1af30c16dd42747d9ee913e8de9b100b976eed1996f20c1810c407bb15e2c41d59158ff6392007ac3f8f17c3477fa9f0e
@@ -20,24 +20,15 @@ EBUILD e2fsprogs-libs-1.42.3.ebuild 1704 SHA256 873cf3ab95e44a0dd1e6376bb1684dc6
 EBUILD e2fsprogs-libs-1.42.4.ebuild 1704 SHA256 8809bef5ef938700c042793e52b1602dd74bfa551b18abb238b99e29fea87e57 SHA512 83bd6574c46a801e0360174ea9a3ec0707e2c8e095489fcf2cd4a38079f6d567758a1eafd403f5ba18727552164468e65aeb522cca87a81789c3ecc5819b071c WHIRLPOOL de8cc6c19089ffebc26ba566ced82d75430c9ee925deeae0d6e489787b8a185df5f1e9141f4e5cb90d6b91d7a5cc5fd60650af98a029ed9ed675a136aed23de4
 EBUILD e2fsprogs-libs-1.42.5.ebuild 1794 SHA256 1ae8e08f82814a5025ad01af04446f91893a3261ddbc9b3fd9c03ae48b750e56 SHA512 5fe817b156ef5a36d503878dd1e85a0810dd0b5ecf85a07e48b0d479093fa0c8d9d5d39616b118e0f402b0b8f0626d2fbd7ecbf3970c81eef70062d56987c17c WHIRLPOOL f9b2ef47bd389af1cc58c43d0ac4abf0aee82d4c9e59f593655849bf79466fbb7357bdbda7c0d66f142c7a28612a7486cc82053218680f3e1cd71ae417194f90
 EBUILD e2fsprogs-libs-1.42.6.ebuild 1747 SHA256 253cc880220e21fd62af5ebd450cd9b65c03455787803cc038554b6767f3c1de SHA512 0ec07ca54723a641dca4fea0d03e907aa024327e7b57b7bce418c342a61f0dbdd7756b573cca834752792df44df4ca58090f6bde96570ec1a8286787c8653031 WHIRLPOOL 653f914868a3a1c229238126d2384a95cb12c31d7ae3c99016c21f062ab82165f6aa2cc05f5d631088c579bfa509b2309e61e01681d830f2ccd07eeb46ac6dc1
+EBUILD e2fsprogs-libs-1.42.7-r1.ebuild 1967 SHA256 d5c2cd202de87716088538e2f0619a3394ba7c3c95aec65223158fdafd81e062 SHA512 9ff325c876b7ab7a98b56f1936b44000f4d0981f3746d982436655f7529ae6c63aee385697b686200d33225e92648aa4dd3e5e7b91ba4a4e4eeefbf8fe1925b6 WHIRLPOOL 971247a663507755a0b06400f74ac10f8c6dea782da2b6b48d45bd95e74399e15b3b9fd640249d67c9ea4da5d5a3d3abe46636c84147b6ff9796b3467b6b07d5
 EBUILD e2fsprogs-libs-1.42.7.ebuild 1733 SHA256 9feed37fc08dcfb637ecbf18c4656e221826cd80e2eedad7d0b72d301e7773d0 SHA512 50ab896f55c148f09d70a6ccc40d20675905bd6b399c9915837fa6e714860af1cd3fc3d99044c7c05a6c590eb817533f917623a660c637b20dd859529d91061c WHIRLPOOL 8c069f078014f3cfd5cf3b3c8d97cb45ecf8984e3ef68088f311ab515be2308dc44a23928fda66a3d9bbe518922e0351ef8901dd363d4945ab52361b092bdd9f
 EBUILD e2fsprogs-libs-1.42.ebuild 1677 SHA256 f6d23a14c00c0e6e7c33c350f5bfe18b1b728dd5426b3487798447b99e58bd07 SHA512 1298178fdf3b304305e4384ca55aa272ae059ecd42736c16b7241cdf091e8b0e3d19848f7f5d4685e9dd36e2f82c7aaa19d17366faf382c40021f176ccd16488 WHIRLPOOL d065101e7df99885a9161700ade7738a87d9b6de545f2ce2cbba4b64f5ba6ba2f4abe62dc97f1355a8f22f70cb01a1bbb6c68faf90ad856cc5a2e8b58b705b97
-MISC ChangeLog 14598 SHA256 5f3a9f178cc8b2feac6671c9680b78d921b0816d38a8e5b9bf6e74b016f181fc SHA512 74aa1be18b2b672c9bba40d54efba69fe4a7dfe112cebc67663a5ef41c1dc7cd12959b7859d2f07d6516e9ef862dcf554f0b5a2c1c34383623db0da36e7c0f2c WHIRLPOOL b4203061b04e3f5ec97eda38a2494da6a4857d16417bcb64310c554c14e4d603b005be28ee44fab5d3b0372c2cb297e93287d4bc99a67818d58b6f5cc4dcbdfe
+MISC ChangeLog 14800 SHA256 2615170a3fce64474974ace3ad24a398b407fbc59c590c91e5b393804f48274f SHA512 eb2820bb6a86f26b22861ae4da317f4a268e179903baeed9f21bdcb751747e4f52050379daf6ca687870eee5d0dc2eb988079c1b4daccc3ba4f78c62f1543aeb WHIRLPOOL 16a488b76eb0bba212740b1766f085e54894076b51e2be215b2b5fd279dfae1ec8f882cd2fdd195631c823f2d33805982fb2f5bf97ce2f0665ab6c50c2113982
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRml/jAAoJELp701BxlEWfPWcP/jxITnwH6jT4Dkxvf+Djp3Yh
-ojZiIZFbOqdzaFRMkZLUI1pkT2HwGP2x4g43mRI6UxTpcfJlg67Xh7UMDXoEi2an
-q5hsZWnFeavXItkYvDmxc8kuB0LUnj4yIr/GPvVdosamx9ncC3atoWDhI2pE/jd+
-F2JApSyrHBG3vaeeikTCKbbJKa8ULZoVdKY8uUqmpOuQKhyXCZixLqwA7+Td/sW+
-IR0N4XR0YRbZEGVwvtd9Ua4bKoUZ4/0zJkq2X2IQn7w4PV9FchRpmQMJPewqXJOs
-cZGZvQaBdcIAJBqiuZy2OhrgA1aEg1SJjhgpjyGDaIFkwFll0ZdPnHD5Xa99FUS3
-j55JGHKigUIXt4z62vWxNPyG2Je+yACF7hZKVf8A1vE8tnoHzNz0014zKdaiL78a
-eBJCokGAvdWe5UgOMlaziY7rKXurlG9QeXEHHx52dEZjZRhYH9WLLuyyTrx7/pS7
-CAkehNrkNMTLWtVgmqJTQ4jrZSsil0lyfgTk5cDLSnykipStjA9KNpl95gc1jkNq
-xTTIsd6VsgPueWUNFgepot4fRSR6uuKSfGfiRTBzWODhk/PZdLbekk1CHYjWLqRh
-54Ys0MQPlMCZYaIqq+2of5zd/Is34sNoACjo5oalHoOg/cEnOBaI7/Edl5vKzKFL
-Ga1jjoJKxq/RxhT1i8lC
-=kW+R
+iEYEAREIAAYFAlIU4dkACgkQvFcC4BYPU0q6ogCdEMhY2LJCIFN7S7fBYv+PMi89
+vM4AoMPqIsW2Lr/MoIMFgO4fR1sHs3UQ
+=vFqF
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.7-r1.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.7-r1.ebuild
new file mode 100644
index 000000000000..933c77f4b8d1
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.7-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.7-r1.ebuild,v 1.1 2013/08/21 15:50:48 aballier Exp $
+
+EAPI="4"
+
+case ${PV} in
+*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
+*)      UP_PV=${PV} ;;
+esac
+
+inherit toolchain-funcs eutils multilib-minimal
+
+DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="nls static-libs"
+
+RDEPEND="!sys-libs/com_err
+	!sys-libs/ss
+	!<sys-fs/e2fsprogs-1.41.8
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r12
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P%_pre*}
+
+src_prepare() {
+	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
+}
+
+multilib_src_configure() {
+	# We want to use the "bsd" libraries while building on Darwin, but while
+	# building on other Gentoo/*BSD we prefer elf-naming scheme.
+	local libtype
+	case ${CHOST} in
+		*-darwin*) libtype=bsd;;
+		*)         libtype=elf;;
+	esac
+
+	# we use blkid/uuid from util-linux now
+	ac_cv_lib_uuid_uuid_generate=yes \
+	ac_cv_lib_blkid_blkid_get_cache=yes \
+	ac_cv_path_LDCONFIG=: \
+	QUOTA_CMT='#' \
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-lib{blkid,uuid} \
+		--disable-quota \
+		--enable-${libtype}-shlibs \
+		$(tc-has-tls || echo --disable-tls) \
+		$(use_enable nls)
+}
+
+multilib_src_install() {
+	emake STRIP=: DESTDIR="${D}" install || die
+	multilib_is_native_abi && gen_usr_ldscript -a com_err ss
+	# configure doesn't have an option to disable static libs :/
+	use static-libs || find "${ED}" -name '*.a' -delete
+}