Remove old.

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

3 files changed, 16 insertions, 152 deletions

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index ee25ccee512c..75557950c516 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/emacs-common-gentoo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.122 2015/04/17 10:40:33 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.123 2015/04/17 12:24:38 ulm Exp $
+
+  17 Apr 2015; Ulrich Müller <ulm@gentoo.org>
+  -emacs-common-gentoo-1.4-r1.ebuild:
+  Remove old.
 
   17 Apr 2015; Mikle Kolyada <zlogene@gentoo.org>
   emacs-common-gentoo-1.5.ebuild:
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 68328384fe98..c3caadbb0fce 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST emacs-common-gentoo-1.4.tar.xz 40848 SHA256 c36081d809c47f4414d623726eeff54d6512eca7f178f864e1f0c71e58a5b78f SHA512 f993ef83bdfe1e622688d93b81f1317663f2918f1dace8785474db759f411c0dc883e9946872e05cc406a1191bf29abe193af5212d652d2e64d5f64576a28cbe WHIRLPOOL 9861d4fadad9a420ebc2ac7f61dec2441ce934903cded6efeeb91600d2ef98fdf1af9f78ebb3518b7810034a2fc8cbb1f7e34ca2467c679083a1de193f181bb5
 DIST emacs-common-gentoo-1.5.tar.xz 40844 SHA256 fbec52de8552c6b22f56382a28d469d9346c02c7569c05cdb0db6a54b39995a1 SHA512 61ac2a1bb8bc449480137789f4d93228d81d2a7ea87a255a7fd82072ce98eecf5f585d102db95f0deda06102e27efbd5d9fce8cd21d6b58239f7a2b6d4ee4d55 WHIRLPOOL bb6d58d8afb55c9d6204f82553962190cd50f64d25ea5fb50308827f88ea3b1c42dc0e072155567391ffc7745b8871c733c9aee5042b57bfcbef5e5419d0b6cf
-EBUILD emacs-common-gentoo-1.4-r1.ebuild 4510 SHA256 09937ea87ba9559d9502896904f9490689f11c33c42ce491cad4e8b2f65d0706 SHA512 31f07d00dec75f9a0b956c5f6a951cdfb3240a2018d03ba45b5985af282d9a85bd70d057a314122b4b4146ab0f30e5606aba3717f7edfcef410f7d236c89e5c1 WHIRLPOOL a67ff6c6e0e88fd6f961e0af945be91734eef04dbbc47e9119149a660e80b40c23c0564722c5f997b761a51bf3c6b6f9fde8f24d07083b37db8229c6776c1868
 EBUILD emacs-common-gentoo-1.5.ebuild 4815 SHA256 b920f89b40e11ae92fbe7e0d463bce1400717ae9e6e67f124af647aef3364074 SHA512 6fb618fbe02de4d49cd1c1e5ff5980dc2f9d1eb6aabc2e0772af090c8357afcffd06afb4125d5fd282c503c9809f760b1048d6ae8cbf2054e650ef1f91711950 WHIRLPOOL 1f6afd1c5202f258c2f9644f066d083290e2a4535175e900b701988033235067a1e05ef1f3c80eb92e90effd65437b72d10983c9a21bcbfb001a32d2b95f51d9
