Enable building under a PaX enabled kernel, bug 411439.

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

4 files changed, 360 insertions, 16 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index cdaa9b15f075..db0b7c47dd0d 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.488 2012/05/24 21:12:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.489 2012/05/26 16:11:19 ulm Exp $
+
+*emacs-23.4-r2 (26 May 2012)
+
+  26 May 2012; Ulrich Müller <ulm@gentoo.org> +emacs-23.4-r2.ebuild,
+  metadata.xml:
+  Enable building under a PaX enabled kernel, bug 411439.
 
   24 May 2012; Ulrich Müller <ulm@gentoo.org> emacs-22.3-r9.ebuild,
   emacs-23.4-r1.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 66eee6786972..1663f6e934dc 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,28 +9,30 @@ DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a
 DIST emacs-22.3-patches-8.tar.bz2 5974 RMD160 a17c6e291b6c0d246d30a27baceaa882b12a1250 SHA1 fbb03538973be5f416edbffebc567f6346caef4b SHA256 72a68bd14ce2efd52b0425c56649d735f4b3c0e630de73e0eb51ddf947d56ff7
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST emacs-23.4-patches-2.tar.bz2 1535 RMD160 7b991a627c60a7b26134ef4bc8b4e4062a045ea3 SHA1 fa2682743653fac475f3c8dd9e9ebf3dafa43edd SHA256 ee12b40d769497b98b609933f9f122f9b45873ac84447832930158822f52f920
+DIST emacs-23.4-patches-3.tar.bz2 2568 RMD160 3f2e7dde13aaf3c60ece5049f9b7d8966fb3ca46 SHA1 492eb31155fab9996985071d9ef3fc7b3423c70d SHA256 ac58a290b01db52edb93173413fc2ee8f42a3ea227161f27f79b0340002ff879
 DIST emacs-23.4.tar.bz2 38646508 RMD160 564d31fabc205b9ee4789827ef50d2b0f0461bf7 SHA1 5effbd2af6bf7a4feb2d80810e49b0ce47b463cb SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r8.ebuild 4360 RMD160 9c639e3318395aed2c15f02ece983c412909f503 SHA1 3b2b4855ef0f832b0ab92cc167aadea99f45f94c SHA256 89d4265e525b72fda6dd48285d836ccfb32baab21933ec396b68d195bb8e046e
 EBUILD emacs-21.4-r24.ebuild 5275 RMD160 7d38f9b7d1ef305f5ef4d922ab8541369cca29af SHA1 2482697e96e03fb31eed7dc0bc6eb4f353963514 SHA256 2930535d14d578a57beba1c9678b7691337055e3ec99f2ad9afe9ff06116f4aa
 EBUILD emacs-22.3-r9.ebuild 7996 RMD160 2bc2e952bbe862059c9f28cb46c040a83da70dd1 SHA1 362c86845558a5e2ff6420fa8fbcc02a2fc2bde7 SHA256 0182bdac3a93d1b1eaa3590e312fa37f9115cbe651f98019fa0efb7d2b00be6d
 EBUILD emacs-23.4-r1.ebuild 10939 RMD160 d90c885b539bb90133739213e03def5052e20f3d SHA1 f75d03e4534c2bd2899805cc977c0ee1a360234f SHA256 c399973b6ab4e6d63b97dc9da5ec2463d8c9ee9bc8947d8991a81c8983a7b1ef
