summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-04-05 20:15:15 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-04-05 20:15:15 +0000
commit70159cd3803d42451368ddcca906f5ccdc9fc62a (patch)
tree0787e71de3339d381c2c2dbed821cc22d43fd497 /media-video/kaffeine
parentStable on amd64 wrt bug #312835 (diff)
downloadgentoo-2-70159cd3803d42451368ddcca906f5ccdc9fc62a.tar.gz
gentoo-2-70159cd3803d42451368ddcca906f5ccdc9fc62a.tar.bz2
gentoo-2-70159cd3803d42451368ddcca906f5ccdc9fc62a.zip
amd64 stable wrt #310385
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-video/kaffeine')
-rw-r--r--media-video/kaffeine/ChangeLog6
-rw-r--r--media-video/kaffeine/kaffeine-1.0_pre2.ebuild32
-rw-r--r--media-video/kaffeine/kaffeine-1.0_pre3.ebuild4
3 files changed, 7 insertions, 35 deletions
diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index 54d208c34848..94eafc28d8a6 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/kaffeine
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.106 2010/03/24 19:16:33 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.107 2010/04/05 20:15:15 ssuominen Exp $
+
+ 05 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+ kaffeine-1.0_pre3.ebuild:
+ amd64 stable wrt #310385
24 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
kaffeine-1.0_pre3.ebuild:
diff --git a/media-video/kaffeine/kaffeine-1.0_pre2.ebuild b/media-video/kaffeine/kaffeine-1.0_pre2.ebuild
deleted file mode 100644
index a36f9a213450..000000000000
--- a/media-video/kaffeine/kaffeine-1.0_pre2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-1.0_pre2.ebuild,v 1.4 2009/11/09 17:01:50 ssuominen Exp $
-
-EAPI=2
-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"
-MY_P=${P/_/-}
-
-inherit kde4-base
-
-DESCRIPTION="A media player for KDE with digital TV support"
-HOMEPAGE="http://kaffeine.kde.org/"
-SRC_URI="mirror://sourceforge/kaffeine/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="debug"
-
-DEPEND=">=kde-base/phonon-kde-${KDE_MINIMAL}
- >=kde-base/solid-${KDE_MINIMAL}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS Changelog NOTES TODO"
-
-src_configure() {
- mycmakeargs="${mycmakeargs}
- $(cmake-utils_use_build debug DEBUG_MODULE)"
- kde4-base_src_configure
-}
diff --git a/media-video/kaffeine/kaffeine-1.0_pre3.ebuild b/media-video/kaffeine/kaffeine-1.0_pre3.ebuild
index 00979a21e4d6..2ab07e517867 100644
--- a/media-video/kaffeine/kaffeine-1.0_pre3.ebuild
+++ b/media-video/kaffeine/kaffeine-1.0_pre3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-1.0_pre3.ebuild,v 1.2 2010/03/24 19:16:33 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-1.0_pre3.ebuild,v 1.3 2010/04/05 20:15:15 ssuominen Exp $
EAPI=2
KDE_LINGUAS="ast be ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hr hu
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/kaffeine/${MY_P}.tar.gz"
LICENSE="GPL-2 FDL-1.2"
SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="debug"
DEPEND="x11-libs/qt-sql:4[sqlite]