[gentoo-commits] gentoo-x86 commit in media-sound/trommler: metadata.xml trommler-3.8.ebuild

[gentoo-commits] gentoo-x86 commit in media-sound/trommler: metadata.xml trommler-3.8.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    09/06/06 11:04:52

  Modified:             metadata.xml trommler-3.8.ebuild
  Log:
  Some EAPI2 love before opening stable bug.
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  media-sound/trommler/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/trommler/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/trommler/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/trommler/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/trommler/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	1 Mar 2004 04:45:09 -0000	1.1
+++ metadata.xml	6 Jun 2009 11:04:52 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+	<herd>sound</herd>
 </pkgmetadata>



1.3                  media-sound/trommler/trommler-3.8.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/trommler/trommler-3.8.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/trommler/trommler-3.8.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/trommler/trommler-3.8.ebuild?r1=1.2&r2=1.3

Index: trommler-3.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/trommler/trommler-3.8.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trommler-3.8.ebuild	1 Feb 2008 20:57:17 -0000	1.2
+++ trommler-3.8.ebuild	6 Jun 2009 11:04:52 -0000	1.3
@@ -1,9 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/trommler/trommler-3.8.ebuild,v 1.2 2008/02/01 20:57:17 drac Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/media-sound/trommler/trommler-3.8.ebuild,v 1.3 2009/06/06 11:04:52 ssuominen Exp $
 
+EAPI=2
 inherit eutils toolchain-funcs
 
 DESCRIPTION="GTK+ based drum machine."
@@ -15,7 +14,7 @@
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="+sox"
 
-RDEPEND=">=x11-libs/gtk+-2
+RDEPEND="x11-libs/gtk+:2
 	sox? ( media-sound/sox )"
 DEPEND="${RDEPEND}
 	x11-misc/makedepend
@@ -24,21 +23,23 @@
 S=${WORKDIR}/${PN/t/T}
 
 src_compile() {
-	emake export.h || die "emake export.h failed."
+	emake export.h || die "emake export.h failed"
 	emake CFLAGS="${CFLAGS} $(pkg-config --cflags gtk+-2.0)" \
-		CC="$(tc-getCC)" || die "emake failed."
+		CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {
 	exeinto /usr/libexec
-	doexe ${PN}
-	newbin "${FILESDIR}"/${PN}.wrapper ${PN}
-	dobin wav2smp playsample
-	use sox && dobin smp2wav
+	doexe ${PN} || die "doexe failed"
+	newbin "${FILESDIR}"/${PN}.wrapper ${PN} || die "newbin failed"
+	dobin wav2smp playsample || die "dobin failed"
+	if use sox; then
+		dobin smp2wav || die "dobin failed"
+	fi
 	insinto /usr/share/${PN}/Drums
-	doins Drums/*.smp
+	doins Drums/*.smp || die "doins failed"
 	insinto /usr/share/${PN}/Songs
-	doins Songs/*.sng
+	doins Songs/*.sng || die "doins failed"
 	dodoc CHANGES README
 	dohtml index.html style.css
 	make_desktop_entry ${PN} Trommler