private-headers is gone from Qt-4.8.0 hence we make it mandatory only when applicable

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

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 0ea4548abb897f2e52bdd1f616a25686c3c9d09c..039177f4d6ec7ea08655f7f2b802944609761adf 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.101 2011/12/27 21:45:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.102 2011/12/31 12:14:39 hwoarang Exp $
+
+  31 Dec 2011; Markos Chandras <hwoarang@gentoo.org> qt-creator-2.4.0.ebuild:
+  private-headers is gone from Qt-4.8.0 hence we make it mandatory only when
+  applicable
 
   27 Dec 2011; Markus Meier <maekke@gentoo.org> qt-creator-2.3.1.ebuild:
   x86 stable, bug #378753

diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index a432239606a26dafa9ed0bfd4820982be470cd07..0e6979244d1e4042c974bdc55a5b8660b2f71dce 100644 (file)
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX docs_gen.patch 603 RMD160 9711ddb1c59e8ddd1ad17ba34f89c8e4c89b4504 SHA1 83cd745baabd1545a1079c59edef6279b254074a SHA256 7428155e6f09201d60f308c3934153aa5fa5b25296a96d86dad80354dc8e3b93
 AUX qt-creator-1.3.1-qt47.patch 415 RMD160 c1006214dd399baf8c996e4d51801c8a8c544ccb SHA1 3434e72a399808c77e34722ad5c69e2cbc9f6a62 SHA256 9dc1ec786ed9d329d81228f031e94b867165947b8af9ed16082e1c69a830343f
@@ -11,13 +11,23 @@ DIST qt-creator-2.4.0-src.tar.gz 26105130 RMD160 c8be1e24e100b856a8f78b52848ad70
 EBUILD qt-creator-2.1.0.ebuild 4366 RMD160 7bb6643a50343ba236fff12a4c43a44ab109a317 SHA1 bfe69de1ae21e45ec2144a8ea75a558aa34fbe26 SHA256 9e07242bfddf41eb585118cefb41650c8b18d34378c7be263e775acfa50cf70f
 EBUILD qt-creator-2.2.1.ebuild 3927 RMD160 08e20c15e7a9b5f7858f63034392cf45b4c269ce SHA1 d2ca1e76a4410dd61d3ccc2e89d8a72b189aa08c SHA256 ffd9d9e2a05b4f25419848ab76b25d264fb08bc018b5c61b95cdea0cd329b9da
 EBUILD qt-creator-2.3.1.ebuild 5412 RMD160 6e3b8aa2202fc12906ae719b32ab0d2d4b6a7511 SHA1 84b44670fa726265229afab3cdadd6d68190bbfb SHA256 beaad6d1aa7b9f2a1e3895960568153894def2f7dc62e0bc524af0e152f31073
-EBUILD qt-creator-2.4.0.ebuild 5351 RMD160 c76a987c23f98dbfbd273efedb46a5ec538b95dc SHA1 259ec121d4c89d2b7e86a82cc46afeea0624b53d SHA256 5ee034cebc6f6ec76da26c2ff0f53eca2759e4694bfa225fefec38331563a92e
-MISC ChangeLog 15821 RMD160 f53c21a7444a1f58b659a4b215906c6a5c62f090 SHA1 979f1df13fca956c976b14f8914b8a5dba7f0ed9 SHA256 e4a16f197f14be4ab45ef495a6ff55049b42d2052552209bc482d8895bc00357
+EBUILD qt-creator-2.4.0.ebuild 5363 RMD160 ef5c3f8673687449b05e0c8bb0961b70ce7043b2 SHA1 1828be36fabe560d7166576a42f3f1134a8c8b9b SHA256 faed766f4d12e8b1023f37385191b8e71137f61cbd3fda7dddcdcd402a96903d
+MISC ChangeLog 15992 RMD160 9d5a36bf6a65c3c77d9a4487a2614fab01835b25 SHA1 8742790791f139b8950aee20af402fe9ffface75 SHA256 baad926668a50569359ad356315df727faa9487e310a38c81d5c39ceb90495c3
 MISC metadata.xml 1182 RMD160 a3d34a17f3bc9f9e78828e001b5039ce0b513914 SHA1 d5e53ca653574a332a644abe72021372ef10cf0a SHA256 151feaa82fdd12a111412f4223cc29312d76fa35f8a039df46d764f090b7b2ab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk76PNEACgkQkKaRLQcq0GLU+wCfa+pZQVu88l18o0MfNN/n/s1B
-32cAoJy7VAEq2R0fosslKJvN4rtjEHgY
-=xoEe
+iQIcBAEBCgAGBQJO/vyJAAoJEPqDWhW0r/LCx/YQAK/BkDhjK2dAuVUQLThIZbhe
+4kTOlQ1Gf2tRf1DCkh2W2pQrzesf8n+4QDifHehbVQx+efyjAeBDChk3YJtHPeGt
+fxaaWpMhXTkVUlrFoTKHiYYtGzAi+RBNnV4Todi5VyDR0QLgF5Ni54YdS7Uh5JGI
+RiUhDrgjso6MpzxoKIbtn/7hfru8JdNTzGlKkSF8Gs9vMEwVU7EVI5gktXnwVtdv
+/rT4tMGZFTeSs4+BQ9A1OaVgC4tmJ0AZZYdnJCXN5DJoqfp8kpkT4FmHQeZeZHVF
+FN0BpC/2A0swORUps0bmEGKVkzk+llrv6v2jMpjNpLtqMi5emba1afLkP6mP5DwT
+cTKnBDS6H1x0ky6S7CJgY3ON+jY9LB3SLsuVFULGavVWF5gpBdYg6hkMbnFiGCeZ
+y4PDrrzl5MOe/PfCwLQKIOn45yYE8/u7gLEJQ4pulSwAeuwTl5gNM08WpWQrhrNJ
+V6MeW4cRN1wTXxQOFMhPLk4UA9zgnsh88+g+BrzPnAQCY4DB39V1Nss1ettVixbP
+G9Fdj1APU26TT+VVJJkHXrLFqwoocxmohLIcjGVapR2yftDPeIfn6EyG9LPzjO/E
+HVZXBFYEqOBXTSQ9jJerBOTWewhLOkQREl+hbLCjJYphpbvrVSMNNph5g1Z4JhZb
+E4ewDPjiQlJDZr1ZM/6W
+=JPib
 -----END PGP SIGNATURE-----

diff --git a/dev-util/qt-creator/qt-creator-2.4.0.ebuild b/dev-util/qt-creator/qt-creator-2.4.0.ebuild
index 03e20b8d514c4b9f6ebb29c479faec0e2170ad48..9093b5379824459d82540f7ca54eab53446beca4 100644 (file)
--- a/dev-util/qt-creator/qt-creator-2.4.0.ebuild
+++ b/dev-util/qt-creator/qt-creator-2.4.0.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.4.0.ebuild,v 1.1 2011/12/23 20:56:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.4.0.ebuild,v 1.2 2011/12/31 12:14:39 hwoarang Exp $
 
 EAPI="4"
 LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
@@ -26,10 +26,10 @@ CDEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]
        debug? ( >=x11-libs/qt-test-${QTVER} )
        !qml? ( >=x11-libs/qt-gui-${QTVER} )
        qml? (
-               >=x11-libs/qt-declarative-${QTVER}[private-headers]
-               >=x11-libs/qt-core-${QTVER}[private-headers]
-               >=x11-libs/qt-gui-${QTVER}[private-headers]
-               >=x11-libs/qt-script-${QTVER}[private-headers]
+               >=x11-libs/qt-declarative-${QTVER}[private-headers(+)]
+               >=x11-libs/qt-core-${QTVER}[private-headers(+)]
+               >=x11-libs/qt-gui-${QTVER}[private-headers(+)]
+               >=x11-libs/qt-script-${QTVER}[private-headers(+)]
        )
        qtscript? ( >=x11-libs/qt-script-${QTVER} )
        !botan-bundled? ( =dev-libs/botan-1.8* )"