old

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 8 insertions, 71 deletions

diff --git a/media-sound/grip/grip-3.3.1-r1.ebuild b/media-sound/grip/grip-3.3.1-r1.ebuild
deleted file mode 100644
index 6ba0adb18087..000000000000
--- a/media-sound/grip/grip-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.3.1-r1.ebuild,v 1.3 2008/01/13 18:09:10 aballier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper."
-HOMEPAGE="http://www.nostatic.org/grip"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="nls vorbis"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	x11-libs/vte
-	media-sound/lame
-	media-sound/cdparanoia
-	>=media-libs/id3lib-3.8.3
-	>=gnome-base/libgnomeui-2.2.0
-	>=gnome-base/orbit-2
-	net-misc/curl
-	vorbis? ( media-sound/vorbis-tools )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Fix for incompatible implicit declaration of built-in function ‘strlen’.
-	epatch "${FILESDIR}"/${P}-implicit-declaration.patch
-
-	# Required for FreeBSD (do not remove)
-	elibtoolize
-}
-
-src_compile() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nl pl_PL pt_BR ru zh_CN zh_HK zh_TW
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls) || die "./configure failed"
-	emake || die "emake failed."
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS CREDITS ChangeLog README TODO
-}
diff --git a/media-sound/grip/grip-3.3.1-r2.ebuild b/media-sound/grip/grip-3.3.1-r2.ebuild
index 8c3281b2fcdf..14c4b0b9121e 100644
--- a/media-sound/grip/grip-3.3.1-r2.ebuild
+++ b/media-sound/grip/grip-3.3.1-r2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.3.1-r2.ebuild,v 1.1 2009/03/05 03:19:23 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.3.1-r2.ebuild,v 1.2 2009/06/05 16:17:52 ssuominen Exp $
 
+EAPI=2
 inherit eutils flag-o-matic toolchain-funcs libtool
 
 DESCRIPTION="GTK+ based Audio CD Player/Ripper."
@@ -13,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nls vorbis"
 
-RDEPEND=">=x11-libs/gtk+-2.2
+RDEPEND=">=x11-libs/gtk+-2.2:2
 	x11-libs/vte
 	media-sound/lame
 	media-sound/cdparanoia
@@ -27,17 +28,12 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Fix for incompatible implicit declaration of built-in function ‘strlen’.
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-implicit-declaration.patch
-
-	# Required for FreeBSD (do not remove)
 	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	# Bug #69536
 	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
 
@@ -45,11 +41,10 @@ src_compile() {
 
 	econf \
 		--disable-dependency-tracking \
-		$(use_enable nls) || die "./configure failed"
-	emake || die "emake failed."
+		$(use_enable nls)
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS CREDITS ChangeLog README TODO
 }
diff --git a/media-sound/grip/metadata.xml b/media-sound/grip/metadata.xml
index 78ec7f6984fe..ae573a60407f 100644
--- a/media-sound/grip/metadata.xml
+++ b/media-sound/grip/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
-<maintainer>
-  <email>sound@gentoo.org</email>
-  <name>Gentoo Sound Team</name>
-</maintainer>
+	<herd>sound</herd>
 </pkgmetadata>