Stabilise latest on amd64 and x86. Drop older.

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

3 files changed, 18 insertions, 56 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 01317d122552..f65cfc7a332a 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/kmplayer
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.141 2010/10/05 10:50:54 tampakrap Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.142 2011/01/30 18:40:24 scarabeus Exp $
+
+  30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kmplayer-0.11.2b.ebuild, kmplayer-0.11.2c.ebuild:
+  Stabilise latest on amd64 and x86. Drop older.
 
 *kmplayer-0.11.2c (05 Oct 2010)
 
diff --git a/media-video/kmplayer/kmplayer-0.11.2b.ebuild b/media-video/kmplayer/kmplayer-0.11.2b.ebuild
deleted file mode 100644
index d1dc5016be2d..000000000000
--- a/media-video/kmplayer/kmplayer-0.11.2b.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.11.2b.ebuild,v 1.3 2010/07/15 10:02:31 fauli Exp $
-
-EAPI=2
-KDE_LINGUAS="cs da de el en_GB es et fr ga gl it ja km ku lt lv mai nb nds nl
-nn pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend."
-HOMEPAGE="http://kmplayer.kde.org/"
-SRC_URI="http://kmplayer.kde.org/pkgs/${P}.tar.bz2"
-
-LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="cairo debug expat handbook npp"
-
-DEPEND="media-sound/phonon
-	expat? ( >=dev-libs/expat-2.0.1 )
-	cairo? ( x11-libs/cairo
-		x11-libs/pango )
-	npp? ( dev-libs/dbus-glib
-		>=x11-libs/gtk+-2.10.14:2 )"
-RDEPEND="${DEPEND}
-	media-video/mplayer"
-
-DOCS="AUTHORS ChangeLog README TODO"
-
-src_prepare() {
-	sed -i \
-		-e '/add_subdirectory(icons)/d' \
-		CMakeLists.txt || die
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs+=(
-		$(cmake-utils_use cairo KMPLAYER_BUILT_WITH_CAIRO)
-		$(cmake-utils_use expat KMPLAYER_BUILT_WITH_EXPAT)
-		$(cmake-utils_use npp KMPLAYER_BUILT_WITH_NPP)
-		)
-
-	kde4-base_src_configure
-}
diff --git a/media-video/kmplayer/kmplayer-0.11.2c.ebuild b/media-video/kmplayer/kmplayer-0.11.2c.ebuild
index 79a7f52cadb7..21668d20c09c 100644
--- a/media-video/kmplayer/kmplayer-0.11.2c.ebuild
+++ b/media-video/kmplayer/kmplayer-0.11.2c.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.11.2c.ebuild,v 1.1 2010/10/05 10:50:54 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.11.2c.ebuild,v 1.2 2011/01/30 18:40:24 scarabeus Exp $
 
-EAPI=2
+EAPI=3
 KDE_LINGUAS="cs da de el en_GB es et fr ga gl it ja km ku lt lv mai nb nds nl
 nn pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
 inherit kde4-base
@@ -13,15 +13,19 @@ SRC_URI="http://kmplayer.kde.org/pkgs/${P}.tar.bz2"
 
 LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cairo debug expat handbook npp"
 
 DEPEND="media-sound/phonon
 	expat? ( >=dev-libs/expat-2.0.1 )
-	cairo? ( x11-libs/cairo
-		x11-libs/pango )
-	npp? ( dev-libs/dbus-glib
-		>=x11-libs/gtk+-2.10.14:2 )"
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango
+	)
+	npp? (
+		dev-libs/dbus-glib
+		>=x11-libs/gtk+-2.10.14:2
+	)"
 RDEPEND="${DEPEND}
 	media-video/mplayer"