New pretest version.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

3 files changed, 366 insertions, 15 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 021ee02cace8..a95a84c267e2 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.122 2013/01/10 18:36:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.123 2013/02/07 23:55:15 ulm Exp $
+
+*emacs-vcs-24.2.93 (07 Feb 2013)
+
+  07 Feb 2013; Ulrich Müller <ulm@gentoo.org> +emacs-vcs-24.2.93.ebuild:
+  New pretest version.
 
 *emacs-vcs-24.2.92 (10 Jan 2013)
 
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 42dacad8567e..962ddc432164 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -4,27 +4,29 @@ Hash: SHA256
 DIST emacs-24.2.90.tar.gz 52987023 SHA256 211c154240fbde9222316e6556b00a4c374ed44fcc01b02ef494a26da753397a SHA512 817aa462a433950c189496687918a0cd17de889a5b461ef60cc734124e7a029412771bc55efb11a45bc43f548c5671eb8c6b384efbfb0b5e14f8a711d7690dca WHIRLPOOL f57d34c4d6bad81b02d7ff0997cac13ba503bcfee96cc4e43e691dc2b87cc353b5f07829dfa57247aa58ad9ba52d1c68006a50dafcd5038e93b9247d237b045e
 DIST emacs-24.2.91.tar.gz 53109002 SHA256 47dedc136219567d1d2a35c802147734156d6d329a62ee3e25ebf0f5766d52d4 SHA512 8e4efc6b5aeb73e8d7075784497e4dc995c9461feac10d924b631ab67d93bbecf68f7cf0910de6771ac5e181d378898f96584e18fe52b755ca7382ea34eabf1e WHIRLPOOL f4885b6057ef8df4961b1072c6795817198a9e31e35344bd14985a8165262bfc9a4659b244bd870e7219e10dfb6824f70958e34e12aee4ccbe46520e84023fd2
 DIST emacs-24.2.92.tar.xz 35560200 SHA256 5ec6e26ea0d18ab3f192bf2a9af4c614b01ad5033faa4990f5e3f55183f0eaab SHA512 afd61b1127a81d95ae5efee7d74a3a258cac3c83d98dfbbdfa3b85a5ac963615d9ff833492e466a93d973210f58b5df8b30b6117d1297fd13cebbb236ef12463 WHIRLPOOL 3b67d65348e5d787bf171a45cc93cb124742466c937cebf3b2ed6285ee9457185a723911342e6dfb8f83bd443edc70d111ab774d19f1519311511dde219d2186
+DIST emacs-24.2.93.tar.xz 35556548 SHA256 59b3971b14b1bc29244f3f98408045ba4dcd5be289792cb0330cb4223a350927 SHA512 3cc5a33f8407a72692c898f60e8725fce6b51472e74a005a8f987a4fe10327aeb2b41339a026d79641090ac91b86f9f4b9deff8bf364be029e3eb8117f85059e WHIRLPOOL b92c9ee6514a531e3c32fed9788763e2fc9850881518a30fe50a85ac31f157ca27b0331bee5d5763a7344fa2f4b8e73db1d28ebecf3921653f2c6857ce17b286
 EBUILD emacs-vcs-24.2.90.ebuild 11238 SHA256 defea2c0d7204b05d23c3f8017dff9d09cf8d94125bc5ffdd70e221e71b28f0b SHA512 db28771d4c3d37261a111b39cd23c051c7e27137fdd6629a52e437ee248b98b159eec0fe16c44dcb6784c09f6a34fbf56ddd147d6ee45d3bd5c09bb380568c24 WHIRLPOOL 6f866d25955c55a4b73a21942bd0f42f34aeb7e31b8b26418ebb15f0fa4c69999ce6f43b0c5cef1558239197b05cbca18c3ebbb512d904e0615c9428d478d100
 EBUILD emacs-vcs-24.2.91.ebuild 11235 SHA256 47ea4c6624abc90cdce980814a788de5fc8d43cd95d606912a4001b3fd3e2dd6 SHA512 02467002a0b3e6de2ab1bdc989ba8b1cc40cf08eca9e56cc4b8a6a08ac6bcd2e1f5f5dd1f79d818d52739c0945815d094742447928e3810f8d1d06a47fbe3e71 WHIRLPOOL 9496a7902e1669c1d5ddac8ae1e1c17e602b36f0ad38b8bc81a7bc591833a46f97edb5a8b1bfada2839831272a117a338b63988028c11de8f6ae27538665f2fb
 EBUILD emacs-vcs-24.2.92.ebuild 11254 SHA256 2191ce38b8a345a692d4fb71092179fbd3c691e5fab528209e3b369dc1c1e09a SHA512 852f39aa507f3f4eab18b02fae8226bc4ad6fc23eedf5946068d97fa0db6a3d379be066d1f6ca33eb88fc689de47c83b2e079786d1f83944bbed848c343de357 WHIRLPOOL 9f24c2a6fbdc4b431f44e0491c888f2e0d2aa764826ae4c65452787a9ac74bd5747e467fc72730da0509638a408a7448e7e5350def6a9c40e1356ae1fc412007
