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

Package-Manager: portage-2.2.0_alpha122/cvs/Linux x86_64

5 files changed, 35 insertions, 57 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/Manifest b/media-libs/phonon-vlc/Manifest
index ba2594b0fa34..db810f3c12e2 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,23 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX phonon-vlc-0.6.0-desktop.patch 2067 SHA256 88ff6f552836b976082fd7c9bab18708ab50253bd640b4850155d26b7de534ee SHA512 ab72ec02ef4612ba78d40d7ef0d3c1038dfb3b4e7264d95feb0d2cf128439593485a824775626ab1a2e859b0c0929b19829504eeecece5d4f9b324c954bd498c WHIRLPOOL 9e9ef476f7debf0ebc28cfd09aca2bdce4cc96b3eb040f7a3e01559a029469ce259f4fff82b5074999bae47bf4f7afa167d7b345d9080f1f114b273953c14405
 DIST phonon-backend-vlc-0.4.1.tar.bz2 55020 SHA256 168da93f71ec00b35d006a501f434a50134c51d8f80a8338e340c835d24b2da4
-DIST phonon-backend-vlc-0.5.0.tar.xz 51388 SHA256 2256fe9fef74bcd165c24ae8e9b606a48264c9193a4a1da6ef0aaa02dad76388
 DIST phonon-backend-vlc-0.6.0.tar.xz 54796 SHA256 1db140b67081e6f1bacdf88de88abca21edd1607c3d69dec35110c427aed133d SHA512 1093a6dd963f37a04c85643001f35026de36280e7ddab61efbc6f94e9ded3efc1f3345ed77864a8308de60d26763a6488d17237519ebca4ec74acfb7a73ae1dc WHIRLPOOL 3e4b04f2b0f3c2a53ad206acdd0cc34547f261911ed11206fc3239549190e19c2b74dbf617321132fcf9355048414f748b0a25e0a6a43df57b1416c1468ea4a2
 EBUILD phonon-vlc-0.4.1.ebuild 1162 SHA256 564443996fdc1974d8143da1a8ee06d5d7bed0a8f5e78a26894f1d9a1343705c SHA512 076261ade069f10b569aa38e57462a22ed87b2bae2cffc4c6ce8da9ea96a088de59de355d592fd584a8444f5f8902c244135a9776decfa5bed7df90fdd8c5c39 WHIRLPOOL 8da4453c42fc4ee5eb1cde87e1841ad878e53f6f8c5e4c48768748cba4c3044032e9bf67f850704411471690806b142f886d35640a042f2a0a86c51fd31fd804
-EBUILD phonon-vlc-0.5.0.ebuild 1190 SHA256 2a1213fa6370e9b46915158cdf64909c1ee67e0f10028e755e2447f83f8a7999 SHA512 a9248e7b6c0361fd3673cbc5a4eda38f40cf989dbbe33a83043cd6542450c09050faea202d080f0c8d1ad4720717d17e1fd43045f7ea2d680421bd9e9a9d0765 WHIRLPOOL 7a7aef2ed4878898dbf2cab59258cd34d41f6deafdad7047d46431b4ef8d0e9dfa0384643d2f7e97828278565bc74358862d4d38d842f57b205f8de06cc85e36
-EBUILD phonon-vlc-0.6.0.ebuild 1194 SHA256 f670bfa023983b824e101a571757dc361ad0f9dbb7f3f20d3521bde012ac32c1 SHA512 07488a2f281ae4dca39caa157105516b02264b0ea6aae65dcffb8c4d3803a7c09ba9c8b71acf05775c0b6f48db22818f209ca8feaede05741b2e016654c9bc65 WHIRLPOOL 91cce10cc4cdd234891502281b20100ab810c8a7bdfe20c090c9edfd82d97c6d40b36be66dd62c25d9455c06d0875915b98a13df5f0d9359e8c6963d5c7a6e0c
+EBUILD phonon-vlc-0.6.0-r1.ebuild 1243 SHA256 93e75fad52c9720acd88d764b1d83ccabbffdd48736ed9932feaee40b8e6fab2 SHA512 244d1307e8b3511ab8d0e0a0f81cfe2d293c30cc82c88cc5f6fc292e3eb50f0361ae31233be81b3ac476c965dd32a743f689ff5d9ffaa6da87697e2ef92be042 WHIRLPOOL 95c7080357dca1e17f3406dd26d69db7eb4a466b450626c0e68851fb128377383935b0ffbbe40e4bacf94e58d1b378ddff65aafed585277674aa7a60f897ba1b
 EBUILD phonon-vlc-9999.ebuild 1194 SHA256 52628f65a9fb04726940a11f70f1ab12cde87cff7fc66c14de6dd151f039b606 SHA512 78d7e2b283facbe728d1478b31edf27a6b4f4cbbbee150c2a96a32122fc5004370af70bec1cc120f38002d3852e71762ccd0adb9b6c1872d32785588219aefab WHIRLPOOL ea2f2acc11fc409b732d5ec828950b5b94f8a7e878494485907b3a1d6071cc1b5a91f3d7bc10fdd48a006725a9cb0d718a5056b2232e2c79ceb1e6915f46ff84
