diff options
| author |   Marty E. Plummer <hanetzer@startmail.com> | 2018-04-20 11:47:35 -0500 |
|---|---|---|
| committer |   Anthony G. Basile <blueness@gentoo.org> | 2018-04-21 07:15:13 -0400 |
| commit | 4b8c292c5c97cf34c3d8494b5d7d2195278c5340 (patch) | |
| tree | 5665ce4b2f44d729a468652affc3d2324d0031e9 /net-vpn/tinc | |
| parent | dev-util/elfkickers: epatch->PATCHES=() (diff) | |
| download | gentoo-4b8c292c5c97cf34c3d8494b5d7d2195278c5340.tar.gz gentoo-4b8c292c5c97cf34c3d8494b5d7d2195278c5340.tar.bz2 gentoo-4b8c292c5c97cf34c3d8494b5d7d2195278c5340.zip | |
net-vpn/tinc: reworked UPSTREAM_VER to use eapply
Also dropped unneeded multilib eclass.
Package-Manager: Portage-2.3.31, Repoman-2.3.9
Diffstat (limited to 'net-vpn/tinc')
| -rw-r--r-- | net-vpn/tinc/tinc-1.1_pre15.ebuild | 26 |
1 files 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 57d5cee18286..ea6d0816b40c 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 } |