Version bump. Also, don't use the Qt built in split debug option as portage now supports it via make.conf

Package-Manager: portage-2.1.2.1

4 files changed, 265 insertions, 5 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 5889caa32118..0ec59c68dc44 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.415 2007/02/22 14:13:47 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.416 2007/03/08 13:58:45 caleb Exp $
+
+*qt-4.2.3 (08 Mar 2007)
+
+  08 Mar 2007; Caleb Tennis <caleb@gentoo.org> +qt-4.2.3.ebuild:
+  Version bump. Also, don't use the Qt built in split debug option as portage
+  now supports it via make.conf
 
   22 Feb 2007; Caleb Tennis <caleb@gentoo.org> -qt-4.2.1.ebuild:
   remove old version
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index e174d3bf1d75..d291e061b105 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -121,6 +121,7 @@ DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b2
 DIST qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200 RMD160 51e480e651261796622a0d824ad549fd5e90089a SHA1 2b82583f1e922d73af7b147f5f03ea7821861a09 SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18
 DIST qt-x11-opensource-src-4.1.4.tar.gz 32174985 RMD160 a7e8558f275751b1a6217827784c3b81f84d6d5f SHA1 7924011d7fcc0c873b952670e0dac2c56fc6f0f5 SHA256 1687e40065023469fa308d47db6158a529ee42e740e38cb5c89e6f20ee68e59c
 DIST qt-x11-opensource-src-4.2.2.tar.gz 37636491 RMD160 90d5f527e5f867cd8169f99634fe9e908339fc29 SHA1 8bee428d975f855ed02517763010002ca99715cc SHA256 e790d227fa7958f2b0c0b0facd8ca880190121ed2b9c99ca70643baf7a0cd24c
+DIST qt-x11-opensource-src-4.2.3.tar.gz 37635710 RMD160 06c9c3bd53dd6b96fc68a1dfe96882ac6927df25 SHA1 b988aab4fa1dcce8532c36bb63947a556076e8c8 SHA256 c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
 EBUILD qt-3.3.4-r8.ebuild 10491 RMD160 e6aa0743aa90a606385cbb263f5e3d0508229616 SHA1 03703f79f821ebf07cf4220d5368450099ebd36c SHA256 b71d5da031ccf8c06a93beb61b33e697363ecae268ab235cfeb3e811e75d03c6
 MD5 9cd4050cbf79528363ca2e0dbfbfd9fb qt-3.3.4-r8.ebuild 10491
 RMD160 e6aa0743aa90a606385cbb263f5e3d0508229616 qt-3.3.4-r8.ebuild 10491
@@ -145,10 +146,14 @@ EBUILD qt-4.2.2.ebuild 7691 RMD160 c22f499f93702a0000325da515c14f3d26c72175 SHA1
 MD5 fe911ce7afaeeb22c93d7b6b02a633cb qt-4.2.2.ebuild 7691
 RMD160 c22f499f93702a0000325da515c14f3d26c72175 qt-4.2.2.ebuild 7691
 SHA256 9a283ff88292c02772d2b5cd508d4c510ccfe318f09ab15f1179f77416138ae2 qt-4.2.2.ebuild 7691