+EBUILD emacs-vcs-24.2.93.ebuild 11254 SHA256 39afe406a6fd96dfe9ce2043e3a7a582d0dc1a0ddc28ef3946dcb48564a246d6 SHA512 becaa2b887df8d850a35e44ff62b8f01f69d860d5da8f1aa1df8f547695ad4fe91645a76cf6effdc8bd0346d8ccfc7e446f79df7e53b391f88078f9ee685ec2c WHIRLPOOL 71b46f12ded08e9c5bfb26caed74722661540ea5321818234f9e85f15972c091e7ff1c8a3159274e6a4f91e641e7fa113826727bb8b1d0037e7d640fed30d69d
 EBUILD emacs-vcs-24.2.9999-r1.ebuild 11240 SHA256 c29950b6f83da80c3dfb2dee8041c7c69a23eaf63aebd1f50e691b52a29e0303 SHA512 8c04713b41d25694252543bd61514eb2834108508e8991f730a8f30d7bcd28970817871a099e78a234193537315a4861a9ab90bd7b63cdaa34aeee666fa27062 WHIRLPOOL d02a98a48575ba6825bb86e68497e65d1fe99608f332759bac358beee5ea62f8ae596a343ab115ca1fed3158524ba509a3091c02c1e70e6566408b330aa65b9f
 EBUILD emacs-vcs-24.3.9999.ebuild 11234 SHA256 22e4bb7cc29c3bc1a801b5e569b9be2c4aa9973a7507dcf2842e3a44acc056a0 SHA512 785d21f51806ee863805f6f9f66c2075d31d42ab8273791da151fb4bdca9fd911d38b033258044605585e6119fecc67af74192b7a74739ddb4021db2a333a3bf WHIRLPOOL 550e54ae65565e9f42d1967f03f6fddc752ae263a13eb0fd4e2ea0edc669cf4c3462d64d4ed6c237b5eade3cdacf99982b32cd0f2b9f635cb996a17abb1073f0
