From 46905ab1f408389735c90221edd24b2230a54acd Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sat, 18 Apr 2015 13:19:47 +0000 Subject: [PATCH] Ban eapi2 and 3 for gnome2.eclass (#539118) --- eclass/ChangeLog | 5 ++++- eclass/gnome2.eclass | 34 +++++++++------------------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index fd58081a3e0e..de564e593f4f 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.1588 2015/04/14 18:32:51 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1589 2015/04/18 13:19:47 pacho Exp $ + + 18 Apr 2015; Pacho Ramos gnome2.eclass: + Ban eapi2 and 3 for gnome2.eclass (#539118) 14 Apr 2015; php-lib-r1.eclass: Specify :* as slot by default to silence repoman warnings diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 97d5fcc6b83c..a45da6ca40a1 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.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/gnome2.eclass,v 1.130 2015/02/23 10:59:44 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.131 2015/04/18 13:19:47 pacho Exp $ # @ECLASS: gnome2.eclass # @MAINTAINER: @@ -13,16 +13,6 @@ inherit eutils fdo-mime libtool gnome.org gnome2-utils case "${EAPI:-0}" in - 2|3) - eqawarn - eqawarn "${CATEGORY}/${PF}: EAPI 2/3 support is now deprecated." - eqawarn "If you are the package maintainer, please" - eqawarn "update this package to a newer EAPI." - eqawarn "Support for EAPIs 2 and 3 for gnome2.eclass will be dropped" - eqawarn "in a month (around 23rd March)." - eqawarn - EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm - ;; 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} 2 3 4; then +if has ${EAPI:-0} 4; then GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"} else GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""} @@ -94,13 +84,8 @@ gnome2_src_prepare() { gnome2_disable_deprecation_warning # Run libtoolize - if has ${EAPI:-0} 2 3; then - elibtoolize ${ELTCONF} - else - # Everything is fatal EAPI 4 onwards - nonfatal elibtoolize ${ELTCONF} - fi - + # Everything is fatal EAPI 4 onwards + nonfatal elibtoolize ${ELTCONF} } # @FUNCTION: gnome2_src_configure @@ -122,7 +107,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} 2 3 4 && in_iuse doc ; then + if has ${EAPI:-0} 4 && in_iuse doc ; then G2CONF="$(use_enable doc gtk-doc) ${G2CONF}" else G2CONF="--disable-gtk-doc ${G2CONF}" @@ -141,7 +126,7 @@ gnome2_src_configure() { fi # Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308 - if has ${EAPI:-0} 2 3 4; then + if has ${EAPI:-0} 4; then if grep -q "disable-silent-rules" "${ECONF_SOURCE:-.}"/configure; then G2CONF="--disable-silent-rules ${G2CONF}" fi @@ -177,7 +162,7 @@ gnome2_src_configure() { # @DESCRIPTION: # Only default src_compile for now gnome2_src_compile() { - emake || die "compile failure" + emake } # @FUNCTION: gnome2_src_install @@ -185,7 +170,6 @@ 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} 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" @@ -200,7 +184,7 @@ gnome2_src_install() { unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # Handle documentation as 'default' for eapi5 and newer, bug #373131 - if has ${EAPI:-0} 2 3 4; then + if has ${EAPI:-0} 4; then # Manual document installation if [[ -n "${DOCS}" ]]; then dodoc ${DOCS} || die "dodoc failed" @@ -221,7 +205,7 @@ gnome2_src_install() { rm -fr "${ED}/usr/share/applications/mimeinfo.cache" # Delete all .la files - if has ${EAPI:-0} 2 3 4; then + if has ${EAPI:-0} 4; then if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then ebegin "Removing .la files" if ! use_if_iuse static-libs ; then -- 2.26.2