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 1SEPEJ-0008Qp-Of for garchives@archives.gentoo.org; Sun, 01 Apr 2012 18:10:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 074C9E0527; Sun, 1 Apr 2012 18:10:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BCD1DE0527 for ; Sun, 1 Apr 2012 18:10:12 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F087B1B401E for ; Sun, 1 Apr 2012 18:10:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B25D6E5403 for ; Sun, 1 Apr 2012 18:10:10 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1333303769.eda4a132e254aa33e1bf3d935f2cc74d754dfa1b.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/qt-demo/ X-VCS-Repository: proj/qt X-VCS-Files: x11-libs/qt-demo/metadata.xml x11-libs/qt-demo/qt-demo-4.8.9999.ebuild X-VCS-Directories: x11-libs/qt-demo/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: eda4a132e254aa33e1bf3d935f2cc74d754dfa1b X-VCS-Branch: master Date: Sun, 1 Apr 2012 18:10:10 +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: c531e147-73be-42b3-a16d-e9ca92132a75 X-Archives-Hash: 552c7c06031c13a30fb5e7b5fc7918ef commit: eda4a132e254aa33e1bf3d935f2cc74d754dfa1b Author: Michael Palimaka astralcloak net> AuthorDate: Sun Apr 1 18:09:29 2012 +0000 Commit: Michael Palimaka astralcloak net> CommitDate: Sun Apr 1 18:09:29 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3Deda4a132 [x11-libs/qt-demo] Sync with portage. (Portage version: 2.1.10.53/git/Linux x86_64, unsigned Manifest commit) --- x11-libs/qt-demo/metadata.xml | 12 +++- x11-libs/qt-demo/qt-demo-4.8.9999.ebuild | 81 +++++++++++++++++++++++-= ------ 2 files changed, 72 insertions(+), 21 deletions(-) diff --git a/x11-libs/qt-demo/metadata.xml b/x11-libs/qt-demo/metadata.xm= l index 80ed182..9a353bd 100644 --- a/x11-libs/qt-demo/metadata.xml +++ b/x11-libs/qt-demo/metadata.xml @@ -3,11 +3,17 @@ qt=20 + Build Qt using the C++11 standard + Build QtDBus examples and demos + Build QtDeclarative examples and demos Add support for exceptions - like catching t= hem inside the event loop (recommended by Nokia) - Enable the Qt3Support libraries for Qt4. Not= e that - this does not mean you can compile pure Qt3 programs with Qt4. - Build Qt using the C++11 standard + Build QtMultimedia examples and demos + Build QtOpenGL examples and demos + Build QtOpenVG examples and demos Build a window system agnostic implementation of Qt= + Build Qt3Support examples and demos + Build QtWebKit examples and demos + Build QtXmlPatterns examples and demos diff --git a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild b/x11-libs/qt-demo/= qt-demo-4.8.9999.ebuild index e7188d5..d0d4d0d 100644 --- a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild +++ b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.8.1.ebuild= ,v 1.1 2012/03/29 22:11:13 pesa Exp $ +# $Header: $ =20 EAPI=3D4 =20 @@ -13,27 +13,28 @@ if [[ ${QT4_BUILD_TYPE} =3D=3D live ]]; then else KEYWORDS=3D"~amd64 ~ppc ~ppc64 ~x86" fi -IUSE=3D"kde qt3support" +IUSE=3D"dbus declarative kde multimedia opengl openvg qt3support webkit = xmlpatterns" =20 DEPEND=3D" - ~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=3D,c++0x=3D,qpa=3D,debug=3D] - ~x11-libs/qt-core-${PV}:${SLOT}[aqua=3D,c++0x=3D,qpa=3D,debug=3D,qt3sup= port=3D] - ~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=3D,c++0x=3D,qpa=3D,debug=3D] - ~x11-libs/qt-declarative-${PV}:${SLOT}[aqua=3D,c++0x=3D,qpa=3D,debug=3D= ,webkit] - ~x11-libs/qt-gui-${PV}:${SLOT}[aqua=3D,c++0x=3D,qpa=3D,debug=3D,qt3supp= ort=3D] - ~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=3D,c++0x=3D,qpa=3D,debug=3D] - ~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=3D,c++0x=3D,qpa=3D,debug=3D,qt3s= upport=3D] + ~x11-libs/qt-core-${PV}:4[aqua=3D,c++0x=3D,debug=3D,qpa=3D,qt3support?] + dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=3D,c++0x=3D,debug=3D,qpa=3D] ) + declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=3D,c++0x=3D,debug=3D= ,qpa=3D,webkit?] ) + ~x11-libs/qt-gui-${PV}:4[aqua=3D,c++0x=3D,debug=3D,qpa=3D,qt3support?] + multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=3D,c++0x=3D,debug=3D= ,qpa=3D] ) + opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=3D,c++0x=3D,debug=3D,qpa=3D,= qt3support?] ) + openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=3D,c++0x=3D,debug=3D,qpa=3D,= qt3support?] ) kde? ( media-libs/phonon[aqua=3D] ) !kde? ( || ( - ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=3D,c++0x=3D,qpa=3D,debug=3D] + ~x11-libs/qt-phonon-${PV}:4[aqua=3D,c++0x=3D,debug=3D,qpa=3D] media-libs/phonon[aqua=3D] ) ) - ~x11-libs/qt-script-${PV}:${SLOT}[aqua=3D,c++0x=3D,qpa=3D,debug=3D] - ~x11-libs/qt-sql-${PV}:${SLOT}[aqua=3D,c++0x=3D,qpa=3D,debug=3D,qt3supp= ort=3D] - ~x11-libs/qt-svg-${PV}:${SLOT}[aqua=3D,c++0x=3D,qpa=3D,debug=3D] - ~x11-libs/qt-test-${PV}:${SLOT}[aqua=3D,c++0x=3D,qpa=3D,debug=3D] - ~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=3D,c++0x=3D,qpa=3D,debug=3D] - ~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=3D,c++0x=3D,qpa=3D,debug=3D= ] + qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=3D,c++0x=3D,debug=3D= ,qpa=3D] ) + ~x11-libs/qt-script-${PV}:4[aqua=3D,c++0x=3D,debug=3D,qpa=3D] + ~x11-libs/qt-sql-${PV}:4[aqua=3D,c++0x=3D,debug=3D,qpa=3D,qt3support?] + ~x11-libs/qt-svg-${PV}:4[aqua=3D,c++0x=3D,debug=3D,qpa=3D] + ~x11-libs/qt-test-${PV}:4[aqua=3D,c++0x=3D,debug=3D,qpa=3D] + webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=3D,c++0x=3D,debug=3D,qpa=3D]= ) + xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=3D,c++0x=3D,debug=3D= ,qpa=3D] ) " RDEPEND=3D"${DEPEND}" =20 @@ -54,14 +55,58 @@ pkg_setup() { qt4-build_pkg_setup } =20 +src_prepare() { + qt4-build_src_prepare + + # Array mapping USE flags to subdirs + local flags_subdirs_map=3D( + 'dbus' + 'declarative:declarative' + 'multimedia:spectrum' + 'opengl:boxes|glhypnotizer' + 'openvg' + 'webkit:browser' + 'xmlpatterns' + ) + # Disable unwanted examples/demos + for flag in "${flags_subdirs_map[@]}"; do + if ! use ${flag%:*}; then + einfo "Disabling ${flag%:*} examples" + sed -i -e "/SUBDIRS +=3D ${flag%:*}/d" \ + examples/examples.pro || die + + if [[ ${flag} =3D=3D *:* ]]; then + einfo "Disabling ${flag%:*} demos" + sed -i -re "/SUBDIRS \+=3D demos_(${flag#*:})/d" \ + demos/demos.pro || die + fi + fi + done + + if ! use qt3support; then + einfo "Disabling qt3support examples" + sed -i -e '/QT_CONFIG, qt3support/d' \ + examples/graphicsview/graphicsview.pro || die + fi +} + src_configure() { - myconf=3D"${myconf} $(qt_use qt3support)" + myconf+=3D" + $(qt_use dbus) + $(qt_use declarative) + $(qt_use multimedia) + $(qt_use opengl) + $(qt_use openvg) + $(qt_use qt3support) + $(qt_use webkit) + $(qt_use xmlpatterns)" + qt4-build_src_configure } =20 src_install() { insinto "${QTDOCDIR#${EPREFIX}}"/src - doins -r "${S}"/doc/src/images + doins -r doc/src/images =20 qt4-build_src_install }