Remove old. This drops ~x64-freebsd, ~x86-freebsd, and ~x86-solaris keywords wrt bug #432420.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

5 files changed, 14 insertions, 571 deletions

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index c22dd1c3fec9..7f0cb091883b 100644
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.48 2012/12/30 16:30:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.49 2012/12/31 11:08:40 kensington Exp $
+
+  31 Dec 2012; Michael Palimaka <kensington@gentoo.org>
+  -files/phonon-4.4-qt7.patch, -phonon-4.4.2.ebuild, -phonon-4.4.3.ebuild:
+  Remove old. This drops ~x64-freebsd, ~x86-freebsd, and ~x86-solaris keywords
+  wrt bug #432420.
 
   30 Dec 2012; Raúl Porcel <armin76@gentoo.org> phonon-4.6.0-r1.ebuild:
   alpha/sparc stable wrt #431190
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index e8f11f092c81..0f6559d267ad 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX phonon-4.4-qt7.patch 15621 SHA256 8b236f3731434ec6fd591f7da6f1267943c819ebc523797b58d27facfafde68e SHA512 50d489c23525b805897590c78308570dd55cab156e1f10e72ace16745f36bb838f3ce17c110b6eff8ce16d3de8638352c3e6ecede78906aed7b87201b3e5f10b WHIRLPOOL 10088663e082fbd5cde57939bd01489a74e117522775e2dab85d5ef3d9e295cff2c90acf1c1e6447006cb7d95a6be735093befd41c1d34c8b66eb733a94b8984
 AUX phonon-4.5.1-qmakeworkaround.patch 1084 SHA256 a8b22a299ceae59594ca74661af9c37cbaee14ee3c7000aa7b52e2fe7c2c5988 SHA512 f97a5835fc58b7774f3a628b0e40c6cf1bd06ab28beedd9d985153eff9753a38081e5ef1f6c7eb7371cacc8629069ab7ede02943f4267f04b0674eaa00de3306 WHIRLPOOL 1867db0692e0a1b28b540e852e9232d137d61375f006d3165047172e352c36718342f75864a19acae1b00dbac525dd877b436b1f2989d7ed07e87a281f42f31e
 AUX phonon-4.6.0-rpath.patch 600 SHA256 354b590e07db72d9479d4895d305ac87a4a7b895524505cffcb7237e6259e727 SHA512 426e8a7ac82a2ddaa82500e93c41263a6113939bc5127ac87911d530dd691a19dc08c6929b7ea716a2cf6fb7577f44ef42f4a2c60982baf5e31eb933438a2fe2 WHIRLPOOL 7a8e60fe888388bff6e1bc671f085dd564d3492e56d2d7029b2738d433666828eddadfd47bc1cdf2dc6d301ab8473f6447bb100d7cbbfd961809d6f2d943065a
-DIST phonon-4.4.2.tar.bz2 629193 SHA256 f1404c3f326201b382c26ba37f2d885d30bc71ba5fd8e1479afb632f92d93486 SHA512 8b0e971f11820120cc70f78505a2e85c5b770772a5ee080bf82bf15473d4c048345e1f4a2516ae0d5b8e098cc99a70cd826528b26d9fcdb34577b1f5ffd7b440 WHIRLPOOL 6be22b38627f3d9d63613a7d42cdf2d0d9ac7a5329c76485046722545887aa335fceada44afd5dd745b4c155c7ba6da40eba4d621ef540c2c1b10fdeb8ea6fb8
-DIST phonon-4.4.3.tar.bz2 648733 SHA256 60d17a70732df32cebad099e76f970d6d1aeab5e1f68ec305431f8c86a30a1d8
 DIST phonon-4.6.0.tar.xz 280712 SHA256 2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4 SHA512 d07c0eaa1be04d80266f6630933bbe8e4f822dc9eb1c31946a08339530cd81e450f1764731c309ae4c661ea3416237521d2048d3e7c0f9cbb7528b1bbbc60f7d WHIRLPOOL 9ec4ae833e3824683ea5c469d3be4b2248645e47d9df199efb717364cf6f67eaffb1e5747e3e0cb0aa71fd5ec3c270119a187a8f5ef2bf6134427b48640740a9
