summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2018-02-25 21:57:48 +0100
committerJeroen Roovers <jer@gentoo.org>2018-02-25 21:58:45 +0100
commitc81097a84e82a2b394a71e761e289775d599c603 (patch)
treee4542a7130e31224d788105b4eaad3466faa8791 /net-vpn
parentnet-dialup/mwavem: Drop old (diff)
downloadgentoo-c81097a84e82a2b394a71e761e289775d599c603.tar.gz
gentoo-c81097a84e82a2b394a71e761e289775d599c603.tar.bz2
gentoo-c81097a84e82a2b394a71e761e289775d599c603.zip
net-vpn/tinc: Fix compiling against sys-libs/ncurses[tinfo] (bug #621868).
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'net-vpn')
-rw-r--r--net-vpn/tinc/files/tinc-1.1-tinfo.patch10
-rw-r--r--net-vpn/tinc/tinc-1.1_pre15.ebuild8
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 00000000000..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() {