[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mart Raudsepp]

commit:     455f60bfdd78924ddeebfce30a83433c0db2ef6d
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 18:42:09 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 18:49:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=455f60bf

Revert "gnome2.eclass: we cannot rely on default phases involving emake because 
they don't allow to pass extra variables, bug #606826"

This reverts commit c84c8b8d0bccb14e20ed6d3336f0e6f80e7936a4.

 eclass/gnome2.eclass | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index a18bd469a1..bb538dd191 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -232,10 +232,13 @@ gnome2_src_configure() {
 
 # @FUNCTION: gnome2_src_compile
 # @DESCRIPTION:
-# Only default src_compile for now, but we cannot call "default" because it
-# doesn't allow to set variables, bug #606826
+# Only default src_compile for now
 gnome2_src_compile() {
-       emake
+       if has ${EAPI:-0} 4 5; then
+               emake
+       else
+               default
+       fi
 }
 
 # @FUNCTION: gnome2_src_install
@@ -256,15 +259,14 @@ gnome2_src_install() {
                dodir "${sk_tmp_dir}" || die "dodir failed"
                emake DESTDIR="${D}" 
"scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install 
failed"
        else
-               emake DESTDIR="${D}" "$@" install || die "install failed"
+               default
        fi
 
        unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
        # Handle documentation as 'default' for eapi5, bug #373131
-       # Since eapi6 we also install MAINTAINERS and HACKING files as they are 
really common in gnome packages (bug #573390)
-       # Please remember we cannot rely on default_src_install because it
-       # doesn't allow to set variables, bug #606826
+       # Since eapi6 this is handled by default on its own plus MAINTAINERS 
and HACKING
+       # files that are really common in gnome packages (bug #573390)
        if has ${EAPI:-0} 4; then
                # Manual document installation
                if [[ -n "${DOCS}" ]]; then
@@ -273,7 +275,6 @@ gnome2_src_install() {
        elif has ${EAPI:-0} 5; then
                einstalldocs
        else
-               einstalldocs
                local d
                for d in HACKING MAINTAINERS; do
                        [[ -s "${d}" ]] && dodoc "${d}"