Remove USE_EINSTALL (#482082)

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index d3d0502494b92dc022d834f2495dd4b3fe4265b2..3d0127f832bdc194a7a18279059eaa8c8a065249 100644 (file)
--- 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.1550 2015/02/23 10:57:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1551 2015/02/23 10:59:44 pacho Exp $
+
+  23 Feb 2015; Pacho Ramos <pacho@gentoo.org> gnome2.eclass:
+  Remove USE_EINSTALL (#482082)
 
   23 Feb 2015; Pacho Ramos <pacho@gentoo.org> gnome2.eclass:
   Deprecate eapis 2 and 3 for gnome2.eclass (#539118)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index e6aca7088bc23f28e95ce54b25125d09fb5f6630..97d5fcc6b83c087c4a962c639e109712382ce3be 100644 (file)
--- 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.129 2015/02/23 10:57:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.130 2015/02/23 10:59:44 pacho Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -51,12 +51,6 @@ fi
 # Extra options passed to elibtoolize
 ELTCONF=${ELTCONF:-""}
 
-# @ECLASS-VARIABLE: USE_EINSTALL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Should we use EINSTALL instead of DESTDIR. DEPRECATED
-USE_EINSTALL=${USE_EINSTALL:-""}
-
 # @ECLASS-VARIABLE: DOCS
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -200,17 +194,8 @@ gnome2_src_install() {
        # we must delay gconf schema installation due to sandbox
        export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
 
-       if [[ -z "${USE_EINSTALL}" || "${USE_EINSTALL}" = "0" ]]; then
-               debug-print "Installing with 'make install'"
-               emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed"
-       else
-               debug-print "Installing with 'einstall'"
-               eqawarn
-               eqawarn "Support for USE_EINSTALL will be dropped in a month,"
-               eqawarn "please stop using it (#482082)"
-               eqawarn
-               einstall "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" || die "einstall failed"
-       fi
+       debug-print "Installing with 'make install'"
+       emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed"
 
        unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL