Optionalize sys-fs/e2fsprogs wrt #354923 by Robin Johnson

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index 299ee7c0453a8f0b1ad5fed830e4d06adc7c4655..c4d17d4f8727e82a51c6d608ac6dbc1b16842d21 100644 (file)
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/libarchive
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.98 2012/01/10 12:52:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.99 2012/01/10 15:19:44 ssuominen Exp $
+
+  10 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> libarchive-3.0.2.ebuild,
+  metadata.xml:
+  Optionalize sys-fs/e2fsprogs wrt #354923 by Robin Johnson
 
 *libarchive-3.0.2 (10 Jan 2012)
 

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index b54216b07352cf7c1b8cd73dc1efe656a337bb8c..318f639b96f462a5ebcbbe71bf24c38b1a1d0fe6 100644 (file)
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -13,17 +13,17 @@ EBUILD libarchive-2.8.3.ebuild 2702 RMD160 6438f59b1379de2b9d55ffe1f207436d9f16b
 EBUILD libarchive-2.8.4-r1.ebuild 2784 RMD160 0ceaaecb479d117210039398561dc66e70b14cc6 SHA1 e035db816e2d14b8d49a66323469d4c0c76292c1 SHA256 262a63e7515095f12c4762e143918d48ac8cb6747ab316410935e2f43b28131c
 EBUILD libarchive-2.8.4.ebuild 2705 RMD160 82947ba234a3350384408a8c2ca47c70d6a88c00 SHA1 4ea6e95687fb264c3ae131981a831ebfc60a418f SHA256 81c4c2d06a8b30f96b51cf323a0319b95267427ad7a62b3348daa0cbbb44339d
 EBUILD libarchive-2.8.5.ebuild 2669 RMD160 15a4f1265b444d7afe23fb49c67a35b54d22a28a SHA1 8d49d43e4ba6da3cf6ae33f87d7ff2af61d3e4d5 SHA256 be6256a002612a6d6e63ead4476db88c50a3806d00c27f8bcc47264a0b6b9ee2
-EBUILD libarchive-3.0.2.ebuild 2137 RMD160 a9ed73c5d517f7609a8151d150a57e5df34a7b66 SHA1 2267d109021793c350e3c3e70d74536b2ed1736e SHA256 675c6d386bfc9e75f9e5bdd404f5ceb2a39b79ed46f3e3cefbf7edcdf24d379c
-MISC ChangeLog 28252 RMD160 3b02616a886249cb2502fe8b1be3aebd563f3d6d SHA1 45a2dc349cd11bee0310663b87cda5da08991c2a SHA256 d1bf287d8c5faa901c8f5ee88decec64728ebdf80490e27e316be0242c327a8d
-MISC metadata.xml 1276 RMD160 73e216cc9fa2119fc7aea6ed11acf6393540908c SHA1 de1edc64ba801f169e482578eacb63c59386cad0 SHA256 2820dcbb05d9f56cc62e4ae8f1c2bed66be2eef33f3ef8ef3dfd303566bd314b
+EBUILD libarchive-3.0.2.ebuild 2230 RMD160 c3dbc5bbf1e16ba411ebd72be4c32cb2e1323566 SHA1 9293cbd1244a7b7a8b3b64d975c70f5bae19c436 SHA256 25fd178a5853e40885fb243c9b8e09f42703247dcd6b92ce0514290eae703f97
+MISC ChangeLog 28408 RMD160 1c5d192ef95ea934a9cdf15e5b6b2c03bbd052b8 SHA1 04597a23edcd97721fb27f393516a85c793f340a SHA256 51ad6f3c6b8c91cb235a9937f3a5d5d8f080be6ace699ddebc4f5cb4a6c3db3f
+MISC metadata.xml 1450 RMD160 6e786a07dcf4ccc526402014ea8c91903eec2573 SHA1 17887185b51ee47a669c8bbe330b74fc8b8150c5 SHA256 a58dec73ebb3d560de5192cd94f7d295119da75ad90d32cfcca720bc19b41842
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPDDUkAAoJEEdUh39IaPFNAXYH/14UYc9p8WY23Kgt1PlCjbe9
-iAQwkbGiTnbtfi36ByG6YYFRKBUUbYGRuG3mg5H7fUKHCHEV5WNcJ0CqPCK5PAjB
-hHYe2SUUWKlmiNqBRZC+R8drAZe8lJSv4a+r71a+xT9xCW1URRkydK2Qpk1HKdoj
-a09ufKJduO+SwwKE24xj1f1L1c/VVNjjbn9QPJbnptX8gdU1QMWoYibRMbM9U71d
-lhJVG9qzr7LgPsGiqcimzfXyW++bOZ/6M0nWzW5qe+PCQ6+gFH7RizOSJb3hdq8V
-bj8RtR69mWHnU/XRUR9tU7nWlBUvCXty1+9aJYdpLlnz1se8HP5TEGK394iVKgM=
-=FWIP
+iQEcBAEBAgAGBQJPDFa4AAoJEEdUh39IaPFN6o0H/iciNf/vKkvqkBx48O0dsVgP
+zC/OLyDYD1+vCsUOYHZpk5f0JGWbQQ+QtPuid4uFJQ+TjrOYcw+DD3yAehBZe76u
+gt0puO4nBePVkAhlAQHR+9+x3yKiiwk/oyfAs0TMRFLRvL6AH5q0z3CJFMwYE+mI
+NxNo7PwnfyyQk9joiDAAOvV0GZVQAqDvIgYlLrUfJrU3lFDiBxcRORShAX7vldao
+0xw5N/b/ERqHknpn3y9KtqjkFIrtEWT99SKSfwbDYBQqei1/0DcEPPsb2ngrMf94
+urBTs4eCT096+9aKb9FA3zy4SdxEONNhYM/tn5hqgC9+3etggshcWEfdX8vD8Ko=
+=t4S8
 -----END PGP SIGNATURE-----

