4 files changed, 8 insertions, 110 deletions
diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index f01709911e27..582ee05fd701 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konqueror
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.198 2011/03/04 17:59:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.199 2011/04/06 14:18:53 scarabeus Exp $
+
+*konqueror-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -konqueror-4.5.5.ebuild,
+  -konqueror-4.6.0.ebuild, -konqueror-4.6.1.ebuild, +konqueror-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *konqueror-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/konqueror/konqueror-4.5.5.ebuild b/kde-base/konqueror/konqueror-4.5.5.ebuild
deleted file mode 100644
index 9fa2b940da9f..000000000000
--- a/kde-base/konqueror/konqueror-4.5.5.ebuild
+++ /dev/null
@@ -1,54 +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/konqueror/konqueror-4.5.5.ebuild,v 1.1 2011/01/10 11:53:37 tampakrap Exp $
-
-EAPI="3"
-
-KDE_HANDBOOK="optional"
-KMNAME="kdebase-apps"
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KDE: Web browser, file manager, ..."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bookmarks debug svg thumbnail"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT="test"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kfind)
-	$(add_kdebase_dep kfmclient)
-	bookmarks? ( $(add_kdebase_dep keditbookmarks) )
-	svg? ( $(add_kdebase_dep svgpart) )
-"
-PDEPEND="
-	thumbnail? ( $(add_kdebase_dep mplayerthumbs) )
-"
-
-KMEXTRACTONLY="
-	konqueror/client/
-	lib/konq/
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	kde4-meta_src_prepare
-
-	# Do not install *.desktop files for kfmclient
-	sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
-		|| die "Failed to omit .desktop files"
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	echo
-	elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
-	elog "emerge -1 kde-base/dolphin:${SLOT}"
-	elog
-	elog "To use Java on webpages: emerge jre"
-	echo
-}
diff --git a/kde-base/konqueror/konqueror-4.6.0.ebuild b/kde-base/konqueror/konqueror-4.6.0.ebuild
deleted file mode 100644
index 0f5f165610e3..000000000000
--- a/kde-base/konqueror/konqueror-4.6.0.ebuild
+++ /dev/null
@@ -1,54 +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/konqueror/konqueror-4.6.0.ebuild,v 1.1 2011/01/26 20:28:31 alexxy Exp $
-
-EAPI="3"
-
-KDE_HANDBOOK="optional"
-KMNAME="kdebase-apps"
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KDE: Web browser, file manager, ..."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bookmarks debug svg thumbnail"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT="test"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kfind)
-	$(add_kdebase_dep kfmclient)
-	bookmarks? ( $(add_kdebase_dep keditbookmarks) )
-	svg? ( $(add_kdebase_dep svgpart) )
-"
-PDEPEND="
-	thumbnail? ( $(add_kdebase_dep mplayerthumbs) )
-"
-
-KMEXTRACTONLY="
-	konqueror/client/
-	lib/konq/
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	kde4-meta_src_prepare
-
-	# Do not install *.desktop files for kfmclient
-	sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
-		|| die "Failed to omit .desktop files"
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	echo
-	elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
-	elog "emerge -1 kde-base/dolphin:${SLOT}"
-	elog
-	elog "To use Java on webpages: emerge jre"
-	echo
-}
diff --git a/kde-base/konqueror/konqueror-4.6.1.ebuild b/kde-base/konqueror/konqueror-4.6.2.ebuild
index 4c439cb1a541..f3a169481c2d 100644
--- a/kde-base/konqueror/konqueror-4.6.1.ebuild
+++ b/kde-base/konqueror/konqueror-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/konqueror/konqueror-4.6.1.ebuild,v 1.1 2011/03/04 17:59:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.6.2.ebuild,v 1.1 2011/04/06 14:18:53 scarabeus Exp $
 
 EAPI=3