Re-enable libuuid/libblkid for non-Linux platforms #278667 by Alexis Ballier.

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

3 files changed, 28 insertions, 22 deletions

diff --git a/sys-libs/e2fsprogs-libs/ChangeLog b/sys-libs/e2fsprogs-libs/ChangeLog
index 75110ff39d54..e73f52cda79c 100644
--- a/sys-libs/e2fsprogs-libs/ChangeLog
+++ b/sys-libs/e2fsprogs-libs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/e2fsprogs-libs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.123 2014/08/05 07:57:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.124 2014/08/05 10:40:46 vapier Exp $
+
+  05 Aug 2014; Mike Frysinger <vapier@gentoo.org> e2fsprogs-libs-1.42.11.ebuild:
+  Re-enable libuuid/libblkid for non-Linux platforms #278667 by Alexis Ballier.
 
   05 Aug 2014; Mike Frysinger <vapier@gentoo.org>
   +files/e2fsprogs-libs-1.42.11-prototypes.patch, e2fsprogs-libs-1.42.11.ebuild:
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 59556cd0aee5..0c8f9e850c46 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -10,24 +10,24 @@ DIST e2fsprogs-libs-1.42.11.tar.gz 604886 SHA256 8b52d20c6571155d2adffafbbd5d215
 DIST e2fsprogs-libs-1.42.7.tar.gz 571544 SHA256 21ce9cd879c401d08b057a9abda2b56d70557239d1f5e42674fa2c20509c2145 SHA512 2ffd37edd156730d2cc5c685e0d082c171ada626ced40a86623d937522fd020c9215fa287de909968cab366ad8a1aa84a6de8e4eaf3fc1effb103000448bae0b WHIRLPOOL 12d4f309feadd957317f97f44c9c8cf5552ed27e0f22e2061d39e8abd2732fd512f38127a0806bc913ba92c64894218efcebda1316d74b6a814bf7f6f94152df
 EBUILD e2fsprogs-libs-1.41.7.ebuild 1375 SHA256 1d0cb56ff0730d1e7ad90825df12610c3d869b6b830e5c85401b005b8b61432c SHA512 057f80553e38cd72a81621f8691fd8fd59f26542ad1205c7896992537e86fce584bfc309110bb2267ffe5109ddca07d248fa34b0c05cf0eca41602eab9aaf8a6 WHIRLPOOL f9373e687b343912c5442488fb90a95dfcb322232cc15a6b39ce8bda09e1c592a1d98ec141356c841f695b14dc75e2e5829c8d31f4776f2540edbdad36324150
 EBUILD e2fsprogs-libs-1.42.10.ebuild 2023 SHA256 3d428208aa273bf66d4a4b5605900d712a35ac98022bd4a46027bd3a9426b706 SHA512 8d1b9be851b294266731db127c50b086215319748594bbda0fc90b7128971ac1d35d601b28be5fce63f4a377d5d14d98180c6fce01c9195cfe603889f43ad357 WHIRLPOOL ae0fc093edcdccb4cd7aca650713187e8fc9de8ff882c28e0f79ec3a310aad06317f05de0b72f56dc2d2498afab2dde4aecde37b3525b62e31fcc3556f23e6c4
-EBUILD e2fsprogs-libs-1.42.11.ebuild 2094 SHA256 e7d3cdbc5bfa85aa1f24de27b2a9028c221b7e4010601300c11b3078296fef04 SHA512 226d009f4b5e718e88d4613f32b5e176dfd71b994d6a46467bbfe763b0cdc25f3447f835d82cde0402660dd49f5460c662159eeb9ace655d034175284995d2d4 WHIRLPOOL cca7a8042e2f77a9f819d3adcd7f4f573ccf5179339b8d3a2a9e78d56bcb342c646762583c6a95695b7b9ba79d6cf5a0eebbb47697fe8da8f29ab4798afe1f20
+EBUILD e2fsprogs-libs-1.42.11.ebuild 2200 SHA256 cfd228351a9efd34360deeb9ea7de3001db0366ef04021229e303f5a5773c7da SHA512 db2d5053b134cb5e44b8159ef70a684539a9789232081839b458e92dfd2caaadfe243dc639a493d0ccd155c75339634d374d5f7cbc4b515f03a11764fb25d9df WHIRLPOOL 4ca10911b0857b058c3878f901c28b85f94110fa907be48f4f92c022a391c7ab759e8d9cbb4791a77832e72799f32222d7a17e19a141f8fc4ebda737b01e0feb
 EBUILD e2fsprogs-libs-1.42.7.ebuild 1741 SHA256 7dd297867ba5761579b258217f5eb537a769a7347d59da362b02aafcd1e7f725 SHA512 87096aa2a4fa5f7aa786c5f05fe8a27775e3c51f57c3c0a21e42e8478026aea745bf50335a3c1ccfb75e74de5df3b61311549fcea403d8e1abf9bb2d0bbe6bb1 WHIRLPOOL b611adabcf9c0160ec77c25edb2ad588cd4f1c49e56e5a0ad95388c9a36d422737c16f9e73e1bcb4e76c6e4a60a338ad253f038aff41830404893de67412d70f
