Add prefix support, revbump due to otherwise unresolvable USE deps

Package-Manager: portage--svn/cvs/Linux i686

5 files changed, 469 insertions, 63 deletions

diff --git a/media-sound/phonon/ChangeLog b/media-sound/phonon/ChangeLog
index 1f8b662fcd42..481d36b1b183 100644
--- a/media-sound/phonon/ChangeLog
+++ b/media-sound/phonon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/phonon
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/ChangeLog,v 1.34 2009/12/11 14:56:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/ChangeLog,v 1.35 2009/12/25 15:31:46 abcd Exp $
+
+*phonon-4.3.80-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org> -phonon-4.3.80.ebuild,
+  +phonon-4.3.80-r1.ebuild, +files/phonon-4.4-qt7.patch:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   11 Dec 2009; Raúl Porcel <armin76@gentoo.org> phonon-4.3.1.ebuild:
   sparc stable
diff --git a/media-sound/phonon/Manifest b/media-sound/phonon/Manifest
index ba4fe2a58738..8b1ca8617833 100644
--- a/media-sound/phonon/Manifest
+++ b/media-sound/phonon/Manifest
@@ -1,9 +1,10 @@
 AUX fix_nonascii_chars.patch 3159 RMD160 cde38d5c7000618eefa910b9638ac6b51ed663f9 SHA1 4b520fbc8e42764225d1fe7ee73213e7bbf92f3f SHA256 5969e2766160c21565dfcef3dffb6c264a9031dc6364a580b9b452358d07d6de
+AUX phonon-4.4-qt7.patch 15299 RMD160 ec017cf0dbbd79577a29c595f5bd6cbe9df7e199 SHA1 565b2c407acea17bcfeb5e24c82b14dbb398af38 SHA256 68b51882663ed0a8ef0bfa4bbb9acc8d113e033f7704cddba6add8adb061c6e3
 DIST phonon-4.3.1.tar.bz2 575856 RMD160 d91cc7e994d4f6a143a7cd6c2a723b579b294141 SHA1 f7537e5280d0a4cc1348975daa7a7e45d833d45c SHA256 7fb6d9efad29d7ac390d539cd516177c26cc2f92ddb9b3a5d70f2c49fc15269a
 DIST phonon-4.3.80.tar.bz2 598739 RMD160 5c271c1d53ee8878205255f8f257b7bfcd6c21c3 SHA1 914e4db5a6c23918be4b85e56a31207a2d17bf5d SHA256 89cb295f45d7db1bf261e344569c2597879657d1aa9538e5037bc2db9a508bec
 DIST phonon-4.4_pre20090520.tar.bz2 583005 RMD160 5cd7abe22319124b60fe292b978b7e78fae1a29d SHA1 a0a6942cb40b28c4e30f4272b1420300546a9bdf SHA256 0073efcc672b4d2e6def34e82ff43313cf8cb14ef63d15cd9b4d9f641b998e9d
 EBUILD phonon-4.3.1.ebuild 1441 RMD160 c39c350aa3cc9426df0c73083a818d80c7bffd81 SHA1 4317d773801da65f70cb4ed0e0f5992b50113d14 SHA256 c994cc89a8b2399b0d00cf1b11a155079ca0bc98ac2016d64c54371fa5a2642b
 EBUILD phonon-4.3.50_pre20090520.ebuild 1432 RMD160 ec4648e2330d74cf27ba6ebd49302535303481b8 SHA1 34d2d1480672c4ac41352f5e813d24114b3dbdc1 SHA256 9c0438145e5e82333768327323ad0bef0ea6fe23744455026fe2d1d6d793b74d
-EBUILD phonon-4.3.80.ebuild 1478 RMD160 5851720c9965522663bfd1b836fd41db3713d6da SHA1 17505259d6ee0f0039a5b7580051d20a09e65b2b SHA256 41c173fdd78d1627ab174fe3841d3d3fb2dddd478b100b1844f6efa4549be1c4
-MISC ChangeLog 4702 RMD160 a6364494751ba1d77663fa3b4cee67eb0bef598a SHA1 7aed36ae587a817f931c84c754d71696b98c2bfd SHA256 2a5cb164836938ab0a87dbbbe6949f14a9bf2c1a2aae0e7f904e293bc88ab45d
+EBUILD phonon-4.3.80-r1.ebuild 3198 RMD160 d4cdf93460d9fba61915ee5c6b0b034540ebefd6 SHA1 48a8e802f1f8441de37c0bdf5a77589145076ff7 SHA256 feba2996302c13a048313c0cbdf1cb87fa1a3ac5344fa9d9eb91d3ed6fee00ff
+MISC ChangeLog 4931 RMD160 5c801e48a0f4822e3055f7b6ebbed0057b18c03a SHA1 f322179f9d864802419dd2b05a16301b39f31b9c SHA256 292b6cae59ffe0ce44dcff9d828cbf0e80a3785215ad18956a6fa7a4f4351db6
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-sound/phonon/files/phonon-4.4-qt7.patch b/media-sound/phonon/files/phonon-4.4-qt7.patch
new file mode 100644
index 000000000000..974fe11d2a4f
--- /dev/null
+++ b/media-sound/phonon/files/phonon-4.4-qt7.patch
@@ -0,0 +1,352 @@
+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;
diff --git a/media-sound/phonon/phonon-4.3.80-r1.ebuild b/media-sound/phonon/phonon-4.3.80-r1.ebuild
new file mode 100644
index 000000000000..cd262c111491
--- /dev/null
+++ b/media-sound/phonon/phonon-4.3.80-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/phonon-4.3.80-r1.ebuild,v 1.1 2009/12/25 15:31:46 abcd Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+
+DESCRIPTION="KDE multimedia API"
+HOMEPAGE="http://phonon.kde.org"
+SRC_URI="mirror://kde/unstable/phonon/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~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 +xcb +xine"
+
+RDEPEND="
+	!kde-base/phonon-xine
+	!x11-libs/qt-phonon:4
+	>=x11-libs/qt-test-4.4.0:4[aqua=]
+	>=x11-libs/qt-dbus-4.4.0:4[aqua=]
+	>=x11-libs/qt-gui-4.4.0:4[aqua=]
+	>=x11-libs/qt-opengl-4.4.0:4[aqua=]
+	gstreamer? (
+		media-libs/gstreamer
+		media-libs/gst-plugins-base
+		alsa? ( media-libs/alsa-lib )
+	)
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-0.9.21[glib]
+	)
+	xine? (
+		>=media-libs/xine-lib-1.1.15-r1[xcb?]
+		xcb? ( x11-libs/libxcb )
+	)
+"
+DEPEND="${RDEPEND}
+	>=kde-base/automoc-0.9.87
+"
+
+pkg_setup() {
+	if use !xine && use !gstreamer && use !aqua; then
+		die "you must at least select one backend for phonon"
+	fi
+
+	if use xine && use aqua; then
+		die "XINE backend needs X11 which is not available for USE=aqua"
+	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
+}
+
+src_configure() {
+	mycmakeargs="${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)
+		$(cmake-utils_use_with xine)
+		$(cmake-utils_use_with xcb)
+	"
+
+	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-sound/phonon/phonon-4.3.80.ebuild b/media-sound/phonon/phonon-4.3.80.ebuild
deleted file mode 100644
index 0f23a8c69bd4..000000000000
--- a/media-sound/phonon/phonon-4.3.80.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/phonon-4.3.80.ebuild,v 1.2 2009/12/04 16:04:17 scarabeus Exp $
-
-EAPI="2"
-inherit cmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="http://phonon.kde.org"
-SRC_URI="mirror://kde/unstable/phonon/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa debug gstreamer pulseaudio +xcb +xine"
-
-RDEPEND="
-	!kde-base/phonon-xine
-	!x11-libs/qt-phonon:4
-	>=x11-libs/qt-test-4.4.0:4
-	>=x11-libs/qt-dbus-4.4.0:4
-	>=x11-libs/qt-gui-4.4.0:4
-	>=x11-libs/qt-opengl-4.4.0:4
-	gstreamer? (
-		media-libs/gstreamer
-		media-libs/gst-plugins-base
-		alsa? ( media-libs/alsa-lib )
-	)
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-	xine? (
-		>=media-libs/xine-lib-1.1.15-r1[xcb?]
-		xcb? ( x11-libs/libxcb )
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-base/automoc-0.9.87
-"
-
-pkg_setup() {
-	if use !xine && use !gstreamer; then
-		die "you must at least select one backend for phonon"
-	fi
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with gstreamer GStreamer)
-		$(cmake-utils_use_with gstreamer GStreamerPlugins)
-		$(cmake-utils_use_with pulseaudio PulseAudio)
-		$(cmake-utils_use_with pulseaudio GLib2)
-		$(cmake-utils_use_with xine)
-		$(cmake-utils_use_with xcb)
-	"
-
-	cmake-utils_src_configure
-}