Version bump.

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

3 files changed, 137 insertions, 10 deletions

diff --git a/dev-qt/qtdemo/ChangeLog b/dev-qt/qtdemo/ChangeLog
index 7736c455b3cf..c59f47d212f5 100644
--- a/dev-qt/qtdemo/ChangeLog
+++ b/dev-qt/qtdemo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtdemo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.3 2013/04/08 16:56:00 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.4 2013/07/09 10:47:30 pesa Exp $
+
+*qtdemo-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtdemo-4.8.5.ebuild:
+  Version bump.
 
   08 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> qtdemo-4.8.4.ebuild:
   Add ~arm keyword, wrt bug #454916
diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest
index cea2f387b5cd..75c8a434310c 100644
--- a/dev-qt/qtdemo/Manifest
+++ b/dev-qt/qtdemo/Manifest
@@ -3,17 +3,25 @@ Hash: SHA256
 
 AUX qtdemo-4.6-plugandpaint.patch 609 SHA256 e7c8fccf933dfee061b2960b5754e4835e7cb87c0e36166d3b11d69632732215 SHA512 e547e34d501bf29e0c5f17765f7355b330ab7533fef25ae97e55469d700ee929b36f885e5596b34e2406e63d7fb9fa200e509d4e517473597d3ceffccb7b94b2 WHIRLPOOL 4ea022a82d5580613fdf47b4eb3f0a174c7ce542e79df5b191403c6120195018f136bcd1c325a7718f810d847b40b14b511eb718e8902528fb5694177385ddff
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtdemo-4.8.4.ebuild 2820 SHA256 78b2416dcfa2440424c94083f7aab9cb5586553d6177fb99a68cb933250092ef SHA512 914c48eb9cea03bc74e4564bc8bdb3359b5eafb5a46d0544acd65ce044dd69bfb5381f6003b55483d0276d60d6c965c5f9fb6030812b7ef20b6b654fde005b9d WHIRLPOOL 1160c59e520fbb3c795e0dda59194535e961d4b865b4698fec21a9e98c1d38529d29d40cbf4b9b4cf6e431bb4c19286ac1cd19c9bb6c4e5f946ba35b55310f08
-MISC ChangeLog 13201 SHA256 55a0ff8a125f7a24d0141f34583d2f8ec3355d809c10ebf2beaea97f13aa9258 SHA512 cda93e50c90f1bcc8c6e4506ebc9d682c8cb69248c3a5a207cd6b376122d12ed00067f4014751e714fde8f131db4e63c59ae3da64991a6837c856953458dc13e WHIRLPOOL 23c33051149cb1ce7a45749865cca6ee5377852aec0d00adaf9b3317129f58b40f5a080e2f925472406265c364a9c5a0e3a6c6d295fd3f08d8e80920b60bbb87
+EBUILD qtdemo-4.8.5.ebuild 2820 SHA256 ac2e61443983719c3491d3e6185b39cf0715f97f830a9d9771b3e1ee7cabb2ff SHA512 026a92f957680a97dde7d2c96da8df252cb8079b07e91c40315bb70331f50e158edf91a032ecdc75db781e7339f07ce9697c544789fba016fc3cc4505d2c0b8b WHIRLPOOL c010ce390b9b65c679b3d6e81b81763b70397771f087e99046d9f8f6595267360521018f372c4120d9a08e803af95dfe240dfc900a329595737048157a5de4d9
+MISC ChangeLog 13315 SHA256 6d20d00147c018bd94873f2c893d285ac063ef66a182d20a27e7bf76d60e8ce8 SHA512 ba9871771252848fd79896f185bb9b321b1d82c45e026f7f4a4cb18ab43fddc0e2ccd353a9bebc4abce67f5f792f567e5be6af5ce5aa23d9c17f416ce98f8bbf WHIRLPOOL 5819e6d73eae3188443713ee987151506e08e59cc9dbeab4673448b4b9d22f6c1b2b301febe975defa4262062fad3be9240b56d17e0291517fd8cd2b47aca6ba
 MISC metadata.xml 1018 SHA256 1121d70cccd79f423d3d88174adcb27f932fdafc02875c925981808bd16e94b6 SHA512 526c1c7991244ef801666633bcf5960e6f0dab2b5cab08dccbb0ba5281aae608938656acb1178d341d8b66ea8f2428294ad0995b8a13ded337e68b0e52c75f6a WHIRLPOOL 9f164eef97700630d6bb4ee3958dd7491d2954416d88366aaf980de6d78f9733b7058becdddc58bfe1a4fec4992bd5fc9e0ebfe461cb87f58c8657cc7f73b105
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRYvalAAoJECo/aRed9267K44H/2ZaN2vgTrmysKj4c3R1vdRG
-qfK7+sa6p9FHbimce0zKxhQIsrlogNWLrEGwM7vxb6m18Q7OCOjyAagbeCHfIjLU
-mTmmaHxyw0mdLNUkwJUoI/B+o5x4PhONXEAmXXWCznKJW4DR6C2P9BzrrOMS5yKf
-AZcYNf74DsYxnqF4jz4ODiCzegjCPEBteitNP7qiJmexD2loZTTTEpFpcdq7UtJi
-umu2LqQ5lb4yU6e28Ryz5nAAZALZjM/q+hhOcEIXv+M6x1B3O0FyPWxQ9lbC7zuO
-BBb2ZtSw+ierIFlKAiXSUsNVdCMRbUx6heYu25YwuoqVwRQ6kTZERDpTY2O8HWw=
-=hXCo
+iQIcBAEBCAAGBQJR2+pjAAoJENXLsxwXqFxy6pAP/16O/86Fn+hnesxlZgOwx8dU
+xFdfYMBa37UYgFzBKzVqByCyvupi96NTe9uvOzHJLijzYo9bv8pViugFosN2nMgn
+dAtUdMN+JSfIo4c7JZDR0BOknT4p9EE+0Qgik9OE5gHEEYlX+FYchnmwEoS8fBRe
+b0CJI3qqM6ITDp7Vfq0IK5sAB5MzcTuXbZ4qOazuOegqQY9wHYk8HAzghvo7YY20
+KVCHy40AKo/NKswtec/4NevlkxewkX8H1C92T563NZqsOHjMPp70OaMMzGU9lPEp
+zX4G20Q+17zccLg2VK2YDFfrdSaEAesacKezXhh4GyXe6hlBDyVrljvNfs34HzLE
+R4MkZ2/hXS0rjSBdbxF0+mWJ+L3Y8aegbNoqhhSgGiR04YNJFevAItbr72us4d2N
+v+Ovy+SaYjTL74fgD1wGoxel+zhNweHmmtbi4k/76ryzWubbneT6MJSZuGiX4P68
+HKIclfXZVcGcXXj2LrKLe4qHL3yW0ztgRBW9ErM/pknk7VI3NbKHrcGKa3L21b9i
+snyMICnpUnNDZIvqPsBH+nK405Igf4wFQ5HXWLLordCLMJktuBiKg32KacwIZcQp
+TzjmFQBnwBT+OD2ML7deEA3JkzNE5n1J9pgDgYQMkeYhmzruf3XXOX+JDnCDa2+F
+1B28I9jXWMDNC1fPr1ci
+=qQwI
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdemo/qtdemo-4.8.5.ebuild b/dev-qt/qtdemo/qtdemo-4.8.5.ebuild
new file mode 100644
index 000000000000..393f63272fb7
--- /dev/null
+++ b/dev-qt/qtdemo/qtdemo-4.8.5.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5.ebuild,v 1.1 2013/07/09 10:47:30 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="Demonstration module and examples for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
+fi
+IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}:4[aqua=,debug=,qt3support?]
+	~dev-qt/qtgui-${PV}:4[aqua=,debug=,qt3support?]
+	~dev-qt/qthelp-${PV}:4[aqua=,debug=]
+	~dev-qt/qtscript-${PV}:4[aqua=,debug=]
+	~dev-qt/qtsql-${PV}:4[aqua=,debug=,qt3support?]
+	~dev-qt/qtsvg-${PV}:4[aqua=,debug=]
+	~dev-qt/qttest-${PV}:4[aqua=,debug=]
+	dbus? ( ~dev-qt/qtdbus-${PV}:4[aqua=,debug=] )
+	declarative? ( ~dev-qt/qtdeclarative-${PV}:4[aqua=,debug=,webkit?] )
+	kde? ( media-libs/phonon[aqua=] )
+	!kde? ( || (
+		~dev-qt/qtphonon-${PV}:4[aqua=,debug=]
+		media-libs/phonon[aqua=]
+	) )
+	multimedia? ( ~dev-qt/qtmultimedia-${PV}:4[aqua=,debug=] )
+	opengl? ( ~dev-qt/qtopengl-${PV}:4[aqua=,debug=,qt3support?] )
+	openvg? ( ~dev-qt/qtopenvg-${PV}:4[aqua=,debug=,qt3support?] )
+	qt3support? ( ~dev-qt/qt3support-${PV}:4[aqua=,debug=] )
+	webkit? ( ~dev-qt/qtwebkit-${PV}:4[aqua=,debug=] )
+	xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}:4[aqua=,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_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
+}