-MISC ChangeLog 69246 RMD160 ebcb98b2020e905c401874da5e470aa3fe311a10 SHA1 699bf0a96c39ee830f4f3bf43fa7aa24d12dc3bc SHA256 362b8604a57607d890febeb9faf121e01c8008ca8c09627f67997308e6fb2f50
-MISC metadata.xml 1644 RMD160 911d63b0a921d248984f3c5efeb1922f05aa5111 SHA1 7281388d7c274016274e888d97821fda9e5c958c SHA256 7c703ad3af721dfa1d9737f78cd848b7c69a7b906ead5c5fe8fd1db23a1d3166
+EBUILD emacs-23.4-r2.ebuild 10993 RMD160 76f2244d4944ecc1d18bd9cc941a478d6df19dbf SHA1 41e0a4ac6dad82ca0ffb0558acc572ae6ad9eb60 SHA256 507ca89820f40e54f0dfe866b66ab9543607d312764b2d37dbbf455d6b4e537d
+MISC ChangeLog 69421 RMD160 27948c6766b4788aae72380c5973083ee27c4b50 SHA1 e8257d0eea386ebf6f9fed91eea64c3b51c6ef72 SHA256 dd9f87b7ae3320628cad738be2a0dbad5307cba7f972af3ad250f25e4515ff12
+MISC metadata.xml 1753 RMD160 08612ddd7dc86c3513a033b7780c2422e92edf8a SHA1 8b3edd7f6aec5b62505bb52db2e110d8b8a817eb SHA256 2803c744b9ec057eefb1443e17ea888b17d986fc706a77800447df05cdcfea42
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPvqVoAAoJEDxpGckxwJCBEj4QAKKdjGLInrmok3JmEU49+xdo
-Xz+Jv+CeHFS3jhvcf7DJ0ZQNizIvKlYFsh//4Nlc/zUxMlpsH0O/pQb96Odf7srO
-d/cQN66aJCtbrPYyr73S+9437S7Ujewc4jSM8W8YxeBmouBk5vJlNKMZipuDuiKf
-g4jTaZpWPWKg8S6CJ1ZhWdtU6/W1pK3bzhNzVS3XWloi2NK96TsFixNb7pnCKpIK
-GV+QAoebrH1FdvnFsWA2Q1S7VCcCIC76ILN6eqVVjidXCSGPoC9hCcYjOOEMR3aY
-ZQlAoKmn3BvmLts+3UERRb17MbaUswW0AEeG8PgcsNI54rZ8eJ66HydEjJSCS3Sl
-cb1E4Gu4zyJ43KS94CPH+Q3JK8PSktlR/2d1Fw75sk3/XSseecPbSZI91SIikNNA
-ZGMr4Udi9raLjGoHVn5x1IS7fsvM+uI68523xLLcQujA/GAdrGansMkaJ3eio7mh
-ZSA8WIkgfIwfhdiRVVTz5coFZagJl1ra4pEmVgItug5QDnF1vMLaeeOrvP9YlLie
-wS3tknzwSGEwHl/zD/wzVt0hZwCODep85hRA01kS7j9PshrY5nkF6kbAwav3vDmi
-H7JHgL5w5f2amn/2nUJjI1yW5tey/gCJqPBGRWeyBPEt3JjfO9MUKUdprNfG0Xio
-9oBZWBGd253JfqceG090
-=jr72
+iQIcBAEBAgAGBQJPwQHVAAoJEDxpGckxwJCBTEoP/inGb/nQpBXza55hRuYMyzik
+zCp7TXlS1Jf9ei8H8ghNqiyCYR0HWPlC6Mo22HE/ARY1e1vqTZgy/1UqHa6XlLjg
+ky4ko3QS5ehHvSAwmHkCwyBKmFvrDIbnGzNLOkgR8GED8BsR6m1nuoWZvkfvGbFE
+hCzexpAmd5k8Ijv8vgpHWg/u/moHogZtWYt/39uCULKYdwh7gVwSjoLJt1JIp7nc
+dXAV4LCkhCIseu6DgBv7YGU12so2J0Z704xokFKpToqe9ForUFCvy34zJzF+ej7p
+7mIn8JwPvoKllrnrSJhiNjgG6cKsv0zMU2HcslgpRv4zXGkXA2GUVx8L1jt4nzEZ
+cHUvwICUk1b30JHlOu2EG1KgvM7ak+ErKGrXcUtGUU+n8KdarIwntaE8R/vkdLiw
+2eqVPxNB2L5H+mqZIzITvW1tStf6YhLme3kIs1pz2Lh47467USU8qZizeguhcpQG
+dI9KjchuKK62WzxC2ieU2XwR3x9vYM+TDbu5knDndtC33rNOS17OXgzpm/Xt/Juo
+rMaGOZn7zNw55DFQXWAOlg6pzxjtf4zWWUuTj5ADDJudcbCGhsr2EWqTLqA1uT7B
+wIdbfmMCMJTAISolMIQv5H9Dxzk5Jwm4DBdeeRTrudcrGpdDmeioxIRItYySqBWG
+sOioFUuyVj/1MbkJta1J
+=EutX
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-23.4-r2.ebuild b/app-editors/emacs/emacs-23.4-r2.ebuild
new file mode 100644
index 000000000000..378daf96f1f4
--- /dev/null
+++ b/app-editors/emacs/emacs-23.4-r2.ebuild
@@ -0,0 +1,334 @@
+# 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-23.4-r2.ebuild,v 1.1 2012/05/26 16:11:19 ulm Exp $
+
+EAPI=4
+WANT_AUTOMAKE="none"
+
+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-3.tar.bz2"
+
+LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
+SLOT="23"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="alsa aqua athena dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars 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 )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		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 )
+		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? ( 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 )
+	X? ( virtual/pkgconfig )
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? ( sys-apps/paxctl )"
+
+RDEPEND="${RDEPEND}
+	!<app-editors/emacs-vcs-${PV}
+	>=app-emacs/emacs-common-gentoo-1.3[X?]"
+
+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
+
+	sed -i \
+		-e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
+		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
+		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
+
+	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
+
+	eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -fstrict-aliasing
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	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 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)"
+
+		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
+
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			myconf="${myconf} --with-x-toolkit=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
+	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
+
+	# 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}" \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with gpm) \
+		$(use_with dbus) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	# set last component of emacs-version to (package revision + 1)
+	touch src/emacs-${FULL_VERSION}.${PR#r}
+	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 "${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/Makefile.c
+		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() {
+	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
+
+	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
+}
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 3eccd83154ee..3a04e733640d 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -24,6 +24,8 @@
   <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
   <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
   <flag name='leim'>Add support for Emacs input methods</flag>
+  <flag name='pax_kernel'>Enable building under a PaX enabled kernel
+    (<pkg>sys-apps/paxctl</pkg>)</flag>
   <flag name='sendmail'>Build Emacs with MTA support</flag>
   <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
     preference to Emacs' own scrollbars</flag>