Build against gstreamer:1.0 with USE=gstreamer, and introduce USE=gstreamer010 to build against old gstreamer:0.10. Patch by Uwe L. Korn, fixes bug #523518.

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

4 files changed, 44 insertions, 24 deletions

diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog
index 6725cefe768b..8f8eee203f8b 100644
--- a/dev-qt/qtwebkit/ChangeLog
+++ b/dev-qt/qtwebkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-qt/qtwebkit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.17 2014/09/25 11:18:13 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.18 2014/09/28 18:24:38 pesa Exp $
+
+*qtwebkit-5.3.2-r1 (28 Sep 2014)
+
+  28 Sep 2014; Davide Pesavento <pesa@gentoo.org> +qtwebkit-5.3.2-r1.ebuild,
+  -qtwebkit-5.3.2.ebuild, metadata.xml:
+  Build against gstreamer:1.0 with USE=gstreamer, and introduce USE=gstreamer010
+  to build against old gstreamer:0.10. Patch by Uwe L. Korn, fixes bug #523518.
 
   25 Sep 2014; Michael Palimaka <kensington@gentoo.org> metadata.xml:
   Remove unused USE flag.
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 91a958d0e03c..cf45c18f5cf1 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -7,24 +7,25 @@ AUX qtwebkit-5.2.1-disable-gstreamer.patch 766 SHA256 06b0aa301aadc5fb601beb6758
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qtwebkit-opensource-src-5.3.2.tar.xz 33445540 SHA256 e47122ed15e8e1cc32e11b3cd89bacc056437215134a204899f2fddb4fd92e5b SHA512 f04e18b550fe0feb1451361339f0a71cd95f65f6a1989b157ed79291e20fb42490f176fc30932ccf4326865ae6f01688b6ad5af7ac6a434d25add5f6557d175c WHIRLPOOL dd5313db10ef23feb134235f7df93733b1d6a93dd0d1e324b6688559f05625edabed6e069df5ba783cc5f8e91649adc373e803fc2fd16c5b984473fc1a145523
 EBUILD qtwebkit-4.8.5.ebuild 2053 SHA256 04be7ac80d16a4f2b9f12039d86ab9de9d645256f11ae9eebe5d0544ebb62253 SHA512 1bec3aec1bbc90f3148d798bd57cb4d92cd638048905e33d3aac8e3844b341839ceb4f50b41b54532dcbd87a3454e9a464c4e47953202e03519e5bd16cd9275a WHIRLPOOL 08d7e1948d1aff0806a4ade799effd42ae462d859d59321e10610020c4f038468735843e7d042a9a64970a8eae756adfb7b0927cd59b816de160dbeccbd05109
