Add upstream patch to pass .desktop validation by Michael Palimaka <kensington@gentoo.org> wrt bug #432408. Remove old.

(Portage version: 2.2.0_alpha122/cvs/Linux x86_64)

4 files changed, 25 insertions, 46 deletions

diff --git a/media-libs/phonon-vlc/ChangeLog b/media-libs/phonon-vlc/ChangeLog
index 6c2e4cce26e8..f68809020f83 100644
--- a/media-libs/phonon-vlc/ChangeLog
+++ b/media-libs/phonon-vlc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/phonon-vlc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/ChangeLog,v 1.23 2012/08/09 09:13:37 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/ChangeLog,v 1.24 2012/08/23 12:26:47 johu Exp $
+
+*phonon-vlc-0.6.0-r1 (23 Aug 2012)
+
+  23 Aug 2012; Johannes Huber <johu@gentoo.org>
+  +files/phonon-vlc-0.6.0-desktop.patch, +phonon-vlc-0.6.0-r1.ebuild,
+  -phonon-vlc-0.5.0.ebuild, -phonon-vlc-0.6.0.ebuild:
+  Add upstream patch to pass .desktop validation by Michael Palimaka
+  <kensington@gentoo.org> wrt bug #432408. Remove old.
 
 *phonon-vlc-0.6.0 (09 Aug 2012)
 
diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.6.0-desktop.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.6.0-desktop.patch
new file mode 100644
index 000000000000..1f7310a7b0a6
--- /dev/null
+++ b/media-libs/phonon-vlc/files/phonon-vlc-0.6.0-desktop.patch
@@ -0,0 +1,13 @@
+diff --git a/src/vlc.desktop.cmake b/src/vlc.desktop.cmake
+index 24efc311d428371db8df77dae78ddacb5c24bf01..9db70625f3f6b916691bd69491b48e61c3721a4e 100644
+--- a/src/vlc.desktop.cmake
++++ b/src/vlc.desktop.cmake
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Type=Service
+ X-KDE-ServiceTypes=PhononBackend
+-MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;x-mpegurl;audio/x-mpegurl;audio/mp3;audio/mpeg;video/x-ms-asf;application/x-flash-video;audio/x-it;audio/x-s3m;audio/x-xm;
++MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;audio/x-mpegurl;audio/mp3;video/x-ms-asf;application/x-flash-video;audio/x-it;audio/x-s3m;audio/x-xm;
+ X-KDE-Library=phonon_vlc
+ X-KDE-PhononBackendInfo-InterfaceVersion=1
+ X-KDE-PhononBackendInfo-Version=@PHONON_VLC_VERSION@
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.5.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.5.0.ebuild
deleted file mode 100644
index 3910979f9934..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-0.5.0.ebuild,v 1.3 2012/05/29 16:07:02 aballier Exp $
-
-EAPI=4
-
-MY_PN="phonon-backend-vlc"
-MY_P="${MY_PN}-${PV}"
-EGIT_REPO_URI="git://anongit.kde.org/${PN}"
-[[ ${PV} == 9999 ]] && git_eclass=git-2
-inherit cmake-utils ${git_eclass}
-unset git_eclass
-
-DESCRIPTION="Phonon VLC backend"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-vlc"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	>=media-libs/phonon-4.6.0
-	media-video/vlc[dbus,ogg,vorbis]
-	>=x11-libs/qt-dbus-4.6.0:4
-	>=x11-libs/qt-gui-4.6.0:4
-"
-DEPEND="${RDEPEND}
-	>=dev-util/automoc-0.9.87
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS )
-
-pkg_postinst() {
-	elog "For more verbose debug information, export the following variables:"
-	elog "PHONON_DEBUG=1"
-	elog ""
-	elog "To make KDE detect the new backend without reboot, run:"
-	elog "kbuildsycoca4 --noincremental"
-}
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.6.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.6.0-r1.ebuild
index 02745ff0ce76..0c9bd6c2fe9c 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.6.0.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-0.6.0.ebuild,v 1.1 2012/08/09 09:13:37 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-0.6.0-r1.ebuild,v 1.1 2012/08/23 12:26:47 johu Exp $
 
 EAPI=4
 
@@ -35,6 +35,8 @@ S=${WORKDIR}/${MY_P}
 
 DOCS=( AUTHORS )
 
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+
 pkg_postinst() {
 	elog "For more verbose debug information, export the following variables:"
 	elog "PHONON_DEBUG=1"