Refactor dependency variables and introduce pkgconfig dependency

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

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 7128a9e50a73ee281d5c14135c2f7eff65c7d037..b5dc9b44258e1050f5f626f7abf7f3a26fd1c92c 100644 (file)
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/qt-creator
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.90 2011/09/21 10:21:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.91 2011/09/24 09:09:24 hwoarang Exp $
+
+  24 Sep 2011; Markos Chandras <hwoarang@gentoo.org>
+  qt-creator-2.3.0-r1.ebuild:
+  Refactor dependency variables and introduce pkgconfig dependency
 
 *qt-creator-2.3.0-r1 (21 Sep 2011)
 

diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index 4bf82b15ffb8f5921a52f1398765abd06532ee4d..95c9336d5e374b8b5fb5aa73c48cfccffe620a22 100644 (file)
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -14,24 +14,24 @@ EBUILD qt-creator-1.3.1-r2.ebuild 3594 RMD160 c1813c51ae773ea77fc39b6e0fc4edac9a
 EBUILD qt-creator-2.1.0.ebuild 4358 RMD160 92eb6b55c89cf4fb90c01b7b6059c5b672aab8a9 SHA1 7a3eea0e523ddd28033649b04b181bd5ca822c38 SHA256 2c54c3eda44c41a5c51e7eb11d5bad5e269d474fe71c7670d849435231158b0b
 EBUILD qt-creator-2.2.0-r1.ebuild 3924 RMD160 72bab0d56e26ab107ddcf2da996aca9a5a7f0f45 SHA1 80b7a06a3dd6030db0f922f33d74f17700042cc8 SHA256 dbf5a06de37a0c3eb53046194cf7d44f5ad19c97b732e3aae3510c96009486c1
 EBUILD qt-creator-2.2.1.ebuild 3921 RMD160 6defad916e217b880ba6c0e02fc933737c13f82f SHA1 672aa8b5a94411389dcdbb0f12209c65c949706b SHA256 005d09049b744bda5247f650bc36639c659e87b6f97f1412f0828ac0a3e8a8f7
-EBUILD qt-creator-2.3.0-r1.ebuild 5348 RMD160 e53ab8fdc3ebe05cfd9c07c6a354013b98d1f02d SHA1 95d2bf63bfdbce6098836ebceb40d96c486e76e5 SHA256 7714dbfd057c1766f692251a57ede254397fc4ea1e921b251b06a37bcd0fca4a
+EBUILD qt-creator-2.3.0-r1.ebuild 5412 RMD160 a8bafa7d7f076e80c17c07fd1711efb3e457a68a SHA1 df8123b4507e6c2866503a5845c8f01e78f89a82 SHA256 9c5d805b229b674a272695cd8767cb96cfc8496f4c995aa6f5b09ac5e332b9be
 EBUILD qt-creator-2.3.0.ebuild 4169 RMD160 a144421f85e1aa0fa51094da69fbbc6db9975d53 SHA1 746ca8b8a5972dc6d676b9dd6d093c951056a3ae SHA256 13469831ac43199d9703bd09e6b5b6cd38b949e28d6140763b1ba322c5438f9a
-MISC ChangeLog 13991 RMD160 29498897d946d43636e2e56295014a5d04f03035 SHA1 0ee39c28b62b0265f121d45fda6995b7e48fa2e2 SHA256 3262f9c027bbe2393800129d75398c07de4a4ca222e04ee13c4943e2e7e84e7a
+MISC ChangeLog 14142 RMD160 7d412aac2b6394224e2e8b8c6330c98bde5d0012 SHA1 1d3f5f0621239e132bec74268c568dc82e10c9e3 SHA256 6328d298748f639daf36ffb354b20be621816adca9f12d4b738761e909065c14
 MISC metadata.xml 1182 RMD160 a3d34a17f3bc9f9e78828e001b5039ce0b513914 SHA1 d5e53ca653574a332a644abe72021372ef10cf0a SHA256 151feaa82fdd12a111412f4223cc29312d76fa35f8a039df46d764f090b7b2ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOebqAAAoJEPqDWhW0r/LCOjYP/i1ROFIYYA7HKsf2EKflh+Ey
-j7FrlyQrtZmOU33zFG8jb/4ey4rCJ6aaIAoueoe4iCIHZPaHSaEHVqT79M4imwaN
-i/Rf11Q9fmbDlVSOxsRSESTk5V2Wm+4QLk6X+eouuAE7OtaFH/Auxt7NhnE0FiyU
-AOZFz7pQLcB5uOqDLv9Mc23V8r/B7DncXKW1IjCX3JCY+iSw5pDDeGvi0ZsFxuPX
-mPthH4HSa2MUpE9JpnpnfeWtRwyCXgQThb2qILqGVb5A6nI3tEF07D+X9jloB3tD
-1XtbOpdgQpFWa9hFz2lCCrqlmG/lPKIoE8l2Bt/xWu2dSq2Un/jN+PMuQLjvKgOk
-EitQB4JbVZ2V90DDf38YUgI3AacvZwqptaZxOXrvkciABMaBtvY/TWB4Q9WPpBd/
-epptkjIxtO70HlN1F0lPSq+ti4kt4Zc5D3NcsMd+cbZxwsK4xgyYCBf9RB7Dp4s6
-tYh4CMTozA2ydBvMlASk7/UHIGHAFbX0KSnd5UB2Tylcpi0QsDTqGeE+j4se6Eia
-YG02smK25nYtGpHcsx2meBh2NN/ga3wWMl3/cER4C1ngXq1sBLlnqTS/2xB7IjOT
-vmJYliN0MZ4paau7BeSxE9hIdg4QiFKHvJYBCkt0O90lJl2IGlbHwKvfQ9VAkIAP
-FqQV1wNEHMKW+ON5eQtW
-=tePX
+iQIcBAEBCgAGBQJOfZ5JAAoJEPqDWhW0r/LCfhcP/j4Bam9CGhiiu23PTHwlhQgi
+gn9ZQPONlVThZfQ1F2rISjlvjex7LReObOfxptDPv+m1t35mn9ZhzeX8pcYUDhrp
+AMefYd+vEk8yColOHnS4MPYIY0RJGOmWxT0TuCHVTHFAtrqqgrNH+Y5vgzt4/ueK
+FHTuki9yFhPulI9BJWCnaWYK6QkUb0Ug5RUGzepy3yJz6C+HEcVkdNCf+2rZn8uo
+Qc+c4lSXoqpZVReCpath/kO8JkQYmk4YFR7yeS5PhldomvL6mYNVU34kkNkRqj4x
+06VJo0mG4xnvOqVXBuo7xi6fFQKR+Puo0rla9X8w/HZApchiccHS0i25xeoWwOas
+EEkMVlXLKARpBxS9zqquW4uaFxOumbEHruSYUBzKBfeVYLN3ExCI1uFA8cudOzWK
+U1ZGsvU++1eM9tRfFoR3M0C0vINg+0L1orJ/rB7umRPPZAfDfxQKVKy+y6bPH9Wh
+63TWKXt8H9BbAjoVnjZk3YKBnO13U2NTTQqry8Cz8IVNKislBeS+9bLaGphxrwir
+S3wpppMzBJtagKScD0gRwbYlhS8fa69+JnFP68N/H3WjYQD7WbEAMKL24MqnJ3si
+wsF+MOLoK4FYiz3sspV32dtyEsGuX9KG1ereysM0L8w8eGthv21819jXccUbWm5+
+gvEdSIS0tv5iMe39Hc9z
+=mRET
 -----END PGP SIGNATURE-----

diff --git a/dev-util/qt-creator/qt-creator-2.3.0-r1.ebuild b/dev-util/qt-creator/qt-creator-2.3.0-r1.ebuild
index a76e475374235217ed1c57df919f3e1dfb81624e..2541f1bf4b446e252f04b0fbc32c9f2f25406b11 100644 (file)
--- a/dev-util/qt-creator/qt-creator-2.3.0-r1.ebuild
+++ b/dev-util/qt-creator/qt-creator-2.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.3.0-r1.ebuild,v 1.1 2011/09/21 10:21:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.3.0-r1.ebuild,v 1.2 2011/09/24 09:09:24 hwoarang Exp $
 
 EAPI="4"
 LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bazaar bineditor bookmarks +botan-bundled +cmake cvs debug doc examples fakevim git
        mercurial perforce +qml qtscript rss subversion"
 QTVER="4.7.4:4"
-DEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]
+CDEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]
        >=x11-libs/qt-sql-${QTVER}
        >=x11-libs/qt-svg-${QTVER}
        debug? ( >=x11-libs/qt-test-${QTVER} )
@@ -34,7 +34,10 @@ DEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]
        qtscript? ( >=x11-libs/qt-script-${QTVER} )
        !botan-bundled? ( =dev-libs/botan-1.8* )"
 
-RDEPEND="${DEPEND}
+DEPEND= "${CDEPEND}
+       !botan-bundled? ( dev-util/pkgconfig )"
+
+RDEPEND="${CDEPEND}
        bazaar? ( dev-vcs/bzr )
        cmake? ( dev-util/cmake )
        cvs? ( dev-vcs/cvs )