Cleanup.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

3 files changed, 7 insertions, 60 deletions

diff --git a/dev-qt/qtphonon/ChangeLog b/dev-qt/qtphonon/ChangeLog
index 655594998eab..702d64cfe2c7 100644
--- a/dev-qt/qtphonon/ChangeLog
+++ b/dev-qt/qtphonon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtphonon
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/ChangeLog,v 1.7 2013/11/11 14:00:49 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/ChangeLog,v 1.8 2014/01/26 18:04:46 pesa Exp $
+
+  26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtphonon-4.8.4.ebuild,
+  metadata.xml:
+  Cleanup.
 
   11 Nov 2013; Jeroen Roovers <jer@gentoo.org> qtphonon-4.8.5.ebuild:
   Stable for HPPA (bug #488536).
diff --git a/dev-qt/qtphonon/metadata.xml b/dev-qt/qtphonon/metadata.xml
index 8f9551c3d809..7dfcbbfcc663 100644
--- a/dev-qt/qtphonon/metadata.xml
+++ b/dev-qt/qtphonon/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<herd>qt</herd> 
 	<use>
-		<flag name="c++0x">Build Qt using the C++11 standard</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by Nokia)</flag>
+			inside the event loop (recommended by upstream)</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
 			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
 	</use>
diff --git a/dev-qt/qtphonon/qtphonon-4.8.4.ebuild b/dev-qt/qtphonon/qtphonon-4.8.4.ebuild
deleted file mode 100644
index 2d40e2dfd279..000000000000
--- a/dev-qt/qtphonon/qtphonon-4.8.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/qtphonon-4.8.4.ebuild,v 1.1 2013/03/02 15:32:28 yngwin Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Phonon module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="dbus qt3support"
-
-DEPEND="
-	~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=]
-	!kde-base/phonon-kde
-	!kde-base/phonon-xine
-	!media-libs/phonon
-	!media-sound/phonon
-	!aqua? ( media-libs/gstreamer:0.10
-		 media-plugins/gst-plugins-meta:0.10 )
-	aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=] )
-	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/phonon
-		src/plugins/phonon
-		tools/designer/src/plugins/phononwidgets"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include
-		src
-		tools"
-
-	QCONFIG_ADD="phonon"
-	QCONFIG_DEFINE="QT_PHONON
-			$(use !aqua && echo QT_GSTREAMER)"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		-phonon -phonon-backend -no-opengl -no-svg
-		$(qt_use dbus qdbus)
-		$(qt_use qt3support)"
-
-	qt4-build_src_configure
-}