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

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

4 files changed, 36 insertions, 18 deletions

diff --git a/media-sound/mp3info/ChangeLog b/media-sound/mp3info/ChangeLog
index e1d776c3942d..e9ddb78d738d 100644
--- a/media-sound/mp3info/ChangeLog
+++ b/media-sound/mp3info/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mp3info
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/ChangeLog,v 1.27 2011/03/12 09:59:28 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/ChangeLog,v 1.28 2014/10/28 11:28:20 jer Exp $
+
+  28 Oct 2014; Jeroen Roovers <jer@gentoo.org> mp3info-0.8.5a.ebuild,
+  files/mp3info-0.8.5a-ldflags.patch, +files/mp3info-0.8.5a-tinfo.patch:
+  EAPI bump. Fix building against sys-libs/ncurses[tinfo] (bug #464336).
 
   12 Mar 2011; Tim Harder <radhermit@gentoo.org> mp3info-0.8.5a.ebuild:
   Update to EAPI 2, use slot dep for gtk+, add explicit DEPEND, and use default
diff --git a/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch b/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch
index 40276235b842..4881b91eb29f 100644
--- a/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch
+++ b/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2007-01-05 23:21:33.000000000 +0100
-+++ Makefile	2007-01-05 23:22:02.000000000 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -52,10 +52,10 @@
  doc: mp3info.txt
  
diff --git a/media-sound/mp3info/files/mp3info-0.8.5a-tinfo.patch b/media-sound/mp3info/files/mp3info-0.8.5a-tinfo.patch
new file mode 100644
index 000000000000..475292144ee7
--- /dev/null
+++ b/media-sound/mp3info/files/mp3info-0.8.5a-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -43,7 +43,7 @@
+ INSTALL = /usr/bin/install -c
+ STRIP = strip
+ 
+-LIBS = -lncurses
++LIBS = $(shell ${PKG_CONFIG} --libs ncurses)
+ CC = gcc
+ CFLAGS = -g -O2 -Wall
+ 
diff --git a/media-sound/mp3info/mp3info-0.8.5a.ebuild b/media-sound/mp3info/mp3info-0.8.5a.ebuild
index a177280cd307..c8832ff944f0 100644
--- a/media-sound/mp3info/mp3info-0.8.5a.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.5a.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/mp3info-0.8.5a.ebuild,v 1.10 2011/03/12 09:59:28 radhermit Exp $
-
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/mp3info-0.8.5a.ebuild,v 1.11 2014/10/28 11:28:20 jer Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="An MP3 technical info viewer and ID3 1.x tag editor"
@@ -15,24 +14,28 @@ SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="gtk"
 
-DEPEND="gtk? ( >=x11-libs/gtk+-2.6.10:2 )
-	sys-libs/ncurses"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	gtk? ( >=x11-libs/gtk+-2.6.10:2 )
+	sys-libs/ncurses
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
+	epatch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+	tc-export PKG_CONFIG
 }
 
 src_compile() {
-	emake mp3info CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
-	if use gtk; then
-		emake gmp3info CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "gtk mp3info failed"
-	fi
+	emake mp3info $(usex gtk gmp3info '') CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	dobin mp3info
-	use gtk && dobin gmp3info
+	dobin mp3info $(usex gtk gmp3info '')
 
 	dodoc ChangeLog README
 	doman mp3info.1