[gentoo-commits] proj/kde:master commit in: kde-base/artikulate/

[Michael Palimaka]

commit:     c288f97d79c8a313f49f2cd16c4093aa36e63563
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 28 11:03:36 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jul 28 11:03:36 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c288f97d

[kde-base/artikulate] gstreamer is now mandatory.

Package-Manager: portage-2.2.10

---
 kde-base/artikulate/artikulate-4.14.49.9999.ebuild | 17 ++---------------
 kde-base/artikulate/artikulate-4.9999.ebuild       | 17 ++---------------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/kde-base/artikulate/artikulate-4.14.49.9999.ebuild b/kde-base/artikulate/artikulate-4.14.49.9999.ebuild
index 30a1ca4..f06e7cd 100644
--- a/kde-base/artikulate/artikulate-4.14.49.9999.ebuild
+++ b/kde-base/artikulate/artikulate-4.14.49.9999.ebuild
@@ -11,25 +11,12 @@ inherit kde4-base multilib
 DESCRIPTION="Language learning application that helps improving pronunciation skills"
 HOMEPAGE="http://edu.kde.org/applications/language/artikulate"
 KEYWORDS=""
-IUSE="debug gstreamer"
+IUSE="debug"
 
 DEPEND="
 	dev-qt/qtxmlpatterns:4
-	media-libs/phonon
-	gstreamer? ( media-libs/qt-gstreamer )
-	!gstreamer? ( dev-qt/qt-mobility[multimedia] )
+	>=media-libs/qt-gstreamer-1.2.0
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep kqtquickcharts)
 "
-
-src_configure() {
-	# Paths are required because qt-mobility is installed to custom location
-	local mycmakeargs=(
-		-DCMAKE_INCLUDE_PATH="${EPREFIX}/usr/include/qt4"
-		-DCMAKE_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir)/qt4"
-		$(cmake-utils_use_find_package gstreamer QtGStreamer)
-	)
-
-	kde4-base_src_configure
-}

diff --git a/kde-base/artikulate/artikulate-4.9999.ebuild b/kde-base/artikulate/artikulate-4.9999.ebuild
index 30a1ca4..f06e7cd 100644
--- a/kde-base/artikulate/artikulate-4.9999.ebuild
+++ b/kde-base/artikulate/artikulate-4.9999.ebuild
@@ -11,25 +11,12 @@ inherit kde4-base multilib
 DESCRIPTION="Language learning application that helps improving pronunciation skills"
 HOMEPAGE="http://edu.kde.org/applications/language/artikulate"
 KEYWORDS=""
-IUSE="debug gstreamer"
+IUSE="debug"
 
 DEPEND="
 	dev-qt/qtxmlpatterns:4
-	media-libs/phonon
-	gstreamer? ( media-libs/qt-gstreamer )
-	!gstreamer? ( dev-qt/qt-mobility[multimedia] )
+	>=media-libs/qt-gstreamer-1.2.0
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep kqtquickcharts)
 "
-
-src_configure() {
-	# Paths are required because qt-mobility is installed to custom location
-	local mycmakeargs=(
-		-DCMAKE_INCLUDE_PATH="${EPREFIX}/usr/include/qt4"
-		-DCMAKE_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir)/qt4"
-		$(cmake-utils_use_find_package gstreamer QtGStreamer)
-	)
-
-	kde4-base_src_configure
-}