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, 8 insertions, 196 deletions

diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog
index 45bf44eb03da..5a65bcc80fd6 100644
--- a/kde-base/kde-env/ChangeLog
+++ b/kde-base/kde-env/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kde-env
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.96 2011/03/04 18:00:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.97 2011/04/06 14:19:24 scarabeus Exp $
+
+*kde-env-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -kde-env-4.5.5.ebuild,
+  -kde-env-4.6.0.ebuild, -kde-env-4.6.1.ebuild, +kde-env-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *kde-env-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/kde-env/kde-env-4.5.5.ebuild b/kde-base/kde-env/kde-env-4.5.5.ebuild
deleted file mode 100644
index 3a3e1d8eb046..000000000000
--- a/kde-base/kde-env/kde-env-4.5.5.ebuild
+++ /dev/null
@@ -1,97 +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/kde-env/kde-env-4.5.5.ebuild,v 1.1 2011/01/10 11:53:24 tampakrap Exp $
-
-EAPI="3"
-
-CMAKE_REQUIRED="never"
-KDE_REQUIRED="never"
-inherit kde4-base
-
-DESCRIPTION="Environment setting required for all KDE4 apps to run."
-HOMEPAGE="http://kde.org"
-[[ ${PV} = *9999* ]] && ESVN_REPO_URI="" || SRC_URI=""
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="as-is"
-IUSE="aqua"
-
-add_blocker kdelibs 4.2.2-r1 '<3.5.10-r3:3.5' 4.2.70:4.3
-
-S=${WORKDIR}
-
-src_unpack() {
-	:
-}
-
-src_prepare() {
-	:
-}
-
-src_install() {
-	if use kdeprefix; then
-		# List all the multilib libdirs
-		local _libdir _libdirs
-		for _libdir in $(get_all_libdirs); do
-			_libdirs+=":${EKDEDIR}/${_libdir}"
-		done
-		_libdirs=${_libdirs#:}
-
-		# number goes down with version
-		cat <<-EOF > 43kdepaths-${SLOT}
-PATH="${EKDEDIR}/bin"
-ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
-LDPATH="${_libdirs}"
-MANPATH="${EKDEDIR}/share/man"
-CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/share/config"
-#KDE_IS_PRELINKED=1
-PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
-XDG_DATA_DIRS="${EKDEDIR}/share"
-EOF
-		doenvd 43kdepaths-${SLOT}
-		cat <<-EOF > 50-kde-${SLOT}
-SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
-EOF
-		insinto /etc/revdep-rebuild
-		doins 50-kde-${SLOT}
-
-		# kdeglobals needed to make third party apps installed in /usr work
-		cat <<-EOF > kdeglobals
-[Directories][\$i]
-prefixes=${EPREFIX}/usr
-EOF
-		insinto ${KDEDIR}/share/config
-		doins kdeglobals
-
-		KDE_X="KDE-${SLOT}"
-	else
-		# Much simpler for the FHS compliant -kdeprefix install
-		# number goes down with version
-		cat <<-EOF > 43kdepaths
-CONFIG_PROTECT="/usr/share/config"
-#KDE_IS_PRELINKED=1
-EOF
-		doenvd 43kdepaths
-
-		KDE_X="KDE-4"
-	fi
-
-	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
-	cat <<EOF > 11-xdg-menu-kde-${SLOT}
-#!/bin/sh
-
-if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then
-	export XDG_MENU_PREFIX="kde-${SLOT}-"
-fi
-EOF
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe 11-xdg-menu-kde-${SLOT} || die "doexe failed"
-}
-
-pkg_preinst() {
-	:
-}
-
-src_test() {
-	:
-}
diff --git a/kde-base/kde-env/kde-env-4.6.0.ebuild b/kde-base/kde-env/kde-env-4.6.0.ebuild
deleted file mode 100644
index fda80dac22e0..000000000000
--- a/kde-base/kde-env/kde-env-4.6.0.ebuild
+++ /dev/null
@@ -1,97 +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/kde-env/kde-env-4.6.0.ebuild,v 1.1 2011/01/26 20:28:41 alexxy Exp $
-
-EAPI="3"
-
-CMAKE_REQUIRED="never"
-KDE_REQUIRED="never"
-inherit kde4-base
-
-DESCRIPTION="Environment setting required for all KDE4 apps to run."
-HOMEPAGE="http://kde.org"
-[[ ${PV} = *9999* ]] && ESVN_REPO_URI="" || SRC_URI=""
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="as-is"
-IUSE="aqua"
-
-add_blocker kdelibs 4.2.2-r1 '<3.5.10-r3:3.5' 4.2.70:4.3
-
-S=${WORKDIR}
-
-src_unpack() {
-	:
-}
-
-src_prepare() {
-	:
-}
-
-src_install() {
-	if use kdeprefix; then
-		# List all the multilib libdirs
-		local _libdir _libdirs
-		for _libdir in $(get_all_libdirs); do
-			_libdirs+=":${EKDEDIR}/${_libdir}"
-		done
-		_libdirs=${_libdirs#:}
-
-		# number goes down with version
-		cat <<-EOF > 43kdepaths-${SLOT}
-PATH="${EKDEDIR}/bin"
-ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
-LDPATH="${_libdirs}"
-MANPATH="${EKDEDIR}/share/man"
-CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/share/config"
-#KDE_IS_PRELINKED=1
-PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
-XDG_DATA_DIRS="${EKDEDIR}/share"
-EOF
-		doenvd 43kdepaths-${SLOT}
-		cat <<-EOF > 50-kde-${SLOT}
-SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
-EOF
-		insinto /etc/revdep-rebuild
-		doins 50-kde-${SLOT}
-
-		# kdeglobals needed to make third party apps installed in /usr work
-		cat <<-EOF > kdeglobals
-[Directories][\$i]
-prefixes=${EPREFIX}/usr
-EOF
-		insinto ${KDEDIR}/share/config
-		doins kdeglobals
-
-		KDE_X="KDE-${SLOT}"
-	else
-		# Much simpler for the FHS compliant -kdeprefix install
-		# number goes down with version
-		cat <<-EOF > 43kdepaths
-CONFIG_PROTECT="/usr/share/config"
-#KDE_IS_PRELINKED=1
-EOF
-		doenvd 43kdepaths
-
-		KDE_X="KDE-4"
-	fi
-
-	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
-	cat <<EOF > 11-xdg-menu-kde-${SLOT}
-#!/bin/sh
-
-if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then
-	export XDG_MENU_PREFIX="kde-${SLOT}-"
-fi
-EOF
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe 11-xdg-menu-kde-${SLOT} || die "doexe failed"
-}
-
-pkg_preinst() {
-	:
-}
-
-src_test() {
-	:
-}
diff --git a/kde-base/kde-env/kde-env-4.6.1.ebuild b/kde-base/kde-env/kde-env-4.6.2.ebuild
index 4b638e6b1183..a69d925cb105 100644
--- a/kde-base/kde-env/kde-env-4.6.1.ebuild
+++ b/kde-base/kde-env/kde-env-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/kde-env/kde-env-4.6.1.ebuild,v 1.1 2011/03/04 18:00:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.6.2.ebuild,v 1.1 2011/04/06 14:19:24 scarabeus Exp $
 
 EAPI=3