1 |
commit: 9cff0c12bbe3e9eb361326d9f42e77d211bb8865 |
2 |
Author: Felix Janda <felix.janda <AT> posteo <DOT> de> |
3 |
AuthorDate: Sun Nov 26 13:16:32 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 18 17:25:39 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cff0c12 |
7 |
|
8 |
www-client/elinks: sort dependencies. |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/6960 |
11 |
|
12 |
www-client/elinks/elinks-0.12_pre6-r3.ebuild | 38 ++++++++++++++-------------- |
13 |
www-client/elinks/elinks-9999.ebuild | 36 +++++++++++++------------- |
14 |
2 files changed, 37 insertions(+), 37 deletions(-) |
15 |
|
16 |
diff --git a/www-client/elinks/elinks-0.12_pre6-r3.ebuild b/www-client/elinks/elinks-0.12_pre6-r3.ebuild |
17 |
index 045c7b755e8..f6e65dacca0 100644 |
18 |
--- a/www-client/elinks/elinks-0.12_pre6-r3.ebuild |
19 |
+++ b/www-client/elinks/elinks-0.12_pre6-r3.ebuild |
20 |
@@ -21,22 +21,22 @@ RESTRICT="test" |
21 |
DEPEND=" |
22 |
bzip2? ( >=app-arch/bzip2-1.0.2 ) |
23 |
gc? ( dev-libs/boehm-gc ) |
24 |
- ssl? ( |
25 |
- !libressl? ( dev-libs/openssl:0= ) |
26 |
- libressl? ( dev-libs/libressl:0= ) |
27 |
- ) |
28 |
- xml? ( >=dev-libs/expat-1.95.4 ) |
29 |
- X? ( x11-libs/libX11 x11-libs/libXt ) |
30 |
- zlib? ( >=sys-libs/zlib-1.1.4 ) |
31 |
- lua? ( >=dev-lang/lua-5:0= ) |
32 |
gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) |
33 |
guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) |
34 |
idn? ( net-dns/libidn ) |
35 |
+ javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) |
36 |
+ lua? ( >=dev-lang/lua-5:0= ) |
37 |
perl? ( dev-lang/perl:= ) |
38 |
ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) |
39 |
samba? ( net-fs/samba ) |
40 |
+ ssl? ( |
41 |
+ !libressl? ( dev-libs/openssl:0= ) |
42 |
+ libressl? ( dev-libs/libressl:0= ) |
43 |
+ ) |
44 |
tre? ( dev-libs/tre ) |
45 |
- javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )" |
46 |
+ X? ( x11-libs/libX11 x11-libs/libXt ) |
47 |
+ xml? ( >=dev-libs/expat-1.95.4 ) |
48 |
+ zlib? ( >=sys-libs/zlib-1.1.4 )" |
49 |
RDEPEND="${DEPEND}" |
50 |
|
51 |
S="${WORKDIR}/${MY_P}" |
52 |
@@ -105,27 +105,27 @@ src_configure() { |
53 |
--enable-256-colors \ |
54 |
--enable-true-color \ |
55 |
--enable-html-highlight \ |
56 |
- $(use_with gpm) \ |
57 |
- $(use_with zlib) \ |
58 |
$(use_with bzip2 bzlib) \ |
59 |
$(use_with gc) \ |
60 |
- $(use_with X x) \ |
61 |
- $(use_with lua) \ |
62 |
+ $(use_with gpm) \ |
63 |
$(use_with guile) \ |
64 |
- $(use_with perl) \ |
65 |
- $(use_with ruby) \ |
66 |
$(use_with idn) \ |
67 |
$(use_with javascript spidermonkey) \ |
68 |
+ $(use_with lua) \ |
69 |
+ $(use_with perl) \ |
70 |
+ $(use_with ruby) \ |
71 |
$(use_with tre) \ |
72 |
+ $(use_with X x) \ |
73 |
+ $(use_with zlib) \ |
74 |
$(use_enable bittorrent) \ |
75 |
- $(use_enable nls) \ |
76 |
- $(use_enable ipv6) \ |
77 |
+ $(use_enable finger) \ |
78 |
$(use_enable ftp) \ |
79 |
$(use_enable gopher) \ |
80 |
+ $(use_enable ipv6) \ |
81 |
+ $(use_enable mouse) \ |
82 |
+ $(use_enable nls) \ |
83 |
$(use_enable nntp) \ |
84 |
- $(use_enable finger) \ |
85 |
$(use_enable samba smb) \ |
86 |
- $(use_enable mouse) \ |
87 |
$(use_enable xml xbel) \ |
88 |
${myconf} |
89 |
} |
90 |
|
91 |
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild |
92 |
index f608a19718e..b524b78949c 100644 |
93 |
--- a/www-client/elinks/elinks-9999.ebuild |
94 |
+++ b/www-client/elinks/elinks-9999.ebuild |
95 |
@@ -24,22 +24,22 @@ DEPEND=" |
96 |
${PYTHON_DEPS} |
97 |
brotli? ( app-arch/brotli ) |
98 |
bzip2? ( >=app-arch/bzip2-1.0.2 ) |
99 |
- ssl? ( |
100 |
- !libressl? ( dev-libs/openssl:0= ) |
101 |
- libressl? ( dev-libs/libressl:0= ) |
102 |
- ) |
103 |
- xml? ( >=dev-libs/expat-1.95.4 ) |
104 |
- X? ( x11-libs/libX11 x11-libs/libXt ) |
105 |
- zlib? ( >=sys-libs/zlib-1.1.4 ) |
106 |
- lua? ( >=dev-lang/lua-5:0= ) |
107 |
gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) |
108 |
guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) |
109 |
idn? ( net-dns/libidn ) |
110 |
+ javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) |
111 |
+ lua? ( >=dev-lang/lua-5:0= ) |
112 |
perl? ( dev-lang/perl:= ) |
113 |
ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) |
114 |
samba? ( net-fs/samba ) |
115 |
+ ssl? ( |
116 |
+ !libressl? ( dev-libs/openssl:0= ) |
117 |
+ libressl? ( dev-libs/libressl:0= ) |
118 |
+ ) |
119 |
tre? ( dev-libs/tre ) |
120 |
- javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )" |
121 |
+ X? ( x11-libs/libX11 x11-libs/libXt ) |
122 |
+ xml? ( >=dev-libs/expat-1.95.4 ) |
123 |
+ zlib? ( >=sys-libs/zlib-1.1.4 )" |
124 |
RDEPEND="${DEPEND}" |
125 |
|
126 |
PATCHES=( |
127 |
@@ -100,26 +100,26 @@ src_configure() { |
128 |
--enable-true-color \ |
129 |
--enable-html-highlight \ |
130 |
$(use_with gpm) \ |
131 |
- $(use_with zlib) \ |
132 |
$(use_with brotli) \ |
133 |
$(use_with bzip2 bzlib) \ |
134 |
- $(use_with X x) \ |
135 |
- $(use_with lua) \ |
136 |
$(use_with guile) \ |
137 |
- $(use_with perl) \ |
138 |
- $(use_with ruby) \ |
139 |
$(use_with idn) \ |
140 |
$(use_with javascript spidermonkey) \ |
141 |
+ $(use_with lua) \ |
142 |
+ $(use_with perl) \ |
143 |
+ $(use_with ruby) \ |
144 |
$(use_with tre) \ |
145 |
+ $(use_with X x) \ |
146 |
+ $(use_with zlib) \ |
147 |
$(use_enable bittorrent) \ |
148 |
- $(use_enable nls) \ |
149 |
- $(use_enable ipv6) \ |
150 |
+ $(use_enable finger) \ |
151 |
$(use_enable ftp) \ |
152 |
$(use_enable gopher) \ |
153 |
+ $(use_enable ipv6) \ |
154 |
+ $(use_enable mouse) \ |
155 |
+ $(use_enable nls) \ |
156 |
$(use_enable nntp) \ |
157 |
- $(use_enable finger) \ |
158 |
$(use_enable samba smb) \ |
159 |
- $(use_enable mouse) \ |
160 |
$(use_enable xml xbel) \ |
161 |
${myconf} |
162 |
} |