Version bump (bug 510042). Add multilib support (bug 498010).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

4 files changed, 125 insertions, 18 deletions

diff --git a/dev-qt/qtdemo/ChangeLog b/dev-qt/qtdemo/ChangeLog
index 1b71a8420c20..7998ca189a3c 100644
--- a/dev-qt/qtdemo/ChangeLog
+++ b/dev-qt/qtdemo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtdemo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.11 2014/01/26 17:55:58 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.12 2014/11/15 02:36:28 pesa Exp $
+
+*qtdemo-4.8.6-r1 (15 Nov 2014)
+
+  15 Nov 2014; Davide Pesavento <pesa@gentoo.org> +qtdemo-4.8.6-r1.ebuild,
+  metadata.xml:
+  Version bump (bug 510042). Add multilib support (bug 498010).
 
   26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtdemo-4.8.4.ebuild,
   metadata.xml:
diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest
index 832796d87e64..e17d92f3b93f 100644
--- a/dev-qt/qtdemo/Manifest
+++ b/dev-qt/qtdemo/Manifest
@@ -3,23 +3,27 @@ Hash: SHA256
 
 AUX qtdemo-4.6-plugandpaint.patch 609 SHA256 e7c8fccf933dfee061b2960b5754e4835e7cb87c0e36166d3b11d69632732215 SHA512 e547e34d501bf29e0c5f17765f7355b330ab7533fef25ae97e55469d700ee929b36f885e5596b34e2406e63d7fb9fa200e509d4e517473597d3ceffccb7b94b2 WHIRLPOOL 4ea022a82d5580613fdf47b4eb3f0a174c7ce542e79df5b191403c6120195018f136bcd1c325a7718f810d847b40b14b511eb718e8902528fb5694177385ddff
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 EBUILD qtdemo-4.8.5-r1.ebuild 2922 SHA256 2a8b0b050419c6b15dc62aa5e64ddc129c9107899c2ae96385425132b2ece2eb SHA512 7b35bf6737ea85c04653077a7d763dc833f44c858a177381fc45029651038f1d8814192d2e06f68b3a36f1d3042efc6a9bc6507cc25ea9bf783f789701e6214c WHIRLPOOL ce22d3812314352f3a7cd3648c92538ac79004ee09309da552b794004378420dbe52b4546110331d55ce8e09e305e7c72fe1b9b1ebc769e7f7521fba50c5202e
-MISC ChangeLog 14266 SHA256 8369143c58a6c82ed877a97a8f4c2bb3025821978abc506e2dac3190c0e6ce4b SHA512 c1cd472d2a47ac5e56190a571e738591bb9b1660434218b5590df904cca6b9beacce712d0fd9dd3387df17f9cbc53b5c4343f410aee06d4032b22d420986afcb WHIRLPOOL cf1c028449c5a099d60d67ec4c6d3ef9a003075764ce9a6f3a260d98bccfb9977c2e5758a9f578de23c0daeda0203cd447d7ff3bf62e9cebb01e51007817f71f
-MISC metadata.xml 1020 SHA256 46f76f0975f7fe04b16af4d3bc7cdf7802fae2e4115a2cf6ace589c613a2de8c SHA512 f6b9b50d4918ca7382a099400650baa337acde441e173095ce718d398fccee9231aaaee45dc9f6158a0b8207abb4d26acf70cca57520bc281cc77643a266febc WHIRLPOOL 2a51b2184a889c8fe63d3879c328c24f69d4feb0de9b5856fb21d32c8f70586b1ca35c36fc4bb543874897ddec410c4476e0c6113c3546727adde7720e97485a
+EBUILD qtdemo-4.8.6-r1.ebuild 2861 SHA256 8c16a8ffe7d176d491a4f63e535653ec9be9036e2f3cfa02fdd8a99c165fb2c4 SHA512 d0c42f400e4b4088dc0b7b0f328ac706a753951133397860a7f7f68f2e7d537a872dd7a3173e541ae74ade1533fb7cd62919fd518f2f707639ed400eac824f28 WHIRLPOOL fd844992668899e5d2c7c9462e773742404489a1ecb572c4a98ee524363e808816a7718c2b2abb32edeaee8efee4808fd01fbc07c7f5a600a27898b431c1f2c0
+MISC ChangeLog 14454 SHA256 1f5fb8c78f6083abe78476cec468f93d8a6726a0dbecaee82ab9a471ebcfd827 SHA512 75f0c40c289768576256a0979b39e260682ff506f70b541abb8f1b1cb2d7707c0a2789f7d6b32bd7f8bbcd93d31f5a6736e95d19ac16181994e36574444ff77c WHIRLPOOL e642fce029af2c19237435de955ba657ba52ac51536d3d641932e953b906860b81f2eccecd096db81a6f4c367a1d366cd58da609310683b3dc45aff2cbc9c7b5
+MISC metadata.xml 1019 SHA256 6ae799502dd83e7d68685cf5d3277b3f7eb21bc98c247c92d997658b65f7e109 SHA512 b171d7d14bf8a45524816cd02923bade4bd76c3e3458c5f75f0d9ca532e598fc06e23f007b9f7881a53d6e63a70c802264b6b06c4922db135b38823cb83b4b8b WHIRLPOOL 3faacd90a8a124a25d6487c764f35d947b5afbf76675c60068b7b42c75e88383e377bcde3af0280726f46835bd6e40335ad07d8d4a6eab642c0f9be60a467952
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJS5UwvAAoJENXLsxwXqFxydNYP/0BbdRXw6WshngjxpVP+DXDX
-IoXtPkanGHFmBYkZm9wmBdn2HNIGVm6dOXt60LANnkfbtbwPK73bxeJTo7HRHfnn
-kjdTzEmtZ9qzyvkEtKH3sqkQ+o2DKDj8clVBbBm8C+bGDoT29thWoOZN+Kxibg0R
-ao1AstvHraXGb2WK9wnQOkvXN0UzOcEJk1yyqdi9+NV7pgS/wgC2dc5VBaBcEBOc
-SV+VHBHQ8REb8Mjo1XBOVsLIGL2wTXi9TjU+Go+IVdXzY0lwxEHexhCyH0Q0/C2U
-Ml/wNFohqAwF6JAIuaxgTyjxEi6NoCh7UApZ7GrH0juNU9k5M23Q1Kpfzdez2t9Q
-e8dhOtT0PLboOsCbithW5GwOBfbs1DwvESUXMczjhdR9UGzYg53LMSnF9tSpnR1F
-xLu6coL6hl/s7Kujtb5LpWak+a6jvYY1nU8ty4dgooky5MLuQVt7FKmlbenmP0S0
-PKKs+va2rW1RIdYKmHMQKNq521u0GvQrYx0ZWGftXXjrXloty8ppzgSqo8UAlNaR
-9eHJeF6SH3C+D8YvrPENp8DenxbQ1+G4kAGpJlYfhO+WqG3ova2pFxn3aLZhaZe5
-KxTCvG+Um5wWVv5YpymbXXuSXKTEXLlm3GJ3zANUcXQzwvVymt8g/C1/ASbtPrnb
-Uulx3DFEJ5uQICvg0FfX
-=xX/7
+iQJ8BAEBCABmBQJUZrwtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9v10P/jKpz0JsCBgOy+EUr5Q2Y/fe
+w++yIcYfLX/7SENDr8DKoiTmeaDOAYSCMzYOO5F3JnOJstaEdwRjKujsGgoAufmK
+i68LJxJah3Oyb7MzkEpTscaM4P77MUtlRgPy1qedh5V/9n8d9zuxqnLIQVlGvAls
+z7Kc1f5eOvxXThjlULCtZNmcsHUCzS0tAooSoE2FEmZ7jTmUZXzt63DfxMYSedIP
+SeQ77yCAXiRXOkBdbn44EQd/NtK8IBwSvQzuqy9/2TQA7FKUoB3kQPZIp/SMrVvp
+OB8YF2xHkBWp1rTEEDGmB7dIponqqCZQwjKEQLSfP1vMbP/CXgvmvemF6UrecBWG
+p9slfMkDzCgRxcEtavjyZ3kZuvHJGmvUxUNdVU1Ii5XsyNlNZFUSvgoRs4by7d6L
+ul+epAMaUtAppKurLOqj4FVTdYBt3f0q1OkrQFjxIRoXURWuxhLwq5Ghn4HSmFWh
+zSrxHM8iLuSod7ZsvS2oRESJqE+/XoPHZlUEMg8FDJjdgM/mOzcP5oEFGkc2siss
+YbDIOwY4uo+7ayJqixmxTn54lqew7k1gsBnEHVb9voTdarBQAlVpjkFLJElHr4kE
+oURK8/ijU8ayrZ6Q05oY1dSAA4oIL9boblSQ9BrBe/BEyznhWc52zpiK66jZF86j
+1izD9VUoFdZLdfRk0Bib
+=7cRh
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml
index 4bb5221e23ca..65e4b624d414 100644
--- a/dev-qt/qtdemo/metadata.xml
+++ b/dev-qt/qtdemo/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd> 
+	<herd>qt</herd>
 	<use>
 		<flag name="dbus">Build QtDBus examples and demos</flag>
 		<flag name="declarative">Build QtDeclarative examples and demos</flag>
