Fix broken desktop file.

(Portage version: 2.2_rc23/cvs/Linux i686)

3 files changed, 106 insertions, 2 deletions

diff --git a/media-sound/yammi/ChangeLog b/media-sound/yammi/ChangeLog
index 5cfff93bb162..51ba3c1f4221 100644
--- a/media-sound/yammi/ChangeLog
+++ b/media-sound/yammi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/yammi
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.36 2008/02/19 01:53:09 ingmar Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.37 2009/02/13 22:59:56 carlo Exp $
+
+*yammi-1.2.3-r1 (13 Feb 2009)
+
+  13 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +files/yammi-1.2.3-desktop-file.diff, +yammi-1.2.3-r1.ebuild:
+  Fix broken desktop file.
 
   19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> yammi-1.2.3.ebuild:
   Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
diff --git a/media-sound/yammi/files/yammi-1.2.3-desktop-file.diff b/media-sound/yammi/files/yammi-1.2.3-desktop-file.diff
new file mode 100644
index 000000000000..e0a6d9e11d18
--- /dev/null
+++ b/media-sound/yammi/files/yammi-1.2.3-desktop-file.diff
@@ -0,0 +1,33 @@
+--- src/Makefile.am.o	2009-02-13 23:24:50.000000000 +0100
++++ src/Makefile.am	2009-02-13 23:25:08.000000000 +0100
+@@ -35,7 +35,7 @@
+ noinst_HEADERS = applytoalldialog.h trackpositionslider.h util.h searchthread.h yammidcopiface.h
+ 
+ SUBDIRS = icons
+-appsdir = $(kde_appsdir)/Multimedia
++appsdir = $(xdg_appsdir)
+ apps_DATA =  yammi.desktop
+ 
+ 
+--- src/yammi.desktop.o	2009-02-13 23:19:00.000000000 +0100
++++ src/yammi.desktop	2009-02-13 23:24:34.000000000 +0100
+@@ -1,13 +1,12 @@
+ [Desktop Entry]
+ Type=Application
+-Version=1.2-rc
+-Encoding=UTF-8
++Version=1.0
+ Name=Yammi
+ GenericName=Yet Another Music Manager I...
+-Exec=yammi -caption "%c" %i %m %u
++Exec=yammi -caption "%c" %i %u
+ Comment=Yet Another Music Manager I...
+-Icon=yammi.png
+-DocPath=yammi/index.html
+-MimeTypes=
++Icon=yammi
++X-DocPath=yammi/index.html
++MimeType=
+ Terminal=false
+-Categories=Qt;KDE;AudioVideo;AudioVideo;Player
++Categories=Qt;KDE;AudioVideo;Audio;Player;
diff --git a/media-sound/yammi/yammi-1.2.3-r1.ebuild b/media-sound/yammi/yammi-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..f294411a0934
--- /dev/null
+++ b/media-sound/yammi/yammi-1.2.3-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.2.3-r1.ebuild,v 1.1 2009/02/13 22:59:56 carlo Exp $
+
+ARTS_REQUIRED="yes"
+
+EAPI="1"
+
+inherit kde
+
+DESCRIPTION="MP3/Ogg/Wav-Manager and Jukebox"
+HOMEPAGE="http://yammi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/yammi/${P}.tar.gz
+	mirror://gentoo/kde-admindir-3.5.5.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cdr encode kde vorbis"
+
+DEPEND=">=media-libs/taglib-1.3"
+
+RDEPEND="${DEPEND}
+	kde? ( || ( kde-base/noatun:3.5 kde-base/kdemultimedia:3.5 ) )
+	media-sound/sox
+	virtual/mpg123
+	vorbis? ( media-sound/vorbis-tools )
+	encode? ( media-sound/cdparanoia
+		media-sound/lame )"
+
+# sox, mpg123 and vorbis-tools are used for the 'prelisten' feature.
+# cdparanoia and lame are used by the yammiGrabAndEncode script.
+# gstreamer support is left out on purpose, since it is
+# based on the obsolete gst kde bindings.
+
+need-kde 3.5
+
+PATCHES=(
+	"${FILESDIR}/yammi-1.2.3-desktop-file.diff"
+	)
+
+src_unpack() {
+	kde_src_unpack
+
+	sed -i -e '/AM_PATH_XMMS/s:^:dnl :' "${S}/configure.in.in"
+}
+
+src_compile() {
+	myconf="--disable-xmms"
+
+	kde_src_compile
+}
+
+pkg_postinst() {
+	elog
+	elog "Yammi provides various plugins based on external"
+	elog "programs, you can emerge any of the following"
+	elog "packages to make the correspondent plugin available:"
+	elog
+	elog "app-cdr/cdlabelgen:        Create CD labels."
+	elog "app-cdr/k3b:               Burn CDs with K3b."
+	elog "media-libs/tunepimp or"
+	elog "media-sound/trm:           Lookup tracks on www.musicbrainz.org"
+	echo
+}