Remove old.

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

3 files changed, 15 insertions, 349 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 93d5a349dbca..f5d8fcd37e23 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.646 2014/11/10 20:52:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.647 2014/12/06 14:16:52 ulm Exp $
+
+  06 Dec 2014; Ulrich Müller <ulm@gentoo.org> -emacs-24.4.ebuild:
+  Remove old.
 
   10 Nov 2014; Ulrich Müller <ulm@gentoo.org> emacs-23.4-r11.ebuild:
   Remove redundant _BSD_SOURCE macro causing warnings with glibc 2.20.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index c96cad3c81b8..6ccce1bdd3e5 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,27 +8,25 @@ DIST emacs-23.4-patches-15.tar.xz 12400 SHA256 a8e609a75c2a904efeb7269f4d1a0829c
 DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
 DIST emacs-24.3-patches-7.tar.xz 6484 SHA256 167a004b3b528dada8f68d28ce98cfbf1f23a1e00e52d7b23e14352178e5eab7 SHA512 6e3f6f053ad66e6d298b4fd904c57a6c2a03269ec53e9dfc56f834672a42c8f48eeb20a7ed1bcfb534eb62e0cca6e01b4a1663bebb046a0ce7325b732a378868 WHIRLPOOL bb68a6874e682afe58fe4cdf60695bc7b8d763afd15ba40ffda3156e80a6cad318e969fed6f22cb6e484ffdc29daa1b6b64873bf6cf73de28cfa711172046138
 DIST emacs-24.3.tar.xz 35565352 SHA256 70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d SHA512 a1300fa10a9fba2db9735db3d01382bcda89ceec033976c4622796dfdf6d2748ed5fa73edf229182b368190c8acbf706810dd5f344542d2c0d294154bc2d0ca9 WHIRLPOOL 687ad4c7d69b41884bf28269bdea1808e03cdcec5a5218d0bac23c07cca3ced341ef98b4d5892149e2dbe899774a5e60edde9931d6c0fe41687995f530fb61d8
