From cf846e4dd3d3a0201648e58feb3fdc5d526e79d9 Mon Sep 17 00:00:00 2001 From: Ben de Groot Date: Mon, 11 Aug 2008 12:59:34 +0000 Subject: Version bump to 4.4.1 (Portage version: 2.2_rc7/cvs/Linux 2.6.26-hh1 i686, RepoMan options: --force) --- x11-libs/qt-core/ChangeLog | 7 +- x11-libs/qt-core/qt-core-4.4.1.ebuild | 167 ++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 x11-libs/qt-core/qt-core-4.4.1.ebuild (limited to 'x11-libs/qt-core') diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index fa519eb42af2..7e6d64a02ad2 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.9 2008/05/27 13:07:32 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.10 2008/08/11 12:59:34 yngwin Exp $ + +*qt-core-4.4.1 (11 Aug 2008) + + 11 Aug 2008; Ben de Groot +qt-core-4.4.1.ebuild: + Version bump 27 May 2008; Raúl Porcel qt-core-4.4.0.ebuild: Add ~alpha/~ia64/~sparc wrt #223557 diff --git a/x11-libs/qt-core/qt-core-4.4.1.ebuild b/x11-libs/qt-core/qt-core-4.4.1.ebuild new file mode 100644 index 000000000000..ffa0c50c760f --- /dev/null +++ b/x11-libs/qt-core/qt-core-4.4.1.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2008 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.4.1.ebuild,v 1.1 2008/08/11 12:59:34 yngwin Exp $ + +EAPI="1" +inherit qt4-build + +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework." +HOMEPAGE="http://www.trolltech.com/" + +LICENSE="|| ( GPL-3 GPL-2 )" +SLOT="4" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc glib +qt3support ssl" + +RDEPEND="sys-libs/zlib + glib? ( dev-libs/glib ) + ssl? ( dev-libs/openssl ) + !<=x11-libs/qt-4.4.0_alpha:${SLOT}" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +QT4_TARGET_DIRECTORIES=" +src/tools/moc/ +src/tools/rcc/ +src/tools/uic/ +src/corelib/ +src/xml/ +src/network/ +src/plugins/codecs/" +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/script/ +translations/" + +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() { + use doc && QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES} + doc/ + tools/qdoc3/" + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + ${QT4_EXTRACT_DIRECTORIES}" + + qt4-build_src_unpack +} + +src_compile() { + unset QMAKESPEC + local myconf + + myconf="${myconf} + $(qt_use glib) + $(qt_use ssl openssl) + $(qt_use qt3support)" + + myconf="${myconf} -no-xkb -no-tablet -no-fontconfig -no-xrender -no-xrandr + -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl + -no-nas-sound -no-dbus -iconv -no-cups -no-nis -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" + + if ! use doc; then + myconf="${myconf} -nomake docs" + fi + + qt4-build_src_compile +} + +src_install() { + dobin "${S}"/bin/{qmake,moc,rcc,uic} || 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 + + emake INSTALL_ROOT="${D}" install_translations || die "emake install_translations failed" + + fix_library_files + + # List all the multilib libdirs + local libdirs + for libdir in $(get_all_libdirs); do + libdirs="${libdirs}:/usr/${libdir}/qt4" + done + + cat <<-EOF > "${T}/44qt4" + LDPATH=${libdirs:1} + EOF + doenvd "${T}/44qt4" + + dodir /${QTDATADIR}/mkspecs/gentoo + mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo || \ + die "Failed to move qconfig.pri" + + sed -i -e '2a#include \n' \ + "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ + "${D}${QTHEADERDIR}"/Qt/qconfig.h || die "sed for qconfig.h failed." + + if use glib; then + QCONFIG_DEFINE="$(use glib && echo QT_GLIB) + $(use ssl && echo QT_OPENSSL)" + install_qconfigs + fi + + keepdir "${QTSYSCONFDIR}" +} -- cgit v1.2.3-65-gdbad