[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Sam James]

commit: 4d399c7b4f59f0ec81a0249585ce1a1ab008ef8f
Author: Eli Schwartz  gmail  com>
AuthorDate: Thu Apr  4 04:57:24 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  5 01:20:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d399c7b

net-vpn/tinc: mark as LTO-unsafe

It is fixed upstream in git but not released.

Closes: https://bugs.gentoo.org/877743
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 net-vpn/tinc/tinc-1.1_pre18.ebuild | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/net-vpn/tinc/tinc-1.1_pre18.ebuild 
b/net-vpn/tinc/tinc-1.1_pre18.ebuild
index a1f6b4969f72..e5e8aca62cfa 100644
--- a/net-vpn/tinc/tinc-1.1_pre18.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 MY_PV=${PV/_/}
 MY_P=${PN}-${MY_PV}
 
-inherit autotools systemd
+inherit autotools flag-o-matic systemd
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="https://www.tinc-vpn.org/;
@@ -49,6 +49,13 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=lto-type-mismatch
+   # https://bugs.gentoo.org/877743
+   #
+   # Fixed upstream:
+   # 
https://github.com/gsliepen/tinc/commit/28b7a53b693f6b4e70218a926e68a36ece54cda1
+   filter-lto
+
econf \
--enable-jumbograms \
--enable-legacy-protocol \

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Sam James]

commit: 1e36eee944d232ea058b0b75f42b2dfe3cbb4827
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 25 22:59:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 25 22:59:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e36eee9

net-vpn/tinc: avoid maintainer mode

Signed-off-by: Sam James  gentoo.org>

 net-vpn/tinc/tinc-1.1_pre18.ebuild | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/net-vpn/tinc/tinc-1.1_pre18.ebuild 
b/net-vpn/tinc/tinc-1.1_pre18.ebuild
index 58f8b912f8d8..a1f6b4969f72 100644
--- a/net-vpn/tinc/tinc-1.1_pre18.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,13 +38,14 @@ PATCHES+=(
 
 src_prepare() {
default
-   eautoreconf
 
# Fix the static (failing UNKNOWN) version in the autoconf
# NOTE: When updating the ebuild, make sure to check that this
# line number hasn't changed in the upstream sources.
-   sed -i "6d" configure.ac
-   sed -i "6iAC_INIT([tinc], ${PVR})" configure.ac
+   sed -i "6d" configure.ac || die
+   sed -i "6iAC_INIT([tinc], ${PVR})" configure.ac || die
+
+eautoreconf
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Sam James]

commit: d804d7a2ffdb9fe0bee5b6654d6e0754151948a1
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul  3 00:46:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul  3 00:46:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d804d7a2

net-vpn/tinc: use HTTPS

Signed-off-by: Sam James  gentoo.org>

 net-vpn/tinc/tinc-1.0.36.ebuild| 4 ++--
 net-vpn/tinc/tinc-1.1_pre18.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-vpn/tinc/tinc-1.0.36.ebuild b/net-vpn/tinc/tinc-1.0.36.ebuild
index a5126df2ce23..37a9ad73c249 100644
--- a/net-vpn/tinc/tinc-1.0.36.ebuild
+++ b/net-vpn/tinc/tinc-1.0.36.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 inherit systemd
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/;
+HOMEPAGE="https://www.tinc-vpn.org/;
 
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
+SRC_URI="https://www.tinc-vpn.org/packages/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/net-vpn/tinc/tinc-1.1_pre18.ebuild 
b/net-vpn/tinc/tinc-1.1_pre18.ebuild
index fe12962f130f..58f8b912f8d8 100644
--- a/net-vpn/tinc/tinc-1.1_pre18.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre18.ebuild
@@ -9,9 +9,9 @@ MY_P=${PN}-${MY_PV}
 inherit autotools systemd
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/;
+HOMEPAGE="https://www.tinc-vpn.org/;
 
-SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz;
+SRC_URI="https://www.tinc-vpn.org/packages/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[WANG Xuerui]

commit: 919e4a4877c4442b2b1e70b9a34d4b0f2f0a20a4
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu May  5 10:00:06 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu May  5 10:05:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=919e4a48

net-vpn/tinc: keyword 1.0.36 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 net-vpn/tinc/tinc-1.0.36.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/tinc/tinc-1.0.36.ebuild b/net-vpn/tinc/tinc-1.0.36.ebuild
index 070db9c07709..a5126df2ce23 100644
--- a/net-vpn/tinc/tinc-1.0.36.ebuild
+++ b/net-vpn/tinc/tinc-1.0.36.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 IUSE="+lzo uml vde +zlib"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[WANG Xuerui]

commit: b790650281f46692e1a3ec1bf5fe3bbe908daa2c
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu May  5 10:00:10 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu May  5 10:05:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7906502

net-vpn/tinc: keyword 1.1_pre18 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 net-vpn/tinc/tinc-1.1_pre18.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-vpn/tinc/tinc-1.1_pre18.ebuild 
b/net-vpn/tinc/tinc-1.1_pre18.ebuild
index 20539694eac6..fe12962f130f 100644
--- a/net-vpn/tinc/tinc-1.1_pre18.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+lzo +ncurses +readline +ssl uml vde upnp +zlib"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Jakov Smolić]

commit: c5b4553f25817a6fa66dabbdeb83166c34a69d59
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Mar  6 10:11:47 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Mar  6 10:11:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5b4553f

net-vpn/tinc: Stabilize 1.0.36 amd64, #834648

Signed-off-by: Jakov Smolić  gentoo.org>

 net-vpn/tinc/tinc-1.0.36.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-vpn/tinc/tinc-1.0.36.ebuild b/net-vpn/tinc/tinc-1.0.36.ebuild
index e22c1b81a520..070db9c07709 100644
--- a/net-vpn/tinc/tinc-1.0.36.ebuild
+++ b/net-vpn/tinc/tinc-1.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 IUSE="+lzo uml vde +zlib"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Yixun Lan]

commit: cf04b0281a5b95796fb24f3af41d17361705f8c5
Author: Yixun Lan  gentoo  org>
AuthorDate: Thu Sep  2 06:12:49 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Thu Sep  2 06:24:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf04b028

net-vpn/tinc: keyword ~riscv

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Yixun Lan  gentoo.org>

 net-vpn/tinc/tinc-1.0.36.ebuild| 2 +-
 net-vpn/tinc/tinc-1.1_pre18.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-vpn/tinc/tinc-1.0.36.ebuild b/net-vpn/tinc/tinc-1.0.36.ebuild
index 5094bc4d00f..e22c1b81a52 100644
--- a/net-vpn/tinc/tinc-1.0.36.ebuild
+++ b/net-vpn/tinc/tinc-1.0.36.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 IUSE="+lzo uml vde +zlib"
 
 DEPEND="

diff --git a/net-vpn/tinc/tinc-1.1_pre18.ebuild 
b/net-vpn/tinc/tinc-1.1_pre18.ebuild
index 6ffcb15a205..20539694eac 100644
--- a/net-vpn/tinc/tinc-1.1_pre18.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre18.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 IUSE="+lzo +ncurses +readline +ssl uml vde upnp +zlib"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Anthony G. Basile]

commit: a1826e2fff99aacd11084256ddf9d82edfc5a8a4
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Jun 28 23:25:17 2021 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Jun 28 23:25:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1826e2f

net-vpn/tinc: remove 1.0.35, bump to 1.1_pre18

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-vpn/tinc/Manifest  |  5 +-
 net-vpn/tinc/tinc-1.0.35-r2.ebuild | 53 --
 ...c-1.1_pre17-r1.ebuild => tinc-1.1_pre18.ebuild} | 13 +-
 3 files changed, 2 insertions(+), 69 deletions(-)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index b72f05dadb4..00ec92b71c0 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,5 +1,2 @@
-DIST tinc-1.0.35-upstream-patches-1.tar.xz 6028 BLAKE2B 
d236125211efda0c8b5aa4e93a278fec17d57ecb257ea057ca67f2a465d1da7d069f6d3a97220dc1e40123266bc2fc68685d2ea2e143033a12199278b073c31b
 SHA512 
8ae2b96d5f296bc5d0d21fa814832ccafdb5595b06d60d72a090eadb4aade9e386990801b5e1a8cca722f1aa2d21e70f9154570feede6a9771a0eaec83ab
-DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 
419b581167614d534b6f2f3b804657f088c013529d7738766aff199da775860ffed42ecb61e8ed008c5b6fa410f071e2fe1ca59f0c6e443c0a8017cd10c31ce3
 SHA512 
037867306c21506d57d69d35c0f246b2936022047978fa3e01464b5f6b65f109760507d9cc740f82f8166f39c5ce44d9f8dde55655a6372dacd5b5974aeaee32
 DIST tinc-1.0.36.tar.gz 500320 BLAKE2B 
6f799ab04f9553fa389baf9d60121540b1fc7d5b5c2b62b2ebe0bf7478f5f69e8638a9c1b15f8ab84268d813ac1b1978c73b12a478b682cd808747fd2eed951c
 SHA512 
23af9162f7ae700bad01e1f59f23f32d1b183b185ec35f4a69a987c52c53cfebfa9e852203b399f035988078e9131e5d59b018554a52a30044f34df6e64b5289
-DIST tinc-1.1-upstream-patches-2.tar.xz 23500 BLAKE2B 
ab44d2efcd494c6a49e9e0bc109670a586b087d5ce1daab9b9cdf8f50a4c9b9d927e102fe947e75e6f7be509ba9315936315006b557b39639399bc7f40109f5f
 SHA512 
351537f212421e7fe28fcf97293550edaa4c4c8a578bf4eeca34ae591caefb222df4d5d96bfa03bddd6afcb5143e68b59f5341b2a6412c053a3cecf4fdd0bee8
-DIST tinc-1.1pre17.tar.gz 927313 BLAKE2B 
d16789b64f6d11deda4752fdeeb603fe62efd6b1d68b0286fbe9c329d8ea51494df59e0e5bf1564b25a0ed44e9244799eb61f73de9ded6a1a418417453adddc4
 SHA512 
b966dbfa522e12ff6766c4deb54a9da29cddc15c3a1df0f0e084df27ee5f1421ffbebc0e29472b1bcd79ea8b41f8c0ef904172e333dcba0b85bafe4654a63b30
+DIST tinc-1.1pre18.tar.gz 732111 BLAKE2B 
b236a8a0b7f8b755d71f2e2564af6bd13f5d87aec512b7db388ac1e23110cfdac80d8b642644a4b35fa81d37765e9ced65cc535d48e34b79190c2eddb107a9e2
 SHA512 
d8b03c78fd579df58d4c8a03f5d2241d2c95edb660ce9aa34441f6e75df09e3fff7524215c7c4b3622311e80f5bb452a6ac1205f3fd13424d56135f70b973183

diff --git a/net-vpn/tinc/tinc-1.0.35-r2.ebuild 
b/net-vpn/tinc/tinc-1.0.35-r2.ebuild
deleted file mode 100644
index be4c667f269..000
--- a/net-vpn/tinc/tinc-1.0.35-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/;
-
-UPSTREAM_VER=1
-
-[[ -n ${UPSTREAM_VER} ]] && \
-   
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz;
-
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz
-   ${UPSTREAM_PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos"
-IUSE="+lzo uml vde +zlib"
-
-DEPEND="
-   dev-libs/openssl:0=
-   lzo? ( dev-libs/lzo:2 )
-   zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-   vde? ( net-misc/vde )"
-
-# Upstream's patchset
-if [[ -n ${UPSTREAM_VER} ]]; then
-   PATCHES=( "${WORKDIR}"/patches-upstream )
-fi
-
-src_configure() {
-   econf \
-   --enable-jumbograms \
-   --disable-tunemu  \
-   $(use_enable lzo) \
-   $(use_enable uml) \
-   $(use_enable vde) \
-   $(use_enable zlib)
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   dodir /etc/tinc
-   dodoc AUTHORS NEWS README THANKS
-   doconfd "${FILESDIR}"/tinc.networks
-   newconfd "${FILESDIR}"/tincd.conf tincd
-   newinitd "${FILESDIR}"/tincd-r1 tincd
-   systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
-}

diff --git a/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild 
b/net-vpn/tinc/tinc-1.1_pre18.ebuild
similarity index 84%
rename from net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
rename to net-vpn/tinc/tinc-1.1_pre18.ebuild
index 3d984145f79..6ffcb15a205 100644
--- a/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre18.ebuild
@@ -11,13 +11,7 @@ inherit autotools systemd
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="http://www.tinc-vpn.org/;
 
-UPSTREAM_VER=2
-
-[[ -n ${UPSTREAM_VER} ]] && \
-

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Mikle Kolyada]

commit: 1bd57eea7f71ccaa840e6cc914382547179d7fdc
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 15:04:18 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 15:07:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd57eea

net-vpn/tinc: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-vpn/tinc/tinc-1.0.35-r2.ebuild| 5 ++---
 net-vpn/tinc/tinc-1.0.36.ebuild   | 5 ++---
 net-vpn/tinc/tinc-1.1_pre17-r1.ebuild | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/net-vpn/tinc/tinc-1.0.35-r2.ebuild 
b/net-vpn/tinc/tinc-1.0.35-r2.ebuild
index 939a35de4cd..be4c667f269 100644
--- a/net-vpn/tinc/tinc-1.0.35-r2.ebuild
+++ b/net-vpn/tinc/tinc-1.0.35-r2.ebuild
@@ -18,11 +18,10 @@ SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos"
-IUSE="libressl +lzo uml vde +zlib"
+IUSE="+lzo uml vde +zlib"
 
 DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
lzo? ( dev-libs/lzo:2 )
zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}

diff --git a/net-vpn/tinc/tinc-1.0.36.ebuild b/net-vpn/tinc/tinc-1.0.36.ebuild
index 1b6f632bb8a..5094bc4d00f 100644
--- a/net-vpn/tinc/tinc-1.0.36.ebuild
+++ b/net-vpn/tinc/tinc-1.0.36.ebuild
@@ -12,11 +12,10 @@ SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos"
-IUSE="libressl +lzo uml vde +zlib"
+IUSE="+lzo uml vde +zlib"
 
 DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
lzo? ( dev-libs/lzo:2 )
zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}

diff --git a/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild 
b/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
index aa515c1303b..3d984145f79 100644
--- a/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
@@ -22,12 +22,11 @@ SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
-IUSE="+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib"
+IUSE="+lzo +ncurses +readline +ssl uml vde upnp +zlib"
 
 DEPEND="
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
)
lzo? ( dev-libs/lzo:2 )
ncurses? ( sys-libs/ncurses:= )

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Fabian Groffen]

commit: 7a75f61d769f3d155a6d3be8559b058f4b006569
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 14:52:24 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 15:06:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a75f61d

net-vpn/tinc: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 net-vpn/tinc/tinc-1.0.35-r2.ebuild| 4 ++--
 net-vpn/tinc/tinc-1.0.36.ebuild   | 4 ++--
 net-vpn/tinc/tinc-1.1_pre17-r1.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-vpn/tinc/tinc-1.0.35-r2.ebuild 
b/net-vpn/tinc/tinc-1.0.35-r2.ebuild
index 7f3390de4c1..939a35de4cd 100644
--- a/net-vpn/tinc/tinc-1.0.35-r2.ebuild
+++ b/net-vpn/tinc/tinc-1.0.35-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos"
 IUSE="libressl +lzo uml vde +zlib"
 
 DEPEND="

diff --git a/net-vpn/tinc/tinc-1.0.36.ebuild b/net-vpn/tinc/tinc-1.0.36.ebuild
index d239ba672fd..1b6f632bb8a 100644
--- a/net-vpn/tinc/tinc-1.0.36.ebuild
+++ b/net-vpn/tinc/tinc-1.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos"
 IUSE="libressl +lzo uml vde +zlib"
 
 DEPEND="

diff --git a/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild 
b/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
index a98a080d9e8..aa515c1303b 100644
--- a/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 IUSE="+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Anthony G. Basile]

commit: 5b0b0fadef0c048aac6f348397437fe20ba26e20
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Feb 24 14:57:51 2020 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Feb 24 14:57:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b0b0fad

net-vpn/tinc: further cleanup for bug #709328

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-vpn/tinc/tinc-1.1_pre17-r1.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild 
b/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
index e376be94df3..a98a080d9e8 100644
--- a/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
@@ -23,10 +23,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
-   ${PYTHON_DEPS}
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Anthony G. Basile]

commit: bc5298510ea6ea0a2cae843449a06b86dec4adf0
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Feb 23 20:59:33 2020 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Feb 23 20:59:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc529851

net-vpn/tinc: remove dependence on python, bug #709328

Closes: https://bugs.gentoo.org/709328
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-vpn/tinc/{tinc-1.1_pre17.ebuild => tinc-1.1_pre17-r1.ebuild} | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net-vpn/tinc/tinc-1.1_pre17.ebuild 
b/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
similarity index 96%
rename from net-vpn/tinc/tinc-1.1_pre17.ebuild
rename to net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
index 589684a694b..e376be94df3 100644
--- a/net-vpn/tinc/tinc-1.1_pre17.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
@@ -6,9 +6,7 @@ EAPI=7
 MY_PV=${PV/_/}
 MY_P=${PN}-${MY_PV}
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1 systemd
+inherit autotools systemd
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="http://www.tinc-vpn.org/;

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Anthony G. Basile]

commit: 57a36e030ff7e0e37a1dcb7dfaa6ffaecda6e19a
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue Aug 27 14:33:47 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Aug 27 14:33:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a36e03

net-vpn/tinc: version bump to 1.0.36

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-vpn/tinc/Manifest   |  1 +
 net-vpn/tinc/tinc-1.0.36.ebuild | 43 +
 2 files changed, 44 insertions(+)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 3c00a622ed5..b72f05dadb4 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,4 +1,5 @@
 DIST tinc-1.0.35-upstream-patches-1.tar.xz 6028 BLAKE2B 
d236125211efda0c8b5aa4e93a278fec17d57ecb257ea057ca67f2a465d1da7d069f6d3a97220dc1e40123266bc2fc68685d2ea2e143033a12199278b073c31b
 SHA512 
8ae2b96d5f296bc5d0d21fa814832ccafdb5595b06d60d72a090eadb4aade9e386990801b5e1a8cca722f1aa2d21e70f9154570feede6a9771a0eaec83ab
 DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 
419b581167614d534b6f2f3b804657f088c013529d7738766aff199da775860ffed42ecb61e8ed008c5b6fa410f071e2fe1ca59f0c6e443c0a8017cd10c31ce3
 SHA512 
037867306c21506d57d69d35c0f246b2936022047978fa3e01464b5f6b65f109760507d9cc740f82f8166f39c5ce44d9f8dde55655a6372dacd5b5974aeaee32
+DIST tinc-1.0.36.tar.gz 500320 BLAKE2B 
6f799ab04f9553fa389baf9d60121540b1fc7d5b5c2b62b2ebe0bf7478f5f69e8638a9c1b15f8ab84268d813ac1b1978c73b12a478b682cd808747fd2eed951c
 SHA512 
23af9162f7ae700bad01e1f59f23f32d1b183b185ec35f4a69a987c52c53cfebfa9e852203b399f035988078e9131e5d59b018554a52a30044f34df6e64b5289
 DIST tinc-1.1-upstream-patches-2.tar.xz 23500 BLAKE2B 
ab44d2efcd494c6a49e9e0bc109670a586b087d5ce1daab9b9cdf8f50a4c9b9d927e102fe947e75e6f7be509ba9315936315006b557b39639399bc7f40109f5f
 SHA512 
351537f212421e7fe28fcf97293550edaa4c4c8a578bf4eeca34ae591caefb222df4d5d96bfa03bddd6afcb5143e68b59f5341b2a6412c053a3cecf4fdd0bee8
 DIST tinc-1.1pre17.tar.gz 927313 BLAKE2B 
d16789b64f6d11deda4752fdeeb603fe62efd6b1d68b0286fbe9c329d8ea51494df59e0e5bf1564b25a0ed44e9244799eb61f73de9ded6a1a418417453adddc4
 SHA512 
b966dbfa522e12ff6766c4deb54a9da29cddc15c3a1df0f0e084df27ee5f1421ffbebc0e29472b1bcd79ea8b41f8c0ef904172e333dcba0b85bafe4654a63b30

diff --git a/net-vpn/tinc/tinc-1.0.36.ebuild b/net-vpn/tinc/tinc-1.0.36.ebuild
new file mode 100644
index 000..d239ba672fd
--- /dev/null
+++ b/net-vpn/tinc/tinc-1.0.36.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/;
+
+SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+IUSE="libressl +lzo uml vde +zlib"
+
+DEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   lzo? ( dev-libs/lzo:2 )
+   zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+   vde? ( net-misc/vde )"
+
+src_configure() {
+   econf \
+   --enable-jumbograms \
+   --disable-tunemu  \
+   $(use_enable lzo) \
+   $(use_enable uml) \
+   $(use_enable vde) \
+   $(use_enable zlib)
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   dodir /etc/tinc
+   dodoc AUTHORS NEWS README THANKS
+   doconfd "${FILESDIR}"/tinc.networks
+   newconfd "${FILESDIR}"/tincd.conf tincd
+   newinitd "${FILESDIR}"/tincd-r1 tincd
+   systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Yixun Lan]

commit: d74c25791f6596212974d4d43ddab21edd1b6215
Author: Yixun Lan  gentoo  org>
AuthorDate: Mon Apr 15 07:10:08 2019 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Apr 15 07:11:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d74c2579

net-vpn/tinc: drop old versions

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Yixun Lan  gentoo.org>

 net-vpn/tinc/Manifest |  2 -
 net-vpn/tinc/tinc-1.0.35-r1.ebuild| 54 
 net-vpn/tinc/tinc-1.0.35.ebuild   | 42 ---
 net-vpn/tinc/tinc-1.1_pre16-r1.ebuild | 96 ---
 4 files changed, 194 deletions(-)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 63c79ddf921..3c00a622ed5 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,6 +1,4 @@
-DIST tinc-1.0.35-upstream-patches-0.tar.xz 2884 BLAKE2B 
a01ee1a372cc366402c005a48adccd7e31bd3182c1fc6df2dc27aecd622266be06f2c25aa169794b2970fe1f8218b7fa813365f8852e165ed2356ed885c5fde3
 SHA512 
