Fix building against sys-libs/ncurses[tinfo] (bug #526908). Fix DPEND typo. Clean up patch.

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

5 files changed, 46 insertions, 17 deletions

diff --git a/app-editors/shed/ChangeLog b/app-editors/shed/ChangeLog
index 082e5c34f57b..fc53d1446651 100644
--- a/app-editors/shed/ChangeLog
+++ b/app-editors/shed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/shed
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/shed/ChangeLog,v 1.25 2012/08/22 00:19:16 blueness Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/shed/ChangeLog,v 1.26 2014/10/26 10:39:47 jer Exp $
+
+  26 Oct 2014; Jeroen Roovers <jer@gentoo.org> shed-1.15.ebuild,
+  +files/shed-1.15-cflags.patch, files/shed-1.15-interix.patch,
+  +files/shed-1.15-tinfo.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #526908). Fix DPEND typo.
+  Clean up patch.
 
   22 Aug 2012; Anthony G. Basile <blueness@gentoo.org> shed-1.15.ebuild:
   Keyword ~arm, bug #431922
diff --git a/app-editors/shed/files/shed-1.15-cflags.patch b/app-editors/shed/files/shed-1.15-cflags.patch
new file mode 100644
index 000000000000..2b675f7449f7
--- /dev/null
+++ b/app-editors/shed/files/shed-1.15-cflags.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -2,7 +2,7 @@
+ AM_INIT_AUTOMAKE(shed,1.15)
+ AC_PROG_CC
+ AC_PROG_INSTALL
+-CFLAGS="-Wall"
++CFLAGS="$CFLAGS -Wall"
+ AC_SUBST(CFLAGS)
+ 
+ AC_ARG_ENABLE(debug,   [  --enable-debug          gcc -g],enable_debug=yes)
diff --git a/app-editors/shed/files/shed-1.15-interix.patch b/app-editors/shed/files/shed-1.15-interix.patch
index 16c310d91cd1..d496795477b4 100644
--- a/app-editors/shed/files/shed-1.15-interix.patch
+++ b/app-editors/shed/files/shed-1.15-interix.patch
@@ -1,7 +1,6 @@
 http://sourceforge.net/tracker/?func=detail&aid=3554634&group_id=21862&atid=374571
-diff -ru shed-1.13.orig/shed.c shed-1.13/shed.c
---- shed-1.13.orig/shed.c	2008-04-03 15:21:53 +0200
-+++ shed-1.13/shed.c	2008-04-03 15:23:05 +0200
+--- a/shed.c
++++ b/shed.c
 @@ -31,6 +31,10 @@
  #include <ctype.h>     /* tolower    */
  #include <unistd.h>    /* dup, dup2  */
diff --git a/app-editors/shed/files/shed-1.15-tinfo.patch b/app-editors/shed/files/shed-1.15-tinfo.patch
new file mode 100644
index 000000000000..d1a406521c0f
--- /dev/null
+++ b/app-editors/shed/files/shed-1.15-tinfo.patch
@@ -0,0 +1,12 @@
+--- a/configure.in
++++ b/configure.in
+@@ -41,8 +41,7 @@
+ fi
+ 
+ ERR="Required package missing!"
+-AC_CHECK_HEADER(ncurses.h,:,AC_MSG_ERROR([$ERR]))
++PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],AC_MSG_ERROR([$ERR]))
+ AC_CHECK_HEADER(getopt.h,:,AC_MSG_ERROR([$ERR]))
+-AC_CHECK_LIB(ncurses,initscr)
+ AC_CHECK_LIB(m,pow)
+ AC_OUTPUT(Makefile)
diff --git a/app-editors/shed/shed-1.15.ebuild b/app-editors/shed/shed-1.15.ebuild
index a0f12ddc4a64..5c8bc3d79a8c 100644
--- a/app-editors/shed/shed-1.15.ebuild
+++ b/app-editors/shed/shed-1.15.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/shed/shed-1.15.ebuild,v 1.3 2012/08/22 00:19:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/shed/shed-1.15.ebuild,v 1.4 2014/10/26 10:39:47 jer Exp $
 
-EAPI="4"
-
-inherit eutils
+EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="Simple Hex EDitor"
 HOMEPAGE="http://shed.sourceforge.net/"
@@ -13,15 +12,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 RDEPEND="sys-libs/ncurses"
-DPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-interix.patch
-}
-
-src_compile() {
-	emake AM_CFLAGS="${CFLAGS}"
+	epatch \
+		"${FILESDIR}"/${P}-cflags.patch \
+		"${FILESDIR}"/${P}-interix.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
 }