Create site-gentoo.el in preinst phase and have it belong to this package. Refuse installation if the site-start.el file is still in its old location; we have warned about this since almost two years.

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

3 files changed, 156 insertions, 12 deletions

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 76b3abf93a0a..b9c6574489c3 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/emacs-common-gentoo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.84 2013/10/31 14:33:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.85 2013/11/12 18:20:03 ulm Exp $
+
+*emacs-common-gentoo-1.3-r4 (12 Nov 2013)
+
+  12 Nov 2013; Ulrich Müller <ulm@gentoo.org>
+  +emacs-common-gentoo-1.3-r4.ebuild:
+  Create site-gentoo.el in preinst phase and have it belong to this package.
+  Refuse installation if the site-start.el file is still in its old location;
+  we have warned about this since almost two years.
 
   31 Oct 2013; Ulrich Müller <ulm@gentoo.org>
   emacs-common-gentoo-1.3-r3.ebuild:
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index df9467bb2617..e2e9aa80b235 100644
--- 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.3.tar.gz 46819 SHA256 c874088b1d9833432e1da9c3e3f79e7891cb3af41bcdecb02aa299d207c0218d SHA512 32682ac7e78d42026bd3a7f3e7b7d9be382f1394b8a422f0a4a36c75eb40167432a83e6fef8283d158055c1843f8bf0cbf14a82f1bbb54e2a93cbbc7394d2d8f WHIRLPOOL 3c8b592d486e5950b2ec2bbabcf63e11510c11fa9918992e96efe1b5f5569a0ee8a255fd1af39e42996e3c08fe22f76632451206c2dec363cce049af22578c63
 EBUILD emacs-common-gentoo-1.3-r3.ebuild 4070 SHA256 ddaf0bdd87d52b453f777cf8355759cfee2d475325954d108f1c111e334b392f SHA512 4d0c5c46aae8f696a323239cd5c03d6fc1a3b163880027b0ae9d04d3e16aa17736e39f984bea5efeb2d76f41d86ac4f2ff31e523051c096a462aa5f83b14e877 WHIRLPOOL 5fe75aa38c099acd10294a554e4a0db1a3b7281ccdbdad397560015ebf09a7261d223b3e04d530aba915fa27c6bd4e7508e695cd96d742858d164b11abf407ab
