version bump

Package-Manager: portage-2.1_pre7-r2

4 files changed, 217 insertions, 14 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 2a4267c61df4..a2aaed75f70d 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # 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.295 2006/03/18 05:41:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.296 2006/03/30 21:18:21 caleb Exp $
+
+*qt-4.1.2 (30 Mar 2006)
+
+  30 Mar 2006; Caleb Tennis <caleb@gentoo.org> +qt-4.1.2.ebuild:
+  version bump
 
   18 Mar 2006; Mike Frysinger <vapier@gentoo.org> qt-3.3.6.ebuild:
   Fix typo (pv -> PV) for libqt-mt.so symlink.
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 7687150e390e..7703ae6e9db5 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0e29f4d0633f65138150f90ef06b205b ChangeLog 7640
-RMD160 92667ab9de21a04f47f8d98efa256461d0134678 ChangeLog 7640
-SHA256 3d532328619454d1d7282edb84a2f3a9f790e7b8976c5343a9870119d75de167 ChangeLog 7640
+MD5 1ea764befe3dd948a9829f7a41b56042 ChangeLog 7745
+RMD160 1e7b77688e462bc551f671d114629d13639f53c6 ChangeLog 7745
+SHA256 7b1e40625e9b40969511bb9e226b4412bee316b7a738ac5cde6a3b65d8ce6f24 ChangeLog 7745
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 files/0001-dnd_optimization.patch 5623
 SHA256 b8c330553cce93475913494a241d6a27fe07bc1b8ef880b9c565342efa7857e1 files/0001-dnd_optimization.patch 5623
@@ -40,6 +37,9 @@ SHA256 978ae137f1276ae9af1ca77fad93c55465907b29c0c37d2f52a5c50600745e3b files/di
 MD5 745c1b09115055e17c96e8754daa6c7d files/digest-qt-4.1.1 289
 RMD160 caa7b9e86616001915929641dfafdf353ec28e90 files/digest-qt-4.1.1 289
 SHA256 46bea95a7e5d949279773eca4aa401ee19bd8c29ccf19e0129033448c2bc1b2b files/digest-qt-4.1.1 289
+MD5 15c631ab0d3b41fe4aa3d7e9d8483185 files/digest-qt-4.1.2 289
+RMD160 2f1a18f50d6ccfdd0db4ee89235f911d05fde9da files/digest-qt-4.1.2 289
+SHA256 d1ab261f19c33437fc21eb2c42b0331385e9c6b7a7e713dc35b8aebac7026f44 files/digest-qt-4.1.2 289
 MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
 RMD160 bada5e23043d314b15f3af1eda70c8833112ebce files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
 SHA256 0dadffc3218b04eb327baf51c1f681843046cdf07a52b943f46373cd8384c275 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
@@ -112,10 +112,6 @@ SHA256 12afba544cd95d5be5caf7ab0cd634e7e74ed1deb5967e3c1f3af1c0f09a8ec6 qt-4.1.0
 MD5 dec77c41b5849f0ebdcde7fa9ea25690 qt-4.1.1.ebuild 6351
 RMD160 f301ece0c483410df03fb22be0e381f2e3e5a18e qt-4.1.1.ebuild 6351
 SHA256 b67eda7a5fa11318f3887762ab3625832b0ea77a3e7ecd02ae84f9c9eefeefbd qt-4.1.1.ebuild 6351
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEG52k2+ySkm8kpY0RAnqyAJ0X2bWAcwVJ49zyidhsvrnUzC6FiACgkVGM
-7//1bw93UG8R0Ly+bnN/VcA=
-=nJra
------END PGP SIGNATURE-----
+MD5 5e83646afbac503b4c78916d9beb425a qt-4.1.2.ebuild 6348
+RMD160 6a97ba0f72acf441830b6bd02f3ec61cbe7209e4 qt-4.1.2.ebuild 6348
+SHA256 1acf8a1be69dc85a71e8d8215777b3dc347b26dfced1387b16c338c7432a5485 qt-4.1.2.ebuild 6348
diff --git a/x11-libs/qt/files/digest-qt-4.1.2 b/x11-libs/qt/files/digest-qt-4.1.2
new file mode 100644
index 000000000000..a2523c6c4228
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.1.2
@@ -0,0 +1,3 @@
+MD5 18bca010d09b98e94210710047baca0a qt-x11-opensource-src-4.1.2.tar.gz 27924277
+RMD160 b4a0031a7c8d72492d8afa1a1190493999cb17ff qt-x11-opensource-src-4.1.2.tar.gz 27924277
+SHA256 025655971eef7f76ece9754346d6eb4e2dd44ddf569c4c84de27836aa24b04a3 qt-x11-opensource-src-4.1.2.tar.gz 27924277
diff --git a/x11-libs/qt/qt-4.1.2.ebuild b/x11-libs/qt/qt-4.1.2.ebuild
new file mode 100644
index 000000000000..2ea0e3521f62
--- /dev/null
+++ b/x11-libs/qt/qt-4.1.2.ebuild
@@ -0,0 +1,199 @@
+# 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.1.2.ebuild,v 1.1 2006/03/30 21:18:22 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+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/libpq )
+	cups? ( net-print/cups )
+	zlib? ( sys-libs/zlib )"
+
+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/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
+
+	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
+	sed -i -e "s:X11R6/::" 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 private header files of QTestLib aren't installed, but are needed by the test library.
+	# This is supposedly fixed in Qt 4.1.1, so this can probably be removed when it is released
+	dodir ${QTHEADERDIR}/QtTest/private
+	cp -pPR ${S}/tools/qtestlib/src/*_p.h ${D}/${QTHEADERDIR}/QtTest/private
+
+	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
+
+	# 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
+PATH=${QTBINDIR}
+ROOTPATH=${QTBINDIR}
+LDPATH=${libdirs:1}
+QMAKESPEC=$(qt_mkspecs_dir)
+EOF
+	doenvd "${T}/44qt4"
+}