Version bump.

Package-Manager: portage-2.1.4.4

3 files changed, 297 insertions, 2 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index d3cbffed9b67..857937c31ac2 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.543 2008/07/26 21:01:44 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.544 2008/07/26 21:03:04 carlo Exp $
+
+*qt-4.3.5 (26 Jul 2008)
+
+  26 Jul 2008; Carsten Lohrke <carlo@gentoo.org> +qt-4.3.5.ebuild:
+  Version bump.
 
 *qt-3.3.8b (26 Jul 2008)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 0ed0d8650b05..dcb0853e85c6 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -33,10 +33,12 @@ DIST qt-x11-free-3.3.8b.tar.gz 17313883 RMD160 4e3cbd9c5d4719b5d33e961e6595d7b21
 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.3.3.tar.gz 42341802 RMD160 410daca03b6802ba5cc6662219c2ba7a190bd292 SHA1 77d00e2438efa793f6c16c54b64c8ba440ee3228 SHA256 89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570
 DIST qt-x11-opensource-src-4.3.4.tar.gz 43988710 RMD160 eb081e599e61bcaa126981aecbe2db480be35eca SHA1 639f6469d5aa07c51c2aa6795f8e3de3aab8cd25 SHA256 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2
+DIST qt-x11-opensource-src-4.3.5.tar.gz 42719000 RMD160 75e6d142e9945299a8c525577c6687a69ae260b6 SHA1 96a0974014c9a872ab1ad44728a2637d6e7ce0b4 SHA256 8a1bb9c2862be70c859a53610e053b7998d0a1eb3968d4636dfcc39402c04349
 EBUILD qt-3.3.8-r4.ebuild 11750 RMD160 c915200401f99e7ba12bc0520f7b887eca9de211 SHA1 c334e7b1deb529d50f247c454d1a9c64a6da67d5 SHA256 10abb17a9d0caae073a9fd5ab7ebaccdce3273b4fd9a6cda2db4b822e3ebb476
 EBUILD qt-3.3.8b.ebuild 10484 RMD160 46703b1bbe55ce60ecef0a0a260f93ffad097994 SHA1 9e5ad511f1e47ab2655c217cea31e55aae58af32 SHA256 d249465e2f6b67e93273297848fa29a70becde58f7b28c862883f559e76d6dd7
 EBUILD qt-4.3.3.ebuild 8735 RMD160 d88fef9502378541a5a507cdd5df9f0ede7c1562 SHA1 38c376e15aa7622028dc4ed328b46ef64fb21245 SHA256 5c7448a5f680a3f9b3a3241530e867294779062bcf96a506004b7a4253ac3683
 EBUILD qt-4.3.4-r1.ebuild 9048 RMD160 660d5dc591cc6e3eeeed055dd9bab3567e8ad4f9 SHA1 39b2ffcff5bfedc3967f7b232d3ef2be72882c9c SHA256 bd7004cecfbea02cf9f1c5c75bc375e252f71e68519226fa2580ad5e72cdbff4
+EBUILD qt-4.3.5.ebuild 9108 RMD160 3a332a97ea60655038c563daa11a13914f3d9b56 SHA1 303f583a522d517ddae59080d7f647ac5a85f0a7 SHA256 04612137ebfe904a72295c23113ca67c64fa5495888b7bd1bf6bea28e676d627
 EBUILD qt-4.4.0.ebuild 789 RMD160 b889401d8bf84836e16019b16cc2a52d7181e027 SHA1 861a558ad077d3d93c0ce94c81231b2b435e1314 SHA256 0ef086ccf20921d18de73ec6394f86899dc6fd6fcbe782a925be86838324b30d
-MISC ChangeLog 41928 RMD160 4c5a88f5ea68c9bb09fac204382f98bb18091b00 SHA1 fc55818dc5d7777430b622227c3b212d7d96753d SHA256 792b82ff93b75c0d57d5a03438953e3872850905f2556bcd0ccc4de762d36b1d
+MISC ChangeLog 42037 RMD160 287792f867cbae32483ccbc5942a1d4389ff5dbd SHA1 6f8bbbfc656440d362846e51035b953ac1a53363 SHA256 042c841a39d9f35f809e714fb0d63088722af60973d342efc2dac52d4fd59a7e
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
diff --git a/x11-libs/qt/qt-4.3.5.ebuild b/x11-libs/qt/qt-4.3.5.ebuild
new file mode 100644
index 000000000000..287e9e138e12
--- /dev/null
+++ b/x11-libs/qt/qt-4.3.5.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.5.ebuild,v 1.1 2008/07/26 21:03:04 carlo Exp $
+
+EAPI="1"
+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 GPL-3 Trolltech-GPL-exception-1.2 Trolltech-GPL-exception-addendum-1.2 )"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~hppa ~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 ssl tiff
+xinerama zlib ${IUSE_INPUT_DEVICES}"
+
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXfont
+	x11-libs/libSM
+	!x11-libs/qt-core
+	xinerama? ( x11-libs/libXinerama )
+	media-libs/fontconfig
+	>=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? ( virtual/postgresql-base )
+	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-libs/libXi x11-drivers/linuxwacom )"
+
+DEPEND="${RDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/inputproto
+	dev-util/pkgconfig"
+
+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() {
+	local flag="$1"
+	local feature="$1"
+	local enableval=
+
+	[[ -n $2 ]] && feature=$2
+	[[ -n $3 ]] && enableval="-$3"
+
+	useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}"
+	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.2.3-hppa-ldcw-fix.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
+
+	if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
+		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
+		append-flags -fno-stack-protector
+	fi
+
+	# Bug 178652
+	if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
+		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
+		append-flags -fno-gcse
+	fi
+
+	# Anti-aliasing rules are broken in qt-4.3*, causing random runtime failures
+	# in Qt programs. bug 213411.
+	append-flags -fno-strict-aliasing
+
+	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}:" \
+		-e "/CONFIG/s:$: nostrip:" \
+		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
+
+	# Add a switch that will attempt to use recent binutils to reduce relocations.  Should be harmless for other
+	# cases.  From bug #178535
+	myconf="${myconf} -reduce-relocations"
+
+	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"
+
+	myconf="${myconf} $(qt_use gif gif qt) $(qt_use png libpng system)"
+	myconf="${myconf} $(qt_use jpeg libjpeg system) $(qt_use tiff libtiff system)"
+	myconf="${myconf} $(qt_use zlib zlib system) $(qt_use mng libmng system)"
+
+	use debug	&& myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
+
+	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
+
+	myconf="-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}"
+
+	echo ./configure ${myconf}
+	./configure ${myconf} || die
+
+	emake all || die
+}
+
+src_install() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	emake INSTALL_ROOT="${D}" install_subtargets || die
+	emake INSTALL_ROOT="${D}" install_qmake || die
+	emake INSTALL_ROOT="${D}" install_mkspecs || die
+
+	if use doc; then
+		emake INSTALL_ROOT="${D}" install_htmldocs || die
+	fi
+
+	# Install the translations.	 This may get use flagged later somehow
+	emake 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}/pkgconfig/*.pc
+
+	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
+	sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.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}
+EOF
+	doenvd "${T}/44qt4"
+}