-MISC ChangeLog 71208 SHA256 b8aff484b5ff39d938468f620b8cfd2fe19bc8a2dce78f34cb4c8243b3de49a7 SHA512 98d380753205215c3dd978366c2a02eff33260324d01dc894243476d95171592cf1adf940a9943a375cb56a0462e48519a442e850d0a3d83c0a38990cff9ba1c WHIRLPOOL d6dffbf8408bcfcc06c440e9e02c8897ff8060eb1ee865cef37da009f2d7d6dfc59f1a31b10b16f3527ba88ec5a847d5336becb2728f04a73f3904193d6a389d
+MISC ChangeLog 71340 SHA256 cab143c1ac28df91c5e95bfed717b2915b06a69c3fb8b7f35b5cbc151a63fd47 SHA512 cf5f351ed6cac3d4bfa47224425f0885e9472c419b351fd758b3e238024eb9556bb571653aee9557990dd07ef119299de1cd6c67d2f1931e17721b57b6e660dd WHIRLPOOL 21dfdaf9cbafb6e1887d380d1230b9d68d6b449b589e185fa3d54592c1824a6658df3322ff98b6e12507dbf9f590cea51d3f1825c709b03b00b38147968ac65b
 MISC metadata.xml 2431 SHA256 f5b0a24ab6e525de4d80cffb7a635260e47c88552e7c2b3fe694b76b130d36f1 SHA512 9345b4871208b2cdc7b1ef4d1981cad54aae6da91ba3fe2aa482df8a242b87d7d1c1288f132ed70ef2cab0372418275a50754c7249bb06adc7f5a17403a40fe7 WHIRLPOOL 73f2ce2c94b5e0b83cd1d06ce975b83004d54f51d573f3330450d60c2e7c5220c4bf92ca0af403a322ed9a67806b3cb11190f81f93e135bf1f8e0d8dee0cf220
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ7wrjAAoJEDxpGckxwJCB+wsQAIyL9UsBFfbkHxJXJXd5Qxm7
-v5jBEmz+lcMPTkpMUx9DQTq4qP9dohwZrMEM33dx/TkonYfQ9Qo5Bf5L59R6OD3K
-eWWXyPOcjoIYqcrkf4rrHMTiFUMgpAu5WNe+dqlkhJV/nMCMApX4+lxGB4RxXLKl
-nyLLwkiIepC7gVxbtxlgNxdxBiyaXo6rI0dd29qhdGLKrFdMuvUlKiM0xa18iGTN
-0D/4WMFLO7ZWY8D/aY7s2t0k/1NfX12cJuE0kuaXEyLPVhRo/WgRs9uEqUnPOmDY
-eh/dVDO7zwRtjIuX5Ot1wy1eJ4niEYpoZiLLcSuPULqWdRGRaI2/zQWVV50zUUm7
-zeVuVsO7x2ygndmMumBdtaiT/r7EuDQiJoPQgZYr015QOwbV5bNIZZLezXXK2ZpH
-FgOoHpnzbx25VgcBevwtopnI7Yln77qWwuZHPq8SmrMJhGxZO8hvwJWDZs8DfDot
-/T7cIA/bxjPrVXyGekjvW2tl0VBPoHNDvmX6I6GkgLLNk8A6Q33mus6ejb9cYLEm
-OlAczetYeNtVTyK5l82krp/b8Th6JDpMTQPE5uYoF3vt0s9lqv5ORECqnfq2igDX
-5Azyp75WE2cf81O74a+txWXkrWN+mmGeLKaDE0IcqHevYbj5FNoEqlh6SYMnJPMW
-mtOF8yYLfGwupogOa6ep
-=nzE/
+iQIcBAEBCAAGBQJRFD/OAAoJEDxpGckxwJCBpI4P/RDfEEhTCqQWK3YR1voWQaZA
+s4P2qbEsoll5NDFoYNQuSrnnjlCjZwuXREMtmLUqnhLFZwhc9JpQla+9i8sBi9Re
+Np6SERDCzG+nykkl8YqcLwEyWyqErgeeJoVRfnAPRFb1a+An40ynzBzvfz0jMH4+
+iDKJ7kKibFuTMSUXPHQZ1G3tzV8mqDdddIn1vdupADcLy64yv7E9IqGWtYV0F7Su
+GQSg5Q9/rpXdraGcNeXTfaDIiDZOnRMD0WJc2uZCH9NVD1TRP8aAMfAjdALEDgrd
+36SPKc5QXCyyXN7pj+QN1ePD98pw5dpBb3zvNfPkCB6jeRV1D+z6F7EjrjjvCeVN
+PuFT/raSCssU7mFNvTKL/F+FMhE1xbMTdels4/5rweQGMyaCe4KiNNcnypczPu9o
+z6SE2qT5O5Ifjb0MdYJp1YvUZJwC2xJTeRZ12oMCaVeRRYpzkMaATiKxrFUD7kyT
+Zq5dZbNb+PnWJUqHktm4KUSHmzDVZgbKXTbuLKR1TPLm7jfqOAX/+17Uml7H/c5d
+HfCwOmxGUoNPFJz172lHyh9prVpw6njCz6QmLOwpS2b0+pYBRCyeWHl7xNMlhZEK
+WbVpmDRf+Em/nq8NxNu4tjsRWbfuri7qOW1iGyeUuvkskKPf4P8k5qrAeLDLjtlG
+WpL5tarXW3PoHa/Akd5H
+=vVpj
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.2.93.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.2.93.ebuild
new file mode 100644
index 000000000000..b900cb6e82a5
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-24.2.93.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2013 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.2.93.ebuild,v 1.1 2013/02/07 23:55:15 ulm Exp $
+
+EAPI=5
+
+inherit autotools elisp-common eutils flag-o-matic multilib
+
+if [[ ${PV##*.} = 9999 ]]; then
+	EBZR_PROJECT="emacs"
+	EBZR_BRANCH="emacs-24"
+	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}"
+	EBZR_WORKDIR_CHECKOUT="t"	#434746
+	inherit bzr
+	SRC_URI=""
+else
+	SRC_URI="mirror://gentoo/emacs-${PV}.tar.xz
+		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
+	# 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 HPND MIT W3C unicode PSF-2"
+SLOT="24"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 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[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/motif-2.3:0 ) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	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 )"
+
+EMACS_SUFFIX="${PN/emacs/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.ac)
+		[[ ${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_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.ac \
+			|| die "unable to sed configure.ac"
+	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 "/AC_PATH_PROG/s/gzip/PrEvEnTcOmPrEsSiOn/" configure.ac \
+			|| die "unable to sed configure.ac"
+	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=$(usex gtk3 gtk3 gtk2)"
+			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
+	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}"
+	if [[ ${PV##*.} = 9999 ]]; then
+		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} \
+		--program-transform-name="s/emacs-[0-9].*/${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 \
+		$(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
+}
+
+src_install () {
+	emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+	# 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}
+		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
+	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 Emacs version 24.2 or earlier, 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
+}