| 1 |
commit: 455f60bfdd78924ddeebfce30a83433c0db2ef6d |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 11 18:42:09 2017 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 11 18:49:44 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=455f60bf |
| 7 |
|
| 8 |
Revert "gnome2.eclass: we cannot rely on default phases involving emake because they don't allow to pass extra variables, bug #606826" |
| 9 |
|
| 10 |
This reverts commit c84c8b8d0bccb14e20ed6d3336f0e6f80e7936a4. |
| 11 |
|
| 12 |
eclass/gnome2.eclass | 17 +++++++++-------- |
| 13 |
1 file changed, 9 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass |
| 16 |
index a18bd469a1..bb538dd191 100644 |
| 17 |
--- a/eclass/gnome2.eclass |
| 18 |
+++ b/eclass/gnome2.eclass |
| 19 |
@@ -232,10 +232,13 @@ gnome2_src_configure() { |
| 20 |
|
| 21 |
# @FUNCTION: gnome2_src_compile |
| 22 |
# @DESCRIPTION: |
| 23 |
-# Only default src_compile for now, but we cannot call "default" because it |
| 24 |
-# doesn't allow to set variables, bug #606826 |
| 25 |
+# Only default src_compile for now |
| 26 |
gnome2_src_compile() { |
| 27 |
- emake |
| 28 |
+ if has ${EAPI:-0} 4 5; then |
| 29 |
+ emake |
| 30 |
+ else |
| 31 |
+ default |
| 32 |
+ fi |
| 33 |
} |
| 34 |
|
| 35 |
# @FUNCTION: gnome2_src_install |
| 36 |
@@ -256,15 +259,14 @@ gnome2_src_install() { |
| 37 |
dodir "${sk_tmp_dir}" || die "dodir failed" |
| 38 |
emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed" |
| 39 |
else |
| 40 |
- emake DESTDIR="${D}" "$@" install || die "install failed" |
| 41 |
+ default |
| 42 |
fi |
| 43 |
|
| 44 |
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL |
| 45 |
|
| 46 |
# Handle documentation as 'default' for eapi5, bug #373131 |
| 47 |
- # Since eapi6 we also install MAINTAINERS and HACKING files as they are really common in gnome packages (bug #573390) |
| 48 |
- # Please remember we cannot rely on default_src_install because it |
| 49 |
- # doesn't allow to set variables, bug #606826 |
| 50 |
+ # Since eapi6 this is handled by default on its own plus MAINTAINERS and HACKING |
| 51 |
+ # files that are really common in gnome packages (bug #573390) |
| 52 |
if has ${EAPI:-0} 4; then |
| 53 |
# Manual document installation |
| 54 |
if [[ -n "${DOCS}" ]]; then |
| 55 |
@@ -273,7 +275,6 @@ gnome2_src_install() { |
| 56 |
elif has ${EAPI:-0} 5; then |
| 57 |
einstalldocs |
| 58 |
else |
| 59 |
- einstalldocs |
| 60 |
local d |
| 61 |
for d in HACKING MAINTAINERS; do |
| 62 |
[[ -s "${d}" ]] && dodoc "${d}" |
Archives