Readding 4.0.1 so sparc will be happy :)

(Portage version: 2.1.2_pre1)

5 files changed, 207 insertions, 5 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 8d4aa9bff4d5..16b6264cee03 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.349 2006/09/20 18:47:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.350 2006/09/22 17:42:59 caleb Exp $
+
+*qt-4.0.1 (22 Sep 2006)
+
+  22 Sep 2006; Caleb Tennis <caleb@gentoo.org> qt-3.3.6-r1.ebuild,
+  qt-3.3.6-r2.ebuild, +qt-4.0.1.ebuild:
+  Readding 4.0.1 so sparc will be happy :)
+
+  22 Sep 2006; Caleb Tennis <caleb@gentoo.org> qt-3.3.6-r1.ebuild,
+  qt-3.3.6-r2.ebuild:
+  Fix icc compiler, bug #148211
 
 *qt-3.3.6-r2 (20 Sep 2006)
 
diff --git a/x11-libs/qt/files/digest-qt-4.0.1 b/x11-libs/qt/files/digest-qt-4.0.1
new file mode 100644
index 000000000000..40b192924350
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.0.1
@@ -0,0 +1,3 @@
+MD5 2db4a4d797d37d0605b776420327503a qt-x11-opensource-src-4.0.1.tar.gz 20141717
+RMD160 8a53a22c08ca5a31194bf5bc69cf86b7193dc95a qt-x11-opensource-src-4.0.1.tar.gz 20141717
+SHA256 f52ff20671848bbfe34f5db493a60c1ef4e914b268237cba040418f31628dad6 qt-x11-opensource-src-4.0.1.tar.gz 20141717
diff --git a/x11-libs/qt/qt-3.3.6-r1.ebuild b/x11-libs/qt/qt-3.3.6-r1.ebuild
index 8abeffd48c02..c787c7246272 100644
--- a/x11-libs/qt/qt-3.3.6-r1.ebuild
+++ b/x11-libs/qt/qt-3.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6-r1.ebuild,v 1.12 2006/08/23 12:39:16 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6-r1.ebuild,v 1.13 2006/09/22 17:42:59 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -68,7 +68,7 @@ pkg_setup() {
 	CXX=$(tc-getCXX)
 	if [[ ${CXX/g++/} != ${CXX} ]]; then
 		PLATCXX="g++"
-	elif [[ ${CXX/icc/} != ${CXX} ]]; then
+	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
 		PLATCXX="icc"
 	else
 		die "Unknown compiler ${CXX}."
diff --git a/x11-libs/qt/qt-3.3.6-r2.ebuild b/x11-libs/qt/qt-3.3.6-r2.ebuild
index 80cf688c86cb..ac8a9050aca6 100644
--- a/x11-libs/qt/qt-3.3.6-r2.ebuild
+++ b/x11-libs/qt/qt-3.3.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6-r2.ebuild,v 1.1 2006/09/20 18:47:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6-r2.ebuild,v 1.2 2006/09/22 17:42:59 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -69,7 +69,7 @@ pkg_setup() {
 	if [[ ${CXX/g++/} != ${CXX} ]]; then
 		PLATCXX="g++"
 	elif [[ ${CXX/icc/} != ${CXX} ]]; then
-		PLATCXX="icc"
+		PLATCXX="icpc"
 	else
 		die "Unknown compiler ${CXX}."
 	fi
diff --git a/x11-libs/qt/qt-4.0.1.ebuild b/x11-libs/qt/qt-4.0.1.ebuild
new file mode 100644
index 000000000000..167b33a12d7b
--- /dev/null
+++ b/x11-libs/qt/qt-4.0.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.1.ebuild,v 1.18 2006/09/22 17:42:59 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/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
+
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+SLOT="4"
+KEYWORDS="~sparc"
+IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib"
+
+DEPEND="|| ( ( x11-libs/libXrandr
+			x11-libs/libXcursor
+			x11-libs/libXi
+			x11-libs/libXfont
+			x11-libs/libSM
+			x11-proto/xextproto
+			x11-proto/inputproto
+			xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
+		)
+		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=/usr/$(get_libdir)/qt4
+	QTBINDIR=/usr/bin
+	QTLIBDIR=/usr/$(get_libdir)/qt4
+	QTDATADIR=/usr/share/doc/${PF}
+	QTDOCDIR=${QTDATADIR}/doc
+	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.  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}
+
+	sed -i -e 's:read acceptance:acceptance=yes:' 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
+	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
+	cd ${S}
+
+	epatch ${FILESDIR}/qt4-nomkdir.patch
+
+	if [[ "$(gcc-major-version)" == "4" ]]; then
+		einfo "Visibility support: auto"
+	else
+		einfo "Visibility support: disabled"
+		sed -i -e "s:CFG_REDUCE_EXPORTS=auto:CFG_REDUCE_EXPORTS=no:" configure
+	fi
+}
+
+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)"
+
+	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} \
+		-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() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die
+
+	if use examples; then
+		make INSTALL_ROOT=${D} sub-examples-install_subtargets || die
+		make INSTALL_ROOT=${D} sub-demos-install_subtargets || die
+	fi
+
+	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
+
+	# The QtAssistant header files aren't installed..not sure why
+	cp -pPR ${S}/include/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant
+
+	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
+
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:/usr/${libdir}/qt4"
+	done
+
+	cat > "${T}/44qt4" << EOF
+PATH=${QTBINDIR}
+ROOTPATH=${QTBINDIR}
+LDPATH=${libdirs:1}
+QMAKESPEC=$(qt_mkspecs_dir)
+EOF
+	doenvd "${T}/44qt4"
+}