| 1 |
ssuominen 12/01/10 15:19:44 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog libarchive-3.0.2.ebuild |
| 4 |
Log: |
| 5 |
Optionalize sys-fs/e2fsprogs wrt #354923 by Robin Johnson |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.7 app-arch/libarchive/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/libarchive/metadata.xml?rev=1.7&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/libarchive/metadata.xml?rev=1.7&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/libarchive/metadata.xml?r1=1.6&r2=1.7 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/libarchive/metadata.xml,v |
| 19 |
retrieving revision 1.6 |
| 20 |
retrieving revision 1.7 |
| 21 |
diff -u -r1.6 -r1.7 |
| 22 |
--- metadata.xml 10 Jan 2012 12:52:25 -0000 1.6 |
| 23 |
+++ metadata.xml 10 Jan 2012 15:19:44 -0000 1.7 |
| 24 |
@@ -28,6 +28,11 @@ |
| 25 |
libarchive's native support: bsdtar will keep using bunzip2 as a |
| 26 |
filter if that's not built-in. |
| 27 |
</flag> |
| 28 |
- <flag name="nettle">Use dev-libs/nettle as crypto backend</flag> |
| 29 |
+ <flag name="nettle"> |
| 30 |
+ Use <pkg>dev-libs/nettle</pkg> as crypto backend |
| 31 |
+ </flag> |
| 32 |
+ <flag name="e2fsprogs"> |
| 33 |
+ Use file flags from <pkg>sys-fs/e2fsprogs</pkg> headers instead of <pkg>virtual/os-headers headers</pkg> |
| 34 |
+ </flag> |
| 35 |
</use> |
| 36 |
</pkgmetadata> |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.99 app-arch/libarchive/ChangeLog |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/libarchive/ChangeLog?rev=1.99&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/libarchive/ChangeLog?rev=1.99&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/libarchive/ChangeLog?r1=1.98&r2=1.99 |
| 45 |
|
| 46 |
Index: ChangeLog |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v |
| 49 |
retrieving revision 1.98 |
| 50 |
retrieving revision 1.99 |
| 51 |
diff -u -r1.98 -r1.99 |
| 52 |
--- ChangeLog 10 Jan 2012 12:52:25 -0000 1.98 |
| 53 |
+++ ChangeLog 10 Jan 2012 15:19:44 -0000 1.99 |
| 54 |
@@ -1,6 +1,10 @@ |
| 55 |
# ChangeLog for app-arch/libarchive |
| 56 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.98 2012/01/10 12:52:25 ssuominen Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.99 2012/01/10 15:19:44 ssuominen Exp $ |
| 59 |
+ |
| 60 |
+ 10 Jan 2012; Samuli Suominen <ssuominen@g.o> libarchive-3.0.2.ebuild, |
| 61 |
+ metadata.xml: |
| 62 |
+ Optionalize sys-fs/e2fsprogs wrt #354923 by Robin Johnson |
| 63 |
|
| 64 |
*libarchive-3.0.2 (10 Jan 2012) |
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
1.3 app-arch/libarchive/libarchive-3.0.2.ebuild |
| 70 |
|
| 71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/libarchive/libarchive-3.0.2.ebuild?rev=1.3&view=markup |
| 72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/libarchive/libarchive-3.0.2.ebuild?rev=1.3&content-type=text/plain |
| 73 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/libarchive/libarchive-3.0.2.ebuild?r1=1.2&r2=1.3 |
| 74 |
|
| 75 |
Index: libarchive-3.0.2.ebuild |
| 76 |
=================================================================== |
| 77 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-3.0.2.ebuild,v |
| 78 |
retrieving revision 1.2 |
| 79 |
retrieving revision 1.3 |
| 80 |
diff -u -r1.2 -r1.3 |
| 81 |
--- libarchive-3.0.2.ebuild 10 Jan 2012 12:56:27 -0000 1.2 |
| 82 |
+++ libarchive-3.0.2.ebuild 10 Jan 2012 15:19:44 -0000 1.3 |
| 83 |
@@ -1,6 +1,6 @@ |
| 84 |
# Copyright 1999-2012 Gentoo Foundation |
| 85 |
# Distributed under the terms of the GNU General Public License v2 |
| 86 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-3.0.2.ebuild,v 1.2 2012/01/10 12:56:27 ssuominen Exp $ |
| 87 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-3.0.2.ebuild,v 1.3 2012/01/10 15:19:44 ssuominen Exp $ |
| 88 |
|
| 89 |
EAPI=4 |
| 90 |
inherit eutils multilib |
| 91 |
@@ -12,7 +12,7 @@ |
| 92 |
LICENSE="BSD" |
| 93 |
SLOT="0" |
| 94 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
| 95 |
-IUSE="acl +bzip2 expat +iconv kernel_linux +lzma nettle static-libs xattr +zlib" |
| 96 |
+IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux +lzma nettle static-libs xattr +zlib" |
| 97 |
|
| 98 |
RDEPEND="!dev-libs/libarchive |
| 99 |
dev-libs/openssl:0 |
| 100 |
@@ -21,19 +21,21 @@ |
| 101 |
expat? ( dev-libs/expat ) |
| 102 |
!expat? ( dev-libs/libxml2 ) |
| 103 |
iconv? ( virtual/libiconv ) |
| 104 |
+ kernel_linux? ( |
| 105 |
+ xattr? ( sys-apps/attr ) |
| 106 |
+ ) |
| 107 |
lzma? ( app-arch/xz-utils ) |
| 108 |
nettle? ( dev-libs/nettle ) |
| 109 |
- xattr? ( |
| 110 |
- kernel_linux? ( sys-apps/attr ) |
| 111 |
- ) |
| 112 |
zlib? ( sys-libs/zlib )" |
| 113 |
DEPEND="${RDEPEND} |
| 114 |
kernel_linux? ( |
| 115 |
- sys-fs/e2fsprogs |
| 116 |
virtual/os-headers |
| 117 |
+ e2fsprogs? ( sys-fs/e2fsprogs ) |
| 118 |
)" |
| 119 |
|
| 120 |
src_configure() { |
| 121 |
+ use e2fsprogs || export ac_cv_header_ext2fs_ext2_fs_h=no #354923 |
| 122 |
+ |
| 123 |
# We disable lzmadec because we support the newer liblzma from xz-utils |
| 124 |
# and not liblzmadec with this version. |
| 125 |
econf \ |
Archives