1 |
commit: 030ed693720a75ddbe08fe835492bbb343a28936 |
2 |
Author: Felix Janda <felix.janda <AT> posteo <DOT> de> |
3 |
AuthorDate: Sun Feb 25 22:27:04 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 3 14:42:33 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=030ed693 |
7 |
|
8 |
www-client/elinks: update live ebuild |
9 |
|
10 |
www-client/elinks/elinks-9999.ebuild | 96 ++++++++++++++++++------------------ |
11 |
1 file changed, 47 insertions(+), 49 deletions(-) |
12 |
|
13 |
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild |
14 |
index 871ec4ab5ab..5f0bf215d16 100644 |
15 |
--- a/www-client/elinks/elinks-9999.ebuild |
16 |
+++ b/www-client/elinks/elinks-9999.ebuild |
17 |
@@ -1,4 +1,4 @@ |
18 |
-# Copyright 1999-2017 Gentoo Foundation |
19 |
+# Copyright 1999-2018 Gentoo Foundation |
20 |
# Distributed under the terms of the GNU General Public License v2 |
21 |
|
22 |
EAPI=6 |
23 |
@@ -8,7 +8,6 @@ inherit autotools git-r3 python-any-r1 |
24 |
|
25 |
EGIT_REPO_URI="https://github.com/rkd77/felinks" |
26 |
|
27 |
-MY_P="${P/_/}" |
28 |
DESCRIPTION="Advanced and well-established text-mode web browser" |
29 |
HOMEPAGE="http://elinks.or.cz/" |
30 |
|
31 |
@@ -17,14 +16,13 @@ SLOT="0" |
32 |
KEYWORDS="" |
33 |
IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm guile idn ipv6 |
34 |
javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib" |
35 |
-RESTRICT="test" |
36 |
|
37 |
DEPEND=" |
38 |
${PYTHON_DEPS} |
39 |
brotli? ( app-arch/brotli ) |
40 |
bzip2? ( >=app-arch/bzip2-1.0.2 ) |
41 |
gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) |
42 |
- guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) |
43 |
+ guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) |
44 |
idn? ( net-dns/libidn ) |
45 |
javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) |
46 |
lua? ( >=dev-lang/lua-5:0= ) |
47 |
@@ -59,53 +57,53 @@ src_prepare() { |
48 |
} |
49 |
|
50 |
src_configure() { |
51 |
- local myconf="" |
52 |
+ local myconf=( |
53 |
+ --sysconfdir="${EPREFIX}"/etc/elinks |
54 |
+ --enable-leds |
55 |
+ --enable-88-colors |
56 |
+ --enable-256-colors |
57 |
+ --enable-true-color |
58 |
+ --enable-html-highlight |
59 |
+ $(use_with gpm) |
60 |
+ $(use_with brotli) |
61 |
+ $(use_with bzip2 bzlib) |
62 |
+ $(use_with guile) |
63 |
+ $(use_with idn) |
64 |
+ $(use_with javascript spidermonkey) |
65 |
+ $(use_with lua) |
66 |
+ $(use_with perl) |
67 |
+ $(use_with ruby) |
68 |
+ $(use_with tre) |
69 |
+ $(use_with X x) |
70 |
+ $(use_with zlib) |
71 |
+ $(use_enable bittorrent) |
72 |
+ $(use_enable finger) |
73 |
+ $(use_enable ftp) |
74 |
+ $(use_enable gopher) |
75 |
+ $(use_enable ipv6) |
76 |
+ $(use_enable mouse) |
77 |
+ $(use_enable nls) |
78 |
+ $(use_enable nntp) |
79 |
+ $(use_enable samba smb) |
80 |
+ $(use_enable xml xbel) |
81 |
+ ) |
82 |
|
83 |
if use debug ; then |
84 |
- myconf="--enable-debug" |
85 |
+ myconf+=( --enable-debug ) |
86 |
else |
87 |
- myconf="--enable-fastmem" |
88 |
+ myconf+=( --enable-fastmem ) |
89 |
fi |
90 |
|
91 |
# NOTE about GNUTSL SSL support (from the README -- 25/12/2002) |
92 |
# As GNUTLS is not yet 100% stable and its support in ELinks is not so well |
93 |
# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible. |
94 |
if use ssl ; then |
95 |
- myconf="${myconf} --with-openssl=${EPREFIX}/usr" |
96 |
+ myconf+=( --with-openssl="${EPREFIX}"/usr ) |
97 |
else |
98 |
- myconf="${myconf} --without-openssl --without-gnutls" |
99 |
+ myconf+=( --without-openssl --without-gnutls ) |
100 |
fi |
101 |
|
102 |
- econf \ |
103 |
- --sysconfdir="${EPREFIX}"/etc/elinks \ |
104 |
- --enable-leds \ |
105 |
- --enable-88-colors \ |
106 |
- --enable-256-colors \ |
107 |
- --enable-true-color \ |
108 |
- --enable-html-highlight \ |
109 |
- $(use_with gpm) \ |
110 |
- $(use_with brotli) \ |
111 |
- $(use_with bzip2 bzlib) \ |
112 |
- $(use_with guile) \ |
113 |
- $(use_with idn) \ |
114 |
- $(use_with javascript spidermonkey) \ |
115 |
- $(use_with lua) \ |
116 |
- $(use_with perl) \ |
117 |
- $(use_with ruby) \ |
118 |
- $(use_with tre) \ |
119 |
- $(use_with X x) \ |
120 |
- $(use_with zlib) \ |
121 |
- $(use_enable bittorrent) \ |
122 |
- $(use_enable finger) \ |
123 |
- $(use_enable ftp) \ |
124 |
- $(use_enable gopher) \ |
125 |
- $(use_enable ipv6) \ |
126 |
- $(use_enable mouse) \ |
127 |
- $(use_enable nls) \ |
128 |
- $(use_enable nntp) \ |
129 |
- $(use_enable samba smb) \ |
130 |
- $(use_enable xml xbel) \ |
131 |
- ${myconf} |
132 |
+ econf "${myconf[@]}" |
133 |
} |
134 |
|
135 |
src_compile() { |
136 |
@@ -126,18 +124,18 @@ src_install() { |
137 |
docinto contrib/guile ; dodoc contrib/guile/*.scm |
138 |
|
139 |
# elinks uses an internal copy of gettext which ships files that may |
140 |
- # colliding with the system's gettext (https://bugs.gentoo.org/635090) |
141 |
+ # collide with the system's gettext (https://bugs.gentoo.org/635090) |
142 |
rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die |
143 |
} |
144 |
|
145 |
pkg_postinst() { |
146 |
- einfo "You may want to convert your html.cfg and links.cfg of" |
147 |
- einfo "Links or older ELinks versions to the new ELinks elinks.conf" |
148 |
- einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl" |
149 |
- einfo |
150 |
- einfo "Please have a look at /etc/elinks/keybind-full.sample and" |
151 |
- einfo "/etc/elinks/keybind.conf.sample for some bindings examples." |
152 |
- einfo |
153 |
- einfo "You will have to set your TERM variable to 'xterm-256color'" |
154 |
- einfo "to be able to use 256 colors in elinks." |
155 |
+ elog "You may want to convert your html.cfg and links.cfg of" |
156 |
+ elog "Links or older ELinks versions to the new ELinks elinks.conf" |
157 |
+ elog "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl" |
158 |
+ elog |
159 |
+ elog "Please have a look at /etc/elinks/keybind-full.sample and" |
160 |
+ elog "/etc/elinks/keybind.conf.sample for some bindings examples." |
161 |
+ elog |
162 |
+ elog "You will have to set your TERM variable to 'xterm-256color'" |
163 |
+ elog "to be able to use 256 colors in elinks." |
164 |
} |