From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SPjWQ-00064Z-Im for garchives@archives.gentoo.org; Thu, 03 May 2012 00:03:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00DAAE0764; Thu, 3 May 2012 00:03:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C7769E07B3 for ; Thu, 3 May 2012 00:03:36 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 131601B4021 for ; Thu, 3 May 2012 00:03:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C577EE5403 for ; Thu, 3 May 2012 00:03:34 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1336003400.77e2d8cd14cbe8aba5cf8e8aa9d658b28bd34258.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/gnome2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 77e2d8cd14cbe8aba5cf8e8aa9d658b28bd34258 X-VCS-Branch: master Date: Thu, 3 May 2012 00:03:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 2b148192-63b7-40fd-aad8-4ba94ce1712b X-Archives-Hash: ad9e1cf3f754b03a8d283a216b8bd66b commit: 77e2d8cd14cbe8aba5cf8e8aa9d658b28bd34258 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Thu May 3 00:03:20 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Thu May 3 00:03:20 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D77e2d8cd eclass/gnome2.eclass: sync with gx86 --- eclass/gnome2.eclass | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index e057217..f3c3d72 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -153,6 +153,11 @@ gnome2_src_configure() { G2CONF=3D"${G2CONF} --disable-maintainer-mode" fi =20 + # Pass --disable-scrollkeeper when possible + if grep -q "disable-scrollkeeper" configure; then + G2CONF=3D"${G2CONF} --disable-scrollkeeper" + fi + # Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659= ) addwrite "$(unset HOME; echo ~)/.gnome2" =20 @@ -200,10 +205,9 @@ gnome2_src_install() { # 1. The scrollkeeper database is regenerated at pkg_postinst() # 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current p= kg # thus it makes no sense if pkg_postinst ISN'T run for some reason. - if [[ -z "$(find "${D}" -name '*.omf')" ]]; then - export SCROLLKEEPER_UPDATE=3D"0" - fi rm -rf "${ED}${sk_tmp_dir}" + rmdir "${ED}/var/lib" 2>/dev/null + rmdir "${ED}/var" 2>/dev/null =20 # Make sure this one doesn't get in the portage db rm -fr "${ED}/usr/share/applications/mimeinfo.cache" @@ -225,6 +229,7 @@ gnome2_pkg_preinst() { gnome2_gconf_savelist gnome2_icon_savelist gnome2_schemas_savelist + gnome2_scrollkeeper_savelist } =20 # @FUNCTION: gnome2_pkg_postinst @@ -237,10 +242,8 @@ gnome2_pkg_postinst() { fdo-mime_mime_database_update gnome2_icon_cache_update gnome2_schemas_update + gnome2_scrollkeeper_update =20 - if [[ "${SCROLLKEEPER_UPDATE}" =3D "1" ]]; then - gnome2_scrollkeeper_update - fi # This should only be in the overlay ewarn "**************************************************************" ewarn "This is the *experimental* Gentoo GNOME Overlay" @@ -264,8 +267,5 @@ gnome2_pkg_postrm() { fdo-mime_mime_database_update gnome2_icon_cache_update gnome2_schemas_update - - if [[ "${SCROLLKEEPER_UPDATE}" =3D "1" ]]; then - gnome2_scrollkeeper_update - fi + gnome2_scrollkeeper_update }