Pretest for Emacs 24.3. Readd support for aqua USE flag, copied from emacs-24.2.ebuild. Rekeyword for ~x64-macos. Remove stale patch.

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

6 files changed, 404 insertions, 62 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 8e54ecdee9b5..bc2e32e67b2b 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.119 2012/11/02 08:10:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.120 2012/11/24 17:56:52 ulm Exp $
+
+*emacs-vcs-24.2.90 (24 Nov 2012)
+
+  24 Nov 2012; Ulrich Müller <ulm@gentoo.org>
+  -files/emacs-24.0.92-ns-appdirs.patch, +emacs-vcs-24.2.90.ebuild,
+  emacs-vcs-24.2.9999-r1.ebuild, emacs-vcs-24.3.9999.ebuild:
+  Pretest for Emacs 24.3. Readd support for aqua USE flag, copied from
+  emacs-24.2.ebuild. Rekeyword for ~x64-macos. Remove stale patch.
 
 *emacs-vcs-24.3.9999 (02 Nov 2012)
 *emacs-vcs-24.2.9999-r1 (02 Nov 2012)
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 10a5b803ab01..1e403e27fd73 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,25 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX emacs-24.0.92-ns-appdirs.patch 1538 SHA256 588b276284c7a56494fdba935a975c66edb668e5431bf25f1396696950c8f804 SHA512 141d6f2a0df176eafd476b1b064586ac1d32d2b920fd3e65a7bdd9ad6335d3c148761238da07329795477c7aebab2db3b685c3466ddbe6c0d297654949bb8364 WHIRLPOOL daf3baf1d88c2399435b340c178888a126ae4ed1e9ffa87575b14977f215f3cb07b109e0c1fe13ccdd5cf9b1d63b7ebd1237586fef7393c0bc279cf9a6196459
-EBUILD emacs-vcs-24.2.9999-r1.ebuild 10666 SHA256 b28c8d403d6badf7be2892eb7bc90c996b9b9758d2deabfe56d0dacd587b42bc SHA512 42c6d2d8660d1cb2696199f2f43f1ecb2deee1b7e0f9cf9f99351825b624d6ac096681c5cf8641fbfc3e2601a187e4abc65b010a549e97707fe5287955e7e1a4 WHIRLPOOL 94fac5cf8ebc5c2f4bf61f2655c18ebca262745d43c93ebdff86b11fce4ba922438dd9cf0c58ea5cb6d1be526ba4e8af2e70b4d6dfba707960f54ec0652180d8
-EBUILD emacs-vcs-24.3.9999.ebuild 10660 SHA256 f3b88840afdc2799f1c3077238f9d6171a3e218e2d962622e915a5cc9e058f95 SHA512 5eb1b0bb260340213a22dd424ae2f3dcd23177e26f020c75b99b1abbd5534940a66849c8290b814fa9c7cf388b3dca4f9fda8701e73a4b677a4a820404969777 WHIRLPOOL 02670f732c41c71286269bd497f46dbb8ec9c4621dbb79d0bd947d630477697617fabbca5df10feddc666db76523680f5ac5cfade0907a3b02f776e6d433d545
-MISC ChangeLog 70483 SHA256 cc03850239231ebc8319571143e3f3ef2c8870b3c6482716b2f1d36a954a56c0 SHA512 28b303b4022e7d00955f946aa097ae910d3e2da75b9fb9ff41de6fe5e742a174e52d86efb55e90e13db3ff97a6ca3979711ff3765a2a0777688295a68ebd43bd WHIRLPOOL 9b2bad062808dc33edd9f3df5f32edeb69f8d797ba8df70afd963ee941d878c5041b23798c058234cf84d6de7c509587a8e9da0052b54cb2d19bacad5be87e3c
+DIST emacs-24.2.90.tar.gz 52987023 SHA256 211c154240fbde9222316e6556b00a4c374ed44fcc01b02ef494a26da753397a SHA512 817aa462a433950c189496687918a0cd17de889a5b461ef60cc734124e7a029412771bc55efb11a45bc43f548c5671eb8c6b384efbfb0b5e14f8a711d7690dca WHIRLPOOL f57d34c4d6bad81b02d7ff0997cac13ba503bcfee96cc4e43e691dc2b87cc353b5f07829dfa57247aa58ad9ba52d1c68006a50dafcd5038e93b9247d237b045e
+EBUILD emacs-vcs-24.2.90.ebuild 11238 SHA256 defea2c0d7204b05d23c3f8017dff9d09cf8d94125bc5ffdd70e221e71b28f0b SHA512 db28771d4c3d37261a111b39cd23c051c7e27137fdd6629a52e437ee248b98b159eec0fe16c44dcb6784c09f6a34fbf56ddd147d6ee45d3bd5c09bb380568c24 WHIRLPOOL 6f866d25955c55a4b73a21942bd0f42f34aeb7e31b8b26418ebb15f0fa4c69999ce6f43b0c5cef1558239197b05cbca18c3ebbb512d904e0615c9428d478d100
+EBUILD emacs-vcs-24.2.9999-r1.ebuild 11243 SHA256 3d60479c5e85c6058566b609a381dede1b1400a50e7b5e09078fa2d8516e607f SHA512 ef1a8f08ad23b37cb9b21220a92468fcb00243c4f0a3372a93dad9b17beed92e650cb54bacd337d6ccccd20517621ed78497eb2283880e21e300af70a814fedc WHIRLPOOL 815623d952d8abccf7a1535b66654a456306080300c7b41c3d67f125a32a5ef4f3a574eb84fc11552f5c8cb79340d0aca9b4094268563ac601fee2ef10945848
+EBUILD emacs-vcs-24.3.9999.ebuild 11237 SHA256 be69a25cdc480e3dc36fbef19a232892c43473471a768573230eec2d200feb14 SHA512 7dcd7c8597d538c50888d28d1f1cb2ca2f9ed868966efa239d8629e99806dca1f05e67b66213ae4e9a2eb5a58da86022a988356a9968a737ca66c07b0a1d5049 WHIRLPOOL ebda2e6a9545a0173d3b064d190aea8599040a81202a9eb0c8147ce55e027d597e359f4d21339d1ec73b39bb9d14543ba395e314375853710305dc65a6faafa9
+MISC ChangeLog 70832 SHA256 5ea4de2896081d746be89e12617df65f740922a1fd85315400f5dd35ee407461 SHA512 19b7ac3de8dd3769d75c0c0798c3510dceda224804f4e786c2066676d6c8b8100bd735df1ab7c011f311c4e0ff8b95344ae388663b1692a6006be2fdbfbd613a WHIRLPOOL bd5e5b44b99acdb8d1036caeffa5efd5ba976c8bd40e2261ca45701aa58293c259ea3cddee5bd509048f7ce1ccc6af5ae4aa758dd5a52330cda031d66d936e67
 MISC metadata.xml 2431 SHA256 f5b0a24ab6e525de4d80cffb7a635260e47c88552e7c2b3fe694b76b130d36f1 SHA512 9345b4871208b2cdc7b1ef4d1981cad54aae6da91ba3fe2aa482df8a242b87d7d1c1288f132ed70ef2cab0372418275a50754c7249bb06adc7f5a17403a40fe7 WHIRLPOOL 73f2ce2c94b5e0b83cd1d06ce975b83004d54f51d573f3330450d60c2e7c5220c4bf92ca0af403a322ed9a67806b3cb11190f81f93e135bf1f8e0d8dee0cf220
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQk4ABAAoJEDxpGckxwJCBWM4P/3fq6I1rXb5cdX9RcsZQokiq
-913kj2bb0oFgElxOv8Pxjr/87VApihzOxrKoF1IjpVpSgvHn+tVCKr61phFSlZEb
-4YhQWmipVy9hNCsGTdFBXkVnjVeEl0KhnDi3nxNSn4Woelj8l8vGquN22Hxz11+F
-mYrQINIE3hxbbM4EOmROXxJePStsGCDPpN2ouMbNOndaL3LL+FBdwDfFGnRL8mfL
-gMZ3/gOoEgTyfBLwv/oLz3a5Qz9/i1Xe+c77YbFQ7XqTL9est5UngrGc82kMWGNJ
-h/nceCcjJIc+oSIB+U3c7tIJJmeH/1+EcBiNk83yv4Nd61dXvfWDZTIwLVFWzCdI
-qCyCG7tiq3tJeOJw28svcNiU41lzTkhJGJnNCZ8jymYE1dWbI7udzjD7Y0Jjbla0
-MVT4liEV46jEsyqJOCwCVYZj6J6oeXbSEJKavLKlhN+B8Ll2mKiPYVMqnVcZzoeE
-hSc1NP67CWTUqws3rFK/m1wvYRSgovYU5OT/O9V6eFA/YLLE3uGVWwlto++N06eL
-lSQ7FWeQRkTiM086QM2K2SghpjPcR35T6htQZkrC27XUbfWpITk3BY9vOPsU8+g7
-QZxPp6D/zKPnPc7Wz+cRwHseAqye8gvFJHGjf81juPNgxJKnTJjiqKYpZgeJq53T
-koG4dZsMHbdBOwTxGEQU
-=d0qa
+iQIcBAEBCAAGBQJQsQqqAAoJEDxpGckxwJCBIM4P+wTSzWtyIyuzzzsy9GsBfGi+
+5MjsakyZpOYt45EnjVBj5foeJNDMYtrp4CD8O2mkvTysiCW1EGKUq6YXK93spcJS
++vdqZjl863bCjvVL/0hZZreWv9IYLb6LikAgaXzOnuuFmy6vW7GWNLhzJcsVcthc
+Loajz9d74dnrS0jAIX2pJ63+nZbV/aGWEA5JAExW57eZsiz3+3eHNZGP7f5rpVAW
+Z4tuUpFL/tDOTo+lEup+53gtLdsXBriSGqtihmUP+FxbpJC+/tfTaJHDKtUQRFJP
+Ml7eN5wN83DGhaZs1eDKoWPx0njYUMR3gqJ66MrEZ+EVIBMLlhXYlOdX2MmbAAZq
+XIG7yKqhEkgwG4dyCdbOTY1/fYxtIg9C7f3SZ7M1fGs0bCUckGbK7IpW5D6IQ53B
+rQpT38MdSdmMOFbpmuKD2gogEsy92lwxxTo3GYFVziYY2d+x0XDa1XMCigTqys3e
+skAC0lE676uPfKzaUQT0Tm1twGVWsiYFQ3zsYJ3JlIZ+8f5pT9bXu2FapDcmKNSr
+WKhnBaxSLlypY+Uc+IifuWdjOFPZgDvsHOEQudTFDZ26d+NS337sysClR8hf4Unv
+kLVBZFn+f22PGJskjGbUDvt17j7WMb492kAv/hXWSrNeMi60kdNDiI7kY/wBWr60
+COfT+eRTnd6tITLuq2kg
+=2xYF
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.2.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.2.90.ebuild
new file mode 100644
index 000000000000..6971f41f39b1
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-24.2.90.ebuild
@@ -0,0 +1,343 @@
+# 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.2.90.ebuild,v 1.1 2012/11/24 17:56:52 ulm Exp $
+
+EAPI=4
+
+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.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 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}
+	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 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-vcs/emacs-vcs-24.2.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.2.9999-r1.ebuild
index 3e9b492d861b..e90cf666ddb9 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.2.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.2.9999-r1.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.2.9999-r1.ebuild,v 1.1 2012/11/02 08:10:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999-r1.ebuild,v 1.2 2012/11/24 17:56:52 ulm Exp $
 
 EAPI=4
 
