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/kdeutils-meta
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/kdeutils-meta')
-rw-r--r--kde-base/kdeutils-meta/ChangeLog9
-rw-r--r--kde-base/kdeutils-meta/kdeutils-meta-4.5.5.ebuild31
-rw-r--r--kde-base/kdeutils-meta/kdeutils-meta-4.6.0.ebuild31
-rw-r--r--kde-base/kdeutils-meta/kdeutils-meta-4.6.2.ebuild (renamed from kde-base/kdeutils-meta/kdeutils-meta-4.6.1.ebuild)11
4 files changed, 11 insertions, 71 deletions
diff --git a/kde-base/kdeutils-meta/ChangeLog b/kde-base/kdeutils-meta/ChangeLog
index be4555a163c5..4374079f5c2c 100644
--- a/kde-base/kdeutils-meta/ChangeLog
+++ b/kde-base/kdeutils-meta/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for kde-base/kdeutils-meta
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/ChangeLog,v 1.169 2011/03/04 18:00:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/ChangeLog,v 1.170 2011/04/06 14:19:01 scarabeus Exp $
+
+*kdeutils-meta-4.6.2 (06 Apr 2011)
+
+ 06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ -kdeutils-meta-4.5.5.ebuild, -kdeutils-meta-4.6.0.ebuild,
+ -kdeutils-meta-4.6.1.ebuild, +kdeutils-meta-4.6.2.ebuild:
+ Version bump KDE SC 4.6.2
*kdeutils-meta-4.6.1 (04 Mar 2011)
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-4.5.5.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.5.5.ebuild
deleted file mode 100644
index a6b0d6f28168..000000000000
--- a/kde-base/kdeutils-meta/kdeutils-meta-4.5.5.ebuild
+++ /dev/null
@@ -1,31 +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/kdeutils-meta/kdeutils-meta-4.5.5.ebuild,v 1.1 2011/01/10 11:53:30 tampakrap Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua cups floppy kdeprefix"
-
-RDEPEND="
- $(add_kdebase_dep ark)
- $(add_kdebase_dep kcalc)
- $(add_kdebase_dep kcharselect)
- $(add_kdebase_dep kdf)
- $(add_kdebase_dep kgpg)
- $(add_kdebase_dep kremotecontrol)
- $(add_kdebase_dep ktimer)
- $(add_kdebase_dep kwallet)
- $(add_kdebase_dep superkaramba)
- $(add_kdebase_dep sweeper)
- $(add_kdebase_dep okteta)
- cups? ( $(add_kdebase_dep printer-applet) )
- floppy? ( $(add_kdebase_dep kfloppy) )
- $(block_other_slots)
-"
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-4.6.0.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.6.0.ebuild
deleted file mode 100644
index 014190152a23..000000000000
--- a/kde-base/kdeutils-meta/kdeutils-meta-4.6.0.ebuild
+++ /dev/null
@@ -1,31 +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/kdeutils-meta/kdeutils-meta-4.6.0.ebuild,v 1.1 2011/01/26 20:28:41 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua cups floppy kdeprefix"
-
-RDEPEND="
- $(add_kdebase_dep ark)
- $(add_kdebase_dep filelight)
- $(add_kdebase_dep kcalc)
- $(add_kdebase_dep kcharselect)
- $(add_kdebase_dep kdf)
- $(add_kdebase_dep kgpg)
- $(add_kdebase_dep kremotecontrol)
- $(add_kdebase_dep ktimer)
- $(add_kdebase_dep kwallet)
- $(add_kdebase_dep superkaramba)
- $(add_kdebase_dep sweeper)
- cups? ( $(add_kdebase_dep printer-applet) )
- floppy? ( $(add_kdebase_dep kfloppy) )
- $(block_other_slots)
-"
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-4.6.1.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.6.2.ebuild
index d76ea726abd9..885678ee79d1 100644
--- a/kde-base/kdeutils-meta/kdeutils-meta-4.6.1.ebuild
+++ b/kde-base/kdeutils-meta/kdeutils-meta-4.6.2.ebuild
@@ -1,17 +1,13 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-4.6.1.ebuild,v 1.1 2011/03/04 18:00:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-4.6.2.ebuild,v 1.1 2011/04/06 14:19:01 scarabeus Exp $
EAPI=3
-inherit kde4-functions
+inherit kde4-meta-pkg
DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua cups floppy kdeprefix"
+IUSE="cups floppy"
RDEPEND="
$(add_kdebase_dep ark)
@@ -27,5 +23,4 @@ RDEPEND="
$(add_kdebase_dep sweeper)
cups? ( $(add_kdebase_dep printer-applet) )
floppy? ( $(add_kdebase_dep kfloppy) )
- $(block_other_slots)
"