c95add88e05dc7dc8d09618dd07870e400e1fe28c8f864acbf131d9616d75337fd1d2d7b44ee80c3f31e1b713f258bb9d575956114e73fea781488d2b477a5f5
 DIST tinc-1.0.35-upstream-patches-1.tar.xz 6028 BLAKE2B 
d236125211efda0c8b5aa4e93a278fec17d57ecb257ea057ca67f2a465d1da7d069f6d3a97220dc1e40123266bc2fc68685d2ea2e143033a12199278b073c31b
 SHA512 
8ae2b96d5f296bc5d0d21fa814832ccafdb5595b06d60d72a090eadb4aade9e386990801b5e1a8cca722f1aa2d21e70f9154570feede6a9771a0eaec83ab
 DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 
419b581167614d534b6f2f3b804657f088c013529d7738766aff199da775860ffed42ecb61e8ed008c5b6fa410f071e2fe1ca59f0c6e443c0a8017cd10c31ce3
 SHA512 
037867306c21506d57d69d35c0f246b2936022047978fa3e01464b5f6b65f109760507d9cc740f82f8166f39c5ce44d9f8dde55655a6372dacd5b5974aeaee32
 DIST tinc-1.1-upstream-patches-2.tar.xz 23500 BLAKE2B 
ab44d2efcd494c6a49e9e0bc109670a586b087d5ce1daab9b9cdf8f50a4c9b9d927e102fe947e75e6f7be509ba9315936315006b557b39639399bc7f40109f5f
 SHA512 
351537f212421e7fe28fcf97293550edaa4c4c8a578bf4eeca34ae591caefb222df4d5d96bfa03bddd6afcb5143e68b59f5341b2a6412c053a3cecf4fdd0bee8
-DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B 
c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b
 SHA512 
b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43
 DIST tinc-1.1pre17.tar.gz 927313 BLAKE2B 
d16789b64f6d11deda4752fdeeb603fe62efd6b1d68b0286fbe9c329d8ea51494df59e0e5bf1564b25a0ed44e9244799eb61f73de9ded6a1a418417453adddc4
 SHA512 
b966dbfa522e12ff6766c4deb54a9da29cddc15c3a1df0f0e084df27ee5f1421ffbebc0e29472b1bcd79ea8b41f8c0ef904172e333dcba0b85bafe4654a63b30

diff --git a/net-vpn/tinc/tinc-1.0.35-r1.ebuild 
b/net-vpn/tinc/tinc-1.0.35-r1.ebuild
deleted file mode 100644
index 1f2d089df01..000
--- a/net-vpn/tinc/tinc-1.0.35-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/;
-
-UPSTREAM_VER=0
-
-[[ -n ${UPSTREAM_VER} ]] && \
-   
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz;
-
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz
-   ${UPSTREAM_PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
-IUSE="libressl +lzo uml vde +zlib"
-
-DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   lzo? ( dev-libs/lzo:2 )
-   zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-   vde? ( net-misc/vde )"
-
-# Upstream's patchset
-if [[ -n ${UPSTREAM_VER} ]]; then
-   PATCHES=( "${WORKDIR}"/patches-upstream )
-fi
-
-src_configure() {
-   econf \
-   --enable-jumbograms \
-   --disable-tunemu  \
-   $(use_enable lzo) \
-   $(use_enable uml) \
-   $(use_enable vde) \
-   $(use_enable zlib)
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   dodir /etc/tinc
-   dodoc AUTHORS NEWS README THANKS
-   doconfd "${FILESDIR}"/tinc.networks
-   newconfd "${FILESDIR}"/tincd.conf tincd
-   newinitd "${FILESDIR}"/tincd-r1 tincd
-   systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
-}

diff --git a/net-vpn/tinc/tinc-1.0.35.ebuild b/net-vpn/tinc/tinc-1.0.35.ebuild
deleted file mode 100644
index 8d387dbc59c..000
--- a/net-vpn/tinc/tinc-1.0.35.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Yixun Lan]

commit: 34da8fc9b7346abe20d3f97fe319bc849a0518dc
Author: Yixun Lan  gentoo  org>
AuthorDate: Mon Apr 15 07:07:20 2019 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Apr 15 07:11:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34da8fc9

net-vpn/tinc: fix icmpv6 checksum error

backport the patch from tinc-1.1 branch,
thanks Benda Xu for testing

Closes: https://bugs.gentoo.org/683160
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Yixun Lan  gentoo.org>

 net-vpn/tinc/Manifest  |  1 +
 net-vpn/tinc/tinc-1.0.35-r2.ebuild | 54 ++
 2 files changed, 55 insertions(+)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index e161801b399..63c79ddf921 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,4 +1,5 @@
 DIST tinc-1.0.35-upstream-patches-0.tar.xz 2884 BLAKE2B 
a01ee1a372cc366402c005a48adccd7e31bd3182c1fc6df2dc27aecd622266be06f2c25aa169794b2970fe1f8218b7fa813365f8852e165ed2356ed885c5fde3
 SHA512 
c95add88e05dc7dc8d09618dd07870e400e1fe28c8f864acbf131d9616d75337fd1d2d7b44ee80c3f31e1b713f258bb9d575956114e73fea781488d2b477a5f5
+DIST tinc-1.0.35-upstream-patches-1.tar.xz 6028 BLAKE2B 
d236125211efda0c8b5aa4e93a278fec17d57ecb257ea057ca67f2a465d1da7d069f6d3a97220dc1e40123266bc2fc68685d2ea2e143033a12199278b073c31b
 SHA512 
8ae2b96d5f296bc5d0d21fa814832ccafdb5595b06d60d72a090eadb4aade9e386990801b5e1a8cca722f1aa2d21e70f9154570feede6a9771a0eaec83ab
 DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 
419b581167614d534b6f2f3b804657f088c013529d7738766aff199da775860ffed42ecb61e8ed008c5b6fa410f071e2fe1ca59f0c6e443c0a8017cd10c31ce3
 SHA512 
037867306c21506d57d69d35c0f246b2936022047978fa3e01464b5f6b65f109760507d9cc740f82f8166f39c5ce44d9f8dde55655a6372dacd5b5974aeaee32
 DIST tinc-1.1-upstream-patches-2.tar.xz 23500 BLAKE2B 
ab44d2efcd494c6a49e9e0bc109670a586b087d5ce1daab9b9cdf8f50a4c9b9d927e102fe947e75e6f7be509ba9315936315006b557b39639399bc7f40109f5f
 SHA512 
351537f212421e7fe28fcf97293550edaa4c4c8a578bf4eeca34ae591caefb222df4d5d96bfa03bddd6afcb5143e68b59f5341b2a6412c053a3cecf4fdd0bee8
 DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B 
c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b
 SHA512 
b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43

diff --git a/net-vpn/tinc/tinc-1.0.35-r2.ebuild 
b/net-vpn/tinc/tinc-1.0.35-r2.ebuild
new file mode 100644
index 000..7f3390de4c1
--- /dev/null
+++ b/net-vpn/tinc/tinc-1.0.35-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/;
+
+UPSTREAM_VER=1
+
+[[ -n ${UPSTREAM_VER} ]] && \
+   
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz;
+
+SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz
+   ${UPSTREAM_PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+IUSE="libressl +lzo uml vde +zlib"
+
+DEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   lzo? ( dev-libs/lzo:2 )
+   zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+   vde? ( net-misc/vde )"
+
+# Upstream's patchset
+if [[ -n ${UPSTREAM_VER} ]]; then
+   PATCHES=( "${WORKDIR}"/patches-upstream )
+fi
+
+src_configure() {
+   econf \
+   --enable-jumbograms \
+   --disable-tunemu  \
+   $(use_enable lzo) \
+   $(use_enable uml) \
+   $(use_enable vde) \
+   $(use_enable zlib)
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   dodir /etc/tinc
+   dodoc AUTHORS NEWS README THANKS
+   doconfd "${FILESDIR}"/tinc.networks
+   newconfd "${FILESDIR}"/tincd.conf tincd
+   newinitd "${FILESDIR}"/tincd-r1 tincd
+   systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Yixun Lan]

commit: 05608a3ec85f66190a172e0dd126ff3cd91cff3d
Author: Yixun Lan  gentoo  org>
AuthorDate: Fri Mar  8 02:43:12 2019 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri Mar  8 03:31:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05608a3e

net-vpn/tinc: version bump 1.1pre17

fix build err when >=dev-libs/openssl-1.1.1b

also fix a bash_completion issue due to
upstream packaging problem, I hope it will be fixed in
upstream's next release.

Closes: https://bugs.gentoo.org/679402

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Yixun Lan  gentoo.org>

 net-vpn/tinc/Manifest  |  2 +
 net-vpn/tinc/tinc-1.1_pre17.ebuild | 96 ++
 2 files changed, 98 insertions(+)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 4bef180b36b..a1316b926cf 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,2 +1,4 @@
 DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 
419b581167614d534b6f2f3b804657f088c013529d7738766aff199da775860ffed42ecb61e8ed008c5b6fa410f071e2fe1ca59f0c6e443c0a8017cd10c31ce3
 SHA512 
037867306c21506d57d69d35c0f246b2936022047978fa3e01464b5f6b65f109760507d9cc740f82f8166f39c5ce44d9f8dde55655a6372dacd5b5974aeaee32
+DIST tinc-1.1-upstream-patches-2.tar.xz 23500 BLAKE2B 
ab44d2efcd494c6a49e9e0bc109670a586b087d5ce1daab9b9cdf8f50a4c9b9d927e102fe947e75e6f7be509ba9315936315006b557b39639399bc7f40109f5f
 SHA512 
351537f212421e7fe28fcf97293550edaa4c4c8a578bf4eeca34ae591caefb222df4d5d96bfa03bddd6afcb5143e68b59f5341b2a6412c053a3cecf4fdd0bee8
 DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B 
c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b
 SHA512 
b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43
+DIST tinc-1.1pre17.tar.gz 927313 BLAKE2B 
d16789b64f6d11deda4752fdeeb603fe62efd6b1d68b0286fbe9c329d8ea51494df59e0e5bf1564b25a0ed44e9244799eb61f73de9ded6a1a418417453adddc4
 SHA512 
b966dbfa522e12ff6766c4deb54a9da29cddc15c3a1df0f0e084df27ee5f1421ffbebc0e29472b1bcd79ea8b41f8c0ef904172e333dcba0b85bafe4654a63b30

diff --git a/net-vpn/tinc/tinc-1.1_pre17.ebuild 
b/net-vpn/tinc/tinc-1.1_pre17.ebuild
new file mode 100644
index 000..6eb358d55d4
--- /dev/null
+++ b/net-vpn/tinc/tinc-1.1_pre17.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1 systemd
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/;
+
+UPSTREAM_VER=2
+
+[[ -n ${UPSTREAM_VER} ]] && \
+   
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz;
+
+SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
+   ${UPSTREAM_PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+   ${PYTHON_DEPS}
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )
+   lzo? ( dev-libs/lzo:2 )
+   ncurses? ( sys-libs/ncurses:= )
+   readline? ( sys-libs/readline:= )
+   upnp? ( net-libs/miniupnpc )
+   zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+   vde? ( net-misc/vde )"
+S="${WORKDIR}/${MY_P}"
+
+# Upstream's patchset
+if [[ -n ${UPSTREAM_VER} ]]; then
+   PATCHES=( "${WORKDIR}"/patches-upstream )
+fi
+
+PATCHES+=(
+   "${FILESDIR}"/tinc-1.1_pre16-r1-fix-paths.patch #560528
+   "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868
+)
+
+src_prepare() {
+   default
+   eautoreconf
+
+   # Fix the static (failing UNKNOWN) version in the autoconf
+   # NOTE: When updating the ebuild, make sure to check that this
+   # line number hasn't changed in the upstream sources.
+   sed -i "6d" configure.ac
+   sed -i "6iAC_INIT([tinc], ${PVR})" configure.ac
+}
+
+src_configure() {
+   econf \
+   --enable-jumbograms \
+   --disable-silent-rules \
+   --enable-legacy-protocol \
+   --disable-tunemu  \
+   --with-systemd="$(systemd_get_systemunitdir)" \
+   $(use_enable lzo) \
+   $(use_enable ncurses curses) \
+   $(use_enable readline) \
+   $(use_enable uml) \
+   $(use_enable vde) \
+   $(use_enable zlib) \
+   $(use_enable upnp miniupnpc) \
+   $(use_with ssl openssl)
+   #--without-libgcrypt \
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   dodir /etc/tinc
+   dodoc AUTHORS NEWS 

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Yixun Lan]

commit: 758130a8a9bad5a076fbd68d2be9a860d9b19509
Author: Yixun Lan  gentoo  org>
AuthorDate: Fri Mar  8 03:21:03 2019 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri Mar  8 03:31:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=758130a8

net-vpn/tinc: fix >=dev-libs/openssl-1.1.1b

bump upstream patches to fix openssl build issue

Closes: https://bugs.gentoo.org/679402
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Yixun Lan  gentoo.org>

 net-vpn/tinc/Manifest  |  1 +
 net-vpn/tinc/tinc-1.0.35-r1.ebuild | 54 ++
 2 files changed, 55 insertions(+)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index a1316b926cf..e161801b399 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,3 +1,4 @@
+DIST tinc-1.0.35-upstream-patches-0.tar.xz 2884 BLAKE2B 
a01ee1a372cc366402c005a48adccd7e31bd3182c1fc6df2dc27aecd622266be06f2c25aa169794b2970fe1f8218b7fa813365f8852e165ed2356ed885c5fde3
 SHA512 
c95add88e05dc7dc8d09618dd07870e400e1fe28c8f864acbf131d9616d75337fd1d2d7b44ee80c3f31e1b713f258bb9d575956114e73fea781488d2b477a5f5
 DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 
419b581167614d534b6f2f3b804657f088c013529d7738766aff199da775860ffed42ecb61e8ed008c5b6fa410f071e2fe1ca59f0c6e443c0a8017cd10c31ce3
 SHA512 
037867306c21506d57d69d35c0f246b2936022047978fa3e01464b5f6b65f109760507d9cc740f82f8166f39c5ce44d9f8dde55655a6372dacd5b5974aeaee32
 DIST tinc-1.1-upstream-patches-2.tar.xz 23500 BLAKE2B 
ab44d2efcd494c6a49e9e0bc109670a586b087d5ce1daab9b9cdf8f50a4c9b9d927e102fe947e75e6f7be509ba9315936315006b557b39639399bc7f40109f5f
 SHA512 
351537f212421e7fe28fcf97293550edaa4c4c8a578bf4eeca34ae591caefb222df4d5d96bfa03bddd6afcb5143e68b59f5341b2a6412c053a3cecf4fdd0bee8
 DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B 
c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b
 SHA512 
b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43

diff --git a/net-vpn/tinc/tinc-1.0.35-r1.ebuild 
b/net-vpn/tinc/tinc-1.0.35-r1.ebuild
new file mode 100644
index 000..1f2d089df01
--- /dev/null
+++ b/net-vpn/tinc/tinc-1.0.35-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/;
+
+UPSTREAM_VER=0
+
+[[ -n ${UPSTREAM_VER} ]] && \
+   
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz;
+
+SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz
+   ${UPSTREAM_PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+IUSE="libressl +lzo uml vde +zlib"
+
+DEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   lzo? ( dev-libs/lzo:2 )
+   zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+   vde? ( net-misc/vde )"
+
+# Upstream's patchset
+if [[ -n ${UPSTREAM_VER} ]]; then
+   PATCHES=( "${WORKDIR}"/patches-upstream )
+fi
+
+src_configure() {
+   econf \
+   --enable-jumbograms \
+   --disable-tunemu  \
+   $(use_enable lzo) \
+   $(use_enable uml) \
+   $(use_enable vde) \
+   $(use_enable zlib)
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   dodir /etc/tinc
+   dodoc AUTHORS NEWS README THANKS
+   doconfd "${FILESDIR}"/tinc.networks
+   newconfd "${FILESDIR}"/tincd.conf tincd
+   newinitd "${FILESDIR}"/tincd-r1 tincd
+   systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Anthony G. Basile]

commit: aad4b8f8558a86755b329769d7f88c141b8d5821
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Thu Mar  7 23:13:22 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Mar  7 23:13:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aad4b8f8

net-vpn/tinc: remove older versions

Signed-off-by: Anthony G. Basile  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-vpn/tinc/Manifest   |  2 --
 net-vpn/tinc/tinc-1.0.33.ebuild | 47 -
 net-vpn/tinc/tinc-1.0.34.ebuild | 47 -
 3 files changed, 96 deletions(-)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 14650b1eb64..4bef180b36b 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,4 +1,2 @@
-DIST tinc-1.0.33.tar.gz 486374 BLAKE2B 
542e9c95aa3dea941315c5a3293c06137be7131bbb4a3ba5d788e7c250327d0b01530db5b3371aee85b1e85a104b9997e9f09a6b33051090da087595e1bcb9da
 SHA512 
f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804
-DIST tinc-1.0.34.tar.gz 484174 BLAKE2B 
8ba80983cb1293b03b814f305bd733a2208562b8450a539c0f80c25596c0e05fb7ebc8edf8e6617b9e18d8b96bb49a82098f902e692ce4b85c7c47b1072be2dd
 SHA512 
b711a2c532f8efc94c77e9bbe5213ae284d2a3cb598d2760df700448e495a02ac56baa0393bbc6fbc735bf97a26ca5a79133c92952d98a9086a9ffd273eef725
 DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 
419b581167614d534b6f2f3b804657f088c013529d7738766aff199da775860ffed42ecb61e8ed008c5b6fa410f071e2fe1ca59f0c6e443c0a8017cd10c31ce3
 SHA512 
037867306c21506d57d69d35c0f246b2936022047978fa3e01464b5f6b65f109760507d9cc740f82f8166f39c5ce44d9f8dde55655a6372dacd5b5974aeaee32
 DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B 
c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b
 SHA512 
b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43

diff --git a/net-vpn/tinc/tinc-1.0.33.ebuild b/net-vpn/tinc/tinc-1.0.33.ebuild
deleted file mode 100644
index c8adaa0c7d3..000
--- a/net-vpn/tinc/tinc-1.0.33.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/;
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
-IUSE="libressl +lzo uml vde +zlib"
-
-DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   lzo? ( dev-libs/lzo:2 )
-   zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-   vde? ( net-misc/vde )"
-
-src_configure() {
-   econf \
-   --enable-jumbograms \
-   --disable-tunemu  \
-   $(use_enable lzo) \
-   $(use_enable uml) \
-   $(use_enable vde) \
-   $(use_enable zlib)
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   dodir /etc/tinc
-   dodoc AUTHORS NEWS README THANKS
-   doconfd "${FILESDIR}"/tinc.networks
-   newconfd "${FILESDIR}"/tincd.conf tincd
-   newinitd "${FILESDIR}"/tincd-r1 tincd
-   systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
-}
-
-pkg_postinst() {
-   elog "This package requires the tun/tap kernel device."
-   elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
-}

diff --git a/net-vpn/tinc/tinc-1.0.34.ebuild b/net-vpn/tinc/tinc-1.0.34.ebuild
deleted file mode 100644
index 717bdeac65a..000
--- a/net-vpn/tinc/tinc-1.0.34.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/;
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
-IUSE="libressl +lzo uml vde +zlib"
-
-DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   lzo? ( dev-libs/lzo:2 )
-   zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-   vde? ( net-misc/vde )"
-
-src_configure() {
-   econf \
-   --enable-jumbograms \
-   --disable-tunemu  \
-   $(use_enable lzo) \
-   $(use_enable uml) \
-   $(use_enable vde) \
-   $(use_enable zlib)
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   dodir /etc/tinc
-   dodoc AUTHORS NEWS README THANKS
-   doconfd 

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Anthony G. Basile]

commit: 19f9bef3016141f1f4d7e3e5caa87b89d0c780c7
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Oct 10 01:24:27 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Oct 10 01:24:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19f9bef3

net-vpn/tinc: version bump to 1.0.35

Signed-off-by: Anthony G. Basile  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 net-vpn/tinc/Manifest   |  1 +
 net-vpn/tinc/tinc-1.0.35.ebuild | 42 +
 2 files changed, 43 insertions(+)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index a6f95f0a401..14650b1eb64 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,3 +1,4 @@
 DIST tinc-1.0.33.tar.gz 486374 BLAKE2B 
542e9c95aa3dea941315c5a3293c06137be7131bbb4a3ba5d788e7c250327d0b01530db5b3371aee85b1e85a104b9997e9f09a6b33051090da087595e1bcb9da
 SHA512 
f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804
 DIST tinc-1.0.34.tar.gz 484174 BLAKE2B 
8ba80983cb1293b03b814f305bd733a2208562b8450a539c0f80c25596c0e05fb7ebc8edf8e6617b9e18d8b96bb49a82098f902e692ce4b85c7c47b1072be2dd
 SHA512 
b711a2c532f8efc94c77e9bbe5213ae284d2a3cb598d2760df700448e495a02ac56baa0393bbc6fbc735bf97a26ca5a79133c92952d98a9086a9ffd273eef725
+DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 
419b581167614d534b6f2f3b804657f088c013529d7738766aff199da775860ffed42ecb61e8ed008c5b6fa410f071e2fe1ca59f0c6e443c0a8017cd10c31ce3
 SHA512 
037867306c21506d57d69d35c0f246b2936022047978fa3e01464b5f6b65f109760507d9cc740f82f8166f39c5ce44d9f8dde55655a6372dacd5b5974aeaee32
 DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B 
c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b
 SHA512 
b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43

diff --git a/net-vpn/tinc/tinc-1.0.35.ebuild b/net-vpn/tinc/tinc-1.0.35.ebuild
new file mode 100644
index 000..8d387dbc59c
--- /dev/null
+++ b/net-vpn/tinc/tinc-1.0.35.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit systemd
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/;
+SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+IUSE="libressl +lzo uml vde +zlib"
+
+DEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   lzo? ( dev-libs/lzo:2 )
+   zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+   vde? ( net-misc/vde )"
+
+src_configure() {
+   econf \
+   --enable-jumbograms \
+   --disable-tunemu  \
+   $(use_enable lzo) \
+   $(use_enable uml) \
+   $(use_enable vde) \
+   $(use_enable zlib)
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   dodir /etc/tinc
+   dodoc AUTHORS NEWS README THANKS
+   doconfd "${FILESDIR}"/tinc.networks
+   newconfd "${FILESDIR}"/tincd.conf tincd
+   newinitd "${FILESDIR}"/tincd-r1 tincd
+   systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/, net-vpn/tinc/files/

[Anthony G. Basile]

commit: be0c91f71dcc1617f9f71e3a008d6e09aa7f496f
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Sep  5 01:55:39 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Sep  5 01:55:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be0c91f7

net-vpn/tinc: drop older 1.1 version

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-vpn/tinc/Manifest |   1 -
 net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch |  44 -
 net-vpn/tinc/tinc-1.1_pre15.ebuild| 103 --
 3 files changed, 148 deletions(-)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 959505f8846..a6f95f0a401 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,4 +1,3 @@
 DIST tinc-1.0.33.tar.gz 486374 BLAKE2B 
542e9c95aa3dea941315c5a3293c06137be7131bbb4a3ba5d788e7c250327d0b01530db5b3371aee85b1e85a104b9997e9f09a6b33051090da087595e1bcb9da
 SHA512 
f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804
 DIST tinc-1.0.34.tar.gz 484174 BLAKE2B 
8ba80983cb1293b03b814f305bd733a2208562b8450a539c0f80c25596c0e05fb7ebc8edf8e6617b9e18d8b96bb49a82098f902e692ce4b85c7c47b1072be2dd
 SHA512 
b711a2c532f8efc94c77e9bbe5213ae284d2a3cb598d2760df700448e495a02ac56baa0393bbc6fbc735bf97a26ca5a79133c92952d98a9086a9ffd273eef725
-DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B 
e97f044066a3c399b4089ed73e77a78904837031cbf04445390a3132a5cd8cf3e9390c1908b1804364616d16fffdedbae6b88f8a42da7471a42e4c8eea614d0e
 SHA512 
29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17
 DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B 
c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b
 SHA512 
b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43

diff --git a/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch 
b/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch
deleted file mode 100644
index 519677dd503..000
--- a/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur tinc-1.1pre14.orig/src/names.c tinc-1.1pre14/src/names.c
 tinc-1.1pre14.orig/src/names.c 2016-04-17 12:08:41.0 -0400
-+++ tinc-1.1pre14/src/names.c  2016-10-15 07:37:51.147064396 -0400
-@@ -86,36 +86,11 @@
-   if(!pidfilename)
-   xasprintf(, "%s" SLASH "pid", confbase);
- #else
--  bool fallback = false;
--  if(daemon) {
--  if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK))
--  fallback = true;
--  } else {
--  char fname[PATH_MAX];
--  snprintf(fname, sizeof fname, LOCALSTATEDIR SLASH "run" SLASH 
"%s.pid", identname);
--  if(access(fname, R_OK)) {
--  snprintf(fname, sizeof fname, "%s" SLASH "pid", 
confbase);
--  if(!access(fname, R_OK))
--  fallback = true;
--  }
--  }
-+  if(!logfilename)
-+  xasprintf(, "/var/log" SLASH "%s.log", identname);
- 
--  if(!fallback) {
--  if(!logfilename)
--  xasprintf(, LOCALSTATEDIR SLASH "log" SLASH 
"%s.log", identname);
--
--  if(!pidfilename)
--  xasprintf(, LOCALSTATEDIR SLASH "run" SLASH 
"%s.pid", identname);
--  } else {
--  if(!logfilename)
--  xasprintf(, "%s" SLASH "log", confbase);
--
--  if(!pidfilename) {
--  if(daemon)
--  logger(DEBUG_ALWAYS, LOG_WARNING, "Could not 
access " LOCALSTATEDIR SLASH " (%s), storing pid and socket files in %s" SLASH, 
strerror(errno), confbase);
--  xasprintf(, "%s" SLASH "pid", confbase);
--  }
--  }
-+  if(!pidfilename)
-+  xasprintf(, "/run" SLASH "%s.pid", identname);
- #endif
- 
-   if(!unixsocketname) {

diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild 
b/net-vpn/tinc/tinc-1.1_pre15.ebuild
deleted file mode 100644
index 359469d9dc7..000
--- a/net-vpn/tinc/tinc-1.1_pre15.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1 systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/;
-
-# UPSTREAM_VER=1
-
-[[ -n ${UPSTREAM_VER} ]] && \
-   
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz;
-
-SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
-   ${UPSTREAM_PATCHSET_URI}"
-
-LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/, net-vpn/tinc/files/

[Anthony G. Basile]

commit: d7eef58d8c3ba44604691f721bb1e25428b86ff7
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Sep  5 02:02:21 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Sep  5 02:02:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7eef58d

net-vpn/tinc: drop gui, bug #665208

Thanks Charlie Gehlin  gehlin.com>

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 ...1_pre16-fix-paths.patch => tinc-1.1_pre16-r1-fix-paths.patch} | 0
 net-vpn/tinc/metadata.xml| 1 -
 net-vpn/tinc/{tinc-1.1_pre16.ebuild => tinc-1.1_pre16-r1.ebuild} | 9 +
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch 
b/net-vpn/tinc/files/tinc-1.1_pre16-r1-fix-paths.patch
similarity index 100%
rename from net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
rename to net-vpn/tinc/files/tinc-1.1_pre16-r1-fix-paths.patch

diff --git a/net-vpn/tinc/metadata.xml b/net-vpn/tinc/metadata.xml
index 02dd537c6e6..f6ec81bf4f8 100644
--- a/net-vpn/tinc/metadata.xml
+++ b/net-vpn/tinc/metadata.xml
@@ -14,7 +14,6 @@

-   Add GUI support, using 
dev-python/wxpython
 Enable support for User Mode Linux 
Sockets
 Enable Virtual Distributed Ethernet (VDE) 
based networking


diff --git a/net-vpn/tinc/tinc-1.1_pre16.ebuild 
b/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
similarity index 90%
rename from net-vpn/tinc/tinc-1.1_pre16.ebuild
rename to net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
index 91923228701..f252a1217c3 100644
--- a/net-vpn/tinc/tinc-1.1_pre16.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
@@ -24,12 +24,11 @@ SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib"
+IUSE="+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
${PYTHON_DEPS}
-   gui? ( dev-python/wxpython:3.0[${PYTHON_USEDEP}] )
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
@@ -89,12 +88,6 @@ src_install() {
doconfd "${FILESDIR}"/tinc.networks
newconfd "${FILESDIR}"/tincd.conf tincd
newinitd "${FILESDIR}"/tincd-r2 tincd
-
-   if use gui; then
-   python_fix_shebang "${ED}"/usr/bin/tinc-gui
-   else
-   rm -f "${ED}"/usr/bin/tinc-gui || die
-   fi
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/, net-vpn/tinc/files/

[Jonathan Vasquez]

commit: 70ffe53880c2d20ee5911a846e5a42df2d1ca070
Author: Jonathan Vasquez  gentoo  org>
AuthorDate: Fri Jul  6 20:10:12 2018 +
Commit: Jonathan Vasquez  gentoo  org>
CommitDate: Fri Jul  6 20:10:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70ffe538

net-vpn/tinc: version bump to 1.1_pre16 and minor improvements.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-vpn/tinc/Manifest  |  1 +
 ...-paths.patch => tinc-1.1_pre15-fix-paths.patch} |  0
 ...-paths.patch => tinc-1.1_pre16-fix-paths.patch} | 47 +-
 net-vpn/tinc/tinc-1.1_pre15.ebuild |  8 +++-
 ...tinc-1.1_pre15.ebuild => tinc-1.1_pre16.ebuild} |  8 +++-
 5 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index ca1d7e95537..959505f8846 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,3 +1,4 @@
 DIST tinc-1.0.33.tar.gz 486374 BLAKE2B 
