Revision bump adds upstream patch to fix .desktop validation by Michael Palimaka <kensington@gentoo.org> wrt bug #431602. Remove old.

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

8 files changed, 51 insertions, 235 deletions

diff --git a/media-libs/phonon-gstreamer/ChangeLog b/media-libs/phonon-gstreamer/ChangeLog
index 7f00f2768fe1..e4cc4657a574 100644
--- a/media-libs/phonon-gstreamer/ChangeLog
+++ b/media-libs/phonon-gstreamer/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-libs/phonon-gstreamer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/ChangeLog,v 1.22 2012/08/13 08:25:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/ChangeLog,v 1.23 2012/08/23 11:56:42 johu Exp $
+
+*phonon-gstreamer-4.6.2-r1 (23 Aug 2012)
+
+  23 Aug 2012; Johannes Huber <johu@gentoo.org>
+  +files/phonon-gstreamer-4.6.2-desktop.patch,
+  +phonon-gstreamer-4.6.2-r1.ebuild,
+  -files/4.5.1-fix-searching-for-phonon.patch, -phonon-gstreamer-4.5.1.ebuild,
+  -phonon-gstreamer-4.6.0.ebuild, -phonon-gstreamer-4.6.1.ebuild,
+  -phonon-gstreamer-4.6.2.ebuild:
+  Revision bump adds upstream patch to fix .desktop validation by Michael
+  Palimaka <kensington@gentoo.org> wrt bug #431602. Remove old.
 
 *phonon-gstreamer-4.6.2 (13 Aug 2012)
 
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 4bc9b6410151..ff1d353376a0 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,28 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 4.5.1-fix-searching-for-phonon.patch 2522 SHA256 ea1df8c6117d6251eacfe624258511afd5d1101b1d6579ee85c07b5e07c49d96 SHA512 2c5e0a71445d96620cfe4552685ca51de2eee5e285f7492a3a44b92070daf84f1676c12cf9086ae3740cbd235976c1d660041e67adff68e26de8b9746f3a1a7f WHIRLPOOL cb1b78f4a96dbdcf24607c3546bd2a91c232438ddcd982f1b1783d1b950ef2081561ff83f8bb646de4ade37fe44a24eebfd8eb498124b3fc77d74f24030d5cc1
+AUX phonon-gstreamer-4.6.2-desktop.patch 2279 SHA256 d3f5f730c550ef2788a2eb2b3b5981c44f5d40c216d1ae9c7a5a4d9c05f9865f SHA512 c3f14cef6fca8d6cb1c1d73833b2c5c70428bd219fadf49bbe19bf3ad5e6f9471d3904621c08b1e046b9a1b602f824c2bb1ab639fa1aaffb8987c4ba4aa01556 WHIRLPOOL 961693202739b5d7652a02e42c3cc4f0bb4afb86e43d5d9e3a078cd9f8213319f29e34c86053dc5939a0007be1395af006809ab633d658924faab371ad045183
 DIST phonon-backend-gstreamer-4.5.0.tar.bz2 89682 SHA256 a90874728b4eba089eb427fa1df2b65df387c08380df880ff5fa8f9beb85f79e SHA512 a4d1e1bd65f3be60141ff4667e03b286f312cb50ead8deaa28d8371dfa61e730696a4312b494a93809c3b7e5ff8a8dc484527842c2f9c42635069ca750a4d3f6 WHIRLPOOL b026bdc31dedfc8a28750ac310c663605ca5bb3773e9ad12ebd6392a9c8eeec0451cecc760dae3989f8205c401444f125672d192d0f49b554a74042fa99b3b66
-DIST phonon-backend-gstreamer-4.5.1.tar.bz2 90211 SHA256 62326ce7c64810eec8f42245a1f1880ce10d0a3b8976318ad516091f419ba38e
-DIST phonon-backend-gstreamer-4.6.0.tar.xz 70912 SHA256 5bd4e00c75d86b21fa364458b72b3603bbb85d8f06361b7ba9e422595b68932f
-DIST phonon-backend-gstreamer-4.6.1.tar.xz 71444 SHA256 2a51b0a6fe735d349de4ae58b1aac56e4278feefea9ba8f78106f0f8abcc5096 SHA512 c67ac30601f23d6752c1b25c4285ef7db37cc2c77ef503309dd51a405662d9b6afb8ea6d55542b30b47d4fb9b719c65555b2128cdcd9bb5a9ebc4dba1142a9f7 WHIRLPOOL 235662cd4b8578bc1d72c99ec24cebf7a971a3c2116b6ac29e317c05c5e18041dc379a7781f3528c0ef57d407e3afcaaa0a71429787573f7dac7780d21d7e88d
 DIST phonon-backend-gstreamer-4.6.2.tar.xz 71672 SHA256 d563a8d04e59203f5a5f8cae7de78ca0206057691e264cff813e2d34bc982516 SHA512 55701ff2a8a2bb137e2ffe42b8b95695fe96de34fd2e40438a81487619568bc23963f4cdbe2a6341cffbfdd1eeef86cd1fbb053bc9336cf176b44d250b74b071 WHIRLPOOL 790c50aae82cf97a0fc36bcbdfb0ddd00a424701a32b2f67ad5c6fadccc8ebc6ae5482aa8f2abd5f30b43771f79573c76278b70c6250503293f8dcc1909d7639
 EBUILD phonon-gstreamer-4.5.0.ebuild 1253 SHA256 4c56876adaea07964e01f91d3d6d8529608e3e11c585c6e7e79ae91a19110ba5 SHA512 643510a64c6209c8f55d87eef43c34f21de7f20b5c5cfb01496b3156d3a7b5ab32f213506360d20b3634dbd3e0d3cc2a3324665260980d029c881a81a2b33ad4 WHIRLPOOL a27832d75a4582d8bd911616d12b90561473762b5c401213c96f9723ac0653d7ef4f8835cd521e07ec3451f2b6491bf5d31e8873e067936102b51e04ee9b878a
-EBUILD phonon-gstreamer-4.5.1.ebuild 1311 SHA256 c3f9de764a42ae8a9eaaf4a51de5bb58a4beb9db5d6da145f3628c6ef76a6e3d SHA512 f354419fe7da806809ed623a5635d096fc6ea39a4100f89ce72b906ad78ceb53da85b8c927adf8bd79841242304387a30546ec1fc34e892f98dd4ae88892b17d WHIRLPOOL 5d5761fd517e8c307cee6392e2b0f71ace2fe7de3b995ff02b58ffc3c68da465ec1d2a45403a67cf1ee7eff65c07d3c21ebf3555e6836e4128311c02aceccb6d
-EBUILD phonon-gstreamer-4.6.0.ebuild 1257 SHA256 2b8d47ec34e424b05a31b1a27861c73a5e4c35081c5421782d0742a1def95e97 SHA512 acd5850e937fa201be528fbb0bc1c38ff0598d0c9573f72a205fcfce745ed0d2f4e97bee6e6ad635ebfcc418dfdee517bd9a7eb3bf32ab81234ec51943f8df02 WHIRLPOOL b17d17f45f50e8e0fa960eb81bfb4cb6f3334dcee3ff218d42b42d413818e2f6383cb9f57bbcf37dc7c19f8261560cd9da53cc89e133d47be3599c6a4102a62f
-EBUILD phonon-gstreamer-4.6.1.ebuild 1257 SHA256 5bdbe0dc3bd618c303b4f80cd794f27eb1d4071719fe2ec1dc5eb73925b31777 SHA512 c1fdf3bd7451b52394eea4cac388bb0bd86be462fede92a1c796b05815f014d56993190dd64df66a0cb99f872d5ac113c7e02ab8308f8ffdbec22d94af184ccc WHIRLPOOL a33c8eae2ce86e57da5e8cd361d6955660f54988b4cd47ef93a6bd6be59371286432ff4aa1b514ba795866a5aab1b5b395f7de3848ec81c8985c4e1fe4bcff44
-EBUILD phonon-gstreamer-4.6.2.ebuild 1255 SHA256 e88f4467fed530a2d60f40fabf7e58a6c7671b6f88e606f1d77668feb130b1a6 SHA512 da5e2cee67b2a2666ea975cc25367e08be84f5643e2a83261186d5b51538802d3a8a9b87f06875ef5dbbf5a9b658520d2ad5d5695e93e73327294de242b75d1b WHIRLPOOL 5e4845179a86b7203f93c1fd85988809fed84c6a867b3480a8176bac7d85ba46d9f5f1ac8013aa730e4527ae2ceebd1571b38bb2bade3bb4f294aa03a9cc4019
+EBUILD phonon-gstreamer-4.6.2-r1.ebuild 1304 SHA256 c84da2f2ad509d0e743577821d073c769455ccefe45cc243d771f7d9e5690052 SHA512 eb049e240f51ba596dae40ca50b4100b0003dbe65fc691590a90a15801bc568bfff8982b55f07b9c1562bb391db91c8fe12159469ac29b0487c15319f94bfd7b WHIRLPOOL 861124a62101960cdc02bed7c27b956a2335a366f3fdb37573802020095af7766f7c976e60de3f5936dc6f96ee22810cec515671a765ce474593b02f7454f040
 EBUILD phonon-gstreamer-9999.ebuild 1248 SHA256 ee83e86b2115f1c93452e3697ba74a6fbcaaa73d31650ddff716ea2eb4e85530 SHA512 359b4dafea95facd39ba81e13f6bb7819f5c22d51b479c3b1852ae5b0adacab47900203709fa0fe60a204f2e2bcd9455d88495985838bebf4a13b8c6f337ffe4 WHIRLPOOL 9bbd3719b10e03c3d988be01fddd12d967238660839b9a4ed55a0c1dad6fe69414e03964624bdbefff559d5408c7ee0795e8cfac645a4994a3fc70c42f0322d8
