summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-04-06 14:19:31 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-04-06 14:19:31 +0000
commitfb68bba1f0227eb362b9438dc7956a901d433d9a (patch)
tree3c781a7ac4011a69fad3c3b0f5b3d20bbac253c6 /kde-base/solid-runtime
parentVersion bump to rc2 for both 1.8.1 and 1.7.6; move plugins for 1.8 to /usr/li... (diff)
downloadgentoo-2-fb68bba1f0227eb362b9438dc7956a901d433d9a.tar.gz
gentoo-2-fb68bba1f0227eb362b9438dc7956a901d433d9a.tar.bz2
gentoo-2-fb68bba1f0227eb362b9438dc7956a901d433d9a.zip
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)
Diffstat (limited to 'kde-base/solid-runtime')
-rw-r--r--kde-base/solid-runtime/ChangeLog9
-rw-r--r--kde-base/solid-runtime/solid-runtime-4.5.5.ebuild26
-rw-r--r--kde-base/solid-runtime/solid-runtime-4.6.0.ebuild29
-rw-r--r--kde-base/solid-runtime/solid-runtime-4.6.2.ebuild (renamed from kde-base/solid-runtime/solid-runtime-4.6.1.ebuild)2
4 files changed, 9 insertions, 57 deletions
diff --git a/kde-base/solid-runtime/ChangeLog b/kde-base/solid-runtime/ChangeLog
index 530414cb5c33..508b32cd5718 100644
--- a/kde-base/solid-runtime/ChangeLog
+++ b/kde-base/solid-runtime/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for kde-base/solid-runtime
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/ChangeLog,v 1.28 2011/03/04 17:59:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/ChangeLog,v 1.29 2011/04/06 14:18:51 scarabeus Exp $
+
+*solid-runtime-4.6.2 (06 Apr 2011)
+
+ 06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ -solid-runtime-4.5.5.ebuild, -solid-runtime-4.6.0.ebuild,
+ -solid-runtime-4.6.1.ebuild, +solid-runtime-4.6.2.ebuild:
+ Version bump KDE SC 4.6.2
*solid-runtime-4.6.1 (04 Mar 2011)
diff --git a/kde-base/solid-runtime/solid-runtime-4.5.5.ebuild b/kde-base/solid-runtime/solid-runtime-4.5.5.ebuild
deleted file mode 100644
index 344956d3534f..000000000000
--- a/kde-base/solid-runtime/solid-runtime-4.5.5.ebuild
+++ /dev/null
@@ -1,26 +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/solid-runtime/solid-runtime-4.5.5.ebuild,v 1.1 2011/01/10 11:53:49 tampakrap Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-KMNOMODULE=true
-inherit kde4-meta
-
-DESCRIPTION="KDE SC solid runtime modules (autoeject, automounter and others)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# Packages merged around 4.3.77
-add_blocker solidautoeject
-add_blocker solid-device-automounter
-add_blocker solid-hardware
-add_blocker soliduiserver
-
-KMEXTRA="
- solidautoeject/
- solid-device-automounter/
- solid-hardware/
- soliduiserver/
-"
diff --git a/kde-base/solid-runtime/solid-runtime-4.6.0.ebuild b/kde-base/solid-runtime/solid-runtime-4.6.0.ebuild
deleted file mode 100644
index e62aeb520e45..000000000000
--- a/kde-base/solid-runtime/solid-runtime-4.6.0.ebuild
+++ /dev/null
@@ -1,29 +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/solid-runtime/solid-runtime-4.6.0.ebuild,v 1.1 2011/01/26 20:28:26 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-runtime"
-KMNOMODULE=true
-inherit kde4-meta
-
-DESCRIPTION="KDE SC solid runtime modules (autoeject, automounter and others)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# Packages merged around 4.3.77
-add_blocker solidautoeject
-add_blocker solid-device-automounter
-add_blocker solid-hardware
-add_blocker soliduiserver
-# Moved away from workspace
-add_blocker solid '<4.5.69'
-
-KMEXTRA="
- solid-device-automounter/
- solid-hardware/
- solid-networkstatus/
- solidautoeject/
- soliduiserver/
-"
diff --git a/kde-base/solid-runtime/solid-runtime-4.6.1.ebuild b/kde-base/solid-runtime/solid-runtime-4.6.2.ebuild
index 14577c406765..2a606c7abde6 100644
--- a/kde-base/solid-runtime/solid-runtime-4.6.1.ebuild
+++ b/kde-base/solid-runtime/solid-runtime-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/solid-runtime/solid-runtime-4.6.1.ebuild,v 1.1 2011/03/04 17:59:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/solid-runtime-4.6.2.ebuild,v 1.1 2011/04/06 14:18:51 scarabeus Exp $
EAPI=3