gentoo resync : 02.03.2018

3 files changed, 17 insertions, 4 deletions

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index d823d6a17bd3..86ed3d38f510 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,4 +1,5 @@
 AUX tinc-1.1-fix-paths.patch 1469 BLAKE2B de939576010a60fa74e1bb5880a7eef2e0c77c7c853d3640d0b779642f0a2dbc83c927e8f9b75183a08cc72345c583139b28d0b3d345f5737be033b7eabea0b8 SHA512 55bd0e61a1d10a89d879d5113082f0cdb5ff6bf1d1fb3f618c459eb2658836bf602f72fe27ac03ec78746e300a3a5178db053eef6f08d3cb34b11410dbeb05de
+AUX tinc-1.1-tinfo.patch 143 BLAKE2B a78500b9b020c6cd3f667f59459dd9b146baf7cdee90b96b2ed1ef62e4d9d55d8a8752f4a0544452e604d2a6962d29faf93fa6285475c9b39d72e95e94da2549 SHA512 d18d194b63dc71b8e45a0899ca325e722b4228b22370426265eaa669fb421a9b05fa87e42dbc23ce524ae61e62a99ca949e3f4d96be1f60fa0f77a8e8cb54419
 AUX tinc.networks 387 BLAKE2B c3057322b46ee0186db4f2e9cadb8e60a318f5731e77a19e8c31e757c47c88afb8db6848f739511146bd0dc85ffdecea80c5be09890bcc3060a9b9ace9ecf855 SHA512 f7cb459c170898e51176bd92c642335386db90b7bca2abb3f6eb2514546efbd74e5fd2c8845060111dd48a0dd2cc1890717a03315c9b86185047c259cdc27135
 AUX tincd-r1 1842 BLAKE2B 889c9f73f3960c913fffaff4a5d49d67c6123ace1c10321815d56c8dd55e29d3916f8de0befdcef4ff7862b5f741406918bba2203c8b2e13548f874edad5c821 SHA512 1308d097487ef0f1fb1763ca99565edc1026c11159775a5d0c1e41905d8332b7df734460ccea5750a7b6dd5897ecffbe8e95cb721d94ffe5b7855ec4293dc360
 AUX tincd-r2 1830 BLAKE2B 3da729c7bc43c5bef471f0d5798c7e96a114f9cfd79ccb9e5e4383a37e6fb91a3465b6c9ec5125d6b9f775112563f29da1e6b8cb49c89b7e805f7b2e00a08de4 SHA512 59811c3e5241d08ebdfbd539556b7cee0dfaab89727ad503512c98f1a696fae143ecdf2682a652c5d71d077ed254ffe2e1c442b1c305c7e7ea94d9af9a1d385e
@@ -11,5 +12,5 @@ DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B e97f044066a3c399b4089ed73e77a7890483703
 EBUILD tinc-1.0.31.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
 EBUILD tinc-1.0.32.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
 EBUILD tinc-1.0.33.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
-EBUILD tinc-1.1_pre15.ebuild 2395 BLAKE2B a2823e5cbd4eda68fe675606808458b2e8e77ca5bda77bf7d16d76fbb03c18bbb1bbd01998ff2a649048e958ee0b76370e0e1693c4f0c86c77f2ee6e15063e23 SHA512 debbc0e04ba85bde3ca88d3b60bc7b9523f25ddc13057618bd5bb22520d0af9517395e56cd8d97317e5485ed969400e74d2734a826dc0ef96a71df5262c97f0c
+EBUILD tinc-1.1_pre15.ebuild 2463 BLAKE2B 4af2897de07c7451630edf7ad2d8760556dbf4bcbc1cbbc32122ce1b4c946f4ce865e1f30c334afd2328ccd9bcee9bbe7500357064065bcc7eb5a91a41642e38 SHA512 0f40a4c374d06758444aa9748d46ea61324445027eff5c6d94bd8af96dc3341ef2e78d7ccd6cdbd72904f8803e09c83863febe98262019027d6e52955e2c832e
 MISC metadata.xml 803 BLAKE2B 6cbe55ecefa33a96893318ec94f64e8b768bcdb52cec36ca8a57c80cd1dfb06543bd3dcf9686e79c71f984502da3dba0f492d43f253d37e9cc6107e6e5206e41 SHA512 23ccfff115ec3553356db3b2a16f436cee60f5471e4a240d032cf48d89a73ef350545bc91b3976b188ad3658ff83d0037ccc00a5f3f5864e2704d4616e1095ac
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 000000000000..5a9ec01473df
--- /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 a1b29bd75463..57d5cee18286 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() {