Move various kde-base packages to kde-apps.

3 files changed, 11 insertions, 7 deletions

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 1849568e4efa..5b718925cedb 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1639 2015/06/04 10:36:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1640 2015/06/04 18:49:42 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org> chromium.eclass,
+  kde4-base.eclass:
+  Move various kde-base packages to kde-apps.
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
   Use path_exists from eutils.eclass
diff --git a/eclass/chromium.eclass b/eclass/chromium.eclass
index 895b82203d95..064059babc7e 100644
--- a/eclass/chromium.eclass
+++ b/eclass/chromium.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/chromium.eclass,v 1.11 2015/05/21 12:28:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/chromium.eclass,v 1.12 2015/06/04 18:49:42 kensington Exp $
 
 # @ECLASS: chromium.eclass
 # @MAINTAINER:
@@ -136,7 +136,7 @@ chromium_pkg_postinst() {
 		elog "Depending on your desktop environment, you may need"
 		elog "to install additional packages to get icons on the Downloads page."
 		elog
-		elog "For KDE, the required package is kde-base/oxygen-icons."
+		elog "For KDE, the required package is kde-apps/oxygen-icons."
 		elog
 		elog "For other desktop environments, try one of the following:"
 		elog " - x11-themes/gnome-icon-theme"
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 3bc10ead1f2e..1a2b28de55f8 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.154 2015/06/03 22:36:30 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.155 2015/06/04 18:49:42 kensington Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -328,7 +328,7 @@ fi
 
 # all packages needs oxygen icons for basic iconset
 if [[ ${PN} != oxygen-icons ]]; then
-	kderdepend+=" || ( kde-apps/oxygen-icons $(add_kdebase_dep oxygen-icons '' 4.14.3) )"
+	kderdepend+=" kde-apps/oxygen-icons"
 fi
 
 # add a dependency over kde-l10n
@@ -339,7 +339,7 @@ if [[ ${KDEBASE} != "kde-base" && -n ${KDE_LINGUAS} ]]; then
 		# this can't be done on one line because if user doesn't use any localisation
 		# then he is probably not interested in kde-l10n at all.
 		kderdepend+="
-		linguas_${_lingua}? ( || ( kde-apps/kde4-l10n[linguas_${_lingua}(+)] $(add_kdebase_dep kde-l10n "linguas_${_lingua}(+)") ) )
+		linguas_${_lingua}? ( $(add_kdeapps_dep kde4-l10n "linguas_${_lingua}(+)") )
 		"
 	done
 	unset _lingua
@@ -904,7 +904,7 @@ kde4-base_pkg_postinst() {
 		fi
 		# for all 3rd party soft tell user that he SHOULD install kdebase-startkde or kdebase-runtime-meta
 		if [[ ${KDEBASE} != kde-base ]] && \
-				! has_version 'kde-base/kdebase-runtime-meta' && \
+				! has_version 'kde-apps/kdebase-runtime-meta' && \
 				! has_version 'kde-base/kdebase-startkde'; then
 			if [[ ${KDE_REQUIRED} == always ]] || ( [[ ${KDE_REQUIRED} == optional ]] && use kde ); then
 				echo