Version bump.

(Portage version: 2.1.5_rc6)

5 files changed, 39 insertions, 98 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/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
 }