Cleanup.

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

4 files changed, 21 insertions, 73 deletions

diff --git a/dev-qt/qtdbus/ChangeLog b/dev-qt/qtdbus/ChangeLog
index 52735922c4fc..093d7546dff7 100644
--- a/dev-qt/qtdbus/ChangeLog
+++ b/dev-qt/qtdbus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtdbus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/ChangeLog,v 1.11 2014/01/26 11:55:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/ChangeLog,v 1.12 2014/01/26 17:52:34 pesa Exp $
+
+  26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtdbus-4.8.4.ebuild,
+  metadata.xml:
+  Cleanup.
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtdbus-4.8.5.ebuild:
   Stable for ia64, wrt bug #494728
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 4fc1e3a52164..b7e8b32060d3 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -3,26 +3,24 @@ Hash: SHA256
 
 AUX qtdbus-4.7-qdbusintegrator-no-const.patch 543 SHA256 a05de8d906be14160e5c951856fae2796b6f6eed91ed4781e8197433e94ce922 SHA512 1967f1b3f1a834eecf140df39c6e4826acf80fc2f8de85770252949910de357a4303d1c1b3202e2df164e8b1cd74b0ab4928a3b333df0a222bdf21e71696824f WHIRLPOOL c5d72b6fc8a9e55cfdacdd2a514e1acbd1c4f864f92596b3c3b9d013a24425619c04048063afb9aef267ade2b5fcf6b3921b90cddb2f9a3ee7d8721ae7d8eeeb
 AUX qtdbus-4.8.4-qdbusconnection-silence-warning.patch 997 SHA256 648a06278bd4cbe98c61543475cf75b0251722d0f562e9ff8a3b8a89d3838811 SHA512 b3135450bcd7ab50e5b559b0e8619606053845852159853498756e50777cfbe8b5871bd7b0c178b3de038dc9229f3564c4827b35fcb67b354f0814ca1b2c58e3 WHIRLPOOL c28d79d56c284dc17489c31449b20d774021a0a9dac385c327e6b42997dabc0d92aeca4f5fae3020926f6c16053b30f82913800019e5419e3a82f58481fa30db
-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 qtdbus-4.8.4.ebuild 1186 SHA256 5e192084b00d47949c98e159a9d7fd93eb355e78650c961eb4ce917b99476bfe SHA512 dbbf0d432e862bbc81ef3aaa6551eb56024446a7a9092b97063c06121c41ed05675a93a1d720ef8185fb77b68b470dbfc8d826e14ce54993bbd142b5b6d353ed WHIRLPOOL f241422975521969a8fd3c7cf07ece6091ed49c88f8eb1471d143eab311997179d9ab24e4a94004c1e34713b5fe19c63573f4558c6b92505ed69a2a7b29334bb
 EBUILD qtdbus-4.8.5.ebuild 1184 SHA256 2f9ac94d2d32deb1798a98425b288ea6ffb900bbe9dfbfd24b156cf869249476 SHA512 4defc49eb7de95e21e12a07ee919fe0a3aad462e3f75b46e763a0822d7c28df103b6fc4c2173a50e3e8df6eb30f3585f28417283b6b1d2023fe3e0f6a055ebed WHIRLPOOL 56ae1d167972bc7540d4195e3bb6660a0e58f0e50ece0d897fa679af196d404d9156e0cd48fa94fdd00fb404e2139aee5861482b1c33ed0e2fcb0ba7e4b81fee
-MISC ChangeLog 18066 SHA256 c3529f4d56ecf587adfbe113bdaa16778f0e06ded39bd838c69eedbdafb574db SHA512 038d88a3693557dba89e65ebf9cc1a41c1ba924d29c1564249e551a6ee19409cbb179e1699b7aeb040fd85231c759d4bfc57201d6ca8b27b97052cc5c5d01796 WHIRLPOOL b4287dd93a35147f7bf99aa410533978f7a405b69a321a06b5386f13d0e48499432cedd75fffd0e4f492dfb586737a3e6aae1d774c251d1d8a9b68c715478045
-MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f
+MISC ChangeLog 18167 SHA256 4db3b59434a57f8342f049d361b073917da94376ba6244bf93480497ac8c7096 SHA512 a4c735b8e4b3ee5aa3518afc873d8205fff6d249e879ce16ddbd4953cabcdca3719a0e7eee4169e35c5984ff94d4b6ee70b693bc9b94d978f86018a398262479 WHIRLPOOL b6d1b70b375e9823490ab26eaab3194bdd504871e628dabc51e6d3badaa80f05cd3b86a6ec07b187408a958a09d928357ee651b8878156319d255d38ffa243c4
+MISC metadata.xml 425 SHA256 0165b386b79e8935b55fb9bc09aeba60faa381f5814541f4dde08d3cdca907f7 SHA512 69227945f6fc3cb4b72f7753545605ec5665a21a7c009ec889648fa93871f9923011734af82af09e3370dd9fec664875d1892002f5ade5189a05ea33c134f12e WHIRLPOOL e3ff695a907a21fc3ededf7c260d7be52b7555e88d763ae5d8c2afa6ebb941f80430909a8864f41cda3a6d96f07135b583b4f85afff231d4f76bf50bc061ba9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS5PfFAAoJELp701BxlEWfCEkP/jgaO4aYT66dizD8FyybACSu
-Od5BC6CAOTUfhefT/T+zEQewB/bcQCJ5YXOY5tjp21HC017M+EcpdOCKmciOP71B
-cN6q404eldCNThWK0x1oQE4gwQgVew05y8ZjaCqqfQPjuksepeJb8GNgyoO9Coy8
-ENx683LlCinw7PENKdmDPNXF9DucCWriPb4BAtn96b5GDR89w22L86/EijtrC3pW
-FJPC599UN8ruj2hGoNHn/K5pLMBAfuNkMOltLDMXN1cQEziOfHtwzpxOwCsaaP87
-KR6GUQEeAAebQIZ5sEkJfC63u4DKimOpcPy/BgCgfTOSfmKvxUS7gderZ/fzMUVk
-uQaM5ZEy4zGzKtxZCOdEIlHr/0dB+MtllSEEKpU3eax6G2YCLbBm90YrHKSJC4MV
-ITZ6ufK9weKQrFYmBZajCeKag7ZpGvsWfsDr1P68O0ET9OT7Bs2/hV5R6MXxAwzI
-zs7FTg3wW6o2g8Qn+mdS8vxShi/GUjzFQS2xlEUJ7yjWm5u4wbcMpKAcEbZzGGuG
-UGQDdOGfWOHCGW5mOSaOQJgSOy1PUZa29W1HDc7zT22Ja3Px7XNoqYVgdghkcRm5
-3dpMn0U73StDWyWckf7q3bURIIyxHVdhVJCJ78A+ovr1AJLSJuZKo4v0aG5ikFL7
-7nS0AY2FDQTOjqC1RV+W
-=Bt37
+iQIcBAEBCAAGBQJS5UtjAAoJENXLsxwXqFxyxh8QAKm2882lIxC8UYSqaFZ41bgK
+dLXrhgVZw/skIyLItNHuODWZ+aPMveMzRkAK6J92TdOsnp54Qxip2TB0Ub/ORHU7
+BKa/QVpWQonwqAl9MXamJy32+ixoO3c1bLO/8bnTUTlNEawN9QOk0amS2H6g8CDM
+cxSQ53qrbG+UtR9psZkeHUNgBQarv6CkG+W7/tRW/NCD0719YPfzut0VjL46b4yd
+9CIksEFQMa6U2mXS4tpvC1uVbgRF2EQQIMoZ1F/Tmso9VKQa/RJfbHl/QOY8QlEc
+OWo/JjYZbftMWeUckIumnjp5g/8tx82CSHzP2Zk9moM1HsC27SZHfwf5IsaGoa62
+AuBQa9drheEn//ekwl4dgVlupGbB+h2hCenfVA9RxOHxCKIDxQ39uHkVEImQOpX1
+r+D+HygfckVwcuKRuTgvtB0YohoyDu0qWsn9idWlLYNEGXOu8GGrKgDGRMlSnLqR
+znAyBC5uIL92P6Xw5NM0/bvVa9J8JN+Ut9/WaH48qE2Ze7C4zjE1IEqQygs6Ufhw
+N7mhrjhGdxr4q/F4Baawrwmy/EFpMYp1y4ubqxeFHHRu+tIgLLjOpceifJgQE4eb
+1hN98ukYjFJ6a50dNCnIMGEl6o+oQI6Lr4RIGLo0C9n0hFnmLkc1Ly/sPXX4gxQI
+EKhuh8FpxGEJEvUywY/Z
+=2Vue
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdbus/metadata.xml b/dev-qt/qtdbus/metadata.xml
index 93e5fd3f1e69..e3ba68900f83 100644
--- a/dev-qt/qtdbus/metadata.xml
+++ b/dev-qt/qtdbus/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/qtdbus/qtdbus-4.8.4.ebuild b/dev-qt/qtdbus/qtdbus-4.8.4.ebuild
deleted file mode 100644
index 67b77296eee9..000000000000
--- a/dev-qt/qtdbus/qtdbus-4.8.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/qtdbus-4.8.4.ebuild,v 1.1 2013/03/02 15:26:24 yngwin Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The DBus module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE=""
-
-DEPEND="
-	>=sys-apps/dbus-1.2
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
-	"${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/dbus
-		tools/qdbus/qdbus
-		tools/qdbus/qdbusxml2cpp
-		tools/qdbus/qdbuscpp2xml"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/QtCore
-		include/QtDBus
-		include/QtXml
-		src/corelib
-		src/xml"
-
-	QCONFIG_ADD="dbus dbus-linked"
-	QCONFIG_DEFINE="QT_DBUS"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+=" -dbus-linked"
-
-	qt4-build_src_configure
-}