-EBUILD phonon-4.4.2.ebuild 2979 SHA256 6082f4e0b0529087ef7806defe6050af1aca8af99e545c61731fa4fada7464a5 SHA512 2382bfa081a5f73e1671483742d1d3ece15a9fd7f43fd40b0e564eef20d48ed7b9a34c1776599e4a2b603dc03bfa6a097107897548818d27c96390f75ad5ee00 WHIRLPOOL ac52be8a5d22ef298fc0b58260c04aa4ea0ea0ba33698d3001af14b15f181afc0ca490f519651972c6e58e494e17120f2216f8b0e17133903330bb8b8de6b688
-EBUILD phonon-4.4.3.ebuild 2872 SHA256 169cd2e59f425970d1e5d520b6000f4bf63b2793bddebec50ec7d6c26ce3e797 SHA512 2e60b3a459e1cf09c6feeeb51888bd98c80397cf0be782b107c31c1cfd590f15a4424a0870ff9b04eba621a633796787add08390e2f93a71a6f53904835ac6c9 WHIRLPOOL bbb48c52ceed5d644ca37625ac509be954af85f606fb3b81bc6ec9738068614809085c019ed86619ce1506c560ca7cff0063cd1d5f3e46a9035dfacf7e8d3915
 EBUILD phonon-4.6.0-r1.ebuild 2256 SHA256 2fe2a6f80bc3b938ecd98cb5366b1d0df1715a9a4cb92f09c98a3dfa7e8d4f28 SHA512 e1d657dec65421e13d53de9a577ffb9f79b6328871d1716b29486c5f945c14f7e4830f98bd46f964f563f8a0dbb2560a67bbe5bd733d74a6c1f941a293cb0f68 WHIRLPOOL 553ec4e3a37b378a89423069778aca00167296120f96b71d575af83d4779dd668429244ae9384e0171d40069ef00d2a1173e662018b0357aaf50c88fae11adac
 EBUILD phonon-9999.ebuild 1574 SHA256 0c93d7848c3f5274f9613275b1c72352b18d7bcb8b135448f652e78dec027d44 SHA512 3c4793a85a3fddbe4599933bf660cf8087917de624b378ae8b02e3aff69ef7115d0a89b3163372a52b9b25a6f95ed4f79dccdd98e3ef7c42e43b7e2c6277ecb2 WHIRLPOOL 6fde7609deace761fb8e6b24d733de7f22aa43903e7c89b49c9e41d906090db75d9a7cafb19a59b47f396d4a33a44ec8c1e044c19693b95e2fca16559fafec20
-MISC ChangeLog 16478 SHA256 e4a14437a65c4b97c647aa84bb1bd759fff5bc414a9db941d63cb4493a97203f SHA512 71d22fe340059ac9668751b1e0b446958578271fc4ae440ded3fb21e4103a4a3a170e8eee374feece46d0d09146d31783eaebb6c37a7aedca32916b92292cf13 WHIRLPOOL bd9c327b7afe2c18abff192b75478499e5a454f77df56813f485d41d6c50d08e1da99fe9edff036498de83364198f6276621630732ab33f16281fecad6c012ce
+MISC ChangeLog 16711 SHA256 bebc0886c25a240810247a926dd607c3e3fbe7d246ac6592052ce6ca179b3cd6 SHA512 9cab70d478acdc8c9f6a56dc1fd87e1f507e1d6bf94054939ba5e7009cf44c0b60a184cbf49f1ec049f596b6da4d3adb09d0a3a3488fc5eb2094ded340c5754d WHIRLPOOL 2ef3c3b1ca2ed4e06fa741a58d5ec61b1d25186faff33fd5c09ab5fc428f9dbda632cc2e93d1c349693acb238261f448a82ca09791ccc29c3995e0568e691531
 MISC metadata.xml 300 SHA256 30942d7da188e105a7f745018a518ecc4438fc8ae8840ecbbabd676eed725bc0 SHA512 06a922941c56ea38b578d632109105238b6c32d0027bb519e88ccad31ccb6685097b008ac3ecd57925e0b0caf8cc55115f2db0d7090a5355d4a5054b2561fff7 WHIRLPOOL 01a73fde630c918ed1e968db3e3b5f519a7a9b57d73f720d5db8527fbb18e3278292aadd1774b5836aee1fc4bf99364bfec9082983a42da0a27f5464bc17ea90
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDgbBIACgkQuQc30/atMkAUyQCeMXOy7bjymJ00yRije1z/TokY
-wYoAniFGEBSVBq3m8fkCk+ha4/LTJJkG
-=nI2E
+iQEcBAEBCAAGBQJQ4XF8AAoJEMbwO6tnXQ0sweIIAIgfOrHviQoaXLWKpeCNZdAM
+sv59/y/djbFrATA6TifbSqseD+WDJq/c1Cno06dPTGt3uTKQZzg26AKuQ8cQhaQM
+bqZmRwKXW9IyQXtVAf3E0ToVNUiook3qagIeUThANvObYjwM7G8yDB1IkInwnjEc
+YYP5r5qXekNpe6wtugmXcHWsp08jTgOVpS4WsiRq5xZJ1dQwCrMp61Zlzo4IXMXB
+ZaY30B4WqklRVxkycmFFpQfaBOy/ILFiOYbUPwOak01Co3gZbcAOhiqamE44DO1w
++L2w9bGqfxSgf20y37i6wU2xvspbjCywXiF71Droqtep/MINjkCgTklulPuVenU=
+=R9XR
 -----END PGP SIGNATURE-----
