commit:     67eebc1a0cb282c810c872c535dedcd1d5a2fca5
Author:     Alex Efros <powerman <AT> powerman <DOT> name>
AuthorDate: Wed Mar 23 05:59:47 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 18:21:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67eebc1a

net-proxy/3proxy: EAPI 6 cleanup

Closes: https://github.com/gentoo/gentoo/pull/1118

 net-proxy/3proxy/3proxy-0.7.1.2.ebuild | 12 +++++-------
 net-proxy/3proxy/3proxy-0.7.1.4.ebuild | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/net-proxy/3proxy/3proxy-0.7.1.2.ebuild 
b/net-proxy/3proxy/3proxy-0.7.1.2.ebuild
index ca001f1..9fb9293 100644
--- a/net-proxy/3proxy/3proxy-0.7.1.2.ebuild
+++ b/net-proxy/3proxy/3proxy-0.7.1.2.ebuild
@@ -27,17 +27,15 @@ src_install() {
        dobin 3proxy
        for x in proxy socks ftppr pop3p tcppm udppm mycrypt dighosts 
countersutil ; do
                newbin ${x} ${PN}-${x}
-               [[ -f ${S}/man/${x}.8 ]] && newman "${S}"/man/${x}.8 
${PN}-${x}.8
+               [[ -f "${S}"/man/${x}.8 ]] && newman "${S}"/man/${x}.8 
${PN}-${x}.8
        done
        cd ..
 
-       doman "${S}"/man/3proxy*.[38]
+       doman man/3proxy*.[38]
 
-       cd "${S}"
        dodoc Readme
-       dohtml -r doc/html/*
+       docinto html
+       dodoc -r doc/html/*
        docinto cfg
-       dodoc cfg/*.{txt,sample}
-       docinto cfg/sql
-       dodoc cfg/sql/*.{cfg,sql}
+       dodoc -r cfg/*
 }

diff --git a/net-proxy/3proxy/3proxy-0.7.1.4.ebuild 
b/net-proxy/3proxy/3proxy-0.7.1.4.ebuild
index 556ce0a..a018336 100644
--- a/net-proxy/3proxy/3proxy-0.7.1.4.ebuild
+++ b/net-proxy/3proxy/3proxy-0.7.1.4.ebuild
@@ -27,17 +27,15 @@ src_install() {
        dobin 3proxy
        for x in proxy socks ftppr pop3p tcppm udppm mycrypt dighosts 
countersutil ; do
                newbin ${x} ${PN}-${x}
-               [[ -f ${S}/man/${x}.8 ]] && newman "${S}"/man/${x}.8 
${PN}-${x}.8
+               [[ -f "${S}"/man/${x}.8 ]] && newman "${S}"/man/${x}.8 
${PN}-${x}.8
        done
        cd ..
 
-       doman "${S}"/man/3proxy*.[38]
+       doman man/3proxy*.[38]
 
-       cd "${S}"
        dodoc Readme
-       dohtml -r doc/html/*
+       docinto html
+       dodoc -r doc/html/*
        docinto cfg
-       dodoc cfg/*.{txt,sample}
-       docinto cfg/sql
-       dodoc cfg/sql/*.{cfg,sql}
+       dodoc -r cfg/*
 }

Reply via email to