Cleanup.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

4 files changed, 23 insertions, 82 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/Manifest b/dev-qt/qtmultimedia/Manifest
index 5e3ab6684c0f..a9fb054f271e 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,27 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX qtmultimedia-4.8.0-alsa.patch 2155 SHA256 49a54bd39627b1070b106519cdff1fe33aec6a5755658c20270204b2ba850f7a SHA512 725dc78b861c82393ecd97ce293f9c165067ca940332fab22ecc252880e1c08aae301d54ddcdf38df9d32907c57bc70d772891a6dc9fdacf740de32b363f4aa4 WHIRLPOOL c5359f79a53b4d488c346e2d58924e21df3deabbb87e59762185afe43b05543578a1bc2d2bdafa31b1a345adf7a287851bde3a963c56ed1cc686beb14cedc321
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
-EBUILD qtmultimedia-4.8.4.ebuild 1518 SHA256 19fa410e7e7dc77d5666d3b2ac855746563d9f22513e8b0a176fcc06d4a51b04 SHA512 0effbb560524ccca50dc61ff16e93e5690fb3233c3cf1e432a42b5b0bf2674471b4e4fb1054dd69fa45c8afae59f8ff0ec5bd320f8d99911d4097384a421c73c WHIRLPOOL 4dfdb99842d7f70779c4f9860e8cf3d020817c6299b15979bbd6cf8cd72881448fd0e7a8d9394f5b9726cf8575a866f629a9ff73feda0ccef0dfeaf1921347df
 EBUILD qtmultimedia-4.8.5.ebuild 1515 SHA256 a1386a7472171b861981f04e7c484cce090a87efd5c08d73557135bb03e50067 SHA512 6f5d7ac5d7f90c1eac874b286d4fee243caf5456b8ca1b989c4e2ba77fb4816cc85d7dc28f6071eb2cebc651ef3f708dd8b918dc5346d24944cdd0a98230703e WHIRLPOOL 3be8a10021a17b8022e446409f6022e27d47b6edd0e765871f5b9e5c194fb2c9ae6ba3c26262beb82f553c37a908346ee255fc121db026b1eaaa7e59b319364f
-MISC ChangeLog 10462 SHA256 29b916f821a2d705e5f876e7a83a34855814822cc7352632b7681e89e7cd084d SHA512 ced01ecb7a43eb8212febfca6db6334053c897ccf495081897ee29759379602dc9f74fa0dcc7423531dd0958b8c3b33659d612db5c203e252711b6ccc8cb410a WHIRLPOOL 52ecc1a767e18281fc4a341ca9cb4cb35dfdeb3d6f6c54c7d843de5818da47d388e4fa2060d6a322f5604ad52fd6a8a9855e3c226533507bb714b038914e0570
-MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f
+MISC ChangeLog 10569 SHA256 fbabd5259b251580e673e5f69ba46cfd6386421b31f72afacda78d4cc2aad0f7 SHA512 9bdb2f1223ce5685d3fcdc0847bcfb5250c00497e67aaa1d30a0fd4809d393a91e6f14908898607e60a479875756695ea260ceba6288baadb750eb20ebb51dff WHIRLPOOL 62efabccf59e4128f4de3e9e49ee8a16c8f81ed5e0a7df3aa23e8d7bc6203e15e3fe43572906d0d55b5f7445ff2da8aec770a2ff8c51109e5a7681fc506e2f57
+MISC metadata.xml 425 SHA256 0165b386b79e8935b55fb9bc09aeba60faa381f5814541f4dde08d3cdca907f7 SHA512 69227945f6fc3cb4b72f7753545605ec5665a21a7c009ec889648fa93871f9923011734af82af09e3370dd9fec664875d1892002f5ade5189a05ea33c134f12e WHIRLPOOL e3ff695a907a21fc3ededf7c260d7be52b7555e88d763ae5d8c2afa6ebb941f80430909a8864f41cda3a6d96f07135b583b4f85afff231d4f76bf50bc061ba9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSeyyiAAoJELp701BxlEWf9ckP/jG8+HkkLNZ0H394gYgVcSOp
-t7aDs/kUG4PQHaa9xOjKZ9PMeEXoEE+tBBuWtqxI7CdsrqqEyflFYGEPFlQS72ss
-LqhrlLJflovaw076VLvPNe2hLHWD8c+GQHu5b3jnuwav1I/SXKSkPCqBuflWD2ec
-iOQ+bT5r5RWnzYOa0JlOeS2lznn2X3K3cX/xxh04fzzx8OAtVx76qBEbKo8Y3QyF
-qugCZ0lSyKw/7ImS8w49XDB27gbgfS5UW2tkL7U6xuYo6r/tftamofazTB5YHi2n
-kid788PIYibKgmOuyhyWkknPAnN9KeLk/aYQDtzVViK1MpUnN8LX//knTAY6sziK
-l3QtayhZi5jmHBGhha5Jyhj8q/+CRyYMa1goMcZjJYpusMxBmBQKmUcraR+DiyJF
-53pdi5aBkPhJOym7evLEboABV0iLMHMP6sVEcAflabMblYPIrrg3ZCYc7fMNM/eP
-85HWTIphIvRoEiHjo40OjSvOoQSRs3JN5XpcIORjNRioQJUH+owzsARmu5fQZSbf
-bvuMQTOLY2nPF/N90VAH0d+7XYFNyeuhoCOBLac0kZWv6CEFEaB5sDpGjKF4PXot
-HNEjRR+Pv+XzM87pHexWLSW1GDtVwVAkhSx+iHumrfxTalbAxeM7wOSPWlTX25qm
-4m9I+rmAIvPpBL6Zv9SJ
-=EavB
+iQIcBAEBCAAGBQJS5U1/AAoJENXLsxwXqFxyJHcP/iiWqeXNDfQYsjMV4Jsp+N8J
+M2N7tq3TnScaxh8qmE/uEUU/oBL1YrJ69+ohp+NoLsrOZDgrYp0U9tCu1+BNgpki
+cH748qYG7hVnZz9xraWVtlpq+d2Uj/yNOpZHf2ZSCHp5C71SfOIxtPNYBtCAwnlb
+aOEQ/gNzB/OATHuOEHSsSnmqL4OHw/LE852Ne0e1+r+hJEo4KNCfxEgKoTMEeSTY
+8de+3kbtcZYL0PhNoyqJfEuF79aqh3Hv3aXkHAcqBXNqhW62WGHAaXffCiNYodpa
+4L9YqGobZnhhHecTwgqfGanGsLU+dA2Ar/Q20Lqxja0MorBdre5+zibvZ4lslEBC
+/lIl1kKHnrNt8T1uTy8nn/sSON8b9vYii5ByT9h2GaASRetTbTAhXEcJLz3JtbtT
+otMx+5s6Ci6pyxUn0KiMplnCgID55PvRRyEVgWo/tA+yNDDGa8niflsxqNlyZY3Q
++OKJ+4IQiXWVB3anp8DG+z/ESrudtdSml8MH92/F7xVZaqT9VBrKFakyj/UTsGyE
+CAJeNgdewEU7OTEIPavHDhkV2wh+g6a+V+RB6glKa3ZxeRb3yo4pMrZB8rxzxPG/
+pFDzPJuYVoUqgzC1HfnRWuBcfUW2oAUEOc+iWOk5uSJ76CgLLN01RFjPXU2jJHK1
+LrxIkdIvr3uJvmBW5D4w
+=slzt
 -----END PGP SIGNATURE-----
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
-}