Version bump.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

7 files changed, 61 insertions, 163 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/Manifest b/media-sound/gnomad/Manifest
index 4ce2ae8403d1..23a11a4f3bf4 100644
--- a/media-sound/gnomad/Manifest
+++ b/media-sound/gnomad/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnomad-2.9.1-desktop-entry.patch 417 RMD160 dcec1e4cd9333844adf7691004c5205e37253f1e SHA1 a285820b8a811cebc4500a63ab10948b64b37bf0 SHA256 850a7b6d73534f724b31f0cadc231d109c01da27ae5f6198a14ac488adfa0692
-AUX gnomad-2.9.1-libmtp-0.3.0-API.patch 2040 RMD160 5f3dfe54ae0d2dfeabb0670d1501a608d953b787 SHA1 688de1063973153eec8fac05d6711bfa0cddc24e SHA256 1f78b6874c21d17ed607781d43fa0a1cd1133f6eab7eaa6583c16606e68f49ce
 DIST gnomad2-2.9.1.tar.gz 368449 RMD160 d7e06b6acf39e35e2cb5c08b7cdc5cd979f34968 SHA1 fbbd3cb3e9934f45979d5523870579cc6a2460c5 SHA256 21d1a00d1d8f8e8f4d19803663339527ec2577dcadd80b3438928a67c9000a0b
-DIST gnomad2-2.9.2.tar.gz 370455 RMD160 1261b27e9196fb5c3e7113e3ef304045838c53ff SHA1 3cb00d6a83c5d46f5bcf11747ca09718d68be931 SHA256 92280c3c3563a0dc8c75aac89f6a7cd859f59897c4fce8db8ccdeea34b8fad80
-EBUILD gnomad-2.9.1-r1.ebuild 1166 RMD160 d7c1e1f68d85a2cb811aefce9d6f51f1c181b733 SHA1 ba371a86cd2ffe9df498334fd5aca9a4005340d1 SHA256 e03fab98bd56183adc309a5b63a091d5c42155bc275916d2a3eed8719c56753a
+DIST gnomad2-2.9.4.tar.gz 347481 RMD160 ff884acb2425f84541b8a7ee2e86403d2509149a SHA1 51d8d89c2960a36084fc6dd007fe652224b57ce5 SHA256 7dc696b50b9bb5fcbddf67988096a989212a4f6c6a728a5b491f06c64569e380
 EBUILD gnomad-2.9.1.ebuild 1111 RMD160 22b2feb4963f807a94e19a33b5e3fa07cc9e1cc9 SHA1 503bf85fb27ec55300cd94cc6dc0a0464eadbbb3 SHA256 54055450378aa1dab2eaadbc50177ae25fe03d447d68b89a8b2eb3fb6287945a
-EBUILD gnomad-2.9.2.ebuild 1027 RMD160 3acc72342cff05a47920e5fa2092c4afcedd066e SHA1 520c1a78b801d42373c4277ef59154de9b6048af SHA256 fdd4b64f59339549b956a04290a504e31a2045c10ff31fbd434eadc7aee7a32a
-MISC ChangeLog 4602 RMD160 d489f2d0068809c25fe579ec156e27ee4380beb4 SHA1 083da0195674103eaa27f1bfd33d57ec8e12b849 SHA256 67041f1e8a3c28ca6f349d32d838f03ecf68fa04c91b5191b7eb0646e5b45f0f
-MISC metadata.xml 284 RMD160 9c36fcc389876fbda6e17d877240c387af9dff93 SHA1 7b3171dbd22242c76240e04cea3478f6db7a63d3 SHA256 0acd90445e302f1ff6b9d173305db1c2345fd996ccc1a34f8039b4883d76c87c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkktuRgACgkQRh6X64ivZaJ00wCdHQveFiFXSyHgR4kwBkevCl89
-Ti4An0hdKyxHyh8kwC9+Xom9lSEx6bQQ
-=lDMf
------END PGP SIGNATURE-----
+EBUILD gnomad-2.9.4.ebuild 993 RMD160 c595fc2163ea07b0a814a46962d0bd8d902d2ca8 SHA1 f5021898a2e9092c58bce350009c8a81b2240ba8 SHA256 3f4a13c33e6c83b413ddd2d4d0ed7ab9479732dbb3ffe8542cff8cf57cc034e1
+MISC ChangeLog 4822 RMD160 7f3fa26a6a9c7c25eccb2bcdb444e50d9caa5467 SHA1 b9909fd2ee8c88281a52291367c627053b2eda42 SHA256 fff90e3099c841549a1e283d109339b2c201db0f7a4d033def5787bb87262f6f
+MISC metadata.xml 250 RMD160 b54dd8011b3d6177a89d21f6fbdb751aa9d69934 SHA1 c5de7e2c409a5f0f76a59acbd3164752c7d54819 SHA256 9843e2780d4541b36788a00dc8ac35ddb86fab1116002a1f34c97e6d97c61dbd
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>