pacho       15/02/23 10:59:44

  Modified:             ChangeLog gnome2.eclass
  Log:
  Remove USE_EINSTALL (#482082)

Revision  Changes    Path
1.1551               eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1551&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1551&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1550&r2=1.1551

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1550
retrieving revision 1.1551
diff -u -r1.1550 -r1.1551
--- ChangeLog   23 Feb 2015 10:57:38 -0000      1.1550
+++ ChangeLog   23 Feb 2015 10:59:44 -0000      1.1551
@@ -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 <[email protected]> gnome2.eclass:
+  Remove USE_EINSTALL (#482082)
 
   23 Feb 2015; Pacho Ramos <[email protected]> gnome2.eclass:
   Deprecate eapis 2 and 3 for gnome2.eclass (#539118)



1.130                eclass/gnome2.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.130&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.130&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.129&r2=1.130

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- gnome2.eclass       23 Feb 2015 10:57:38 -0000      1.129
+++ gnome2.eclass       23 Feb 2015 10:59:44 -0000      1.130
@@ -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 @@
 # 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 @@
        # 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
 




Reply via email to