New snapshot of trunk. No keywords, because the default should be that users get the pretest version.

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

4 files changed, 385 insertions, 15 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 2d98de4582c3..a4c17ff1842f 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.159 2014/05/16 20:10:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.160 2014/06/01 09:20:29 ulm Exp $
+
+*emacs-vcs-24.4.50_pre20140531 (01 Jun 2014)
+
+  01 Jun 2014; Ulrich Müller <ulm@gentoo.org>
+  emacs-vcs-24.4.50_pre20140512.ebuild, +emacs-vcs-24.4.50_pre20140531.ebuild:
+  New snapshot of trunk. No keywords, because the default should be that users
+  get the pretest version.
 
   16 May 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.91.ebuild,
   emacs-vcs-24.3.9999-r1.ebuild, emacs-vcs-24.4.50_pre20140512.ebuild,
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index e02f3ef5c046..02ac820230b9 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -3,23 +3,25 @@ Hash: SHA256
 
 DIST emacs-24.3.91.tar.xz 39423508 SHA256 40cee18cecd3a54b6b14dd2d9d46bf3de625a1649c39fa8826be42ad47dd217a SHA512 e944755ed464d269b535125f154127215ece9413e369286fe9d572bd32d9ef6160627a19644a9d80593c30d58412c55bb0559d06a7332d9090cb5fea718e1395 WHIRLPOOL f6b31889faa64a359969a33d319461865183d2a40ca61bab3398f07b9a939ac9f6ac8c9f84277e13682032a3f3efdcaf64c6dedf482a05c6c382373e8a27e826
 DIST emacs-24.4.50_pre20140512.tar.xz 24025212 SHA256 6df0c15aa736de7836b0f6124cfd82bc9c6b730e9fa8e7a696b9c09d15f1c2a9 SHA512 5cf1c192948447a30f364ec0ded15a4e543e0315f7be29107ced7f399afdfc4d45faab5da9c3c06e9ccd17845bc8de3aa53d059fc4453337bbe2c8abb4a5dd9e WHIRLPOOL 2ac765473d09f14064875e7e6d7677492230c353cef2d3fcb2f53eb31e1a31ecac385932e079111a3bdf76acd5010a71e66dbe28059d1c13f46910124828f87f
+DIST emacs-24.4.50_pre20140531.tar.xz 24040952 SHA256 9697cedafa3259d472481b368dd04986ee35ca7923341da4d415c62e4f6e5983 SHA512 c48f7f0f737a126a82f20a2230bdc433959b2d9548fd1c9c993a6c6d26218e75dc10835f7b0b7d421a989fee7507683ab1efd356170d9c5eadcae484b5fda6e3 WHIRLPOOL 54e4ec7dd75af36594eb340d16e450a2786615035134aa159dc0c113f77a65813b125542d957193fe64f25b37e2289955ef2abf8e492b6775fbd314e22c4c059
 EBUILD emacs-vcs-24.3.91.ebuild 11441 SHA256 2328d3bf668cb98cb343ce95739861ba24c39811a71ecfdd2ec3e91ef10444d7 SHA512 e3eaca660cee9b8aea5b0a8d1287f0474515f815f97b57b06bd270266a9362214d001677519defccfc6de9567c2d331c6308780867ea998e9a4f723b3ddd5640 WHIRLPOOL b25be868f80129222c2ce7ec6a731e95d34008fb8c109515064e24bde84dc869d90afb317406ad35af8857d177cbba4faeaae4b226fb1af13432d2a9f1821519
 EBUILD emacs-vcs-24.3.9999-r1.ebuild 11291 SHA256 e18678477ed72ff1124799238306aee8bafb0b2ceedde3c8a3e592d53bf08e32 SHA512 73c310e9a351faf37eb967dc202ccadc5c0d862485938c6df732cf8a83c77ce69bb912fcab337c4447f6d7567f5d994c6596f860aed5930ea0576058c166b3c2 WHIRLPOOL de7371f51cc0d8e7241e82ab8eda1991b65e11cf572b90804333289a06843b19aaccf83ea5d03d7ff0c5e44c82f92bf225138d9ab1565fa56e9a545732256cd2
