gentoo resync : 16.06.2018

3 files changed, 3 insertions, 52 deletions

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 5765326f5f68..903276798ead 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -5,12 +5,10 @@ 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.31.tar.gz 494877 BLAKE2B bdb47a9026d26cb2681da2a83931063d818a851e9e41dbd27ac131937abda68769b973afba74445bab7999599d766b3375ef853a6ed8740027ba119cfc5d2d89 SHA512 ac694d4ceec19bddebd3d5b9f37eb703a4701b93f65a7bbcdbc0b364f2a4f8b116c85748d06ec7821474de5c4d434caf5448109a0846e15c4a96adb92a0fc622
-DIST tinc-1.0.32.tar.gz 496221 BLAKE2B 692053d2bb690d1b2e76070f3dbae12ff4f90803434f62e0d7de0d1739312e5873abacbacccc976eda9860882846789732750364886961d4c5c164bb88d84a09 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
-EBUILD tinc-1.0.31.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
-EBUILD tinc-1.0.32.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
 EBUILD tinc-1.0.33.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
+EBUILD tinc-1.0.34.ebuild 1212 BLAKE2B b1561117d04453a25dba0f834a30e7ca816fb439cecb5bed8879a73d980290e10ead3b77d2cd0332a16af4b3e0bb5ad9c8db71ce6f45af224f92d954eadb3a6e SHA512 d58d37be4d1c8852299bd9c72f152c2e156ff6838e04b4fb3d21bd7dbf218f53f37acf4edac292b1ba10fb7dfab295ee3d546e774866fd4cb0a82551c077f9e4
 EBUILD tinc-1.1_pre15.ebuild 2330 BLAKE2B 677427570cdf3eba07d8c12af052576e4275d5995387828dced0520eca51bab34c432b8822dacd7b82f473e80b2c4b576b76038e834ce0344ecbf0043e05047c SHA512 b0a73cd46da15d49c40dbc76c12348b3577d6f1ed17182ba57bd390a0b01eda2e878443c9061fbb6b4f5b81a775120c5024e8ae34eed70a6a0008aeb9bbe274b
 MISC metadata.xml 803 BLAKE2B 6cbe55ecefa33a96893318ec94f64e8b768bcdb52cec36ca8a57c80cd1dfb06543bd3dcf9686e79c71f984502da3dba0f492d43f253d37e9cc6107e6e5206e41 SHA512 23ccfff115ec3553356db3b2a16f436cee60f5471e4a240d032cf48d89a73ef350545bc91b3976b188ad3658ff83d0037ccc00a5f3f5864e2704d4616e1095ac
diff --git a/net-vpn/tinc/tinc-1.0.32.ebuild b/net-vpn/tinc/tinc-1.0.32.ebuild
deleted file mode 100644
index c8adaa0c7d3e..000000000000
--- 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) \
-		$(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.31.ebuild b/net-vpn/tinc/tinc-1.0.34.ebuild
index c8adaa0c7d3e..717bdeac65a9 100644
--- a/net-vpn/tinc/tinc-1.0.31.ebuild
+++ b/net-vpn/tinc/tinc-1.0.34.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"