| 1 |
commit: 1ef5fafcec31a7df61c8500750a9cd1bdfa9ef43 |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 24 18:45:27 2016 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 26 14:40:29 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef5fafc |
| 7 |
|
| 8 |
net-irc/irssi: clean up 0.8.20 ebuild |
| 9 |
|
| 10 |
- don't quote eapi |
| 11 |
- munge the patch so the default src_prepare can be used |
| 12 |
|
| 13 |
This change was approved by monsieurp. |
| 14 |
|
| 15 |
Package-Manager: portage-2.2.28 |
| 16 |
|
| 17 |
net-irc/irssi/files/irssi-0.8.20-tinfo.patch | 21 +++++++++++++++++++++ |
| 18 |
net-irc/irssi/irssi-0.8.20.ebuild | 11 ++++++----- |
| 19 |
2 files changed, 27 insertions(+), 5 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-irc/irssi/files/irssi-0.8.20-tinfo.patch b/net-irc/irssi/files/irssi-0.8.20-tinfo.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000..346c6e9 |
| 24 |
--- /dev/null |
| 25 |
+++ b/net-irc/irssi/files/irssi-0.8.20-tinfo.patch |
| 26 |
@@ -0,0 +1,21 @@ |
| 27 |
+--- a/m4/curses.m4 2010-04-04 02:19:58.000000000 +1000 |
| 28 |
++++ b/m4/curses.m4 2014-03-06 16:36:12.404404130 +1100 |
| 29 |
+@@ -218,9 +218,17 @@ |
| 30 |
+ CURSES_LIBS="$CHECKLIBS" |
| 31 |
+ ],, $CHECKLIBS) |
| 32 |
+ ], $CURSES_LIBS) |
| 33 |
++ AC_CHECK_LIB(ncurses, tputs, [ |
| 34 |
++ true; |
| 35 |
++ ], [ |
| 36 |
++ CHECKLIBS=`echo "$3"|sed 's/-lncurses/-lncurses -ltinfo/g'` |
| 37 |
++ AC_CHECK_LIB(tinfo, tputs, [ |
| 38 |
++ CURSES_LIBS="$CHECKLIBS" |
| 39 |
++ ],, $CHECKLIBS) |
| 40 |
++ ], $CURSES_LIBS) |
| 41 |
+ CURSES_INCLUDEDIR="$4" |
| 42 |
+ search_ncurses=false |
| 43 |
+- screen_manager="$5" |
| 44 |
++ screen_manager=$5 |
| 45 |
+ AC_DEFINE(HAS_CURSES) |
| 46 |
+ has_curses=true |
| 47 |
+ has_ncurses=true |
| 48 |
|
| 49 |
diff --git a/net-irc/irssi/irssi-0.8.20.ebuild b/net-irc/irssi/irssi-0.8.20.ebuild |
| 50 |
index 20e7b3c..65b6f23 100644 |
| 51 |
--- a/net-irc/irssi/irssi-0.8.20.ebuild |
| 52 |
+++ b/net-irc/irssi/irssi-0.8.20.ebuild |
| 53 |
@@ -2,7 +2,7 @@ |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
# $Id$ |
| 56 |
|
| 57 |
-EAPI="6" |
| 58 |
+EAPI=6 |
| 59 |
|
| 60 |
inherit autotools eutils flag-o-matic perl-module toolchain-funcs |
| 61 |
|
| 62 |
@@ -40,11 +40,12 @@ RESTRICT="test" |
| 63 |
|
| 64 |
S="${WORKDIR}/${MY_P}" |
| 65 |
|
| 66 |
+PATCHES=( |
| 67 |
+ "${FILESDIR}/${P}-tinfo.patch" |
| 68 |
+) |
| 69 |
+ |
| 70 |
src_prepare() { |
| 71 |
- pushd m4 > /dev/null || die |
| 72 |
- eapply "${FILESDIR}/${PN}-0.8.15-tinfo.patch" |
| 73 |
- popd > /dev/null || die |
| 74 |
- eapply_user |
| 75 |
+ default |
| 76 |
eautoreconf |
| 77 |
} |
Archives