| 1 |
commit: c81097a84e82a2b394a71e761e289775d599c603 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 25 20:57:48 2018 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 25 20:58:45 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c81097a8 |
| 7 |
|
| 8 |
net-vpn/tinc: Fix compiling against sys-libs/ncurses[tinfo] (bug #621868). |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
net-vpn/tinc/files/tinc-1.1-tinfo.patch | 10 ++++++++++ |
| 13 |
net-vpn/tinc/tinc-1.1_pre15.ebuild | 8 +++++--- |
| 14 |
2 files changed, 15 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-vpn/tinc/files/tinc-1.1-tinfo.patch b/net-vpn/tinc/files/tinc-1.1-tinfo.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..5a9ec01473d |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-vpn/tinc/files/tinc-1.1-tinfo.patch |
| 21 |
@@ -0,0 +1,10 @@ |
| 22 |
+--- a/m4/curses.m4 |
| 23 |
++++ b/m4/curses.m4 |
| 24 |
+@@ -39,6 +39,7 @@ |
| 25 |
+ )] |
| 26 |
+ ) |
| 27 |
+ ]) |
| 28 |
++ AC_SEARCH_LIBS(stdscr, tinfo) |
| 29 |
+ |
| 30 |
+ AC_SUBST(CURSES_LIBS) |
| 31 |
+ ]) |
| 32 |
|
| 33 |
diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild b/net-vpn/tinc/tinc-1.1_pre15.ebuild |
| 34 |
index a1b29bd7546..57d5cee1828 100644 |
| 35 |
--- a/net-vpn/tinc/tinc-1.1_pre15.ebuild |
| 36 |
+++ b/net-vpn/tinc/tinc-1.1_pre15.ebuild |
| 37 |
@@ -1,4 +1,4 @@ |
| 38 |
-# Copyright 1999-2017 Gentoo Foundation |
| 39 |
+# Copyright 1999-2018 Gentoo Foundation |
| 40 |
# Distributed under the terms of the GNU General Public License v2 |
| 41 |
|
| 42 |
EAPI="6" |
| 43 |
@@ -8,7 +8,7 @@ MY_P=${PN}-${MY_PV} |
| 44 |
|
| 45 |
PYTHON_COMPAT=( python2_7 ) |
| 46 |
|
| 47 |
-inherit eutils multilib python-single-r1 systemd |
| 48 |
+inherit autotools multilib python-single-r1 systemd |
| 49 |
|
| 50 |
DESCRIPTION="tinc is an easy to configure VPN implementation" |
| 51 |
HOMEPAGE="http://www.tinc-vpn.org/" |
| 52 |
@@ -41,7 +41,6 @@ DEPEND=" |
| 53 |
zlib? ( sys-libs/zlib )" |
| 54 |
RDEPEND="${DEPEND} |
| 55 |
vde? ( net-misc/vde )" |
| 56 |
- |
| 57 |
S="${WORKDIR}/${MY_P}" |
| 58 |
|
| 59 |
src_prepare() { |
| 60 |
@@ -55,7 +54,10 @@ src_prepare() { |
| 61 |
fi |
| 62 |
|
| 63 |
eapply "${FILESDIR}"/tinc-1.1-fix-paths.patch #560528 |
| 64 |
+ eapply "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868 |
| 65 |
eapply_user |
| 66 |
+ |
| 67 |
+ eautoreconf |
| 68 |
} |
| 69 |
|
| 70 |
src_configure() { |
Archives