From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 758C61382C5 for ; Sat, 21 Apr 2018 11:15:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E610E086A; Sat, 21 Apr 2018 11:15:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6C9A4E086A for ; Sat, 21 Apr 2018 11:15:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5DA0335C78 for ; Sat, 21 Apr 2018 11:15:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31FEB29F for ; Sat, 21 Apr 2018 11:15:55 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1524309313.4b8c292c5c97cf34c3d8494b5d7d2195278c5340.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/tinc/tinc-1.1_pre15.ebuild X-VCS-Directories: net-vpn/tinc/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 4b8c292c5c97cf34c3d8494b5d7d2195278c5340 X-VCS-Branch: master Date: Sat, 21 Apr 2018 11:15:55 +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: 4efe5f09-9446-46ad-bf57-07e37bca8a40 X-Archives-Hash: 0a4d8c19c4e0ab1d1444aa8f5162f46d commit: 4b8c292c5c97cf34c3d8494b5d7d2195278c5340 Author: Marty E. Plummer startmail com> AuthorDate: Fri Apr 20 16:47:35 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Apr 21 11:15:13 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b8c292c net-vpn/tinc: reworked UPSTREAM_VER to use eapply Also dropped unneeded multilib eclass. Package-Manager: Portage-2.3.31, Repoman-2.3.9 net-vpn/tinc/tinc-1.1_pre15.ebuild | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild b/net-vpn/tinc/tinc-1.1_pre15.ebuild index 57d5cee1828..ea6d0816b40 100644 --- a/net-vpn/tinc/tinc-1.1_pre15.ebuild +++ b/net-vpn/tinc/tinc-1.1_pre15.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=6 MY_PV=${PV/_/} MY_P=${PN}-${MY_PV} PYTHON_COMPAT=( python2_7 ) -inherit autotools multilib python-single-r1 systemd +inherit autotools python-single-r1 systemd DESCRIPTION="tinc is an easy to configure VPN implementation" HOMEPAGE="http://www.tinc-vpn.org/" @@ -43,20 +43,18 @@ RDEPEND="${DEPEND} vde? ( net-misc/vde )" S="${WORKDIR}/${MY_P}" -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - einfo "Try to apply Tinc Upstream patch set" - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi +# Upstream's patchset +if [[ -n ${UPSTREAM_VER} ]]; then + PATCHES=( "${WORKDIR}"/patches-upstream ) +fi - eapply "${FILESDIR}"/tinc-1.1-fix-paths.patch #560528 - eapply "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868 - eapply_user +PATCHES+=( + "${FILESDIR}"/${PN}-1.1-fix-paths.patch #560528 + "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868 +) +src_prepare() { + default eautoreconf }