New pretest version. Fix SRC_URI to use mirror://gnu-alpha/.

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

5 files changed, 398 insertions, 22 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index b02dab542f52..93018fcc6396 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.84 2012/02/27 22:34:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.85 2012/04/02 17:29:27 ulm Exp $
+
+*emacs-vcs-24.0.95 (02 Apr 2012)
+
+  02 Apr 2012; Ulrich Müller <ulm@gentoo.org> +emacs-vcs-24.0.95.ebuild:
+  New pretest version. Fix SRC_URI to use mirror://gnu-alpha/.
 
 *emacs-vcs-24.0.94 (27 Feb 2012)
 
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 6e3df8195bdd..e52110c7d55c 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -4,26 +4,28 @@ Hash: SHA1
 AUX emacs-24.0.92-ns-appdirs.patch 1538 RMD160 354b2726d80435aeb8b0e39616682df6774e7cf2 SHA1 50044a01c4c125d394308ea371f9a0337ee11609 SHA256 588b276284c7a56494fdba935a975c66edb668e5431bf25f1396696950c8f804
 DIST emacs-24.0.93.tar.gz 51257120 RMD160 6a3b6ae0ecab96a53828856de6db0c016cc5d47f SHA1 0b98ecf3e9f44497bfaf4203c2afc81252c4bafe SHA256 4a100accb2f76231aed4dddb32d3725dec131280ad3bdf1b39b52ce337a210fe
 DIST emacs-24.0.94.tar.gz 51251891 RMD160 3593d6a003b556f3755ba6ea3f8a92ba1b5ba2af SHA1 d70fe6da2d2b943423fcf16badb0294566710eaa SHA256 238dacb608e74fce088cde61b82907ba6ae5d975e88f38a0b199dbdbdb28feb5
+DIST emacs-24.0.95.tar.gz 51371928 RMD160 14a0ca326c18dc549495e862d83eb9e1917d2ead SHA1 09c1eaed7400f8cc0e5dab9fb2337c3c4cee5449 SHA256 434b8e4a27d376257a6fe93b35936466985ac45c90310e6041e0a0577752df64
 EBUILD emacs-vcs-23.4.9999.ebuild 11183 RMD160 944d9981ea522e0cc75f8d8cace4b58efa6f3d64 SHA1 03177b048d4f72abcdc0d426d2c4406db13b4d4d SHA256 61a2c95095bd3e2fdfe5830991139732cb864ab5d0a434a0677615a84adf2193
-EBUILD emacs-vcs-24.0.93.ebuild 12107 RMD160 7589ff12f188f125d6df0411b7e2477270ce8dae SHA1 04b3de8521e61a5794ac9e3544b0781399eb0b93 SHA256 d829fc0ba61a180b5ea43e1c0391e4424580bc7ff24a8941c3dfab5b29e74402
-EBUILD emacs-vcs-24.0.94.ebuild 12103 RMD160 3b4d9b1c099e3a06605672dd8e9eab8beb487542 SHA1 982e496eb9b93a0e399041fa1d3f6a7dba9cf8ef SHA256 b85508fbe7bb96461c9cea9efd76f85f37579395b9025f3550b239008485d722
+EBUILD emacs-vcs-24.0.93.ebuild 12098 RMD160 422d495a0ef0054badc9660e3e03755c0e0bb25a SHA1 d922a5a9b0d2ecd1f5be61e81407d094d1099ce6 SHA256 21e8738fa9814c9fcd80e5787aa670fd473c325200fc4ce372cb5e9ef4bf7b92
+EBUILD emacs-vcs-24.0.94.ebuild 12098 RMD160 3341fe7dcbffd3f1dd0d125a9ea50bca9524c191 SHA1 e3fc1193f795a313dcd69e2eabaaf032d325a819 SHA256 032effd50dced34af5b6e194158abd1167d8bc60397e0e00e36765a49c0a9c7f
+EBUILD emacs-vcs-24.0.95.ebuild 12098 RMD160 d2685dffef208429471f235cd4b44891f10f317a SHA1 af6839f12017772e488c5a2061be5c1bd2e7c98f SHA256 f453c1fc671b4a7e85ab042400d74667f1c7b75d12560fe5bafbe7c6709cb148
 EBUILD emacs-vcs-24.0.9999-r3.ebuild 11477 RMD160 c779beb80bbe3850d2710b62ff3ae62979a14a19 SHA1 f2a419906b694ce591fade3f55f2feefae301e1d SHA256 b9d253c6831ac49cdb8f26ca1df7f118d264f5b23bc04e8f346321a516dac78d
