From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OWtHb-0003be-H5 for garchives@archives.gentoo.org; Thu, 08 Jul 2010 15:45:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0449EE086D; Thu, 8 Jul 2010 15:45:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C2E54E086D for ; Thu, 8 Jul 2010 15:45:02 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C48D1B4079 for ; Thu, 8 Jul 2010 15:45:02 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2238) id A6F1D2CE14; Thu, 8 Jul 2010 15:45:01 +0000 (UTC) From: "Markos Chandras (hwoarang)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, hwoarang@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: qt4-build.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: qt4-build.eclass X-VCS-Directories: eclass X-VCS-Committer: hwoarang X-VCS-Committer-Name: Markos Chandras Content-Type: text/plain; charset=utf8 Message-Id: <20100708154501.A6F1D2CE14@corvid.gentoo.org> Date: Thu, 8 Jul 2010 15:45:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 11cdcbb3-2dbb-4132-baed-1a46f74a7174 X-Archives-Hash: e526fd474d83c6a659e9dff29d512586 hwoarang 10/07/08 15:45:01 Modified: qt4-build.eclass Log: Introduce functions from -edge eclass. Use them for 4.7.0_beta2 ebuild = for now Revision Changes Path 1.77 eclass/qt4-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.e= class?rev=3D1.77&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.e= class?rev=3D1.77&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.e= class?r1=3D1.76&r2=3D1.77 Index: qt4-build.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- qt4-build.eclass 3 Jul 2010 15:49:39 -0000 1.76 +++ qt4-build.eclass 8 Jul 2010 15:45:01 -0000 1.77 @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.76 2010/0= 7/03 15:49:39 ayoy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.77 2010/0= 7/08 15:45:01 hwoarang Exp $ =20 # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -162,13 +162,19 @@ qt4-build_src_prepare() { setqtenv cd "${S}" - +=09 # fix qt 4.7 regression that skips -fvisibility=3Dhidden if version_is_at_least "4.7.0_beta1"; then sed -e "s/^gcc|g++)/*gcc|*g++)/" \ -i config.tests/unix/fvisibility.test || die "visibility fixing sed failed" fi + # fix libx11 dependency on non X packages + if version_is_at_least "4.7.0_beta2"; then + local NOLIBX11PKG=3D"qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpa= tterns" + hasq ${PN} ${NOLIBX11PKG} && qt_nolibx11 + [[ ${PN} =3D=3D "qt-assistant" ]] && qt_assistant_cleanup + fi =20 if use aqua; then # provide a proper macx-g++-64 @@ -751,4 +757,37 @@ echo "${spec}" } =20 +# @FUNCTION: qt_assistant_cleanup +# @RETURN: nothing +# @DESCRIPTION: +# Tries to clean up tools.pro for qt-assistant ebuilds +# Meant to be called in src_prepare +qt_assistant_cleanup() { + # different versions (and branches...) may need different handling, + # add a case if you need special handling + case "${MY_PV_EXTRA}" in + *kde-qt*) + sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \ + -e "/mac/,/^embedded.*makeqpf$/d" \ + -i tools/tools.pro || die "patching tools.pro failed" + ;; + *) + sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \ + -e "/mac/,/^embedded.*makeqpf$/d" \ + -e "s/^\([ \t]*pixeltool\) /\1 qdoc3 /" \ + -i tools/tools.pro || die "patching tools.pro failed" + ;; + esac +} + +# @FUNCTION: qt_nolibx11 +# @RETURN: nothing +# @DESCRIPTION: +# Ignore X11 tests for packages that don't need X libraries installed +qt_nolibx11() { + einfo "removing X11 check to allow X-less compilation" + sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S= }"/configure || + die "x11 check sed failed" +} + EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_comp= ile src_install src_test pkg_postrm pkg_postinst