Readding a masked 4.2.1 version that support dbus, since it will be unmasked somewhat soon

Package-Manager: portage-2.1.2_rc1-r1

4 files changed, 252 insertions, 5 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 3c95675e8264..b06cc67b86ea 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.386 2006/11/07 12:54:45 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.387 2006/11/09 15:01:06 caleb Exp $
+
+*qt-4.2.1-r1 (09 Nov 2006)
+
+  09 Nov 2006; Caleb Tennis <caleb@gentoo.org> +qt-4.2.1-r1.ebuild:
+  Readding a masked 4.2.1 version that support dbus, since it will be unmasked
+  somewhat soon
 
   07 Nov 2006; Caleb Tennis <caleb@gentoo.org> qt-4.2.1.ebuild:
   Fix pkgconfig files
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 106c2ce7e11c..eecb073d35c9 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -132,14 +132,18 @@ EBUILD qt-4.1.4-r2.ebuild 6847 RMD160 8525b11f90d6f4faa20d712fc7d977e84a9c7999 S
 MD5 9aa16bc9eba1a97600f040fa47afc568 qt-4.1.4-r2.ebuild 6847
 RMD160 8525b11f90d6f4faa20d712fc7d977e84a9c7999 qt-4.1.4-r2.ebuild 6847
 SHA256 8f442105c43eb4d7902497b762461d6712611d0be0df6336bb1837010366762e qt-4.1.4-r2.ebuild 6847
+EBUILD qt-4.2.1-r1.ebuild 7126 RMD160 bbaaa7345464179abb3957ecb3b3a0e43601d70b SHA1 25e1cf22378ed25caffb830d738790058a0fccd2 SHA256 8d01eac2322c378814bcc12ea9d72c8291b551b06d51c2c80b807cf18ccae9a1
+MD5 0542a48a3e003da26aeddaa85a34ac42 qt-4.2.1-r1.ebuild 7126
+RMD160 bbaaa7345464179abb3957ecb3b3a0e43601d70b qt-4.2.1-r1.ebuild 7126
+SHA256 8d01eac2322c378814bcc12ea9d72c8291b551b06d51c2c80b807cf18ccae9a1 qt-4.2.1-r1.ebuild 7126
 EBUILD qt-4.2.1.ebuild 7916 RMD160 435660dcadde727a12b9c4a8fc7d524520243312 SHA1 ce954730a0880982755676d97a7927259f60bdb0 SHA256 34746505591ccd20b953ef30cbb16ace07550719f655960c039b45f52a234498
 MD5 9470099e942dc638eb925480cd583de3 qt-4.2.1.ebuild 7916
 RMD160 435660dcadde727a12b9c4a8fc7d524520243312 qt-4.2.1.ebuild 7916
 SHA256 34746505591ccd20b953ef30cbb16ace07550719f655960c039b45f52a234498 qt-4.2.1.ebuild 7916
-MISC ChangeLog 20512 RMD160 95991eecf34a95a3d3e6598cce2caadc38e876e1 SHA1 e0732e1ed88453a65d347230cadac1861d5ae3d7 SHA256 11d674e4a108a6ffb9f5bebe448d06c0ca0acd773b13b0e006341ab091fd84a9
-MD5 eef7064b17751c2cf0d62c2a333dd952 ChangeLog 20512
-RMD160 95991eecf34a95a3d3e6598cce2caadc38e876e1 ChangeLog 20512
-SHA256 11d674e4a108a6ffb9f5bebe448d06c0ca0acd773b13b0e006341ab091fd84a9 ChangeLog 20512
+MISC ChangeLog 20704 RMD160 7523801b1664f7cf81f1f798ad2a8277b1dad3d8 SHA1 16d8c1d519cc1ef07dd14744c35617256275b269 SHA256 f657da29ee060b9891ee06c4e39b122dcbf1f22f65075e02dc1b9da4e834bae2
+MD5 f0bfaabe083db643d73428866bfda861 ChangeLog 20704
+RMD160 7523801b1664f7cf81f1f798ad2a8277b1dad3d8 ChangeLog 20704
+SHA256 f657da29ee060b9891ee06c4e39b122dcbf1f22f65075e02dc1b9da4e834bae2 ChangeLog 20704
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -165,3 +169,6 @@ SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/di
 MD5 5745eb95fbcdbb57fd56f19f6394b9aa files/digest-qt-4.2.1 289
 RMD160 fec797f1d0080976deb53495aa1a83e94ff245bc files/digest-qt-4.2.1 289
 SHA256 47a0446def545c4863c0121b96fd6437e5a47a24e9eaf5a9b4bb91935235d02a files/digest-qt-4.2.1 289
+MD5 5745eb95fbcdbb57fd56f19f6394b9aa files/digest-qt-4.2.1-r1 289
+RMD160 fec797f1d0080976deb53495aa1a83e94ff245bc files/digest-qt-4.2.1-r1 289
+SHA256 47a0446def545c4863c0121b96fd6437e5a47a24e9eaf5a9b4bb91935235d02a files/digest-qt-4.2.1-r1 289
diff --git a/x11-libs/qt/files/digest-qt-4.2.1-r1 b/x11-libs/qt/files/digest-qt-4.2.1-r1
new file mode 100644
index 000000000000..c5644a01599f
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.2.1-r1
@@ -0,0 +1,3 @@
+MD5 2ab1c88084f55b94809f025a8503bf18 qt-x11-opensource-src-4.2.1.tar.gz 37069122
+RMD160 af9935cb6a3ef3aa738e81389f13c09e837a2a01 qt-x11-opensource-src-4.2.1.tar.gz 37069122
+SHA256 115e8f0380b55c182a42787d000fce7858b8e0cad4adfe37be3c544cd2ab5cb4 qt-x11-opensource-src-4.2.1.tar.gz 37069122
diff --git a/x11-libs/qt/qt-4.2.1-r1.ebuild b/x11-libs/qt/qt-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..2e34d7559c9f
--- /dev/null
+++ b/x11-libs/qt/qt-4.2.1-r1.ebuild
@@ -0,0 +1,231 @@
+# 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.2.1-r1.ebuild,v 1.1 2006/11/09 15:01:06 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 ~ppc ~ppc64 ~sparc ~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 qt3 sqlite 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
+	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? ( dev-db/mysql )
+	firebird? ( dev-db/firebird )
+	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-0.93 )
+	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
+
+	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
+
+	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
+	sed -i -e "s:X11R6/::" qmake.conf
+
+	cd ${S}
+
+	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 -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 sqlite	&& myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
+	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 qt3		&& 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"
+
+	./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
+
+	# 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"
+}