-MISC ChangeLog 17413 SHA256 0661efd43ca116e5eb5a93f3d09617d6b668f53c088938e6df3f0467c6336d1c SHA512 8b6194b0883e1d6d90b9b925c45df402b57a83109874f6876d83d960f8c049a325490749406ec4ad13177a4b0d67fb018d723bcf579b35e98f52129bd01dc2b5 WHIRLPOOL 5796db387a852b1159c3e9f9f42b663d4534701f3653856a55af2a9385cef7263b0cb5aa5e0b956c251175f97caa6560e08f181c35b62596e47b92955b7ce5cd
+MISC ChangeLog 17575 SHA256 52eab68bd6f0ff5aefb3a45267714a848b2c7c45af05818d8487e3498131b7d9 SHA512 658d15615c47a524409c82817f9c09f1118f1056446ebe279d5a84b75046032d43663e053290d71968e57993e34aba5b2f725e34e485d81d6edfe437c5587217 WHIRLPOOL 8b4c8f1cc674f1cc8f346ea15df5593e82ae9ba243a5d312b5db5b1174ba4c3d0c8a48ad8b598481d4ff2f51170794ede080e12f8071eb87ad84672497bc1b38
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT4I5+AAoJEPGu1DbS6WIAt1MP/1AkvV4J4e+cC8FivzFq4qyL
-0JP2/mzXsZlDKZ5jMtzsncQm4H/WTrXG6uTUHkAR1Oe4OO6P3S3UgSRqkTuxeYk+
-olWTAp31YSC0vzhVLbpbE45vj7mO41SGIchAuNUTxTlecOxK4h9jAtaWrFxQ+sPC
-SgeppGPT2MWgqm5v+o7hNi7pYS1ZgtVWjLIstOn8YIXIIzM1+HPkayp0+rimpVxz
-PgRZEQmCNdgL40V0EGgRXWqwXxst7WjewimDFUuzO1wEDyIXuDGPZs1hpnCwzYII
-u8Brv7alg4DK+Y7HPbCLskpi1lrKrfm75iY4xHTO67+4tDbuYV4yJqF3DCpt1+Ye
-ISvpwPPp9NKbk68ChzG5+eP53GNA7jSGK4Ume+su3pT5PSCnK6TiBaRtRXGkM7jf
-VqG62l0nr6F0DxaSbcIAyiVmbH+6JVBmVoMcbrdHglgMACWNF6ALrS/6aV85Mpaj
-Xm3vKu2PEqfwd1R4g1o7D9QaK2Rlxz21xu6XH/8wyFbTYEg4ldVVFD8oR5PmMtCt
-Go73vUaEeS35/r+8fW9UNkRjHgCNsm4VSSnsS8bu//bISJLtbElHVkCqvTex4e3P
-xqquY9TSSk6fseefE4oXKnmUxMYr4cIYgrpoNZVIXfU2+JMqZaWcU3nkP+Kn4fSk
-ioxFuH8db7fPB4ZD4wAK
-=wdhn
+iQIcBAEBCAAGBQJT4LSxAAoJEPGu1DbS6WIAcKgP/2zSeJAnQYLbxG+2rziFl/eX
+Ysu2tyr4ukPEx5h54p1i+Kh3OekvFfbN7X0WloG3IgYIQ8vaDi0k7ZnaJjtsM4WG
+LJe9U7/o/adYtwawuk3ss0j8PcpSF8WzBkj/KA+I7P7TSVcFHQMXZP6JJtRcMdL4
+QYhCy1qG60ZokNQYQr3W2ilLFp4MKjQInU2iZNtHgBbmSTbe85rBq3uLRcyFOzM0
+rlbDS+6grqH3ksIGwZPS0lBGvhQcN9T6RtyTcjQ7dDkzsrn8FBA0bHGvAyQjT+A3
+0IoLyLCFW+3qR8M1VcCXXL21wzKqPU65rMl4PJVXj4YyTaLFSHwHQ+4GXbo/X5hs
+b6LYn9bk/NMgEUnHmxuIB1KZiweutJOyp1ABRtXNBOISd/HNTyY8VgM3MC6V/1M+
+aepHga6H5zgR/1aciFJUtqX+RUNZHxnMOMIrhddh1ZRCPaQlHepkD4W49eM68/AX
+XCln/9ZtIJCX/YQPXUFtV07aS0Rkatks09E0Sej7WFQ6zV09NdqueVmQrKOjrZzQ
+/ly90UcNAmErYVE8eMG/h1lwmIZGq/kzqUdpEFvlxHJVSzGcfD8IlR09+v8/2Jta
+knwFEKxgMoWPnynGH/4xConl7HY09uxmZGilfisdtjiK53rNqUtEl4iuWVj2z2v1
+eC8ZpVe/G3+U5LSP2Upx
+=1zHy
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild
index ea8732f0686e..308c2705c241 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.11.ebuild,v 1.2 2014/08/05 07:57:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild,v 1.3 2014/08/05 10:40:46 vapier Exp $
 
 EAPI="4"
 
@@ -41,20 +41,23 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	local myconf=()
 	# we use blkid/uuid from util-linux now
-	ac_cv_lib_uuid_uuid_generate=yes \
-	ac_cv_lib_blkid_blkid_get_cache=yes \
+	if use kernel_linux ; then
+		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
+		myconf+=( --disable-lib{blkid,uuid} )
+	fi
 	ac_cv_path_LDCONFIG=: \
 	ECONF_SOURCE="${S}" \
 	CC="$(tc-getCC)" \
 	BUILD_CC="$(tc-getBUILD_CC)" \
 	BUILD_LD="$(tc-getBUILD_LD)" \
 	econf \
-		--disable-lib{blkid,uuid} \
 		--disable-quota \
 		$(tc-is-static-only || echo --enable-elf-shlibs) \
 		$(tc-has-tls || echo --disable-tls) \
-		$(use_enable nls)
+		$(use_enable nls) \
+		"${myconf[@]}"
 }
 
 multilib_src_compile() {
@@ -63,7 +66,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake V=1 STRIP=: DESTDIR="${D}" install || die
-	multilib_is_native_abi && gen_usr_ldscript -a com_err ss
+	multilib_is_native_abi && gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
 	# configure doesn't have an option to disable static libs :/
 	use static-libs || find "${ED}" -name '*.a' -delete
 }