Follow QA policy for game state directory, bug 537580.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index f5ba27eace106b703ec266308771b00d83dc7498..0f7a1b7a3b62c7421a5227abfc127323a3b1c53c 100644 (file)
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/emacs-common-gentoo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.110 2015/01/28 13:06:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.111 2015/02/21 08:46:47 ulm Exp $
+
+*emacs-common-gentoo-1.4-r2 (21 Feb 2015)
+
+  21 Feb 2015; Ulrich Müller <ulm@gentoo.org>
+  +emacs-common-gentoo-1.4-r2.ebuild:
+  Follow QA policy for game state directory, bug 537580.
 
   28 Jan 2015; Ulrich Müller <ulm@gentoo.org>
   emacs-common-gentoo-1.4-r1.ebuild:

diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 03e798703c53eaaecd3b4233d0dfee5f33a2cdc9..22daf56ae2155b692b4d324bbd0dfac758a6afa0 100644 (file)
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -3,19 +3,20 @@ Hash: SHA256
 
 DIST emacs-common-gentoo-1.4.tar.xz 40848 SHA256 c36081d809c47f4414d623726eeff54d6512eca7f178f864e1f0c71e58a5b78f SHA512 f993ef83bdfe1e622688d93b81f1317663f2918f1dace8785474db759f411c0dc883e9946872e05cc406a1191bf29abe193af5212d652d2e64d5f64576a28cbe WHIRLPOOL 9861d4fadad9a420ebc2ac7f61dec2441ce934903cded6efeeb91600d2ef98fdf1af9f78ebb3518b7810034a2fc8cbb1f7e34ca2467c679083a1de193f181bb5
 EBUILD emacs-common-gentoo-1.4-r1.ebuild 4510 SHA256 09937ea87ba9559d9502896904f9490689f11c33c42ce491cad4e8b2f65d0706 SHA512 31f07d00dec75f9a0b956c5f6a951cdfb3240a2018d03ba45b5985af282d9a85bd70d057a314122b4b4146ab0f30e5606aba3717f7edfcef410f7d236c89e5c1 WHIRLPOOL a67ff6c6e0e88fd6f961e0af945be91734eef04dbbc47e9119149a660e80b40c23c0564722c5f997b761a51bf3c6b6f9fde8f24d07083b37db8229c6776c1868
