Revision bump adds multibuild support by Karol Herbst <git@karolherbst.de>.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

3 files changed, 101 insertions, 15 deletions

diff --git a/media-libs/qt-gstreamer/ChangeLog b/media-libs/qt-gstreamer/ChangeLog
index a13983e7e72a..362f0060c402 100644
--- a/media-libs/qt-gstreamer/ChangeLog
+++ b/media-libs/qt-gstreamer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/qt-gstreamer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qt-gstreamer/ChangeLog,v 1.21 2015/01/31 12:11:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qt-gstreamer/ChangeLog,v 1.22 2015/03/05 19:38:35 johu Exp $
+
+*qt-gstreamer-1.2.0-r1 (05 Mar 2015)
+
+  05 Mar 2015; Johannes Huber <johu@gentoo.org> +qt-gstreamer-1.2.0-r1.ebuild:
+  Revision bump adds multibuild support by Karol Herbst <git@karolherbst.de>.
 
   31 Jan 2015; Johannes Huber <johu@gentoo.org> -qt-gstreamer-0.10.3.ebuild,
   qt-gstreamer-1.2.0.ebuild:
diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest
index 216866bd4a12..2775ad1fcf46 100644
--- a/media-libs/qt-gstreamer/Manifest
+++ b/media-libs/qt-gstreamer/Manifest
@@ -2,23 +2,24 @@
 Hash: SHA256
 
 DIST qt-gstreamer-1.2.0.tar.xz 313632 SHA256 9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4 SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7 WHIRLPOOL 2e8c5d70a384ee472dac265179c471369d64fb2deabe239c13cd4eb437358c97c316a486ae4292e8bdb3c823b521b656b665292392f0bb91d1c233869fb09789
+EBUILD qt-gstreamer-1.2.0-r1.ebuild 1625 SHA256 2f54c607e9a1142e0acbe9e6cd56271b96ed9e26dfe11b5fca58ef213aabc30b SHA512 f40442329ab4738aa59e933f6b9522ca994627be4bd8501f5d61f896271cd3063ca796a72b0633a3d15db399651fb69b0e871160e6b8a0347da1192904b00989 WHIRLPOOL 22680445d956d11b4870f0a60c12a544bfdeae389063d6387273f60479665b005a21340efd36204f781074ac36e67f236a1ec35f329c91393f3de8862262b616
 EBUILD qt-gstreamer-1.2.0.ebuild 1226 SHA256 4c48acef72dcbad7c0a4083c052e1408f31c1924c5892413948a097271c4d759 SHA512 9d2d99f0df660e389e100112cfe0a57103b06118a11969e51e6b80f90e040cfabc14a09ddb33bc5ca21c83b288faa2e79286e823665bdecc747178484e796554 WHIRLPOOL a77561b76858d40d40a358171cc71a556266c6c5661690d804838c96ad764ae59b2891643c9741550f4583491fdaaf7362112fd0382521f16d591c7d87e3f991
