Remove old.

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

3 files changed, 18 insertions, 355 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 96d9b65fc0b0..283918fda564 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.529 2012/09/26 15:53:37 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.530 2012/09/26 18:36:40 ulm Exp $
+
+  26 Sep 2012; Ulrich Müller <ulm@gentoo.org> -emacs-24.1.ebuild:
+  Remove old.
 
   26 Sep 2012; Kacper Kowalik <xarthisius@gentoo.org> emacs-23.4-r4.ebuild,
   emacs-24.1-r1.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 525b01220b9c..cd2b146797f8 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -11,7 +11,6 @@ DIST emacs-22.3.tar.gz 39587396 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30
 DIST emacs-23.4-patches-6.tar.bz2 3416 SHA256 a10b45101dbd3f7e4d0bcdf483736b445abf76efdd5d181607ca86180472930d SHA512 b7913b1c6b70b85656007f69b4dd08455a3bcb4eeeeec502c4754b818584e1c186d0be1e8b56ac4358b4bf64997961d72234136e52c09fa115a7a24a3911c06f WHIRLPOOL ef3ae5086863f834b3d46ba3c45c04d4ae27bd95fab225895e3052763716600df89e2b7f6b4dad437cd81e82411ac861aa7a923b66e11064f7719c4d9c868543
 DIST emacs-23.4-patches-7.tar.bz2 3852 SHA256 cfcf49838ed200d28b0073af65768931253e4db3c7b812f3a4809c6d47a6a418 SHA512 bcc3a3ab50281d1d17f906d10b3b922367e41756c5291609cabfeb0a165d061d2c40cd92f7257cba8ad3d92351e69b8647792a4fa0320479f5944e877cfe1cdf WHIRLPOOL c2f14420f2457e45a646f417c84f14a4942714229362f85ae355e2f1daf141cef706c00c00c65cdfc6e93d25e1a98d5ce11380983d1a35822ebdbc5c43253413
 DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
-DIST emacs-24.1-patches-4.tar.bz2 4296 SHA256 2dda7c1d74b4fd55937c41fd25401684c6a2998dcd27ada4c5bcca856743cbd7 SHA512 bba85091b10791b7539102f5e8ea961e62da1d9b7752225997ecbbe0c1dd80acadcb74e553a89c4fce0e16c2095938f2f565566aa71f003dd108ab73b7806dc1 WHIRLPOOL 7d950722a9b63d07163b3ca150faf134017e22f38b574adfeef206f29f5a696a469d8b9fa7eb62cc4087095bd2cbf7c91a3030ce3ce7f6c74766898471c3ba00
 DIST emacs-24.1-patches-5.tar.bz2 4720 SHA256 759ea6674b86a7943e95ecfc7d7809367bc6d1506e9b55099ce5e38c80845e9f SHA512 4f213d562237443bd441698e93a9860bdb783bb845412cd3ba5b96e0f029fc49196ffd9644482ae2804293195d621d586ba64ecae7a58e427b40853bcfd52677 WHIRLPOOL f6608221cff48aaeba07f6f98ce0faa75367fafebfb19bd71914cc3ee8a2d10cf7ab25be3735da75f01dd2b7549939d533d7e9d4b54c86d994a718dd6183d32e
 DIST emacs-24.1.tar.bz2 41722508 SHA256 eeea272732146e2be9aee2f8d71d6cf07b8654c0282da62a26b921d433f02b7c SHA512 aff89b54f2c6b30aa8c9bec8902a52b76ee1c5e4717b4c7385fe3a1583153d6857eed5351ce04f0a16d8fa93bb4b96804ade5dcfffc381094cbb7724934633ca WHIRLPOOL fc9343d464ec837dd069931a90c716e200ea8c67ea2e58d916e4bc3e00ad883c05e105161f6cec868d86ca7f6ec79b2a8a9f887fd3a247c1cfb885a4a685d3f6
 DIST emacs-24.2-patches-1.tar.xz 2496 SHA256 c445422e685f3a88742ca9a376f2f147a1fb408730a84214a8752458419040ec SHA512 e51ee423b09e7ec3e725dcb9b58ea6c3a5bb826c0c46d82255975c4f6e212cef7d97831e7924782644045fadbc30690702b46e690ea4d97c87b13bc913ee37f9 WHIRLPOOL 18e5daba204ae1b1ac6cb0fd4aee05001fc24dc09b07ca70b99924d9fa56dd63573dff5d4c1121d5054bc794ebe9a78a04f37088c8ce7b74c671ec4fa5b262a4
