1 |
commit: d70614316ff6809f2b88a6aa773eb58523818e0d |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 3 03:58:12 2015 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 3 04:00:26 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7061431 |
7 |
|
8 |
www-client/elinks: add USE="gc xml" to control boehm-gc/expat deps |
9 |
|
10 |
www-client/elinks/elinks-0.12_pre6-r1.ebuild | 11 +++++++---- |
11 |
www-client/elinks/elinks-0.12_pre6-r2.ebuild | 11 +++++++---- |
12 |
www-client/elinks/elinks-9999.ebuild | 11 +++++++---- |
13 |
www-client/elinks/metadata.xml | 2 ++ |
14 |
4 files changed, 23 insertions(+), 12 deletions(-) |
15 |
|
16 |
diff --git a/www-client/elinks/elinks-0.12_pre6-r1.ebuild b/www-client/elinks/elinks-0.12_pre6-r1.ebuild |
17 |
index a9ffcf6..6290826 100644 |
18 |
--- a/www-client/elinks/elinks-0.12_pre6-r1.ebuild |
19 |
+++ b/www-client/elinks/elinks-0.12_pre6-r1.ebuild |
20 |
@@ -15,14 +15,15 @@ SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2 |
21 |
LICENSE="GPL-2" |
22 |
SLOT="0" |
23 |
KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
24 |
-IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \ |
25 |
- javascript lua +mouse nls nntp perl ruby samba ssl unicode X zlib" |
26 |
+IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6 |
27 |
+ javascript lua +mouse nls nntp perl ruby samba ssl unicode X xml zlib" |
28 |
RESTRICT="test" |
29 |
|
30 |
-DEPEND="dev-libs/boehm-gc |
31 |
- >=dev-libs/expat-1.95.4 |
32 |
+DEPEND=" |
33 |
bzip2? ( >=app-arch/bzip2-1.0.2 ) |
34 |
+ gc? ( dev-libs/boehm-gc ) |
35 |
ssl? ( >=dev-libs/openssl-0.9.6g:0 ) |
36 |
+ xml? ( >=dev-libs/expat-1.95.4 ) |
37 |
X? ( x11-libs/libX11 x11-libs/libXt ) |
38 |
zlib? ( >=sys-libs/zlib-1.1.4 ) |
39 |
lua? ( >=dev-lang/lua-5:0 ) |
40 |
@@ -122,6 +123,7 @@ src_configure() { |
41 |
$(use_with gpm) \ |
42 |
$(use_with zlib) \ |
43 |
$(use_with bzip2 bzlib) \ |
44 |
+ $(use_with gc) \ |
45 |
$(use_with X x) \ |
46 |
$(use_with lua) \ |
47 |
$(use_with guile) \ |
48 |
@@ -138,6 +140,7 @@ src_configure() { |
49 |
$(use_enable finger) \ |
50 |
$(use_enable samba smb) \ |
51 |
$(use_enable mouse) \ |
52 |
+ $(use_enable xml xbel) \ |
53 |
${myconf} |
54 |
} |
55 |
|
56 |
|
57 |
diff --git a/www-client/elinks/elinks-0.12_pre6-r2.ebuild b/www-client/elinks/elinks-0.12_pre6-r2.ebuild |
58 |
index 23044aa..88b93c0 100644 |
59 |
--- a/www-client/elinks/elinks-0.12_pre6-r2.ebuild |
60 |
+++ b/www-client/elinks/elinks-0.12_pre6-r2.ebuild |
61 |
@@ -15,17 +15,18 @@ SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2 |
62 |
LICENSE="GPL-2" |
63 |
SLOT="0" |
64 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
65 |
-IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \ |
66 |
- javascript libressl lua +mouse nls nntp perl ruby samba ssl unicode X zlib" |
67 |
+IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6 |
68 |
+ javascript libressl lua +mouse nls nntp perl ruby samba ssl unicode X xml zlib" |
69 |
RESTRICT="test" |
70 |
|
71 |
-DEPEND="dev-libs/boehm-gc |
72 |
- >=dev-libs/expat-1.95.4 |
73 |
+DEPEND=" |
74 |
bzip2? ( >=app-arch/bzip2-1.0.2 ) |
75 |
+ gc? ( dev-libs/boehm-gc ) |
76 |
ssl? ( |
77 |
!libressl? ( dev-libs/openssl:0 ) |
78 |
libressl? ( dev-libs/libressl ) |
79 |
) |
80 |
+ xml? ( >=dev-libs/expat-1.95.4 ) |
81 |
X? ( x11-libs/libX11 x11-libs/libXt ) |
82 |
zlib? ( >=sys-libs/zlib-1.1.4 ) |
83 |
lua? ( >=dev-lang/lua-5:0 ) |
84 |
@@ -125,6 +126,7 @@ src_configure() { |
85 |
$(use_with gpm) \ |
86 |
$(use_with zlib) \ |
87 |
$(use_with bzip2 bzlib) \ |
88 |
+ $(use_with gc) \ |
89 |
$(use_with X x) \ |
90 |
$(use_with lua) \ |
91 |
$(use_with guile) \ |
92 |
@@ -141,6 +143,7 @@ src_configure() { |
93 |
$(use_enable finger) \ |
94 |
$(use_enable samba smb) \ |
95 |
$(use_enable mouse) \ |
96 |
+ $(use_enable xml xbel) \ |
97 |
${myconf} |
98 |
} |
99 |
|
100 |
|
101 |
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild |
102 |
index 476a621..3feac4b 100644 |
103 |
--- a/www-client/elinks/elinks-9999.ebuild |
104 |
+++ b/www-client/elinks/elinks-9999.ebuild |
105 |
@@ -17,14 +17,15 @@ SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2" |
106 |
LICENSE="GPL-2" |
107 |
SLOT="0" |
108 |
KEYWORDS="" |
109 |
-IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \ |
110 |
- javascript lua +mouse nls nntp perl ruby samba ssl unicode X zlib" |
111 |
+IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6 |
112 |
+ javascript lua +mouse nls nntp perl ruby samba ssl unicode X xml zlib" |
113 |
RESTRICT="test" |
114 |
|
115 |
-DEPEND="dev-libs/boehm-gc |
116 |
- >=dev-libs/expat-1.95.4 |
117 |
+DEPEND=" |
118 |
bzip2? ( >=app-arch/bzip2-1.0.2 ) |
119 |
+ gc? ( dev-libs/boehm-gc ) |
120 |
ssl? ( >=dev-libs/openssl-0.9.6g:0= ) |
121 |
+ xml? ( >=dev-libs/expat-1.95.4 ) |
122 |
X? ( x11-libs/libX11 x11-libs/libXt ) |
123 |
zlib? ( >=sys-libs/zlib-1.1.4 ) |
124 |
lua? ( >=dev-lang/lua-5:0= ) |
125 |
@@ -91,6 +92,7 @@ src_configure() { |
126 |
$(use_with gpm) \ |
127 |
$(use_with zlib) \ |
128 |
$(use_with bzip2 bzlib) \ |
129 |
+ $(use_with gc) \ |
130 |
$(use_with X x) \ |
131 |
$(use_with lua) \ |
132 |
$(use_with guile) \ |
133 |
@@ -107,6 +109,7 @@ src_configure() { |
134 |
$(use_enable finger) \ |
135 |
$(use_enable samba smb) \ |
136 |
$(use_enable mouse) \ |
137 |
+ $(use_enable xml xbel) \ |
138 |
${myconf} |
139 |
} |
140 |
|
141 |
|
142 |
diff --git a/www-client/elinks/metadata.xml b/www-client/elinks/metadata.xml |
143 |
index 8878745..6ee34d0 100644 |
144 |
--- a/www-client/elinks/metadata.xml |
145 |
+++ b/www-client/elinks/metadata.xml |
146 |
@@ -9,7 +9,9 @@ |
147 |
<use> |
148 |
<flag name='bittorrent'>Enable support for the BitTorrent protocol</flag> |
149 |
<flag name='finger'>Enable support for the finger protocol</flag> |
150 |
+ <flag name='gc'>Enable garbage collection support via <pkg>dev-libs/boehm-gc</pkg></flag> |
151 |
<flag name='gopher'>Enable support for the gopher protocol</flag> |
152 |
<flag name='mouse'>Make elinks to grab all mouse events</flag> |
153 |
+ <flag name='xml'>Enable support for bookmarks via <pkg>dev-libs/expat</pkg></flag> |
154 |
</use> |
155 |
</pkgmetadata> |