Version bump.

Package-Manager: portage-2.1.5_rc6

6 files changed, 43 insertions, 105 deletions

diff --git a/media-sound/gnomad/ChangeLog b/media-sound/gnomad/ChangeLog
index 49fec001a312..881a9c644098 100644
--- a/media-sound/gnomad/ChangeLog
+++ b/media-sound/gnomad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/gnomad
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/ChangeLog,v 1.30 2008/01/30 22:21:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/ChangeLog,v 1.31 2008/04/27 02:35:43 drac Exp $
+
+*gnomad-2.9.1 (27 Apr 2008)
+
+  27 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/gnomad-2.9.1-desktop-entry.patch, -gnomad-2.8.9.ebuild,
+  -gnomad-2.8.12.ebuild, -gnomad-2.9.0.ebuild, +gnomad-2.9.1.ebuild:
+  Version bump.
 
   30 Jan 2008; Brent Baude <ranger@gentoo.org> gnomad-2.9.0.ebuild:
   Marking gnomad-2.9.0 ~ppc64 for bug 208038
diff --git a/media-sound/gnomad/Manifest b/media-sound/gnomad/Manifest
index d1221f1402f2..0e8fbd817a5a 100644
--- a/media-sound/gnomad/Manifest
+++ b/media-sound/gnomad/Manifest
@@ -1,10 +1,7 @@
+AUX gnomad-2.9.1-desktop-entry.patch 417 RMD160 dcec1e4cd9333844adf7691004c5205e37253f1e SHA1 a285820b8a811cebc4500a63ab10948b64b37bf0 SHA256 850a7b6d73534f724b31f0cadc231d109c01da27ae5f6198a14ac488adfa0692
 DIST gnomad2-2.8.1.tar.gz 323178 RMD160 6961d35f52cb751f8d286112e1f9f130e4bf9a55 SHA1 aa90560b5a073739863570d9ff8eccb24ccad6e9 SHA256 1902d5de651c91d76a41459e9ed4e399cf3cb9cbfea13ac9880bac8066ba284f
-DIST gnomad2-2.8.12.tar.gz 343705 RMD160 c21bea13bb58273fb168a2f6023cdebd7b106e75 SHA1 2199558617b3d32b232a444a13219e473cc2662b SHA256 ffb3c1cfd54088ad3cae81cf26ebfa2010988d917b26caa32aea9ee32841062b
-DIST gnomad2-2.8.9.tar.gz 316934 RMD160 b1ba4384778b8c3d9e64be11bf69cb9d2f2d9e80 SHA1 8980a9f4057e6c9f79a396822689300118e77d15 SHA256 5b2e6019a3eb5d8cb2d005a5a960a39e7fd60924262c9efb0c97c81bc8557825
-DIST gnomad2-2.9.0.tar.gz 359652 RMD160 b448b7a1495522f9977d6630a3f7a446a839a1aa SHA1 9ac31398f6a11f0fc2311ca390f74fe4134971dc SHA256 817ca00bf056947dae2e1a43eb3b9037ac00fa3ff092af2de06157744a9d401c
+DIST gnomad2-2.9.1.tar.gz 368449 RMD160 d7e06b6acf39e35e2cb5c08b7cdc5cd979f34968 SHA1 fbbd3cb3e9934f45979d5523870579cc6a2460c5 SHA256 21d1a00d1d8f8e8f4d19803663339527ec2577dcadd80b3438928a67c9000a0b
 EBUILD gnomad-2.8.1.ebuild 1022 RMD160 434cfd8bf8fc0c71c1667f7f15adc84ce0b40051 SHA1 3bdf2407affe731527b16eb38dababd111ba675e SHA256 5a9565c4ae9fa0ce5b405666cd6ce67aaca3fa35b03643123450253dd0c6da37
-EBUILD gnomad-2.8.12.ebuild 1066 RMD160 2f4e6adea5a751543573c309ffc06861d9b1d87e SHA1 20b37dfa125d5010915ee37d996c5a99227545c5 SHA256 162b684b5445756771910cd1fca6efb85b322bd8185286923117490a3b421994
-EBUILD gnomad-2.8.9.ebuild 994 RMD160 c2b93b741478cebf3220478c2470616041396143 SHA1 a342177096c91999b7194a5902bc4ea78cb0debb SHA256 24e90a8b6166e6ea5636a19551eebd1b19701a884b691c7e665a1ac59bdbce23
-EBUILD gnomad-2.9.0.ebuild 1090 RMD160 0289d79f3ae6a7728539cdb6d09ade808e3bafca SHA1 4a30ae53cc649b87bfeb74ec86de4186bc373038 SHA256 bb4233ea3d5c9c1ce3474bd0ce9b483245a83d4ef2c73feac7dc6c29b54d67b2
-MISC ChangeLog 3874 RMD160 4f4e85869994e2c650dc9ce6f4b91ed979659bf1 SHA1 644044a74db3b0a76bb09054f8b5802ecbcbe4fc SHA256 81f44dfaf97c633d1ea317eb550d19df7309e15a0449d303e5421e001d298d29
+EBUILD gnomad-2.9.1.ebuild 1172 RMD160 d76c8f4d08d8095cea7968c52cb0883b1c6e3059 SHA1 4fe208f4f0d719b8fc30fcbc15fda9d3c82db98b SHA256 af1530df2b7927d8472ce6de434c5960389ec4cfeed804f1a4da6bdd48e0d066
+MISC ChangeLog 4101 RMD160 8f408b078e3928fa6d51b619a4fc80e669b237d1 SHA1 2db0ca4c3516c35f1e9f845446c9af5e4c50bbeb SHA256 bb150f6b285b4234cacf1a4514323bbb3ec1049e07f15958952349ac5c5fc2e8
 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
