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, 72 deletions

diff --git a/kde-base/phonon-kde/ChangeLog b/kde-base/phonon-kde/ChangeLog
index 1328ada20ff1..5813f3783995 100644
--- a/kde-base/phonon-kde/ChangeLog
+++ b/kde-base/phonon-kde/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/phonon-kde
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.77 2011/03/26 17:22:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.78 2011/04/06 14:19:00 scarabeus Exp $
+
+*phonon-kde-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -phonon-kde-4.5.5.ebuild, -phonon-kde-4.6.0.ebuild, -phonon-kde-4.6.1.ebuild,
+  +phonon-kde-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
   26 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   phonon-kde-4.4.5.ebuild, phonon-kde-4.5.5.ebuild, phonon-kde-4.6.0.ebuild,
diff --git a/kde-base/phonon-kde/phonon-kde-4.5.5.ebuild b/kde-base/phonon-kde/phonon-kde-4.5.5.ebuild
deleted file mode 100644
index 2c4ea5f82c56..000000000000
--- a/kde-base/phonon-kde/phonon-kde-4.5.5.ebuild
+++ /dev/null
@@ -1,32 +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/phonon-kde/phonon-kde-4.5.5.ebuild,v 1.3 2011/03/26 17:22:37 dilfridge Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-KMMODULE="phonon"
-inherit kde4-meta
-
-DESCRIPTION="Phonon KDE Integration"
-HOMEPAGE="http://phonon.kde.org"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="alsa debug xine"
-
-DEPEND="
-	>=media-libs/phonon-4.4.2[xine?]
-	alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_tests=OFF
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with xine)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/phonon-kde/phonon-kde-4.6.0.ebuild b/kde-base/phonon-kde/phonon-kde-4.6.0.ebuild
deleted file mode 100644
index 789d3b226fc5..000000000000
--- a/kde-base/phonon-kde/phonon-kde-4.6.0.ebuild
+++ /dev/null
@@ -1,38 +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/phonon-kde/phonon-kde-4.6.0.ebuild,v 1.2 2011/03/26 17:22:37 dilfridge Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-KMMODULE="phonon"
-inherit kde4-meta
-
-DESCRIPTION="Phonon KDE Integration"
-HOMEPAGE="http://phonon.kde.org"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="alsa debug xine pulseaudio"
-
-DEPEND="
-	>=media-libs/phonon-4.4.3[xine?]
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_tests=OFF
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with xine)
-		$(cmake-utils_use_with pulseaudio PulseAudio)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/phonon-kde/phonon-kde-4.6.1.ebuild b/kde-base/phonon-kde/phonon-kde-4.6.2.ebuild
index 7af0d8705644..bf97c400f0bf 100644
--- a/kde-base/phonon-kde/phonon-kde-4.6.1.ebuild
+++ b/kde-base/phonon-kde/phonon-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/phonon-kde/phonon-kde-4.6.1.ebuild,v 1.2 2011/03/26 17:22:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.6.2.ebuild,v 1.1 2011/04/06 14:19:00 scarabeus Exp $
 
 EAPI=3