New version depending on KDE 3.5.4 that don't install x-mplayer mime type.

Package-Manager: portage-2.1.1_pre4-r1

4 files changed, 86 insertions, 8 deletions

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index be327b44ab03..6104cd387344 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/kaffeine
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.57 2006/07/09 05:58:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.58 2006/08/02 09:58:08 flameeyes Exp $
+
+*kaffeine-0.8.1-r1 (02 Aug 2006)
+
+  02 Aug 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +kaffeine-0.8.1-r1.ebuild:
+  New version depending on KDE 3.5.4 that don't install x-mplayer mime type.
 
   09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   kaffeine-0.7.1-r2.ebuild, kaffeine-0.8.1.ebuild:
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 13eb25aae0c1..2ba315309795 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -23,14 +23,18 @@ EBUILD kaffeine-0.7.1-r2.ebuild 1251 RMD160 bf83871489cf398fee05cf74cdaeb35860b9
 MD5 2b86f7aa8a3234ebe8b9780f38469e81 kaffeine-0.7.1-r2.ebuild 1251
 RMD160 bf83871489cf398fee05cf74cdaeb35860b97362 kaffeine-0.7.1-r2.ebuild 1251
 SHA256 156e2b1cbcdd7132b50d40d15f869276caf3642f331482f2d3e552636e7f7326 kaffeine-0.7.1-r2.ebuild 1251
+EBUILD kaffeine-0.8.1-r1.ebuild 1610 RMD160 d13d4f27aed88553b665eabdf94f2ba3ad12ff69 SHA1 a38e72a01f72022dc3d5cf482163379d1694c96f SHA256 773cdc5eb41317675f0fb7632288869183f4cc435acd6d4cccf492b6567421aa
+MD5 7394539c83f7d72a5c8ea7609ab9c007 kaffeine-0.8.1-r1.ebuild 1610
+RMD160 d13d4f27aed88553b665eabdf94f2ba3ad12ff69 kaffeine-0.8.1-r1.ebuild 1610
+SHA256 773cdc5eb41317675f0fb7632288869183f4cc435acd6d4cccf492b6567421aa kaffeine-0.8.1-r1.ebuild 1610
 EBUILD kaffeine-0.8.1.ebuild 1460 RMD160 599fc2488480c84b105c8ea005b552f0be882bf9 SHA1 3c0c0304aa8c7b985a001df9f3f4ade70d540f95 SHA256 a968d2bd3d92af5ee26ad3bd8f0a0d240c40d4aef29b3a0356f4e3cfe98dd768
 MD5 d76cf2a9daea723f4ae086a51e808d71 kaffeine-0.8.1.ebuild 1460
 RMD160 599fc2488480c84b105c8ea005b552f0be882bf9 kaffeine-0.8.1.ebuild 1460
 SHA256 a968d2bd3d92af5ee26ad3bd8f0a0d240c40d4aef29b3a0356f4e3cfe98dd768 kaffeine-0.8.1.ebuild 1460
-MISC ChangeLog 8516 RMD160 493cc07a03dd43b8f526dba94f328787498592e9 SHA1 08398977b37c549d7a6ae07315adf91a8b7ecde7 SHA256 f4dab241ad5b9a2431cebcace5af67f2fbef84075c3c43fbc28fcf95ba2df2e5
-MD5 75cd582b3ffbcbf5ae9d41426992ac18 ChangeLog 8516
-RMD160 493cc07a03dd43b8f526dba94f328787498592e9 ChangeLog 8516
-SHA256 f4dab241ad5b9a2431cebcace5af67f2fbef84075c3c43fbc28fcf95ba2df2e5 ChangeLog 8516
+MISC ChangeLog 8710 RMD160 9da610a92f47b1ee8d6bbfd4d78e099a30d26c0e SHA1 c8f9349ec8747e31891be2646dfefdc16e798d52 SHA256 50329b291276f2c8044ff99de8dc4d377d35a49b3793b91af29ab3bf46951354
+MD5 ef751013d557fd8715b6dec5072b38ef ChangeLog 8710
+RMD160 9da610a92f47b1ee8d6bbfd4d78e099a30d26c0e ChangeLog 8710
+SHA256 50329b291276f2c8044ff99de8dc4d377d35a49b3793b91af29ab3bf46951354 ChangeLog 8710
 MISC metadata.xml 175 RMD160 4e4c9dfa9b5102163a4f7b231f95672bd2266c0d SHA1 ea1bcf3e3090182e13f9d6211de688e9cae1ddcf SHA256 ee81a2309bd9eae88d896b77f0d87adbb941cf18f82eea08c025eb583ac6043d
 MD5 f252d0d8aaea067fe6be5e09527ab18e metadata.xml 175
 RMD160 4e4c9dfa9b5102163a4f7b231f95672bd2266c0d metadata.xml 175