diff --git a/media-libs/phonon/files/phonon-4.4-qt7.patch b/media-libs/phonon/files/phonon-4.4-qt7.patch
deleted file mode 100644
index 8890fa1da0cf..000000000000
--- a/media-libs/phonon/files/phonon-4.4-qt7.patch
+++ /dev/null
@@ -1,363 +0,0 @@
-Desc:	Fix the QuickTime7 plugin for MacOS. Probably needs 10.6.
-Author:	Heiko Przybyl <zuxez@cs.tu-berlin.de>
---- phonon-4.4_pre20090520/qt7/backendinfo.mm.orig	2009-10-10 17:54:22 +0200
-+++ phonon-4.4_pre20090520/qt7/backendinfo.mm	2009-10-10 17:52:13 +0200
-@@ -22,6 +22,7 @@
- #include <AudioUnit/AudioUnit.h>
- #include <CoreServices/CoreServices.h>
- 
-+#include <QtGui/qmacdefines_mac.h>
- #import <QTKit/QTMovie.h>
- 
- #ifdef QUICKTIME_C_API_AVAILABLE
---- phonon-4.4_pre20090520/qt7/quicktimevideoplayer.h.orig	2009-10-10 19:42:17 +0200
-+++ phonon-4.4_pre20090520/qt7/quicktimevideoplayer.h	2009-10-10 20:25:49 +0200
-@@ -20,6 +20,7 @@
- 
- #include "backendheader.h"
- 
-+#include <QtGui/qmacdefines_mac.h>
- #import <QTKit/QTDataReference.h>
- #import <QTKit/QTMovie.h>
- 
---- phonon-4.4_pre20090520/qt7/CMakeLists.txt.orig	2009-10-10 22:09:10 +0200
-+++ phonon-4.4_pre20090520/qt7/CMakeLists.txt	2009-10-10 22:09:19 +0200
-@@ -43,6 +43,7 @@ if (BUILD_PHONON_QT7)
-        )
- 
-    automoc4_add_library(phonon_qt7 MODULE ${phonon_qt7_SRCS})
-+   set_target_properties(phonon_qt7 PROPERTIES PREFIX "")
-    target_link_libraries(phonon_qt7
-        ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY}
-        ${PHONON_LIBS}
-@@ -46,7 +46,6 @@ if (BUILD_PHONON_QT7)
-    target_link_libraries(phonon_qt7
-        ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY}
-        ${PHONON_LIBS}
--       "-framework QuickTime"
-        "-framework AudioUnit"
-        "-framework AudioToolbox"
-        "-framework CoreAudio"
-@@ -53,6 +54,6 @@ if (BUILD_PHONON_QT7)
-        "-framework QuartzCore"
-        "-framework QTKit"
-        )
--    install(TARGETS phonon_qt7 DESTINATION ${PLUGIN_INSTALL_DIR})
-+    install(TARGETS phonon_qt7 DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/phonon_backend)
- 
- endif (BUILD_PHONON_QT7)
---- phonon-4.4_pre20090520/qt7/audioeffects.h.orig	2009-10-10 20:42:45 +0200
-+++ phonon-4.4_pre20090520/qt7/audioeffects.h	2009-10-10 20:42:54 +0200
-@@ -37,7 +37,7 @@ namespace QT7
-             AudioEffectAudioNode(int effectType);
-             int m_effectType;
- 
--            ComponentDescription getAudioNodeDescription() const;
-+            AudioComponentDescription getAudioNodeDescription() const;
-             void initializeAudioUnit();
- 
-             QVariant parameterValue(const Phonon::EffectParameter &value) const;
---- phonon-4.4_pre20090520/qt7/audioeffects.mm.orig	2009-10-10 20:42:41 +0200
-+++ phonon-4.4_pre20090520/qt7/audioeffects.mm	2009-10-10 21:52:44 +0200
-@@ -29,9 +29,9 @@ AudioEffectAudioNode::AudioEffectAudioNo
- {
- }
- 
--ComponentDescription AudioEffectAudioNode::getAudioNodeDescription() const
-+AudioComponentDescription AudioEffectAudioNode::getAudioNodeDescription() const
- {
--	ComponentDescription d;
-+	AudioComponentDescription d;
- 	d.componentType = kAudioUnitType_Effect;
- 	d.componentSubType = m_effectType;
- 	d.componentManufacturer = kAudioUnitManufacturer_Apple;
-@@ -62,10 +62,10 @@ QVariant AudioEffectAudioNode::parameter
-     } else {
-         // Use default value:
-         AudioUnit tmpAudioUnit;
--        ComponentDescription description = getAudioNodeDescription();
--        Component component = FindNextComponent(0, &description);
-+        AudioComponentDescription description = getAudioNodeDescription();
-+        AudioComponent component = AudioComponentFindNext(0, &description);
-         BACKEND_ASSERT3(component, "Could not get parameters of audio effect.", NORMAL_ERROR, QVariant())
--        OSErr err = OpenAComponent(component, &tmpAudioUnit);
-+        OSErr err = AudioComponentInstanceNew(component, &tmpAudioUnit);
-         BACKEND_ASSERT3(err == noErr, "Could not get parameters of audio effect.", NORMAL_ERROR, QVariant())
-         AudioUnitParameterInfo info;
-         UInt32 size = sizeof(info);
-@@ -87,10 +87,10 @@ void AudioEffectAudioNode::setParameterV
-         m_alteredParameters.remove(parameter.id());
-         if (m_audioUnit){
-             AudioUnit tmpAudioUnit;
--            ComponentDescription description = getAudioNodeDescription();
--            Component component = FindNextComponent(0, &description);
-+            AudioComponentDescription description = getAudioNodeDescription();
-+            AudioComponent component = AudioComponentFindNext(0, &description);
-             BACKEND_ASSERT2(component, "Could not get parameters of audio effect.", NORMAL_ERROR)
--            OSErr err = OpenAComponent(component, &tmpAudioUnit);
-+            OSErr err = AudioComponentInstanceNew(component, &tmpAudioUnit);
-             BACKEND_ASSERT2(err == noErr, "Could not get parameters of audio effect.", NORMAL_ERROR)
-             AudioUnitParameterInfo info;
-             UInt32 size = sizeof(info);
-@@ -121,10 +121,10 @@ QList<Phonon::EffectParameter> AudioEffe
-     QList<Phonon::EffectParameter> effectList;
-     // Create a temporary audio unit:
-     AudioUnit audioUnit;
--    ComponentDescription description = m_audioNode->getAudioNodeDescription();
--    Component component = FindNextComponent(0, &description);
-+    AudioComponentDescription description = m_audioNode->getAudioNodeDescription();
-+    AudioComponent component = AudioComponentFindNext(0, &description);
-     BACKEND_ASSERT3(component, "Could not get parameters of audio effect.", NORMAL_ERROR, effectList)
--    OSErr err = OpenAComponent(component, &audioUnit);
-+    OSErr err = AudioComponentInstanceNew(component, &audioUnit);
-     BACKEND_ASSERT3(err == noErr, "Could not get parameters of audio effect.", NORMAL_ERROR, effectList)
- 
-     UInt32 size = 0;
-@@ -149,29 +149,25 @@ QList<Phonon::EffectParameter> AudioEffe
- 
- QString AudioEffect::name()
- {
--    ComponentDescription description = m_audioNode->getAudioNodeDescription();
--    Component component = FindNextComponent(0, &description);
-+    AudioComponentDescription description = m_audioNode->getAudioNodeDescription();
-+    AudioComponent component = AudioComponentFindNext(0, &description);
-     BACKEND_ASSERT3(component, "Could not get audio effect name.", NORMAL_ERROR, QLatin1String("<unknown effect>"))
- 
--    ComponentDescription cDesc;
--    Handle nameH = NewHandle(0);
--    GetComponentInfo(component, &cDesc, nameH, 0, 0); 
--    HLock(nameH);
--    char *namePtr = *nameH;
--    int len = *namePtr++;
--    namePtr[len] = 0;
--    QString qsName = QString::fromUtf8(namePtr);
--    DisposeHandle(nameH);
-+    CFStringRef n;
-+    AudioComponentCopyName(component, &n);
-+    // Or use CFStringGetCString?
-+    QString qsName = QString::fromUtf8(CFStringGetCStringPtr(n, kCFStringEncodingUTF8));
-     return qsName;
- }
- 
- QString AudioEffect::description()
- {
--    ComponentDescription description = m_audioNode->getAudioNodeDescription();
--    Component component = FindNextComponent(0, &description);
-+    AudioComponentDescription description = m_audioNode->getAudioNodeDescription();
-+#if 0
-+    AudioComponent component = AudioComponentFindNext(0, &description);
-     BACKEND_ASSERT3(component, "Could not get audio effect description.", NORMAL_ERROR, QLatin1String("<unknown effect>"))
- 
--    ComponentDescription cDesc;
-+    AudioComponentDescription cDesc;
-     Handle descH = NewHandle(0);
-     GetComponentInfo(component, &cDesc, 0, descH, 0); 
-     HLock(descH);
-@@ -180,6 +176,9 @@ QString AudioEffect::description()
-     descPtr[len] = 0;
-     QString qsDesc = QString::fromUtf8(descPtr);
-     DisposeHandle(descH);
-+#else
-+    QString qsDesc;
-+#endif
-     return qsDesc;
- }
- 
-@@ -187,19 +186,19 @@ QList<int> AudioEffect::effectList()
- {
-     QList<int> effects;
- 
--	ComponentDescription d;
-+	AudioComponentDescription d;
- 	d.componentType = kAudioUnitType_Effect;
- 	d.componentSubType = 0;
- 	d.componentManufacturer = 0;
- 	d.componentFlags = 0;
- 	d.componentFlagsMask = 0;
--    Component component = FindNextComponent(0, &d);
-+    AudioComponent component = AudioComponentFindNext(0, &d);
-     
-     while (component) {
--        ComponentDescription cDesc;
--        GetComponentInfo(component, &cDesc, 0, 0, 0); 
-+        AudioComponentDescription cDesc;
-+        AudioComponentGetDescription(component, &cDesc);
-         effects << cDesc.componentSubType;
--        component = FindNextComponent(component, &d);
-+        component = AudioComponentFindNext(component, &d);
-     }
-     return effects;
- }
---- phonon-4.4_pre20090520/qt7/audiomixer.h.orig	2009-10-10 21:55:44 +0200
-+++ phonon-4.4_pre20090520/qt7/audiomixer.h	2009-10-10 21:56:01 +0200
-@@ -41,7 +41,7 @@ namespace QT7
-             float volume(int bus = 0);
- 
-         protected:
--            ComponentDescription getAudioNodeDescription() const;
-+            AudioComponentDescription getAudioNodeDescription() const;
-             void initializeAudioUnit();
- 
-         private:
---- phonon-4.4_pre20090520/qt7/audiomixer.mm.orig	2009-10-10 21:56:20 +0200
-+++ phonon-4.4_pre20090520/qt7/audiomixer.mm	2009-10-10 21:56:33 +0200
-@@ -30,9 +30,9 @@ AudioMixerAudioNode::AudioMixerAudioNode
-     m_volume = 1.0f;
- }
- 
--ComponentDescription AudioMixerAudioNode::getAudioNodeDescription() const
-+AudioComponentDescription AudioMixerAudioNode::getAudioNodeDescription() const
- {
--	ComponentDescription description;
-+	AudioComponentDescription description;
- 	description.componentType = kAudioUnitType_Mixer;
- 	description.componentSubType = kAudioUnitSubType_StereoMixer;
- 	description.componentManufacturer = kAudioUnitManufacturer_Apple;
---- phonon-4.4_pre20090520/qt7/audionode.h.orig	2009-10-10 20:39:39 +0200
-+++ phonon-4.4_pre20090520/qt7/audionode.h	2009-10-10 20:40:01 +0200
-@@ -73,7 +73,7 @@ namespace QT7
- 
-             // Only the following methods needs to
-             // be overidden by only_one-audio-unit nodes:
--            virtual ComponentDescription getAudioNodeDescription() const;
-+            virtual AudioComponentDescription getAudioNodeDescription() const;
-             virtual void initializeAudioUnit();
- 
-         private:
---- phonon-4.4_pre20090520/qt7/audionode.mm.orig	2009-10-10 20:35:51 +0200
-+++ phonon-4.4_pre20090520/qt7/audionode.mm	2009-10-10 22:02:27 +0200
-@@ -63,17 +63,20 @@ void AudioNode::createAndConnectAUNodes(
-     if (m_auNode)
-         return;
- 
--    ComponentDescription description = getAudioNodeDescription();
-+    AudioComponentDescription description = getAudioNodeDescription();
-     DEBUG_AUDIO_GRAPH("AudioNode" << int(this) << "creates AUNode" 
-         << QString(!FindNextComponent(0, &description) ? "ERROR: COMPONENT NOT FOUND!" : "OK!"))
- 
-     OSStatus err = noErr;
-+#if 0
- #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-     if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5)
-         err = AUGraphAddNode(m_audioGraph->audioGraphRef(), &description, &m_auNode);
-     else
- #endif
-         err = AUGraphNewNode(m_audioGraph->audioGraphRef(), &description, 0, 0, &m_auNode);
-+#endif
-+	err = AUGraphAddNode(m_audioGraph->audioGraphRef(), &description, &m_auNode);
-         
-     BACKEND_ASSERT2(err != kAUGraphErr_OutputNodeErr, "A MediaObject can only be connected to one audio output device.", FATAL_ERROR)
-     BACKEND_ASSERT2(err == noErr, "Could not create new AUNode.", FATAL_ERROR)
-@@ -100,10 +103,10 @@ void AudioNode::createAudioUnits()
-     initializeAudioUnit();
- }
- 
--ComponentDescription AudioNode::getAudioNodeDescription() const
-+AudioComponentDescription AudioNode::getAudioNodeDescription() const
- {
-     // Override if needed.
--    ComponentDescription cd;
-+    AudioComponentDescription cd;
-     Q_UNUSED(cd);
-     return cd;
- }
---- phonon-4.4_pre20090520/qt7/audiooutput.h.orig	2009-10-10 20:40:32 +0200
-+++ phonon-4.4_pre20090520/qt7/audiooutput.h	2009-10-10 20:40:48 +0200
-@@ -41,7 +41,7 @@ namespace QT7
-             float volume();
- 
-         protected:
--            ComponentDescription getAudioNodeDescription() const;
-+            AudioComponentDescription getAudioNodeDescription() const;
-             void initializeAudioUnit();
- 
-         signals:
---- phonon-4.4_pre20090520/qt7/audiooutput.mm.orig	2009-10-10 20:40:54 +0200
-+++ phonon-4.4_pre20090520/qt7/audiooutput.mm	2009-10-10 20:41:11 +0200
-@@ -16,6 +16,7 @@
- */
- 
- #include "audiooutput.h"
-+#include "audiooutput_p.h"
- #include "audiograph.h"
- #include "audiodevice.h"
- #include "mediaobject.h"
-@@ -34,9 +34,9 @@ AudioOutputAudioPart::AudioOutputAudioPa
-     m_volume = 1;
- }
- 
--ComponentDescription AudioOutputAudioPart::getAudioNodeDescription() const
-+AudioComponentDescription AudioOutputAudioPart::getAudioNodeDescription() const
- {
--	ComponentDescription description;
-+	AudioComponentDescription description;
- 	description.componentType = kAudioUnitType_Output;
- 	description.componentSubType = kAudioUnitSubType_DefaultOutput;
- 	description.componentManufacturer = kAudioUnitManufacturer_Apple;
---- phonon-4.4_pre20090520/qt7/audiosplitter.h.orig	2009-10-10 20:41:44 +0200
-+++ phonon-4.4_pre20090520/qt7/audiosplitter.h	2009-10-10 20:41:53 +0200
-@@ -33,7 +33,7 @@ namespace QT7
-     {
-         public:
-             AudioNodeSplitter();
--            ComponentDescription getAudioNodeDescription() const;
-+            AudioComponentDescription getAudioNodeDescription() const;
-     };
- 
-     class AudioSplitter : public MediaNode
---- phonon-4.4_pre20090520/qt7/audiosplitter.mm.orig	2009-10-10 20:42:02 +0200
-+++ phonon-4.4_pre20090520/qt7/audiosplitter.mm	2009-10-10 20:42:10 +0200
-@@ -28,9 +28,9 @@ AudioNodeSplitter::AudioNodeSplitter() :
- {
- }
- 
--ComponentDescription AudioNodeSplitter::getAudioNodeDescription() const
-+AudioComponentDescription AudioNodeSplitter::getAudioNodeDescription() const
- {
--	ComponentDescription description;
-+	AudioComponentDescription description;
- 	description.componentType = kAudioUnitType_FormatConverter;
- 	description.componentSubType = kAudioUnitSubType_Splitter;
- 	description.componentManufacturer = kAudioUnitManufacturer_Apple;
---- phonon-4.4_pre20090520/qt7/quicktimeaudioplayer.h.orig	2009-10-10 21:53:20 +0200
-+++ phonon-4.4_pre20090520/qt7/quicktimeaudioplayer.h	2009-10-10 21:53:30 +0200
-@@ -66,7 +66,7 @@ namespace QT7
-             QString currentTimeString();
-             QuickTimeVideoPlayer *videoPlayer();
- 
--            ComponentDescription getAudioNodeDescription() const;
-+            AudioComponentDescription getAudioNodeDescription() const;
-             void initializeAudioUnit();
-             bool fillInStreamSpecification(AudioConnection *connection, ConnectionSide side);
-             void mediaNodeEvent(const MediaNodeEvent *event);
---- phonon-4.4_pre20090520/qt7/quicktimeaudioplayer.mm.orig	2009-10-10 21:53:42 +0200
-+++ phonon-4.4_pre20090520/qt7/quicktimeaudioplayer.mm	2009-10-10 21:55:18 +0200
-@@ -266,13 +266,13 @@ bool QuickTimeAudioPlayer::hasAudio()
- bool QuickTimeAudioPlayer::soundPlayerIsAwailable()
- {
-     QuickTimeAudioPlayer player;
--    ComponentDescription d = player.getAudioNodeDescription();
--    return FindNextComponent(0, &d);
-+    AudioComponentDescription d = player.getAudioNodeDescription();
-+    return AudioComponentFindNext(0, &d);
- }
- 
--ComponentDescription QuickTimeAudioPlayer::getAudioNodeDescription() const
-+AudioComponentDescription QuickTimeAudioPlayer::getAudioNodeDescription() const
- {
--	ComponentDescription description;
-+	AudioComponentDescription description;
- 	description.componentType = kAudioUnitType_Generator;
- 	description.componentSubType = kAudioUnitSubType_ScheduledSoundPlayer;
- 	description.componentManufacturer = kAudioUnitManufacturer_Apple;
-ayer.h
---- phonon-4.4.2-orig/qt7/quicktimevideoplayer.h	2010-08-06 08:43:28.000000000 +0200
-+++ phonon-4.4.2/qt7/quicktimevideoplayer.h	2010-08-06 08:43:43.000000000 +0200
-@@ -20,6 +20,7 @@
- 
- #include "backendheader.h"
- 
-+#include <QtGui/qmacdefines_mac.h>
- #import <QTKit/QTDataReference.h>
- #import <QTKit/QTMovie.h>
- 
diff --git a/media-libs/phonon/phonon-4.4.2.ebuild b/media-libs/phonon/phonon-4.4.2.ebuild
deleted file mode 100644
index 0336875556cb..000000000000
--- a/media-libs/phonon/phonon-4.4.2.ebuild
+++ /dev/null
@@ -1,102 +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/phonon-4.4.2.ebuild,v 1.5 2012/09/11 10:33:18 johu Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="http://phonon.kde.org"
-SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="alsa aqua debug +gstreamer pulseaudio"
-
-RDEPEND="
-	!!x11-libs/qt-phonon:4
-	>=x11-libs/qt-test-4.6.0:4[aqua=]
-	>=x11-libs/qt-dbus-4.6.0:4[aqua=]
-	>=x11-libs/qt-gui-4.6.0:4[aqua=]
-	>=x11-libs/qt-opengl-4.6.0:4[aqua=]
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		media-plugins/gst-plugins-meta:0.10[alsa?]
-	)
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-"
-DEPEND="${RDEPEND}
-	!!x11-libs/qt-phonon:4
-	>=dev-util/automoc-0.9.87
-"
-
-S=${WORKDIR}/${P/.0}
-
-pkg_setup() {
-	if use !gstreamer && use !aqua; then
-		die "you must at least select one backend for phonon"
-	fi
-}
-
-src_prepare() {
-	# Fix the qt7 backend for MacOS 10.6.
-	[[ ${CHOST} == *-darwin10 ]] && epatch "${FILESDIR}"/${PN}-4.4-qt7.patch
-
-	# On MacOS we additionally want the gstreamer plugin.
-	if use aqua && use gstreamer; then
-		sed -e "/add_subdirectory(qt7)/a add_subdirectory(gstreamer)" \
-			-i CMakeLists.txt \
-			|| die "failed to enable GStreamer backend"
-	fi
-
-	base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_build aqua PHONON_QT7)
-		$(cmake-utils_use_with gstreamer GStreamer)
-		$(cmake-utils_use_with gstreamer GStreamerPlugins)
-		$(cmake-utils_use_with pulseaudio PulseAudio)
-		$(cmake-utils_use_with pulseaudio GLib2)
-		-DWITH_Xine=OFF
-		-DWITH_XCB=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use aqua; then
-		local MY_PV=4.4.0
-
-		install_name_tool \
-			-id "${EPREFIX}/usr/lib/libphonon.${MY_PV::1}.dylib" \
-			"${ED}/usr/lib/libphonon.${MY_PV}.dylib" \
-			|| die "failed to fix libphonon.${MY_PV}.dylib"
-
-		install_name_tool \
-			-id "${EPREFIX}/usr/lib/libphononexperimental.${MY_PV::1}.dylib" \
-			-change "libphonon.${MY_PV::1}.dylib" \
-				"${EPREFIX}/usr/lib/libphononexperimental.${MY_PV::1}.dylib" \
-			"${ED}/usr/lib/libphononexperimental.${MY_PV}.dylib" \
-			|| die "failed to fix libphononexperimental.${MY_PV}.dylib"
-
-		# fake the framework for the qt-apps depending on qt-frameworks (qt-webkit)
-		dodir /usr/lib/qt4/phonon.framework/Versions/${MY_PV::1}
-		dosym ${MY_PV::1} /usr/lib/qt4/phonon.framework/Versions/Current \
-			|| die "failed to create symlink"
-		dosym ../../../../libphonon.${MY_PV::1}.dylib /usr/lib/qt4/phonon.framework/Versions/${MY_PV::1}/phonon \
-			|| die "failed to create symlink"
-		dosym Versions/${MY_PV::1}/phonon /usr/lib/qt4/phonon.framework/phonon \
-			|| die "failed to create symlink"
-	fi
-}
diff --git a/media-libs/phonon/phonon-4.4.3.ebuild b/media-libs/phonon/phonon-4.4.3.ebuild
deleted file mode 100644
index 516063b48192..000000000000
--- a/media-libs/phonon/phonon-4.4.3.ebuild
+++ /dev/null
@@ -1,96 +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/phonon-4.4.3.ebuild,v 1.6 2012/09/11 10:33:18 johu Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="http://phonon.kde.org"
-SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="alsa aqua debug +gstreamer pulseaudio"
-
-RDEPEND="
-	!!x11-libs/qt-phonon:4
-	>=x11-libs/qt-test-4.6.0:4[aqua=]
-	>=x11-libs/qt-dbus-4.6.0:4[aqua=]
-	>=x11-libs/qt-gui-4.6.0:4[aqua=]
-	>=x11-libs/qt-opengl-4.6.0:4[aqua=]
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		media-plugins/gst-plugins-meta:0.10[alsa?]
-	)
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-"
-DEPEND="${RDEPEND}
-	!!x11-libs/qt-phonon:4
-	>=dev-util/automoc-0.9.87
-"
-
-S=${WORKDIR}/${P/.0}
-
-src_prepare() {
-	# Fix the qt7 backend for MacOS 10.6.
-	[[ ${CHOST} == *-darwin10 ]] && epatch "${FILESDIR}"/${PN}-4.4-qt7.patch
-
-	# On MacOS we additionally want the gstreamer plugin.
-	if use aqua && use gstreamer; then
-		sed -e "/add_subdirectory(qt7)/a add_subdirectory(gstreamer)" \
-			-i CMakeLists.txt \
-			|| die "failed to enable GStreamer backend"
-	fi
-
-	base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_build aqua PHONON_QT7)
-		$(cmake-utils_use_with gstreamer GStreamer)
-		$(cmake-utils_use_with gstreamer GStreamerPlugins)
-		$(cmake-utils_use_with pulseaudio PulseAudio)
-		$(cmake-utils_use_with pulseaudio GLib2)
-		-DWITH_Xine=OFF
-		-DWITH_XCB=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use aqua; then
-		local MY_PV=4.4.0
-
-		install_name_tool \
-			-id "${EPREFIX}/usr/lib/libphonon.${MY_PV::1}.dylib" \
-			"${ED}/usr/lib/libphonon.${MY_PV}.dylib" \
-			|| die "failed to fix libphonon.${MY_PV}.dylib"
-
-		install_name_tool \
-			-id "${EPREFIX}/usr/lib/libphononexperimental.${MY_PV::1}.dylib" \
-			-change "libphonon.${MY_PV::1}.dylib" \
-				"${EPREFIX}/usr/lib/libphononexperimental.${MY_PV::1}.dylib" \
-			"${ED}/usr/lib/libphononexperimental.${MY_PV}.dylib" \
-			|| die "failed to fix libphononexperimental.${MY_PV}.dylib"
-
-		# fake the framework for the qt-apps depending on qt-frameworks (qt-webkit)
-		dodir /usr/lib/qt4/phonon.framework/Versions/${MY_PV::1}
-		dosym ${MY_PV::1} /usr/lib/qt4/phonon.framework/Versions/Current \
-			|| die "failed to create symlink"
-		dosym ../../../../libphonon.${MY_PV::1}.dylib /usr/lib/qt4/phonon.framework/Versions/${MY_PV::1}/phonon \
-			|| die "failed to create symlink"
-		dosym Versions/${MY_PV::1}/phonon /usr/lib/qt4/phonon.framework/phonon \
-			|| die "failed to create symlink"
-	fi
-}