Cleanup.

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

3 files changed, 7 insertions, 64 deletions

diff --git a/dev-qt/qtmultimedia/ChangeLog b/dev-qt/qtmultimedia/ChangeLog
index b7b6b096796c..2014c209e20b 100644
--- a/dev-qt/qtmultimedia/ChangeLog
+++ b/dev-qt/qtmultimedia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtmultimedia
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/ChangeLog,v 1.8 2013/11/07 06:01:15 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/ChangeLog,v 1.9 2014/01/26 18:01:34 pesa Exp $
+
+  26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtmultimedia-4.8.4.ebuild,
+  metadata.xml:
+  Cleanup.
 
   07 Nov 2013; Agostino Sarubbo <ago@gentoo.org> qtmultimedia-4.8.5.ebuild:
   Stable for arm, wrt bug #488536
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index 93e5fd3f1e69..e3ba68900f83 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/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>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.4.ebuild
deleted file mode 100644
index 501692432dfd..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.4.ebuild
+++ /dev/null
@@ -1,60 +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/qtmultimedia/qtmultimedia-4.8.4.ebuild,v 1.1 2013/03/02 15:31:35 yngwin Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Multimedia module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-fi
-IUSE="alsa"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-	~dev-qt/qtgui-${PV}[aqua=,debug=]
-	alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.0-alsa.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/multimedia"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt
-		include/QtCore
-		include/QtGui
-		include/QtMultimedia
-		src/src.pro
-		src/corelib
-		src/gui"
-
-	QCONFIG_ADD="multimedia"
-	QCONFIG_DEFINE="QT_MULTIMEDIA"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		-multimedia -audio-backend
-		$(qt_use alsa)
-		-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
-		-no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
-
-	qt4-build_src_configure
-}