-MISC ChangeLog 4432 SHA256 2e6faeffe12d4b01994f750d7096b7976160c92d00fc8346103a233575ee73b5 SHA512 2eadfc5060547b1fa934ee0e0d4b33298217c591a7bcfc81d6dac5ca7b48e432c5c983c74beed124403f445a18e414fa06df3aff00c72bf9caa31edf99a2dacd WHIRLPOOL 9e5a3258daf6f8075fef182e9c990f20f156bf3288c79b13fa33a098d9c596cdc60d2f396717ad5ef8ac4fb5243c362e42f9eabc24ddd311442c59d07a696111
+MISC ChangeLog 4924 SHA256 57a9dcc164362c4af61de4cf7e59c7a28b00f82abb47d1c9d9ed2f368619f2b9 SHA512 18e7a0f405f9d8327168df811f335220c4400fdfc1ce0e7afcc14e7f23f6e071d7354ff6bf4279cec5147ead8657b4bf5a0b930762a4784f7e692fdb17822e72 WHIRLPOOL 7eca96deca4856d22b2999a9646114c79eef0b6b521ee349f18ed7788cb393c3ae486ad39de0def7ebefef67a41c78b2e510385e7bb4e7c417eca0bbd68a6cbc
 MISC metadata.xml 244 SHA256 4e62785c5651e1802026dce1b7fe721cbd9bc2f24bd59ec5f839e47af0ac8c58 SHA512 dcce9ee0215b078568f17854200c539f12e1225b42411c088d002e5089e9c5e0e324673e155fe396fd71e480576c1ef1bbe662edf333f82fa623cf3eefd86702 WHIRLPOOL 5e9f0369159fa7b195aca60aa622ec8248fb0fd8a9cf08b5abe4e54a72eba8d666ad9a8820915e79daefe347ecb1766cb4a6716777e04b214f85dd6584e39334
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQKLtXAAoJEO+t9ga+3I3a0hsIAIHVCSDAe4bjLkRH8xCG0qfq
-e1AlvK+qd7KzPhbFY3QucRHwLhz3z8pKvQIBkgaF+kW74+ZtMGjk2lGyPpYrQCDv
-ggoo2RHp32Tz4iJg68nf4wMBgz7KY4Jw9RGI7mS4RAcRXXaGGNJQf4shFEZ8PTup
-txHlq5f3DjJ0BxlWIGXQcQFmhJuUgYzcob9VwkW8hrf+ex5AarmgXTi/tBAp/fB/
-D0P6bSw4KICplLYOtF3BpAx8srEmvoYSLP7yLO6/oqEkaKV4V0tum/76cly53JtW
-2gAV/LcZGBX/D34QA1tz2F7y2BhnezkqWq2uSlycJB7m9abaAk6rImuvNGDQGXU=
-=TixB
+iQEcBAEBCAAGBQJQNhqDAAoJEO+t9ga+3I3a0WIH/3qrThpEQOPk5OefUUUqG0lV
+g3NknQJb3xajOrJooVzmh+H11HkzncME9lIaemQIU1LB5K7MHaEHzketaHVlYFYW
+8/NazYMKKPE8kSBHbCXtZrMvjbMwo1zM+I0ptYKWz9cBxqQ42PgYnQRHZ8bpZ7gc
+B6dyhhpcSLVavHqx3qhb6PPEMsJ60BR1Dkx+YzGzEHHsGngbdZadyMh/sz21Hozm
+L1b6Aw0T8dne8B7L64/dxW7ld4sz0UxHNzoXqYLJuxgW7xccTRE3j4L3GzRgyhJq
+BiFOwR+Lr44CKyFFzRdhnxvZfuOcnzKKx98qVh9EakjeH5qxQcyjXiKa+jdN2Zw=
+=fp76
 -----END PGP SIGNATURE-----
diff --git a/media-libs/phonon-gstreamer/files/4.5.1-fix-searching-for-phonon.patch b/media-libs/phonon-gstreamer/files/4.5.1-fix-searching-for-phonon.patch
deleted file mode 100644
index af9e9c88c8ff..000000000000
--- a/media-libs/phonon-gstreamer/files/4.5.1-fix-searching-for-phonon.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -urN phonon-backend-gstreamer-4.5.1.old/cmake/FindPhonon.cmake phonon-backend-gstreamer-4.5.1/cmake/FindPhonon.cmake
---- phonon-backend-gstreamer-4.5.1.old/cmake/FindPhonon.cmake	2011-05-04 06:34:52.000000000 +0200
-+++ phonon-backend-gstreamer-4.5.1/cmake/FindPhonon.cmake	2011-12-30 12:22:03.623333200 +0100
-@@ -1,53 +1,16 @@
- # Find Phonon
- 
- # Copyright (c) 2010, Harald Sitter <sitter@kde.org>
-+# Copyright (c) 2011, Alexander Neundorf <neundorf@kde.org>
- #
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
--if (NOT PHONON_BUILDSYSTEM_DIR)
--    find_program(PC_EXECUTABLE NAMES pkg-config
--    PATH_SUFFIXES bin               
--    HINTS
--    ${CMAKE_INSTALL_PREFIX}
--    ONLY_CMAKE_FIND_ROOT_PATH
--    )
--
--    if (NOT PC_EXECUTABLE)
--        if (Phonon_FIND_REQUIRED)
--            message(FATAL_ERROR "ERROR: Could not find pkg-config [required to find Phonon].")
--        endif (Phonon_FIND_REQUIRED)
--    endif (NOT PC_EXECUTABLE)
--
--    if (PC_EXECUTABLE)
--        execute_process(COMMAND "${PC_EXECUTABLE}" --variable=buildsystemdir phonon
--                        OUTPUT_VARIABLE _data_DIR
--                        ERROR_QUIET
--                        OUTPUT_STRIP_TRAILING_WHITESPACE)
--        file(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
--        find_path(PHONON_BUILDSYSTEM_DIR FindPhononInternal.cmake HINTS ${_data_DIR})
--    endif (PC_EXECUTABLE)
--endif (NOT PHONON_BUILDSYSTEM_DIR)
--
--if (PHONON_BUILDSYSTEM_DIR)
-+find_package(Phonon NO_MODULE)
-+if(PHONON_FOUND)
-     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PHONON_BUILDSYSTEM_DIR})
-+endif()
- 
--    if (Phonon_FIND_REQUIRED)
--        set(_req REQUIRED)
--    endif (Phonon_FIND_REQUIRED)
--    if (PHONON_FIND_QUIETLY)
--        set(_quiet QUIET)
--    endif (PHONON_FIND_QUIETLY)
-+include(FindPackageHandleStandardArgs)
- 
--    find_package(PhononInternal ${_req} ${_quiet})
--else (PHONON_BUILDSYSTEM_DIR)
--    if (_data_DIR)
--        if (Phonon_FIND_REQUIRED)
--            message(FATAL_ERROR "ERROR: FindPhonon.cmake not found in ${_data_DIR}")
--        endif (Phonon_FIND_REQUIRED)
--    else (_data_DIR)
--        if (Phonon_FIND_REQUIRED)
--            message(FATAL_ERROR "ERROR: Either pkg-config can not find its phonon config, or you are not using a recent enough Phonon version.")
--        endif (Phonon_FIND_REQUIRED)
--    endif (_data_DIR)
--endif (PHONON_BUILDSYSTEM_DIR)
-+find_package_handle_standard_args(Phonon  DEFAULT_MSG  Phonon_DIR )
diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.6.2-desktop.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.6.2-desktop.patch
new file mode 100644
index 000000000000..d7b5b8063add
--- /dev/null
+++ b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.6.2-desktop.patch
@@ -0,0 +1,26 @@
+From 4f65f6c1897f4855ed9c765e3cfffa38e25ad149 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Sat, 18 Aug 2012 01:15:11 +1000
+Subject: [PATCH] Fix validation of gstreamer.desktop.
+
+REVIEW: 106010
+---
+ gstreamer/gstreamer.desktop.cmake | 2 +-
+ 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
+
+diff --git a/gstreamer/gstreamer.desktop.cmake b/gstreamer/gstreamer.desktop.cmake
+index 8192852..523c121 100644
+--- a/gstreamer/gstreamer.desktop.cmake
++++ b/gstreamer/gstreamer.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;audio/x-ape;
++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;audio/x-ape;
+ X-KDE-Library=phonon_gstreamer
+ X-KDE-PhononBackendInfo-InterfaceVersion=1
+ X-KDE-PhononBackendInfo-Version=@PHONON_GST_VERSION@
+-- 
+1.7.12
+
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild
deleted file mode 100644
index 745c4ca5d82b..000000000000
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild
+++ /dev/null
@@ -1,54 +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-gstreamer/phonon-gstreamer-4.5.1.ebuild,v 1.8 2012/07/25 21:15:59 maekke Exp $
-
-EAPI=4
-
-[[ ${PV} == *9999 ]] && git_eclass="git-2"
-EGIT_REPO_URI="git://anongit.kde.org/${PN}"
-
-MY_PN="phonon-backend-gstreamer"
-MY_P=${MY_PN}-${PV}
-
-inherit cmake-utils ${git_eclass}
-
-DESCRIPTION="Phonon GStreamer backend"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~arm ~hppa ~x86"
-fi
-SLOT="0"
-IUSE="alsa debug +network"
-
-RDEPEND="
-	media-libs/gstreamer
-	media-plugins/gst-plugins-meta[alsa?,ogg,vorbis]
-	>=media-libs/phonon-4.6.0
-	>=x11-libs/qt-core-4.6.0:4[glib]
-	>=x11-libs/qt-gui-4.6.0:4[glib]
-	>=x11-libs/qt-opengl-4.6.0:4
-	virtual/opengl
-	network? ( media-plugins/gst-plugins-soup )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/automoc-0.9.87
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-fix-searching-for-phonon.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with alsa)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.0.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.0.ebuild
deleted file mode 100644
index 57d4ed41caf9..000000000000
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.0.ebuild
+++ /dev/null
@@ -1,50 +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-gstreamer/phonon-gstreamer-4.6.0.ebuild,v 1.5 2012/07/25 21:15:59 maekke Exp $
-
-EAPI=4
-
-[[ ${PV} == *9999 ]] && git_eclass="git-2"
-EGIT_REPO_URI="git://anongit.kde.org/${PN}"
-
-MY_PN="phonon-backend-gstreamer"
-MY_P=${MY_PN}-${PV}
-
-inherit cmake-utils ${git_eclass}
-
-DESCRIPTION="Phonon GStreamer backend"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-fbsd"
-fi
-SLOT="0"
-IUSE="alsa debug +network"
-
-RDEPEND="
-	media-libs/gstreamer
-	media-plugins/gst-plugins-meta[alsa?,ogg,vorbis]
-	>=media-libs/phonon-4.6.0
-	>=x11-libs/qt-core-4.6.0:4[glib]
-	>=x11-libs/qt-gui-4.6.0:4[glib]
-	>=x11-libs/qt-opengl-4.6.0:4
-	virtual/opengl
-	network? ( media-plugins/gst-plugins-soup )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/automoc-0.9.87
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with alsa)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.1.ebuild
deleted file mode 100644
index 92f7c007e8ed..000000000000
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.1.ebuild
+++ /dev/null
@@ -1,50 +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-gstreamer/phonon-gstreamer-4.6.1.ebuild,v 1.2 2012/07/25 21:15:59 maekke Exp $
-
-EAPI=4
-
-[[ ${PV} == *9999 ]] && git_eclass="git-2"
-EGIT_REPO_URI="git://anongit.kde.org/${PN}"
-
-MY_PN="phonon-backend-gstreamer"
-MY_P=${MY_PN}-${PV}
-
-inherit cmake-utils ${git_eclass}
-
-DESCRIPTION="Phonon GStreamer backend"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-fbsd"
-fi
-SLOT="0"
-IUSE="alsa debug +network"
-
-RDEPEND="
-	media-libs/gstreamer
-	media-plugins/gst-plugins-meta[alsa?,ogg,vorbis]
-	>=media-libs/phonon-4.6.0
-	>=x11-libs/qt-core-4.6.0:4[glib]
-	>=x11-libs/qt-gui-4.6.0:4[glib]
-	>=x11-libs/qt-opengl-4.6.0:4
-	virtual/opengl
-	network? ( media-plugins/gst-plugins-soup )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/automoc-0.9.87
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with alsa)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.2-r1.ebuild
index 8fc202acb21f..efa9e71ce379 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.2.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.2-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-gstreamer/phonon-gstreamer-4.6.2.ebuild,v 1.1 2012/08/13 08:25:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.2-r1.ebuild,v 1.1 2012/08/23 11:56:42 johu Exp $
 
 EAPI=4
 
@@ -42,6 +42,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with alsa)