Unify 4.7 and 4.8 ebuilds, remove 4.6. Drop arches with unkeyworded deps.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

6 files changed, 49 insertions, 85 deletions

diff --git a/x11-libs/qt-meta/ChangeLog b/x11-libs/qt-meta/ChangeLog
index 138e31a9eedc..31f03fba9a9a 100644
--- a/x11-libs/qt-meta/ChangeLog
+++ b/x11-libs/qt-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-meta/ChangeLog,v 1.9 2012/05/13 14:14:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-meta/ChangeLog,v 1.10 2012/05/20 20:45:18 pesa Exp $
+
+  20 May 2012; Davide Pesavento <pesa@gentoo.org> -qt-meta-4.6.ebuild,
+  metadata.xml, qt-meta-4.7.ebuild, qt-meta-4.8.ebuild:
+  Unify 4.7 and 4.8 ebuilds, remove 4.6. Drop arches with unkeyworded deps.
 
   13 May 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Sync metadata with the other Qt modules.
diff --git a/x11-libs/qt-meta/Manifest b/x11-libs/qt-meta/Manifest
index 7ddb8dddef58..0b1bf2c7ab34 100644
--- a/x11-libs/qt-meta/Manifest
+++ b/x11-libs/qt-meta/Manifest
@@ -1,25 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-EBUILD qt-meta-4.6.ebuild 1311 RMD160 5a490ae2bf23fbb94dcb7cf547aac58dd9cc9f30 SHA1 224b16d727bddcc281c6e2b9894e20481efca3d7 SHA256 52d10968950b457791f5c76a196bf8f17ccfb65fb5d94b224afb84485fcaa943
-EBUILD qt-meta-4.7.ebuild 1337 RMD160 ab35c6436cc223e9ddc80c74a34179d5c4e56382 SHA1 b03139e2e574a79e5b143c6186c90acc84fc2107 SHA256 a9ab0341ece3a8d0f5f7088ff195bf86caa841865a4d46800f136455025a923c
-EBUILD qt-meta-4.8.ebuild 1419 RMD160 0de0bc63c116c55dd743193bdb3ab74b1ab7ee85 SHA1 1fe7ce5e97eaaa271aec7c56eb38cca64772ac16 SHA256 0e358e816ac98d06b7e263ef20e9de7d3bfbb2714f657085eaedb732bdf9c5b1
-MISC ChangeLog 1248 RMD160 7d0b0e436da51fd682d71c04ae125312ebd53371 SHA1 79de8019b8d1c980cd0ccf35cf382339a318abe6 SHA256 89aaa850d55c0d0c7e5e6fb02acc89dfca404af4e89294106c97fd944ddf6da2
-MISC metadata.xml 395 RMD160 501396ad56c7d3c0c9048ec551d7b116b20a80c8 SHA1 ff864c73b65ab7986b9f4487cade672c474f2976 SHA256 1f693c6cc226ad1900f17a0c9b573eb9196f468bdb8f3227fd442cdd68b1403f
+EBUILD qt-meta-4.7.ebuild 1333 RMD160 b113844e62281ecc03b22ec07f0cfb8ff37891d3 SHA1 aac0be8abef568fce894a15fa6accaf124cc0303 SHA256 537ada666b464b82b782e6db7b1c4c9aeac0250266517328c16411245b0abc7a
+EBUILD qt-meta-4.8.ebuild 1382 RMD160 e4ac84adb31c476b910f5f60cb8e93a5e9faa269 SHA1 bf263e0ce88ea74b7fbc88056a0a31a5c023d342 SHA256 97f77dec485f1b443a130b985409092f033b609cc010b4b35e8d419a08dc80d6
+MISC ChangeLog 1453 RMD160 a99cc710a7fdde1278d50a2f0d930371ce14e5fd SHA1 d89787ba83b28f5acf3af66cea67f3de2144bdbd SHA256 9ffce077e1ae46befd3a7b434244bf67394f0a08dd8d1eb016ae445b6b2ac14a
+MISC metadata.xml 451 RMD160 7226cf2f74383e3e1631208c331b2c7af6a7428b SHA1 1cea38a222c790ad8bc18dee6f0f7911de2de8b6 SHA256 b552af2484da61abc5c87371e1baeb8818b2e660495e0dcc82b9d0e5cb10a03d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPr8HNAAoJENXLsxwXqFxy6q4P/iawxlydIHQbyc1UU6+JKkFZ
-MzQHMMvI4PTc21Uetp/qlpTUMB2jKyAhxJtm1W/1csttIRw5K576rm59pajkIlCP
-RojrOXNv24C62xkA184MHxiJKnMSyVjunK0f2zQ+V5Fs6esy8SgUleEzCHoTMevn
-kBX0Fj7faYip9hyF5iVUsLKL+4bcBWz1suPLQhrcjIsopPlKcNZ7hu5NMEfyh6Ou
-X0uCoYm6OcZXCx6fiy1FuHMgBe/THOtP57BB12NN/qHfX0VqVHL6njowMfNoUGu8
-aMF77LTBs/Wetb5v2w62hcv9IEltW99jBlWtaJJPbR6z5jvTb6Hk1/3zi/poCd3j
-3rTFEvzs4I1l/j2OlXQKBpMNTqqhmMEDW70df6wWLtRIGrh3JrZSj3JYhoK79o7J
-kDN24da+P2/qaAqyGv4gCpFzKScNa8I+ndLxH21qxpy8a/tGwcPIQtuBx0v6WAx3
-/xoHs2GaQkn87X0Yr37wdzfSJHxPMomtWcbSZnVp4e8MXrYLJT0KQEaihlVYTn+H
-6FkXzjXMRLjy9WskFdrVEAYmMnLqKs2CWcF9NAhSPpFrVrn2DHBgMHJDark96rRu
-nHRpxc9yDOT0Ed7H9mX2Ajqkosd2VBI+dxu9Ko35mKpTGVBgxCh7XB89IaaXcUgA
-01Pu7OpqqBP7M2130o71
-=VcE8
+iQIcBAEBCgAGBQJPuVfnAAoJENXLsxwXqFxy5MUQAI/FvUmPzAIjrdY1XHpsah7X
+M4hNtXKz9XMJqSzZ9t+HAWwyE5lyEvwCrqu+XT9l/nUuRpseeVeW+hwwabrerm1Z
+MmjfMB7uohguy4PoXr39IkZUFWnM73JYiAtOMGABA9jZkfynHxjx8k2aYfP+JM+o
++N+/57GT0V4u1HYlbLsmquK8hUS77dvbzoQAZadcRj4cQ3rfH2kilHYcI/49VtZ5
+TVULGQVJP8uFJBONdzlW8BoMqmRq0Q64Ft9zSDkAmD4h3/oyr3b/MzYkEfngdGhi
+hO6tA4M5vAc46F9C1biky/QwvQIeH2gk0u6Oc6bWWFOL7aKQK15mZFgqKufb4JR2
+rX6ic9O+ZM3ggjgrcUS8G4kHsKtisoAIo/DNXpXuNLBdbZpCTPmehcvGTyBNsPzU
+dhSTwn4bDlotWLWs4/AnL/6BRto3h4Pr5hDbU1s/LatNZnRWlYT1B+6fwk/+kLPR
+xZ72seOlKTkopdL7a5SAqhAZWn+Z2B4aWcQC5DMnqvdaU91UDJDeHfoz6G+I8fop
+1AmVHNFJsMSinQSbEW9MSgBXzwaQDyYTgH51GmBSKC86Zk6rVL8ZzviPd/umuQ8/
+CjRl5KohUB73++AoYByahu829aua0/08zs7ohLD4H35omvDG9aGnHHmda8omB/Ge
+gRxGp54Qh/3++YGjPQ4s
+=2ZYl
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-meta/metadata.xml b/x11-libs/qt-meta/metadata.xml
index c6be8d9f11b3..22f7c637aa4c 100644
--- a/x11-libs/qt-meta/metadata.xml
+++ b/x11-libs/qt-meta/metadata.xml
@@ -4,7 +4,8 @@
 	<herd>qt</herd>
 	<use>
 		<flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon variant (needed for KDE)</flag>
-		<flag name="openvg">Build the Qt OpenVG module</flag>
+		<flag name="opengl">Enable the QtOpenGL module</flag>
+		<flag name="openvg">Enable the QtOpenVG module</flag>
 		<flag name="qt3support">Enable the Qt3Support library for Qt4</flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-libs/qt-meta/qt-meta-4.6.ebuild b/x11-libs/qt-meta/qt-meta-4.6.ebuild
deleted file mode 100644
index 0e3b81da3cab..000000000000
--- a/x11-libs/qt-meta/qt-meta-4.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-meta/qt-meta-4.6.ebuild,v 1.2 2011/12/08 17:40:47 pesa Exp $
-
-EAPI=2
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
-HOMEPAGE="http://qt.nokia.com/ http://qt-project.org/"
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="dbus kde opengl qt3support"
-
-DEPEND=""
-RDEPEND="
-	>=x11-libs/qt-core-${PV}
-	>=x11-libs/qt-gui-${PV}
-	>=x11-libs/qt-svg-${PV}
-	>=x11-libs/qt-sql-${PV}
-	>=x11-libs/qt-script-${PV}
-	>=x11-libs/qt-xmlpatterns-${PV}
-	dbus? ( >=x11-libs/qt-dbus-${PV} )
-	opengl? ( >=x11-libs/qt-opengl-${PV} )
-	!kde? ( || ( >=x11-libs/qt-phonon-${PV} media-libs/phonon ) )
-	kde? ( media-libs/phonon )
-	qt3support? ( >=x11-libs/qt-qt3support-${PV} )
-	>=x11-libs/qt-webkit-${PV}
-	>=x11-libs/qt-test-${PV}
-	>=x11-libs/qt-multimedia-${PV}
-	>=x11-libs/qt-assistant-${PV}
-"
-
-pkg_postinst() {
-	echo
-	elog "Please note that this meta package is only provided for convenience."
-	elog "No packages should depend directly on this meta package, but on the"
-	elog "specific split Qt packages needed."
-	echo
-}
diff --git a/x11-libs/qt-meta/qt-meta-4.7.ebuild b/x11-libs/qt-meta/qt-meta-4.7.ebuild
index 69433685af3f..7e295b424db7 100644
--- a/x11-libs/qt-meta/qt-meta-4.7.ebuild
+++ b/x11-libs/qt-meta/qt-meta-4.7.ebuild
@@ -1,41 +1,41 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-meta/qt-meta-4.7.ebuild,v 1.2 2011/12/08 17:40:47 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-meta/qt-meta-4.7.ebuild,v 1.3 2012/05/20 20:45:18 pesa Exp $
 
 EAPI=2
 
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
-HOMEPAGE="http://qt.nokia.com/ http://qt-project.org/"
+HOMEPAGE="http://qt-project.org/ http://qt.nokia.com/"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="dbus kde opengl qt3support"
 
 DEPEND=""
 RDEPEND="
-	>=x11-libs/qt-core-${PV}
-	>=x11-libs/qt-gui-${PV}
-	>=x11-libs/qt-svg-${PV}
-	>=x11-libs/qt-sql-${PV}
-	>=x11-libs/qt-script-${PV}
-	>=x11-libs/qt-xmlpatterns-${PV}
-	dbus? ( >=x11-libs/qt-dbus-${PV} )
-	opengl? ( >=x11-libs/qt-opengl-${PV} )
-	!kde? ( || ( >=x11-libs/qt-phonon-${PV} media-libs/phonon ) )
+	>=x11-libs/qt-assistant-${PV}:4
+	>=x11-libs/qt-core-${PV}:4
+	dbus? ( >=x11-libs/qt-dbus-${PV}:4 )
+	>=x11-libs/qt-declarative-${PV}:4
+	>=x11-libs/qt-gui-${PV}:4
+	>=x11-libs/qt-multimedia-${PV}:4
+	opengl? ( >=x11-libs/qt-opengl-${PV}:4 )
 	kde? ( media-libs/phonon )
-	qt3support? ( >=x11-libs/qt-qt3support-${PV} )
-	>=x11-libs/qt-webkit-${PV}
-	>=x11-libs/qt-test-${PV}
-	>=x11-libs/qt-multimedia-${PV}
-	>=x11-libs/qt-declarative-${PV}
-	>=x11-libs/qt-assistant-${PV}
+	!kde? ( || ( >=x11-libs/qt-phonon-${PV}:4 media-libs/phonon ) )
+	qt3support? ( >=x11-libs/qt-qt3support-${PV}:4 )
+	>=x11-libs/qt-script-${PV}:4
+	>=x11-libs/qt-sql-${PV}:4
+	>=x11-libs/qt-svg-${PV}:4
+	>=x11-libs/qt-test-${PV}:4
+	>=x11-libs/qt-webkit-${PV}:4
+	>=x11-libs/qt-xmlpatterns-${PV}:4
 "
 
 pkg_postinst() {
 	echo
-	elog "Please note that this meta package is only provided for convenience."
-	elog "No packages should depend directly on this meta package, but on the"
-	elog "specific split Qt packages needed."
+	einfo "Please note that this meta package is only provided for convenience."
+	einfo "No packages should depend directly on this meta package, but on the"
+	einfo "specific split Qt packages needed."
 	echo
 }
diff --git a/x11-libs/qt-meta/qt-meta-4.8.ebuild b/x11-libs/qt-meta/qt-meta-4.8.ebuild
index a39bc4ed7abb..9db3b85ec880 100644
--- a/x11-libs/qt-meta/qt-meta-4.8.ebuild
+++ b/x11-libs/qt-meta/qt-meta-4.8.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-meta/qt-meta-4.8.ebuild,v 1.5 2012/05/12 09:53:07 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-meta/qt-meta-4.8.ebuild,v 1.6 2012/05/20 20:45:18 pesa Exp $
 
-EAPI=4
+EAPI=2
 
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
 HOMEPAGE="http://qt-project.org/ http://qt.nokia.com/"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="dbus kde opengl openvg qt3support"
 
 DEPEND=""