-MISC ChangeLog 18716 SHA256 80b7948a59e4b5145accdf8e6b3b8985011840d623b0ce7a49173f7cd488933f SHA512 bf16fecfd38391b8c68a68a34e3b241c038cd569123dbdf6cb4cb0a0330de056d9d16736fd23b11de03aa5bd3dd54f033acd886613a3690e6680af5048964fc4 WHIRLPOOL 286513bd4de3bce4ea2f8bcc61e5de516813ea9084b9a6afbd5c623fe8f6d5de9a96b5959a083c6ead2c4635af79c90515987a1c8a844062e7a99ce7b7ea7079
+MISC ChangeLog 18812 SHA256 8d7a1a86068bd8ac720714526cb3328cb91bffbd1d8b97ea827d6584ddf8dce0 SHA512 72afaf73f6d423f1eefa1e499200eafece99a1d1c4a3abcaa960612f9aa36aacf158a67009ead68cd0473771156bf1f1eb1e92d769dcd8d1ea12d215907c0d24 WHIRLPOOL 53a64ccc6c8d552b462db73dc74058c7046e9e675d401c0a18635aedc6bb422665f9259929115fcf4cf0457eea5f23f114b2d4b9e7caf17ed5a79dcbe818ceb2
 MISC metadata.xml 236 SHA256 f0b6df93ac83810a22d1519f0b37ee94996d1512c4fe4407df6fbb27f4da6608 SHA512 beb19666e6ea1a04718133d41e61ee7e7604ae0e614f979c66835f10fcd8b8e908a136a67397b212bcbb3e67d9bda458d561da228998cd9b616cd4a8bff6a989 WHIRLPOOL 099d599d015c0835bf2ed4780df6609ed0bf407c8cef5278f35fab89ccc6b9b2d98d48833aac8ef3243633dc33206eb155851cf570c980e96dc259d1e0416759
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlUw4rEACgkQG9wOWsQutdZUlQP/XL1JK3Wwjs7zE48v6kEVLEOk
-rrPokvzWzX/jRjOF/VlXpre6PGk6R/9QGEyOkAY7HwM/nAdPcyep6RtMVBdttMRw
-TXPhBBzLkX/L0cif0hOQ3WVyXz/etN+KVS/9XuShsUvDt/BI+PxAPgJ2JgRoRMmz
-K6WkMqEoVj4wiPNhtgo=
-=lP/j
+iQGcBAEBCAAGBQJVMPuYAAoJEJQzkH1pP7W4f6IL/jSHQRKZ8oF4hAMCaJjV46L7
+UTem89GYZsdgJnhKmMljxUbW3qAzGTo1+E6XzvpAlvL8GsfLZTMK5cDf2XIZIqXI
+PR2Rn67/217Czfrh/wEUZrYnKzZd/OEwOj3COkibl0SY5br/gYSio5HZvF8O+SXs
+A+OJlAwcMWvb86r27M94rzI5biLruuBUdswNI77nEeiHh5/li8lamXUizzQwsVfQ
+T/f+ux0vwFyp4GNUum5scJ61+KiY/xqXbCKHcXH9k7Lb9QUxxKJb3G06Y9m5Ndr3
+w07Cly40TfK05saraDiFajceuRoNPoN84nknBTOetyi9mYSh0RNRlHRD0By5YOw1
+4JyjYT1PVwQTsFDAAWsNRJX6/WteiD7sYBAieaFVr9mDhfy2FV/OfRTX4emEjLq6
+0ELf1EyjeqHlo5OZY+ay4urcvdc8RSqgxrFZ6kLHEejKqBIDYvJEVY/ibWMGSIvW
+XTRgrzWPbvG2btarlHxyfMYIoi65eZ2iKU/5aIRKyQ==
+=QTSy
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild
deleted file mode 100644
index 9e2dc5af60dd..000000000000
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 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-r1.ebuild,v 1.11 2015/01/28 13:06:34 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/games/emacs
-		fowners "${GAMES_USER_DED:-games}" /var/games/emacs
-	fi
-
-	if use X; then
-		local i
-		domenu emacs.desktop emacsclient.desktop || die
-
-		pushd icons || die
-		newicon sink.png emacs-sink.png
-		newicon emacs_48.png emacs.png
-		newicon emacs22_48.png emacs22.png
-		for i in 16 24 32 48 128; do
-			newicon -s ${i} emacs_${i}.png emacs.png
-		done
-		for i in 16 24 32 48; do
-			newicon -s ${i} emacs22_${i}.png emacs22.png
-		done
-		doicon -s scalable 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/games/emacs/{snake,tetris}-scores; do
-			if [[ -e ${EROOT}${f} ]]; then
-				cp "${EROOT}${f}" "${ED}${f}" || die
-			elif [[ -e ${EROOT}/var/lib${f#/var} ]]; then
-				# backwards compatibility
-				cp "${EROOT}/var/lib${f#/var}" "${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
-}