| 1 |
commit: 77e2d8cd14cbe8aba5cf8e8aa9d658b28bd34258 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 3 00:03:20 2012 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Thu May 3 00:03:20 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=77e2d8cd |
| 7 |
|
| 8 |
eclass/gnome2.eclass: sync with gx86 |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/gnome2.eclass | 20 ++++++++++---------- |
| 12 |
1 files changed, 10 insertions(+), 10 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass |
| 15 |
index e057217..f3c3d72 100644 |
| 16 |
--- a/eclass/gnome2.eclass |
| 17 |
+++ b/eclass/gnome2.eclass |
| 18 |
@@ -153,6 +153,11 @@ gnome2_src_configure() { |
| 19 |
G2CONF="${G2CONF} --disable-maintainer-mode" |
| 20 |
fi |
| 21 |
|
| 22 |
+ # Pass --disable-scrollkeeper when possible |
| 23 |
+ if grep -q "disable-scrollkeeper" configure; then |
| 24 |
+ G2CONF="${G2CONF} --disable-scrollkeeper" |
| 25 |
+ fi |
| 26 |
+ |
| 27 |
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659) |
| 28 |
addwrite "$(unset HOME; echo ~)/.gnome2" |
| 29 |
|
| 30 |
@@ -200,10 +205,9 @@ gnome2_src_install() { |
| 31 |
# 1. The scrollkeeper database is regenerated at pkg_postinst() |
| 32 |
# 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current pkg |
| 33 |
# thus it makes no sense if pkg_postinst ISN'T run for some reason. |
| 34 |
- if [[ -z "$(find "${D}" -name '*.omf')" ]]; then |
| 35 |
- export SCROLLKEEPER_UPDATE="0" |
| 36 |
- fi |
| 37 |
rm -rf "${ED}${sk_tmp_dir}" |
| 38 |
+ rmdir "${ED}/var/lib" 2>/dev/null |
| 39 |
+ rmdir "${ED}/var" 2>/dev/null |
| 40 |
|
| 41 |
# Make sure this one doesn't get in the portage db |
| 42 |
rm -fr "${ED}/usr/share/applications/mimeinfo.cache" |
| 43 |
@@ -225,6 +229,7 @@ gnome2_pkg_preinst() { |
| 44 |
gnome2_gconf_savelist |
| 45 |
gnome2_icon_savelist |
| 46 |
gnome2_schemas_savelist |
| 47 |
+ gnome2_scrollkeeper_savelist |
| 48 |
} |
| 49 |
|
| 50 |
# @FUNCTION: gnome2_pkg_postinst |
| 51 |
@@ -237,10 +242,8 @@ gnome2_pkg_postinst() { |
| 52 |
fdo-mime_mime_database_update |
| 53 |
gnome2_icon_cache_update |
| 54 |
gnome2_schemas_update |
| 55 |
+ gnome2_scrollkeeper_update |
| 56 |
|
| 57 |
- if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then |
| 58 |
- gnome2_scrollkeeper_update |
| 59 |
- fi |
| 60 |
# This should only be in the overlay |
| 61 |
ewarn "**************************************************************" |
| 62 |
ewarn "This is the *experimental* Gentoo GNOME Overlay" |
| 63 |
@@ -264,8 +267,5 @@ gnome2_pkg_postrm() { |
| 64 |
fdo-mime_mime_database_update |
| 65 |
gnome2_icon_cache_update |
| 66 |
gnome2_schemas_update |
| 67 |
- |
| 68 |
- if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then |
| 69 |
- gnome2_scrollkeeper_update |
| 70 |
- fi |
| 71 |
+ gnome2_scrollkeeper_update |
| 72 |
} |
Archives