@@ -23,24 +22,23 @@ EBUILD emacs-22.3-r10.ebuild 7738 SHA256 6b74aa724f16449fe053c63aee86897495eaa92
 EBUILD emacs-23.4-r3.ebuild 10590 SHA256 9f25ed1cb7a34c60bea8fffee962bab332629dcfc58d4ee5424fd354623438ed SHA512 8244a2f102109147278ac654cfbd95cd235cea68e2529712c6d0a2b0055f7efbca2fea5f965f5948b8a84429d7c13663822b1404e0b0f08676bfeb0784e4f3da WHIRLPOOL 3db20304fda72c42feac277aaec97503fb11a0c2725156a357c7ee2661dc08b83f780dad142f01df9e07fca7b4fd701864fa9885e89cf923867a6871d4744897
 EBUILD emacs-23.4-r4.ebuild 10592 SHA256 c20ecf36f97b8f4f1113c240fc3949c6d5b7c527c6a26c5df32e95df8e5518cf SHA512 ac8178def893b8516610be314465bc57dbd61304d7d3906b56062d2b074f7e323f969dcd8314dc09e3e0d04a5775eddd098acac0e6f223a754622cd1462be57d WHIRLPOOL 72b2602d62bed7b076017c91d2d35501d28f38c14c4e25a2c83bd26c2239925253cec687bba64a6fed7b5e26838ac4243f266120ed970ea4b5bf19d06bb1dba9
 EBUILD emacs-24.1-r1.ebuild 11021 SHA256 554cbda5e60068c112984f2372ab16395eb40843475d4c8039fe3cf172fd8970 SHA512 942881511324a432cf04cbf8ba8900759b9891ad8617b8dbed7499e4f1eb88cb7c4c7c4dd0a51f67c51060e7845e0d4a78b1885b1ebedb0741fa33261ace1511 WHIRLPOOL 83d14c33b245c977feb04ae864073560bd8ad1769dd3fac1b155b3917ca9e0dbe3ad7bc5a1ebe6c15c40313d1a94b7a7caa11447645c7c030b7f08725dc05c23
-EBUILD emacs-24.1.ebuild 11017 SHA256 6d66297eca1e71e6f84ca36d4f47e30bf23c4bd838edca5c41c1817e24fb4da2 SHA512 b5a698cd181388fb6a74d634c25f20ba012dde8398fdae25a8d0deb2fec90d8045db44539b9c76d69f93cd9069fe07a71caabb17a2fed207cec50152bf933762 WHIRLPOOL 31e47dfab07edf3566754a4c3d250a77b3ad30456e340d154cb91169ca9f4c9c07be0196039b7647a47d6afdd575f2f53e356876f149f34f4ff49191fa4d960e
 EBUILD emacs-24.2.ebuild 10978 SHA256 3db64fb4c88e1715c8564ac94f4dfaec1cae70f2168fb3dde8fd37b63fae0662 SHA512 e7afb31b13215b04ca089a5c38be0c9407c30950874623b270ed5e2c310f97c3ecb9b8f239837e62ad8086db7bf2a08a7ca08f793607c94c04ad37beefe4f74f WHIRLPOOL f0b2d943cdcbdd1bd25e5997b343eff01da1e9758d7a22904fdb223d73fb45a4e5c0271cc9a956e40b6baaf4f5b0fb91efd2e0d57e1d098a4ae9f937154ee459
-MISC ChangeLog 74759 SHA256 7911944835da7fce5c6745f8a98d1bb356f7b608fe0049c21d080a30737c41b8 SHA512 8cd98b84713660f0205aa6b917cb7c2940cd8947eb479b994f82864ca34854229e154e3f745c0bf06fbe8c7b5ef8145ce684812e2bc5cb651311a43d4e6b51ea WHIRLPOOL 8c6ace962b58a47db7bdd89cbd2ddf1ebdbc7de93f994759702510fba971ef51bcc9d82894a8b89d2150ff01ac5184c3f86f598c1b02498ab89edc850df72b21
+MISC ChangeLog 74834 SHA256 330bd0825f2836a9c1a85de8475506f6e45d653cbad5ab5819829fc35db6ac78 SHA512 06fc9290c00024d07b71f13696b5c2a35add39da12701d7726aa18cca3b1f348bebf9056a8550fb623e1b9475bc71c65e5aef3378fb26cfc0624d06486d7b0f3 WHIRLPOOL 709e16a432aa3e40214dd9c91b47812553b82149b3ceaed306779e27ca3084d0afecadda8a6c507b55e6511707cebb3929f909d047615fae57020101c0091568
 MISC metadata.xml 2554 SHA256 94ab92fa323dcb5747564f95bfd1e2a3eca2511cd3e95b48e4ca95ea40ac8238 SHA512 24207b2227969f1d87126bbca5046f10f848f22584fa9c2a23a88ebb854e4344cc564902be1e6e1b86ae8b9da416f65ccf6172d4595633d6063f78893f9ae0c1 WHIRLPOOL db5cb9f87e4804152bf0a41807497733f4a4c382dd634b2ba7cc41fb6bda07191adca7e68b11dcac79d681b3b17dc9a4d629d0b8d152cd8c148883e754385155
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQYyUNAAoJEF0huFKJUZL51MUP/AwWOHCrgl8hVPgSXh4LmA9Z
-tzYk+GvIK6hC+FL8taaSHzouFVnt1KrLvidQDv4d/yCrUZxC3mqCTDsUHUrjRIaR
-zYGzrR5vAw2WJzsqV5ncK14KLARM0XHf/39FlUR3gzi+T+V49wzw+uBxVAyFIZxB
-hhhahQKlsfAQU4sKbEBtxljnvdcnKX5lwnyHfPj3jZLC8IJupT4AS+FMQfUzoCqY
-FpmvZSKBZ+igFOJs9gkYnd607sL6Dj9o33cA//0+CpNVBY8V4m4VKTMsoBFnMZvd
-WejV1XhdNMLKOMsCXUsilt1YKBoBp9HZtCpCmBmCzZbbnyZylUyxUQA/VISEwrEw
-IdYJxBp2TR87QW2n1qyC9uuiAWRdKPq7fmv2CVLE8vKpzvOE2AcH2XPl93KFk43p
-jxee1BPgfQhEGFr0XaNmcoSnloIGNOxq/IjfIjY5gPone7uk28+R4FLt/Tuui9Ei
-+itR9t8hj5RVEP92RRSOSuVbkeOQ81CTo+gFkBlQh1NkzPUo4Tz/D4nYg9aNXlrX
-O7l9QKu7HqWhEWQyC4Oeo2CB3eCvb24dhDEbOPDDVQucoHy/yM7Jtd5RM3WOUEQ2
-b7fzo0m0q0TAmB+L6dYkevDAmEAp+vJJOwzMWoJMRtlo5KwoECCQ1AFOcNqkj0Qz
-7mjt1Fa346jCX1Qw71DL
-=wLgU
+iQIcBAEBCAAGBQJQY01WAAoJEDxpGckxwJCBEL0P/jN8VZ+Yas/K0jptLq2tMNR9
+dMNyktYKQgNejmshg/qdoU5FIzj6jHwn76yweGKXnQ2RkvWOSuGqt5M80AG0Fdvb
+ksfdedPlnSWMj0Kvi/XLjT9tyPDeN/mzFu7ENcF6GA/kOSO5zDnCRSdVg13ZTo3i
+cfaFZgkstlN+k6w/UWQGXviW8jnfzyl+EUAFaB8EPW3bTZsYASaWo305JTD9MIfE
+iJFUcI5w5BLdbpBVSyMBUxq6AewiP0NMAn++GsxheIpCX2xiIKFYHcPiOQogG6nP
+cze1oQ0ZvD5ra6asOhAQyMR7dfxhT0hI5Q8wOBWGLg9H54DQv7INtPYoPbVJ8rDJ
+hkievyMx9fEoD2mtTqfntlGV0F6JpBjxFjJ6E+RRBBrXzaZq107OUgVsOpWOVdBG
+6/mBypyF83FjhGDBFkni0SsTZDVBV9DAyXesmwEPKTgCbdcYOKXZpBrYJVzM7HYx
+mFJpCwfNpLjwm7elMAECTxquxRZLDJWmpE5CzTWO4KGmWMYp96qIN9XAqzWvNNW4
+kBntpzXiuDr7H3qDpLs05lGC+Ae+Zq+2Id5ll1pRHpzQAtkqkJVrdFJX9JucRxKI
+PiwzLg4pb+A+2eTUGcdD3P0TeC3KdPEwzltYniapAj2z184zZMYGqC6rb7NwqTSB
+qp+mTMWYJ1MFZ3WOgf+A
+=0kmM
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-24.1.ebuild b/app-editors/emacs/emacs-24.1.ebuild
deleted file mode 100644
index a87a5f6962c9..000000000000
--- a/app-editors/emacs/emacs-24.1.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1.ebuild,v 1.14 2012/09/25 19:12:18 ulm Exp $
-
-EAPI=4
-
-inherit autotools elisp-common eutils flag-o-matic multilib
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
-	mirror://gentoo/${P}-patches-4.tar.bz2"
-
-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 ~sparc-solaris ~x86-solaris"
-IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
-REQUIRED_USE="aqua? ( !X )"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	>=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
-	net-libs/liblockfile
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	alsa? ( media-libs/alsa-lib )
-	gpm? ( sys-libs/gpm )
-	dbus? ( sys-apps/dbus )
-	gnutls? ( net-libs/gnutls )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	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 )
-		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? (
-			Xaw3d? ( x11-libs/libXaw3d )
-			!Xaw3d? (
-				athena? ( x11-libs/libXaw )
-				!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	alsa? ( virtual/pkgconfig )
-	dbus? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	libxml2? ( virtual/pkgconfig )
-	X? ( virtual/pkgconfig )
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/paxctl )"
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-24.1.9999-r1"
-
-EMACS_SUFFIX="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
-
-	if ! use alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-
-	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 && ! use sound; then
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		myconf="${myconf} --with-sound"
-	else
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf="${myconf} --with-x --without-ns"
-		myconf="${myconf} $(use_with gconf)"
-		myconf="${myconf} $(use_with gsettings)"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
-		myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
-		myconf="${myconf} $(use_with tiff) $(use_with xpm)"
-		myconf="${myconf} $(use_with imagemagick)"
-
-		if use xft; then
-			myconf="${myconf} --with-xft"
-			myconf="${myconf} $(use_with m17n-lib libotf)"
-			myconf="${myconf} $(use_with m17n-lib m17n-flt)"
-		else
-			myconf="${myconf} --without-xft"
-			myconf="${myconf} --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
-			local f
-			for f in athena Xaw3d motif; do
-				use ${f} && ewarn "USE flag \"${f}\" ignored" \
-					"(superseded by \"gtk\")"
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-			use motif && ewarn "USE flag \"motif\" ignored" \
-				"(superseded by \"athena\" or \"Xaw3d\")"
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-
-		! use gtk && use gtk3 \
-			&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
-	elif use aqua; then
-		einfo "Configuring to build with Cocoa support"
-		myconf="${myconf} --with-ns --disable-ns-self-contained"
-		myconf="${myconf} --without-x"
-	else
-		myconf="${myconf} --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf="${myconf} GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
-	# According to configure, this option is only used for GNU/Linux
-	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
-	# out the location because $(get_libdir) does not necessarily return
-	# something that matches the host OS's libdir naming (e.g. RHEL).
-	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
-	crtdir=${crtdir%/*}
-
-	econf \
-		--program-suffix=-${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-crt-dir="${crtdir}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		--without-compress-info \
-		--disable-maintainer-mode \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with gpm) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	emake install DESTDIR="${D}"
-
-	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving Emacs executable failed"
-
-	# move man pages to the correct place
-	local m
-	for m in "${ED}"/usr/share/man/man1/* ; do
-		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
-	done
-
-	# 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
-
-	local c=";;"
-	if use source; then
-		insinto /usr/share/emacs/${FULL_VERSION}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-		doins -r src/{m,s}
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
-		c=""
-	fi
-
-	sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	X  ${c}(setq find-function-C-source-directory
-	X  ${c}      "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
-	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
-		elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
-		elog "You may want to copy or symlink it into /Applications by yourself."
-	fi
-}
-
-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
-
-	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
-	else
-		eselect emacs update ifunset
-	fi
-
-	if use X; then
-		elog "You need to install some fonts for Emacs."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-		elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
-		elog "for how to enable anti-aliased fonts."
-		elog
-	fi
-
-	elog "You can set the version to be started by /usr/bin/emacs through"
-	elog "the Emacs eselect module, which also redirects man and info pages."
-	elog "Therefore, several Emacs versions can be installed at the same time."
-	elog "\"man emacs.eselect\" for details."
-	elog
-	elog "If you upgrade from a previous major version of Emacs, then it is"
-	elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
-	elog "all byte-compiled elisp files of the installed Emacs packages."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}