ebuild clean up, QA: newdepend -> R/DEPEND, need-kde after R/DEPEND

8 files changed, 25 insertions, 52 deletions

diff --git a/media-video/kplayer/ChangeLog b/media-video/kplayer/ChangeLog
index debbb889adcd..234fce722a46 100644
--- a/media-video/kplayer/ChangeLog
+++ b/media-video/kplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/kplayer
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/ChangeLog,v 1.8 2004/07/16 00:22:47 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/ChangeLog,v 1.9 2004/07/18 16:11:46 carlo Exp $
+
+  18 Jul 2004; Carsten Lohrke <carlo@gentoo.org> -kplayer-0.1.0.ebuild,
+  kplayer-0.2.0.ebuild, -kplayer-0.4.0.ebuild, kplayer-0.5.1.ebuild:
+  ebuild clean up, QA: newdepend -> R/DEPEND, need-kde after R/DEPEND
 
 *kplayer-0.5.1 (16 Jul 2004)
 
diff --git a/media-video/kplayer/Manifest b/media-video/kplayer/Manifest
index e31fee59c395..687bd05bc312 100644
--- a/media-video/kplayer/Manifest
+++ b/media-video/kplayer/Manifest
@@ -1,10 +1,6 @@
-MD5 c07125611bfda50a573edbbbac09f399 ChangeLog 1168
-MD5 ca90fd3d7a2124b1459cc6f69d50bfdc kplayer-0.1.0.ebuild 491
-MD5 95c41aa094695b8ad2ac7d0114753348 kplayer-0.2.0.ebuild 516
-MD5 d60b913194bc733d6980ef61d895fa9f kplayer-0.4.0.ebuild 495
-MD5 274b769617a81f60281a3750b18616b8 kplayer-0.5.1.ebuild 501
+MD5 04787a4d9785a8b67fe47a3d68d79e1a kplayer-0.5.1.ebuild 533
+MD5 cc21659f009216d792b1b69916bdccf4 kplayer-0.2.0.ebuild 552
+MD5 3994facd5bc374416df5657e928bc9a5 ChangeLog 1375
 MD5 194354179c380c5dab0498d715fae079 metadata.xml 230
-MD5 bc92c03101a57c731863306048e522a2 files/digest-kplayer-0.1.0 69
 MD5 bc2b102a24f8195c784bd5c10a96e3fa files/digest-kplayer-0.2.0 69
-MD5 58bf523c9fcde9e66748b396fa3c09f9 files/digest-kplayer-0.4.0 66
 MD5 5f5a4f827a05f276c1e151389ab52f19 files/digest-kplayer-0.5.1 70
diff --git a/media-video/kplayer/files/digest-kplayer-0.1.0 b/media-video/kplayer/files/digest-kplayer-0.1.0
deleted file mode 100644
index 1d9e0e4fba5c..000000000000
--- a/media-video/kplayer/files/digest-kplayer-0.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f2de14592fd8fe65fa7d22eb895308e9 kplayer-0.1.0-src.tar.gz 438140
diff --git a/media-video/kplayer/files/digest-kplayer-0.4.0 b/media-video/kplayer/files/digest-kplayer-0.4.0
deleted file mode 100644
index b7d2d3259856..000000000000
--- a/media-video/kplayer/files/digest-kplayer-0.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d7e24c314b0b533b0111b2c316abc22b kplayer-0.4.0.tar.bz2 621078
diff --git a/media-video/kplayer/kplayer-0.1.0.ebuild b/media-video/kplayer/kplayer-0.1.0.ebuild
deleted file mode 100644
index 4778dea128c4..000000000000
--- a/media-video/kplayer/kplayer-0.1.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.1.0.ebuild,v 1.5 2004/06/25 00:43:04 agriffis Exp $
-
-inherit kde
-need-kde 3
-DESCRIPTION="KPlayer is a KDE media player based on mplayer."
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-HOMEPAGE="http://www.sourceforge.net/projects/kplayer"
-
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-IUSE=""
-newdepend "media-video/mplayer"
diff --git a/media-video/kplayer/kplayer-0.2.0.ebuild b/media-video/kplayer/kplayer-0.2.0.ebuild
index 10cabbbf9bb0..f0ca329adaee 100644
--- a/media-video/kplayer/kplayer-0.2.0.ebuild
+++ b/media-video/kplayer/kplayer-0.2.0.ebuild
@@ -1,16 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.2.0.ebuild,v 1.4 2004/06/25 00:43:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.2.0.ebuild,v 1.5 2004/07/18 16:11:46 carlo Exp $
 
 inherit kde
-need-kde 3
+
+S="${WORKDIR}/${PN}-0.2"
+
 DESCRIPTION="KPlayer is a KDE media player based on mplayer."
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 HOMEPAGE="http://www.sourceforge.net/projects/kplayer"
+SRC_URI="mirror://sourceforge/kplayer/${P}-src.tar.gz"
 
+SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
-
 IUSE=""
-newdepend "media-video/mplayer"
-S="${WORKDIR}/${PN}-0.2"
+
+DEPEND="media-video/mplayer"
+RDEPEND="media-video/mplayer"
+need-kde 3
\ No newline at end of file
diff --git a/media-video/kplayer/kplayer-0.4.0.ebuild b/media-video/kplayer/kplayer-0.4.0.ebuild
deleted file mode 100644
index 27cdfc9ca85a..000000000000
--- a/media-video/kplayer/kplayer-0.4.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.4.0.ebuild,v 1.5 2004/06/25 00:43:04 agriffis Exp $
-
-inherit kde
-need-kde 3
-DESCRIPTION="KPlayer is a KDE media player based on mplayer."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.sourceforge.net/projects/kplayer"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-
-IUSE=""
-newdepend "media-video/mplayer"
-
diff --git a/media-video/kplayer/kplayer-0.5.1.ebuild b/media-video/kplayer/kplayer-0.5.1.ebuild
index f5772ed88c62..00ad1a22fc4b 100644
--- a/media-video/kplayer/kplayer-0.5.1.ebuild
+++ b/media-video/kplayer/kplayer-0.5.1.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.5.1.ebuild,v 1.1 2004/07/16 00:22:47 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.5.1.ebuild,v 1.2 2004/07/18 16:11:46 carlo Exp $
 
 inherit kde
-need-kde 3
+
 DESCRIPTION="KPlayer is a KDE media player based on mplayer."
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
 HOMEPAGE="http://www.sourceforge.net/projects/kplayer"
+SRC_URI="mirror://sourceforge/kplayer/${P}-src.tar.bz2"
 
+SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
-
 IUSE=""
-newdepend "media-video/mplayer"
 
+DEPEND="media-video/mplayer"
+RDEPEND="media-video/mplayer"
+need-kde 3
\ No newline at end of file