Version bump.

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

5 files changed, 167 insertions, 19 deletions

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index f3c45481e641..33a7a52b89cc 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.86 2013/11/15 13:02:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.87 2013/11/16 12:50:52 ulm Exp $
+
+*emacs-common-gentoo-1.4 (16 Nov 2013)
+
+  16 Nov 2013; Ulrich Müller <ulm@gentoo.org> +emacs-common-gentoo-1.4.ebuild:
+  Version bump.
 
   15 Nov 2013; Ulrich Müller <ulm@gentoo.org>
   emacs-common-gentoo-1.3-r4.ebuild:
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index a7e6588c276c..fc93ced5eeb6 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -2,21 +2,23 @@
 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
-EBUILD emacs-common-gentoo-1.3-r4.ebuild 4346 SHA256 095775f7dd08235ce20d1f8d9c7224ac533e43de84532545f6543d722daea23b SHA512 b7f632434f9c29664d257f44f97f302e27c93626092b2710de34231671ca4c50e5028f54d8994a5737953c9b7ea5430083c02fbefcde0e93a10753b021e5e8e5 WHIRLPOOL 2da6de15d5e8fb13a52d40cd8ae8cf3fd893f5848ee5d4e6f770bf1be7e4826cee21230a019277ea5d3c74dfcbf72a61eabcf4564e82921d93498053218929e1
-MISC ChangeLog 15045 SHA256 688e7919080e74598e82e08a5b0400069f7f4ee83b3bd098c679cbcc23ab3181 SHA512 8525a8c7fcccb41101ffd0be1b9936b4df2072089b683b196d6c6a32d9180387ffa4e8800850f34ab7cc5a816aaccc6ff93a32fb0b3ae2133a0ef3ebcbb0cb81 WHIRLPOOL 483ead16b36804a1ba5051135df671be29783ceb907a88d63fcb53509f3d82c45146151bdc037ff075b0ddc7513e37c9275fd71e7d2fb7312773b0757bf10d72
+DIST emacs-common-gentoo-1.4.tar.xz 40848 SHA256 c36081d809c47f4414d623726eeff54d6512eca7f178f864e1f0c71e58a5b78f SHA512 f993ef83bdfe1e622688d93b81f1317663f2918f1dace8785474db759f411c0dc883e9946872e05cc406a1191bf29abe193af5212d652d2e64d5f64576a28cbe WHIRLPOOL 9861d4fadad9a420ebc2ac7f61dec2441ce934903cded6efeeb91600d2ef98fdf1af9f78ebb3518b7810034a2fc8cbb1f7e34ca2467c679083a1de193f181bb5
+EBUILD emacs-common-gentoo-1.3-r3.ebuild 4087 SHA256 d734c9f4269b371812318379eef57da5cd56bee1999e92a807735b28e393a3d7 SHA512 9ee6958e7e3a9b1b404ebf28f10c9fd9176f7ecbdc644a7093145f078beb4730cf42f483dca54d810fd3d88a567e8369a13ee8ed6753fcc02cdf464a132dc68a WHIRLPOOL 412a60dbc16d32ebbcaa6c1c20427cddb807352b6c8de7f750a539aec539cab217012b47d42284011cc55208d888e08f501ac105a24052dedd7f28d2085b7347
+EBUILD emacs-common-gentoo-1.3-r4.ebuild 4365 SHA256 ce462f300e317880bb68d91d877d4217c112851147b7a26b9653aa85a785a0e7 SHA512 13bab1e0e8d18828f5280fcaa644768e583f17d1edbaba6c4b3724a18e79c0b9a782a943317e59c2c1541f33b71d2fc8497a8b7c48ee61f528c09075640d5d6f WHIRLPOOL 181c4ff6fee5bf9225a569a50c21b0f6151c433534cd5f189eea1764375bdd64d8fdfa0488c956e63e56214cf92dc62e2a322f51f0b1add73bdaba7ce969d36e
+EBUILD emacs-common-gentoo-1.4.ebuild 4466 SHA256 1aff41d2b84148ec72aaf02629d4f77d59b0019b1324351a176718bce430f60f SHA512 d2d0ce48fc0b8dc05a35e0d039f3044953a494b7a9f4233a8eff3e0b872c890fe3b6961179d2f7be03e9345cb252647412445264d8e7e51d9a7f3ae295c45d79 WHIRLPOOL bc6c41d8bf67cb85465b6b28792b73aa09be9b34a5ad72f1d89f3deed48f05ff03b87fc6b4d9ce85ba4175ade3f46e7a30e88a33a8d69b28f70d96436ef43d67
+MISC ChangeLog 15182 SHA256 b62bc191b3ae697301424debc947e1c1f4aa5f17a19840db9877609dc931db11 SHA512 2ca364d288f992fcc5f3c7a1c5e832040597409527e57719ab27d016145a98f7e74e36468d0c033616fdba58124a2c82614f5add5d00c7202d39130a6970c57c WHIRLPOOL 807ac493b4b13bf21b8833cb3e2efa8ba5a4cc41168afd65964288c5907acdeee10931ddfb283e74463e5559ac9fd278286fb2326aed8407e46615a7222715a9
 MISC metadata.xml 236 SHA256 f0b6df93ac83810a22d1519f0b37ee94996d1512c4fe4407df6fbb27f4da6608 SHA512 beb19666e6ea1a04718133d41e61ee7e7604ae0e614f979c66835f10fcd8b8e908a136a67397b212bcbb3e67d9bda458d561da228998cd9b616cd4a8bff6a989 WHIRLPOOL 099d599d015c0835bf2ed4780df6609ed0bf407c8cef5278f35fab89ccc6b9b2d98d48833aac8ef3243633dc33206eb155851cf570c980e96dc259d1e0416759
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJShhwFAAoJEJQzkH1pP7W4L2wMAJUSpL4+Pod8q6ZVn1k8dsa8
-J9cklczKph8Kp0zK11+znScBjFTi1bwJE6YpBcHPhEzah4HldoHSWsHi0ew0O9zP
-JTd/pVHwwfEKj3spJtkBT0kav3EIo7lBLF37lU9faQydX+2XrX3oY/A+aDbtRU6T
-5MyhhH1/dnAqMvimPZimO8JqqjwJLPYp3V9nbaaQ3NpLWM4Mm8L+5Yt3GZr1iT8S
-b2Zu0wTZjq15+xRTy7t2etC3la/noew48UcMim31yKiCrN5VTF0GbDfj1X+Z0w5F
-iAgs0KrPXi8eXUXUecBZ9W6G5bCms7/LB5C/Zl9Y8bnSh4vY/9hvXB0MmzWdFJ6q
-/yYsR6ldMuR8kJPuSn7hRfnMGgg9U/QjWtAiqbmHFZcZUEzf7SSP63v0sQ7dOkdN
-F7SgBn9hK9G45hatdV2h0/Q1v5ol9qIpiQ3ecaoimnphQe9vwJ6KGaHpj8UNssRK
-Q+gPx78+bhaCIpBd5q/mBaQpPqRJ1VIrT7WJz1bGSg==
-=NXRE
+iQGcBAEBCAAGBQJSh2q8AAoJEJQzkH1pP7W4M9wL/i6bbGA34mcwHA0icPHuMxKH
+Hd8rxkgzRFSzpQkO+4c21BwEmrO9isFuDVrFNS5a6LIb6E2hxHLMNGEL5oebVVFu
+XtCMP3kz2fMYczdJ9rtgo/buFI4G+F7QhB9ZFqPWPVAxqmYv6uq7lc5eEeXEp9Kx
+5vjVF1F7BG08aC9QCvF0q6IAmtIegEFhQDrxez8jXA8sD9tcrNx42Q3wi1kl6+2S
+cH0xQsKXrX3rt1MMYRUXQp0EbqcVhX2KxqJ7VBVzzFIygOkzU7TjpMNxXgRx7VJH
+Ebrj+xTEcM9nWdKbSwQ3iHQyubnHJ2KXi91bBmD52eac0ifZiFKsuP5FVWCrHI/N
+JOn1kNlRWjF0WWutlkzSHvcdoZziGDMLM8xhRzG8Nm70G/F4+Iuf+ufEWSttuHJ0
+PVd9jiPy6MHow66HTUtcvvfe0zhZh5hEgo3L/NhC/FkuNb9UWbTwzI7ElIolmnED
+q9GtiX3G/nNUZN26CpINjnuI7ThKQRDEbni9lr+TOA==
+=VXgW
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild
index 0ad1318162e3..f41a50e75351 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.12 2013/10/31 14:33:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild,v 1.13 2013/11/16 12:50:51 ulm Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ 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"
+SRC_URI="http://dev.gentoo.org/~ulm/emacs/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
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
index 462ef93f10d7..350cc1472118 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.2 2013/11/15 13:02:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r4.ebuild,v 1.3 2013/11/16 12:50:51 ulm Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ 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"
+SRC_URI="http://dev.gentoo.org/~ulm/emacs/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -89,7 +89,7 @@ site-start-modified-p() {
 pkg_preinst() {
 	# make sure that site-gentoo.el exists since site-start.el requires it
 	if [[ ! -d ${EROOT}${SITELISP} ]]; then
-		mkdir -p ${EROOT}${SITELISP} || die
+		mkdir -p "${EROOT}${SITELISP}" || die
 	fi
 	elisp-site-regen
 	cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4.ebuild
new file mode 100644
index 000000000000..891162003614
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4.ebuild
@@ -0,0 +1,141 @@
+# 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.4.ebuild,v 1.1 2013/11/16 12:50:52 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() {
+	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
+	newins site-gentoo.el{,.orig}
+
+	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
+	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/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
+}