Preparation for new eclass. Unprefixing misc apps.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

7 files changed, 29 insertions, 51 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 26f8cf33200b..b024d9ec973a 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/kmplayer
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.122 2009/03/15 15:16:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.123 2009/04/06 11:56:28 scarabeus Exp $
+
+  06 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> kmplayer-0.11.0a.ebuild:
+  Preparation for new eclass. Unprefixing misc apps.
 
   15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
   +files/0.11.0a-npp.patch, kmplayer-0.11.0a.ebuild:
diff --git a/media-video/kmplayer/kmplayer-0.11.0a.ebuild b/media-video/kmplayer/kmplayer-0.11.0a.ebuild
index 4c9f08e3de0a..f74e28291668 100644
--- a/media-video/kmplayer/kmplayer-0.11.0a.ebuild
+++ b/media-video/kmplayer/kmplayer-0.11.0a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.11.0a.ebuild,v 1.4 2009/03/15 15:16:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.11.0a.ebuild,v 1.5 2009/04/06 11:56:28 scarabeus Exp $
 
 EAPI="2"
 
@@ -21,11 +21,13 @@ DEPEND="
 	|| ( media-sound/phonon x11-libs/qt-phonon )
 	x11-libs/libXv
 	cairo? ( x11-libs/cairo )
-	!kdeprefix? ( !media-video/kmplayer:0 )
-	npp? ( >=dev-libs/nspr-4.6.7
-			x11-libs/gtk+ )
+	npp? (
+		>=dev-libs/nspr-4.6.7
+		x11-libs/gtk+
+	)
 "
 RDEPEND="${DEPEND}
+	!media-video/kmplayer:0
 	media-video/mplayer"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-video/kplayer/ChangeLog b/media-video/kplayer/ChangeLog
index 06e2cdb26ab2..9e6ada1c4f3b 100644
--- a/media-video/kplayer/ChangeLog
+++ b/media-video/kplayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/kplayer
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/ChangeLog,v 1.37 2009/02/27 12:35:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/ChangeLog,v 1.38 2009/04/06 11:59:41 scarabeus Exp $
+
+  06 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> kplayer-0.7.ebuild:
+  Preparation for new eclass. Unprefixing misc apps.
 
   27 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org> kplayer-0.7.ebuild:
   Update deps to block old kplayer with -kdeprefix. Per bug #259868.
diff --git a/media-video/kplayer/kplayer-0.7.ebuild b/media-video/kplayer/kplayer-0.7.ebuild
index f6f367ebd270..6744a2fb849b 100644
--- a/media-video/kplayer/kplayer-0.7.ebuild
+++ b/media-video/kplayer/kplayer-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.7.ebuild,v 1.3 2009/02/27 12:35:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.7.ebuild,v 1.4 2009/04/06 11:59:41 scarabeus Exp $
 
 EAPI="2"
 
@@ -17,8 +17,8 @@ SLOT="0.7"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-DEPEND="!kdeprefix? ( !media-video/kplayer:0 )"
 RDEPEND="${DEPEND}
+	!media-video/kplayer:0
 	>=media-video/mplayer-1.0_rc1"
 
 CMAKE_IN_SOURCE_BUILD="1"
diff --git a/media-video/mplayerthumbs/ChangeLog b/media-video/mplayerthumbs/ChangeLog
index 6b25b59a885a..14f2f0b63877 100644
--- a/media-video/mplayerthumbs/ChangeLog
+++ b/media-video/mplayerthumbs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayerthumbs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayerthumbs/ChangeLog,v 1.13 2009/03/16 19:25:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayerthumbs/ChangeLog,v 1.14 2009/04/06 11:57:55 scarabeus Exp $
+
+  06 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  -mplayerthumbs-1.1.ebuild, mplayerthumbs-1.2.ebuild:
+  Preparation for new eclass. Unprefixing misc apps.
 
   16 Mar 2009; Brent Baude <ranger@gentoo.org> ChangeLog:
   Marking mplayerthumbs-1.2 ~ppc for bug 258454
diff --git a/media-video/mplayerthumbs/mplayerthumbs-1.1.ebuild b/media-video/mplayerthumbs/mplayerthumbs-1.1.ebuild
deleted file mode 100644
index e1540cc0ffe9..000000000000
--- a/media-video/mplayerthumbs/mplayerthumbs-1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayerthumbs/mplayerthumbs-1.1.ebuild,v 1.4 2009/03/03 16:14:28 scarabeus Exp $
-
-EAPI="2"
-
-inherit kde4-base
-
-DESCRIPTION="A Thumbnail Generator for Video Files on Konqueror."
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=41180"
-SRC_URI="http://www.kde-apps.org/CONTENT/content-files/41180-${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="!kdeprefix? ( !media-video/mplayerthumbs:0 )
-	|| (
-		>=kde-base/dolphin-${KDE_MINIMAL}[kdeprefix=]
-		>=kde-base/konqueror-${KDE_MINIMAL}[kdeprefix=]
-	)
-	|| (
-		media-video/mplayer
-		media-video/mplayer-bin
-		)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	sed -i \
-		-e "s:\${KDE4_KDECORE_LIBS}:\${KDE4_KDECORE_LIBS} \${KDE4_KIO_LIBS}:g" \
-		"${S}"/src/CMakeLists.txt || die "fixing linkage failed"
-}
diff --git a/media-video/mplayerthumbs/mplayerthumbs-1.2.ebuild b/media-video/mplayerthumbs/mplayerthumbs-1.2.ebuild
index 61571ed5c705..f58d8ead69de 100644
--- a/media-video/mplayerthumbs/mplayerthumbs-1.2.ebuild
+++ b/media-video/mplayerthumbs/mplayerthumbs-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayerthumbs/mplayerthumbs-1.2.ebuild,v 1.3 2009/03/16 19:22:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayerthumbs/mplayerthumbs-1.2.ebuild,v 1.4 2009/04/06 11:57:55 scarabeus Exp $
 
 EAPI="2"
 
@@ -15,14 +15,16 @@ SLOT="1"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-DEPEND="!kdeprefix? ( !media-video/mplayerthumbs:0 )
+DEPEND="
 	|| (
-		>=kde-base/dolphin-${KDE_MINIMAL}[kdeprefix=]
-		>=kde-base/konqueror-${KDE_MINIMAL}[kdeprefix=]
+		>=kde-base/dolphin-${KDE_MINIMAL}
+		>=kde-base/konqueror-${KDE_MINIMAL}
 	)
 	|| (
 		media-video/mplayer
 		media-video/mplayer-bin
-		)
+	)
+"
+RDEPEND="${DEPEND}
+	!media-video/mplayerthumbs:0
 "
-RDEPEND="${DEPEND}"