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.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 11 insertions, 74 deletions

diff --git a/kde-base/system-config-printer-kde/ChangeLog b/kde-base/system-config-printer-kde/ChangeLog
index 868b3a666d01..322db3eb993f 100644
--- a/kde-base/system-config-printer-kde/ChangeLog
+++ b/kde-base/system-config-printer-kde/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/system-config-printer-kde
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/ChangeLog,v 1.37 2011/03/04 18:00:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/ChangeLog,v 1.38 2011/04/06 14:19:21 scarabeus Exp $
+
+*system-config-printer-kde-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -system-config-printer-kde-4.5.5.ebuild,
+  -system-config-printer-kde-4.6.0.ebuild,
+  -system-config-printer-kde-4.6.1.ebuild,
+  +system-config-printer-kde-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *system-config-printer-kde-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.5.5.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.5.5.ebuild
deleted file mode 100644
index 0585e55dc8a2..000000000000
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.5.5.ebuild
+++ /dev/null
@@ -1,36 +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/system-config-printer-kde/system-config-printer-kde-4.5.5.ebuild,v 1.1 2011/01/10 11:53:50 tampakrap Exp $
-
-EAPI="3"
-
-KMNAME="kdeadmin"
-PYTHON_DEPEND="2"
-inherit python kde4-meta
-
-DESCRIPTION="KDE port of Red Hat's Gnome system-config-printer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=app-admin/system-config-printer-common-1.2.2
-	>=dev-python/pycups-1.9.49
-	$(add_kdebase_dep pykde4)
-"
-RDEPEND="${DEPEND}
-	net-print/cups[dbus]
-"
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-	python_set_active_version 2
-}
-
-src_install() {
-	kde4-meta_src_install
-	python_convert_shebangs -q -r $(python_get_version) "${ED}"
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${PREFIX}share/apps/${PN}"
-}
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.6.0.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.6.0.ebuild
deleted file mode 100644
index a3b986e7b374..000000000000
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.6.0.ebuild
+++ /dev/null
@@ -1,36 +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/system-config-printer-kde/system-config-printer-kde-4.6.0.ebuild,v 1.1 2011/01/26 20:28:45 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdeadmin"
-PYTHON_DEPEND="2"
-inherit python kde4-meta
-
-DESCRIPTION="KDE port of Red Hat's Gnome system-config-printer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=app-admin/system-config-printer-common-1.2.2
-	>=dev-python/pycups-1.9.49
-	$(add_kdebase_dep pykde4)
-"
-RDEPEND="${DEPEND}
-	net-print/cups[dbus]
-"
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-	python_set_active_version 2
-}
-
-src_install() {
-	kde4-meta_src_install
-	python_convert_shebangs -q -r $(python_get_version) "${ED}"
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${PREFIX}share/apps/${PN}"
-}
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.6.1.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.6.2.ebuild
index f7ddd9514ac5..3cc2e8816607 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.6.1.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-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/system-config-printer-kde/system-config-printer-kde-4.6.1.ebuild,v 1.1 2011/03/04 18:00:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/system-config-printer-kde-4.6.2.ebuild,v 1.1 2011/04/06 14:19:21 scarabeus Exp $
 
 EAPI=3