diff options
| author |   Johannes Huber <johu@gentoo.org> | 2015-03-29 10:29:42 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2015-03-29 10:29:42 +0000 |
| commit | ef5f9662163f4097d172b6c24695503814c138d6 (patch) | |
| tree | 4269052997fa8ad3c1216a744e4c24f268bae33d /eclass | |
| parent | Stable for HPPA (bug #534012). (diff) | |
| download | gentoo-2-ef5f9662163f4097d172b6c24695503814c138d6.tar.gz gentoo-2-ef5f9662163f4097d172b6c24695503814c138d6.tar.bz2 gentoo-2-ef5f9662163f4097d172b6c24695503814c138d6.zip | |
Drop EAPI 4 support.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/kde4-base.eclass | 13 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 6 | ||||
| -rw-r--r-- | eclass/kde4-meta-pkg.eclass | 4 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 4 |
5 files changed, 15 insertions, 18 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index e208479f9402..8b2cb5537b1c 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.1577 2015/03/28 22:01:14 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1578 2015/03/29 10:29:42 johu Exp $ + + 29 Mar 2015; Johannes Huber <johu@gentoo.org> kde4-base.eclass, + kde4-functions.eclass, kde4-meta.eclass, kde4-meta-pkg.eclass: + Drop EAPI 4 support. 28 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -rox-0install.eclass, -rox.eclass: diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index d636324744c5..59d1b6ea4e9b 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.148 2015/03/21 18:22:22 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.149 2015/03/29 10:29:42 johu Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -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 0597484e2ecc..db02b19071e3 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.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-functions.eclass,v 1.75 2015/02/11 04:29:06 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.76 2015/03/29 10:29:42 johu Exp $ # @ECLASS: kde4-functions.eclass # @MAINTAINER: @@ -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 diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass index f7ea13057337..5ec3ed1398f4 100644 --- a/eclass/kde4-meta-pkg.eclass +++ b/eclass/kde4-meta-pkg.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.13 2014/07/11 08:21:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.14 2015/03/29 10:29:42 johu Exp $ # @ECLASS: kde4-meta-pkg.eclass # @MAINTAINER: diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 26068f7199f5..e44bc6ce3e31 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.77 2014/07/11 08:21:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.78 2015/03/29 10:29:42 johu Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: |