542e9c95aa3dea941315c5a3293c06137be7131bbb4a3ba5d788e7c250327d0b01530db5b3371aee85b1e85a104b9997e9f09a6b33051090da087595e1bcb9da
 SHA512 
f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804
 DIST tinc-1.0.34.tar.gz 484174 BLAKE2B 
8ba80983cb1293b03b814f305bd733a2208562b8450a539c0f80c25596c0e05fb7ebc8edf8e6617b9e18d8b96bb49a82098f902e692ce4b85c7c47b1072be2dd
 SHA512 
b711a2c532f8efc94c77e9bbe5213ae284d2a3cb598d2760df700448e495a02ac56baa0393bbc6fbc735bf97a26ca5a79133c92952d98a9086a9ffd273eef725
 DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B 
e97f044066a3c399b4089ed73e77a78904837031cbf04445390a3132a5cd8cf3e9390c1908b1804364616d16fffdedbae6b88f8a42da7471a42e4c8eea614d0e
 SHA512 
29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17
+DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B 
c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b
 SHA512 
b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43

diff --git a/net-vpn/tinc/files/tinc-1.1-fix-paths.patch 
b/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch
similarity index 100%
copy from net-vpn/tinc/files/tinc-1.1-fix-paths.patch
copy to net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch

diff --git a/net-vpn/tinc/files/tinc-1.1-fix-paths.patch 
b/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
similarity index 56%
rename from net-vpn/tinc/files/tinc-1.1-fix-paths.patch
rename to net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
index 519677dd503..30cafee8787 100644
--- a/net-vpn/tinc/files/tinc-1.1-fix-paths.patch
+++ b/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
@@ -1,44 +1,55 @@
-diff -Naur tinc-1.1pre14.orig/src/names.c tinc-1.1pre14/src/names.c
 tinc-1.1pre14.orig/src/names.c 2016-04-17 12:08:41.0 -0400
-+++ tinc-1.1pre14/src/names.c  2016-10-15 07:37:51.147064396 -0400
-@@ -86,36 +86,11 @@
-   if(!pidfilename)
-   xasprintf(, "%s" SLASH "pid", confbase);
+diff -Naur tinc-1.1pre16.orig/src/names.c tinc-1.1pre16/src/names.c
+--- tinc-1.1pre16.ori/src/names.c  2018-04-02 10:41:12.0 -0400
 tinc-1.1pre16/src/names.c  2018-07-06 15:11:35.970680875 -0400
+@@ -103,47 +103,13 @@
+   }
+ 
  #else
 -  bool fallback = false;
