summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2017-02-11 20:42:09 +0200
committerMart Raudsepp <leio@gentoo.org>2017-02-11 20:49:44 +0200
commit455f60bfdd78924ddeebfce30a83433c0db2ef6d (patch)
tree6e4f560c18cde0b36db7910c06424d8eb2b94025 /eclass
parentwww-client/epiphany: amd64/x86 stable, bug #608964 (diff)
downloadgentoo-455f60bfdd78924ddeebfce30a83433c0db2ef6d.tar.gz
gentoo-455f60bfdd78924ddeebfce30a83433c0db2ef6d.tar.bz2
gentoo-455f60bfdd78924ddeebfce30a83433c0db2ef6d.zip
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.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/gnome2.eclass17
1 files changed, 9 insertions, 8 deletions
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index a18bd469a10..bb538dd1918 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}"