Introduce some USE flags to control building of various examples and demos, fixing also bug 410309.

Package-Manager: portage-2.2.0_alpha97/cvs/Linux x86_64

5 files changed, 141 insertions, 83 deletions

diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog
index c357686ea9b4..045ce8c18f0a 100644
--- a/x11-libs/qt-demo/ChangeLog
+++ b/x11-libs/qt-demo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-demo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.82 2012/03/29 22:11:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.83 2012/04/01 15:42:58 pesa Exp $
+
+*qt-demo-4.8.1-r1 (01 Apr 2012)
+
+  01 Apr 2012; Davide Pesavento <pesa@gentoo.org> +qt-demo-4.8.1-r1.ebuild,
+  -qt-demo-4.8.1.ebuild, metadata.xml:
+  Introduce some USE flags to control building of various examples and demos,
+  fixing also bug 410309.
 
 *qt-demo-4.8.1 (29 Mar 2012)
 
diff --git a/x11-libs/qt-demo/Manifest b/x11-libs/qt-demo/Manifest
index df1046260b5c..e4c57c61f4e2 100644
--- a/x11-libs/qt-demo/Manifest
+++ b/x11-libs/qt-demo/Manifest
@@ -11,23 +11,23 @@ EBUILD qt-demo-4.6.3.ebuild 1392 RMD160 12f3048645a077a57b72622206365f2160540a7c
 EBUILD qt-demo-4.7.2.ebuild 1591 RMD160 baa823ffbf43275fda630a1cfd3e64ccedbc2057 SHA1 88e2382439fdc6dbcf8827352438f6c01c3804f0 SHA256 44110434bc72160dfbac9d72f16682d321e109774d78709da9c28236c035c177
 EBUILD qt-demo-4.7.4.ebuild 1598 RMD160 5fe178e211a126562fe692a2bae54b6290b1dfbb SHA1 6c655ddd34960c9ebbb26e6b9b75705fd83a941d SHA256 56680004cbe07118417c08e330e41bf24691b32469b24ff1c7a0ec3c165947df
 EBUILD qt-demo-4.8.0.ebuild 1881 RMD160 ddbcafa500ffed9b57dc5ba3f3761c5c846d5a59 SHA1 f925e3d81c5e9fdab1a792d9494e01e412d41019 SHA256 8be43f2c70d4312f4410380eb22284d25c51b020234c5572dec71c90edda56dd