@@ -41,10 +45,13 @@ SHA256 be7cdc2892bb3974674212480a401b7a94746757df65e419657a4b117dc46676 files/di
 MD5 724bc44b05c44fc79d4b2157dc6afb53 files/digest-kaffeine-0.8.1 250
 RMD160 ea996cc83be377c9deb1a58f9ff32169da7ff6ab files/digest-kaffeine-0.8.1 250
 SHA256 5bad66e8667f400b3b29e08e0af7fc80f7f2fec8d34cd589abcf772806250796 files/digest-kaffeine-0.8.1 250
+MD5 724bc44b05c44fc79d4b2157dc6afb53 files/digest-kaffeine-0.8.1-r1 250
+RMD160 ea996cc83be377c9deb1a58f9ff32169da7ff6ab files/digest-kaffeine-0.8.1-r1 250
+SHA256 5bad66e8667f400b3b29e08e0af7fc80f7f2fec8d34cd589abcf772806250796 files/digest-kaffeine-0.8.1-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEsJsdAiZjviIA2XgRAqO1AKCIzQ2LwKzoDPxThNIhwy8H33FtiwCeLC0v
-Qel1aYRyh7t/3GGudTRkzMc=
-=p3UH
+iD8DBQFE0HdFAiZjviIA2XgRAii8AKCWo9Uqm7XKx7gtrsxGPIVZGU0LdgCgn8ud
+jmjvqcvAYtpYE7egQwQlFyY=
+=4+nY
 -----END PGP SIGNATURE-----
diff --git a/media-video/kaffeine/files/digest-kaffeine-0.8.1-r1 b/media-video/kaffeine/files/digest-kaffeine-0.8.1-r1
new file mode 100644
index 000000000000..c4091f20057c
--- /dev/null
+++ b/media-video/kaffeine/files/digest-kaffeine-0.8.1-r1
@@ -0,0 +1,3 @@
+MD5 3abba4ff76ffdd109e1f1cfe286e5b5b kaffeine-0.8.1.tar.bz2 2703094
+RMD160 0a8ec4980b5ddce55640543763ae22215a1c5287 kaffeine-0.8.1.tar.bz2 2703094
+SHA256 eda787214563cee684aa868cb82ef198144fe247a3ffd9032d7ae312e2d9bcd2 kaffeine-0.8.1.tar.bz2 2703094
diff --git a/media-video/kaffeine/kaffeine-0.8.1-r1.ebuild b/media-video/kaffeine/kaffeine-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..7e33cb32a1fc
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-0.8.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.1-r1.ebuild,v 1.1 2006/08/02 09:58:08 flameeyes Exp $
+
+inherit eutils kde
+
+DESCRIPTION="Media player for KDE using xine and gstreamer backends."
+HOMEPAGE="http://kaffeine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kaffeine/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dvb gstreamer xinerama vorbis encode kdehiddenvisibility"
+
+RDEPEND="|| ( x11-base/xorg-server
+		  >=x11-base/xorg-x11-6.8.0-r4 )
+	>=media-libs/xine-lib-1
+	gstreamer? ( =media-libs/gstreamer-0.8*
+		=media-libs/gst-plugins-0.8*
+		=media-plugins/gst-plugins-xvideo-0.8* )
+	media-sound/cdparanoia
+	encode? ( media-sound/lame )
+	vorbis? ( media-libs/libvorbis )
+	|| ( (
+			x11-libs/libXtst
+			xinerama? ( x11-libs/libXinerama )
+		) <virtual/x11-7 )"
+
+DEPEND="${RDEPEND}
+	|| ( (
+			x11-proto/xproto
+			x11-proto/xextproto
+			xinerama? ( x11-proto/xineramaproto )
+		) <virtual/x11-7 )
+	dvb? ( media-tv/linuxtv-dvb-headers )
+	dev-util/pkgconfig"
+
+# the dependency on xorg-x11 is meant to avoid bug #59746
+
+need-kde 3.5.4
+
+src_compile() {
+	# It re-runs configure because of messed-up timestamps
+	rm -f "${S}/configure"
+
+	myconf="${myconf}
+		$(use_with xinerama)
+		$(use_with dvb)
+		$(use_with gstreamer)
+		$(use_with vorbis oggvorbis)
+		$(use_with encode lame)"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	# Remove this, as kdelibs 3.5.4 provides it
+	rm -f "${D}/usr/share/mimelnk/application/x-mplayer2.desktop"
+}