Removed alternative dependency and references to Qt metapackage, converted to EAPI=2

Package-Manager: portage-2.2_rc43/cvs/Linux x86_64

3 files changed, 22 insertions, 28 deletions

diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
index 6e6be09e7553..268aa54deda7 100644
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/qca
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.75 2009/08/29 17:55:30 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.76 2009/10/05 19:08:48 ayoy Exp $
+
+  05 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> qca-2.0.0-r2.ebuild:
+  Removed alternative dependency and references to Qt metapackage, converted
+  to EAPI=2
 
   29 Aug 2009; nixnut <nixnut@gentoo.org> qca-2.0.2-r2.ebuild:
   ppc stable #272865
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 90f3e6a4fccf..1cb109b873c8 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qca-1.0-fbsd.patch 753 RMD160 481eee7ad8e334f1551c00de7ac7f597694a92a2 SHA1 582f3259623ee82ec38a1a9e4391b22c2946c0ac SHA256 53a0257ecbf917741b41ab4bc50a1d9518cb1bd86f0be36dbf3a1c6ef1d5257c
 AUX qca-2.0.0-debug-same-pkgconfig-file.patch 1112 RMD160 a0bbc98447d7ddfa090bc20b404655c768f00947 SHA1 7c11cceb62d46094367d5cb81088d96d376bbdfe SHA256 5240f0853a3d918efe6ef861cdf1c5b0e611f165257d3e74479468de014d1883
 AUX qca-2.0.1-pcfilespath.patch 378 RMD160 5c2dd4ca13339bf6c0d5d4262f1d4d2df6516ffb SHA1 decdaf319a0f414d9ed91554cd4af46267612db2 SHA256 720178f24b39cb8411b0e85ee508ce0a592cd50610a5b48b5d104f0c5552f604
@@ -7,8 +10,15 @@ DIST qca-1.0.tar.bz2 30677 RMD160 129d8eeed68fb98e9cba94040b8f75b9f94c8a60 SHA1
 DIST qca-2.0.0.tar.bz2 5106520 RMD160 256ca518fea507d03b67c0f5d26ba2ac7b3db517 SHA1 5b896647426637e1974703f2950786746408c70b SHA256 2ed0d49300459ae1f2d138fc2e68ed7f92850065981032c96f2538e1878fc2d3
 DIST qca-2.0.2.tar.bz2 1937201 RMD160 18b0f497709f9700227644977946735d2ec3c623 SHA1 5a414c3296cd37d1ec34182be0d089c5073f55a8 SHA256 49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8
 EBUILD qca-1.0-r3.ebuild 1359 RMD160 ad5344c3ef85b7453f1d4898341aa0f03e3d19da SHA1 e9e6c30da0e0c550db21f09b937fbc9cdace2e86 SHA256 1d840266250e93113f82f4760e0a9ba7984147c2b5e8f9c1499078687fc35d8a
-EBUILD qca-2.0.0-r2.ebuild 2281 RMD160 d74baeee388c4416134da622cc5a6cfd260e6688 SHA1 ceda8e5d874857a8dedb385fa3745abe1c012693 SHA256 be026cbb13c25ebd5723c57cf6994671090b5d1c65b16a575fc378c0bdf0a6b3
+EBUILD qca-2.0.0-r2.ebuild 1612 RMD160 c04e67d01180835cade7e0227350b9d4792b80b3 SHA1 3c4c8177d08f2b430d2f8a2687d02a85cbbabd29 SHA256 d5200aac2fef8fafaae46af5719dab2db81f6711df33b155ab41b6d92c9eb27a
 EBUILD qca-2.0.2-r1.ebuild 1447 RMD160 e20c34b8f947ea963cf81fc86092178b88b32fc9 SHA1 0c15748577af74259b0f21e4b81ffff68fd9cf12 SHA256 a23981552704bb3ea77a55a58121c402f83a75b7b978d69566f6d034ff1190e2
 EBUILD qca-2.0.2-r2.ebuild 1450 RMD160 08e194ad9d1804d442e30b07867f2e29053ec667 SHA1 6348c61653642fd3ba070a4e92328b48f2d67220 SHA256 b94c0fe9263e9d40a5c06b3d300ec54516fe03b8ccbf6f1d5efe154fc348a604
-MISC ChangeLog 9116 RMD160 0dc575e24806dd5a15727c173f0a8adb1ebba9db SHA1 8898cdc69870a30cf8966c18ebfc0a2706eca724 SHA256 4d23fdcda1a2b0d1f533c4dd47a353075ed2fbeff3c25f591398b6f3bbc035ed
+MISC ChangeLog 9274 RMD160 b2f02c8bba1f38e8f7508201c3e856a84c1c9d1a SHA1 be52c24c963d487b7bcb9f69d3518f7dc02abeba SHA256 cb65589d8d37cb096bf1916f4d1d393ed225c09fc426c25de4f886b2333ce0b7
 MISC metadata.xml 192 RMD160 421d4665996ea38fdfc756e2da700603abe17ec7 SHA1 c32af4b790776c36b524e5f2e2dca587c9cd3351 SHA256 e585d77a075b30463ad28cc89374f9ef2876636bca95a23321b824e0122aa6fd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrKREkACgkQ+CZEqwt+F6btIgCbBcCyEoF9Wila2dbMfTBVq4UV
+WG0AoKDTlPGp73fRv7PbHk4OzJ4ia0bM
+=w20G
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/qca/qca-2.0.0-r2.ebuild b/app-crypt/qca/qca-2.0.0-r2.ebuild
index 7055befe552c..808de7ea665c 100644
--- a/app-crypt/qca/qca-2.0.0-r2.ebuild
+++ b/app-crypt/qca/qca-2.0.0-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild,v 1.18 2009/04/26 15:32:25 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild,v 1.19 2009/10/05 19:08:48 ayoy Exp $
 
-EAPI="1"
+EAPI="2"
 
 inherit eutils multilib qt4
 
@@ -17,31 +17,12 @@ IUSE="debug doc examples"
 RESTRICT="test"
 
 DEPEND="!<app-crypt/qca-1.0-r3
-	x11-libs/qt-core:4"
+	x11-libs/qt-core:4[debug?]"
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	if use debug; then
-		if has_version "<x11-libs/qt-4.4.0_alpha1:4" && ! built_with_use x11-libs/qt:4 debug; then
-			eerror "You are trying to compile ${PN} with USE=\"debug\""
-			eerror "while x11-libs/qt:4 is built without this particular flag."
-			die "Rebuild x11-libs/qt:4 with USE=\"debug\"."
-		elif has_version "x11-libs/qt-core:4" && ! built_with_use x11-libs/qt-core:4 debug; then
-			eerror "You are trying to compile ${PN} with USE=\"debug\""
-			eerror "while x11-libs/qt-core:4 is built without this particular flag."
-			die "Rebuild x11-libs/qt-core:4 with USE=\"debug\"."
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-debug-same-pkgconfig-file.patch"
-}
+PATCHES=( "${FILESDIR}/${P}-debug-same-pkgconfig-file.patch" )
 
-src_compile() {
+src_configure() {
 	_libdir=$(get_libdir)
 	local myconf
 	if use debug; then
@@ -65,7 +46,6 @@ src_compile() {
 		|| die "configure failed"
 
 	eqmake4 ${PN}.pro
-	emake || die "emake failed"
 }
 
 src_install() {