Fix runtime failure when load-path contains a nil element, bug 528664.

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

3 files changed, 354 insertions, 12 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index efe3eb5f5048..c86c985515c5 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.643 2014/10/28 13:03:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.644 2014/11/10 07:58:51 ulm Exp $
+
+*emacs-24.4-r1 (10 Nov 2014)
+
+  10 Nov 2014; Ulrich Müller <ulm@gentoo.org> +emacs-24.4-r1.ebuild:
+  Fix runtime failure when load-path contains a nil element, bug 528664.
 
   28 Oct 2014; Ulrich Müller <ulm@gentoo.org> emacs-23.4-r11.ebuild,
   emacs-24.4.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 3476fe414397..48982bd7d249 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,24 +9,26 @@ DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd0929692519884
 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 11187 SHA256 8efcd58597e0b3a68403ae773ff180e89d7dcd603b9506f7419c4333381cf6e6 SHA512 828385e42baf2c4456f69f82da0fa9814e1dc6eecab615c65bfe861c7bfd7d23746af6d7c1b7e1208de277d4bce7f274b4b218a6a74f4de6e651c1f7ec302168 WHIRLPOOL 454cd14432a9491de431d9b9b6fa3d400d2fb1c852fa0955bc450ce851cc4baf27ef1cf3e659d6f38f96ae91c2bbc4b25ef60ef4645e2e7805be97b8d0b6d0af
 EBUILD emacs-24.3-r6.ebuild 11077 SHA256 64ddd4f5dd1034033c43654eaa8f07f8864dcb560ba8f4b635ba6dd938494e4f SHA512 4e61f865046ab4a152f96809b11c648d96ce79ae4bc95fb97c6d743e677bde648775abb612b28f32312dbdba444f655441dc3320b601315c939ed7b8c5adb64c WHIRLPOOL 18607e47889e25cedfc6347ac78d131a58852f4b011aa73eca87283dfb86b4c5bfb99aed7d705bda04494cdc5f84bdf359783c7c697157895441f0521284068d
+EBUILD emacs-24.4-r1.ebuild 10545 SHA256 cf9778b0bda177543476ed98693e4779527d1065ffd3a8a56d930fe6f0f908f3 SHA512 e6fa64fa5ce1ef2d336412f192af98eaa07bcde29bc842165a28afd6b7b88b7983620466753060e075c7961f62550b17d1b2d35e6cfa5aa080043e1ade2b34cb WHIRLPOOL 11646c2d1e05c7e215ebb5d2088762e41be4fe0ce3b35f1cd41f59d84b7466682d7071cd85728e085e0984e10c7d53c4f2ea745d198a04517ad15ce95cc2c293
 EBUILD emacs-24.4.ebuild 10542 SHA256 b6302a4de5b3a09782079bae26506a50fc31046b7ddee5824f487c705502e8e3 SHA512 0328ce85287a4134ca5c59e3ed46e58ffcc9b777543c6140aa5422a4a663925c13bcb8b190bda0d3d73d1e41e3127c9d3fe8094c7c0c71e26493d9f4ef567490 WHIRLPOOL d57f3ee9bd98ec07c867305970279919d12e7534d0500a55ea5d61329097ce3bb691baa32c7d9463ff4073a6dfb6eb950a582d54726da12a0d3add07b4c16f8d
