net-proxy/3proxy: EAPI 6 cleanup

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

diff --git a/net-proxy/3proxy/3proxy-0.7.1.2.ebuild b/net-proxy/3proxy/3proxy-0.7.1.2.ebuild
index ca001f1128c82d421d019bc3c2b6309b25ebe482..9fb9293b70148e64db1967cba36749394d9b8a6c 100644 (file)
--- 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 556ce0adf098e070167d88e6ba73d8b7acf1a419..a0183362260b3792d50fa502ee45e657d54a9417 100644 (file)
--- 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/*
 }