@@ -30,8 +30,9 @@ 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 ~x86-macos"
-IUSE="alsa 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"
+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
@@ -185,6 +186,10 @@ src_configure() {
 			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
@@ -280,6 +285,15 @@ src_install () {
 	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() {
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index ef4db95d641a..d2d0703f3bd2 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.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.3.9999.ebuild,v 1.1 2012/11/02 08:10:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.2 2012/11/24 17:56:52 ulm Exp $
 
 EAPI=4
 
@@ -30,8 +30,9 @@ 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 ~x86-macos"
-IUSE="alsa 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"
+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
@@ -185,6 +186,10 @@ src_configure() {
 			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
@@ -280,6 +285,15 @@ src_install () {
 	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() {
diff --git a/app-editors/emacs-vcs/files/emacs-24.0.92-ns-appdirs.patch b/app-editors/emacs-vcs/files/emacs-24.0.92-ns-appdirs.patch
deleted file mode 100644
index 7834d04c73e3..000000000000
--- a/app-editors/emacs-vcs/files/emacs-24.0.92-ns-appdirs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- emacs-24.0.92-orig/Makefile.in
-+++ emacs-24.0.92/Makefile.in
-@@ -469,21 +469,6 @@
- 	-chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL)
- 	rm -f $(DESTDIR)${bindir}/$(EMACS)
- 	-ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS)
--	if test "${ns_appresdir}" != ""; then \
--	  ( cd ${ns_appresdir} ; \
--	    if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
--	    if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \
--	    rm -fr share ) ; \
--	  ( cd ${ns_appbindir} ; \
--	    if cd libexec ; then dir=emacs/*/*/* ; $(MV_DIRS); \
--	    rm -fr emacs; if cd ../bin; then rm -f emacs emacs-24*; \
--	    ln -sf ../libexec/* . ; fi ; fi ) ; \
--	else true ; fi
--
--## FIXME is the emacs-24* bit above really necessary and correct?
--## What if I have 24.1 and 24.2 installed at the same time?
--## In any case, it should use something like echo $version | sed 's/\..*//'
--## instead of hard-coding a version.
- 
- ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
- ## Needs to be the user running install, so configure can't set it.
---- emacs-24.0.92-orig/leim/Makefile.in
-+++ emacs-24.0.92/leim/Makefile.in
-@@ -259,11 +259,6 @@
- 	  [ -n "$${installuser}" ] && break ; \
- 	done ; \
- 	find ${INSTALLDIR} -exec chown $${installuser} '{}' ';'
--	if [ "${ns_appresdir}" != "" ]; then \
--	  ( cd ${ns_appresdir} ; \
--	    if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
--	    rm -fr share ) ; \
--	else true ; fi
- 
- clean mostlyclean:
- 	rm -f ${TIT_MISC} ${TIT_MISC:.elc=.el} \