Fix handling of mplayer-bin support on amd64, and remove x-mplayer mime type (now installed by kdelibs).

(Portage version: 2.1.1_pre4-r1)

4 files changed, 73 insertions, 8 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 9ccfde3fd6a2..6978a8935cfc 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/kmplayer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.68 2006/06/15 09:40:02 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.69 2006/08/02 10:18:05 flameeyes Exp $
+
+*kmplayer-0.9.2a-r1 (02 Aug 2006)
+
+  02 Aug 2006; Diego Pettenò <flameeyes@gentoo.org> kmplayer-0.9.2a.ebuild,
+  +kmplayer-0.9.2a-r1.ebuild:
+  Fix handling of mplayer-bin support on amd64, and remove x-mplayer mime type
+  (now installed by kdelibs).
 
   15 Jun 2006; Carsten Lohrke <carlo@gentoo.org> -kmplayer-0.9.0c.ebuild,
   -kmplayer-0.9.1.ebuild, -kmplayer-0.9.1a.ebuild,
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.9.2a-r1 b/media-video/kmplayer/files/digest-kmplayer-0.9.2a-r1
new file mode 100644
index 000000000000..fbd9689cf57a
--- /dev/null
+++ b/media-video/kmplayer/files/digest-kmplayer-0.9.2a-r1
@@ -0,0 +1,3 @@
+MD5 9e8ab1a03f80249c3ea9332a48817c32 kmplayer-0.9.2a.tar.bz2 902210
+RMD160 56eec6b64da0c0da6738896dcc215d1d565bf3ca kmplayer-0.9.2a.tar.bz2 902210
+SHA256 ddd5f2afffc1a5458456f5a88e81691a106deee4f8a4ba5ac8edb3b3600dd51f kmplayer-0.9.2a.tar.bz2 902210
diff --git a/media-video/kmplayer/kmplayer-0.9.2a-r1.ebuild b/media-video/kmplayer/kmplayer-0.9.2a-r1.ebuild
new file mode 100644
index 000000000000..a327a016ef64
--- /dev/null
+++ b/media-video/kmplayer/kmplayer-0.9.2a-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.2a-r1.ebuild,v 1.1 2006/08/02 10:18:05 flameeyes Exp $
+
+inherit kde eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend for KDE."
+HOMEPAGE="http://kmplayer.kde.org/"
+SRC_URI="http://kmplayer.kde.org/pkgs/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gstreamer mplayer xine"
+
+DEPEND="xine? ( >=media-libs/xine-lib-1.1.1 )
+	gstreamer? ( || ( =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-0.8* ) )"
+
+RDEPEND="mplayer? ( || ( media-video/mplayer media-video/mplayer-bin ) )
+	xine? ( >=media-libs/xine-lib-1.1.1 )
+	gstreamer? ( || ( =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-0.8* ) )"
+
+need-kde 3.5.4
+
+pkg_setup() {
+	if ! use mplayer && ! use xine ; then
+		echo
+		ewarn "Neither mplayer nor xine use flag is set. Either one is needed."
+		ewarn "You can install mplayer later, though.\n"
+	fi
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	if use mplayer && use amd64 && ! has_version media-video/mplayer; then
+		epatch "${FILESDIR}/${P}-use32bitbin.diff"
+	fi
+}
+
+src_compile(){
+	local myconf="$(use_with gstreamer) $(use_with xine)"
+	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"
+}
diff --git a/media-video/kmplayer/kmplayer-0.9.2a.ebuild b/media-video/kmplayer/kmplayer-0.9.2a.ebuild
index d7bebf4a94c5..608dd6057a9c 100644
--- a/media-video/kmplayer/kmplayer-0.9.2a.ebuild
+++ b/media-video/kmplayer/kmplayer-0.9.2a.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.2a.ebuild,v 1.3 2006/06/23 14:06:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.2a.ebuild,v 1.4 2006/08/02 10:18:05 flameeyes Exp $
 
-inherit kde flag-o-matic
+inherit kde eutils
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -31,12 +31,13 @@ pkg_setup() {
 		ewarn "Neither mplayer nor xine use flag is set. Either one is needed."
 		ewarn "You can install mplayer later, though.\n"
 	fi
+}
+
+src_unpack() {
+	kde_src_unpack
 
-	# on amd64, there are mplayer and mplayer-bin
-	if use mplayer && use amd64 ; then
-		if ! has_version media-libs/mplayer ; then
-			PATCHES=${FILESDIR}/${P}-use32bitbin.diff
-		fi
+	if use mplayer && use amd64 && ! has_version media-video/mplayer; then
+		epatch "${FILESDIR}/${P}-use32bitbin.diff"
 	fi
 }