Fix Bug 453396 - net-irc/irssi with sys-libs/ncurses[tinfo] - .../work/irssi-0.8.15/src/fe-text/terminfo-core.c:281: undefined reference to tputs, thanks to Ben Longbons for reporting, jer, Paul Osmialowski, ssuominen and Zhu Sha Zang for working on it. Patch by me. Fix bug Bug 459012 - net-irc/irssi calls unnecessarily epunt_cxx, thanks to ago for reporting.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

3 files changed, 107 insertions, 2 deletions

diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog
index acc1a22c2bd3..d27607d7ea5f 100644
--- a/net-irc/irssi/ChangeLog
+++ b/net-irc/irssi/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-irc/irssi
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.182 2013/12/28 18:04:35 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.183 2014/03/04 13:08:52 gienah Exp $
+
+*irssi-0.8.15-r2 (04 Mar 2014)
+
+  04 Mar 2014; Mark Wright <gienah@gentoo.org> +files/irssi-0.8.15-tinfo.patch,
+  +irssi-0.8.15-r2.ebuild:
+  Fix Bug 453396 - net-irc/irssi with sys-libs/ncurses[tinfo] -
+  .../work/irssi-0.8.15/src/fe-text/terminfo-core.c:281: undefined reference to
+  tputs, thanks to Ben Longbons for reporting, jer, Paul Osmialowski, ssuominen
+  and Zhu Sha Zang for working on it. Patch by me. Fix bug Bug 459012 - net-
+  irc/irssi calls unnecessarily epunt_cxx, thanks to ago for reporting.
 
   28 Dec 2013; Jeroen Roovers <jer@gentoo.org> -irssi-0.8.15-r2.ebuild,
   irssi-9999.ebuild, metadata.xml:
diff --git a/net-irc/irssi/files/irssi-0.8.15-tinfo.patch b/net-irc/irssi/files/irssi-0.8.15-tinfo.patch
new file mode 100644
index 000000000000..60ad511f4dc6
--- /dev/null
+++ b/net-irc/irssi/files/irssi-0.8.15-tinfo.patch
@@ -0,0 +1,35 @@
+--- irssi-0.8.15-orig/curses.m4	2010-04-04 02:19:58.000000000 +1000
++++ irssi-0.8.15/curses.m4	2014-03-02 13:06:29.834097805 +1100
+@@ -95,6 +95,7 @@
+ 
+ 	AC_SUBST(CURSES_LIBS)
+ 	AC_SUBST(CURSES_INCLUDEDIR)
++	AC_SUBST(NCURSES_LIBS)
+ 
+ 	AC_ARG_WITH(sco,
+ 	  [  --with-sco              Use this to turn on SCO-specific code],[
+@@ -131,7 +132,8 @@
+ 	  if test x$withval = xno ; then
+ 		search_ncurses=false
+ 	  elif test x$withval != xyes ; then
+-		AC_NCURSES($withval/include, ncurses.h, -L$withval/lib -lncurses, -I$withval/include, "ncurses on $withval/include")
++		NCURSES_LIBS="`pkg-config --libs-only-l ncurses`"
++		AC_NCURSES($withval/include, ncurses.h, -L$withval/lib "$NCURSES_LIBS", -I$withval/include, "ncurses on $withval/include")
+ 	  fi
+ 	)
+ 
+@@ -230,8 +232,14 @@
+ ])
+ 
+ AC_DEFUN([AC_SEARCH_NCURSES], [
++    AC_SUBST(NCURSES_LIBS)
++    AC_SUBST(NCURSES_INCLUDES)
++    NCURSES_LIBS=`pkg-config --libs-only-l ncurses`
++    NCURSES_INCLUDES=`pkg-config --cflags-only-I ncurses`
+     AC_CHECKING("location of ncurses.h file")
+ 
++    AC_NCURSES($NCURSES_INCLUDES, ncurses.h, $NCURSES_LIBS,,
++	       [ncurses in $NCURSES_INCLUDES])
+     AC_NCURSES(/usr/include, ncurses.h, -lncurses,,
+ 	       [ncurses in /usr/include])
+     AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses,
diff --git a/net-irc/irssi/irssi-0.8.15-r2.ebuild b/net-irc/irssi/irssi-0.8.15-r2.ebuild
new file mode 100644
index 000000000000..edd37d82a4a5
--- /dev/null
+++ b/net-irc/irssi/irssi-0.8.15-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.15-r2.ebuild,v 1.3 2014/03/04 13:08:52 gienah Exp $
+
+EAPI=4
+
+inherit autotools-utils perl-module
+
+# Keep for _rc compability
+MY_P="${P/_/-}"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="http://irssi.org/"
+SRC_URI="http://irssi.org/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ipv6 +perl ssl socks5"
+
+RDEPEND="sys-libs/ncurses
+	>=dev-libs/glib-2.6.0
+	ssl? ( dev-libs/openssl )
+	perl? ( dev-lang/perl )
+	socks5? ( >=net-proxy/dante-1.1.18 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	perl? ( !net-im/silc-client )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.15-tinfo.patch" )
+
+src_prepare() {
+	AUTOTOOLS_AUTORECONF=1
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	econf \
+		--with-proxy \
+		--with-ncurses="${EPREFIX}"/usr \
+		--with-perl-lib=vendor \
+		$(use_with perl) \
+		$(use_with socks5 socks) \
+		$(use_enable ssl) \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	use perl && fixlocalpod
+
+	dodoc AUTHORS ChangeLog README TODO NEWS
+}