-MISC ChangeLog 17169 SHA256 e9ea67de9c3503fe25380c220923a41ad6d24743c7327850d1f153aaa85d1a7c SHA512 bdee130452ac0b8890586d4993592cc6e449fc625762c919355e4e90fbd4b1659f34525d809277da95c622057d3e666be1e14bcf8634770d27e7ea4c46395246 WHIRLPOOL 3850be97feb659438baad4fa1142418b23f754751d38bb633d4b23eae92b3b92edbe15d28b488e670ea024c883809c35a65b2bb3c865177bdc78414f6a1c8ad2
+EBUILD emacs-common-gentoo-1.4-r2.ebuild 4580 SHA256 24e32d2687f6228f25aba420eda074973048568a0bab72900f767d626d465cdd SHA512 4ecc8f6f0875d5b3c999af0b1708b4ee61fa2ea3e1a80862c07c1c48874f1b07cf52010e09d27c08f2c2118a6b025e1f7a11bb17a00ca83f0c39d0963ff26339 WHIRLPOOL 9707ecfd10bd3b5ab40220fced316cfa3edc66908b5f64a7a5115d4c830774e0b7255be592992900942cfb640205c2015441f1ce9f1e9a002a1e0d80d434256b
+MISC ChangeLog 17355 SHA256 87f69095dd2655775e7a54fac7e9823c6918e833ca46d11f8dd081bba47d0703 SHA512 a0c9967a6b4b2cb21d9cb311ef9c6b76893a2144bea136ef280f480856e77be54703aa2ea195133acd1bbbb87dc1816691cb4e6237b2e06d99e1bb0472ff2531 WHIRLPOOL 2e8a29283aa6b8521879a82c1b3b6180d0da03d2e5b09a18d5c5b1351edcd8b088bc59cc9fc06f21fc7e8161e7cb65895b6eb6ee1b87a8da70f0a5cbaa817a0c
 MISC metadata.xml 236 SHA256 f0b6df93ac83810a22d1519f0b37ee94996d1512c4fe4407df6fbb27f4da6608 SHA512 beb19666e6ea1a04718133d41e61ee7e7604ae0e614f979c66835f10fcd8b8e908a136a67397b212bcbb3e67d9bda458d561da228998cd9b616cd4a8bff6a989 WHIRLPOOL 099d599d015c0835bf2ed4780df6609ed0bf407c8cef5278f35fab89ccc6b9b2d98d48833aac8ef3243633dc33206eb155851cf570c980e96dc259d1e0416759
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJUyOBbAAoJEJQzkH1pP7W4PBoL/219COMu3VE83jPV1fXeQpr4
-s7e9oTqWnWKcyeQoPQs9SmRbiJTR7Igog+wSv03yQCKAEjDKoEaz/rpxm1siJyDb
-E7dtlPA8sK7xzE+p4ze60w3Qdwt13W7GFCac8eFL+TGLJkQvPbF0it7PI+l4KoXp
-vwroeMxPoT0aOgxe6zrkaGY0uxA3EylwKNhDtUUWhyIDKkESYZVnvHi9+Hqnjg06
-Jq6ZbPkc0YVVVTMB3g4OtFEFj6VhJHHYKpvwfGUaYnXiQpvs5Xnfqw/QtvEjspgC
-cFg15pCJ//MpNgrde8K/mLKH/5pWH0GL0CHozprNus7PSTrLUaJzU5bqX4xW6Mpt
-wCs8GZU7TZ9aovQOVoaROlSLydV0Z+/EGp3CP/mr1doMUqo8AyhCvrp2O2cvcOWZ
-Vz5v8bQBvdse6hT+bLEflUNBX47nHp7wE6D14AV5Du5ESrm6ezDHVyMkh0+EOhkn
-3xeaz2TayIyz9znHXWKLQCwyeFi3Hojl+9enBx9Iiw==
-=PYSO
+iQGcBAEBCAAGBQJU6EYQAAoJEJQzkH1pP7W4frIL/1XpzIV2E77ZJMj/5Q+SkbXl
+tS9+hXZMrhX0/0cXUVhw5Tj6o2iH6+34ddytTztzm+CawURj31/825svVSJlEsf2
+qmsjNHkctF2usqih4tHyJw88FdoDnr0IuK4sHNSWBFRx98sgZl75Iuy4YMvdsxDa
+9Ublq/pmmjgUVDl3rt5ADrOaGbgJHonwNo5uDSVq5UTbjEJp1lzUOcDRYD/wzPI5
+NAjWnjrnbjb8NerfZ4Qx3GK4edvCFOugg5xB4qUkd59CRhS4w0hFd6/dMdcAxlje
+Tqso5Y9nCYnFatDVhS13M02nGvWLo2HfsKdx5vjCHoukKwzZn65xUcV3AR/C73n8
+P0zjUBPl0eP2E2yZ8Y+44CT2rHYSBcdh8aWx5n9+v5RXG2NL9Jl5sduzsirWKPH3
+asKDdwd3F4tFDFflyBxx0o+Kh7tRshy2BmVQPJVrM/0pXiTvphkDkC2WpCcV/6Wm
+RmE61yBRgzJCUdtYUAr92Ng0OfVkgBeHGNSVOt6dAw==
+=lEGK
 -----END PGP SIGNATURE-----

diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r2.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r2.ebuild
new file mode 100644 (file)
index 0000000..d352e9b
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r2.ebuild,v 1.1 2015/02/21 08:46:47 ulm Exp $
+
+EAPI=5
+
+inherit elisp-common eutils fdo-mime gnome2-utils readme.gentoo user
+
+DESCRIPTION="Common files needed by all GNU Emacs versions"
+HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="http://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="games X"
+
+PDEPEND="virtual/emacs"
+
+pkg_setup() {
+       use games && enewgroup gamestat 36
+}
+
+src_install() {
+       insinto "${SITELISP}"
+       doins subdirs.el
+       newins site-gentoo.el{,.orig}
+
+       keepdir /etc/emacs
+       insinto /etc/emacs
+       doins site-start.el
+
+       if use games; then
+               keepdir /var/games/emacs
+               fowners 0:gamestat /var/games/emacs
+               fperms g+w /var/games/emacs
+       fi
+
+       if use X; then
+               local i
+               domenu emacs.desktop emacsclient.desktop || die
+
+               pushd icons || die
+               newicon sink.png emacs-sink.png
+               newicon emacs_48.png emacs.png
+               newicon emacs22_48.png emacs22.png
+               for i in 16 24 32 48 128; do
+                       newicon -s ${i} emacs_${i}.png emacs.png
+               done
+               for i in 16 24 32 48; do
+                       newicon -s ${i} emacs22_${i}.png emacs22.png
+               done
+               doicon -s scalable emacs.svg
+               popd
+
+               gnome2_icon_savelist
+       fi
+
+       DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
+               added to ${SITELISP}/site-gentoo.el. In order for this site
+               initialisation to be loaded for all users automatically, a default
+               site startup file /etc/emacs/site-start.el is installed. You are
+               responsible for maintenance of this file.
+               \n\nAlternatively, individual users can add the following command:
+               \n\n(require 'site-gentoo)
+               \n\nto their ~/.emacs initialisation files, or, for greater
+               flexibility, users may load single package-specific initialisation
+               files from the ${SITELISP}/site-gentoo.d/ directory."
+       readme.gentoo_create_doc
+}
+
+site-start-modified-p() {
+       case $(cksum <"${EROOT}${SITELISP}/site-start.el") in
+               # checksums of auto-generated site-start.el files
+               "2098727038 349") return 1 ;;   # elisp-common.eclass
+               "3626264063 355") return 1 ;;   # emacs-common-gentoo-1.0 (cvs rev 1.1)
+               "3738455534 394") return 1 ;;   # emacs-common-gentoo-1.0 (cvs rev 1.6)
+               "4199862847 394") return 1 ;;   # emacs-common-gentoo-1.1
+               "2547348044 394") return 1 ;;   # emacs-common-gentoo-1.2
+               "2214952934 397") return 1 ;;   # emacs-common-gentoo-1.2-r1
+               "3917799317 397") return 1 ;;   # emacs-common-gentoo-1.2-r2
+               *) return 0 ;;
+       esac
+}
+
+pkg_preinst() {
+       # make sure that site-gentoo.el exists since site-start.el requires it
+       if [[ ! -d ${EROOT}${SITELISP} ]]; then
+               mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
+       else
+               elisp-site-regen
+               rm "${ED}${SITELISP}/site-gentoo.el.orig" || die
+               cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
+       fi
+
+       if use games; then
+               local f
+               for f in /var/games/emacs/{snake,tetris}-scores; do
+                       if [[ -e ${EROOT}${f} ]]; then
+                               cp "${EROOT}${f}" "${ED}${f}" || die
+                       elif [[ -e ${EROOT}/var/lib${f#/var} ]]; then
+                               # backwards compatibility
+                               cp "${EROOT}/var/lib${f#/var}" "${ED}${f}" || die
+                       fi
+                       touch "${ED}${f}" || die
+                       chgrp gamestat "${ED}${f}" || die
+                       chmod g+w "${ED}${f}" || die
+               done
+       fi
+
+       if [[ -e ${EROOT}${SITELISP}/site-start.el ]]; then
+               ewarn "The location of the site startup file for Emacs has changed to"
+               ewarn "/etc/emacs/site-start.el."
+               if site-start-modified-p; then
+                       eerror "Locally modified ${SITELISP}/site-start.el file found."
+                       eerror "If this file contains your own customisation, you should"
+                       eerror "move it to /etc/emacs/. In any case, you must remove the"
+                       eerror "file from the old location."
+                       die "Cannot continue unless ${SITELISP}/site-start.el is removed."
+               else
+                       ewarn "Removing the old ${SITELISP}/site-start.el file."
+                       rm -f "${EROOT}${SITELISP}/site-start.el"
+               fi
+       fi
+}
+
+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
+}
+
+pkg_postrm() {
+       if use X; then
+               fdo-mime_desktop_database_update
+               gnome2_icon_cache_update
+       fi
+}