[gentoo-commits] repo/gentoo:master commit in: net-proxy/tinyproxy/

[Lars Wendler]

commit:     d24c4f2b2529ad3f009b200641793b5105c01426
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 09:34:49 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May  4 09:34:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d24c4f2b

net-proxy/tinyproxy: Fixed incomplete EAPI-6 conversion (bug #582060).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-proxy/tinyproxy/tinyproxy-1.8.3-r4.ebuild | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/net-proxy/tinyproxy/tinyproxy-1.8.3-r4.ebuild 
b/net-proxy/tinyproxy/tinyproxy-1.8.3-r4.ebuild
index ac0b0c7..83adc78 100644
--- a/net-proxy/tinyproxy/tinyproxy-1.8.3-r4.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.8.3-r4.ebuild
@@ -21,18 +21,21 @@ REQUIRED_USE="test? ( xtinyproxy-header )"
 
 DEPEND="!minimal? ( app-text/asciidoc )"
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.8.1-ldflags.patch
+       "${FILESDIR}"/${P}-r2-DoS-Prevention.patch
+
+)
+
 pkg_setup() {
        enewgroup ${PN}
        enewuser ${PN} "" "" "" ${PN}
 }
 
 src_prepare() {
-       default
+       use minimal && PATCHES+=( "${FILESDIR}/${PN}-1.8.1-minimal.patch" )
 
-       eapply "${FILESDIR}"/${PN}-1.8.1-ldflags.patch
-       eapply "${FILESDIR}"/${P}-r2-DoS-Prevention.patch
-
-       use minimal && epatch "${FILESDIR}/${PN}-1.8.1-minimal.patch"
+       default
 
        sed -i \
                -e "s|nobody|${PN}|g" \