newer snapshot, more ebuild changes

Package-Manager: portage-2.0.51.22-r1

5 files changed, 33 insertions, 29 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 7043f7e12581..b51434329aa0 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.226 2005/06/14 18:48:48 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.227 2005/06/16 15:52:53 caleb Exp $
+
+*qt-4.0.0_rc1-r2 (16 Jun 2005)
+
+  16 Jun 2005; Caleb Tennis <caleb@gentoo.org> -qt-4.0.0_rc1-r1.ebuild,
+  +qt-4.0.0_rc1-r2.ebuild:
+  newer snapshot, more ebuild changes
 
 *qt-4.0.0_rc1-r1 (14 Jun 2005)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index bd92ca681d61..51e8e11a11c7 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,13 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c70df8ab5924eceef30f1a659840bc40 qt-4.0.0_rc1-r1.ebuild 6427
 MD5 32ad8d8bffefcdf4d7885199b7c55890 qt-4.0.0_beta2-r3.ebuild 5983
 MD5 4f8e5fad7ce7529afc9f924f618ae0f0 qt-3.3.4-r3.ebuild 8950
 MD5 88875c77c2482de25169850cfc19faf5 qt-3.3.3-r1.ebuild 7987
 MD5 98c2c897d6bb5fd3f7c6af49cd8decb7 qt-3.3.4-r2.ebuild 8565
+MD5 75ce8582791a0d174df19da9843fafb9 qt-4.0.0_rc1-r2.ebuild 6711
 MD5 e5e1f28d1973386abc7d593bd7330d62 qt-3.3.4-r4.ebuild 9306
-MD5 69933beab25922542e51c88c0f4d0001 ChangeLog 37652
+MD5 a5ac51c2e026de2007ab0beb7181198e ChangeLog 37822
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 d9f916370f1950762a23b8f04dd22232 qt-4.0.0_rc1.ebuild 6125
 MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
@@ -15,7 +12,7 @@ MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
 MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
-MD5 11541658104ec9ed59f7b6036a8e3942 files/digest-qt-4.0.0_rc1-r1 104
+MD5 efa1381655dae2c9afb77ac85fa6ef09 files/digest-qt-4.0.0_rc1-r2 104
 MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
 MD5 99d57476c4605ca076db91f8f086a326 files/digest-qt-4.0.0_beta2-r3 100
 MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
@@ -41,10 +38,3 @@ MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inve
 MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
 MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
 MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4b2r3_nomkdir.patch 866
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCrz4YI1lqEGTUzyQRAh91AKDDr6/HyZ6ybvu8mmaNRMRXG4HDnwCeJXEA
-HJfDLQnfg1X0NYirtlehY2A=
-=ANE6
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/digest-qt-4.0.0_rc1-r1 b/x11-libs/qt/files/digest-qt-4.0.0_rc1-r1
deleted file mode 100644
index a4330e3ca120..000000000000
--- a/x11-libs/qt/files/digest-qt-4.0.0_rc1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 18a556be23f6f51ccb2c3eb1839775a3 qt-x11-opensource-desktop-4.0.0-snapshot-20050614.tar.bz2 15645144
diff --git a/x11-libs/qt/files/digest-qt-4.0.0_rc1-r2 b/x11-libs/qt/files/digest-qt-4.0.0_rc1-r2
new file mode 100644
index 000000000000..74ac15e2b867
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.0.0_rc1-r2
@@ -0,0 +1 @@
+MD5 225f36f33cffc54772bc6282a322676d qt-x11-opensource-desktop-4.0.0-snapshot-20050616.tar.bz2 15587263
diff --git a/x11-libs/qt/qt-4.0.0_rc1-r1.ebuild b/x11-libs/qt/qt-4.0.0_rc1-r2.ebuild
index 9db557b29d9d..77341bcd6592 100644
--- a/x11-libs/qt/qt-4.0.0_rc1-r1.ebuild
+++ b/x11-libs/qt/qt-4.0.0_rc1-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_rc1-r1.ebuild,v 1.2 2005/06/14 20:28:40 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_rc1-r2.ebuild,v 1.1 2005/06/16 15:52:53 caleb Exp $
 
 inherit eutils flag-o-matic
 
 SRCTYPE="opensource-desktop"