-MISC ChangeLog 64137 RMD160 b56fb0910242b6d82ca77b1db79f22ab5c0644de SHA1 7595f7bf8d3c1c9eaead0651cac240e6c0a4bab2 SHA256 5ef7f0b9f7a9919d804ee50e71aca03a44893f9fcc6849b69cee46be98220ee1
+MISC ChangeLog 64309 RMD160 6f95f9eed0527f8b77cb960fa8f5d7cae595684d SHA1 87572f56bb005e626b59fb2ddfc23c897a62e5e6 SHA256 289d7bd8c1deb0df134cb736edd59013f42162113e4a23374e157fc53ad44339
 MISC metadata.xml 2159 RMD160 c0ec88f19a4e19271ea414b5e4429d0ca3ec4548 SHA1 3f8c32f164afe13baf231c60a2b64ca9912e5bfb SHA256 b1008bb18ce3aacd84175d61ac8254d017a4a9ba67d5b376f21a39e5699be3ba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPTAVzAAoJEDxpGckxwJCBnggQAJEGYjOVZuUmy+inulGq7HjX
-L4YVrL8k0Iw1uAVTwWDL12aApE3t09oRQcAgOwxmyOxzO6wzjHzfgXwg3rbFUFhl
-x1xi/gld+M76HVcbiRWLYta51tJSQCnfZGjHpOAG4VVeCFTopDoZOz32rp5xhpmS
-gwetbv5pQoVDRM+tRNTbF3Xl7JIXQYbQnVtIUatTgW5vc001DnhaiyFaCfh7iHKu
-h2bQrpf3a0/+gSlcI11g4WN6rUHjoCsimzP8Xh7mKvQLzPNUIY4VTBoRbTaefaef
-2/dXzGGJUrSs1+TDVrrrIle6Au8fn9AH9/XrNtucoijeuFtQmaQSxT0qsxdJ4m3V
-5IcNMg+8LjmO8tDJ9i4dvHvtWlo5nTYVcu0ue0pwrDH4ckh/c5LNnC1DAaRRfiic
-nAWGVmc3lI6WxzOsnpZx3nq2ijCw8D5qXoj7cRTMw4aDQCDbNabO7P7sKo7apPim
-mX9y0hJvYq4QN6lnY2FfJJYZ+LFaUxiKjcvKT7d4zJwy34l3oKvrNP9BYxGVrvW9
-NIt+FeDV3myQm1oP/FaEIKrA+c1GADIUGePpfUpyVnseykLq4lWAE/0sYf8/9fZv
-knsS9H2A+CqMySYG6Eh8qaMPRH+KA+0FyEecB7ffjK9XpBWfibqUbWQYFKycBrCU
-QtJmSZac6JTFp7MdDJCf
-=Xavd
+iQIcBAEBAgAGBQJPeeNnAAoJEDxpGckxwJCB2usQAJ5uUtAzDrFaEkFl8hQVqjq/
+FnrK+4UvfzNjF3MiEej6flkl3KKnnbHTL/XfF4stqI0GapR10+oyf329GadCXpcz
+jb/NShioVMriK7nsxIoEGSY5bKJu8EKZVf+RNjWK9EAGBSb21XpMJXGFgh8dTERd
+zd4WyOWciT7D09NW/SqCXjounnmMRqjAy0NPayjG2cz3shu0G8J/4RuGhr+lWClD
+ql3hjh7nMBhaO+twmVukhuBCMuybF8d1V2ZYpH5n1TmANoEdt2Lqds6v0765trc7
+PVnCC1EM8PtZcE2vQpHBfCjb/FW7C8TVk4aPyURgc9uuFfq8gIiR/Rg9iwtczpT+
+Q/sy48pC6B3OItbIC1WnKpuRZGE+OH21bwzzpCmmo0ejafSiF2jX7uQfcPk8Bs8a
+dEpX+JXOZiz71uWU+e1z0UQTjV2yICVWI5GdXcxx1Yl/hKXY0O0VZuUM6zXL1wub
+E2KN1r/IWnCgodxn1lpM/IDASie4p/UaBAt99ViiA9Y/rr09CV3llOYh0ysasAa2
+ZAsVHgEOBK77bZRh3Zjg/gAst+sv0djg0hpWrBT6peFJEvfHEtoTld9Ztzs9++sj
+Sj43c8kvOIEmOi7Fcj/Hj+T9X7IL2guH3L6lkS3ItRyCiGJ4tl2mpc7eHUlnQLNy
+hjWTl7iCWLy41ZzgHahl
+=FAgF
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.93.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.93.ebuild
index 1cc34036840a..8303781495df 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.93.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.93.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.93.ebuild,v 1.3 2012/02/10 16:54:39 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.93.ebuild,v 1.4 2012/04/02 17:29:27 ulm Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
-		ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
+		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.gz"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild
index 721a894df8a4..48269ce1c865 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild,v 1.1 2012/02/27 22:34:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild,v 1.2 2012/04/02 17:29:27 ulm Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
-		ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
+		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.gz"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild
new file mode 100644
index 000000000000..58e6b02e8c03
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild
@@ -0,0 +1,369 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild,v 1.1 2012/04/02 17:29:27 ulm Exp $
+
+EAPI=4
+
+inherit autotools elisp-common eutils flag-o-matic multilib
+
+if [[ ${PV##*.} = 9999 ]]; then
+	EBZR_PROJECT="emacs"
+	EBZR_BRANCH="trunk"
+	EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
+	# "Nosmart" is much faster for initial branching.
+	EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
+	inherit bzr
+	SRC_URI=""
+else
+	SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
+		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.gz"
+	# 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}"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
+SLOT="24"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif 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
+	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? ( dev-util/pkgconfig )
+	dbus? ( dev-util/pkgconfig )
+	gnutls? ( dev-util/pkgconfig )
+	libxml2? ( dev-util/pkgconfig )
+	X? ( dev-util/pkgconfig )
+	gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+	>=app-emacs/emacs-common-gentoo-1.3[X?]"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.in)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EBZR_BRANCH}"
+		einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch
+
+	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() {
+	ALLOWED_FLAGS=""
+	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 wide-int)"
+		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
+
+	if [[ ${PV##*.} = 9999 ]]; then
+		# These variables are not needed for building. We add them to
+		# configure options because they are stored in the Emacs binary
+		# and available in variable "system-configuration-options".
+		myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
+	fi
+
+	# 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) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	if [[ ${PV##*.} = 9999 ]]; then
+		emake CC="$(tc-getCC)" bootstrap
+		# cleanup, otherwise emacs will be dumped again in src_install
+		(cd src; emake versionclean)
+	fi
+	# set last component of emacs-version to (package revision + 1)
+	touch src/emacs-${FULL_VERSION}.${PR#r}
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	local i m
+
+	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
+	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 "${ED}"/var/lib/games/emacs/{snake,tetris}-scores
+	keepdir /var/lib/games/emacs
+
+	# 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"
+	else
+		# 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() {
+	local f
+	for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
+		[[ -e ${f} ]] || touch "${f}"
+	done
+	chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
+
+	elisp-site-regen
+	eselect emacs update ifunset
+
+	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
+}