aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski (reavertm) <reavertm@poczta.fm>2009-04-29 00:27:39 +0200
committerMaciej Mrozowski (reavertm) <reavertm@poczta.fm>2009-04-29 00:27:39 +0200
commit3d1e5947db8457f638c489461ccb73ccc0569489 (patch)
tree1041877b4c8240c47327fbfee72a105818055e27 /media-video/kaffeine
parentset slot to 0 for 9999, too. It will lead to a mess with the portage version ... (diff)
downloadkde-3d1e5947db8457f638c489461ccb73ccc0569489.tar.gz
kde-3d1e5947db8457f638c489461ccb73ccc0569489.tar.bz2
kde-3d1e5947db8457f638c489461ccb73ccc0569489.zip
Added keywords for kaffeine, changed slot to=1 and added block for kaffeine:0 (kde3) version for now
Diffstat (limited to 'media-video/kaffeine')
-rw-r--r--media-video/kaffeine/ChangeLog4
-rw-r--r--media-video/kaffeine/Manifest6
-rw-r--r--media-video/kaffeine/kaffeine-1.0_pre1.ebuild14
-rw-r--r--media-video/kaffeine/kaffeine-9999.ebuild11
4 files changed, 22 insertions, 13 deletions
diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index f23083d219..1ba2ae958e 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 28 Apr 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+ kaffeine-1.0_pre1.ebuild:
+ Most common docs are already installed by kde4-base eclass
+
18 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
kaffeine-9999.ebuild:
Dropped live SLOT, deps sorted
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index ad639d7c2b..636a0d20c3 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,5 +1,5 @@
DIST kaffeine-1.0-pre1.tar.gz 231826 RMD160 0fa6312dc00bea2478532b8fa33cfdd1a69a172d SHA1 4996161224b5b38ef4a2973773ca6be4dd8feb08 SHA256 4add54c26a3684990124aca04db3744741028c3793f1e5acf4b37cd0c4da2e61
-EBUILD kaffeine-1.0_pre1.ebuild 547 RMD160 990c6cf46f56c9d1f8d699262e2aac3b6ce06670 SHA1 9172af6fbbbe0b03ee9db9dfbeb092fe1ae3335d SHA256 242a1dc755ad255e9ef76358ce0936a44279c09bbb7a538bfaed1d122b815ccd
-EBUILD kaffeine-9999.ebuild 650 RMD160 e75b4ba529059b46498fa82a826ebb6c200beb81 SHA1 d8592b385149c0a77b6fb574df75fce8d34111d6 SHA256 423d25e98fc7cd1c9d2caa82f5e93ff73fb7845ad4847ca65a925be9f12a7075
-MISC ChangeLog 525 RMD160 d6ebbd72dd8f2435534493b91c0a58e0b57d082a SHA1 09d411627d815dfcf5aaaaf8ba83bd50ee70b016 SHA256 337e26d801047af69d8e63791d702ae410b8afa3f3f54b54e679c164bb2837ea
+EBUILD kaffeine-1.0_pre1.ebuild 608 RMD160 681aafe469b6efc6a4868ce303a5526a8cc7d575 SHA1 0a9f948349f17725f94bf72f66a9e1271031d41d SHA256 6a55660353ca64f0d09aef37867a44ca33a275f455e458c33bdd3ceab1f1196a
+EBUILD kaffeine-9999.ebuild 742 RMD160 4c9752ba28b0d5289bb6c5383a8d1248f2c6e3e9 SHA1 c71e9c25ebd07a84e9bffb63085112ffec449571 SHA256 4621f243b49269bd5b1aa3e802b81c824bb15ed4e2e04f1336104c07ddac1bac
+MISC ChangeLog 679 RMD160 d6332d199bc5cb1ebdd2f7680ba6d8b44a6a0eee SHA1 2eb2ceb33152e624c2becb7cd617c2bad324e66a SHA256 da8d66c4c7f74ab3744d701598c8910bd128600b61480964b9bd6c92164a5595
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
index fd9361e20e..8739b6f5a2 100644
--- a/media-video/kaffeine/kaffeine-1.0_pre1.ebuild
+++ b/media-video/kaffeine/kaffeine-1.0_pre1.ebuild
@@ -9,19 +9,21 @@ 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="0"
+SLOT="1"
IUSE="debug"
-RDEPEND="
+COMMON_DEPEND="
>=media-libs/xine-lib-1.1.12
x11-libs/libXtst
"
-DEPEND="${RDEPEND}
- x11-proto/inputproto
+RDEPEND="${COMMON_DEPEND}
+ !kdeprefix? ( !media-video/kaffeine:0 )
+"
+DEPEND="${COMMON_DEPEND}
media-tv/linuxtv-dvb-headers
+ x11-proto/inputproto
"
S=${WORKDIR}/${P/_/-}
-
-DOCS="AUTHORS TODO"
diff --git a/media-video/kaffeine/kaffeine-9999.ebuild b/media-video/kaffeine/kaffeine-9999.ebuild
index 3d8997dfcc..3344ad6762 100644
--- a/media-video/kaffeine/kaffeine-9999.ebuild
+++ b/media-video/kaffeine/kaffeine-9999.ebuild
@@ -12,11 +12,11 @@ DESCRIPTION="Media player for KDE using xine and gstreamer backends."
HOMEPAGE="http://kaffeine.sourceforge.net/"
LICENSE="GPL-2"
-KEYWORDS=""
-SLOT="0"
+KEYWORDS="~amd64 ~x86"
+SLOT="1"
IUSE="debug dvb xcb encode vorbis"
-RDEPEND="
+COMMON_DEPEND="
>=media-libs/xine-lib-1.1.12
media-sound/cdparanoia
x11-libs/libXtst
@@ -24,7 +24,10 @@ RDEPEND="
vorbis? ( media-libs/libvorbis )
xcb? ( >=x11-libs/libxcb-1.0 )
"
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+ !kdeprefix? ( !media-video/kaffeine:0 )
+"
+DEPEND="${COMMON_DEPEND}
x11-proto/inputproto
dvb? ( media-tv/linuxtv-dvb-headers )
"