1 |
commit: 6d5901fd57daf9d949c930749d8fbc32385f2c15 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 6 12:00:25 2017 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 6 12:02:49 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d5901fd |
7 |
|
8 |
app-arch/xar: Fix building (#583668) |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
app-arch/xar/files/xar-1.6.1-ext2.patch | 24 ++++++++++++++++++++ |
13 |
app-arch/xar/xar-1.6.1-r1.ebuild | 40 +++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 64 insertions(+) |
15 |
|
16 |
diff --git a/app-arch/xar/files/xar-1.6.1-ext2.patch b/app-arch/xar/files/xar-1.6.1-ext2.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..da413b03e52 |
19 |
--- /dev/null |
20 |
+++ b/app-arch/xar/files/xar-1.6.1-ext2.patch |
21 |
@@ -0,0 +1,24 @@ |
22 |
+--- a/lib/ext2.c.orig |
23 |
++++ b/lib/ext2.c |
24 |
+@@ -139,8 +139,10 @@ |
25 |
+ if(! (flags & ~EXT2_NOCOMPR_FL) ) |
26 |
+ x_addprop(f, "NoCompBlock"); |
27 |
+ #endif |
28 |
++#ifdef EXT2_ECOMPR_FL |
29 |
+ if(! (flags & ~EXT2_ECOMPR_FL) ) |
30 |
+ x_addprop(f, "CompError"); |
31 |
++#endif |
32 |
+ if(! (flags & ~EXT2_BTREE_FL) ) |
33 |
+ x_addprop(f, "BTree"); |
34 |
+ if(! (flags & ~EXT2_INDEX_FL) ) |
35 |
+@@ -225,8 +227,10 @@ |
36 |
+ if( e2prop_get(f, "NoCompBlock", (char **)&tmp) == 0 ) |
37 |
+ flags |= EXT2_NOCOMPR_FL ; |
38 |
+ #endif |
39 |
++#ifdef EXT2_ECOMPR_FL |
40 |
+ if( e2prop_get(f, "CompError", (char **)&tmp) == 0 ) |
41 |
+ flags |= EXT2_ECOMPR_FL ; |
42 |
++#endif |
43 |
+ if( e2prop_get(f, "BTree", (char **)&tmp) == 0 ) |
44 |
+ flags |= EXT2_BTREE_FL ; |
45 |
+ if( e2prop_get(f, "HashIndexed", (char **)&tmp) == 0 ) |
46 |
|
47 |
diff --git a/app-arch/xar/xar-1.6.1-r1.ebuild b/app-arch/xar/xar-1.6.1-r1.ebuild |
48 |
new file mode 100644 |
49 |
index 00000000000..fe744682e35 |
50 |
--- /dev/null |
51 |
+++ b/app-arch/xar/xar-1.6.1-r1.ebuild |
52 |
@@ -0,0 +1,40 @@ |
53 |
+# Copyright 1999-2017 Gentoo Foundation |
54 |
+# Distributed under the terms of the GNU General Public License v2 |
55 |
+ |
56 |
+EAPI=6 |
57 |
+inherit autotools ltprune |
58 |
+ |
59 |
+DESCRIPTION="An easily extensible archive format" |
60 |
+HOMEPAGE="https://github.com/mackyle/xar" |
61 |
+SRC_URI="mirror://github/mackyle/${PN}/${P}.tar.gz" |
62 |
+ |
63 |
+LICENSE="BSD-2" |
64 |
+SLOT="0" |
65 |
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
66 |
+IUSE="+bzip2 libressl" |
67 |
+ |
68 |
+DEPEND=" |
69 |
+ !libressl? ( dev-libs/openssl:0= ) |
70 |
+ libressl? ( dev-libs/libressl:0= ) |
71 |
+ bzip2? ( app-arch/bzip2 ) |
72 |
+ sys-libs/zlib |
73 |
+" |
74 |
+RDEPEND="${DEPEND}" |
75 |
+ |
76 |
+PATCHES=( "${FILESDIR}"/${P}-ext2.patch ) |
77 |
+ |
78 |
+src_prepare() { |
79 |
+ default |
80 |
+ eautoconf |
81 |
+} |
82 |
+ |
83 |
+src_configure() { |
84 |
+ econf \ |
85 |
+ $(use_with bzip2) \ |
86 |
+ --disable-static |
87 |
+} |
88 |
+ |
89 |
+src_install() { |
90 |
+ default |
91 |
+ prune_libtool_files |
92 |
+} |