1 |
commit: f6c9ef19a22b679ef1b1a503b73631ca0d26e0ba |
2 |
Author: Felix Janda <felix.janda <AT> posteo <DOT> de> |
3 |
AuthorDate: Sun Oct 15 00:53:29 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 22 16:55:19 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c9ef19 |
7 |
|
8 |
www-client/elinks: bump live ebuild to EAPI 6. |
9 |
|
10 |
www-client/elinks/elinks-9999.ebuild | 47 +++++++++++----------- |
11 |
.../files/elinks-0.10.4.conf-syscharset.diff | 4 +- |
12 |
2 files changed, 26 insertions(+), 25 deletions(-) |
13 |
|
14 |
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild |
15 |
index ca4b6b2466c..0cd77903130 100644 |
16 |
--- a/www-client/elinks/elinks-9999.ebuild |
17 |
+++ b/www-client/elinks/elinks-9999.ebuild |
18 |
@@ -1,10 +1,10 @@ |
19 |
# Copyright 1999-2017 Gentoo Foundation |
20 |
# Distributed under the terms of the GNU General Public License v2 |
21 |
|
22 |
-EAPI=5 |
23 |
+EAPI=6 |
24 |
PYTHON_COMPAT=( python2_7 ) |
25 |
PYTHON_REQ_USE="threads" |
26 |
-inherit autotools eutils git-r3 flag-o-matic python-any-r1 |
27 |
+inherit autotools git-r3 python-any-r1 |
28 |
|
29 |
EGIT_REPO_URI="git://repo.or.cz/elinks.git" |
30 |
|
31 |
@@ -42,36 +42,39 @@ DEPEND=" |
32 |
javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )" |
33 |
RDEPEND="${DEPEND}" |
34 |
|
35 |
+PATCHES=( |
36 |
+ "${FILESDIR}"/${P}-parallel-make.patch |
37 |
+ ) |
38 |
+ |
39 |
src_unpack() { |
40 |
default |
41 |
git-r3_src_unpack |
42 |
} |
43 |
|
44 |
src_prepare() { |
45 |
- mv "${WORKDIR}/${PN}-0.10.4.conf" "${WORKDIR}/${PN}.conf" |
46 |
+ default |
47 |
+ |
48 |
+ cd "${WORKDIR}" || die |
49 |
+ eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff |
50 |
+ mv ${PN}-0.10.4.conf ${PN}.conf || die |
51 |
if ! use ftp ; then |
52 |
- sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' "${WORKDIR}"/${PN}.conf |
53 |
+ sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die |
54 |
fi |
55 |
- sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' "${WORKDIR}"/${PN}.conf |
56 |
- epatch "${FILESDIR}"/${P}-parallel-make.patch |
57 |
- |
58 |
- epatch_user |
59 |
+ sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die |
60 |
+ cd "${S}" || die |
61 |
|
62 |
# Regenerate acinclude.m4 - based on autogen.sh. |
63 |
- cat > acinclude.m4 <<- _EOF |
64 |
+ cat > acinclude.m4 <<- _EOF || die |
65 |
dnl Automatically generated from config/m4/ files. |
66 |
dnl Do not modify! |
67 |
_EOF |
68 |
- cat config/m4/*.m4 >> acinclude.m4 |
69 |
- sed -i -e 's/-Werror//' configure* |
70 |
+ cat config/m4/*.m4 >> acinclude.m4 || die |
71 |
+ sed -i -e 's/-Werror//' configure* || die |
72 |
|
73 |
eautoreconf |
74 |
} |
75 |
|
76 |
src_configure() { |
77 |
- # NOTE about GNUTSL SSL support (from the README -- 25/12/2002) |
78 |
- # As GNUTLS is not yet 100% stable and its support in ELinks is not so well |
79 |
- # tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible. |
80 |
local myconf="" |
81 |
|
82 |
if use debug ; then |
83 |
@@ -80,6 +83,9 @@ src_configure() { |
84 |
myconf="--enable-fastmem" |
85 |
fi |
86 |
|
87 |
+ # NOTE about GNUTSL SSL support (from the README -- 25/12/2002) |
88 |
+ # As GNUTLS is not yet 100% stable and its support in ELinks is not so well |
89 |
+ # tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible. |
90 |
if use ssl ; then |
91 |
myconf="${myconf} --with-openssl=${EPREFIX}/usr" |
92 |
else |
93 |
@@ -125,20 +131,16 @@ src_compile() { |
94 |
src_install() { |
95 |
emake V=1 DESTDIR="${D}" install |
96 |
|
97 |
- insopts -m 644 ; insinto /etc/elinks |
98 |
+ insinto /etc/elinks |
99 |
doins "${WORKDIR}"/elinks.conf |
100 |
newins contrib/keybind-full.conf keybind-full.sample |
101 |
newins contrib/keybind.conf keybind.conf.sample |
102 |
|
103 |
dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.* |
104 |
docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*} |
105 |
- insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote} |
106 |
- insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.* |
107 |
- insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm |
108 |
- |
109 |
- # Remove some conflicting files on OSX. The files provided by OSX 10.4 |
110 |
- # are more or less the same. -- Fabian Groffen (2005-06-30) |
111 |
- rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias || die |
112 |
+ docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote} |
113 |
+ docinto contrib/conv ; dodoc contrib/conv/*.* |
114 |
+ docinto contrib/guile ; dodoc contrib/guile/*.scm |
115 |
} |
116 |
|
117 |
pkg_postinst() { |
118 |
@@ -154,5 +156,4 @@ pkg_postinst() { |
119 |
einfo |
120 |
einfo "You will have to set your TERM variable to 'xterm-256color'" |
121 |
einfo "to be able to use 256 colors in elinks." |
122 |
- echo |
123 |
} |
124 |
|
125 |
diff --git a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff |
126 |
index dc64712b29a..83accf4c2d9 100644 |
127 |
--- a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff |
128 |
+++ b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff |
129 |
@@ -1,5 +1,5 @@ |
130 |
---- elinks-0.10.4.conf 2005-04-08 15:29:49.000000000 -0700 |
131 |
-+++ elinks-0.10.4-syscharset.conf 2006-11-04 00:26:26.000000000 -0800 |
132 |
+--- a/elinks-0.10.4.conf 2005-04-08 15:29:49.000000000 -0700 |
133 |
++++ b/elinks-0.10.4-syscharset.conf 2006-11-04 00:26:26.000000000 -0800 |
134 |
@@ -12,8 +12,6 @@ |
135 |
# obsolete config.saving_style. You shouldn't touch it. |
136 |
set config.saving_style_w = 1 |