Adding 4.3.0 final

Package-Manager: portage-2.1.2.7

4 files changed, 274 insertions, 5 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 7680d3dd47f2..07b49ce6fce0 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # 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.444 2007/05/30 11:49:19 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.445 2007/05/31 11:51:46 caleb Exp $
+
+*qt-4.3.0 (31 May 2007)
+
+  31 May 2007; Caleb Tennis <caleb@gentoo.org> +qt-4.3.0.ebuild:
+  Adding 4.3.0 final
 
   30 May 2007; Caleb Tennis <caleb@gentoo.org> qt-3.3.8-r2.ebuild:
   Add firebird include dir
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 62275d9077f3..71fc7cafa96b 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -115,6 +115,7 @@ DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66
 DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 SHA1 37b59bb27d62562fcfbf9e32bd74001583060970 SHA256 67555c1655f394f43dd67293df6e8acf40f842f14faa392ed6752e0ddf6ff1a6
 DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918
 DIST qt-x11-opensource-src-4.2.3.tar.gz 37635710 RMD160 06c9c3bd53dd6b96fc68a1dfe96882ac6927df25 SHA1 b988aab4fa1dcce8532c36bb63947a556076e8c8 SHA256 c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
+DIST qt-x11-opensource-src-4.3.0.tar.gz 41955515 RMD160 2106dd8dda7a5b16305ba701e33c17e9349fddc3 SHA1 e433cf5482f24e81fa0b83bd1ed9a9c0abeb6ea4 SHA256 abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
 DIST qt-x11-opensource-src-4.3.0beta.tar.gz 41041032 RMD160 8097e68f14858477602312c1477a6c5d0aa9752b SHA1 4727bf6f31b03045aa435be649d6efac59f241df SHA256 ac16defbafa67c8059eefabcd5a410b13c77ae4676bf108cfc456eb54ebc53e8
 DIST qt-x11-opensource-src-4.3.0rc1.tar.gz 41785034 RMD160 9c40c0c2ec02b8e5138b421ce3cef5aa252458b4 SHA1 990a7bc1fe92b0b1660d40e0e01f15439b2b0cc3 SHA256 dbddb4c85bff3732db5eb55b26ea557e7cb410c84dd01aa171cddcf8ae15d9fe
 EBUILD qt-3.3.4-r8.ebuild 10438 RMD160 e7f16971106ca4acf97dd1a4da2296a7adaf80a0 SHA1 cf7fe930d6028e803c89df65b915f25e03226e32 SHA256 4edbdcf7a9260686fa3de1597757100d0f6c7cbbf4546873d6e4bf472b0c77df
@@ -129,6 +130,10 @@ EBUILD qt-4.2.3-r1.ebuild 7850 RMD160 cfcb81faeeef55a7535db93575ace364e47fb55d S
 MD5 d777b5aa90c29c6782cdf808ee849827 qt-4.2.3-r1.ebuild 7850
 RMD160 cfcb81faeeef55a7535db93575ace364e47fb55d qt-4.2.3-r1.ebuild 7850
 SHA256 fa69ac9233cc181186428710edcbcbc03b9509f2c45187558b47d5464fb40ae8 qt-4.2.3-r1.ebuild 7850
+EBUILD qt-4.3.0.ebuild 8161 RMD160 4a5926a2261292b99b52c8ee0b631786a13d4ce8 SHA1 8a9b5501b96a242c3cb64f2cfae2b1f2d5938700 SHA256 81186632563a19cf4022dd4f05e8cc6ae4a61b723d3b031f72359b865ef489fc
+MD5 2e28252c2374bd74ba5d4ddf436aaab4 qt-4.3.0.ebuild 8161
+RMD160 4a5926a2261292b99b52c8ee0b631786a13d4ce8 qt-4.3.0.ebuild 8161
+SHA256 81186632563a19cf4022dd4f05e8cc6ae4a61b723d3b031f72359b865ef489fc qt-4.3.0.ebuild 8161
 EBUILD qt-4.3.0_beta1.ebuild 8041 RMD160 0e1b6ccc0c915516997e7a729ae671cf5a759d3d SHA1 83e10c3185773e32e84b75cf441fd4657122037a SHA256 36dee62d0bfbd6874e9d901f4a96aa19c3169812e5fcded342b7e1c00b7ab132
 MD5 36bcfb4b8fec9946fc564c5548d96741 qt-4.3.0_beta1.ebuild 8041
 RMD160 0e1b6ccc0c915516997e7a729ae671cf5a759d3d qt-4.3.0_beta1.ebuild 8041
@@ -137,10 +142,10 @@ EBUILD qt-4.3.0_rc1.ebuild 8285 RMD160 13d69f3e44ccb2e166aa475ebaa29962297c47b1
 MD5 cae5ac1eae42856f84091b691acd0f4e qt-4.3.0_rc1.ebuild 8285
 RMD160 13d69f3e44ccb2e166aa475ebaa29962297c47b1 qt-4.3.0_rc1.ebuild 8285
 SHA256 71dbcdf4dc534f96c530c895655f4d7e7f7bf730b9dd79069511b86243fe7385 qt-4.3.0_rc1.ebuild 8285