-MISC ChangeLog 24714 RMD160 79be7a1bf78fa302ce6eeff0511fe29479ba8363 SHA1 5752954b8e2b131a8d63dc0a37114097359bc34f SHA256 ebd27bef4bd2bed220c4b5a8e3b3689d439c7d9ea53a95159fec10d54a8fe2f1
-MD5 9f3d3b66ca4310719dc1f1c95df5e64a ChangeLog 24714
-RMD160 79be7a1bf78fa302ce6eeff0511fe29479ba8363 ChangeLog 24714
-SHA256 ebd27bef4bd2bed220c4b5a8e3b3689d439c7d9ea53a95159fec10d54a8fe2f1 ChangeLog 24714
+EBUILD qt-4.2.3.ebuild 7699 RMD160 27a70efaa57f9d5eff3d38205a11b60df3034807 SHA1 44d1008fd8eabb0cc5e03bb301d88dade84a124f SHA256 a675cd447e7b4b2edb3eef719d022c08b6316341b2bff6ba250df8374ff59ed9
+MD5 371dc767bce4f830b97bc0155280eb95 qt-4.2.3.ebuild 7699
+RMD160 27a70efaa57f9d5eff3d38205a11b60df3034807 qt-4.2.3.ebuild 7699
+SHA256 a675cd447e7b4b2edb3eef719d022c08b6316341b2bff6ba250df8374ff59ed9 qt-4.2.3.ebuild 7699
+MISC ChangeLog 24915 RMD160 f176ffbdeac956fb3d40b9a10cdee12bc169f429 SHA1 2ec842d0fb8bb9d959a645585255debb5031ca8f SHA256 c0a5e9308bb786e9c8f96b885b0d9117b88defc1e616cf7aa1784162dcd8b8d9
+MD5 82bbdb3a79d2729890c56856d7189575 ChangeLog 24915
+RMD160 f176ffbdeac956fb3d40b9a10cdee12bc169f429 ChangeLog 24915
+SHA256 c0a5e9308bb786e9c8f96b885b0d9117b88defc1e616cf7aa1784162dcd8b8d9 ChangeLog 24915
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -171,3 +176,6 @@ SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/di
 MD5 521080f3e0b421ab5ad25f9dc25b69f1 files/digest-qt-4.2.2 289
 RMD160 6d2f65f407b6e455d477a31d49d969eeaf6db6da files/digest-qt-4.2.2 289
 SHA256 a5ce9efde5affef98446892de54ae4e5d8304554a9873eff9796c685e3c94d3e files/digest-qt-4.2.2 289
