Drop support for eapi0 and 1 (#530046)

2 files changed, 14 insertions, 24 deletions

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index d1e70a95cb89..fe8fa7ac4f7a 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1516 2015/01/28 13:48:58 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1517 2015/01/29 09:59:51 pacho Exp $
+
+  29 Jan 2015; Pacho Ramos <pacho@gentoo.org> gnome2.eclass:
+  Drop support for eapi0 and 1 (#530046)
 
   28 Jan 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass,
   mysql-cmake.eclass:
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 4cc2dcbdd207..661cfa091400 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.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/gnome2.eclass,v 1.127 2014/12/16 00:04:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.128 2015/01/29 09:59:51 pacho Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -13,16 +13,6 @@
 inherit eutils fdo-mime libtool gnome.org gnome2-utils
 
 case "${EAPI:-0}" in
-	0|1)
-		eqawarn
-		eqawarn "${CATEGORY}/${PF}: EAPI 0/1 support is now deprecated."
-		eqawarn "If you are the package maintainer, please"
-		eqawarn "update this package to a newer EAPI."
-		eqawarn "Support for EAPIs 0 and 1 for gnome2.eclass will be dropped"
-		eqawarn "in a month (around 23rd December)."
-		eqawarn
-		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
-		;;
 	2|3|4|5)
 		EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
 		;;
@@ -39,7 +29,7 @@ G2CONF=${G2CONF:-""}
 # @DESCRIPTION:
 # Should we delete ALL the .la files?
 # NOT to be used without due consideration.
-if has ${EAPI:-0} 0 1 2 3 4; then
+if has ${EAPI:-0} 2 3 4; then
 	GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"}
 else
 	GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""}
@@ -77,14 +67,12 @@ if [[ ${GCONF_DEBUG} != "no" ]]; then
 	IUSE="debug"
 fi
 
-
 # @FUNCTION: gnome2_src_unpack
 # @DESCRIPTION:
 # Stub function for old EAPI.
 gnome2_src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	has ${EAPI:-0} 0 1 && gnome2_src_prepare
 }
 
 # @FUNCTION: gnome2_src_prepare
@@ -102,7 +90,7 @@ gnome2_src_prepare() {
 	gnome2_disable_deprecation_warning
 
 	# Run libtoolize
-	if has ${EAPI:-0} 0 1 2 3; then
+	if has ${EAPI:-0} 2 3; then
 		elibtoolize ${ELTCONF}
 	else
 		# Everything is fatal EAPI 4 onwards
@@ -130,7 +118,7 @@ gnome2_src_configure() {
 	# rebuild docs.
 	# Preserve old behavior for older EAPI.
 	if grep -q "enable-gtk-doc" "${ECONF_SOURCE:-.}"/configure ; then
-		if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then
+		if has ${EAPI:-0} 2 3 4 && in_iuse doc ; then
 			G2CONF="$(use_enable doc gtk-doc) ${G2CONF}"
 		else
 			G2CONF="--disable-gtk-doc ${G2CONF}"
@@ -149,7 +137,7 @@ gnome2_src_configure() {
 	fi
 
 	# Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308
-	if has ${EAPI:-0} 0 1 2 3 4; then
+	if has ${EAPI:-0} 2 3 4; then
 		if grep -q "disable-silent-rules" "${ECONF_SOURCE:-.}"/configure; then
 			G2CONF="--disable-silent-rules ${G2CONF}"
 		fi
@@ -183,9 +171,8 @@ gnome2_src_configure() {
 
 # @FUNCTION: gnome2_src_compile
 # @DESCRIPTION:
-# Stub function for old EAPI.
+# Only default src_compile for now
 gnome2_src_compile() {
-	has ${EAPI:-0} 0 1 && gnome2_src_configure "$@"
 	emake || die "compile failure"
 }
 
@@ -194,7 +181,7 @@ gnome2_src_compile() {
 # Gnome specific install. Handles typical GConf and scrollkeeper setup
 # in packages and removal of .la files if requested
 gnome2_src_install() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
+	has ${EAPI:-0} 2 && ! use prefix && ED="${D}"
 	# if this is not present, scrollkeeper-update may segfault and
 	# create bogus directories in /var/lib/
 	local sk_tmp_dir="/var/lib/scrollkeeper"
@@ -218,7 +205,7 @@ gnome2_src_install() {
 	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 	# Handle documentation as 'default' for eapi5 and newer, bug #373131
-	if has ${EAPI:-0} 0 1 2 3 4; then
+	if has ${EAPI:-0} 2 3 4; then
 		# Manual document installation
 		if [[ -n "${DOCS}" ]]; then
 			dodoc ${DOCS} || die "dodoc failed"
@@ -239,7 +226,7 @@ gnome2_src_install() {
 	rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
 
 	# Delete all .la files
-	if has ${EAPI:-0} 0 1 2 3 4; then
+	if has ${EAPI:-0} 2 3 4; then
 		if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
 			ebegin "Removing .la files"
 			if ! use_if_iuse static-libs ; then