-SNAPSHOT="20050614"
+SNAPSHOT="20050616"
 #SNAPSHOT=""
 DESCRIPTION="QT version ${PV}"
 HOMEPAGE="http://www.trolltech.com/"
@@ -35,15 +35,17 @@ DEPEND="virtual/x11 virtual/xft >=media-libs/freetype-2
 
 pkg_setup() {
 	QTBASEDIR=/usr/$(get_libdir)/qt4
-	QTPREFIXDIR=${S}
+	QTPREFIXDIR=/usr/$(get_libdir)/qt4
 	QTBINDIR=/usr/bin
 	QTLIBDIR=/usr/$(get_libdir)/qt4
-	QTDOCDIR=/usr/share/qt4/doc
 	QTDATADIR=/usr/share/qt4
+	QTDOCDIR=${QTDATADIR}/doc
 	QTHEADERDIR=/usr/include/qt4
-	QTPLUGINDIR=/usr/$(get_libdir)/qt4/plugins
+	QTPLUGINDIR=${QTLIBDIR}/plugins
 	QTSYSCONFDIR=/etc/qt4
-	QTTRANSDIR=/usr/share/qt4/translations
+	QTTRANSDIR=${QTDATADIR}/translations
+	QTEXAMPLESDIR=${QTDATADIR}/examples
+	QTDEMOSDIR=${QTDATADIR}/demos
 
 	PLATFORM=$(qt_mkspecs_dir)
 }
@@ -78,6 +80,7 @@ src_unpack() {
 	# Don't let the user go too overboard with flags.  If you really want to, uncomment
 	# out the line below and give 'er a whirl.
 	strip-flags
+	replace-flags -O3 -O2
 
 	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
 		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
@@ -127,9 +130,13 @@ src_compile() {
 		-platform ${PLATFORM} -xplatform ${PLATFORM} \
 		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
 		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
-		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} ${myconf} || die
+		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
+		-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf} || die
 
 	emake sub-tools-all-ordered || die
+	if use examples; then
+		emake sub-examples-all-ordered || die
+	fi
 }
 
 src_install() {
@@ -143,20 +150,21 @@ src_install() {
 
 	make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die
 	if use examples; then
-		dodir ${QTDATADIR}/examples
-		cp -a ${S}/examples/* ${D}/${QTDATADIR}/examples
-		dodir ${QTDATADIR}/demos
-		cp -a ${S}/demos/* ${D}/${QTDATADIR}/demos
+		make INSTALL_ROOT=${D} sub-examples-install_subtargets
+		# dodir ${QTDATADIR}/examples
+		# cp -a ${S}/examples/* ${D}/${QTDATADIR}/examples
+		# dodir ${QTDATADIR}/demos
+		# cp -a ${S}/demos/* ${D}/${QTDATADIR}/demos
 	fi
 
 	make INSTALL_ROOT=${D} install_qmake || die
 	make INSTALL_ROOT=${D} install_mkspecs || die
 
 	# The QtDesigner and QtAssistant header files aren't installed..not sure why
-	cp -a ${S}/include/QtDesigner ${D}/${QTHEADERDIR}/QtDesigner
-	rm -rf ${D}/${QTHEADERDIR}/QtDesigner/private
+	#cp -a ${S}/include/QtDesigner ${D}/${QTHEADERDIR}/QtDesigner
+	#rm -rf ${D}/${QTHEADERDIR}/QtDesigner/private
 
-	cp -a ${S}/include/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant
+	#cp -a ${S}/include/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant
 
 	# Fix symlink
 	cd ${D}/${QTDATADIR}/mkspecs