diff --git a/app-arch/libarchive/libarchive-3.0.2.ebuild b/app-arch/libarchive/libarchive-3.0.2.ebuild
index 39aa5982702103eb3048e8c00b34ebaf195b8f47..4368b8792930d61023dae23d67841402132d12e5 100644 (file)
--- a/app-arch/libarchive/libarchive-3.0.2.ebuild
+++ b/app-arch/libarchive/libarchive-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-3.0.2.ebuild,v 1.2 2012/01/10 12:56:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-3.0.2.ebuild,v 1.3 2012/01/10 15:19:44 ssuominen Exp $
 
 EAPI=4
 inherit eutils multilib
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="acl +bzip2 expat +iconv kernel_linux +lzma nettle static-libs xattr +zlib"
+IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux +lzma nettle static-libs xattr +zlib"
 
 RDEPEND="!dev-libs/libarchive
        dev-libs/openssl:0
@@ -21,19 +21,21 @@ RDEPEND="!dev-libs/libarchive
        expat? ( dev-libs/expat )
        !expat? ( dev-libs/libxml2 )
        iconv? ( virtual/libiconv )
+       kernel_linux? (
+               xattr? ( sys-apps/attr )
+               )
        lzma? ( app-arch/xz-utils )
        nettle? ( dev-libs/nettle )
-       xattr? (
-               kernel_linux? ( sys-apps/attr )
-               )
        zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
        kernel_linux? (
-               sys-fs/e2fsprogs
                virtual/os-headers
+               e2fsprogs? ( sys-fs/e2fsprogs )
                )"
 
 src_configure() {
+       use e2fsprogs || export ac_cv_header_ext2fs_ext2_fs_h=no #354923
+
        # We disable lzmadec because we support the newer liblzma from xz-utils
        # and not liblzmadec with this version.
        econf \

diff --git a/app-arch/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml
index ead8bc8c077e354f0293475e7c910882481ed594..dbb10f30d9eeca1f7ce8eaffcdbc4a4e64d42b1a 100644 (file)
--- a/app-arch/libarchive/metadata.xml
+++ b/app-arch/libarchive/metadata.xml
@@ -28,6 +28,11 @@
       libarchive's native support: bsdtar will keep using bunzip2 as a
       filter if that's not built-in.
     </flag>
-    <flag name="nettle">Use dev-libs/nettle as crypto backend</flag>
+    <flag name="nettle">
+      Use <pkg>dev-libs/nettle</pkg> as crypto backend
+    </flag>
+    <flag name="e2fsprogs">
+      Use file flags from <pkg>sys-fs/e2fsprogs</pkg> headers instead of <pkg>virtual/os-headers headers</pkg>
+    </flag>
   </use>
 </pkgmetadata>