[gentoo-commits] proj/qt:master commit in: x11-libs/qt-demo/

[Michael Palimaka]

commit:     eda4a132e254aa33e1bf3d935f2cc74d754dfa1b
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Sun Apr  1 18:09:29 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Sun Apr  1 18:09:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=eda4a132

[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.xml
index 80ed182..9a353bd 100644
--- a/x11-libs/qt-demo/metadata.xml
+++ b/x11-libs/qt-demo/metadata.xml
@@ -3,11 +3,17 @@
 <pkgmetadata>
 	<herd>qt</herd> 
 	<use>
+		<flag name='c++0x'>Build Qt using the C++11 standard</flag>
+		<flag name='dbus'>Build QtDBus examples and demos</flag>
+		<flag name='declarative'>Build QtDeclarative examples and demos</flag>
 		<flag name='exceptions'>Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
-		<flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that
-			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
-		<flag name='c++0x'>Build Qt using the C++11 standard</flag>
+		<flag name='multimedia'>Build QtMultimedia examples and demos</flag>
+		<flag name='opengl'>Build QtOpenGL examples and demos</flag>
+		<flag name='openvg'>Build QtOpenVG examples and demos</flag>
 		<flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
+		<flag name='qt3support'>Build Qt3Support examples and demos</flag>
+		<flag name='webkit'>Build QtWebKit examples and demos</flag>
+		<flag name='xmlpatterns'>Build QtXmlPatterns examples and demos</flag>
 	</use>
 </pkgmetadata>

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: $
 
 EAPI=4
 
@@ -13,27 +13,28 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
 else
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
-IUSE="kde qt3support"
+IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
 
 DEPEND="
-	~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
-	~x11-libs/qt-core-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
-	~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
-	~x11-libs/qt-declarative-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,webkit]
-	~x11-libs/qt-gui-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
-	~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
-	~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
+	~x11-libs/qt-core-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
+	dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
+	declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,c++0x=,debug=,qpa=,webkit?] )
+	~x11-libs/qt-gui-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
+	multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
+	opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
+	openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
 	kde? ( media-libs/phonon[aqua=] )
 	!kde? ( || (
-		~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+		~x11-libs/qt-phonon-${PV}:4[aqua=,c++0x=,debug=,qpa=]
 		media-libs/phonon[aqua=]
 	) )
-	~x11-libs/qt-script-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
-	~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
-	~x11-libs/qt-svg-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
-	~x11-libs/qt-test-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
-	~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
-	~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+	qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
+	~x11-libs/qt-script-${PV}:4[aqua=,c++0x=,debug=,qpa=]
+	~x11-libs/qt-sql-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
+	~x11-libs/qt-svg-${PV}:4[aqua=,c++0x=,debug=,qpa=]
+	~x11-libs/qt-test-${PV}:4[aqua=,c++0x=,debug=,qpa=]
+	webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
+	xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
 "
 RDEPEND="${DEPEND}"
 
@@ -54,14 +55,58 @@ pkg_setup() {
 	qt4-build_pkg_setup
 }
 
+src_prepare() {
+	qt4-build_src_prepare
+
+	# Array mapping USE flags to subdirs
+	local flags_subdirs_map=(
+		'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 += ${flag%:*}/d" \
+				examples/examples.pro || die
+
+			if [[ ${flag} == *:* ]]; then
+				einfo "Disabling ${flag%:*} demos"
+				sed -i -re "/SUBDIRS \+= 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="${myconf} $(qt_use qt3support)"
+	myconf+="
+		$(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
 }
 
 src_install() {
 	insinto "${QTDOCDIR#${EPREFIX}}"/src
-	doins -r "${S}"/doc/src/images
+	doins -r doc/src/images
 
 	qt4-build_src_install
 }