public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/, net-vpn/tinc/files/
Date: Sun, 25 Feb 2018 20:58:46 +0000 (UTC)	[thread overview]
Message-ID: <1519592325.c81097a84e82a2b394a71e761e289775d599c603.jer@gentoo> (raw)

commit:     c81097a84e82a2b394a71e761e289775d599c603
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 20:57:48 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 20:58:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c81097a8

net-vpn/tinc: Fix compiling against sys-libs/ncurses[tinfo] (bug #621868).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-vpn/tinc/files/tinc-1.1-tinfo.patch | 10 ++++++++++
 net-vpn/tinc/tinc-1.1_pre15.ebuild      |  8 +++++---
 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() {


             reply	other threads:[~2018-02-25 20:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-25 20:58 Jeroen Roovers [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-07-06 20:10 [gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/, net-vpn/tinc/files/ Jonathan Vasquez
2018-09-05  2:02 Anthony G. Basile
2018-09-05  2:02 Anthony G. Basile

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1519592325.c81097a84e82a2b394a71e761e289775d599c603.jer@gentoo \
    --to=jer@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox