Fix building against sys-libs/ncurses[tinfo] (bug #526332).

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)

6 files changed, 65 insertions, 20 deletions

diff --git a/net-misc/urlview/ChangeLog b/net-misc/urlview/ChangeLog
index 080cc3a1c5cb..8dd997a567f3 100644
--- a/net-misc/urlview/ChangeLog
+++ b/net-misc/urlview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/urlview
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/urlview/ChangeLog,v 1.23 2012/04/05 18:21:59 nimiux Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/urlview/ChangeLog,v 1.24 2014/10/28 00:04:35 jer Exp $
+
+  28 Oct 2014; Jeroen Roovers <jer@gentoo.org> urlview-0.9.ebuild,
+  files/urlview-0.9-DESTDIR.patch, +files/urlview-0.9-tinfo.patch,
+  files/include-fix.patch, files/no-trailing-newline.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #526332).
 
   05 Apr 2012; Chema Alonso <nimiux@gentoo.org> metadata.xml:
   Added myself as maintainer
diff --git a/net-misc/urlview/files/include-fix.patch b/net-misc/urlview/files/include-fix.patch
index c948a2355435..b9bb6ab46992 100644
--- a/net-misc/urlview/files/include-fix.patch
+++ b/net-misc/urlview/files/include-fix.patch
@@ -1,5 +1,5 @@
---- urlview.c.orig	2005-02-06 17:10:54.000000000 +0100
-+++ urlview.c	2005-02-06 17:57:06.998290062 +0100
+--- a/urlview.c
++++ b/urlview.c
 @@ -40,6 +40,8 @@
  #include <fcntl.h>
  #include <sys/stat.h>
diff --git a/net-misc/urlview/files/no-trailing-newline.patch b/net-misc/urlview/files/no-trailing-newline.patch
index 8a6859f2ccfe..6d78cd4ed073 100644
--- a/net-misc/urlview/files/no-trailing-newline.patch
+++ b/net-misc/urlview/files/no-trailing-newline.patch
@@ -1,5 +1,5 @@
---- urlview.c	2000-07-04 11:14:30.000000000 +0100
-+++ urlview.no-trailing-newline.c	2003-09-06 11:07:02.000000000 +0100
+--- a/urlview.c
++++ b/urlview.no-trailing-newline.c
 @@ -46,7 +46,7 @@
  #include <rx/rxposix.h>
  #endif
diff --git a/net-misc/urlview/files/urlview-0.9-DESTDIR.patch b/net-misc/urlview/files/urlview-0.9-DESTDIR.patch
index 304fd6706c86..8c4cfe816b63 100644
--- a/net-misc/urlview/files/urlview-0.9-DESTDIR.patch
+++ b/net-misc/urlview/files/urlview-0.9-DESTDIR.patch
@@ -1,5 +1,16 @@
---- Makefile.in
-+++ Makefile.in
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,6 +11,7 @@
+ CLEANFILES = *~ *.orig *.rej
+ 
+ install-data-local:
+-	$(INSTALL_DATA) urlview.man $(mandir)/man1/urlview.1
++	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
++	$(INSTALL_DATA) urlview.man ${DESTDIR}$(mandir)/man1/urlview.1
+ 
+ # how to create a target for uninstall-data-local???
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -318,7 +318,8 @@
  
  
diff --git a/net-misc/urlview/files/urlview-0.9-tinfo.patch b/net-misc/urlview/files/urlview-0.9-tinfo.patch
new file mode 100644
index 000000000000..e8f3886a4d0e
--- /dev/null
+++ b/net-misc/urlview/files/urlview-0.9-tinfo.patch
@@ -0,0 +1,21 @@
+--- a/configure.in
++++ b/configure.in
+@@ -3,6 +3,8 @@
+ dnl AM_CONFIG_HEADER(config.h)
+ AM_PROG_CC_STDC
+ CFLAGS="$CFLAGS -DURLVIEW -Dunix"
++
++PKG_CHECK_MODULES(ncurses,ncurses)
+ AC_ARG_WITH(slang, [  --with-slang[=DIR]      use S-Lang instead of curses],
+ 	[AC_DEFINE(USE_SLANG)
+ 	if test $withval = yes -a -d ../slang; then
+@@ -22,8 +24,7 @@
+ 		fi
+ 		LIBS="$LIBS -lslang -lm"
+ 	fi],
+-
+-	[AC_CHECK_LIB(ncurses, initscr, [LIBS="$LIBS -lncurses"], [LIBS="$LIBS -lcurses"])
++	[LIBS="$LIBS $ncurses_LIBS"
+ 	AC_CHECK_FUNCS(curs_set)
+ 	AC_CHECK_HEADERS(ncurses.h)
+ 	AC_CHECK_HEADER(ncurses/curses.h, [CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"])])
diff --git a/net-misc/urlview/urlview-0.9.ebuild b/net-misc/urlview/urlview-0.9.ebuild
index ec927ec38acd..de3da54e077c 100644
--- a/net-misc/urlview/urlview-0.9.ebuild
+++ b/net-misc/urlview/urlview-0.9.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/urlview/urlview-0.9.ebuild,v 1.27 2008/02/03 15:43:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/urlview/urlview-0.9.ebuild,v 1.28 2014/10/28 00:04:35 jer Exp $
 
-inherit eutils
+EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="extracts urls from text and will send them to another app"
 HOMEPAGE="http://www.mutt.org"
@@ -11,20 +12,27 @@ SRC_URI="ftp://gd.tuwien.ac.at/infosys/mail/mutt/contrib/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
 
-DEPEND=">=sys-libs/ncurses-5.2"
+RDEPEND="
+	>=sys-libs/ncurses-5.2
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/no-trailing-newline.patch
-	epatch "${FILESDIR}"/include-fix.patch
-	epatch "${FILESDIR}"/${P}-DESTDIR.patch
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/no-trailing-newline.patch \
+		"${FILESDIR}"/include-fix.patch \
+		"${FILESDIR}"/${P}-DESTDIR.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+
+	eautoreconf
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	default
 	dodoc README INSTALL ChangeLog AUTHORS sample.urlview
 	dobin url_handler.sh
 }