[gentoo-commits] proj/kde:master commit in: media-libs/qt-gstreamer/

["Johannes Huber" <johu@gentoo.org>]

commit:     8bac5ff3a69bbe39c7844f50d88b619d62eb460d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 13:51:40 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 13:51:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8bac5ff3

[media-libs/qt-gstreamer] Make bumping easier.

(Portage version: 2.2.0_alpha100/git/Linux i686, unsigned Manifest commit)

---
 media-libs/qt-gstreamer/qt-gstreamer-0.10.2.ebuild |   23 +++++++++++++------
 media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild   |   23 +++++++++++++------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/media-libs/qt-gstreamer/qt-gstreamer-0.10.2.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-0.10.2.ebuild
index 2d8bd49..7f1c3d3 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-0.10.2.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-0.10.2.ebuild
@@ -4,15 +4,24 @@
 
 EAPI=4
 
-inherit cmake-utils
+QT_MINIMAL="4.7.0"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-2"
+	EGIT_REPO_URI="git://anongit.freedesktop.org/gstreamer/${PN}"
+	KEYWORDS=""
+fi
+
+inherit cmake-utils ${GIT_ECLASS}
 
 DESCRIPTION="QtGStreamer provides C++ bindings for GStreamer with a Qt-style API."
 HOMEPAGE="http://gstreamer.freedesktop.org/wiki/QtGStreamer"
-SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -20,9 +29,9 @@ DEPEND="
 	>=dev-util/boost-build-1.40
 	>=media-libs/gstreamer-0.10.33
 	>=media-libs/gst-plugins-base-0.10.33
-	>=x11-libs/qt-core-4.7:4
-	>=x11-libs/qt-declarative-4.7:4
-	>=x11-libs/qt-gui-4.7:4
-	>=x11-libs/qt-opengl-4.7:4
+	>=x11-libs/qt-core-${QT_MINIMAL}:4
+	>=x11-libs/qt-declarative-${QT_MINIMAL}:4
+	>=x11-libs/qt-gui-${QT_MINIMAL}:4
+	>=x11-libs/qt-opengl-${QT_MINIMAL}:4
 "
 RDEPEND="${DEPEND}"

diff --git a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
index 3a67bc2..7f1c3d3 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
@@ -4,15 +4,24 @@
 
 EAPI=4
 
-inherit cmake-utils git-2
+QT_MINIMAL="4.7.0"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-2"
+	EGIT_REPO_URI="git://anongit.freedesktop.org/gstreamer/${PN}"
+	KEYWORDS=""
+fi
+
+inherit cmake-utils ${GIT_ECLASS}
 
 DESCRIPTION="QtGStreamer provides C++ bindings for GStreamer with a Qt-style API."
 HOMEPAGE="http://gstreamer.freedesktop.org/wiki/QtGStreamer"
-EGIT_REPO_URI="git://anongit.freedesktop.org/gstreamer/${PN}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
 DEPEND="
@@ -20,9 +29,9 @@ DEPEND="
 	>=dev-util/boost-build-1.40
 	>=media-libs/gstreamer-0.10.33
 	>=media-libs/gst-plugins-base-0.10.33
-	>=x11-libs/qt-core-4.7:4
-	>=x11-libs/qt-declarative-4.7:4
-	>=x11-libs/qt-gui-4.7:4
-	>=x11-libs/qt-opengl-4.7:4
+	>=x11-libs/qt-core-${QT_MINIMAL}:4
+	>=x11-libs/qt-declarative-${QT_MINIMAL}:4
+	>=x11-libs/qt-gui-${QT_MINIMAL}:4
+	>=x11-libs/qt-opengl-${QT_MINIMAL}:4
 "
 RDEPEND="${DEPEND}"