+MD5 2fe79b4d44373d71c88c550171f5cf12 files/digest-qt-4.2.3 289
+RMD160 f3ed6c568633503b4dae6c029c14e063b4f678ee files/digest-qt-4.2.3 289
+SHA256 963d86fa2780c337a6c499902231e24b14a6f849edb2870e9374cc89dfa8b147 files/digest-qt-4.2.3 289
diff --git a/x11-libs/qt/files/digest-qt-4.2.3 b/x11-libs/qt/files/digest-qt-4.2.3
new file mode 100644
index 000000000000..c9542fb218d2
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.2.3
@@ -0,0 +1,3 @@
+MD5 13f12bf58a32ebf15837fcd605cb3c99 qt-x11-opensource-src-4.2.3.tar.gz 37635710
+RMD160 06c9c3bd53dd6b96fc68a1dfe96882ac6927df25 qt-x11-opensource-src-4.2.3.tar.gz 37635710
+SHA256 c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b qt-x11-opensource-src-4.2.3.tar.gz 37635710
diff --git a/x11-libs/qt/qt-4.2.3.ebuild b/x11-libs/qt/qt-4.2.3.ebuild
new file mode 100644
index 000000000000..d1acf4ca5c31
--- /dev/null
+++ b/x11-libs/qt/qt-4.2.3.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.3.ebuild,v 1.1 2007/03/08 13:58:45 caleb Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+SRCTYPE="opensource-src"
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
+HOMEPAGE="http://www.trolltech.com/"
+
+SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
+
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE_INPUT_DEVICES="input_devices_wacom"
+
+IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt3support sqlite sqlite3 xinerama zlib ${IUSE_INPUT_DEVICES}"
+
+DEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXfont
+	x11-libs/libSM
+	x11-proto/xextproto
+	x11-proto/inputproto
+	dev-util/pkgconfig
+	xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
+	virtual/xft
+	>=media-libs/freetype-2
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	mng? ( >=media-libs/libmng-1.0.9 )
+	nas? ( >=media-libs/nas-1.5 )
+	odbc? ( dev-db/unixODBC )
+	mysql? ( virtual/mysql )
+	firebird? ( dev-db/firebird )
+	sqlite3? ( =dev-db/sqlite-3* )
+	sqlite? ( =dev-db/sqlite-2* )
+	opengl? ( virtual/opengl virtual/glu )
+	postgres? ( dev-db/libpq )
+	cups? ( net-print/cups )
+	zlib? ( sys-libs/zlib )
+	glib? ( dev-libs/glib )
+	dbus? ( >=sys-apps/dbus-1.0.2 )
+	input_devices_wacom? ( x11-drivers/linuxwacom )"
+
+pkg_setup() {
+	QTBASEDIR=/usr/$(get_libdir)/qt4
+	QTPREFIXDIR=/usr
+	QTBINDIR=/usr/bin
+	QTLIBDIR=/usr/$(get_libdir)/qt4
+	QTPCDIR=/usr/$(get_libdir)/pkgconfig
+	QTDATADIR=/usr/share/qt4
+	QTDOCDIR=/usr/share/doc/${PF}
+	QTHEADERDIR=/usr/include/qt4
+	QTPLUGINDIR=${QTLIBDIR}/plugins
+	QTSYSCONFDIR=/etc/qt4
+	QTTRANSDIR=${QTDATADIR}/translations
+	QTEXAMPLESDIR=${QTDATADIR}/examples
+	QTDEMOSDIR=${QTDATADIR}/demos
+
+	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.
+	local spec
+
+	case ${CHOST} in
+		*-freebsd*|*-dragonfly*)
+			spec="freebsd" ;;
+		*-openbsd*)
+			spec="openbsd" ;;
+		*-netbsd*)
+			spec="netbsd" ;;
+		*-darwin*)
+			spec="darwin" ;;
+		*-linux-*|*-linux)
+			spec="linux" ;;
+		*)
+			die "Unknown CHOST, no platform choosed."
+	esac
+
+	CXX=$(tc-getCXX)
+	if [[ ${CXX/g++/} != ${CXX} ]]; then
+		spec="${spec}-g++"
+	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
+		spec="${spec}-icc"
+	else
+		die "Unknown compiler ${CXX}."
+	fi
+
+	echo "${spec}"
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+#	epatch ${FILESDIR}/qt4-parisc-linux.diff
+	epatch ${FILESDIR}/qt-4.1.4-sparc.patch
+	epatch ${FILESDIR}/qt4-sqlite-configure.patch
+
+	cd ${S}/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
+	replace-flags -O3 -O2
+
+	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
+
+	# Do not link with -rpath. See bug #75181.
+	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" qmake.conf
+
+	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
+	sed -i -e "s:X11R6/::" qmake.conf
+
+	# The trolls moved the definitions of the above stuff for g++, so we need to edit those files
+	# separately as well.
+	cd ${S}/mkspecs/common
+
+	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}:" \
+		g++.conf
+
+	# Do not link with -rpath. See bug #75181.
+	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf
+
+	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
+	sed -i -e "s:X11R6/::" linux.conf
+
+	cd ${S}
+
+}
+
+src_compile() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
+
+	# Disable visibility explicitly if gcc version isn't 4
+	if [[ "$(gcc-major-version)" != "4" ]]; then
+		myconf="${myconf} -no-reduce-exports"
+	fi
+
+	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 -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
+	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 sqlite3	&& myconf="${myconf} -plugin-sql-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite"
+	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite2" || myconf="${myconf} -no-sql-sqlite2"
+	use odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
+
+	use dbus	&& myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus"
+	use glib	&& myconf="${myconf} -glib" || myconf="${myconf} -no-glib"
+	use qt3support		&& myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support"
+
+	use pch		&& myconf="${myconf} -pch"
+
+	use input_devices_wacom	&& myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet"
+
+	myconf="${myconf} -xrender -xrandr -xkb -xshape -sm"
+
+	if ! use examples; then
+		myconf="${myconf} -nomake examples"
+	fi
+
+
+	./configure -stl -verbose -largefile -confirm-license \
+		-platform ${PLATFORM} -xplatform ${PLATFORM} \
+		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
+		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
+		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
+		-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf} || die
+
+	emake all || die
+}
+
+src_install() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	make INSTALL_ROOT=${D} install_subtargets || die
+	make INSTALL_ROOT=${D} install_qmake || die
+	make INSTALL_ROOT=${D} install_mkspecs || die
+
+	if use doc; then
+		make INSTALL_ROOT=${D} install_htmldocs || die
+	fi
+
+	# Install the translations.  This may get use flagged later somehow
+	make INSTALL_ROOT=${D} install_translations || die
+
+	keepdir "${QTSYSCONFDIR}"
+
+	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}/*.pc
+
+	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
+	sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${D}/${QTLIBDIR}/*.pc
+
+	# Move .pc files into the pkgconfig directory
+	dodir ${QTPCDIR}
+	mv ${D}/${QTLIBDIR}/*.pc ${D}/${QTPCDIR}
+
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:/usr/${libdir}/qt4"
+	done
+
+	cat > "${T}/44qt4" << EOF
+LDPATH=${libdirs:1}
+QMAKESPEC=$(qt_mkspecs_dir)
+EOF
+	doenvd "${T}/44qt4"
+}