-MISC ChangeLog 14576 SHA256 f37961929e7895162fe7a2524afbb9dd1fac2323ff9255628557ab763b522a3b SHA512 7f606983dd055d6e362791643965bc76e6d2cffdf7bdac186f5ac4dcb968732e915dc8248a2f2bd6c063c76f597084b9212a97e5c935423f57b83dd92e44806f WHIRLPOOL f6cd3a4406914ec7b2269c888a701ca213ee724001f119c2a0946a026cbb3abb9d292db6087fee1eb8fc0752c01db1c3cae4494aeccb596aefa0e2bf7cca0c86
+EBUILD emacs-common-gentoo-1.3-r4.ebuild 4263 SHA256 783e0122b037328f20cb1656dbcc5a7f1f59cb0d2e8e3b7b793014428f178597 SHA512 35d59b9e99be30413ecd5a73309cb6d805b7a720325dea3f35aa036bed73b6c0f76a7e16847f3e5a0a81b2aaacc04129050a9d4e90540f7d3f877353f28e998b WHIRLPOOL e2c1d77cfc5824ec2bfaee6ab87d517da1d57e61b020ff3c4fb44d89f095075ca82104fc1d8bf12a7af9aef5d6abaebc7b2295b200108db292a0d6912f8757a5
+MISC ChangeLog 14912 SHA256 3e370e4007945537fbe902f096cb7d6ba45c006e16d3a3fca3c8a5ebf681ca1d SHA512 31cd3906d327b92fc14dcf94461026c54307d5f567e0aa4c2e4a88dd20a8cba048ae76dd7f97100e9468e2e43912a7901cabd406518dedf26a3c983f8c6e3183 WHIRLPOOL ab76ff1a00719f1ad2ac5e515288aa6ff1e4a0e5cce63d963ffde79e3908fd95683503a04c6f080c0d3311ccadd3515ed8ffa9e35cf48bbfb000e55237f60875
 MISC metadata.xml 236 SHA256 f0b6df93ac83810a22d1519f0b37ee94996d1512c4fe4407df6fbb27f4da6608 SHA512 beb19666e6ea1a04718133d41e61ee7e7604ae0e614f979c66835f10fcd8b8e908a136a67397b212bcbb3e67d9bda458d561da228998cd9b616cd4a8bff6a989 WHIRLPOOL 099d599d015c0835bf2ed4780df6609ed0bf407c8cef5278f35fab89ccc6b9b2d98d48833aac8ef3243633dc33206eb155851cf570c980e96dc259d1e0416759
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJScmu1AAoJEJQzkH1pP7W4iIcL/0RmgS13hKTYI3FhuNckgNWe
-9nbVr26K0mnK5sc1fGbVQ6aJwOLnK0SCzBQJOBRyZ+m02WzP0NFqqYXiMD5Y7ZpE
-AFaNHXjxKcVPnp/ewYZPXAO8RQUt5Csmzla/+LFlUcqSQ/lmg0dqG0Ut+hzDl/GI
-zZbN9Aapej143JNH/+IKWVM6SdFUK16fKO6C11iygJ6NEXmxW4nPDS4j+O0q6lg7
-ZHPgsDT1zrx/ji76pTP8R4tQMUG0GK4u5XCShspId8fepMrYhHbYynB91zJTg3Ad
-Jnu2sYFuNr5ugwf+I+JO8F0uXdIL5I1aWEyYIIh8enTTmwekBN+Gy8WCT7iRB2Nd
-RVls/NTMbG93j2J6VudLz+HtsPlLKOCuGPF64DjR0X9CBatBs4GEJDb6W3LtZdDJ
-kp871MRjJiJ8lqRbh6to9fUz3A1a9l4EX6k0YuaV8pHCUUXe0tTj2u+u6+ubaM9E
-1cnkWh/phYiUDzxUNVhqN3vUwSeAtMfVzM1Y12LxuA==
-=0uJy
+iQGcBAEBCAAGBQJSgnHcAAoJEJQzkH1pP7W4eDAL/0tLJ1yxWkF2MwVAnJRsvdog
+j6HwvaDbS2PqSB2eDunhPV4n+ew5C/r8S2QBDIyRJ8B4LvwGhs68UkenhOF+oINf
+HbJHqvXHrNGxmuArFiaprWQ0TY0NCjO++DjsjJ2JaOWmWFkCh9IWLAmPF7pMDqaN
+L4ErENE/MkgmF+HfmB1Dce+Uz/GTtryibhJwKfrBpKnkU8oAaivsnTVNV13svLQ9
+Ky3RrNtxmKNaSkVsNd9f5xSjbHBT2Gf1Nrusz9k7lG6tRGBer0aCshmXhdc6xSo9
+mS0pRCo8kFzhh50joMQVAlUORPHo9afs/jb2x4NtopRYYqnKvv4Oh5QUuPsxvgEs
+1gcDJSkW4afPSpnbfiX2JHdabuQIjnixdKGTQP/vlO0cN3scB6upQXeUSiFAk+C/
+NcZcQAD5bgALivPTwJxLBqAAS0X83jxZAdHwePNTsA/QwcuaIKu+9lvGQLja+bJm
+ycQes9qB3rxK0lw1K5T0A3Uh8B9N+jHH4yxgXeKRFA==
+=liOP
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r4.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r4.ebuild
new file mode 100644
index 000000000000..f6b3063d7e4b
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2013 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.3-r4.ebuild,v 1.1 2013/11/12 18:20:03 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="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 && [[ -z $(egetent passwd "${GAMES_USER_DED:-games}") ]]
+	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
+
+	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
+	elisp-site-regen
+	cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
+
+	if use games; then
+		local f
+		for f in /var/lib/games/emacs/{snake,tetris}-scores; do
+			if [[ -e ${EROOT}${f} ]]; then
+				cp "${EROOT}${f}" "${ED}${f}" || die
+			fi
+			touch "${ED}${f}" || die
+			chown "${GAMES_USER_DED:-games}" "${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 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
+}