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

Package-Manager: portage-2.1.1_pre4-r1

5 files changed, 98 insertions, 16 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/Manifest b/media-video/kmplayer/Manifest
index 6eeb770158fa..ff4d4fd3ced0 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kmplayer-0.9.2a-use32bitbin.diff 9311 RMD160 ff28f8574e6c52fdac47a123b708e5d9084f6b47 SHA1 90246b1e384d511aa35eeec112034b2129789426 SHA256 1e7450978f30d6296c73c10737035827f6547460799caa6898488e5d84553af3
 MD5 cc0ab460a6945037328e7ef52c04d64b files/kmplayer-0.9.2a-use32bitbin.diff 9311
 RMD160 ff28f8574e6c52fdac47a123b708e5d9084f6b47 files/kmplayer-0.9.2a-use32bitbin.diff 9311
@@ -8,14 +11,18 @@ EBUILD kmplayer-0.9.1c.ebuild 1339 RMD160 0e8c10a664dc79121d736338bf876ee373f545
 MD5 920dd2294d19b832cfcc092e65fccf6d kmplayer-0.9.1c.ebuild 1339
 RMD160 0e8c10a664dc79121d736338bf876ee373f545f7 kmplayer-0.9.1c.ebuild 1339
 SHA256 393db6252fedd1d2827fc3edbcb96596a2093e52e6fb86b180e15031d8e6dc54 kmplayer-0.9.1c.ebuild 1339
-EBUILD kmplayer-0.9.2a.ebuild 1402 RMD160 988f4ce0aee1fa1908fbf4b521dbb13bba4ee9c8 SHA1 1c4bb797b8ac8d877e08f699831f14692316cf57 SHA256 1a9227d48e3bbe224c104c5c40398662481e06a4e0f1e1936de6dcfed956e2fb
-MD5 1f9dd3eb6d87708ca04385218c06778b kmplayer-0.9.2a.ebuild 1402
-RMD160 988f4ce0aee1fa1908fbf4b521dbb13bba4ee9c8 kmplayer-0.9.2a.ebuild 1402
-SHA256 1a9227d48e3bbe224c104c5c40398662481e06a4e0f1e1936de6dcfed956e2fb kmplayer-0.9.2a.ebuild 1402
-MISC ChangeLog 9402 RMD160 9cd96555a92e49c77d04fe76bb92a6e5af49b06a SHA1 fc4d03d14db9efd5456f26abb5a8a24c430a825d SHA256 58db370f973ce2a1fe8ecc8d2ef4356552f98ef0badf67f6ff067188de821622
-MD5 fcb8348718d2568276e377736e7985aa ChangeLog 9402
-RMD160 9cd96555a92e49c77d04fe76bb92a6e5af49b06a ChangeLog 9402
-SHA256 58db370f973ce2a1fe8ecc8d2ef4356552f98ef0badf67f6ff067188de821622 ChangeLog 9402
+EBUILD kmplayer-0.9.2a-r1.ebuild 1525 RMD160 1cd75c5eb99f1edc623f9ab8cc273f8266d2e7a0 SHA1 f358940f2c1eeba5e8351f18c50dd63500cc5cf2 SHA256 9d35c2e4e21e1db4934aa727496aa0103275ef9187cca1d7c3100c4076e404da
+MD5 26244345f0b341a355a7da9ae9cdc22c kmplayer-0.9.2a-r1.ebuild 1525
+RMD160 1cd75c5eb99f1edc623f9ab8cc273f8266d2e7a0 kmplayer-0.9.2a-r1.ebuild 1525
+SHA256 9d35c2e4e21e1db4934aa727496aa0103275ef9187cca1d7c3100c4076e404da kmplayer-0.9.2a-r1.ebuild 1525
+EBUILD kmplayer-0.9.2a.ebuild 1373 RMD160 9f29e08485d1c9c55c47dfe178203d45b91c6f11 SHA1 db7f91930609910e29cbd00b7a8ef7e72f61ca08 SHA256 76923049c8ba26f9d6dd0ff77a2275a79bec42d9eca34678ad8120eae0c95d17
+MD5 ab8949c1b5200df6c268cee8f2b795dd kmplayer-0.9.2a.ebuild 1373
+RMD160 9f29e08485d1c9c55c47dfe178203d45b91c6f11 kmplayer-0.9.2a.ebuild 1373
+SHA256 76923049c8ba26f9d6dd0ff77a2275a79bec42d9eca34678ad8120eae0c95d17 kmplayer-0.9.2a.ebuild 1373
+MISC ChangeLog 9658 RMD160 158672b92296e2ba503a871cd02291dc55e4f71a SHA1 80fd1a637be46cbaf6d5b8bb8b86aa81d520e360 SHA256 17a6af8e6f54d588249893bd27717160063561d08eec38b2109f85763d445511
+MD5 a522cbc42dac97b68e3457211c4b3c2c ChangeLog 9658
+RMD160 158672b92296e2ba503a871cd02291dc55e4f71a ChangeLog 9658
+SHA256 17a6af8e6f54d588249893bd27717160063561d08eec38b2109f85763d445511 ChangeLog 9658
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -26,3 +33,13 @@ SHA256 880f2aff7abd920c6c581253ae334148fb53ff5206517c5fd2e05e1db708eee5 files/di
 MD5 1e34c57da81407f31c22d60a03ebc5c5 files/digest-kmplayer-0.9.2a 250
 RMD160 fdc646d1026055e3bdf2a9b7eca70fdfeedb8738 files/digest-kmplayer-0.9.2a 250
 SHA256 f4eb04028770248f26cd1167ba8202a95323c7c5dc3ac5d73fae29d56d0a4e07 files/digest-kmplayer-0.9.2a 250
+MD5 1e34c57da81407f31c22d60a03ebc5c5 files/digest-kmplayer-0.9.2a-r1 250
+RMD160 fdc646d1026055e3bdf2a9b7eca70fdfeedb8738 files/digest-kmplayer-0.9.2a-r1 250
+SHA256 f4eb04028770248f26cd1167ba8202a95323c7c5dc3ac5d73fae29d56d0a4e07 files/digest-kmplayer-0.9.2a-r1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFE0HvmAiZjviIA2XgRAotdAJ9e6fqaznBtIo+l6GXnWyIX6vwumwCgjK0B
+8i0uYZDXtQHaLy4oj2Lh1rE=
+=1yBV
+-----END PGP SIGNATURE-----
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
 }