diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-01-10 15:19:44 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-10 15:19:44 +0000 |
| commit | d5523ebb38297a9893768b0ff08be1a336690161 (patch) | |
| tree | 0b2001bda942e30cf41fe842922f7adae2040561 /app-arch/libarchive | |
| parent | patches for 3.1.x and 3.2 kernels. Bug 395305 (diff) | |
| download | gentoo-2-d5523ebb38297a9893768b0ff08be1a336690161.tar.gz gentoo-2-d5523ebb38297a9893768b0ff08be1a336690161.tar.bz2 gentoo-2-d5523ebb38297a9893768b0ff08be1a336690161.zip | |
Optionalize sys-fs/e2fsprogs wrt #354923 by Robin Johnson
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'app-arch/libarchive')
| -rw-r--r-- | app-arch/libarchive/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/libarchive/libarchive-3.0.2.ebuild | 14 | ||||
| -rw-r--r-- | app-arch/libarchive/metadata.xml | 7 |
3 files changed, 19 insertions, 8 deletions
diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog index 299ee7c0453a..c4d17d4f8727 100644 --- 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/libarchive-3.0.2.ebuild b/app-arch/libarchive/libarchive-3.0.2.ebuild index 39aa59827021..4368b8792930 100644 --- 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 ead8bc8c077e..dbb10f30d9ee 100644 --- 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> |