Copy from Portage tree. Move handling of game score files from emacs ebuilds to here. Create games user if necessary, bug 368647.

svn path=/emacs-overlay/; revision=1799

4 files changed, 160 insertions, 16 deletions

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 6aecb0c..b197530 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*emacs-common-gentoo-1.3-r2 (06 Jun 2012)
+
+  06 Jun 2012; Ulrich Müller <ulm@gentoo.org>
+  +emacs-common-gentoo-1.3-r2.ebuild, metadata.xml:
+  Copy from Portage tree. Move handling of game score files from emacs ebuilds
+  to here. Create games user if necessary, bug 368647.
+
   29 Jan 2012; Ulrich Müller <ulm@gentoo.org> -emacs-common-gentoo-1.3.ebuild,
   emacs-common-gentoo-9999.ebuild:
   Sync from Portage tree.
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index cce2746..e87ee8e 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,23 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+DIST emacs-common-gentoo-1.3.tar.gz 46819 RMD160 40c12dd355c3fd80ad65d45190c4f3c7f2134ad6 SHA1 ff743a4646d493dd14ed1e812d3adfd6323498e9 SHA256 c874088b1d9833432e1da9c3e3f79e7891cb3af41bcdecb02aa299d207c0218d
+EBUILD emacs-common-gentoo-1.3-r2.ebuild 3845 RMD160 0d37be330e01c296df804b2bcb82cb1400dd1a69 SHA1 9a7d06f6aeaa679365c858576369531773aabdb2 SHA256 410763cd5ac18c82c5db1675500af5b8cbbe329f1bf6d34f0f444893d03e724a
 EBUILD emacs-common-gentoo-9999.ebuild 3687 RMD160 79db03774ef827d5d578edeaab82762a8661cdf7 SHA1 14ca71c84d84fad5081284e3ae2617c97ee9bbdb SHA256 52690855f6b71eea687cc28f7639921eeeb3194c569c373b8b4a4eaf813a54f8
-MISC ChangeLog 2729 RMD160 72329dc9a2c5a4d90a85c406d6a99c84f2d3677c SHA1 54666460f2980887a0062bb168d8d9bccae521eb SHA256 589271675d4e74ed8709b73f6c4873b981f74d6e02aaaa80b949d7a8d49f8d31
-MISC metadata.xml 235 RMD160 94ec7acf062c24ce7a5c9b98fff11c2a68baf269 SHA1 c948e0bb625876a97f14834fe5848367dda93628 SHA256 81f928a2ff996d91f098bc1d718adec61bbb6afa1f8e5f1b29f0931a73902ec1
+MISC ChangeLog 3006 RMD160 4fde95d790bead726387c039f0fd5d8dc5d1bd4a SHA1 08ce893e01f0e7cf8fc0de2a60d32bec77238066 SHA256 c5295c532f8a8f456a8f2f986f2d56dba2c530fae2c679f844a59fad23680424
+MISC metadata.xml 300 RMD160 0984816d85d7e7e6edb507007e8a1e58e52b2c96 SHA1 818d544d6e28d7d4b7c6a8e1e27c20bba6e7f4dc SHA256 3db1ca77aa19677da4be7526f7667fa5d2fbd9aba96b6a0d590f9c3084bda3a8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPJY7QAAoJEDxpGckxwJCBS90P/1f2sSMaCiBJ1dbxr+bDIJi6
-0egYaoiB9CoL4LumKdIwWeZlxJ5iIQocz4tAFg3oNIQL9QiYoV/0PbgKiWx8KKR4
-d8uAUbcKP0km2SbLFzhcEdhj2BMMC7ISX4zZyjfA7+U14OaMb9r1IpS2a//qyurw
-k5cpgUUP9qh/sK54mZx2569pDXcqAenYMn7lYwXJMJKITgm2EXBULoeVMzQ1XIZV
-WxAT7sWM8GSJe8Y7r2Ew2ZFqKdNbZEiIKJQDnjLkyfF2NwOurzQ8UhonBsP1ad/K
-W4gRZ9+I3JMLHnVv98T6whkskPkDXAW6G+dl1f3jaIv7gxJ/t6pXPOiFObc1C5BY
-wqDFNBBMZv2dRnhL11DSl0be4vwOEJkVEsLWbW3nXaZYNxSMHkYUWIiYOBQY/LkV
-Y8wCfO/SUy2jArMZVBzTrwjvKy3jFuoFkJ54m5t5XqNnuRW9hpTblqmATF819nq1
-9ZgBaHBPXfE6Ljv2cn2D4I24LuJOjpGrm3fXwWPBcUsQhsUQg3zHAm+WK2KO+W8L
-ONUCy9G8jryv93Db7kf8bzivtquCcKcyzq4sB0PyhcTfGjVopaNAuxEu1M5mseiU
-q3BIbQwkEjs1qe0Mw6eQ8Bh7XTnxbMPnh3lMuZqtDp3MBADSsXaH6NvqM+tuzxzQ
-mFtI4StqmVp1ZaPA9ftP
-=hGHZ
+iQIcBAEBAgAGBQJPz88MAAoJEDxpGckxwJCBW7sP/03qflPR//o0URoyDQbWTe4+
+OqwCh8FqvLk1dNSEvoGgHO7MNUSYJ4lczwyYHSKFdV7kNsX9S7D5MdLpsRVdO8je
+gudFmuZAbWjX+8/8fH60M8DiV9R6V6nDD83Uk/oKZUo2/lhsA2V7KCose+RXruOp
+9ux5pHOWZrmF6kawmlh1U0ljjziccHbJMvurCruvSwrHrgcvDZ4FyOTMwZ3c+j8Y
+7SHKdhpWdkhMd5/gLDs1ZT0YwW+y6QbQMkjpIrg7VdlCX6kRx0Ie9+gKzamdaZaV
+akQCXHdEYtPt5uZza2iZGzIelhN4rcg0maFFhdZXb90sJiMwvCZ93CUxppGh/aSE
+asJIkiBwNZddw9u2DuJ9UPzIA4mzC7QJwREbrkdmNrI9929NDBa96l2wj5+BXChv
+PThcU4T/qLq3sbvtVqeVWHvwmc0YJ+J3Ss2Bp/hzJaKl3pwfbAlBp8PXvH5vM/UI
+KH53XDpZMmL+db0dpo2+ThdyobedMKroR4YhcH1UXlH3ZkQz5bSluhYAFl70KgVS
+VfRTOo5C0Cmb/pGchLTlC0+GAltwi30AuBX94RcAdE2FDdg57U8RoNmpxDrnhftu
+Le5GViHWnrkn1b4XJknYaF1Hffe6JSMbKddXn8Bmpc+eHwjt7mlsqq8OkiKN+Wo3
+ORZKNSgpfP6vOu628sBb
+=rUpx
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r2.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r2.ebuild
new file mode 100644
index 0000000..681862a
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit elisp-common eutils fdo-mime gnome2-utils user
+
+DESCRIPTION="Common files needed by all GNU Emacs versions"
+HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+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() {
+	if use games && [[ ${GAMES_USER_DED} != root ]]; then
+		enewgroup "${GAMES_GROUP:-games}" 35
+		enewuser "${GAMES_USER_DED:-games}" 36 /bin/bash \
+			"${GAMES_PREFIX:-/usr/games}" "${GAMES_GROUP:-games}"
+	fi
+}
+
+src_install() {
+	insinto "${SITELISP}"
+	doins subdirs.el
+
+	keepdir /etc/emacs
+	insinto /etc/emacs
+	doins site-start.el
+
+	if use games; then
+		keepdir /var/lib/games/emacs
+		fowners "${GAMES_USER_DED:-games}" /var/lib/games/emacs
+	fi
+
+	if use X; then
+		local i
+		domenu emacs.desktop emacsclient.desktop || die
+
+		pushd icons
+		newicon sink.png emacs-sink.png || die
+		newicon emacs_48.png emacs.png || die
+		newicon emacs22_48.png emacs22.png || die
+		for i in 16 24 32 48 128; do
+			insinto /usr/share/icons/hicolor/${i}x${i}/apps
+			newins emacs_${i}.png emacs.png
+			[[ ${i} -ne 128 ]] && newins emacs22_${i}.png emacs22.png
+		done
+		insinto /usr/share/icons/hicolor/scalable/apps
+		doins emacs.svg
+		popd
+
+		gnome2_icon_savelist
+	fi
+}
+
+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() {
+	if use games; then
+		local f
+		for f in /var/lib/games/emacs/{snake,tetris}-scores; do
+			if [[ -e ${EROOT}${f} ]]; then
+				cp -p "${EROOT}${f}" "${ED}${f}" || die
+			fi
+			touch "${ED}${f}" || die
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use X; then
+		fdo-mime_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+
+	# make sure that site-gentoo.el exists since site-start.el requires it
+	elisp-site-regen
+
+	local line
+	while read line; do elog "${line:- }"; done <<-EOF
+	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.
+
+	Alternatively, individual users can add the following command:
+
+	(require 'site-gentoo)
+
+	to their ~/.emacs initialisation files, or, for greater flexibility,
+	users may load single package-specific initialisation files from
+	${SITELISP}/site-gentoo.d/.
+	EOF
+
+	if [[ -e ${EROOT}${SITELISP}/site-start.el ]]; then
+		elog
+		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
+			ewarn "If your site-start.el file contains your own customisation,"
+			ewarn "you should move it to the new file. In any case, you should"
+			ewarn "remove the old ${SITELISP}/site-start.el file."
+		else
+			ewarn "Removing the old ${SITELISP}/site-start.el file."
+			rm -f "${EROOT}${SITELISP}/site-start.el"
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if use X; then
+		fdo-mime_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/app-emacs/emacs-common-gentoo/metadata.xml b/app-emacs/emacs-common-gentoo/metadata.xml
index ed0de1c..6a6e04f 100644
--- a/app-emacs/emacs-common-gentoo/metadata.xml
+++ b/app-emacs/emacs-common-gentoo/metadata.xml
@@ -4,5 +4,6 @@
 <herd>emacs</herd>
 <use>
   <flag name='emacs22icons'>Install Emacs 22 style icons</flag>
+  <flag name='games'>Support shared score files for games</flag>
 </use>
 </pkgmetadata>