-MISC ChangeLog 88114 SHA256 9d69328e41f09e8bbcbc12955700fca6db9c3d4f9287ff2a933c94f08a787012 SHA512 97506c5023c1577c47d1a850b047fa0f2bc86a7357302dc684b610d8935be7d4cf3ed9f119e6b31abad120464111b0a75eb268975946e4013ad201a8133ef0a3 WHIRLPOOL dd9350f04cc6dfa554be3bff7564abb4f4a1ac05aa92f7ede86d9942569b90391380762e5a6b8380cb7ae11541eec5781aa811624e4c2960b6dee2e22ae4fe4b
+MISC ChangeLog 88288 SHA256 ac7d1c842498b780cc0bb6d0b2af25229d127f4dc05e4f5ba22fd8da3ce9348d SHA512 ca43fa334936946ac7616bbcc4dc1458a3be4c91956ee024c3e38f81775b03b937fc2331de48f24aa95f5f833a16d2d3f511a654e83d1727868b9430bfc8312f WHIRLPOOL 4815dbb5b549deba9eb3cd59944effbdd37191f9112e73e408988b8d5f8702bde46cf1b3fa0689028c8457c7d1b046be6f6b8531aa30c00f1e72b29bcac45e3c
 MISC metadata.xml 2522 SHA256 0dcfb3cd3457215ad785b82adfd0d60eafc10df3ac58c9125f6006e4ac90ced6 SHA512 8fefab8f3644c38b5a5c37e8aba2ee45a0b329b4dd846d280ef33893d940892abaf09204bf807d98870106677caf48e376667a4f2bf7c1dca26e72b6b5ea2c54 WHIRLPOOL b40fe229764c94b5bf59eda550e9a480a9793f3a4df43fa65c0dea518ad2372faf3276ce6009ad44a02907c2df63068b9596fc39e53cc7214dd5b30750df9a8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJUT5TkAAoJEJQzkH1pP7W4glIL/1MYlqmh0incjZ2m7du2qZ2h
-GxShRGlv0oKDNPezsYaA8091B9UWgqrMKW4FuJPOw7aalm+gT3bJXl0SJtzJkx49
-sgGgrf0orUvN7isAC4OHdQCd4jR6TYT2+61gLumVtC6V+3CAFiQC7W+i4+AaoGu2
-tRb5CDvFq+nMGmTA9OtVtLdoGMs2LkYOd+0oleUgmghN7e+q04K/xyM48S25x/eS
-FxGjAtpdxF1qC/0kBDUmkwfICIjevW27K//SRiqX4gGQ0i9s8qcsrZ6W0+kAZmx6
-khXJyb1CNo/vmTuU3IjjRqrl+zGjgeGM9GlmoCdoQbxnKDinRdfvgQncFmQ0cmtG
-mSscB3733jj+CYYGLTmFDXAkNEwQWnOTP6dAiRCJiAwymm9yQKkIxatnp7K2FwAx
-//tCsLw3RWtO9j9j6FHteeOIgvrSdV8/OXNmEZN0JaaSFS0+RLktkVNj3a5ulsQU
-Ny592DCucety0MQpVwDqreAY+zjz+f+EKEJvng8Wgg==
-=K8Ck
+iQGcBAEBCAAGBQJUYHEKAAoJEJQzkH1pP7W4/yEL/A3OMe3t3pOA0TDvLgaU60gC
+uC+Hf7DWHB0UjNqYAnnC19588AKqOWhCPuc7r9I2MDEvjh3XwXedu7bST9gb/Jxc
+sWoG+1vCDwNCyn4u1jLEgq17pn+o1T+VeBCVBZIfi2SH2+nwkQQHkBZOjBGy0pEh
+q6xl5SBgBW3cwoC2cuvONDrP9rasrmPTsy33aoJd7VzXZzfC6myFYh3YEibgp1OG
+FHYyhV/Uo0beiLevStBfpQyTFXMa1QEgQDFZMWfwtxJ2z8fk8y557l3WieincBkY
+PwUq3j7QMtRyihdP/uCvBhPVsx9rgGgEqzGIghfUugV3eypQbgeKC0vZcE57LGVF
+r0k3LhZcbkPmpVEvfiawYh3wfMtjGTGwimksOzbsOCLEJfLcPGug4Ei7FC2aj96v
+TvKcFg2MXIQlmhj2OVoQin6NaGnTEH7js9iWldDY5QqE+KEMQeeteZ64yd5CPjC7
+cmEtguQZqDnuiWTqYlaNtnom92HaH+QVVHyUoHtPCA==
+=wgxN
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-24.4-r1.ebuild b/app-editors/emacs/emacs-24.4-r1.ebuild
new file mode 100644
index 000000000000..c0ed207a0a9f
--- /dev/null
+++ b/app-editors/emacs/emacs-24.4-r1.ebuild
@@ -0,0 +1,335 @@
+# 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-r1.ebuild,v 1.1 2014/11/10 07:58:51 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-2.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
+}