summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2017-02-11 13:28:44 +0100
committerPacho Ramos <pacho@gentoo.org>2017-02-11 13:29:36 +0100
commitc84c8b8d0bccb14e20ed6d3336f0e6f80e7936a4 (patch)
tree9d8ab4d51da42f47bfe093011de06275a7c12d15 /eclass/gnome2.eclass
parentgames-board/gnome-hearts: Drop libgnomeui requirement with the ArchLinux patch (diff)
downloadgentoo-c84c8b8d0bccb14e20ed6d3336f0e6f80e7936a4.tar.gz
gentoo-c84c8b8d0bccb14e20ed6d3336f0e6f80e7936a4.tar.bz2
gentoo-c84c8b8d0bccb14e20ed6d3336f0e6f80e7936a4.zip
gnome2.eclass: we cannot rely on default phases involving emake because they don't allow to pass extra variables, bug #606826
Diffstat (limited to 'eclass/gnome2.eclass')
-rw-r--r--eclass/gnome2.eclass17
1 files changed, 8 insertions, 9 deletions
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index bb538dd1918..a18bd469a10 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -232,13 +232,10 @@ gnome2_src_configure() {
# @FUNCTION: gnome2_src_compile
# @DESCRIPTION:
-# Only default src_compile for now
+# Only default src_compile for now, but we cannot call "default" because it
+# doesn't allow to set variables, bug #606826
gnome2_src_compile() {
- if has ${EAPI:-0} 4 5; then
- emake
- else
- default
- fi
+ emake
}
# @FUNCTION: gnome2_src_install
@@ -259,14 +256,15 @@ 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
- default
+ emake DESTDIR="${D}" "$@" install || die "install failed"
fi
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
# Handle documentation as 'default' for eapi5, bug #373131
- # Since eapi6 this is handled by default on its own plus MAINTAINERS and HACKING
- # files that are really common in gnome packages (bug #573390)
+ # 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
if has ${EAPI:-0} 4; then
# Manual document installation
if [[ -n "${DOCS}" ]]; then
@@ -275,6 +273,7 @@ gnome2_src_install() {
elif has ${EAPI:-0} 5; then
einstalldocs
else
+ einstalldocs
local d
for d in HACKING MAINTAINERS; do
[[ -s "${d}" ]] && dodoc "${d}"