Remove old /usr/share/emacs/site-lisp/site-start.el if it is unmodified.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 142 insertions, 15 deletions

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index ae1c558a008b..8269a9c77287 100644
--- 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.53 2012/01/16 06:35:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.54 2012/01/29 18:19:40 ulm Exp $
+
+*emacs-common-gentoo-1.3-r1 (29 Jan 2012)
+
+  29 Jan 2012; Ulrich Müller <ulm@gentoo.org>
+  +emacs-common-gentoo-1.3-r1.ebuild:
+  Remove old /usr/share/emacs/site-lisp/site-start.el if it is unmodified.
 
   16 Jan 2012; Ulrich Müller <ulm@gentoo.org>
   -emacs-common-gentoo-1.2-r2.ebuild:
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index f5ef3ecabdd0..b725478ed765 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -2,23 +2,24 @@
 Hash: SHA1
 
 DIST emacs-common-gentoo-1.3.tar.gz 46819 RMD160 40c12dd355c3fd80ad65d45190c4f3c7f2134ad6 SHA1 ff743a4646d493dd14ed1e812d3adfd6323498e9 SHA256 c874088b1d9833432e1da9c3e3f79e7891cb3af41bcdecb02aa299d207c0218d
+EBUILD emacs-common-gentoo-1.3-r1.ebuild 3740 RMD160 eb685f28e17cf2ca686e25bb7fbb3afa01879f07 SHA1 de59a66836eee10eafb282edfa0763ab343d19f0 SHA256 37d041311902fe77004837515d6bc4c319fd529b692e171e8041b8b826042f58
 EBUILD emacs-common-gentoo-1.3.ebuild 3026 RMD160 58e426454bcb4f9a472cc2368f50e3b933df4e4a SHA1 6045d35bc6ee29ea2db674e1a59617d33c873f87 SHA256 187e854a0721b2a6dc1e2aa5781f8ae1912dd914d81cc44f97acea7445601d4a
-MISC ChangeLog 10362 RMD160 086e12eac86505602b4a23a060abd3660a1f182e SHA1 1f560cb03b780b3a8f07eb15d4314c8d78ebd1b3 SHA256 1ec8707dabbe5cfae2a8a1ee771e78f88ea6ffe9fc943d2d6d0037355d1fac13
+MISC ChangeLog 10566 RMD160 872b2a0db91c836d290005696b34fe2304c71df4 SHA1 f766377c49322361a231fb8744659cefc6fe885e SHA256 ef3749dbce609ac1c86ce920e0e0f263de660ebebcb09d2ccefaf223424fe21e
 MISC metadata.xml 235 RMD160 94ec7acf062c24ce7a5c9b98fff11c2a68baf269 SHA1 c948e0bb625876a97f14834fe5848367dda93628 SHA256 81f928a2ff996d91f098bc1d718adec61bbb6afa1f8e5f1b29f0931a73902ec1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPE8VTAAoJEDxpGckxwJCBbsQQALcKqjrSlZoNEEYGjPofbZb4
