From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B0D16138222 for ; Wed, 4 May 2016 09:35:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B47221C012; Wed, 4 May 2016 09:35:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B09F621C012 for ; Wed, 4 May 2016 09:35:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C18283408A6 for ; Wed, 4 May 2016 09:35:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 894C2328 for ; Wed, 4 May 2016 09:35:34 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1462354489.d24c4f2b2529ad3f009b200641793b5105c01426.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/tinyproxy/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/tinyproxy/tinyproxy-1.8.3-r4.ebuild X-VCS-Directories: net-proxy/tinyproxy/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: d24c4f2b2529ad3f009b200641793b5105c01426 X-VCS-Branch: master Date: Wed, 4 May 2016 09:35:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 04de353d-1b52-47c1-b3ad-eec47493a925 X-Archives-Hash: 04462703b45d4160082a98ee077280a8 commit: d24c4f2b2529ad3f009b200641793b5105c01426 Author: Lars Wendler gentoo org> AuthorDate: Wed May 4 09:34:49 2016 +0000 Commit: Lars Wendler gentoo 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 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" \