[gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/

[Ulrich Müller]

commit:     cf9d573cea3688ca7e85403d3e7663568f27d34a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 22 18:25:52 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 22 18:25:52 2015 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=cf9d573c

app-emacs/emacs-common-gentoo: Sync from Portage tree.

Package-Manager: portage-2.2.17

---
 app-emacs/emacs-common-gentoo/ChangeLog             |  4 ++++
 ...99-r1.ebuild => emacs-common-gentoo-9999.ebuild} | 21 ++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog 
b/app-emacs/emacs-common-gentoo/ChangeLog
index d5575fd..dd4a433 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Feb 2015; Ulrich Müller <u...@gentoo.org>
+  +emacs-common-gentoo-9999.ebuild, -emacs-common-gentoo-9999-r1.ebuild:
+  Sync from Portage tree.
+
   21 Feb 2015; Ulrich Müller <u...@gentoo.org>
   -emacs-common-gentoo-9999.ebuild, emacs-common-gentoo-9999-r1.ebuild:
   Sync from Portage tree. Remove old.

diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild 
b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
similarity index 89%
rename from app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
rename to app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
index 73cd753..8187379 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
@@ -110,6 +110,18 @@ pkg_preinst() {
                        chgrp gamestat "${ED}${f}" || die
                        chmod g+w "${ED}${f}" || die
                done
+
+               if [[ -d ${EROOT}/var/games && -z $(find "${EROOT}"/var/games \
+                               -maxdepth 0 -uid 0 -gid 0 -perm 755 -print) ]]; 
then
+                       chown 0:0 "${EROOT}"/var/games || die
+                       chmod 755 "${EROOT}"/var/games || die
+               fi
+               if has 1.4-r1 ${REPLACING_VERSIONS} \
+                               && [[ -d ${EROOT}/var/games/emacs ]]; then
+                       elog "Updating owner and permissions of score file 
directory."
+                       chown 0:gamestat "${EROOT}"/var/games/emacs || die
+                       chmod 775 "${EROOT}"/var/games/emacs || die
+               fi
        fi
 
        if [[ -e ${EROOT}${SITELISP}/site-start.el ]]; then
@@ -129,19 +141,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       if use games; then
-               # update permissions of shared score dir #537580
-               chown 0:0 "${EROOT}"/var/games
-               chmod 755 "${EROOT}"/var/games
-               chown 0:gamestat "${EROOT}"/var/games/emacs
-               chmod 775 "${EROOT}"/var/games/emacs
-       fi
-
        if use X; then
                fdo-mime_desktop_database_update
                gnome2_icon_cache_update
        fi
-
        readme.gentoo_print_elog
 }