diff options
Diffstat (limited to 'net-vpn/tinc')
| -rw-r--r-- | net-vpn/tinc/Manifest | 2 | ||||
| -rw-r--r-- | net-vpn/tinc/tinc-1.1_pre15.ebuild | 26 |
2 files changed, 13 insertions, 15 deletions
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest index 86ed3d38f510..5765326f5f68 100644 --- a/net-vpn/tinc/Manifest +++ b/net-vpn/tinc/Manifest @@ -12,5 +12,5 @@ DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B e97f044066a3c399b4089ed73e77a7890483703 EBUILD tinc-1.0.31.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c EBUILD tinc-1.0.32.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c EBUILD tinc-1.0.33.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c -EBUILD tinc-1.1_pre15.ebuild 2463 BLAKE2B 4af2897de07c7451630edf7ad2d8760556dbf4bcbc1cbbc32122ce1b4c946f4ce865e1f30c334afd2328ccd9bcee9bbe7500357064065bcc7eb5a91a41642e38 SHA512 0f40a4c374d06758444aa9748d46ea61324445027eff5c6d94bd8af96dc3341ef2e78d7ccd6cdbd72904f8803e09c83863febe98262019027d6e52955e2c832e +EBUILD tinc-1.1_pre15.ebuild 2330 BLAKE2B 677427570cdf3eba07d8c12af052576e4275d5995387828dced0520eca51bab34c432b8822dacd7b82f473e80b2c4b576b76038e834ce0344ecbf0043e05047c SHA512 b0a73cd46da15d49c40dbc76c12348b3577d6f1ed17182ba57bd390a0b01eda2e878443c9061fbb6b4f5b81a775120c5024e8ae34eed70a6a0008aeb9bbe274b MISC metadata.xml 803 BLAKE2B 6cbe55ecefa33a96893318ec94f64e8b768bcdb52cec36ca8a57c80cd1dfb06543bd3dcf9686e79c71f984502da3dba0f492d43f253d37e9cc6107e6e5206e41 SHA512 23ccfff115ec3553356db3b2a16f436cee60f5471e4a240d032cf48d89a73ef350545bc91b3976b188ad3658ff83d0037ccc00a5f3f5864e2704d4616e1095ac 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 } |