-DIST emacs-24.4-patches-1.tar.xz 1076 SHA256 954087d59f177fe0554b7efa645923a12cbf160fc678052ddc2c014278d7cbcd SHA512 e0d1a8f19badf2d63976c3f90a61355d8e04de0dca7579708972cb77aa0cbb621a001467dab5bfd1c8e99a8c59a3735c7a0d369302a015874097d0eb34bbf4df WHIRLPOOL deedb92c58488c5e677fdfd23e301c560f4b19464f87c33e171a0f61f9d3dd47219b7395ced84b174c941ea38b8f3ace76c6cc47cb9107376f8387b250ac786e
 DIST emacs-24.4-patches-2.tar.xz 1316 SHA256 e67954091f565668b921d32c14f9f31800e09249248fe03fd4369480a17a26f5 SHA512 c52910391ca58fc9a4b99147f62f2f1d9432c08889bd756cb3b5bf21028ef205a5d285fdbd495c5f1608180b834682ee8b4877e2d02359afb3596078fea5533b WHIRLPOOL a571557a3e86c69dde864cb1aac34b12bc6b8b2d97b8a73293337c1c971143fcf807be30c61c0bf6ecec3d5174f46afdece7395f1012d366dca45b4560c825c7
 DIST emacs-24.4.tar.xz 39733124 SHA256 47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd SHA512 f51f88a4736a3f153ef01f3ad710571e967cd3d0c0112b066169a4040725d370ec29b14a4ca8fa3e3f4c657c726ba8e64c3ac4e390b8e911ea47a3afb5ac755c WHIRLPOOL eae38c2382731fecf0ccf8f717f8c96cc130d01a893ff560caecde903294eb843660492761ea8cce9920b79bfc55e821921924e27c040f25355110f56cd2255b
 EBUILD emacs-18.59-r10.ebuild 4297 SHA256 74c5d7927ea976e02680e0a24a90a270a067787e45cbb74602c8e7e513eec166 SHA512 d19f66368ed77bd4caeb260b098e79077a8e87328522d75092297c2cf15b39deb267518242f4939405a99365682653506374c0b6942be267816ddf9419a0ae4a WHIRLPOOL f8fe6dd1b04e838b0e5acc2d199a2d356dbf5ae61152a3ec9df156eceb04a9120743f8f98b04b27ae620b7c30ec5e1841df65b86a572be0746044969c42699a5
 EBUILD emacs-23.4-r11.ebuild 11318 SHA256 bc55e5fa7d3c4638c0162e3812537fb8b029cb0bbbdebf80bef04f3577554b69 SHA512 6090d1f42006ab20c991817da95694759ee8468a0ebb41c679f5fdb515f252ed8792f9b06d3a42ed1b424a847a31013a7895d17ae889cd548499dae6ded31489 WHIRLPOOL 6121ee3880a3fc990f54a50257c6472936afb5b3086844e625333747d30b6f048d745d9f330cef0d4634505ea5c1b31b8efa1c728b5ff75e77ffb2983a890b54
 EBUILD emacs-24.3-r6.ebuild 11208 SHA256 1ded9fecbbdc1c4c0d29690e6880bfe800525647bbd7597a21610762c48332eb SHA512 f6a29ada07419957579adac3ec587ea762064aa13c33677317a497de7b5a35e768d9270e57cefde66033b1b09ea3c8ce15ffac7ff1ab7b5e98adad92e4bc2ebf WHIRLPOOL 91258009fee9fb428c4b6d987bb5b4ef15035183f9084eb421fc0b7382f205252b051e017a214c7c3ee018f612f60792c9c2dde1a72ee15744f54c9e336408c6
 EBUILD emacs-24.4-r1.ebuild 10676 SHA256 2c11288d65cb847ea09465ba99fe0d19c262fdda2c0537aa420b3e2fe71d73e1 SHA512 7c9e8692d7fdf36743313a5096b580bfd1397a11c817f7d4fbd75ae96eb12693d49af0d6c52160b44f80fad06779f28f49a81187a4cc9976b2e5ec2db22c623d WHIRLPOOL 89b12be286ae0274a692e04edfd4e04ee4e423c3ab7c53ee66c7f96439ccfe781d35a5632f2c55d10794329dacddbd2a3459a501af011fc065eed032549fa193
-EBUILD emacs-24.4.ebuild 10542 SHA256 b6302a4de5b3a09782079bae26506a50fc31046b7ddee5824f487c705502e8e3 SHA512 0328ce85287a4134ca5c59e3ed46e58ffcc9b777543c6140aa5422a4a663925c13bcb8b190bda0d3d73d1e41e3127c9d3fe8094c7c0c71e26493d9f4ef567490 WHIRLPOOL d57f3ee9bd98ec07c867305970279919d12e7534d0500a55ea5d61329097ce3bb691baa32c7d9463ff4073a6dfb6eb950a582d54726da12a0d3add07b4c16f8d
-MISC ChangeLog 88587 SHA256 b33d2eacb9f77cd0cdc3ae9c52e7cc738e6a9fbf46b18075c59a061120122636 SHA512 6f463fe82360e67aef8629d4b4f53f6ce89e7d62987969ff23ccdc1de6b1e1e74ec9d569532440163f358cb5360ce0b0b9436b9a4f39d3b66132194bcfeff697 WHIRLPOOL a0f9da5c2b08ac21a63a12cc4c8e627a4d3b5841704443ac8d63c1aa11c67f82bc6ab7de5c704d5038aa9c0e2038decb9f3b238f6bc90d6e0666934b11b6ae4e
+MISC ChangeLog 88669 SHA256 fc407e8caef7f4556a5646d6055ddf68c40c42a25333b9f597651f5ca006c2c3 SHA512 3b8874c81bd81bfc733bebd35d3486f7fbc5e2a6ce3fd787855c6e993304ae3dcb57c0ae7bb1bfaa214fed30caf4ae8f3589d91d97b77ecdb9263b1022cc0408 WHIRLPOOL 7a62b4c35efbdc719c778b1c6a13f9a052ac954ce07935f148de13a89a5e778f9246123ad32ab7c931739e9f2742b20885b1bf58a2b68fab18fea3dcd6527ce1
 MISC metadata.xml 2522 SHA256 0dcfb3cd3457215ad785b82adfd0d60eafc10df3ac58c9125f6006e4ac90ced6 SHA512 8fefab8f3644c38b5a5c37e8aba2ee45a0b329b4dd846d280ef33893d940892abaf09204bf807d98870106677caf48e376667a4f2bf7c1dca26e72b6b5ea2c54 WHIRLPOOL b40fe229764c94b5bf59eda550e9a480a9793f3a4df43fa65c0dea518ad2372faf3276ce6009ad44a02907c2df63068b9596fc39e53cc7214dd5b30750df9a8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJUYSZ4AAoJEJQzkH1pP7W4t6MMAJyiXZAKaKuw7XWF7YD89hw6