diff --git a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
new file mode 100644
index 000000000000..6491f27a544a
--- /dev/null
+++ b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:36:28 pesa Exp $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="Demonstration module and examples for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
+fi
+
+IUSE="dbus declarative kde multimedia opengl openvg phonon webkit xmlpatterns"
+
+DEPEND="
+	~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtsql-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtsvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qttest-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+	declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
+	multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+	opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+	openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+	phonon? (
+		kde? ( media-libs/phonon[aqua=] )
+		!kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=] ) )
+	)
+	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+	xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
+)
+
+QT4_TARGET_DIRECTORIES="
+	demos
+	examples"
+
+src_prepare() {
+	qt4-build-multilib_src_prepare
+
+	# Array mapping USE flags to subdirs
+	local flags_subdirs_map=(
+		'dbus'
+		'declarative:declarative'
+		'multimedia:spectrum'
+		'opengl:boxes|glhypnotizer'
+		'openvg'
+		'phonon:mediaplayer'
+		'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
+
+	# Remove bogus dependency on qt3support (bug 510042)
+	sed -i -e 's/contains(QT_CONFIG, qt3support)://' \
+		examples/graphicsview/graphicsview.pro || die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(qt_use dbus)
+		$(qt_use declarative)
+		$(qt_use multimedia) -no-audio-backend
+		$(qt_use opengl)
+		$(qt_use openvg)
+		$(qt_use phonon) -no-phonon-backend
+		$(qt_use webkit)
+		$(qt_use xmlpatterns)
+	)
+	qt4_multilib_src_configure
+}