-MISC ChangeLog 2844 SHA256 54159c33a04d65abf7ea982b72a4011736b92bae92de1b676fd99fbde8541363 SHA512 e92429be7409d0cbc3ef43c7e102dfbbff1f716a9f97ddda08b3945f7c4665c5e2dd8b8e1aa0b279a4b361bff2fce197970aaa9d2ab05dd031e423e1275cb8c9 WHIRLPOOL 4c36116445dea2daac6f0aff6a90951345dac0ca62df59b9015519ddc771ba0e109da42a0b858bb404e5c6540517cc79d8f08458c8d1d39e2bfa542f0b8b4468
+MISC ChangeLog 3040 SHA256 89c3c5516f8cc37186b33539b733612f05305c15aafc355ee79d6a9e1a6fa78a SHA512 3372f4fe90565712309b7ab048c3b096552acab7ebbb54e67034071b196c2f7a510a1755e3b94059e7798f350b6d2032de46f4c2e1bcbd8adea43e549cca1659 WHIRLPOOL b57de0bb9666cc6c376add1c5477215057af44e62f02064fbff705d045565880dc9beb78d932ea38f1bee45be1dc950c985082c631b2823070cf84afc6891406
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUzMZjAAoJEGVpnaTzz9K9V90QAK/WwjB5jEIkpXHEZrH4+Dp0
-+Cxk4+j46UxnI8qm+1WEwU94HZsdAHuWCCMAYPB3b8pLXXkWtWjfvtsh+ZWVPwM+
-eHzaoqYrpSpJq6wqDVZuCfaLNTaHt1TwR0utup7ofxFAcJtrrZ+iQ4pBFPxDVUON
-NNlUe7ownQWNmds3tRIT4VMPQPMcXLu7y1KlxmL0uvKBIvymQVEpDUCtKrHXRrw7
-Jo65CiFVHn066GjILZAKoFYZKfvyx5SnBUPeeU0QhGHUnQBFlJ6BEpw09+3pn1B/
-IxMvIH1COK/XeBxCwHeFzW7re4U2qrHzzqMcze66nVgmA89CUiHV+ng/kPB9bikl
-3vEw8vQ0eVDQvYg+/3tCV2JUAr9/VNZd4dfbfrEFGfGc8N9JZ7/fUYGBjhmZ9Dh/
-Mx+Hy0qhxzSSYCBsqqRh6BHqm6R+bnOLv7Tt476nd/Fnl1kQhWh+vfHGDYajlHJ7
-5mhBTcJ4O2W4R9twbyGVzpXKooszlbduD19QGPtM3BleZYmQ9LSPHwKQwwdQ6A8A
-5Jsbd2TlCqJS9Y2+6ql1ragYdBepDlc4S3lpUTMJJBPACBd10ltfqzveJbK9Kvig
-xPN6OZJOa+s/WwulzLUoW8bY02xyojWHpsq0oo9xfgcJSrd75tSNGf2IGSvl2wDd
-sb9Zt9OIgu4cak/xqa3d
-=FO3R
+iQIcBAEBCAAGBQJU+LCyAAoJEGVpnaTzz9K9XFUP/0qtooWP2U6QZtQBTqAjVRuQ
+wby7E81bjlKCEr6amQx2Gh0wS+oudDPCQ7ZXJj/6WcwTtEZNEIUNlsPRQo3wvOT7
+JW5hRALqsjx7IFMPcbJ9MLpkNa9oIGH3MK6nChB+KDREAGI0Vg3uqgti2mw0VYZc
+05HhbXWgeuI7IInK0XLBvi37rC8gR7yyNH7ufjdyIiFDxDEugC6yqeCHHaQt977Q
+KH016LDCu0IfQQVC6/akp5/oeAdHBDcEuzcdmBrb3M+B/mJnF4c5gQQ/q6js6pQD
+iIgUxy6MTvR5lZTqco1WtsxgMLKVy5lvlK5thizo93Q0BfB1CSoBT8T8SSujp9en
+YjtzV/nNdXcDtm2PHeSZQIHY/h5X6QZ7kpAnRdeFsYrg4o+N/itDrrwwmqwDp3NJ
+2wpISKP1A5JkjBD5xDy16toO2rYsYlXz2YaXNBW5ezkGha1dzwAfDJ7Re3qlySKM
+kltd0sUCUuHa0NlT7ZtxkhxkW7JePvG5Q0JEnPtjg6mqddVHerrYaPztIynZEB1y
+Qnmtkl9trFOpqAgavMcVWJ6ObM64DcZpCx/1mEowqqQtUqBQlnQuOKP9+dl+gked
+tNIamOl5KMHxl6IY1Gr/at7yyFnLkB4AC939+Prdx/c13Dsr9xQvvaRHkIB5XGs3
+rcSAWrsLjMJ8Yfv2I4OB
+=Pjo7
 -----END PGP SIGNATURE-----
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..12d3837c1e7d
--- /dev/null
+++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild,v 1.1 2015/03/05 19:38:35 johu Exp $
+
+EAPI=5
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI=( "git://anongit.freedesktop.org/gstreamer/${PN}" )
+	KEYWORDS=""
+fi
+
+inherit cmake-utils ${GIT_ECLASS} multibuild
+
+DESCRIPTION="QtGStreamer provides C++ bindings for GStreamer with a Qt-style API"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/qt-gstreamer.html"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="qt4 qt5 test"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=dev-libs/boost-1.40:=
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdeclarative:4
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtquick1:5
+		dev-qt/qtwidgets:5
+	)
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		qt4? (
+			dev-qt/qttest:4
+		)
+	)
+"
+
+# bug 497880
+RESTRICT="test"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usex qt4 4 '') $(usex qt5 5 '') )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DQTGSTREAMER_EXAMPLES=OFF
+			$(cmake-utils_use test QTGSTREAMER_TESTS)
+			-DQT_VERSION=${MULTIBUILD_VARIANT}
+		)
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+}