+-
 -  if(daemon) {
--  if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK))
+-  if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK)) {
 -  fallback = true;
+-  }
 -  } else {
 -  char fname[PATH_MAX];
--  snprintf(fname, sizeof fname, LOCALSTATEDIR SLASH "run" SLASH 
"%s.pid", identname);
+-  snprintf(fname, sizeof(fname), LOCALSTATEDIR SLASH "run" SLASH 
"%s.pid", identname);
+-
 -  if(access(fname, R_OK)) {
--  snprintf(fname, sizeof fname, "%s" SLASH "pid", 
confbase);
--  if(!access(fname, R_OK))
+-  snprintf(fname, sizeof(fname), "%s" SLASH "pid", 
confbase);
+-
+-  if(!access(fname, R_OK)) {
 -  fallback = true;
+-  }
 -  }
--  }
-+  if(!logfilename)
++  if(!logfilename) {
 +  xasprintf(, "/var/log" SLASH "%s.log", identname);
+   }
  
 -  if(!fallback) {
--  if(!logfilename)
+-  if(!logfilename) {
 -  xasprintf(, LOCALSTATEDIR SLASH "log" SLASH 
"%s.log", identname);
+-  }
 -
--  if(!pidfilename)
+-  if(!pidfilename) {
 -  xasprintf(, LOCALSTATEDIR SLASH "run" SLASH 
"%s.pid", identname);
+-  }
 -  } else {
--  if(!logfilename)
+-  if(!logfilename) {
 -  xasprintf(, "%s" SLASH "log", 

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Anthony G. Basile]

commit: c1742c32bc6339be0341508c10baaf679d0c8232
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue Jun 12 22:32:30 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Jun 12 22:32:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1742c32

net-vpn/tinc: remove older versions

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-vpn/tinc/Manifest   |  2 --
 net-vpn/tinc/tinc-1.0.31.ebuild | 47 -
 net-vpn/tinc/tinc-1.0.32.ebuild | 47 -
 3 files changed, 96 deletions(-)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 4d8d91da13b..ca1d7e95537 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,5 +1,3 @@
-DIST tinc-1.0.31.tar.gz 494877 BLAKE2B 
bdb47a9026d26cb2681da2a83931063d818a851e9e41dbd27ac131937abda68769b973afba74445bab7999599d766b3375ef853a6ed8740027ba119cfc5d2d89
 SHA512 
ac694d4ceec19bddebd3d5b9f37eb703a4701b93f65a7bbcdbc0b364f2a4f8b116c85748d06ec7821474de5c4d434caf5448109a0846e15c4a96adb92a0fc622
-DIST tinc-1.0.32.tar.gz 496221 BLAKE2B 
692053d2bb690d1b2e76070f3dbae12ff4f90803434f62e0d7de0d1739312e5873abacba976eda9860882846789732750364886961d4c5c164bb88d84a09
 SHA512 
1533305a062782ec788bcb59f4cbfac76ed401ccfe57b5cbd9a3fd9b76a238dbd0f612071c24b157fec4dfc409c79b1b4fbf6e176510b321dcdd79174632028c
 DIST tinc-1.0.33.tar.gz 486374 BLAKE2B 
542e9c95aa3dea941315c5a3293c06137be7131bbb4a3ba5d788e7c250327d0b01530db5b3371aee85b1e85a104b9997e9f09a6b33051090da087595e1bcb9da
 SHA512 
f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804
 DIST tinc-1.0.34.tar.gz 484174 BLAKE2B 
8ba80983cb1293b03b814f305bd733a2208562b8450a539c0f80c25596c0e05fb7ebc8edf8e6617b9e18d8b96bb49a82098f902e692ce4b85c7c47b1072be2dd
 SHA512 
b711a2c532f8efc94c77e9bbe5213ae284d2a3cb598d2760df700448e495a02ac56baa0393bbc6fbc735bf97a26ca5a79133c92952d98a9086a9ffd273eef725
 DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B 
e97f044066a3c399b4089ed73e77a78904837031cbf04445390a3132a5cd8cf3e9390c1908b1804364616d16fffdedbae6b88f8a42da7471a42e4c8eea614d0e
 SHA512 
29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17

diff --git a/net-vpn/tinc/tinc-1.0.31.ebuild b/net-vpn/tinc/tinc-1.0.31.ebuild
deleted file mode 100644
index c8adaa0c7d3..000
--- a/net-vpn/tinc/tinc-1.0.31.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/;
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
-IUSE="libressl +lzo uml vde +zlib"
-
-DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   lzo? ( dev-libs/lzo:2 )
-   zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-   vde? ( net-misc/vde )"
-
-src_configure() {
-   econf \
-   --enable-jumbograms \
-   --disable-tunemu  \
-   $(use_enable lzo) \
-   $(use_enable uml) \
-   $(use_enable vde) \
-   $(use_enable zlib)
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   dodir /etc/tinc
-   dodoc AUTHORS NEWS README THANKS
-   doconfd "${FILESDIR}"/tinc.networks
-   newconfd "${FILESDIR}"/tincd.conf tincd
-   newinitd "${FILESDIR}"/tincd-r1 tincd
-   systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
-}
-
-pkg_postinst() {
-   elog "This package requires the tun/tap kernel device."
-   elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
-}

diff --git a/net-vpn/tinc/tinc-1.0.32.ebuild b/net-vpn/tinc/tinc-1.0.32.ebuild
deleted file mode 100644
index c8adaa0c7d3..000
--- a/net-vpn/tinc/tinc-1.0.32.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/;
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
-IUSE="libressl +lzo uml vde +zlib"
-
-DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   lzo? ( dev-libs/lzo:2 )
-   zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-   vde? ( net-misc/vde )"
-
-src_configure() {
-   econf \
-   --enable-jumbograms \
-   --disable-tunemu  \
-   $(use_enable lzo) \
-   

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Anthony G. Basile]

commit: b5147a96318fbb94f9ed46a52efbf7bcd9792ea1
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue Jun 12 22:25:35 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Jun 12 22:25:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5147a96

net-vpn/tinc: version bump to 1.0.34

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-vpn/tinc/Manifest   |  1 +
 net-vpn/tinc/tinc-1.0.34.ebuild | 47 +
 2 files changed, 48 insertions(+)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index f918acaf03f..4d8d91da13b 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,4 +1,5 @@
 DIST tinc-1.0.31.tar.gz 494877 BLAKE2B 
bdb47a9026d26cb2681da2a83931063d818a851e9e41dbd27ac131937abda68769b973afba74445bab7999599d766b3375ef853a6ed8740027ba119cfc5d2d89
 SHA512 
ac694d4ceec19bddebd3d5b9f37eb703a4701b93f65a7bbcdbc0b364f2a4f8b116c85748d06ec7821474de5c4d434caf5448109a0846e15c4a96adb92a0fc622
 DIST tinc-1.0.32.tar.gz 496221 BLAKE2B 
692053d2bb690d1b2e76070f3dbae12ff4f90803434f62e0d7de0d1739312e5873abacba976eda9860882846789732750364886961d4c5c164bb88d84a09
 SHA512 
1533305a062782ec788bcb59f4cbfac76ed401ccfe57b5cbd9a3fd9b76a238dbd0f612071c24b157fec4dfc409c79b1b4fbf6e176510b321dcdd79174632028c
 DIST tinc-1.0.33.tar.gz 486374 BLAKE2B 
542e9c95aa3dea941315c5a3293c06137be7131bbb4a3ba5d788e7c250327d0b01530db5b3371aee85b1e85a104b9997e9f09a6b33051090da087595e1bcb9da
 SHA512 
f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804
+DIST tinc-1.0.34.tar.gz 484174 BLAKE2B 
8ba80983cb1293b03b814f305bd733a2208562b8450a539c0f80c25596c0e05fb7ebc8edf8e6617b9e18d8b96bb49a82098f902e692ce4b85c7c47b1072be2dd
 SHA512 
b711a2c532f8efc94c77e9bbe5213ae284d2a3cb598d2760df700448e495a02ac56baa0393bbc6fbc735bf97a26ca5a79133c92952d98a9086a9ffd273eef725
 DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B 
e97f044066a3c399b4089ed73e77a78904837031cbf04445390a3132a5cd8cf3e9390c1908b1804364616d16fffdedbae6b88f8a42da7471a42e4c8eea614d0e
 SHA512 
29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17

diff --git a/net-vpn/tinc/tinc-1.0.34.ebuild b/net-vpn/tinc/tinc-1.0.34.ebuild
new file mode 100644
index 000..717bdeac65a
--- /dev/null
+++ b/net-vpn/tinc/tinc-1.0.34.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit systemd
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/;
+SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+IUSE="libressl +lzo uml vde +zlib"
+
+DEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   lzo? ( dev-libs/lzo:2 )
+   zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+   vde? ( net-misc/vde )"
+
+src_configure() {
+   econf \
+   --enable-jumbograms \
+   --disable-tunemu  \
+   $(use_enable lzo) \
+   $(use_enable uml) \
+   $(use_enable vde) \
+   $(use_enable zlib)
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   dodir /etc/tinc
+   dodoc AUTHORS NEWS README THANKS
+   doconfd "${FILESDIR}"/tinc.networks
+   newconfd "${FILESDIR}"/tincd.conf tincd
+   newinitd "${FILESDIR}"/tincd-r1 tincd
+   systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
+}
+
+pkg_postinst() {
+   elog "This package requires the tun/tap kernel device."
+   elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Anthony G. Basile]

commit: 4b8c292c5c97cf34c3d8494b5d7d2195278c5340
Author: Marty E. Plummer  startmail  com>
AuthorDate: Fri Apr 20 16:47:35 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Apr 21 11:15:13 2018 +
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
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/, net-vpn/tinc/files/

[Jeroen Roovers]

commit: c81097a84e82a2b394a71e761e289775d599c603
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Feb 25 20:57:48 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Feb 25 20:58:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c81097a8

net-vpn/tinc: Fix compiling against sys-libs/ncurses[tinfo] (bug #621868).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-vpn/tinc/files/tinc-1.1-tinfo.patch | 10 ++
 net-vpn/tinc/tinc-1.1_pre15.ebuild  |  8 +---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/net-vpn/tinc/files/tinc-1.1-tinfo.patch 
b/net-vpn/tinc/files/tinc-1.1-tinfo.patch
new file mode 100644
index 000..5a9ec01473d
--- /dev/null
+++ b/net-vpn/tinc/files/tinc-1.1-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/m4/curses.m4
 b/m4/curses.m4
+@@ -39,6 +39,7 @@
+   )]
+ )
+   ])
++  AC_SEARCH_LIBS(stdscr, tinfo)
+ 
+   AC_SUBST(CURSES_LIBS)
+ ])

diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild 
b/net-vpn/tinc/tinc-1.1_pre15.ebuild
index a1b29bd7546..57d5cee1828 100644
--- a/net-vpn/tinc/tinc-1.1_pre15.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ MY_P=${PN}-${MY_PV}
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils multilib python-single-r1 systemd
+inherit autotools multilib python-single-r1 systemd
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="http://www.tinc-vpn.org/;
@@ -41,7 +41,6 @@ DEPEND="
zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
vde? ( net-misc/vde )"
-
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
@@ -55,7 +54,10 @@ src_prepare() {
fi
 
eapply "${FILESDIR}"/tinc-1.1-fix-paths.patch #560528
+   eapply "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868
eapply_user
+
+   eautoreconf
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Pacho Ramos]

commit: 524bcfcdbebcb7edbba54acbf9616f27bb916044
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Nov 27 17:28:18 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Nov 27 17:28:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524bcfcd

net-vpn/tinc: Fix systemd units installation to not hardcode paths (#634650 by 
Mike Gilbert)

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 net-vpn/tinc/Manifest  | 2 +-
 net-vpn/tinc/tinc-1.1_pre15.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index afddf8ea6cb..af861588ca6 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,4 +1,4 @@
 DIST tinc-1.0.31.tar.gz 494877 SHA256 
d3cbc82e6e07975a2ccc0b369d07e30fc3324e71e240dca8781ce9a4f629519b SHA512 
ac694d4ceec19bddebd3d5b9f37eb703a4701b93f65a7bbcdbc0b364f2a4f8b116c85748d06ec7821474de5c4d434caf5448109a0846e15c4a96adb92a0fc622
 WHIRLPOOL 
aec84cd59ca80ca806171003447f946073c8f99fd872eaef1e7fea9d423cd4905d554964920be802e0862f5ab8de7d9d7094792c30403af8b62abca12286e2b1
 DIST tinc-1.0.32.tar.gz 496221 SHA256 
4db24feaff8db4bbb7edb7a4b8f5f8edc39b26eb5feccc99e8e67a6960c05587 SHA512 
1533305a062782ec788bcb59f4cbfac76ed401ccfe57b5cbd9a3fd9b76a238dbd0f612071c24b157fec4dfc409c79b1b4fbf6e176510b321dcdd79174632028c
 WHIRLPOOL 
1d20dd365ea4c774555f809412befe0857fdd574dbbb92b8cf61764973dfaa67ebe95480913c594de663cc91845b3850b9fe541c006725d60c32d6f403cb6be0
 DIST tinc-1.0.33.tar.gz 486374 SHA256 
7f6f5dc6444bc651ac635c81f4745bcce581bbd1d45ed60cbdc4ee11bebb10f4 SHA512 
f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804
 WHIRLPOOL 
9fa868d3ac0b89e0c4458c00b79149e21baa3a6e9950665da11e91278048f2a8866c23027e39f1cf34e940794d5c6b5427a561c4a0a1e4bbfdce3d2554b6b3d8
-DIST tinc-1.1pre15.tar.gz 704145 SHA256 
41dc3e40c5f8be497b779acd6f59ef4572e1430d0d0f0436f2de5cb21a59ef18 SHA512 
29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17
 WHIRLPOOL 
f258704dd6f2f4c5fd184a1f38da93a2bd8e655b07cfed47837e57a049c8be4e9b744f1a10b1932d020aab6c7c5bf043a83d7c9529755f5accca445f95355439
+DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B 
e97f044066a3c399b4089ed73e77a78904837031cbf04445390a3132a5cd8cf3e9390c1908b1804364616d16fffdedbae6b88f8a42da7471a42e4c8eea614d0e
 SHA512 
29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17

diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild 
b/net-vpn/tinc/tinc-1.1_pre15.ebuild
index 72c60c83b61..a1b29bd7546 100644
--- a/net-vpn/tinc/tinc-1.1_pre15.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre15.ebuild
@@ -8,7 +8,7 @@ MY_P=${PN}-${MY_PV}
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils multilib python-single-r1
+inherit eutils multilib python-single-r1 systemd
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="http://www.tinc-vpn.org/;
@@ -64,7 +64,7 @@ src_configure() {
--disable-silent-rules \
--enable-legacy-protocol \
--disable-tunemu  \
-   --with-systemd=/usr/$(get_libdir)/systemd/system \
+   --with-systemd="$(systemd_get_systemunitdir)" \
$(use_enable lzo) \
$(use_enable ncurses curses) \
$(use_enable readline) \

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Anthony G. Basile]

commit: f356a93c7acc8c66fe3e35127db02205e788791e
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Nov  5 23:20:23 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Nov  5 23:20:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f356a93c

net-vpn/tinc: version bump to 1.0.33

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-vpn/tinc/Manifest   |  1 +
 net-vpn/tinc/tinc-1.0.33.ebuild | 47 +
 2 files changed, 48 insertions(+)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index d1ba938a483..afddf8ea6cb 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,3 +1,4 @@
 DIST tinc-1.0.31.tar.gz 494877 SHA256 
d3cbc82e6e07975a2ccc0b369d07e30fc3324e71e240dca8781ce9a4f629519b SHA512 
ac694d4ceec19bddebd3d5b9f37eb703a4701b93f65a7bbcdbc0b364f2a4f8b116c85748d06ec7821474de5c4d434caf5448109a0846e15c4a96adb92a0fc622
 WHIRLPOOL 
aec84cd59ca80ca806171003447f946073c8f99fd872eaef1e7fea9d423cd4905d554964920be802e0862f5ab8de7d9d7094792c30403af8b62abca12286e2b1
 DIST tinc-1.0.32.tar.gz 496221 SHA256 
4db24feaff8db4bbb7edb7a4b8f5f8edc39b26eb5feccc99e8e67a6960c05587 SHA512 
1533305a062782ec788bcb59f4cbfac76ed401ccfe57b5cbd9a3fd9b76a238dbd0f612071c24b157fec4dfc409c79b1b4fbf6e176510b321dcdd79174632028c
 WHIRLPOOL 
1d20dd365ea4c774555f809412befe0857fdd574dbbb92b8cf61764973dfaa67ebe95480913c594de663cc91845b3850b9fe541c006725d60c32d6f403cb6be0
+DIST tinc-1.0.33.tar.gz 486374 SHA256 
7f6f5dc6444bc651ac635c81f4745bcce581bbd1d45ed60cbdc4ee11bebb10f4 SHA512 
f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804
 WHIRLPOOL 
9fa868d3ac0b89e0c4458c00b79149e21baa3a6e9950665da11e91278048f2a8866c23027e39f1cf34e940794d5c6b5427a561c4a0a1e4bbfdce3d2554b6b3d8
 DIST tinc-1.1pre15.tar.gz 704145 SHA256 
41dc3e40c5f8be497b779acd6f59ef4572e1430d0d0f0436f2de5cb21a59ef18 SHA512 
29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17
 WHIRLPOOL 
f258704dd6f2f4c5fd184a1f38da93a2bd8e655b07cfed47837e57a049c8be4e9b744f1a10b1932d020aab6c7c5bf043a83d7c9529755f5accca445f95355439

diff --git a/net-vpn/tinc/tinc-1.0.33.ebuild b/net-vpn/tinc/tinc-1.0.33.ebuild
new file mode 100644
index 000..c8adaa0c7d3
--- /dev/null
+++ b/net-vpn/tinc/tinc-1.0.33.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit systemd
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/;
+SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+IUSE="libressl +lzo uml vde +zlib"
+
+DEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   lzo? ( dev-libs/lzo:2 )
+   zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+   vde? ( net-misc/vde )"
+
+src_configure() {
+   econf \
+   --enable-jumbograms \
+   --disable-tunemu  \
+   $(use_enable lzo) \
+   $(use_enable uml) \
+   $(use_enable vde) \
+   $(use_enable zlib)
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   dodir /etc/tinc
+   dodoc AUTHORS NEWS README THANKS
+   doconfd "${FILESDIR}"/tinc.networks
+   newconfd "${FILESDIR}"/tincd.conf tincd
+   newinitd "${FILESDIR}"/tincd-r1 tincd
+   systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
+}
+
+pkg_postinst() {
+   elog "This package requires the tun/tap kernel device."
+   elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Anthony G. Basile]

commit: b05c1fc9fb75838fa6c8c14bbe25d736db3988d6
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Sep  2 22:16:37 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Sep  2 22:24:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b05c1fc9

net-vpn/tinc: remove older versions

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-vpn/tinc/Manifest   |  2 --
 net-vpn/tinc/tinc-1.0.29.ebuild | 47 -
 net-vpn/tinc/tinc-1.0.30.ebuild | 47 -
 3 files changed, 96 deletions(-)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index c956dbe18b9..2a0e6fd317c 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,5 +1,3 @@
-DIST tinc-1.0.29.tar.gz 493335 SHA256 
0357017c6ffbbe1b2088c28fa684d2b119afa1086f363c503d06e8f6faa72a78 SHA512 
230f3ff4c86d9ebed6e350f3ec92e931d83f94e6b9c4821bec745dddc2d33997e776bf3cd2a8b9e261b2f0b2df2ed8b5406bfa40bae08696304f650de9f34ef3
 WHIRLPOOL 
9825337a4622bd9461c027767e701b3934ef422beb10a06b801e005549b7b2ff944d4609591667efc994d14b002db937658209a8eb9f363a868373ebfdd0603e
-DIST tinc-1.0.30.tar.gz 494699 SHA256 
abc17e25afc1b9e74423c78fef586b11d503cbbbe5e4a2ed323870f4a82faa73 SHA512 
2e98658eeb77ceaf2973f3b77cac0c31beecd1382dc6976461da55cf22e27469d30cf6b35d5b3ce489a1809f38e82635b24a86956d62ef34e28ec43b8d09d1e6
 WHIRLPOOL 
bd37aa99b915e6075b0ec95589f11c3f63a6d6600b566c855735bda8312a0a7957224e4f11a6fb897308b540dd5a9ccd10a13d1d07d11a51200bbf833c823b5f
 DIST tinc-1.0.31.tar.gz 494877 SHA256 
d3cbc82e6e07975a2ccc0b369d07e30fc3324e71e240dca8781ce9a4f629519b SHA512 
ac694d4ceec19bddebd3d5b9f37eb703a4701b93f65a7bbcdbc0b364f2a4f8b116c85748d06ec7821474de5c4d434caf5448109a0846e15c4a96adb92a0fc622
 WHIRLPOOL 
aec84cd59ca80ca806171003447f946073c8f99fd872eaef1e7fea9d423cd4905d554964920be802e0862f5ab8de7d9d7094792c30403af8b62abca12286e2b1
 DIST tinc-1.0.32.tar.gz 496221 SHA256 
4db24feaff8db4bbb7edb7a4b8f5f8edc39b26eb5feccc99e8e67a6960c05587 SHA512 
1533305a062782ec788bcb59f4cbfac76ed401ccfe57b5cbd9a3fd9b76a238dbd0f612071c24b157fec4dfc409c79b1b4fbf6e176510b321dcdd79174632028c
 WHIRLPOOL 
1d20dd365ea4c774555f809412befe0857fdd574dbbb92b8cf61764973dfaa67ebe95480913c594de663cc91845b3850b9fe541c006725d60c32d6f403cb6be0
 DIST tinc-1.1-upstream-patches-1.tar.xz 17316 SHA256 
2358b51678381a76ccc283eb04f14ad1ec426bbf2703d73f566f94dc52d17a9c SHA512 
db71787e2edbfa8ca6288818536a36ee8fa158b400639ca9650d2d17a66b3968ab36d088e6dcbbf9524f3322166254ad1aad87db78b00dc64e0dc2a49ea7b44f
 WHIRLPOOL 
ed28917111cd0553ef75048c2b48b0499559e5a6ace77f49efb7d6d15743ba0d426477eeed9364bea6fba6e434442cf17d71ffb224acdd7da3b49792ff59bc09

diff --git a/net-vpn/tinc/tinc-1.0.29.ebuild b/net-vpn/tinc/tinc-1.0.29.ebuild
deleted file mode 100644
index 3a34c96cb98..000
--- a/net-vpn/tinc/tinc-1.0.29.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/;
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
-IUSE="libressl +lzo uml vde +zlib"
-
-DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   lzo? ( dev-libs/lzo:2 )
-   zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-   vde? ( net-misc/vde )"
-
-src_configure() {
-   econf \
-   --enable-jumbograms \
-   --disable-tunemu  \
-   $(use_enable lzo) \
-   $(use_enable uml) \
-   $(use_enable vde) \
-   $(use_enable zlib)
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   dodir /etc/tinc
-   dodoc AUTHORS NEWS README THANKS
-   doconfd "${FILESDIR}"/tinc.networks
-   newconfd "${FILESDIR}"/tincd.conf tincd
-   newinitd "${FILESDIR}"/tincd-r1 tincd
-   systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
-}
-
-pkg_postinst() {
-   elog "This package requires the tun/tap kernel device."
-   elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
-}

diff --git a/net-vpn/tinc/tinc-1.0.30.ebuild b/net-vpn/tinc/tinc-1.0.30.ebuild
deleted file mode 100644
index 3a34c96cb98..000
--- a/net-vpn/tinc/tinc-1.0.30.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/;
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Anthony G. Basile]

commit: bc4765f69b3b49c3ce7e565717184acb1a876a4b
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Sep  2 22:23:48 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Sep  2 22:24:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc4765f6

net-vpn/tinc: version bump to 1.1_pre15, drop older 1.1

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-vpn/tinc/Manifest| 3 +--
 net-vpn/tinc/{tinc-1.1_pre14-r3.ebuild => tinc-1.1_pre15.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 2a0e6fd317c..d1ba938a483 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,4 +1,3 @@
 DIST tinc-1.0.31.tar.gz 494877 SHA256 
d3cbc82e6e07975a2ccc0b369d07e30fc3324e71e240dca8781ce9a4f629519b SHA512 
ac694d4ceec19bddebd3d5b9f37eb703a4701b93f65a7bbcdbc0b364f2a4f8b116c85748d06ec7821474de5c4d434caf5448109a0846e15c4a96adb92a0fc622
 WHIRLPOOL 
aec84cd59ca80ca806171003447f946073c8f99fd872eaef1e7fea9d423cd4905d554964920be802e0862f5ab8de7d9d7094792c30403af8b62abca12286e2b1
 DIST tinc-1.0.32.tar.gz 496221 SHA256 
4db24feaff8db4bbb7edb7a4b8f5f8edc39b26eb5feccc99e8e67a6960c05587 SHA512 
1533305a062782ec788bcb59f4cbfac76ed401ccfe57b5cbd9a3fd9b76a238dbd0f612071c24b157fec4dfc409c79b1b4fbf6e176510b321dcdd79174632028c
 WHIRLPOOL 
1d20dd365ea4c774555f809412befe0857fdd574dbbb92b8cf61764973dfaa67ebe95480913c594de663cc91845b3850b9fe541c006725d60c32d6f403cb6be0
-DIST tinc-1.1-upstream-patches-1.tar.xz 17316 SHA256 
2358b51678381a76ccc283eb04f14ad1ec426bbf2703d73f566f94dc52d17a9c SHA512 
db71787e2edbfa8ca6288818536a36ee8fa158b400639ca9650d2d17a66b3968ab36d088e6dcbbf9524f3322166254ad1aad87db78b00dc64e0dc2a49ea7b44f
 WHIRLPOOL 
ed28917111cd0553ef75048c2b48b0499559e5a6ace77f49efb7d6d15743ba0d426477eeed9364bea6fba6e434442cf17d71ffb224acdd7da3b49792ff59bc09
-DIST tinc-1.1pre14.tar.gz 696109 SHA256 
e349e78f0e0d10899b8ab51c285bdb96c5ee322e847dfcf6ac9e21036286221f SHA512 
dfc54a91fd40826b108e9cbae43da42462eb51bb7ad16ac040cb1b262b5510eb6884b1f1dbe0541a3b1631213f70cc678593d1ba51ebdf150c3f6968030b9291
 WHIRLPOOL 
63c8229c667e461ad20c118d233a2abfe598cc95698b8c83e5f8b598657ca298ea0cdc20432ab2d084fd4a06129a5884e91eb445f4c7204be3798d1fb4dec2f8
+DIST tinc-1.1pre15.tar.gz 704145 SHA256 
41dc3e40c5f8be497b779acd6f59ef4572e1430d0d0f0436f2de5cb21a59ef18 SHA512 
29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17
 WHIRLPOOL 
f258704dd6f2f4c5fd184a1f38da93a2bd8e655b07cfed47837e57a049c8be4e9b744f1a10b1932d020aab6c7c5bf043a83d7c9529755f5accca445f95355439

diff --git a/net-vpn/tinc/tinc-1.1_pre14-r3.ebuild 
b/net-vpn/tinc/tinc-1.1_pre15.ebuild
similarity index 99%
rename from net-vpn/tinc/tinc-1.1_pre14-r3.ebuild
rename to net-vpn/tinc/tinc-1.1_pre15.ebuild
index 5403ce866a1..72c60c83b61 100644
--- a/net-vpn/tinc/tinc-1.1_pre14-r3.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre15.ebuild
@@ -13,7 +13,7 @@ inherit eutils multilib python-single-r1
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="http://www.tinc-vpn.org/;
 
-UPSTREAM_VER=1
+# UPSTREAM_VER=1
 
 [[ -n ${UPSTREAM_VER} ]] && \

UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz;

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[Anthony G. Basile]

commit: 0c70c013132a6634204163efccd5b76a57f4423e
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Sep  2 22:15:41 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Sep  2 22:24:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c70c013

net-vpn/tinc: version bump to 1.0.32

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-vpn/tinc/Manifest   |  1 +
 net-vpn/tinc/tinc-1.0.32.ebuild | 47 +
 2 files changed, 48 insertions(+)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index c760c97d47a..c956dbe18b9 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,5 +1,6 @@
 DIST tinc-1.0.29.tar.gz 493335 SHA256 
0357017c6ffbbe1b2088c28fa684d2b119afa1086f363c503d06e8f6faa72a78 SHA512 
230f3ff4c86d9ebed6e350f3ec92e931d83f94e6b9c4821bec745dddc2d33997e776bf3cd2a8b9e261b2f0b2df2ed8b5406bfa40bae08696304f650de9f34ef3
 WHIRLPOOL 
9825337a4622bd9461c027767e701b3934ef422beb10a06b801e005549b7b2ff944d4609591667efc994d14b002db937658209a8eb9f363a868373ebfdd0603e
 DIST tinc-1.0.30.tar.gz 494699 SHA256 
abc17e25afc1b9e74423c78fef586b11d503cbbbe5e4a2ed323870f4a82faa73 SHA512 
2e98658eeb77ceaf2973f3b77cac0c31beecd1382dc6976461da55cf22e27469d30cf6b35d5b3ce489a1809f38e82635b24a86956d62ef34e28ec43b8d09d1e6
 WHIRLPOOL 
bd37aa99b915e6075b0ec95589f11c3f63a6d6600b566c855735bda8312a0a7957224e4f11a6fb897308b540dd5a9ccd10a13d1d07d11a51200bbf833c823b5f
 DIST tinc-1.0.31.tar.gz 494877 SHA256 
d3cbc82e6e07975a2ccc0b369d07e30fc3324e71e240dca8781ce9a4f629519b SHA512 
ac694d4ceec19bddebd3d5b9f37eb703a4701b93f65a7bbcdbc0b364f2a4f8b116c85748d06ec7821474de5c4d434caf5448109a0846e15c4a96adb92a0fc622
 WHIRLPOOL 
aec84cd59ca80ca806171003447f946073c8f99fd872eaef1e7fea9d423cd4905d554964920be802e0862f5ab8de7d9d7094792c30403af8b62abca12286e2b1
+DIST tinc-1.0.32.tar.gz 496221 SHA256 
4db24feaff8db4bbb7edb7a4b8f5f8edc39b26eb5feccc99e8e67a6960c05587 SHA512 
1533305a062782ec788bcb59f4cbfac76ed401ccfe57b5cbd9a3fd9b76a238dbd0f612071c24b157fec4dfc409c79b1b4fbf6e176510b321dcdd79174632028c
 WHIRLPOOL 
1d20dd365ea4c774555f809412befe0857fdd574dbbb92b8cf61764973dfaa67ebe95480913c594de663cc91845b3850b9fe541c006725d60c32d6f403cb6be0
 DIST tinc-1.1-upstream-patches-1.tar.xz 17316 SHA256 
2358b51678381a76ccc283eb04f14ad1ec426bbf2703d73f566f94dc52d17a9c SHA512 
db71787e2edbfa8ca6288818536a36ee8fa158b400639ca9650d2d17a66b3968ab36d088e6dcbbf9524f3322166254ad1aad87db78b00dc64e0dc2a49ea7b44f
 WHIRLPOOL 
ed28917111cd0553ef75048c2b48b0499559e5a6ace77f49efb7d6d15743ba0d426477eeed9364bea6fba6e434442cf17d71ffb224acdd7da3b49792ff59bc09
 DIST tinc-1.1pre14.tar.gz 696109 SHA256 
e349e78f0e0d10899b8ab51c285bdb96c5ee322e847dfcf6ac9e21036286221f SHA512 
dfc54a91fd40826b108e9cbae43da42462eb51bb7ad16ac040cb1b262b5510eb6884b1f1dbe0541a3b1631213f70cc678593d1ba51ebdf150c3f6968030b9291
 WHIRLPOOL 
63c8229c667e461ad20c118d233a2abfe598cc95698b8c83e5f8b598657ca298ea0cdc20432ab2d084fd4a06129a5884e91eb445f4c7204be3798d1fb4dec2f8

diff --git a/net-vpn/tinc/tinc-1.0.32.ebuild b/net-vpn/tinc/tinc-1.0.32.ebuild
new file mode 100644
index 000..c8adaa0c7d3
--- /dev/null
+++ b/net-vpn/tinc/tinc-1.0.32.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit systemd
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/;
+SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+IUSE="libressl +lzo uml vde +zlib"
+
+DEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   lzo? ( dev-libs/lzo:2 )
+   zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+   vde? ( net-misc/vde )"
+
+src_configure() {
+   econf \
+   --enable-jumbograms \
+   --disable-tunemu  \
+   $(use_enable lzo) \
+   $(use_enable uml) \
+   $(use_enable vde) \
+   $(use_enable zlib)
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   dodir /etc/tinc
+   dodoc AUTHORS NEWS README THANKS
+   doconfd "${FILESDIR}"/tinc.networks
+   newconfd "${FILESDIR}"/tincd.conf tincd
+   newinitd "${FILESDIR}"/tincd-r1 tincd
+   systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
+}
+
+pkg_postinst() {
+   elog "This package requires the tun/tap kernel device."
+   elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/

[David Seifert]

commit: 801eebdc376cf3109849f573e588d43db98a30c4
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr 23 20:38:20 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 23 21:00:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=801eebdc

net-vpn/tinc: [QA] Add missing python metadata variables

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-vpn/tinc/tinc-1.1_pre14-r3.ebuild | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-vpn/tinc/tinc-1.1_pre14-r3.ebuild 
b/net-vpn/tinc/tinc-1.1_pre14-r3.ebuild
index ccc843d8305..5403ce866a1 100644
--- a/net-vpn/tinc/tinc-1.1_pre14-r3.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre14-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,7 +7,8 @@ MY_PV=${PV/_/}
 MY_P=${PN}-${MY_PV}
 
 PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python-any-r1
+
+inherit eutils multilib python-single-r1
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="http://www.tinc-vpn.org/;
@@ -24,8 +25,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
+   ${PYTHON_DEPS}
+   gui? ( dev-python/wxpython:3.0[${PYTHON_USEDEP}] )
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
@@ -36,11 +40,7 @@ DEPEND="
upnp? ( net-libs/miniupnpc )
zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
-   vde? ( net-misc/vde )
-   ${PYTHON_DEPS}
-   gui? ( $(python_gen_any_dep '
-   dev-python/wxpython[${PYTHON_USEDEP}]
-   ') )"
+   vde? ( net-misc/vde )"
 
 S="${WORKDIR}/${MY_P}"