Version bump.

(Portage version: 2.1.6.11/cvs/Linux x86_64)

5 files changed, 50 insertions, 47 deletions

diff --git a/media-sound/mp3splt-gtk/ChangeLog b/media-sound/mp3splt-gtk/ChangeLog
index eee8539a7014..c15723642154 100644
--- a/media-sound/mp3splt-gtk/ChangeLog
+++ b/media-sound/mp3splt-gtk/ChangeLog
@@ -1,13 +1,21 @@
 # ChangeLog for media-sound/mp3splt-gtk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt-gtk/ChangeLog,v 1.8 2009/01/09 16:32:45 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt-gtk/ChangeLog,v 1.9 2009/04/30 00:44:58 ssuominen Exp $
+
+*mp3splt-gtk-0.5.4 (30 Apr 2009)
+
+  30 Apr 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +files/mp3splt-gtk-0.5.4-validate_desktop_entry.patch,
+  -mp3splt-gtk-0.5.ebuild, -mp3splt-gtk-0.5.2.ebuild,
+  +mp3splt-gtk-0.5.4.ebuild:
+  Version bump.
 
   09 Jan 2009; Joseph Jezak <josejx@gentoo.org> mp3splt-gtk-0.5.2.ebuild:
   Marked ~ppc for bug #221989.
 
 *mp3splt-gtk-0.5.2 (24 Nov 2008)
 
-  24 Nov 2008; <ssuominen@gentoo.org> metadata.xml,
+  24 Nov 2008; Samuli Suominen <ssuominen@gentoo.org>
   +mp3splt-gtk-0.5.2.ebuild:
   Version bump for bug 247603, thanks to Sebastian Mair for reporting.
 
@@ -30,7 +38,7 @@
 
 *mp3splt-gtk-0.4_rc1 (13 May 2008)
 
-  13 May 2008; Samuli Suominen <drac@gentoo.org>
+  13 May 2008; Samuli Suominen <ssuominen@gentoo.org>
   +mp3splt-gtk-0.4_rc1.ebuild:
   Initial commit.
 
diff --git a/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.5.4-validate_desktop_entry.patch b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.5.4-validate_desktop_entry.patch
new file mode 100644
index 000000000000..81dc1d453f39
--- /dev/null
+++ b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.5.4-validate_desktop_entry.patch
@@ -0,0 +1,20 @@
+diff -ur mp3splt-gtk-0.5.4.orig/mp3splt-gtk.desktop mp3splt-gtk-0.5.4/mp3splt-gtk.desktop
+--- mp3splt-gtk-0.5.4.orig/mp3splt-gtk.desktop	2008-06-06 20:29:03.000000000 +0000
++++ mp3splt-gtk-0.5.4/mp3splt-gtk.desktop	2009-04-30 03:41:27.000000000 +0000
+@@ -1,14 +1,12 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+-
+ Name=Mp3splt-gtk audio splitter
+ GenericName=Sound Splitter
+ Comment=Split mp3 and ogg files without decoding
+ 
+-Icon=/usr/share/mp3splt-gtk/mp3splt-gtk_ico.png
++Icon=mp3splt-gtk_ico
+ 
+ Type=Application
+-Categories=Application;AudioVideo;Audio;AudioVideoEditing;
++Categories=AudioVideo;Audio;AudioVideoEditing;
+ 
+ Exec=mp3splt-gtk
+ StartupNotify=false
diff --git a/media-sound/mp3splt-gtk/metadata.xml b/media-sound/mp3splt-gtk/metadata.xml
index c84aa15b735c..751c0f42ebf5 100644
--- a/media-sound/mp3splt-gtk/metadata.xml
+++ b/media-sound/mp3splt-gtk/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
-<use>
-	<flag name='audacious'>Include <pkg>media-sound/audacious</pkg> support.</flag>
-</use>
+	<herd>sound</herd>
+	<use>
+		<flag name='audacious'>Include <pkg>media-sound/audacious</pkg> support</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.5.2.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.5.4.ebuild
index a1fa31c93167..3d60d90a2a87 100644
--- a/media-sound/mp3splt-gtk/mp3splt-gtk-0.5.2.ebuild
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.5.4.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt-gtk/mp3splt-gtk-0.5.2.ebuild,v 1.2 2009/01/09 16:32:45 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt-gtk/mp3splt-gtk-0.5.4.ebuild,v 1.1 2009/04/30 00:44:58 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="a GTK+ based utility to split mp3 and ogg files without decoding."
@@ -13,24 +14,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="audacious gstreamer nls"
 
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=media-libs/libmp3splt-0.5
+RDEPEND=">=x11-libs/gtk+-2.6:2
+	>=media-libs/libmp3splt-0.5.4
 	audacious? ( media-sound/audacious )
-	gstreamer? ( >=media-libs/gst-plugins-base-0.10 )"
+	gstreamer? ( media-libs/gst-plugins-base:0.10 )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-validate_desktop_entry.patch
+}
+
+src_configure() {
 	local myconf
 
-	use audacious && myconf="${myconf} --enable-audacious"
-	use gstreamer && myconf="${myconf} --enable-gstreamer"
+	use nls || myconf+=" --disable-nls"
+	use audacious && myconf+=" --enable-audacious"
+	use gstreamer && myconf+=" --enable-gstreamer"
 
 	econf --disable-dependency-tracking ${myconf}
-	emake || die "emake failed."
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.5.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.5.ebuild
deleted file mode 100644
index a627d802c378..000000000000
--- a/media-sound/mp3splt-gtk/mp3splt-gtk-0.5.ebuild
+++ /dev/null
@@ -1,30 +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/mp3splt-gtk/mp3splt-gtk-0.5.ebuild,v 1.1 2008/09/08 04:30:59 aballier Exp $
-
-inherit eutils
-
-DESCRIPTION="a GTK+ based utility to split mp3 and ogg files without decoding."
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/mp3splt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=media-libs/libmp3splt-0.5"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	econf --disable-dependency-tracking
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	make_desktop_entry ${PN} mp3splt ${PN}
-}