-MISC ChangeLog 29160 RMD160 4dbfe51d1786803fb004bdf1ccaf8d352e879815 SHA1 ee36015b3ec6d2da7a414e9a86ac10cef40e3460 SHA256 27c9f7c5c078f2dfd9008e79aa47e5a8e4bb89240293ae3172cbe62cc2b47623
-MD5 8889d1dc4fcc1e57b941b1508619a5bc ChangeLog 29160
-RMD160 4dbfe51d1786803fb004bdf1ccaf8d352e879815 ChangeLog 29160
-SHA256 27c9f7c5c078f2dfd9008e79aa47e5a8e4bb89240293ae3172cbe62cc2b47623 ChangeLog 29160
+MISC ChangeLog 29272 RMD160 23e3595aabb6b2bb81934301dd38079928b2fdb2 SHA1 3ef75fdeb1a73f285c58639f3483cd74f617b1f0 SHA256 6446fa25303ef741c1b9e389959cb1a17551f71dcf093358860710ce0be36f88
+MD5 453bd557be8616a9d45bd6d36723df82 ChangeLog 29272
+RMD160 23e3595aabb6b2bb81934301dd38079928b2fdb2 ChangeLog 29272
+SHA256 6446fa25303ef741c1b9e389959cb1a17551f71dcf093358860710ce0be36f88 ChangeLog 29272
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -154,6 +159,9 @@ SHA256 eae58d862519afc74261a63ab18ed1b5a72f0d6e33895cf10a6ee916b2ddb5d5 files/di
 MD5 2fe79b4d44373d71c88c550171f5cf12 files/digest-qt-4.2.3-r1 289
 RMD160 f3ed6c568633503b4dae6c029c14e063b4f678ee files/digest-qt-4.2.3-r1 289
 SHA256 963d86fa2780c337a6c499902231e24b14a6f849edb2870e9374cc89dfa8b147 files/digest-qt-4.2.3-r1 289
+MD5 05b5810e7294f4c2b36c1baf6ec434b9 files/digest-qt-4.3.0 289
+RMD160 4941b905c8bc924967401226882e1003b7ebca32 files/digest-qt-4.3.0 289
+SHA256 d690f3feb8a1a5b623ab75eb2cf2e91338fd01d5a0e386282d9b549c4af1daf9 files/digest-qt-4.3.0 289
 MD5 bec05d0ea71cba5eb4a6999f2f9da34a files/digest-qt-4.3.0_beta1 301
 RMD160 6c8ffe21711bccf820b1c259da47f56ab97c5b40 files/digest-qt-4.3.0_beta1 301
 SHA256 cd964ceace88ed3fe59f20aacbf1dbb359f13a16669bbe853275b427a4c8a4f1 files/digest-qt-4.3.0_beta1 301
diff --git a/x11-libs/qt/files/digest-qt-4.3.0 b/x11-libs/qt/files/digest-qt-4.3.0
new file mode 100644
index 000000000000..1f47068a30ba
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.3.0
@@ -0,0 +1,3 @@
+MD5 8012acea71b35c18247bd92c4721589d qt-x11-opensource-src-4.3.0.tar.gz 41955515
+RMD160 2106dd8dda7a5b16305ba701e33c17e9349fddc3 qt-x11-opensource-src-4.3.0.tar.gz 41955515
+SHA256 abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 qt-x11-opensource-src-4.3.0.tar.gz 41955515
diff --git a/x11-libs/qt/qt-4.3.0.ebuild b/x11-libs/qt/qt-4.3.0.ebuild
new file mode 100644
index 000000000000..beeeadcf7482
--- /dev/null
+++ b/x11-libs/qt/qt-4.3.0.ebuild
@@ -0,0 +1,253 @@
+# 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.3.0.ebuild,v 1.1 2007/05/31 11:51:46 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="~amd64 ~x86"
+
+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 ssl tiff 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 )
+	tiff? ( media-libs/tiff )
+	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 )
+	ssl? ( dev-libs/openssl )
+	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}/qt-4.1.4-sparc.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=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
+		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
+		-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}/qmake
+
+	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
+	-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" Makefile.unix
+
+	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 tiff	&& myconf="${myconf} -system-libtiff" || myconf="${myconf} -no-libtiff"
+	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 -I/opt/firebird/include" || 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 ssl		&& myconf="${myconf} -openssl" || myconf="${myconf} -no-openssl"
+
+	use pch		&& myconf="${myconf} -pch" || myconf="${myconf} -no-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} -no-rpath \
+		-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}/pkgconfig/*.pc ${D}/${QTPCDIR}
+
+	# Install .desktop files, from bug #174033
+	insinto /usr/share/applications
+	doins ${FILESDIR}/qt4/*.desktop
+
+	# 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"
+}