More fixes

(Portage version: 2.0.51.22-r1)

6 files changed, 228 insertions, 4 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 240f14841821..7043f7e12581 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.225 2005/06/10 12:56:57 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.226 2005/06/14 18:48:48 caleb Exp $
+
+*qt-4.0.0_rc1-r1 (14 Jun 2005)
+
+  14 Jun 2005; Caleb Tennis <caleb@gentoo.org> +files/qt4rc1_nomkdir.patch,
+  qt-4.0.0_rc1.ebuild, +qt-4.0.0_rc1-r1.ebuild:
+  Newest snapshot
 
 *qt-4.0.0_rc1 (10 Jun 2005)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index fb763f2df5b2..730f7f94ac68 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,3 +1,4 @@
+MD5 d48f51c0b227cf84a234f285ea7e7d58 qt-4.0.0_rc1-r1.ebuild 6422
 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
@@ -5,12 +6,13 @@ MD5 98c2c897d6bb5fd3f7c6af49cd8decb7 qt-3.3.4-r2.ebuild 8565
 MD5 e5e1f28d1973386abc7d593bd7330d62 qt-3.3.4-r4.ebuild 9306
 MD5 11d47711796ef09fe379bab3879852f9 ChangeLog 37477
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 8f2547c202bd0bba58375eafa8d53697 qt-4.0.0_rc1.ebuild 6120
+MD5 9f4a6418e8c9c6544b062e1e406b19e7 qt-4.0.0_rc1.ebuild 6125
 MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
 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 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
@@ -28,6 +30,7 @@ MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
 MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
 MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch 1540
 MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
+MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4rc1_nomkdir.patch 866
 MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
 MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
 MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
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
new file mode 100644
index 000000000000..a4330e3ca120
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.0.0_rc1-r1
@@ -0,0 +1 @@
+MD5 18a556be23f6f51ccb2c3eb1839775a3 qt-x11-opensource-desktop-4.0.0-snapshot-20050614.tar.bz2 15645144
diff --git a/x11-libs/qt/files/qt4rc1_nomkdir.patch b/x11-libs/qt/files/qt4rc1_nomkdir.patch
new file mode 100644
index 000000000000..97ba71085e5a
--- /dev/null
+++ b/x11-libs/qt/files/qt4rc1_nomkdir.patch
@@ -0,0 +1,19 @@
+--- configure.orig	2005-06-03 13:38:58.316152040 -0500
++++ configure	2005-06-03 13:39:36.673320864 -0500
+@@ -1071,16 +1071,6 @@
+ [ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS=$QT_INSTALL_PREFIX/translations #default
+ QT_INSTALL_TRANSLATIONS=`$relpath/config.tests/unix/makeabs "$QT_INSTALL_TRANSLATIONS"`
+ 
+-#settings
+-if [ "$PLATFORM_MAC" = "yes" ]; then
+-   [ -z "$QT_INSTALL_SETTINGS" ] && QT_INSTALL_SETTINGS=/Library/Preferences/Qt #default
+-else
+-   [ -z "$QT_INSTALL_SETTINGS" ] && QT_INSTALL_SETTINGS=/etc/xdg #default
+-fi
+-if mkdir -p "$QT_INSTALL_SETTINGS" >/dev/null 2>&1; then
+-  QT_INSTALL_SETTINGS=`(cd "$QT_INSTALL_SETTINGS"; /bin/pwd)` #absolute
+-fi
+-
+ #examples
+ [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES=$QT_INSTALL_PREFIX/examples #default
+ QT_INSTALL_EXAMPLES=`$relpath/config.tests/unix/makeabs "$QT_INSTALL_EXAMPLES"`
diff --git a/x11-libs/qt/qt-4.0.0_rc1-r1.ebuild b/x11-libs/qt/qt-4.0.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..be688b1b5831
--- /dev/null
+++ b/x11-libs/qt/qt-4.0.0_rc1-r1.ebuild
@@ -0,0 +1,195 @@
+# 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.1 2005/06/14 18:48:48 caleb Exp $
+
+inherit eutils flag-o-matic
+
+SRCTYPE="opensource-desktop"
+SNAPSHOT="20050614"
+#SNAPSHOT=""
+DESCRIPTION="QT version ${PV}"
+HOMEPAGE="http://www.trolltech.com/"
+
+SRC_URI="ftp://ftp.trolltech.com/qt/snapshots/qt-x11-${SRCTYPE}-${PV/_rc1/}-snapshot-${SNAPSHOT}.tar.bz2"
+#SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV/_rc1/-rc1}.tar.bz2"
+#S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV/_rc1/-rc1}
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV/_rc1/}-snapshot-${SNAPSHOT}
+
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+SLOT="4"
+KEYWORDS="-*"
+IUSE="accessibility cups debug doc examples firebird gif ipv6 jpeg mng mysql nas nis odbc opengl postgres png sqlite xinerama zlib"
+
+DEPEND="virtual/x11 virtual/xft >=media-libs/freetype-2
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	mng? ( media-libs/libmng )
+	nas? ( >=media-libs/nas-1.5 )
+	odbc? ( dev-db/unixODBC )
+	mysql? ( dev-db/mysql )
+	firebird? ( dev-db/firebird )
+	opengl? ( virtual/opengl virtual/glu )
+	postgres? ( dev-db/postgresql )
+	cups? ( net-print/cups )
+	zlib? ( sys-libs/zlib )"
+
+pkg_setup() {
+	QTBASEDIR=/usr/$(get_libdir)/qt4
+	QTPREFIXDIR=${S}
+	QTBINDIR=/usr/bin
+	QTLIBDIR=/usr/$(get_libdir)/qt4
+	QTDOCDIR=/usr/share/qt4/doc
+	QTDATADIR=/usr/share/qt4
+	QTHEADERDIR=/usr/include/qt4
+	QTPLUGINDIR=/usr/$(get_libdir)/qt4/plugins
+	QTSYSCONFDIR=/etc/qt4
+	QTTRANSDIR=/usr/share/qt4/translations
+
+	PLATFORM=$(qt_mkspecs_dir)
+}
+
+qt_use() {
+	useq ${1} && echo "-${1}" || echo "-no-${1}"
+	return 0
+}
+
+qt_mkspecs_dir() {
+	# Allows us to define which mkspecs dir we want to use.  Currently we only use
+	# linux-g++ or linux-g++-64, but others could be used for various platforms.
+
+	if [[ $(get_libdir) == "lib" ]]; then
+		echo "linux-g++"
+	else
+		echo "linux-g++-64"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	cp configure configure.orig
+	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
+
+	cd mkspecs/$(qt_mkspecs_dir)
+	# set c/xxflags and ldflags
+	
+	# 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
+
+	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
+		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
+		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
+		qmake.conf
+	cd ${S}
+
+	epatch ${FILESDIR}/qt4-rpath.patch
+	epatch ${FILESDIR}/qt4rc1_nomkdir.patch
+
+	sed -i -e "s:CFG_REDUCE_EXPORTS=auto:CFG_REDUCE_EXPORTS=no:" configure
+}
+
+src_compile() {
+	export SYSCONF=${D}${QTPREFIXDIR}/etc/settings
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	# Fixes for 89704
+	export LC_ALL=C
+	export LANG=C
+
+	# Let's just allow writing to these directories during Qt emerge
+	# as it makes Qt much happier.
+	# addwrite "${QTBASE}/etc/settings"
+	# addwrite "$HOME/.qt"
+
+	myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)"
+	myconf="${myconf} $(qt_use opengl) $(qt_use nis)"
+
+	use nas		&& myconf="${myconf} -system-nas-sound"
+	use gif		&& myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
+	use png		&& myconf="${myconf} -system-libpng" || myconf="${myconf} -qt-libpng"
+	use jpeg	&& myconf="${myconf} -system-libjpeg" || myconf="${myconf} -qt-libjpeg"
+	use debug	&& myconf="${myconf} -debug-and-release" || myconf="${myconf} -release"
+	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
+
+	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
+	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/pgsql" || myconf="${myconf} -no-sql-psql"
+	use firebird	&& myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
+	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
+	use odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
+
+	myconf="${myconf} -tablet -xrender -xrandr -xkb -xshape -sm"
+
+	./configure -stl -verbose -largefile \
+		-platform ${PLATFORM} -xplatform ${PLATFORM} \
+		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
+		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
+		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} ${myconf} || die
+
+	emake sub-tools-all-ordered || die
+}
+
+src_install() {
+	export SYSCONF=${D}${QTPREFIXDIR}/etc/settings
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	# make INSTALL_ROOT=${D} sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered || die
+	# make INSTALL_ROOT=${D} install_qmake sub-tools-install_subtargets-ordered || die
+	# Using install_qmake forces lots of other things to build.  Bypass it for now.
+
+	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
+	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/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant
+
+	# Fix symlink
+	cd ${D}/${QTDATADIR}/mkspecs
+	rm default
+	ln -s $(qt_mkspecs_dir) default
+	cd ${S}
+
+	mkdir -p ${D}/${QTSYSCONFDIR}
+
+	if use doc; then
+		make INSTALL_ROOT=${D} install_htmldocs || die
+	fi
+
+	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la
+	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.prl
+	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
+	sed -i -e "s:${S}:${QTBASEDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
+
+	# Don't need to install stray linguist files
+	rm -rf ${D}/${DATADIR}/phrasebooks/linguist
+
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:/usr/${libdir}/qt4"
+	done
+
+	mkdir -p ${D}/etc/env.d
+
+	cat > ${D}/etc/env.d/44qt4 << EOF
+PATH=${QTBINDIR}
+ROOTPATH=${QTBINDIR}
+LDPATH=${libdirs:1}
+QMAKESPEC=$(qt_mkspecs_dir)
+EOF
+}
diff --git a/x11-libs/qt/qt-4.0.0_rc1.ebuild b/x11-libs/qt/qt-4.0.0_rc1.ebuild
index 75b7b6fd66e6..aed2ea224b4d 100644
--- a/x11-libs/qt/qt-4.0.0_rc1.ebuild
+++ b/x11-libs/qt/qt-4.0.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.2 2005/06/13 15:21:49 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_rc1.ebuild,v 1.3 2005/06/14 18:48:48 caleb Exp $
 
 inherit eutils flag-o-matic
 
@@ -159,7 +159,7 @@ src_install() {
 	ln -s $(qt_mkspecs_dir) default
 	cd ${S}
 
-	mkdir -p ${QTSYSCONFDIR}
+	mkdir -p ${D}/${QTSYSCONFDIR}
 
 	if use doc; then
 		make INSTALL_ROOT=${D} install_htmldocs || die