[gentoo-commits] proj/kde:master commit in: kde-base/kdeaccessibility-colorschemes/, ...

[gentoo-commits] proj/kde:master commit in: kde-base/kdeaccessibility-colorschemes/, ...

[Jonathan Callen]

commit:     83d81621a526a0cb4ebb1180ff2bff678aeb9e98
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 02:27:01 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Wed May 18 02:27:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=83d81621

Remove kdeaccessibility-{colorschemes,iconthemes}: moved to kdeartwork upstream

---
 .../.kde-live/kdeaccessibility-live                |    2 --
 Documentation/package.keywords/kde-live.keywords   |    2 --
 Documentation/package.unmask/kde-live              |    2 --
 .../kdeaccessibility-colorschemes-9999.ebuild      |   14 --------------
 .../kdeaccessibility-iconthemes-9999.ebuild        |   14 --------------
 .../kdeaccessibility-meta-9999.ebuild              |    2 --
 .../kdeartwork-colorschemes-9999.ebuild            |    3 +++
 .../kdeartwork-iconthemes-9999.ebuild              |    3 +++
 sets/kdeaccessibility-live                         |    2 --
 9 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/Documentation/package.keywords/.kde-live/kdeaccessibility-live b/Documentation/package.keywords/.kde-live/kdeaccessibility-live
index 3d362a1..727bad2 100644
--- a/Documentation/package.keywords/.kde-live/kdeaccessibility-live
+++ b/Documentation/package.keywords/.kde-live/kdeaccessibility-live
@@ -1,7 +1,5 @@
 ~kde-base/jovie-9999 **
 ~kde-base/kaccessible-9999 **
-~kde-base/kdeaccessibility-colorschemes-9999 **
-~kde-base/kdeaccessibility-iconthemes-9999 **
 ~kde-base/kdeaccessibility-meta-9999 **
 ~kde-base/kmag-9999 **
 ~kde-base/kmousetool-9999 **

diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index a6dc40d..7acece7 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -5,8 +5,6 @@
 ~kde-base/kde-l10n-9999 **
 ~kde-base/jovie-9999 **
 ~kde-base/kaccessible-9999 **
-~kde-base/kdeaccessibility-colorschemes-9999 **
-~kde-base/kdeaccessibility-iconthemes-9999 **
 ~kde-base/kdeaccessibility-meta-9999 **
 ~kde-base/kmag-9999 **
 ~kde-base/kmousetool-9999 **

diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index 248192e..1f835b0 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -5,8 +5,6 @@ kde-base/kdeplasma-addons:live
 kde-base/kde-l10n:live
 kde-base/jovie:live
 kde-base/kaccessible:live
-kde-base/kdeaccessibility-colorschemes:live
-kde-base/kdeaccessibility-iconthemes:live
 kde-base/kdeaccessibility-meta:live
 kde-base/kmag:live
 kde-base/kmousetool:live

diff --git a/kde-base/kdeaccessibility-colorschemes/kdeaccessibility-colorschemes-9999.ebuild b/kde-base/kdeaccessibility-colorschemes/kdeaccessibility-colorschemes-9999.ebuild
deleted file mode 100644
index 5009520..0000000
--- a/kde-base/kdeaccessibility-colorschemes/kdeaccessibility-colorschemes-9999.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KMNAME="${PN/-*/}"
-KMMODULE="ColorSchemes"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE high contrast color schemes"
-KEYWORDS=""
-IUSE=""

diff --git a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-9999.ebuild b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-9999.ebuild
deleted file mode 100644
index 89f2f1f..0000000
--- a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-9999.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KMNAME="${PN/-*/}"
-KMMODULE="IconThemes"
-
-inherit kde4-meta
-
-DESCRIPTION="KDE Icon Themes designed with accessibility in mind"
-KEYWORDS=""
-IUSE=""

diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
index 455988c..633947c 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
@@ -12,8 +12,6 @@ IUSE=""
 RDEPEND="
 	$(add_kdebase_dep jovie)
 	$(add_kdebase_dep kaccessible)
-	$(add_kdebase_dep kdeaccessibility-colorschemes)
-	$(add_kdebase_dep kdeaccessibility-iconthemes)
 	$(add_kdebase_dep kmag)
 	$(add_kdebase_dep kmousetool)
 	$(add_kdebase_dep kmouth)

diff --git a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-9999.ebuild b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-9999.ebuild
index 04db12d..b81b248 100644
--- a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-9999.ebuild
+++ b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-9999.ebuild
@@ -11,3 +11,6 @@ inherit kde4-meta
 DESCRIPTION="KDE extra colorschemes"
 KEYWORDS=""
 IUSE=""
+
+# Moved here in 4.7
+add_blocker kdeaccessibility-colorschemes

diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-9999.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-9999.ebuild
index da3437c..e725ecc 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-9999.ebuild
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-9999.ebuild
@@ -16,3 +16,6 @@ IUSE=""
 RDEPEND="
 	!kdeprefix? ( !x11-themes/nuvola )
 "
+
+# Moved here in 4.7
+add_blocker kdeaccessibility-iconthemes

diff --git a/sets/kdeaccessibility-live b/sets/kdeaccessibility-live
index efd41a9..37e3cef 100644
--- a/sets/kdeaccessibility-live
+++ b/sets/kdeaccessibility-live
@@ -1,7 +1,5 @@
 kde-base/jovie:live
 kde-base/kaccessible:live
-kde-base/kdeaccessibility-colorschemes:live
-kde-base/kdeaccessibility-iconthemes:live
 kde-base/kdeaccessibility-meta:live
 kde-base/kmag:live
 kde-base/kmousetool:live