From 1ef5fafcec31a7df61c8500750a9cd1bdfa9ef43 Mon Sep 17 00:00:00 2001
From: William Hubbs <williamh@gentoo.org>
Date: Sat, 24 Sep 2016 13:45:27 -0500
Subject: net-irc/irssi: clean up 0.8.20 ebuild

- don't quote eapi
- munge the patch so the default src_prepare can be used

This change was approved by monsieurp.

Package-Manager: portage-2.2.28
---
 net-irc/irssi/files/irssi-0.8.20-tinfo.patch | 21 +++++++++++++++++++++
 net-irc/irssi/irssi-0.8.20.ebuild            | 11 ++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 net-irc/irssi/files/irssi-0.8.20-tinfo.patch

(limited to 'net-irc')

diff --git a/net-irc/irssi/files/irssi-0.8.20-tinfo.patch b/net-irc/irssi/files/irssi-0.8.20-tinfo.patch
new file mode 100644
index 000000000000..346c6e963e56
--- /dev/null
+++ b/net-irc/irssi/files/irssi-0.8.20-tinfo.patch
@@ -0,0 +1,21 @@
+--- a/m4/curses.m4	2010-04-04 02:19:58.000000000 +1000
++++ b/m4/curses.m4	2014-03-06 16:36:12.404404130 +1100
+@@ -218,9 +218,17 @@
+ 			CURSES_LIBS="$CHECKLIBS"
+ 		],, $CHECKLIBS)
+ 	    ], $CURSES_LIBS)
++	    AC_CHECK_LIB(ncurses, tputs, [
++	        true;
++	    ], [
++                CHECKLIBS=`echo "$3"|sed 's/-lncurses/-lncurses -ltinfo/g'`
++		AC_CHECK_LIB(tinfo, tputs, [
++			CURSES_LIBS="$CHECKLIBS"
++		],, $CHECKLIBS)
++	    ], $CURSES_LIBS)
+ 	    CURSES_INCLUDEDIR="$4"
+ 	    search_ncurses=false
+-	    screen_manager="$5"
++	    screen_manager=$5
+             AC_DEFINE(HAS_CURSES)
+             has_curses=true
+ 	    has_ncurses=true
diff --git a/net-irc/irssi/irssi-0.8.20.ebuild b/net-irc/irssi/irssi-0.8.20.ebuild
index 20e7b3c4d58f..65b6f23a3723 100644
--- a/net-irc/irssi/irssi-0.8.20.ebuild
+++ b/net-irc/irssi/irssi-0.8.20.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="6"
+EAPI=6
 
 inherit autotools eutils flag-o-matic perl-module toolchain-funcs
 
@@ -40,11 +40,12 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-tinfo.patch"
+)
+
 src_prepare() {
-	pushd m4 > /dev/null || die
-	eapply "${FILESDIR}/${PN}-0.8.15-tinfo.patch"
-	popd > /dev/null || die
-	eapply_user
+	default
 	eautoreconf
 }
 
-- 
cgit v1.2.3-65-gdbad