Version bump and added mplayer local USE flag, closing bug 103919. Clean up.

Package-Manager: portage-2.0.51.22-r2

7 files changed, 23 insertions, 47 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 0b11641b645d..b9f18ff477b3 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/kmplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.44 2005/08/07 16:50:08 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.45 2005/08/29 12:43:52 cryos Exp $
+
+*kmplayer-0.9.0c (29 Aug 2005)
+
+  29 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  -kmplayer-0.9.0_rc1.ebuild, -kmplayer-0.9.0.ebuild,
+  +kmplayer-0.9.0c.ebuild:
+  Version bump and added mplayer local USE flag, closing bug 103919. Clean up.
 
 *kmplayer-0.9.0b (07 Aug 2005)
 
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 573e84b12ce1..cf164d1de15e 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 3ba3079a1060b2d736ca981909b83406 kmplayer-0.8.4b.ebuild 822
 MD5 167a7515b289d43474c3f918a3be3aad kmplayer-0.9.0c.ebuild 843
 MD5 6a1de34561f7c27dde5d4e8a3de735f5 kmplayer-0.9.0b.ebuild 822
@@ -6,3 +9,10 @@ MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 ab1134edd8f4a6ae6b27f020d216107e files/digest-kmplayer-0.8.4b 68
 MD5 4a5f4706da9e3845f639247949141c4d files/digest-kmplayer-0.9.0b 68
 MD5 cc7843dcf532036a977b880a100fb2ac files/digest-kmplayer-0.9.0c 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDEwMjntT9W3vfTuoRAiTCAJ96m0u9nkihoGIwd23WnpcqUDUoYwCgjPKm
+/Z1CGferPvFcO9uXRgWjQuY=
+=28Vq
+-----END PGP SIGNATURE-----
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.9.0 b/media-video/kmplayer/files/digest-kmplayer-0.9.0
deleted file mode 100644
index 8472e20e95d0..000000000000
--- a/media-video/kmplayer/files/digest-kmplayer-0.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c6d5203bf1bfe5d2f1a5fb9f3b048c74 kmplayer-0.9.0.tar.bz2 856420
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.9.0_rc1 b/media-video/kmplayer/files/digest-kmplayer-0.9.0_rc1
deleted file mode 100644
index 80ac328c9682..000000000000
--- a/media-video/kmplayer/files/digest-kmplayer-0.9.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e07f4494ece7246007671ed2b59f695 kmplayer-0.9.0-rc1.tar.bz2 706610
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.9.0c b/media-video/kmplayer/files/digest-kmplayer-0.9.0c
new file mode 100644
index 000000000000..53e8500c67a5
--- /dev/null
+++ b/media-video/kmplayer/files/digest-kmplayer-0.9.0c
@@ -0,0 +1 @@
+MD5 7786e038ac8070bc7a18c6a294be296c kmplayer-0.9.0c.tar.bz2 861470
diff --git a/media-video/kmplayer/kmplayer-0.9.0_rc1.ebuild b/media-video/kmplayer/kmplayer-0.9.0_rc1.ebuild
deleted file mode 100644
index 608ad9439459..000000000000
--- a/media-video/kmplayer/kmplayer-0.9.0_rc1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.0_rc1.ebuild,v 1.2 2005/07/21 14:58:11 greg_g Exp $
-
-inherit kde eutils
-
-MY_P="${P/_/-}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="MPlayer frontend for KDE"
-HOMEPAGE="http://www.xs4all.nl/~jjvrieze/kmplayer.html"
-SRC_URI="http://www.xs4all.nl/~jjvrieze/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gstreamer xine"
-
-# Removed koffice plugin, since the compilation fails and it's not supported upstream.
-DEPEND=">=media-video/mplayer-0.90
-	xine? ( >=media-libs/xine-lib-1_beta12 )
-	gstreamer? ( >=media-libs/gst-plugins-0.8.7 )"
-need-kde 3.1
-
-pkg_setup() {
-	if ! built_with_use x11-base/xorg-x11 xv; then
-		echo
-		eerror "${PN} needs x11-base/xorg-x11 compiled with USE=\"xv\"."
-		eerror "Recompile x11-base/xorg-x11 with USE=\"xv\" and try again."
-		echo
-		die
-	fi
-
-	kde_pkg_setup
-}
-
-src_compile(){
-	local myconf="$(use_with gstreamer) $(use_with xine)"
-	kde_src_compile
-}
diff --git a/media-video/kmplayer/kmplayer-0.9.0.ebuild b/media-video/kmplayer/kmplayer-0.9.0c.ebuild
index e2c8b67b363c..abafa2a08d8d 100644
--- a/media-video/kmplayer/kmplayer-0.9.0.ebuild
+++ b/media-video/kmplayer/kmplayer-0.9.0c.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.0.ebuild,v 1.1 2005/07/31 23:13:59 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.0c.ebuild,v 1.1 2005/08/29 12:43:52 cryos Exp $
 
 inherit kde
 
 MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}a"
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="MPlayer frontend for KDE"
 HOMEPAGE="http://www.xs4all.nl/~jjvrieze/kmplayer.html"
@@ -14,10 +14,10 @@ SRC_URI="http://www.xs4all.nl/~jjvrieze/${MY_P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gstreamer xine"
+IUSE="gstreamer mplayer xine"
 
 # Removed koffice plugin, since the compilation fails and it's not supported upstream.
-DEPEND=">=media-video/mplayer-0.90
+DEPEND="mplayer? ( >=media-video/mplayer-0.90 )
 	xine? ( >=media-libs/xine-lib-1_beta12 )
 	gstreamer? ( >=media-libs/gst-plugins-0.8.7 )"
 need-kde 3.1