KDE SC 4.6.2 version bump. Drop 4.6.{0,1} and 4.5.5. This is our stable candidate so test and test more. Force due to some unmet deps. Filled as bug #362305.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 9 insertions, 49 deletions

diff --git a/kde-base/nsplugins/ChangeLog b/kde-base/nsplugins/ChangeLog
index 3e182253fab7..b40226ce6e10 100644
--- a/kde-base/nsplugins/ChangeLog
+++ b/kde-base/nsplugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/nsplugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.193 2011/03/05 10:51:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.194 2011/04/06 14:18:53 scarabeus Exp $
+
+*nsplugins-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -nsplugins-4.5.5.ebuild,
+  -nsplugins-4.6.0.ebuild, -nsplugins-4.6.1.ebuild, +nsplugins-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
   05 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   nsplugins-4.6.1.ebuild, +files/nsplugins-4.6.1-enablefinal.patch:
diff --git a/kde-base/nsplugins/nsplugins-4.5.5.ebuild b/kde-base/nsplugins/nsplugins-4.5.5.ebuild
deleted file mode 100644
index 1524b72b9c7f..000000000000
--- a/kde-base/nsplugins/nsplugins-4.5.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.5.5.ebuild,v 1.1 2011/01/10 11:53:47 tampakrap Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	x11-libs/libXt
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep konqueror)
-"
-
-KMEXTRACTONLY="
-	konqueror/settings/
-"
diff --git a/kde-base/nsplugins/nsplugins-4.6.0.ebuild b/kde-base/nsplugins/nsplugins-4.6.0.ebuild
deleted file mode 100644
index 8aea50c5fb98..000000000000
--- a/kde-base/nsplugins/nsplugins-4.6.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.6.0.ebuild,v 1.1 2011/01/26 20:28:31 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	x11-libs/libXt
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep konqueror)
-"
-
-KMEXTRACTONLY="
-	konqueror/settings/
-"
diff --git a/kde-base/nsplugins/nsplugins-4.6.1.ebuild b/kde-base/nsplugins/nsplugins-4.6.2.ebuild
index 82004f21641a..d943b540e384 100644
--- a/kde-base/nsplugins/nsplugins-4.6.1.ebuild
+++ b/kde-base/nsplugins/nsplugins-4.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.6.1.ebuild,v 1.2 2011/03/05 10:51:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.6.2.ebuild,v 1.1 2011/04/06 14:18:53 scarabeus Exp $
 
 EAPI=3
 
@@ -22,4 +22,4 @@ KMEXTRACTONLY="
 	konqueror/settings/
 "
 
-PATCHES=( "${FILESDIR}/${P}"-enablefinal.patch )
+PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch )