Sync from Portage tree.

(Portage version: 2.1.11.24/git/Linux x86_64, signed Manifest commit with key 7DC6EA25)

4 files changed, 25 insertions, 27 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index f49c5cc..3fd399e 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Oct 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild:
+  Sync from Portage tree.
+
   13 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild:
   Sync from Portage tree.
 
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 2c8226e..63e790e 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -2,23 +2,23 @@
 Hash: SHA256
 
 AUX emacs-24.0.92-ns-appdirs.patch 1538 SHA256 588b276284c7a56494fdba935a975c66edb668e5431bf25f1396696950c8f804 SHA512 141d6f2a0df176eafd476b1b064586ac1d32d2b920fd3e65a7bdd9ad6335d3c148761238da07329795477c7aebab2db3b685c3466ddbe6c0d297654949bb8364 WHIRLPOOL daf3baf1d88c2399435b340c178888a126ae4ed1e9ffa87575b14977f215f3cb07b109e0c1fe13ccdd5cf9b1d63b7ebd1237586fef7393c0bc279cf9a6196459
-EBUILD emacs-vcs-24.2.9999.ebuild 10788 SHA256 0b5fb9f57e87cfba987728fccef1adae5b816cfd7a4e42d80a72766b744ce310 SHA512 12eff34711a71577ad91863483c4d40c3b5cf94672f63cb845a3b3d2178a56e0ad08c5c91e6276079860db3ac6f906e8b06b6ee0c9eb589df635d6aa03f0f2ce WHIRLPOOL fc76d5c234e50e8a005fe9ab4da4765eaef105e1e55e768e1246fac4b73f537d9b5ba3f9ffb51b32f153bf13557f8209b7f47f487bca7eee54329e9e1f597b89
-MISC ChangeLog 990 SHA256 948daa3163878d89306ff45f213b66d26214b6456b83edfe1b027c81afd356b2 SHA512 f09bdca1e2d62aedf30ba3efc7d96dabf014daa0fa0b121462433a90405cb2ef4bbde4288b5f58aa8dd311947355c4e9ad0ada0647dd180964626ad34d68eb70 WHIRLPOOL 24c52046922349bbe240932143a20ec7f41f395ba5765b73144e5d065e922646674b61c966be402c78b8db224d5dc599f9d770f4f42439f3b28fe29303a57b75
-MISC metadata.xml 2333 SHA256 6a4ab4b0709e8f61773994140d420a9c75b6c8a3eef7b02727bf4c18d91abe74 SHA512 2ea80909c30fe404ae0ca7059ae444fa9b4bdb168d6c7b2a08d566980e4374d95f21d56d2fba40ac5182705fbbd650362194aa091b3c9fadeebaf82fe92fdfd6 WHIRLPOOL 8987cb0f15d50817f0ab89bc82e1c85e1225797bfe77b13db3a917f2875be9d314054520b6d78b1552bcd1afe7f4446423eafdece71bb638dc26cb9fc41011f2
+EBUILD emacs-vcs-24.2.9999.ebuild 10557 SHA256 c1384e7ec40c9b0b442f2ce12948f0430324e8d8e5694bc1bb7c4b17ea7238b7 SHA512 5e5d10ba39208ad7d1cb8ab9d4a50449ef4b48455bc1d4867f7543e025d9d0906f934d090cb7f094125aeb78cb87447769bc0dcd26b53ec976213b94f5d8c10d WHIRLPOOL 56f0449c9e4ae72a4f85c4a5af60fa5ce260dc1eb6cef258a53f478820f00239da28960cdc8403ba5a331fe053e7d41219730c90e7d4569d6937eba886f7a9ba
+MISC ChangeLog 1092 SHA256 40e39b5d9b8c46626fd0c01820e3dd63fea1ec54ce2ea2ce7fb5da9f15a3c769 SHA512 13868fe48b7c8d6709fbcd59e791fd09a3057afbe1a804035f879cf31c2c8f8e2e88d07a2acf863ac5c8bb961d265a47e080506ed48785e3839a765b5e41a3a7 WHIRLPOOL a1e4a014b24d3e84cc9bcef1af977a74046a6ae688793794986c4a550e1882e98be71a526fce8069dd536daefa887340fc79657c6f0716cb305c24bcd1af1773
+MISC metadata.xml 2431 SHA256 f5b0a24ab6e525de4d80cffb7a635260e47c88552e7c2b3fe694b76b130d36f1 SHA512 9345b4871208b2cdc7b1ef4d1981cad54aae6da91ba3fe2aa482df8a242b87d7d1c1288f132ed70ef2cab0372418275a50754c7249bb06adc7f5a17403a40fe7 WHIRLPOOL 73f2ce2c94b5e0b83cd1d06ce975b83004d54f51d573f3330450d60c2e7c5220c4bf92ca0af403a322ed9a67806b3cb11190f81f93e135bf1f8e0d8dee0cf220
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQUZ2BAAoJEDxpGckxwJCBPYMQAL6kqJ8j6dFh18+7FLPgdp7e
-DLVRqgsp6QkuIGW6OXgtq5aVzwoQ/XgjL+ZUZjTfSfG72sZXaijA3y5SSctlK5gI
-9j68lelzsTTDnNbDmaIBHVq8wUaNgeytjMyngnogEUfsGizSzB3pChz/HmKFE5kB
-wjqcxuq/DtTu93iiWGrHK8SLz3SgxNjarHx6jmaijTSCKig3iq5OweGFtRm8V1S0
-NyNq8cgxObGfUNRA4rMcN/E+IcyGEN14rtMXxIOC0jVG1rAqhudPv01eWBXJQNQW
-yy8yKTlKq9HTRE1L/s1tr2drubnajc3+6MtM4SPSo0B6RIalS90vRla78qImLVQH
-YhPSZWgJsqL53km+gY0RTG9V0YqWJco9H1jrJy05bEQy6O5jU3N4NwGZRmmagFMx
-Cz659Oz9/MbKqw68+BmjHZCo148C4AfywzAV98HJKubrV8P0Ev3q3g0lnuTv/rCV
-UpvtFcmSqBkQf7mhPA508yoSLyL3ZBEYvHMkWWNWMkRfldvU0ukzotQ1dEBHmyTq
-9lDmPyCDjShe7q/hFQmH+XQozQGgvDxQUIGh9vThgfHV0SA3ta4SP2JKXv4XrkXQ
-fD9bGwRyNygOLdsd7cb2VMmRWkzU/ByedWAIyAmuFxpxfdoNBH14HtbFulK+CLMK
-Uxnzhw2SwxV5FvtzLTXV
-=ZiCA
+iQIcBAEBCAAGBQJQbfX3AAoJEDxpGckxwJCBbmUP/2zsYY3Q1qhUpIObFHwOdmVm
+J0cvy/cLzk5aXmDhuVkvW9jgIAUiJXmKArZZOe6zX1sJpCoTKyF3F6wcGO6x7bCb
+pHshSP3P1VEQPlS/MDVQkc00QC0FBcYUEriF8TRyOClKaitD38PgSdTaUoj0pxFS
+P5+QWTyqPQM+cjqDgaihSW5DOgumJTnJEhVXAqXcD3XKb/NyWZl0kr2gk3cwzAsw
+TaGbCSoCeJJt8E+87wFF0JFLfGQu+N3UUI1I1H5VWM8Mc7bo/OjLegt1CfvgxRO2
+tXexTpef8PSbhHbkwPfWiNR7ZeCHBKoYTxDTcOGZ2VUHhEroemMctHM/8lEuXCM4
+aig+NRhwLhdpYr3mI1/9hwPgeQZl6jZPKoosxgXVSMx2VPNoQ6u+eo3x1nRc7Y/e
+l6dJk232jyyORmoYeKR3dP9W6ul1R/l4ZKqzIgEjXSr4lYYSHInEPum2U2grn5Ju
+YguuL3vOUF5r3Sf4liEc/DJBHj/UMCaG8/bQq0w3D5GMKAiZ3O3uHi30Qj4b7Gnq
+b3nKmkJF2YfcuUalnBvA7v+eRbAJU1YJl1h8MdfgjDTfLqOa/t09ucYjoBkRUkpq
+dpRfzYC2XPVqZY7Y1ZsgdjNMpflqvQTNxVswoK2UplKddjenG1TpaAnIrKOT6zPZ
+kGUWVjjUnfAY4YMLCREY
+=uNuU
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
index d08c302..57b7288 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
@@ -28,7 +28,7 @@ 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 as-is MIT W3C unicode PSF-2"
+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"
@@ -205,6 +205,7 @@ src_configure() {
 
 	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}" \
@@ -223,19 +224,11 @@ src_configure() {
 
 src_compile() {
 	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	#if [[ ${PV##*.} = 9999 ]]; then
-	#	emake CC="$(tc-getCC)" bootstrap
-	#	# cleanup, otherwise emacs will be dumped again in src_install
-	#	(cd src; emake versionclean)
-	#fi
-	emake CC="$(tc-getCC)"
+	emake
 }
 
 src_install () {
-	emake install DESTDIR="${D}" NO_BIN_LINK=t
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "Moving emacs executable failed"
+	emake DESTDIR="${D}" NO_BIN_LINK=t install
 
 	# move man pages to the correct place
 	local m
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index fb8d911..b68a939 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -34,6 +34,8 @@
     of the internal Lisp implementations</flag>
   <flag name='pax_kernel'>Enable building under a PaX enabled kernel
     (<pkg>sys-apps/paxctl</pkg>)</flag>
+  <flag name='source'>Install C source files and make them available for
+    find-function</flag>
   <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
     preference to Emacs' own scrollbars</flag>
   <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).