-MISC ChangeLog 4675 SHA256 46410abf38502b22cff0e96033fd5340e833cd4a9e605a734665cdb8fec5a1ae SHA512 6cbae22c876c0763a577b0ff1cebf484a886080abd5fe9525ca9c7d598cf0dcc5296249eb9302fa0c668440d71cd1ef31ee7ac4859390e3c8931234ec511ec2e WHIRLPOOL ac655dbc22d50bf3f3f7a1cf09c6abe0916136eaacc7f632120692850a8abc8b21aa49635a4533e0bebd3a308741386941aedf817f7003ee8de2a250ccc67859
+MISC ChangeLog 5008 SHA256 cd231875071d190c31e30e25864341c84013f95e8e13642ccce4d945d8c24b97 SHA512 2074058896244441d7dac4ad5f353bd3eb23bebde1ae8f59505ee989b26b7b7b0af4a9e4c6eb71aeb010936a48eaf0f6e8c546fe93bee9f26555496d74da1c2a WHIRLPOOL 28f04ff8455bb73bf6d32444d65a5cdfaf30d7b20292145a6eb947b873d5868eb948a71eec1ffe25fb9917c05828faf3bc1816ad11f44876c4c67848860c7673
 MISC metadata.xml 158 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2 SHA512 a9f1d39008120816359e4198157b5613ab427fde9b8503e24346193fe9c84edc9a62860b90fd56c4adf4526bb7873a489a0f98efc75b52caa913e911ffd50f12 WHIRLPOOL 22e1f5aef99c4356a076c106161a1a73b40367e9f95e3ddc38c66a153674daef83871f77d765dd7d1bd7d970b72fd3841577176e361fcdb9936bf0309fd28635
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQI4B8AAoJEO+t9ga+3I3aV5wIAJeW1FkpDuM4ZXdc4WLwkqt/
-iHl+Q7C9npAzLywz3OHTn/XIk4M9V1SiVnSUv5xw4iaPDZico3gfZmWP9Fau2SEq
-0lBmBBuqEPw6AYfuJ4OC/hMjcyEp8K+iz/sDtQK+CknUbrAZ6TBiECxwsF0ZLHBS
-jv+qcMd5OTR6Qy66qbFGn4MQ37x+Pr/bYeyzyDaXxd95jmllktkq/8SBKePyh1Ot
-6sBfyc9tWZab6DNC+AqCi/vIp3MUDgrX2hnJd6inZNhzRFVywZi/wunwhlb3dEFT
-PReOjDK/KiQoBwZ2r92uOxi9dIkLMH24KAxeZ3P4KrSrpOip4iWh8hjxeggTTR8=
-=A61c
+iQEcBAEBCAAGBQJQNiGRAAoJEO+t9ga+3I3aYl8H/A09BSDqu2CqONI3p0Xz7qpH
+ONyej4o6Pze2rmh3RDfgcCjoWuh8GUA05BJuUygihHK+P9goGBbdPeX5bQZdjRWr
+xODIbQ/zJZDBU35P/WBjQ498a88MtLluzUo1Z/tVeaFf1q/T2wZxFbqcF+3vYtvv
+5Vs4XF2DBMq2/JCPesPXWdSLPRYwBDTK5wK32e6TeRNqF8mhP/sWEOGakMywybQT
+kdhSarBT52ypPU1IPfDXZ0n7C1B1fwoyc0cAhi19rGmQfPaesR08bHo13u/Kns9m
+EC4V3bnZKcwHx85fpOBXNQ+HaId4bDbeohvpJC6hT/Q0tcrggZ5OxT/8eHnhZTA=
+=L+jd
 -----END PGP SIGNATURE-----
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"