-EBUILD qt-demo-4.8.1.ebuild 1825 RMD160 5e368ac6e65ed7a25d5d87676543d874ac6baa73 SHA1 f82009138406ecd34f0821bb7f71984f5cb2db81 SHA256 1a63921cc113e49da3f29a84ed24b7612fecb9268ac444fe24154780c00f8eba
-MISC ChangeLog 10052 RMD160 49e323700f123f93e1ecf957c52e586b769cef28 SHA1 c29eb3419df7de269ca53a2aed12c55e9c4a9f85 SHA256 d65e6417cfb2a693b1015b9bfbf8842b79a850a97f3e82880236f20bef3c0040
-MISC metadata.xml 591 RMD160 7487c189559465a886eb30038f0e494304f914c3 SHA1 668b2720366fbd96fc0531b54f0e30cb57cf4133 SHA256 34cf78d4af4d2b9d51a3b2b290068a929b4d178391178b5f455f345004d77738
+EBUILD qt-demo-4.8.1-r1.ebuild 2922 RMD160 50bcb2b3ff65645e20568b9a0d35a38f89762cb8 SHA1 c20a0a811ab45d126a8d0ff25ad7d820e3dffb07 SHA256 a962cfdc72509bb45ab90c8f3c19e55609e7f878e14f022ddaa37287b9b019e3
+MISC ChangeLog 10305 RMD160 1d80025a0c674efb81706dce9291a3e991ea3585 SHA1 163050cd754c1661d028d87a4c3af4c0ccaca291 SHA256 b0b9adf955802524b19f4b947ffe950c93e128482e62d586b30517abcb43bc1a
+MISC metadata.xml 975 RMD160 a84dbce34d0597bb08169fda0bc4c415f053e613 SHA1 35dbfdb9cd4c7cb9999b1057b34103051e611858 SHA256 c4e9cb33b7fbc20a1bcdeb81d6c0f35647b3e2423d032d7de49f464d4073b5f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPdN4JAAoJENXLsxwXqFxy6EYQAIDsZ2tndUEOyygW35G1K6C9
-p0EzVrDUnd+aeRH39U92H5xzFV/GBOZtUaEs4lHl4YQY+Bl/qk3BnELB8CIhG9zN
-At+qkaB5hdln/SeDsC93mXsWHhlubxXeRBy469+VTorKkqpuECn/SXHpMLojth8J
-D5l89d2fyBDligTCfSyyvptT74RMTAyrLhuvee1+qizjasaAJedZ3xwKYzUg2dIN
-chKxWRtROKKvRZ2KF3p4jsHDqBG1gy96lKvsFdYAmnVROJNeEFecIq9C1yAzKiNd
-Zd6gY28AQCvLl+rHDbNzRdu6nsE2sNROnwIIfHYzWNgS+HS1GHs3/aKevBpDn2ss
-28+YBECanJtXZ7f7BEqk9vhVTF2lcq+xsBBWmP9jlN5Sil9pEFWdm/Y6lUBwv/1L
-0j8P5l26FVxsBTTkhWWBhfzGr61fMqoLhiveUBopUVpMUcxVASSgA5kq7gf/wUIE
-kAVu7G04CVoPNYfVr2oPgyDnqGuH1bH8QDauLDNkvPfWOoOnrDdaW2AK10SK8Mw1
-ymaiyzK+m2BLIS9QILAJC3jF2cH2xX0n/Ea8j5BkNLTeeJEVWqPrT83xIAP70seH
-MdDP/Z9eO0KdQBKTYlnHZJPcN9LqM5I+kYJNIZOYyAuqnvS+Iz8joErJZNDKU6jq
-69Dupyssl3q3xfW/l7Ut
-=N4BE
+iQIcBAEBCgAGBQJPeHeLAAoJENXLsxwXqFxy6C0P/3akEaOXIHrWWYUYydy8jJPZ
+/Ee2YbUlpeDK3kp7lO02FyIr0Uc84C4pXinLVceJyy3u/BS2MSFz6OuYdCWPxp+B
+1XQFtqtFiv5J/1nG8Q06YA6knwfqKmfIFJZ/4MM9kTD33NYLN+F9/SmTfcvTfqn0
+dleFM6BLX+rsFt2lsdQAPXX8kz14oEEnWE3MAC4hQ98M0T+II/P0JGNhuDmtO9W5
+KcTaxqihl/mxzRaJ1SEj3ZQy90jiD91vM4gKyfyl7LMPY1HD57KSs3cDjVSES+RZ
+gIc2gAbyRxKGQI3WxxTp9quzQS7Htyvi+TRakoaIlNSomx3GyTkqwd/J6esORF6V
+rysoKMiLcDej55y+q+VwFTqDXA185Ut7LZqbe4T0n8Q9E5Z1M3kr9UdEtlvkiRvm
+fgM2OMA99UznqHggygu50Lr5fMfHHuwA7kCsDovcuKdlDdnp4XTdZ6hzsTEyucpJ
+gNeHmLSqu3AMSRCpPI8e+8WNptrfl76p2jApJwa0dc7bsh/wSdKK8OmEe5YX27TD
+3sF9sFd/DRcMFnlEdYYnw41Qo5QBy+L73VnW/dR66Noz4O/ZvqssUBRtCW2avLU2
+wwp/tyXHgLtDiu14mCipbe0Pe8gFAZUUu7zIPhhMUnmqJCSFNjNBqxyTO0bGQZtJ
+grmTJLvWWDgK6z20Hf2y
+=YG3C
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-demo/metadata.xml b/x11-libs/qt-demo/metadata.xml
index 80ed182284bb..9a353bd988dc 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.1-r1.ebuild b/x11-libs/qt-demo/qt-demo-4.8.1-r1.ebuild
new file mode 100644
index 000000000000..9eb11314f012
--- /dev/null
+++ b/x11-libs/qt-demo/qt-demo-4.8.1-r1.ebuild
@@ -0,0 +1,108 @@
+# 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-r1.ebuild,v 1.1 2012/04/01 15:42:58 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="Demonstration module of the Qt toolkit"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
+
+DEPEND="
+	~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}:4[aqua=,c++0x=,debug=,qpa=]
+		media-libs/phonon[aqua=]
+	) )
+	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}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
+)
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		demos
+		examples"
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		doc/src/images
+		src
+		include
+		tools"
+
+	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+="
+		$(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 doc/src/images
+
+	qt4-build_src_install
+}
diff --git a/x11-libs/qt-demo/qt-demo-4.8.1.ebuild b/x11-libs/qt-demo/qt-demo-4.8.1.ebuild
deleted file mode 100644
index 549f0512cd3d..000000000000
--- a/x11-libs/qt-demo/qt-demo-4.8.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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 $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="Demonstration module of the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="kde qt3support"
-
-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=]
-	kde? ( media-libs/phonon[aqua=] )
-	!kde? ( || (
-		~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
-		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=]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		demos
-		examples"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		doc/src/images
-		src
-		include
-		tools"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} $(qt_use qt3support)"
-	qt4-build_src_configure
-}
-
-src_install() {
-	insinto "${QTDOCDIR#${EPREFIX}}"/src
-	doins -r "${S}"/doc/src/images
-
-	qt4-build_src_install
-}