version bump

Package-Manager: portage-2.1_pre4-r1

4 files changed, 217 insertions, 14 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index ec0387b1e007..06422382eb13 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.286 2006/02/08 10:38:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.287 2006/02/22 18:00:12 caleb Exp $
+
+*qt-4.1.1 (22 Feb 2006)
+
+  22 Feb 2006; Caleb Tennis <caleb@gentoo.org> +qt-4.1.1.ebuild:
+  Version bump
 
   08 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> qt-3.3.5.ebuild:
   Append -fno-strict-aliasing as it dereferences type punned pointers (better
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 38f51dca109d..2f43e4cd7028 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8e49372e7100ddf7cfffbab9dd9665a1 ChangeLog 6312
-RMD160 b1236075da28401ce315437b9c9adeb41049e383 ChangeLog 6312
-SHA256 bc4fee6c97783f113b1b6375cb2adb3e74702641a38ae5c0858872d192f91127 ChangeLog 6312
+MD5 c5ed3f832b63f24655d66856dfb66f9f ChangeLog 6414
+RMD160 6a75bb2ef46d7433d5f31e549ae0ef67a25ef44a ChangeLog 6414
+SHA256 ab23eb064077b114fa7bbeff0f497ae86bfea06fe0399acd0c075296536c6f23 ChangeLog 6414
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 files/0001-dnd_optimization.patch 5623
 SHA256 b8c330553cce93475913494a241d6a27fe07bc1b8ef880b9c565342efa7857e1 files/0001-dnd_optimization.patch 5623
@@ -34,6 +31,9 @@ SHA256 978ae137f1276ae9af1ca77fad93c55465907b29c0c37d2f52a5c50600745e3b files/di
 MD5 fa53e425bec204779eaa1d7b79705f74 files/digest-qt-4.1.0-r2 81
 RMD160 8cccc49ae11ec6a6a2321407e4e83974ecb48cd2 files/digest-qt-4.1.0-r2 81
 SHA256 978ae137f1276ae9af1ca77fad93c55465907b29c0c37d2f52a5c50600745e3b files/digest-qt-4.1.0-r2 81
+MD5 461f9ff4a48b98c13e4605e0eff40f2a files/digest-qt-4.1.1 289
+RMD160 1af2478ddc2087ab09593e57a45bc17d4959642e files/digest-qt-4.1.1 289
+SHA256 28f76ec8338826e0aa368a6b17655749dcccf40440584c3f35bf99a50d896e39 files/digest-qt-4.1.1 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
@@ -94,10 +94,6 @@ SHA256 12afba544cd95d5be5caf7ab0cd634e7e74ed1deb5967e3c1f3af1c0f09a8ec6 qt-4.1.0
 MD5 646d36bb71f8b40f3f91ee8bed5e059a qt-4.1.0.ebuild 6251
 RMD160 c3505d4340126afc04dbb73a57b4257b87f9a0a0 qt-4.1.0.ebuild 6251
 SHA256 ddcea23ccd022c0c80ca37f58a6c60b8819f774ed589153632d5344e8ce0a475 qt-4.1.0.ebuild 6251
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6cotAiZjviIA2XgRAtI1AJ9VrzlKsdxtZqdVugcSw7GBh+bWhQCfcqkn
-z4v0gjQ5PGLlvtmKEV+kMF4=
-=P1j+
------END PGP SIGNATURE-----
+MD5 ad0699c74c5b1c044a317f3a09c241cf qt-4.1.1.ebuild 6342
+RMD160 c8c98afa8cb3888d09398f58f5d05689f8ffc87f qt-4.1.1.ebuild 6342
+SHA256 6d88b761991ab0c2605fc6eb4e1cddd014de3a21db44691fd0ed4642b84e18b5 qt-4.1.1.ebuild 6342
diff --git a/x11-libs/qt/files/digest-qt-4.1.1 b/x11-libs/qt/files/digest-qt-4.1.1
new file mode 100644
index 000000000000..cf2fa874458b
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.1.1
@@ -0,0 +1,3 @@
+MD5 d82b0374d481f93e481aad4e3f26893a qt-x11-opensource-src-4.1.1.tar.gz 27761487
+RMD160 188d99f3ac2929038238229e3b432fc5d5465af2 qt-x11-opensource-src-4.1.1.tar.gz 27761487
+SHA256 a23860a7390bbbc87cf98833f8716cd03b88b1d6fce77e0624daba3150a177e9 qt-x11-opensource-src-4.1.1.tar.gz 27761487
diff --git a/x11-libs/qt/qt-4.1.1.ebuild b/x11-libs/qt/qt-4.1.1.ebuild
new file mode 100644
index 000000000000..5486302cc271
--- /dev/null
+++ b/x11-libs/qt/qt-4.1.1.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.1.ebuild,v 1.1 2006/02/22 18:00:12 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="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"
+}