Version bump.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

6 files changed, 57 insertions, 147 deletions

diff --git a/media-sound/gnomad/ChangeLog b/media-sound/gnomad/ChangeLog
index 258c66c409de..20fe9441585f 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.34 2008/11/26 21:01:07 serkan Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/ChangeLog,v 1.35 2009/05/11 14:01:58 ssuominen Exp $
+
+*gnomad-2.9.4 (11 May 2009)
+
+  11 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -gnomad-2.9.1-r1.ebuild, -files/gnomad-2.9.1-libmtp-0.3.0-API.patch,
+  -gnomad-2.9.2.ebuild, +gnomad-2.9.4.ebuild:
+  Version bump.
 
 *gnomad-2.9.2 (26 Nov 2008)
 
diff --git a/media-sound/gnomad/files/gnomad-2.9.1-libmtp-0.3.0-API.patch b/media-sound/gnomad/files/gnomad-2.9.1-libmtp-0.3.0-API.patch
deleted file mode 100644
index 48ba5d5fc85b..000000000000
--- a/media-sound/gnomad/files/gnomad-2.9.1-libmtp-0.3.0-API.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- gnomad-2.9.1.orig/src/jukebox.c	2008/03/25 23:52:29	1.122
-+++ gnomad-2.9.1/src/jukebox.c	2008/06/26 23:52:41	1.123
-@@ -2177,11 +2177,14 @@
- 	trackmeta->duration = length * 1000;
- 	trackmeta->filesize = get_64bit_file_size(tmpfname);
- 	trackmeta->filetype = filetype_d->filetype;
-+	// Hardcode parent (folder) to 0 (== root directory)
-+	trackmeta->parent_id = 0;
-+	// Hardcode storage to primary
-+	trackmeta->storage_id = 0;
- 	// TODO: Discarding return value as for now
- 	// g_print("Transferring MTP track...\n");
--	// Hardcode parent (folder) to 0 (== root directory)
- 	ret = LIBMTP_Send_Track_From_File(mtpdevice, tmpfname, trackmeta,
--					  mtp_progress, NULL, 0);
-+					  mtp_progress, NULL);
- 	if (ret != 0) {
- 	  g_print("Error sending file \"%s\" to MTP device!\n", tmpfname);
- 	  LIBMTP_Dump_Errorstack(mtpdevice);
-@@ -2348,7 +2351,7 @@
- 	filemeta->filesize = (uint64_t) hdmeta->size;
- 	filemeta->filetype = filetype_d->filetype;
- 	filemeta->parent_id = mtp_current_filter_id;
--	if (LIBMTP_Send_File_From_File(mtpdevice, tmpfname, filemeta, mtp_progress, NULL, mtp_current_filter_id) != 0) {
-+	if (LIBMTP_Send_File_From_File(mtpdevice, tmpfname, filemeta, mtp_progress, NULL) != 0) {
- 	  LIBMTP_destroy_file_t(filemeta);
- 	  g_free(tmpfname);
- 	  g_print("Error sending file \"%s\" to MTP device!\n", tmpfname);
-@@ -2746,8 +2749,10 @@
- 
-     pl = LIBMTP_new_playlist_t();
-     pl->name = g_strdup(plname);
-+    pl->parent_id = 0;
-+    pl->storage_id = 0;
-     // This will create the new playlist in the default folder
--    if (LIBMTP_Create_New_Playlist(mtpdevice, pl, 0) != 0) {
-+    if (LIBMTP_Create_New_Playlist(mtpdevice, pl) != 0) {
-       create_error_dialog(_("Could not create playlist"));
-       return 0;
-     }
-@@ -3609,7 +3614,7 @@
- 
- #ifdef HAVE_LIBMTP
-   if (use_mtp) {
--    int ret=LIBMTP_Create_Folder(mtpdevice,foldername,mtp_current_filter_id);
-+    int ret=LIBMTP_Create_Folder(mtpdevice,foldername,mtp_current_filter_id,0);
-     mtp_initialize_folders();
-     rebuild_datafile_list(folder);
-     return;
diff --git a/media-sound/gnomad/gnomad-2.9.1-r1.ebuild b/media-sound/gnomad/gnomad-2.9.1-r1.ebuild
deleted file mode 100644
index 68c741ff1890..000000000000
--- a/media-sound/gnomad/gnomad-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,48 +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/gnomad/gnomad-2.9.1-r1.ebuild,v 1.1 2008/07/05 22:37:51 loki_val Exp $
-
-GCONF_DEBUG=no
-
-inherit eutils flag-o-matic gnome2
-
-MY_PN=${PN}2
-MY_P=${MY_PN}-${PV}
-
-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"
-#-sparc: 2.4.4: Application crashes on startup (Gnome crash detection)
-KEYWORDS="~amd64 ~ppc ~ppc64 -sparc ~x86"
-IUSE=""
-
-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.3.0
-	>=media-libs/taglib-1.4-r1
-	>=media-libs/libid3tag-0.15.1b"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}"/${P}-desktop-entry.patch
-	epatch "${FILESDIR}"/${P}-libmtp-0.3.0-API.patch
-}
-
-src_compile() {
-	strip-flags
-	replace-flags -O3 -O2
-	gnome2_src_compile
-}
diff --git a/media-sound/gnomad/gnomad-2.9.2.ebuild b/media-sound/gnomad/gnomad-2.9.2.ebuild
deleted file mode 100644
index cef94119849f..000000000000
--- a/media-sound/gnomad/gnomad-2.9.2.ebuild
+++ /dev/null
@@ -1,42 +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/gnomad/gnomad-2.9.2.ebuild,v 1.1 2008/11/26 21:01:07 serkan Exp $
-
-GCONF_DEBUG=no
-
-inherit eutils flag-o-matic gnome2
-
-MY_PN=${PN}2
-MY_P=${MY_PN}-${PV}
-
-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"
-#-sparc: 2.4.4: Application crashes on startup (Gnome crash detection)
-KEYWORDS="~amd64 ~ppc ~ppc64 -sparc ~x86"
-IUSE=""
-
-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.3.0
-	>=media-libs/taglib-1.4-r1
-	>=media-libs/libid3tag-0.15.1b"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_compile() {
-	strip-flags
-	replace-flags -O3 -O2
-	gnome2_src_compile
-}
diff --git a/media-sound/gnomad/gnomad-2.9.4.ebuild b/media-sound/gnomad/gnomad-2.9.4.ebuild
new file mode 100644
index 000000000000..67bf5393c348
--- /dev/null
+++ b/media-sound/gnomad/gnomad-2.9.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/gnomad-2.9.4.ebuild,v 1.1 2009/05/11 14:01:58 ssuominen Exp $
+
+EAPI=2
+GCONF_DEBUG=no
+inherit flag-o-matic gnome2
+
+MY_P=${PN}2-${PV}
+
+DESCRIPTION="A GNOME2 frontend for Creative Players (Zen, JukeBox, etc ...)"
+HOMEPAGE="http://gnomad2.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}2/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+RDEPEND="sys-apps/hal
+	dev-libs/dbus-glib
+	>=x11-libs/gtk+-2.6:2
+	>=media-libs/libnjb-2.2.4
+	>=media-libs/libmtp-0.3
+	>=media-libs/taglib-1.5
+	>=media-libs/libid3tag-0.15.1b"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext
+		dev-util/intltool )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	G2CONF+=" $(use_enable nls)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_configure() {
+	strip-flags
+	replace-flags -O3 -O2
+	gnome2_src_configure
+}
diff --git a/media-sound/gnomad/metadata.xml b/media-sound/gnomad/metadata.xml
index 718d65e238dc..efcb9d33b8e8 100644
--- a/media-sound/gnomad/metadata.xml
+++ b/media-sound/gnomad/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
-<maintainer>
-<email>serkan@gentoo.org</email>
-<name>Serkan Kaba</name>
-<description>Co-maintainer</description>
-</maintainer>
+	<herd>sound</herd>
+	<maintainer>
+		<email>serkan@gentoo.org</email>
+		<name>Serkan Kaba</name>
+	</maintainer>
 </pkgmetadata>