Version bump qt-core to 4.4.0_rc1. Thanks to Bo Andresen and Bernd Steinhauser.

Package-Manager: portage-2.1.5_rc2

3 files changed, 53 insertions, 18 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 77af17131f00..30def2a99036 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.3 2008/03/05 23:23:52 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.4 2008/04/10 13:39:48 ingmar Exp $
+
+  10 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-core-4.4.0_beta1.ebuild, +qt-core-4.4.0_rc1.ebuild:
+  Version bump qt-core to 4.4.0_rc1. Thanks to Bo Andresen and Bernd
+  Steinhauser.
 
   05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   -qt-core-4.4.0_rc1.ebuild:
diff --git a/x11-libs/qt-core/qt-core-4.4.0_beta1.ebuild b/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild
index 7b3c19941dda..071aed6dbdd1 100644
--- a/x11-libs/qt-core/qt-core-4.4.0_beta1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_beta1.ebuild,v 1.1 2008/03/05 23:07:18 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild,v 1.13 2008/04/10 13:39:48 ingmar Exp $
 
 EAPI="1"
 inherit qt4-build
@@ -21,13 +21,29 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 QT4_TARGET_DIRECTORIES="
-src/tools/moc
-src/tools/rcc
-src/tools/uic
-src/corelib
-src/xml
-src/network
-src/plugins/codecs"
+src/tools/moc/
+src/tools/rcc/
+src/tools/uic/
+src/corelib/
+src/xml/
+src/network/
+src/plugins/codecs/"
+QT4_EXTRACT_DIRECTORIES="
+include/Qt/
+include/QtCore/
+include/QtNetwork/
+include/QtScript/
+include/QtXml/
+src/plugins/plugins.pro
+src/plugins/qpluginbase.pri
+src/src.pro
+src/3rdparty/des/
+src/3rdparty/harfbuzz/
+src/3rdparty/md4/
+src/3rdparty/md5/
+src/3rdparty/sha1/
+src/script/
+translations/"
 
 pkg_setup() {
 	qt4-build_pkg_setup
@@ -74,6 +90,14 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	use doc && QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES}
+		doc/
+		tools/qdoc3/"
+
+	qt4-build_src_unpack
+}
+
 src_compile() {
 	unset QMAKESPEC
 	local myconf
@@ -85,9 +109,14 @@ src_compile() {
 
 	myconf="${myconf} -no-xkb -no-tablet -no-fontconfig -no-xrender -no-xrandr
 		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-qdbus -iconv -no-cups -no-nis -no-gif -no-libpng
+		-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
 		-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
-		-no-freetype -no-libtiff  -no-accessibility -no-fontconfig -no-opengl"
+		-no-freetype -no-libtiff  -no-accessibility -no-fontconfig -no-opengl
+		-no-svg"
+
+	if ! use doc; then
+		myconf="${myconf} -nomake docs"
+	fi
 
 	qt4-build_src_compile
 }
diff --git a/x11-libs/qt-test/Manifest b/x11-libs/qt-test/Manifest
index b7dc4d8c1654..848077f7bf81 100644
--- a/x11-libs/qt-test/Manifest
+++ b/x11-libs/qt-test/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST qt-x11-opensource-src-4.4.0-beta1.tar.bz2 95157168 RMD160 fa4105d34e4295e47a76890f6739cf27f99e86a6 SHA1 9e0e2a8902ea0977024c7a64d59a2155386cf7d6 SHA256 3cc2c33956bf10a5019b1d275f4cc2c93326d3c1dfd992d5b4460858f929c38c
-EBUILD qt-test-4.4.0_beta1.ebuild 970 RMD160 85a992dfbc0013a7e3ea5e2dd8288a0fa5441b19 SHA1 b61d7b5fa31564f0d8143fbcaf0b6476fb2117f5 SHA256 38da12e69a6f04e6e87673af1ca6b86ee34a964b4e16ce078d8b6c568a8f5910
-MISC ChangeLog 720 RMD160 3d9a6e805ccef4eeee086bb6f8d3b193815e7545 SHA1 10d2e04eac826c49961c92a622a999d7e159f710 SHA256 c5862e0f05029d4ac1cc60cedad5d0bf7020b6cd72008ea84634b59da4474c1e
+DIST qt-x11-opensource-src-4.4.0-rc1-headers.tar.bz2 2526180 RMD160 2658570a226d3f505cd4a2a3660b8f0427d43995 SHA1 24bb371329af5d82a7f2016c845b9e79c4e569d5 SHA256 d446a922da30e8834bdaa27f40b78c55f150e1c98c937cf8a403f26bbfc3e750
+DIST qt-x11-opensource-src-4.4.0-rc1.tar.bz2 97480693 RMD160 909613dd1acb9dd6138c494e8523ae33047cfa4d SHA1 1d9245c1333aaafc2dda7d138101d300318fada5 SHA256 b6634ca2bc6eb38986f46432161ee0cf94476d5c6a3a3bb300ce82f613596cdc
+EBUILD qt-test-4.4.0_rc1.ebuild 975 RMD160 c80dcf8b57b6d07205fe213ab75d4a91b9b2c21e SHA1 8d0748fbf5f4083650f61902086af7fe8e37d268 SHA256 9c58c2b5ebb3ca15ebd2670acba3dbd41a6c8b5b0a1c1c9d649c43cd9481ef5a
+MISC ChangeLog 915 RMD160 3ccfb895a371b3e323a70a9ef18d9d0c1adafc65 SHA1 bd2d7fe1f5dc6c1642734c4f23f7558885d9d4f1 SHA256 473d7e4bb8bfe47be272d58797d59657ebec1ad4e392a773ce3f37668dd78881
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFHzywCB18eXLOpYdkRAkPrAJ0aDF95bVHIw3Mww6rxvydhBQy4SACghSpL
-LY3ZVtjvPDl/W2XjP7exYU8=
-=u7o7
+iEYEARECAAYFAkf+GZkACgkQB18eXLOpYdke5QCdF8mhLiWqx7i3E9xw0Lt+11q4
+sqIAn0HqQnq/1rhfjndOclnU0fDfoUhN
+=U4Vu
 -----END PGP SIGNATURE-----