-EBUILD emacs-vcs-24.4.50_pre20140512.ebuild 11473 SHA256 43fd45b3556d87636cbdb43f06b72cff7e4d4e93899fc7c23e558d4457455061 SHA512 28a1bff6dd3614a0b3daa311158c741904b526ce26b2d1cfa04213f99edafdb520c37c5dece51c15ef6f052d129381918a7273edaaa0559742c31ea6c24b41d0 WHIRLPOOL 6a9b7ea2c3095e195780e78ca6b94570013c166ac9ed863f101212b7c6b88db28fd21a178fafa9ba45b40c648acdc924a38ccc3d5749440c2c1530aa62db1f15
+EBUILD emacs-vcs-24.4.50_pre20140512.ebuild 11318 SHA256 bdc057a6d11e37c5b05fd2fc2b48fd4bca9db4d912cdf392c89dd94afd1fb871 SHA512 6481e7479dc62d5c2e5d416d92998e83f1e0f13315a165a88e100e1dc948884c1ebef994a3ff1bf0054e76494456ec3d434191e15315b22b9a2e0516f208a5c1 WHIRLPOOL cf52983eb4a58fb61f3dd3486e072f19af3244e580bebf59e4beb45f720f5b7b43d6bc42ed4b962a7339e981f25100e4382b19e96c0aa51d8d8b50d738ff720a
+EBUILD emacs-vcs-24.4.50_pre20140531.ebuild 11318 SHA256 0d9ba03a36b405a5071ee44f0b1bdcf44552d82b21fde7d4d223c7ade06f7d9f SHA512 6378fc175fd41be2fb7cd57227339bddd86b53569c62b591e9e6d08920abf8c45f3ca5c39e99e08b73057275ff4b17ef86ee512cf745baddaa38ff8d09e4a95b WHIRLPOOL 841b3ba891819d8738411222f0f3c022d5571fd384ad8725b47b9a66d033c71840723986c874290dccdde90b4bd3607695a351cb75a68c739138854ee905f3eb
 EBUILD emacs-vcs-24.4.9999.ebuild 11285 SHA256 17397768375acbfae3f427ae6b4045745443129c8216f4a5ae3c48fcdc8bf7eb SHA512 53fde7952587a4d0d99423aeb661d58490dad211dc36cf90c28e26491969e20080d5ea2f6486c88e73dd9be9ee39f3eb59f013c13bb5170ec06820a36065295f WHIRLPOOL 6999e6e985e66ed16b4bc90ed60abff22882306a6984a37119f3a7714950fc20f5b4a454ace89e8c03599dd40ed7b74e50aacd01a59f59abe40d6cbe141f22c2
-MISC ChangeLog 77993 SHA256 43b82cfe88d90f594dfc2576e530c2aeccd3218cf654146e2a02a7f12046c4f6 SHA512 822fcd2a4341d9ee5268f466ebede6001d42b46c3f8d516a49bf700bacb2bab13c0040db1c8a8112527340a129bc0f5ae5b15641f40dcf579af3ab6ffdec7a79 WHIRLPOOL f6fa0312729d1d121b6efb5d096a0cb8f2902d95f1bc888e99b4a350c8c17a56cefe1301e8ab5409c322d7ce5fa552f1c5cd5d69d21384ce34f4ad85479b5922
+MISC ChangeLog 78272 SHA256 e9493bc3be85000798b10af6393a7c88cee4a48bc075e83aa6930bbf1bd6be62 SHA512 500fee7824ca9a146702a33bdf42de4345f4c6f6207be78fc660283ba1f80f153f009decfde19a77f5bd6b2a133c761af80c6d31b301fce299aee0ecf787c574 WHIRLPOOL 748b44c81a76e0da1b642c23404f5f9e537366cc1c6c59eeb86f156adb63cc1b1b7f08ed4cb3cc9c69666adaaef238e0f7d11e9958d6228c5e660f9b5f238063
 MISC metadata.xml 2522 SHA256 0dcfb3cd3457215ad785b82adfd0d60eafc10df3ac58c9125f6006e4ac90ced6 SHA512 8fefab8f3644c38b5a5c37e8aba2ee45a0b329b4dd846d280ef33893d940892abaf09204bf807d98870106677caf48e376667a4f2bf7c1dca26e72b6b5ea2c54 WHIRLPOOL b40fe229764c94b5bf59eda550e9a480a9793f3a4df43fa65c0dea518ad2372faf3276ce6009ad44a02907c2df63068b9596fc39e53cc7214dd5b30750df9a8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJTdnDUAAoJEJQzkH1pP7W4l/wL/3EFg0W6k9CarUyrMHL6Ot/g