-i3wocmAb/wLxWm9+/kwV6ktAbsh/Fj0dFNPkVTjCKqf87cg7hG8/HFNlvOFwoDLg
-6M+Otw7rG7miEPc0rkya9RS+c/2plZVwBJB0LX2FQRsVfBS5pNDgjnV85LRY5Rvu
-3PhumljU7Sd7Ilpv3tEE0c4rKTcU+/LRskCWNQFd5UYP3bkyvE9UJs8r9GCffFRN
-+aNg14ijLv4C0zVLka9Sx2ZfjllDDDzSJiFtYk7sNhY3nUWzBPQBcrHbzQJu5hpn
-8e7iGe3moPdIm+pX3QEnnS5rlwNqMFXjvssfN5xlm1sMwXWBDw/1drUfeiPjeQRs
-k19ZO/mh0ZKmOnoRqlLh38gXWSZ2WIbqx2Di4O8/cwhXqNUFCWoIRyf5uDsen5NU
-bS+itU7QUzykAoYSyTNTdifztQckXPYAxnjeyn+drKbPKM0aOVl9j3KequdX1WJX
-9zQF4f5l22lzyHYw3SpVMvOhyarr7K0u6l+ZvWIw1+T4l3dFpI5mEVPm09Iykpob
-HBZTrjM4f+zZp36fyziqlUMQPHWBpzxVdcIOQgUyAsaxS4sdQ9xLBt+WEQMWignN
-q5NqFH4wKDsV05ihoH9Q2XTWLYeU8g+JS7YYZrDJxZLcHJTnk8XTqFWsCLpom86Q
-IUFN6/X+J+0Mkz8bLcWt
-=bDcy
+iQIcBAEBAgAGBQJPJY3tAAoJEDxpGckxwJCBl58QAKm/e9n/CaNz/8r61f/eOdqc
+IIN9YxC1EF/c8NcAtaPMEgX/n0rPvY7PW4bWUuhvzB4t2BE3/ypHTNsFlBYnb78+
+tU9EGEFB8m1Nvz/9laWoyOaGGvE/hIzL1u+RVco5PQbbqRcdpgO1hIFJe8M2+824
+YnLiWCMPW/kazB6miVrI8XDB6A/3e43Jz8hy8cjvfbs7y1OlPIBOAGJNPAd+9yAd
+GhW0kDEjdnvcdSO1sf4Ayyx3KRX5GN1tqJ0JVnsPqI3W7vUiHNnKOpNk+IDfRNSY
+YwPOmZAV+LLospSaqDmJfgfNURxzhDpf0I6qy88AmsCrq/22tyDlj9bOW7QHNlIs
+zLKaK88uifYMlSU+m+YPkgQgmjO0FBdLjjFj6aeluuaZG6ofgyVaEETTHzo9n42w
+OuM7wu0eWkAXt36lXD8H+yQX25yOdzCByIOgsJ+RoEDxiag+lQWujySOhkgzhJH9
+3gUvih+3yh6iizn/FhUVsISEOt8SP5cFqF/2/MoBJI1bIfK+a6Gw30Csk6GKes8D
+ptp2LOrsGugL+IWBF17JRJnZMbmLuTonw5JcwLip9xAo7qXH4EMQKCxvy3fkl/ek
+fjywH73NPtjKMzKIs3HxTnskifp5paLc4FBptneTsrtdmzzal/gGCt4azcbWMYCT
+c8X+NBrVIlV7i/5ytCjQ
+=4cd5
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r1.ebuild
new file mode 100644
index 000000000000..d96335808e57
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/01/29 18:19:40 ulm Exp $
+
+EAPI=4
+
+inherit elisp-common eutils fdo-mime gnome2-utils
+
+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 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="X emacs22icons"
+
+PDEPEND="virtual/emacs"
+
+pkg_setup() {
+	if [[ -e ${EROOT}${SITELISP}/subdirs.el ]] \
+		&& ! has_version ">=${CATEGORY}/${PN}-1"
+	then
+		ewarn "Removing orphan subdirs.el (installed by old Emacs ebuilds)"
+		rm -f "${EROOT}${SITELISP}/subdirs.el"
+	fi
+}
+
+src_install() {
+	insinto "${SITELISP}"
+	doins subdirs.el
+
+	keepdir /etc/emacs
+	insinto /etc/emacs
+	doins site-start.el
+
+	if use X; then
+		local i
+		domenu emacs.desktop emacsclient.desktop || die
+		newicon icons/sink.png emacs-sink.png || die
+		if use emacs22icons; then
+			newicon icons/emacs22_48.png emacs.png || die
+			for i in 16 24 32 48; do
+				insinto /usr/share/icons/hicolor/${i}x${i}/apps
+				newins icons/emacs22_${i}.png emacs.png
+			done
+		else
+			newicon icons/emacs_48.png emacs.png || die
+			for i in 16 24 32 48 128; do
+				insinto /usr/share/icons/hicolor/${i}x${i}/apps
+				newins icons/emacs_${i}.png emacs.png
+			done
+			insinto /usr/share/icons/hicolor/scalable/apps
+			doins icons/emacs.svg
+		fi
+		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_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
+}