[gentoo-commits] proj/kde:master commit in: media-video/kaffeine/

["Tomas Chvatal" <scarabeus@gentoo.org>]

commit:     3d4284ae669c2b9c9bb4799dbc27b2261a392d64
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 18:33:27 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 18:33:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3d4284ae

Eapi4 sync with 1.2.1.

---
 media-video/kaffeine/kaffeine-1.2.1.ebuild |   38 ----------------------------
 media-video/kaffeine/kaffeine-9999.ebuild  |   22 +++++++++++++---
 2 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/media-video/kaffeine/kaffeine-1.2.1.ebuild b/media-video/kaffeine/kaffeine-1.2.1.ebuild
deleted file mode 100644
index b50d623..0000000
--- a/media-video/kaffeine/kaffeine-1.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-1.1.ebuild,v 1.4 2011/02/02 04:57:41 tampakrap Exp $
-
-EAPI=3
-
-KDE_LINGUAS="ar ast be bg ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hr hu
-	it ja km ko ku lt mai nb nds nl nn pa pl pt pt_BR ro ru se sk sr@ijekavian
-	sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW"
-
-inherit kde4-base
-
-DESCRIPTION="A media player for KDE with digital TV support"
-HOMEPAGE="http://kaffeine.kde.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	x11-libs/libXScrnSaver
-	x11-libs/qt-sql:4[sqlite]
-	>=media-libs/xine-lib-1.1.18.1
-	$(add_kdebase_dep solid)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( Changelog NOTES )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build debug DEBUG_MODULE)
-	)
-
-	kde4-base_src_configure
-}

diff --git a/media-video/kaffeine/kaffeine-9999.ebuild b/media-video/kaffeine/kaffeine-9999.ebuild
index 8c725aa..5e0ab63 100644
--- a/media-video/kaffeine/kaffeine-9999.ebuild
+++ b/media-video/kaffeine/kaffeine-9999.ebuild
@@ -1,24 +1,38 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-1.1.ebuild,v 1.4 2011/02/02 04:57:41 tampakrap Exp $
 
-EAPI=3
+EAPI=4
 
+KDE_LINGUAS="ar ast be bg ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hr hu
+	it ja km ko ku lt mai nb nds nl nn pa pl pt pt_BR ro ru se sk sr@ijekavian
+	sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW"
 KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="A media player for KDE with digital TV support"
 HOMEPAGE="http://kaffeine.kde.org/"
+SRC_URI=""
 
 LICENSE="GPL-2 FDL-1.2"
-KEYWORDS=""
 SLOT="4"
+KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	media-libs/xine-lib
 	x11-libs/libXScrnSaver
 	x11-libs/qt-sql:4[sqlite]
+	>=media-libs/xine-lib-1.1.18.1
 	$(add_kdebase_dep solid)
 "
 RDEPEND="${DEPEND}"
+
+DOCS=( Changelog NOTES )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build debug DEBUG_MODULE)
+	)
+
+	kde4-base_src_configure
+}