-tdQRxf/+riWc2k4Mg2Ax3o9ykdogaCtYXFTwIuc3uFo1IayseIrfjYknKIsgBURP
-kRkf/w6NN9HF2hFsSUUbg7a9sg2u7F5pRDuW9meJtqFXKB2BVgdXsLzTZzL0DF2T
-HXIYCNLhf89vVu4WEuY+6qUK2Ba0UBxMk4epFXRgRilGIqS+ycaqfurFIbIt5sa1
-pYjznUzx721R/t3yk4ldQIpHzoukDl1xMXaF/GQ/9z2A4zxY6OdiFnt3IRtPguXn
-yI2BteoxVIHf6io9XjBkPTIbs00/mATHeKrvFKuMTFbiThK8csxq8dRQ8WwBncxS
-AMjRxC0FR2LbKtjaOpUc4TLWoi//f1Dgy2pCH1soTrY8dctBoVMmhsGixZbGrcge
-seyZKfH4718EA66guyFQOkujCDm1uY5r03CMwhj8qbAQSUIGzwrsVFmma8nTzTue
-Gkzttz2a1wmOzNssDLwRs7UkkV+zAPuYUcK1/2oknw==
-=y2SF
+iQGcBAEBCAAGBQJTivCXAAoJEJQzkH1pP7W42xIL/3WUFbE+UPWh9MY7SrEK2OoB
+WEm3GalWnYUqoisfO896y70CYz3Cocz9RqbKftpyfTDvXXmROsIrYRkiaGUXNUBL
+rVeNDPqBvIA2AGFQPI6D2EbxyOuFr3fOPWF67Sr6Wddi0a/U7WICW8KmA2DnSYCp
+uoh+wFRR/GIhdAz70UTDxbURLB55GxKCaP3zDlsYWaaXfMt9gOxrwjMKstORJYwH
+/BFg1iRp9FiZQs0D//8i4Cy5S8O9OdHRpDxH4XpqffdqMHip7SzI7GkvQYASrH+v
+SrGA80s1QyJqMbMOpp/z5GBAIa8LViKMLBCudDZdIHWSkk1SDXQvXWjyByRrXHU0
+WPopzimjFQGudcq47qzn0JpBiW8TL3urITBQZ/UhNutU72oC/K+bCsdFKUnAmF7W
+YV+7tGsYDI+zYGW+w6XXwmsx0e2nsnGrXZCKVu6XoIXkMSmE497PkzRie2VhTAy8
+nmHivumGKBcbzI7E3EKb8wIFaYccOb78PsHhB0KgHA==
+=hVhL
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140512.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140512.ebuild
index a770a55892ac..df186d466325 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140512.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140512.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.4.50_pre20140512.ebuild,v 1.2 2014/05/16 20:10:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140512.ebuild,v 1.3 2014/06/01 09:20:29 ulm Exp $
 
 EAPI=5
 
@@ -32,7 +32,6 @@ 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="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 )"
 
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140531.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140531.ebuild
new file mode 100644
index 000000000000..c1c508fe74b3
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140531.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2014 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.4.50_pre20140531.ebuild,v 1.1 2014/06/01 09:20:29 ulm Exp $
+
+EAPI=5
+
+inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
+
+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}"
+	EBZR_UNPACK_DIR="${WORKDIR}/emacs"
+	EBZR_WORKDIR_CHECKOUT="t"	#434746
+	inherit bzr
+	S="${EBZR_UNPACK_DIR}"
+else
+	SRC_URI="http://dev.gentoo.org/~ulm/distfiles/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}"
+	S="${WORKDIR}/emacs"
+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"
+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
+	)"
+
+if [[ ${PV##*.} = 9999 ]]; then
+	DEPEND="${DEPEND}
+	sys-apps/texinfo"
+fi
+
+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([^,]*,[ \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
+
+	# 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
+
+	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}"
+	if [[ ${PV##*.} = 9999 ]]; then
+		myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
+	fi
+
+	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
+}