[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     fc05d1df206662ce5b2a61ed6a5964db421c1e76
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  6 19:54:54 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Mar  6 19:54:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fc05d1df

[eclass] Drop EAPI 4 support.

 eclass/kde4-base.eclass      | 11 ++---------
 eclass/kde4-functions.eclass |  4 ++--
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 39b8f11..ff5ecd3 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -10,7 +10,7 @@
 # The kde4-base.eclass provides support for building KDE4 based ebuilds
 # and KDE4 applications.
 #
-# NOTE: KDE 4 ebuilds currently support EAPIs 4 and 5.  This will be
+# NOTE: KDE 4 ebuilds currently support EAPI 5. This will be
 # reviewed over time as new EAPI versions are approved.
 
 if [[ -z ${_KDE4_BASE_ECLASS} ]]; then
@@ -66,14 +66,7 @@ KDE_MINIMAL="${KDE_MINIMAL:-4.4}"
 # Set slot for KDEBASE known packages
 case ${KDEBASE} in
 	kde-base)
-		case ${EAPI} in
-			5)
-				SLOT=4/$(get_version_component_range 1-2)
-				;;
-			*)
-				SLOT=4
-				;;
-		esac
+		SLOT=4/$(get_version_component_range 1-2)
 		KDE_MINIMAL="${PV}"
 		;;
 	kdevelop)

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 51e70d6..7bc70ad 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -17,9 +17,9 @@ inherit versionator
 
 # @ECLASS-VARIABLE: EAPI
 # @DESCRIPTION:
-# Currently kde4 eclasses support EAPI 4 and 5.
+# Currently kde4 eclasses support EAPI 5.
 case ${EAPI} in
-	4|5) : ;;
+	5) : ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac