Version bump. The Emacs site-start.el file has moved to /etc/emacs/.

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

3 files changed, 116 insertions, 6 deletions

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 7082b18ef377..40e1f0569e03 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/emacs-common-gentoo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.45 2011/07/17 17:40:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.46 2011/12/13 22:20:27 ulm Exp $
+
+*emacs-common-gentoo-1.3 (13 Dec 2011)
+
+  13 Dec 2011; Ulrich Mueller <ulm@gentoo.org> +emacs-common-gentoo-1.3.ebuild:
+  Version bump. The Emacs site-start.el file has moved to /etc/emacs/.
 
   15 Jul 2011; Ulrich Mueller <ulm@gentoo.org>
   -emacs-common-gentoo-1.2-r1.ebuild:
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index b10fff991d6e..9f51509e4b44 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA1
 
 DIST emacs-common-gentoo-1.2.tar.gz 46622 RMD160 88c923d05286b53687e1099294fb579a2f4f5d39 SHA1 4712b6186d4620aaa5258236367d3228f515f341 SHA256 d15f9654214b10e9efc9e38fe45b4e08c3f0cc1c975de34058e4d360d3053108
+DIST emacs-common-gentoo-1.3.tar.gz 46819 RMD160 40c12dd355c3fd80ad65d45190c4f3c7f2134ad6 SHA1 ff743a4646d493dd14ed1e812d3adfd6323498e9 SHA256 c874088b1d9833432e1da9c3e3f79e7891cb3af41bcdecb02aa299d207c0218d
 EBUILD emacs-common-gentoo-1.2-r2.ebuild 4044 RMD160 ac44d82f984f1617085324553b37aa666ad76417 SHA1 497a66e8596d4c0af2a25bd468be40238f808325 SHA256 ba89c891ad62b3940b25251f90ea2a943a41dbd71e1f81a9fe07204bd8284f37
-MISC ChangeLog 9304 RMD160 13e6f3bdbce34f3c8d4827907de5ef199c6170c8 SHA1 83de777b805f984f5799d6cfd4668239a98d3945 SHA256 a61feddb198d1826170f8d95bdf292fcc0fa4f23c3d77b9cb92d0ce5ccefbba7
+EBUILD emacs-common-gentoo-1.3.ebuild 3054 RMD160 4b2f34113a663dae73429a1edd330e83132bab1e SHA1 0814447402dce6523973fe1d9b6ddf8b9bae2667 SHA256 b5535d1c9848f9fa9c0d3925a0bb265c16b3a649f7a05a0a4c3dca58fd0a4948
+MISC ChangeLog 9496 RMD160 b2481792cc1b0dba5ae60d0e69d9b062a5ba2438 SHA1 b8f26319ca55ceccc545bbc4f2204bf7b382d2e7 SHA256 eb683650de530c39cd343fe853f8de0a318ff0aaa6c710d71568a22dbea83933
 MISC metadata.xml 235 RMD160 94ec7acf062c24ce7a5c9b98fff11c2a68baf269 SHA1 c948e0bb625876a97f14834fe5848367dda93628 SHA256 81f928a2ff996d91f098bc1d718adec61bbb6afa1f8e5f1b29f0931a73902ec1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4jIB4ACgkQOeoy/oIi7uyBDACeLsfkKiU6XD84br1XmY+JE0S2
-6z4An0bBgbL2yX+lf2w87c5Jn41YDukn
-=Pw4o
+iEYEARECAAYFAk7n0gQACgkQOeoy/oIi7uwmEACeIADCn9YCWgLDJSdEYt5vLIFf
+Ou8An14vZuSQ8uN+iSA+X1kDkEuK96tK
+=X08f
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild
new file mode 100644
index 000000000000..1134d4a171f3
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2011 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.ebuild,v 1.1 2011/12/13 22:20:27 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() {
+	keepdir "${SITELISP}"
+	elisp-install . subdirs.el || die
+
+	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
+}
+
+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
+		while read line; do ewarn "${line}"; done <<-EOF
+		Starting with emacs-23.3-r3, the location of the site startup
+		file for Emacs has changed to /etc/emacs/site-start.el. If your
+		site-start file contains your own customisation, then you should
+		move it to the new file. In any case, you should remove the old
+		${SITELISP}/site-start.el file.
+		EOF
+	fi
+}
+
+pkg_postrm() {
+	if use X; then
+		fdo-mime_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+}