-EBUILD qtwebkit-5.3.2.ebuild 2775 SHA256 11e4d677b323598e42cda70ef7604f7fb49e3433f6b73b54e75f8a3eb0e61bcf SHA512 6281162c2cb701fbbe34a523e29e824aced09e6b9c9da50934458a5e0081ca2cf7679f78e8e0a72b2dcf048952422a2bdf102e783893b6a3518943468606f740 WHIRLPOOL d2b5a3e12248287afa69557e1b3740564c78ce6190870d6cda5667e6e62352bf9bcd2ffab6d2868b11ba092bf9f7275923c37b37a948195d4bac8b47665d7a0f
-MISC ChangeLog 27983 SHA256 8fd3bfcfe84856df945d3741e8d8bac346d2053701940d8a7437e9ee33120647 SHA512 fa887e58f86e1569e6c6be3340833380f9e7793942978396e1f973df7de696b9d1607571ba7a75c8804828ccf89fca2363a643a18300e87dda5d3da8daf0d81f WHIRLPOOL 38d9a30b043d1530997da53eadba9773f6d25827d1696026c6f8c280df9b2e78f829c09543626abd156ceaf8c795ad874fc5e71675933f6386ccbac0404d8193
-MISC metadata.xml 953 SHA256 8f63ce37bb7185b8ecb5523ef6b877b602075ce9e2bf0f6f5910c7eeaff9e6d6 SHA512 4959a86396a6388abc08418117e0888535c718427e6720000fa659a8999d83555f34e070328f30080a232835ad3cfdd1f44ea9a1113dec1f2a940e8bea3ca201 WHIRLPOOL ffbeb1f7861246224536c4611ca7438abf4e1cdae04d4bca08ccbbb59b015e02140984c10c103263a416f9323591774e3d784bb863a2e87a2131c37804256d83
+EBUILD qtwebkit-5.3.2-r1.ebuild 3026 SHA256 8db36a185cd6e5f9b1402764bf497c8ce1f38165963396d7759eb1e2b517c36b SHA512 aab5e994dc9411e3b00418e2584cc70d0c545c425f324beb93e615b6675e34eaf3a40646ecd538ecf51635f3a603bbf44d0a08483d3fe633324a3d36c569c8a4 WHIRLPOOL 6f7938365efe9e7e7b773889c015db69d549f7bf30847457581323a19856acb310b2790be063e61648ef716474fa956dd5ebe745f2fe447f49b2954f57b8c541
+MISC ChangeLog 28290 SHA256 65512492996639fa51f5412395e3156e99a01d884e52cdd0bdf4f10ed7edd970 SHA512 cf44e1a0fb05ca091babbfd75695ae9a9d466e5515347ac5f410bfe199cab8666efc35bc5684e284718c5783cfc6e250a5858e18f9fbe34ec69f5f53287cbbd8 WHIRLPOOL ee9cf7a4ef6913866c0a54aa8d4a142f349bfb12d277d063d9aa6c11ca79bfa327db8dc5a13326a73366a3cc0573dd4265d6f9c9c0c8bb9a9094f710ac60633d
+MISC metadata.xml 1081 SHA256 98e8d87c896c97e6b92e2164da0a61417aff376d0543984442a4d14f9941bbcd SHA512 79bcbbd1daf0e20fc35fb5c1a2468459dc5d6ada32d58168d89a5967c05b91302a4c65902a1f16265ae02daa1d62c3f0479752a96a8d092b1d0b00a82f1d07c8 WHIRLPOOL e9f94b94753dfe90f313a713dfa82b5f136cb5ca3a147b420e6b02a040a00539698f84735d5b351bdde1e537d659b212c1a9ea45e1c6c5409260d617e8aa9bd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJUI/n9RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7ENGD/4ym6IYMzRlO22VXb+ZmAlJNSxG5Af2RnusrX/7xsRevUaENCeOBGjqeV5W
-pdNON2Q85nQCmBFqcD3peFTsrdWW1FKoVF2bzqAEU4mi/YDl/BFZI1rkkipJSQbc
-srmulMagxwYjIy6WC4qJua7YrBogGPM4BwtdKvWr66irTCi7e+qEznHvnJTu9Zu3
-9CjP+KfT4xLopnAUDH7edAB2O9+5NlPEcXS6HuIgJRwqpfB96Jv22NKi67zAZSHD
-X/j5F15ADPOHZL0VyTRvVWOmSynTNdCNnm9J2zpo+aeAhv698Yy8xz32UuxuJwbR
-ymPzaPnpFGoyiZws6iDDamYPHa2LuLH8zwAnqqvlVNLEOjvXL3vgGLegzjIY4gWk
-owaBI5R5ODAroVK3fo1Cnx8FpFEJoFdXSl4NbFahpfd67+s38UK6QSLaGyHG1YKC
-89v1KZsIH09VoO3k+3tJiR9t0+naMCkwsX0QmH+RvRIFXJGUWHklP4miCdsjqtsf
-QSJ6XAU3iqej3ZLM/LqrURKoSKPEh/WiTcAH8p4hygGhiVIWfKyrYjwJtsGoDEBu
-DgLcXfh6YmBztp2Z52Iu06yJm3eRR7r5MbABgUwTuI8iORAbKRJ7AXlB+2+3C2nT
-1GOcIEK662Q0ooVvxMMvwkQIOeGZ5SOL+S6/luBf2+JrpkUAYQ==
-=TbPI
+iQJ8BAEBCABmBQJUKFJuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9LJQP/ipvhPEjdM/yVTLed5G/g3zr
+mZGaWBsLByxo6a5g5k8wqQlUIhm6uXJyqArb5PbIro6kOd9gBdWaBwfVygTYDBW9
+zaWP/6Z2DCJHVkFNVy2kgkv16K8/g0lDLi5D1FQU05EIbTN/4j4//x/nSUWArYXS
+/JbS05apqUQ8p4VlHk+QJhNVysCM89Pi5EvfUNjgui1yyMYi52ZhnGNBp7JzVY/N
+aAPFy2khfg/1eSZMxPUaHLFfYRuXUE7KjCMjh0Hn+l9fDcUiwM95URyDIa9Fh1Gt
+u2z+wBX4XZGVlYHrh9buOk1kQ5ePM0j71FNz8oNPLNmQN/uk1xELG65nG4UDtgFq
+G6CwBxSfZhH5MA8AX3pRNobjmJu4WSOu0+kcktOXpJpvCSUscGku++EoH+NgXk3S
+24vovaElOMSK45SUkRXJa2CbC1xjNH1OQfb/yVD301mlTZxnPcuGMKMvZCruCmcy
+GfMA9MPmDQRh/QEjkorfQpC/R88c40Qz5olFhzQwMch7fAeRN+JU//t2Wt+TV0M9
+DoKfT4PVj3ZXfzNaX/d2wymjApCK8GgkHh5swb/4TzoK/w0dq9EyMOXN17qrQrxv
+RkSgroc/49yZLY5FxLhu/uUbRAYtOmUac4Mv+yka67SzTrxKVpJUrpnFV4S/A1w4
+x31980mkJ5J8vvq2Iznz
+=OIiN
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 3422464df927..f6e0320a2f22 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -6,6 +6,8 @@
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
 		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
+		<flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg>
+			instead of :1.0</flag>
 		<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing</flag>
 		<flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild
index a01aea54c7c1..5466baeaa46f 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.2.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.3.2.ebuild,v 1.2 2014/09/25 11:15:09 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild,v 1.1 2014/09/28 18:24:38 pesa Exp $
 
 EAPI=5
 
@@ -18,7 +18,8 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt"
+IUSE="gstreamer gstreamer010 libxml2 multimedia opengl printsupport qml udev webp xslt"
+REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
 	dev-db/sqlite:3
@@ -38,11 +39,16 @@ RDEPEND="
 	x11-libs/libXrender
 	gstreamer? (
 		dev-libs/glib:2
-		>=media-libs/gstreamer-0.10.30:0.10
-		>=media-libs/gst-plugins-base-0.10.30:0.10
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gstreamer010? (
+		dev-libs/glib:2
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
 	)
 	libxml2? ( dev-libs/libxml2:2 )
-	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
+	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
 	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
 	printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] )
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
@@ -61,7 +67,11 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	use gstreamer    || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	if use gstreamer010; then
+		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
+	elif ! use gstreamer; then
+		epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	fi
 	use libxml2      || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \
 		Tools/qmake/mkspecs/features/features.prf || die
 	use multimedia   || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \