www-client/elinks: use default upstream configuration.

Closes: https://bugs.gentoo.org/638730

diff --git a/www-client/elinks/elinks-0.12_pre6-r3.ebuild b/www-client/elinks/elinks-0.12_pre6-r4.ebuild
similarity index 90%
rename from www-client/elinks/elinks-0.12_pre6-r3.ebuild
rename to www-client/elinks/elinks-0.12_pre6-r4.ebuild
index f6e65dacca097bbc8700bab5a14f96deb8ed577f..8578fc6b794b9ee77d9cf46794a5267aa61ac302 100644 (file)
--- a/www-client/elinks/elinks-0.12_pre6-r3.ebuild
+++ b/www-client/elinks/elinks-0.12_pre6-r4.ebuild
@@ -8,7 +8,6 @@ MY_P="${P/_/}"
 DESCRIPTION="Advanced and well-established text-mode web browser"
 HOMEPAGE="http://elinks.or.cz/"
 SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
-       https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
        https://dev.gentoo.org/~axs/distfiles/${PN}-0.12_pre5-js185-patches.tar.bz2"
 
 LICENSE="GPL-2"
@@ -56,15 +55,6 @@ PATCHES=(
 src_prepare() {
        default
 
-       cd "${WORKDIR}" || die
-       eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
-       mv ${PN}-0.10.4.conf ${PN}.conf || die
-       if ! use ftp ; then
-               sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die
-       fi
-       sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die
-       cd "${S}" || die
-
        # fix lib order in configure check
        # (these seds are necessary so that @preserved-libs copies are not used)
        sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs185 mozjs js smjs; do:' \
@@ -138,7 +128,6 @@ src_install() {
        emake V=1 DESTDIR="${D}" install
 
        insinto /etc/elinks
-       doins "${WORKDIR}"/elinks.conf
        newins contrib/keybind-full.conf keybind-full.sample
        newins contrib/keybind.conf keybind.conf.sample
 
@@ -154,9 +143,6 @@ src_install() {
 }
 
 pkg_postinst() {
-       einfo "This ebuild provides a default config for ELinks."
-       einfo "Please check /etc/elinks/elinks.conf"
-       einfo
        einfo "You may want to convert your html.cfg and links.cfg of"
        einfo "Links or older ELinks versions to the new ELinks elinks.conf"
        einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"

diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index b524b78949ce8f7f473c720a3e0748f39cac0544..51db03c5551b77083ad7b456074e1eadf99dcc87 100644 (file)
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -11,7 +11,6 @@ EGIT_REPO_URI="git://repo.or.cz/elinks.git"
 MY_P="${P/_/}"
 DESCRIPTION="Advanced and well-established text-mode web browser"
 HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -54,15 +53,6 @@ src_unpack() {
 src_prepare() {
        default
 
-       cd "${WORKDIR}" || die
-       eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
-       mv ${PN}-0.10.4.conf ${PN}.conf || die
-       if ! use ftp ; then
-               sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die
-       fi
-       sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die
-       cd "${S}" || die
-
        # Regenerate acinclude.m4 - based on autogen.sh.
        cat > acinclude.m4 <<- _EOF || die
                dnl Automatically generated from config/m4/ files.
@@ -132,7 +122,6 @@ src_install() {
        emake V=1 DESTDIR="${D}" install
 
        insinto /etc/elinks
-       doins "${WORKDIR}"/elinks.conf
        newins contrib/keybind-full.conf keybind-full.sample
        newins contrib/keybind.conf keybind.conf.sample
 
@@ -148,9 +137,6 @@ src_install() {
 }
 
 pkg_postinst() {
-       einfo "This ebuild provides a default config for ELinks."
-       einfo "Please check /etc/elinks/elinks.conf"
-       einfo
        einfo "You may want to convert your html.cfg and links.cfg of"
        einfo "Links or older ELinks versions to the new ELinks elinks.conf"
        einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"