-2gWD94eu50xvMBQSWT4F4pesIuYMk4AJhdzG80cjBcR7km7PWuzTbVPRCxDwJzfR
-rj1Aw0mBKMAibJznHixfswHYKzMSxzCWo/0rvQBdTX1CT3s+49IvVx5mqvABNJ3r
-evB635mwUIy8riVjl9VThaDyNvhwMI36OUciPMgUvG7S5NNU5x+73BlLX6CiWjd+
-7ryYGhPsT2yT/mdj36X1Hy6mnFKuMQ76BVxPJP6OGOOzar9cWz7lHHvr+Yfz8aJg
-vz/dpOd/yF61pP3AdKoiVVjPt8KpxfVeqlEnvnK4xV92GWAWAMMY/wyIr8zLMKix
-IKCYTFNEMjfqm8/2WJ6P9j7J0ttNj5a7m2UGZ3kmgitXxns2Wi4GwdR8xTt0aaep
-befMgxZgY44o6rFoYZc5m5YKj/m6PZbPUxFbR/JeSSm4wDx7WtvATvQ/fTtm9bIV
-rpGZhkIiWFJ4/qtMWktcbIdwRKZLA8NMblddQSJvbw==
-=ZjQT
+iQGcBAEBCAAGBQJUgxDZAAoJEJQzkH1pP7W4UhoL/Ai5+9WBDltyjzkTTN3emeIQ
+IIT4plvpiRX6CaAIUcIAY5a4W8wL9H5k7vzdns1yCCGphRicSNoHEh1wRZckp8u1
+ViJdkOLTKpN28gGBoY3T41PFR3QxKHxH4Ih2cbjt9Qs/V/lGvBVp+vGYzWabQ4r2
+iahZd39w20kBY423M31x5yw979GXr4+BiwfgY56zppHc91fhwNrObmlBUHE8kwf5
+QOpNTB1+CPXBtj/1aaMuZWql87FG55/FOHd00bxSlRx2ZFcdwbiwEsjtoWBVi3DO
+52bH2nCU+Nk1HOzCSTjuCgIA8qNyX7YHx6aqaVT50TgTSia9WkFHzmVYqZ7yAQeV
+DLscVs+SyPx17+0iCGLMg3ul7BluqWu1y4xSzbhWTKYXvPO6VNYAqAaOQQ05oU2v
+VT+IrXmthoXS8VP5HYMceFku7JpjHEYIJ+r0f3HkJrgjB/PL6FdsTD0F8iteRJLm
+6SQr2RUg+8Zh/Z//hXxtr6Wf6At/ylNP6nmEZlihqA==
+=+gqX
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-24.4.ebuild b/app-editors/emacs/emacs-24.4.ebuild
deleted file mode 100644
index 84d3df96d4f4..000000000000
--- a/app-editors/emacs/emacs-24.4.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4.ebuild,v 1.2 2014/10/28 13:03:48 ulm Exp $
-
-EAPI=5
-
-inherit elisp-common eutils flag-o-matic multilib readme.gentoo
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	http://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gfile? ( >=dev-libs/glib-2.28.6 )
-	gnutls? ( net-libs/gnutls )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? (
-		sys-apps/attr
-		sys-apps/paxctl
-	)"
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-	EPATCH_SUFFIX=patch epatch
-	epatch_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	#AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		--without-compress-install \
-		--with-file-notification=$(usev gfile || usev inotify || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}