Version bump

(Portage version: 2.2_rc61/cvs/Linux x86_64)

2 files changed, 237 insertions, 1 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 11ea528265fd..2b7b70ec5644 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.84 2010/01/14 15:39:34 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.85 2010/01/19 14:47:02 yngwin Exp $
+
+*qt-core-4.6.1 (19 Jan 2010)
+
+  19 Jan 2010; Ben de Groot <yngwin@gentoo.org> +qt-core-4.6.1.ebuild:
+  Version bump
 
   14 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   qt-core-4.6.0-r1.ebuild:
diff --git a/x11-libs/qt-core/qt-core-4.6.1.ebuild b/x11-libs/qt-core/qt-core-4.6.1.ebuild
new file mode 100644
index 000000000000..f2ddf831b3ec
--- /dev/null
+++ b/x11-libs/qt-core/qt-core-4.6.1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.1.ebuild,v 1.1 2010/01/19 14:47:02 yngwin Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc +glib iconv optimized-qmake qt3support ssl"
+
+RDEPEND="sys-libs/zlib
+	glib? ( dev-libs/glib )
+	ssl? ( dev-libs/openssl )
+	!<x11-libs/qt-4.4.0:4"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )"
+
+QT4_TARGET_DIRECTORIES="
+src/tools/bootstrap
+src/tools/moc
+src/tools/rcc
+src/tools/uic
+src/corelib
+src/xml
+src/network
+src/plugins/codecs
+tools/linguist/lconvert
+tools/linguist/lrelease
+tools/linguist/lupdate"
+
+# Most ebuilds include almost everything for testing
+# Will clear out unneeded directories after everything else works OK
+QT4_EXTRACT_DIRECTORIES="
+include/Qt
+include/QtCore
+include/QtNetwork
+include/QtScript
+include/QtXml
+src/plugins/plugins.pro
+src/plugins/qpluginbase.pri
+src/src.pro
+src/3rdparty/des
+src/3rdparty/harfbuzz
+src/3rdparty/md4
+src/3rdparty/md5
+src/3rdparty/sha1
+src/3rdparty/easing
+src/script
+tools/linguist/shared
+translations"
+
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.diff"
+	"${FILESDIR}/${P}-hebrew.patch"
+)
+
+pkg_setup() {
+	qt4-build_pkg_setup
+
+	if has_version x11-libs/qt-core; then
+		# Check to see if they've changed the glib flag since the last time installing this package.
+		if use glib && ! built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then
+			ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package."
+			ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change."
+		elif ! use glib && built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then
+			ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package."
+			ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change."
+		fi
+
+		# Check to see if they've changed the qt3support flag since the last time installing this package.
+		# If so, give a list of packages they need to uninstall first.
+		if use qt3support && ! built_with_use x11-libs/qt-core qt3support; then
+			local need_to_remove
+			ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package."
+			for x in sql opengl gui qt3support; do
+				local pkg="x11-libs/qt-${x}"
+				if has_version $pkg; then
+					need_to_remove="${need_to_remove} ${pkg}"
+				fi
+			done
+			if [[ -n ${need_to_remove} ]]; then
+				die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}"
+			fi
+		elif ! use qt3support && built_with_use x11-libs/qt-core qt3support ; then
+			local need_to_remove
+			ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package."
+			for x in sql opengl gui qt3support; do
+				local pkg="x11-libs/qt-${x}"
+				if has_version $pkg; then
+					need_to_remove="${need_to_remove} ${pkg}"
+				fi
+			done
+			if [[ -n ${need_to_remove} ]]; then
+				die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}"
+			fi
+		fi
+	fi
+}
+
+src_unpack() {
+	if use doc; then
+		QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES}
+					doc/"
+		QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+					tools/qdoc3"
+	fi
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+				${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_src_unpack
+
+	# Don't pre-strip, bug 235026
+	for i in kr jp cn tw ; do
+		echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
+	done
+}
+
+src_prepare() {
+	qt4-build_src_prepare
+
+	# bug 172219
+	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
+		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
+	sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
+}
+
+src_configure() {
+	unset QMAKESPEC
+
+	myconf="${myconf}
+		$(qt_use glib)
+		$(qt_use iconv)
+		$(qt_use optimized-qmake)
+		$(qt_use ssl openssl)
+		$(qt_use qt3support)"
+
+	myconf="${myconf} -no-xkb  -no-fontconfig -no-xrender -no-xrandr
+		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
+		-no-nas-sound -no-dbus -no-cups -no-gif -no-libpng
+		-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
+		-no-freetype -no-libtiff  -no-accessibility -no-fontconfig -no-opengl
+		-no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools
+		-no-cups -no-xsync -no-xinput -no-multimedia"
+
+	if ! use doc; then
+		myconf="${myconf} -nomake docs"
+	fi
+
+	qt4-build_src_configure
+}
+
+src_compile() {
+	# bug 259736
+	unset QMAKESPEC
+	qt4-build_src_compile
+}
+
+src_install() {
+	dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed"
+
+	install_directories src/{corelib,xml,network,plugins/codecs}
+
+	emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
+
+	if use doc; then
+		emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed"
+	fi
+
+	# use freshly built libraries
+	local DYLD_FPATH=
+	[[ -d "${S}"/lib/QtCore.framework ]] \
+		&& DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
+	DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
+	LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \
+		|| die "generating translations faied"
+	insinto ${QTTRANSDIR#${EPREFIX}}
+	doins translations/*.qm || die "doins translations failed"
+
+	setqtenv
+	fix_library_files
+
+	# List all the multilib libdirs
+	local libdirs=
+	for libdir in $(get_all_libdirs); do
+		libdirs+=:${EPREFIX}/usr/${libdir}/qt4
+	done
+
+	cat <<-EOF > "${T}/44qt4"
+	LDPATH="${libdirs:1}"
+	EOF
+	doenvd "${T}/44qt4"
+
+	dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
+	mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
+		|| die "Failed to move qconfig.pri"
+
+	# Framework hacking
+	if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then
+		#TODO do this better
+		sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
+				"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
+			|| die "sed for qconfig.h failed."
+		dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
+	else
+		sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
+				"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
+				"${D}${QTHEADERDIR}"/Qt/qconfig.h \
+			|| die "sed for qconfig.h failed"
+	fi
+
+	if use glib; then
+		QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
+				$(use ssl && echo QT_OPENSSL)"
+		install_qconfigs
+	fi
+
+	# remove some unnecessary headers
+	rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\
+qatomic_windows.h,\
+qatomic_windowsce.h,\
+qt_windows.h}
+
+	keepdir "${QTSYSCONFDIR#${EPREFIX}}"
+
+	# Framework magic
+	fix_includes
+}