[media-video/kaffeine] Version bump.

4 files changed, 67 insertions, 47 deletions

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 67e6c4af75..17168df0d1 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,4 +1,4 @@
-DIST kaffeine-1.0-pre1.tar.gz 231826 RMD160 0fa6312dc00bea2478532b8fa33cfdd1a69a172d SHA1 4996161224b5b38ef4a2973773ca6be4dd8feb08 SHA256 4add54c26a3684990124aca04db3744741028c3793f1e5acf4b37cd0c4da2e61
-EBUILD kaffeine-1.0_pre1.ebuild 633 RMD160 c4807cca4d645c08deb9031f202f586a1e42a60e SHA1 e3774c8711019ab64cf09117c824bb12104948fe SHA256 0bd8adc9b355eb3cf35293b92254ab0d0fd0fe7b41dac5cafa8405bc5f9e44f0
-EBUILD kaffeine-9999.ebuild 756 RMD160 fe0b725a4252fee12c8dd71eab277533b3246ed3 SHA1 c3d88ce26454a7a11aa3decea992115a236e49aa SHA256 daa74e5537c458ee706fd1a9bb837896a90e21b8091f566e4e8389cee31b38f4
+DIST kaffeine-1.0-pre2.tar.gz 272825 RMD160 990b609474a1c50b6edcab0d53adf90baa36097f SHA1 12aa280d449f20668eda8e9ed4c5d5f3f410f136 SHA256 5612f3e81aac971a7695fcab68735770cadadfed0f64c494a0eafb0e8741faa2
+EBUILD kaffeine-1.0_pre2.ebuild 908 RMD160 33f4946d2d09d10ee34971f64222cb3cdb530628 SHA1 46b72f353aeea42d5d23cd998935edab54cd48ec SHA256 0d1e69abc5c95489913d14eabccffc2b31aa29092ae627bea12891528a4b7b30
+EBUILD kaffeine-9999.ebuild 908 RMD160 33f4946d2d09d10ee34971f64222cb3cdb530628 SHA1 46b72f353aeea42d5d23cd998935edab54cd48ec SHA256 0d1e69abc5c95489913d14eabccffc2b31aa29092ae627bea12891528a4b7b30
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-video/kaffeine/kaffeine-1.0_pre1.ebuild b/media-video/kaffeine/kaffeine-1.0_pre1.ebuild
deleted file mode 100644
index f3ff29711e..0000000000
--- a/media-video/kaffeine/kaffeine-1.0_pre1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit kde4-base
-
-DESCRIPTION="Media player for KDE using xine and gstreamer backends."
-HOMEPAGE="http://kaffeine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kaffeine/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-SLOT="4"
-IUSE="debug"
-
-COMMON_DEPEND="
-	>=media-libs/xine-lib-1.1.12
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	!kdeprefix? ( !media-video/kaffeine:0 )
-	!media-video/kaffeine:1
-"
-DEPEND="${COMMON_DEPEND}
-	media-tv/linuxtv-dvb-headers
-	x11-proto/inputproto
-"
-S=${WORKDIR}/${P/_/-}
diff --git a/media-video/kaffeine/kaffeine-1.0_pre2.ebuild b/media-video/kaffeine/kaffeine-1.0_pre2.ebuild
new file mode 100644
index 0000000000..1c44252f94
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-1.0_pre2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="extragear/multimedia"
+KMMODULE="kaffeine"
+inherit kde4-base
+
+DESCRIPTION="Media player for KDE using xine and gstreamer backends."
+HOMEPAGE="http://kaffeine.sourceforge.net/"
+if [[ ${PV} != *9999* ]] ; then
+	KDE_LINGUAS="cs da de el en_GB es et fi fr ga gl hu it ja km ko ku lt mai nb
+	nds nl nn pa pl pt pt_BR ro ru se sk sv th tr uk zh_CN zh_TW"
+	SRC_URI="mirror://sourceforge/kaffeine/${P/_/-}.tar.gz"
+else
+	SRC_URI=""
+fi
+
+LICENSE="GPL-2"
+KEYWORDS=""
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+	>=kde-base/phonon-kde-${KDE_MINIMAL}
+	>=kde-base/solid-${KDE_MINIMAL}
+"
+RDEPEND="${DEPEND}
+	!media-video/kaffeine:0
+	!media-video/kaffeine:1
+"
+
+S=${WORKDIR}/${P/_/-}
+
+src_configure() {
+	mycmakeargs="-DBUILD_po=1
+		$(cmake_use debug BUILD_DEBUG_MODULE)
+	"
+	kde4-base_src_configure
+}
diff --git a/media-video/kaffeine/kaffeine-9999.ebuild b/media-video/kaffeine/kaffeine-9999.ebuild
index 6682871250..1c44252f94 100644
--- a/media-video/kaffeine/kaffeine-9999.ebuild
+++ b/media-video/kaffeine/kaffeine-9999.ebuild
@@ -10,25 +10,33 @@ inherit kde4-base
 
 DESCRIPTION="Media player for KDE using xine and gstreamer backends."
 HOMEPAGE="http://kaffeine.sourceforge.net/"
+if [[ ${PV} != *9999* ]] ; then
+	KDE_LINGUAS="cs da de el en_GB es et fi fr ga gl hu it ja km ko ku lt mai nb
+	nds nl nn pa pl pt pt_BR ro ru se sk sv th tr uk zh_CN zh_TW"
+	SRC_URI="mirror://sourceforge/kaffeine/${P/_/-}.tar.gz"
+else
+	SRC_URI=""
+fi
 
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="4"
-IUSE="debug dvb xcb encode vorbis"
+IUSE="debug"
 
-COMMON_DEPEND="
-	>=media-libs/xine-lib-1.1.12
-	media-sound/cdparanoia
-	x11-libs/libXtst
-	encode? ( media-sound/lame )
-	vorbis? ( media-libs/libvorbis )
-	xcb? ( >=x11-libs/libxcb-1.0 )
+DEPEND="
+	>=kde-base/phonon-kde-${KDE_MINIMAL}
+	>=kde-base/solid-${KDE_MINIMAL}
 "
-RDEPEND="${COMMON_DEPEND}
-	!kdeprefix? ( !media-video/kaffeine:0 )
+RDEPEND="${DEPEND}
+	!media-video/kaffeine:0
 	!media-video/kaffeine:1
 "
-DEPEND="${COMMON_DEPEND}
-	x11-proto/inputproto
-	dvb? ( media-tv/linuxtv-dvb-headers )
-"
+
+S=${WORKDIR}/${P/_/-}
+
+src_configure() {
+	mycmakeargs="-DBUILD_po=1
+		$(cmake_use debug BUILD_DEBUG_MODULE)
+	"
+	kde4-base_src_configure
+}