| 1 |
commit: 009e9dee3db2915548728931b1b718f16451f80d |
| 2 |
Author: Felix Janda <felix.janda <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Sun Nov 26 13:21:48 2017 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 18 17:25:42 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=009e9dee |
| 7 |
|
| 8 |
www-client/elinks: use default upstream configuration. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/638730 |
| 11 |
|
| 12 |
...inks-0.12_pre6-r3.ebuild => elinks-0.12_pre6-r4.ebuild} | 14 -------------- |
| 13 |
www-client/elinks/elinks-9999.ebuild | 14 -------------- |
| 14 |
2 files changed, 28 deletions(-) |
| 15 |
|
| 16 |
diff --git a/www-client/elinks/elinks-0.12_pre6-r3.ebuild b/www-client/elinks/elinks-0.12_pre6-r4.ebuild |
| 17 |
similarity index 90% |
| 18 |
rename from www-client/elinks/elinks-0.12_pre6-r3.ebuild |
| 19 |
rename to www-client/elinks/elinks-0.12_pre6-r4.ebuild |
| 20 |
index f6e65dacca0..8578fc6b794 100644 |
| 21 |
--- a/www-client/elinks/elinks-0.12_pre6-r3.ebuild |
| 22 |
+++ b/www-client/elinks/elinks-0.12_pre6-r4.ebuild |
| 23 |
@@ -8,7 +8,6 @@ MY_P="${P/_/}" |
| 24 |
DESCRIPTION="Advanced and well-established text-mode web browser" |
| 25 |
HOMEPAGE="http://elinks.or.cz/" |
| 26 |
SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2 |
| 27 |
- https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2 |
| 28 |
https://dev.gentoo.org/~axs/distfiles/${PN}-0.12_pre5-js185-patches.tar.bz2" |
| 29 |
|
| 30 |
LICENSE="GPL-2" |
| 31 |
@@ -56,15 +55,6 @@ PATCHES=( |
| 32 |
src_prepare() { |
| 33 |
default |
| 34 |
|
| 35 |
- cd "${WORKDIR}" || die |
| 36 |
- eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff |
| 37 |
- mv ${PN}-0.10.4.conf ${PN}.conf || die |
| 38 |
- if ! use ftp ; then |
| 39 |
- sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die |
| 40 |
- fi |
| 41 |
- sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die |
| 42 |
- cd "${S}" || die |
| 43 |
- |
| 44 |
# fix lib order in configure check |
| 45 |
# (these seds are necessary so that @preserved-libs copies are not used) |
| 46 |
sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs185 mozjs js smjs; do:' \ |
| 47 |
@@ -138,7 +128,6 @@ src_install() { |
| 48 |
emake V=1 DESTDIR="${D}" install |
| 49 |
|
| 50 |
insinto /etc/elinks |
| 51 |
- doins "${WORKDIR}"/elinks.conf |
| 52 |
newins contrib/keybind-full.conf keybind-full.sample |
| 53 |
newins contrib/keybind.conf keybind.conf.sample |
| 54 |
|
| 55 |
@@ -154,9 +143,6 @@ src_install() { |
| 56 |
} |
| 57 |
|
| 58 |
pkg_postinst() { |
| 59 |
- einfo "This ebuild provides a default config for ELinks." |
| 60 |
- einfo "Please check /etc/elinks/elinks.conf" |
| 61 |
- einfo |
| 62 |
einfo "You may want to convert your html.cfg and links.cfg of" |
| 63 |
einfo "Links or older ELinks versions to the new ELinks elinks.conf" |
| 64 |
einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl" |
| 65 |
|
| 66 |
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild |
| 67 |
index b524b78949c..51db03c5551 100644 |
| 68 |
--- a/www-client/elinks/elinks-9999.ebuild |
| 69 |
+++ b/www-client/elinks/elinks-9999.ebuild |
| 70 |
@@ -11,7 +11,6 @@ EGIT_REPO_URI="git://repo.or.cz/elinks.git" |
| 71 |
MY_P="${P/_/}" |
| 72 |
DESCRIPTION="Advanced and well-established text-mode web browser" |
| 73 |
HOMEPAGE="http://elinks.or.cz/" |
| 74 |
-SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2" |
| 75 |
|
| 76 |
LICENSE="GPL-2" |
| 77 |
SLOT="0" |
| 78 |
@@ -54,15 +53,6 @@ src_unpack() { |
| 79 |
src_prepare() { |
| 80 |
default |
| 81 |
|
| 82 |
- cd "${WORKDIR}" || die |
| 83 |
- eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff |
| 84 |
- mv ${PN}-0.10.4.conf ${PN}.conf || die |
| 85 |
- if ! use ftp ; then |
| 86 |
- sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die |
| 87 |
- fi |
| 88 |
- sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die |
| 89 |
- cd "${S}" || die |
| 90 |
- |
| 91 |
# Regenerate acinclude.m4 - based on autogen.sh. |
| 92 |
cat > acinclude.m4 <<- _EOF || die |
| 93 |
dnl Automatically generated from config/m4/ files. |
| 94 |
@@ -132,7 +122,6 @@ src_install() { |
| 95 |
emake V=1 DESTDIR="${D}" install |
| 96 |
|
| 97 |
insinto /etc/elinks |
| 98 |
- doins "${WORKDIR}"/elinks.conf |
| 99 |
newins contrib/keybind-full.conf keybind-full.sample |
| 100 |
newins contrib/keybind.conf keybind.conf.sample |
| 101 |
|
| 102 |
@@ -148,9 +137,6 @@ src_install() { |
| 103 |
} |
| 104 |
|
| 105 |
pkg_postinst() { |
| 106 |
- einfo "This ebuild provides a default config for ELinks." |
| 107 |
- einfo "Please check /etc/elinks/elinks.conf" |
| 108 |
- einfo |
| 109 |
einfo "You may want to convert your html.cfg and links.cfg of" |
| 110 |
einfo "Links or older ELinks versions to the new ELinks elinks.conf" |
| 111 |
einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl" |
Archives