diff --git a/media-sound/gnomad/files/gnomad-2.9.1-desktop-entry.patch b/media-sound/gnomad/files/gnomad-2.9.1-desktop-entry.patch
new file mode 100644
index 000000000000..8ea3f6665853
--- /dev/null
+++ b/media-sound/gnomad/files/gnomad-2.9.1-desktop-entry.patch
@@ -0,0 +1,12 @@
+diff -ur gnomad2-2.9.1.orig/gnomad2.desktop.in gnomad2-2.9.1/gnomad2.desktop.in
+--- gnomad2-2.9.1.orig/gnomad2.desktop.in	2005-06-29 15:33:22.000000000 +0300
++++ gnomad2-2.9.1/gnomad2.desktop.in	2008-04-27 04:25:52.000000000 +0300
+@@ -5,6 +5,5 @@
+ Exec=gnomad2
+ Terminal=false
+ Type=Application
+-Icon=gnomad2-logo.png
+-Categories=Application;AudioVideo;
+-Encoding=UTF-8
++Icon=gnomad2-logo
++Categories=AudioVideo;GTK;
diff --git a/media-sound/gnomad/gnomad-2.8.12.ebuild b/media-sound/gnomad/gnomad-2.8.12.ebuild
deleted file mode 100644
index 2c286974f809..000000000000
--- a/media-sound/gnomad/gnomad-2.8.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/gnomad-2.8.12.ebuild,v 1.3 2007/08/04 23:01:38 chainsaw Exp $
-
-inherit flag-o-matic gnome2
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A GNOME2 frontend for Creative Players (Zen, JukeBox, etc ...)"
-HOMEPAGE="http://gnomad2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-#-sparc: 2.4.4: Application crashes on startup (Gnome crash detection)
-KEYWORDS="~amd64 ~ppc -sparc ~x86 ~ppc64"
-
-# Yes, these dependencies are not elegant. However, the upstream configure
-# script offers no flexibility on this point. Sorry.
-RDEPEND=">=dev-libs/glib-2.6.0
-	>=x11-libs/gtk+-2.6
-	>=media-libs/libnjb-2.2.4
-	>=media-libs/libmtp-0.1.3
-	media-libs/libid3tag"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.21"
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/gnomad/gnomad-2.8.9.ebuild b/media-sound/gnomad/gnomad-2.8.9.ebuild
deleted file mode 100644
index ecc28296cb87..000000000000
--- a/media-sound/gnomad/gnomad-2.8.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/gnomad-2.8.9.ebuild,v 1.1 2006/10/24 10:25:32 axxo Exp $
-
-inherit flag-o-matic gnome2
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A GNOME2 frontend for Creative Players (Zen, JukeBox, etc ...)"
-HOMEPAGE="http://gnomad2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-#-sparc: 2.4.4: Application crashes on startup (Gnome crash detection)
-KEYWORDS="~amd64 ~ppc -sparc ~x86"
-
-RDEPEND=">=dev-libs/glib-2.6.0
-	>=x11-libs/gtk+-2.6
-	>=media-libs/libnjb-2.2.4
-	media-libs/libid3tag"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.21"
-
-src_compile() {
-	ALLOWED_FLAGS=""
-	strip-flags
-
-	replace-flags -O3 -O2
-	gnome2_src_compile
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/gnomad/gnomad-2.9.0.ebuild b/media-sound/gnomad/gnomad-2.9.1.ebuild
index d3d00fa02c6f..d59eff4bf4ea 100644
--- a/media-sound/gnomad/gnomad-2.9.0.ebuild
+++ b/media-sound/gnomad/gnomad-2.9.1.ebuild
@@ -1,46 +1,48 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/gnomad-2.9.0.ebuild,v 1.2 2008/01/30 22:21:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/gnomad-2.9.1.ebuild,v 1.1 2008/04/27 02:35:43 drac Exp $
 
-inherit flag-o-matic gnome2
+inherit eutils flag-o-matic gnome2
 
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
+MY_PN=${PN}2
+MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="A GNOME2 frontend for Creative Players (Zen, JukeBox, etc ...)"
-HOMEPAGE="http://gnomad2.sourceforge.net/"
+HOMEPAGE="http://gnomad2.sourceforge.net"
 SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
-
 #-sparc: 2.4.4: Application crashes on startup (Gnome crash detection)
 KEYWORDS="~amd64 ~ppc ~ppc64 -sparc ~x86"
+IUSE=""
 
-RDEPEND="dev-libs/dbus-glib
-	>=dev-libs/glib-2.6.0
+RDEPEND="sys-apps/hal
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.6
 	>=x11-libs/gtk+-2.6
 	>=media-libs/libnjb-2.2.4
 	>=media-libs/libmtp-0.1.3
 	>=media-libs/taglib-1.4-r1
 	>=media-libs/libid3tag-0.15.1b"
-
 DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.35.0"
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+S=${WORKDIR}/${MY_P}
 
 src_compile() {
-	ALLOWED_FLAGS=""
 	strip-flags
-
 	replace-flags -O3 -O2
 	gnome2_src_compile
 }
 
-src_install() {
-	make DESTDIR="${D}" install || die
+src_unpack() {
+	gnome2_src_unpack
+	epatch "${FILESDIR}"/${P}-desktop-entry.patch
+}
 
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }