gentoo resync : 19.03.2019

4 files changed, 116 insertions, 59 deletions

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 72e0bd53d081..7c6ca8c1173c 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -5,12 +5,13 @@ AUX tincd-r1 1842 BLAKE2B 889c9f73f3960c913fffaff4a5d49d67c6123ace1c10321815d56c
 AUX tincd-r2 1830 BLAKE2B 3da729c7bc43c5bef471f0d5798c7e96a114f9cfd79ccb9e5e4383a37e6fb91a3465b6c9ec5125d6b9f775112563f29da1e6b8cb49c89b7e805f7b2e00a08de4 SHA512 59811c3e5241d08ebdfbd539556b7cee0dfaab89727ad503512c98f1a696fae143ecdf2682a652c5d71d077ed254ffe2e1c442b1c305c7e7ea94d9af9a1d385e
 AUX tincd.conf 728 BLAKE2B fdfe320df4ac8112fb5ee64cd88cd228bef8d1e701a00598691a328fa8ff759ed2f5f42d82a0d3555302cb87d4dfc5521e1850a41b9c5332e9210284f1cb0091 SHA512 f8d9354af5ebc07420ced98059262751bffef434b61c6333964338f327e2ac01ae676e375954efa794a1bccf8b939c78387b9fb7261f675f1237b0d946b529c9
 AUX tincd_at.service 197 BLAKE2B f568007b8872e105eb001333d24d7446ff8fb1995edaf77d98679078bfddd2ad9a534e1ed7d8ac743aaf026863dd9952e96e3bf2a8f950115c9f059a2660afc6 SHA512 866f8adbc9c39cc6030e6046e4265a4f6e893960045df15abc0a1865599cf2576ac12468bd1a286df47248ebe2c6b16ba64a60f0ebeeb0212d850a9d7886c98a
-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-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
-EBUILD tinc-1.0.33.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
-EBUILD tinc-1.0.34.ebuild 1212 BLAKE2B b1561117d04453a25dba0f834a30e7ca816fb439cecb5bed8879a73d980290e10ead3b77d2cd0332a16af4b3e0bb5ad9c8db71ce6f45af224f92d954eadb3a6e SHA512 d58d37be4d1c8852299bd9c72f152c2e156ff6838e04b4fb3d21bd7dbf218f53f37acf4edac292b1ba10fb7dfab295ee3d546e774866fd4cb0a82551c077f9e4
+DIST tinc-1.1pre17.tar.gz 927313 BLAKE2B d16789b64f6d11deda4752fdeeb603fe62efd6b1d68b0286fbe9c329d8ea51494df59e0e5bf1564b25a0ed44e9244799eb61f73de9ded6a1a418417453adddc4 SHA512 b966dbfa522e12ff6766c4deb54a9da29cddc15c3a1df0f0e084df27ee5f1421ffbebc0e29472b1bcd79ea8b41f8c0ef904172e333dcba0b85bafe4654a63b30
+EBUILD tinc-1.0.35-r1.ebuild 1349 BLAKE2B b6d0cb417a850682c16857f6f341137e4da9935a7fffb44d5afc4adb91bc37459f0a8f488dc55af1735ca5e1a6cb370484fb9b92ae03d2dd71b83092400a0cd9 SHA512 eb05c0ca37005fd0126b6fd611bd62dfcdba09140324e2cce9b6181796051280edf029088d98fa18b5636d026d92e3704f97ddd05ab65b56275f2449a2c52177
 EBUILD tinc-1.0.35.ebuild 1068 BLAKE2B 61e0222d74e8f01930905649be368cc6da9cc37d047f0d78259deca6badc296ff2e8738144e9eecb8b13848f4b34795cba39b623eb50af677d203169c1429f2c SHA512 86835b3684728c69084d59bb94f7d996a1c74a7a215ba11902c4dba3041a0569b88e90748f53412f395482c879f8fb96dee16905e8c605fc08ce3b4607114b38
 EBUILD tinc-1.1_pre16-r1.ebuild 2410 BLAKE2B 45ca4aa369b5d8fb66cd8af6c25b0f124059a86fece6ad89d72f83a5e76e7a4d92b8ed84cecf256737547f596ce32c3479cd68776bd47276d74e60943048374a SHA512 e95f032539e58a0387740f34ff82c51315454b117288a21d45cc620c763a76e3c17edd32b278ef606edf3119d8edd149be117ab95ac277ed01d6819e4ff9811c
+EBUILD tinc-1.1_pre17.ebuild 2417 BLAKE2B fcbfdddaf5c5e80b9af691bc62e0dd59b297fdcedabe8258edc524306f34e1a1a317bb2e2ef13b6e28f053a5c87f683e99eaa74a7439feb653474ceb80abbff5 SHA512 47f0247a1f47c4cd14f6d9d014b33470276f67a0dcee0d7e81d3fec8d0fe48c2db6c8f6a633a87c108c7e399887fba5d2a6d1afc9304796bc6bd63302c4bb71b
 MISC metadata.xml 723 BLAKE2B 09ac4b61d77c06379478413b2c8f33762908f272de27f7721d7cc02ad77b91755944835544ec6219a5d2744e3d79b2262d570e319140c4d06fae988caf7a7666 SHA512 d1aa24b5c5548fc37c19a992d211918afb93d361b385307f3d6bef783d381a465d0a743832425857766e5af5a8f960e5708cb60a1738d4a29bc659f6293d3bda
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 717bdeac65a9..000000000000
--- 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 "${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.33.ebuild b/net-vpn/tinc/tinc-1.0.35-r1.ebuild
index c8adaa0c7d3e..1f2d089df011 100644
--- a/net-vpn/tinc/tinc-1.0.33.ebuild
+++ b/net-vpn/tinc/tinc-1.0.35-r1.ebuild
@@ -1,12 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+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"
+
+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"
@@ -21,6 +28,11 @@ DEPEND="
 RDEPEND="${DEPEND}
 	vde? ( net-misc/vde )"
 
+# Upstream's patchset
+if [[ -n ${UPSTREAM_VER} ]]; then
+	PATCHES=( "${WORKDIR}"/patches-upstream )
+fi
+
 src_configure() {
 	econf \
 		--enable-jumbograms \
@@ -40,8 +52,3 @@ src_install() {
 	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.1_pre17.ebuild b/net-vpn/tinc/tinc-1.1_pre17.ebuild
new file mode 100644
index 000000000000..6eb358d55d46
--- /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 README THANKS
+	doconfd "${FILESDIR}"/tinc.networks
+	newconfd "${FILESDIR}"/tincd.conf tincd
+	newinitd "${FILESDIR}"/tincd-r2 tincd
+}
+
+pkg_postinst() {
+	elog "This package requires the tun/tap kernel device."
+	elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
+}