Undo previous change. Sync from Portage tree.

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

svn path=/emacs-overlay/; revision=1829

3 files changed, 33 insertions, 37 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 20cfe4b..f91580b 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: $
 
+  12 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild:
+  Undo previous change. Sync from Portage tree.
+
   25 Aug 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild:
   Display some elog messages only on first installation.
 
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index caf9b60..b52ef1e 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 11045 SHA256 2f854470409fb3a01937c06503d2dcd6488c0c8a451e6bb85bef4eb6e338a5ed SHA512 1e87e891064e8e4ac08b40b5f958e7cce6ff62a9bf66af82836c5a8fd108a7e4feda8e527ed90245ce1b45f545cb26a1951c96445ab82c43ae52eceaaff0a2bd WHIRLPOOL b6ad3846c78969d9e77dc09a354eea6bcd25790ca96e723b217c5af17974e1a44ac80c1af94290218bbd466aca690a66de082f37a707833b8957c0abb5c06c0d
-MISC ChangeLog 454 SHA256 3ef67f9d34e15994ee2c458c8f5b43b6481f8f0359f7af0f17e523588c310d99 SHA512 6d29d79f24ec5de2de10a9657f3dbaadb30352473b91bedbf20112caf6f9fb783fd91d412060bd77e2ad61a9e6e3a9e3628cef59b23c01687d432903dc384374 WHIRLPOOL 06d6cc5e0d9e419c9bff063343236b67e723654430c60194ee253bebe313a2d3e77186b3793b60b65c3c1562e2764f771ae97f8334df54e741006c6840ffd6b3
+EBUILD emacs-vcs-24.2.9999.ebuild 10845 SHA256 7bb7525b0b17d46ebadcd08bddbce940a558a74e98eab888e5b21076b11d04e4 SHA512 6c2b557934d7d172300dc8ce3d798f8fa385273e9376a29349973bdbef6b96d276cbc8de5cb3d2de240f8d69e599706dfc3620b072597770bbc804c1b4e0aa32 WHIRLPOOL 976c5a7bc1808d90b551588196ab3f2d8c5277f8d52766dc302985f5664bd90d0ea585aa3dc6f1ad687d0dcc74a0586a609e3ba20a2b1e55a7e4f2fcbb0c7da4
+MISC ChangeLog 578 SHA256 90ec5e39c884bbc3fa9d11dc0c27fa2fe90dec219c6168bacca2b6f9f240862f SHA512 a10c07170bc7dd6fef2e4336863265229b37c48acce66cc2118e4a65c202f1b3f651502f95f2bcc686993da355655a6766dbe874723d92dd13eacb53824f76ae WHIRLPOOL e5fb1b2fc17b54d51cbbdc9ebdae5bcb373da90472bf0b0bb71495c9b8156affd8df5160139bcd57f0b0d2f08875f70bdce06b94b66e6c2bcff5955d33bfe286
 MISC metadata.xml 2333 SHA256 6a4ab4b0709e8f61773994140d420a9c75b6c8a3eef7b02727bf4c18d91abe74 SHA512 2ea80909c30fe404ae0ca7059ae444fa9b4bdb168d6c7b2a08d566980e4374d95f21d56d2fba40ac5182705fbbd650362194aa091b3c9fadeebaf82fe92fdfd6 WHIRLPOOL 8987cb0f15d50817f0ab89bc82e1c85e1225797bfe77b13db3a917f2875be9d314054520b6d78b1552bcd1afe7f4446423eafdece71bb638dc26cb9fc41011f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQOJGsAAoJEDxpGckxwJCBvMsQAKaNKI2Mw5+Y5QnX0qLEnvXw
-yMa8dJeTEJ6GY2M9tZlTBNqIOUvY7RpPuieSf6lNoBjDx2sEI/zI59Tqat0ma64c
-em61g9R/grrl/F/E/8N6UU/5iL2KtDntBDBuXxC3clCDBG1d22koMpxtWv7WnqLY
-purHsF/JBayA0dfcSfwlHcW5c0fZg2pmTTtEu7/q1yVCxw0jO4ynoiQjlgTinPt+
-rSQdE6vyshyc6+5Wyxlj+WYL9M3InJQBx7szNQ1JAtGAnjA7wLBSMgKPYuPzGzU/
-cf3yYY75j/0p+Soiq4Kz/f6gNwI7x1KA3+r8rcY2dUjQUEZ6naUS9JjrN3mN6YHH
-vEYCgy8+Pwr5Ao+sPErWVx1Gd8LIiYZ5Vjy5FEa9QiZwM4YUffIxGjOP9wbrEHSe
-zEmWN66ZDeIYcwb2Esg0w7uzwNlcJ3Ga/SY+gZI9qGiI1DXyCkDF8SzsKxY40/cb
-ymJAB4tG98JiW1nnqZu4blwIcDnByKPE8qqs6ZG9jfwfc0fYwJNeM6GTOmfvIdPH
-IvRl0w1GczjTejeJn9xMrffdY5OTpUAyJz1e6aBuONGFv6dVrZgxb0fq35IhSDzE
-SnKLpVLtsERG+wxKDeAzG4aqvbf4AjJH6k0etUdTYq7t6j0ZVom/Nn/V0GZlloR9
-ykHwHukuTrvu6QkJ+v53
-=qj3i
+iQIcBAEBCAAGBQJQUO+4AAoJEDxpGckxwJCBIroQAJgZHupefj5CuXsiWOZte0wx
+vqbyM6Wp5VcjRoICxcigBYvXWQ6mXghVSX+n8qBZ+PZyjwWZEoGLhtHl4GN6cdWx
+RDIbjSdzFkm5PzWTGoACkGZGhMstaFe1wGM5UUkJtwbuh8f73IpCP4jpK/dmP1qt
+MoVgXIFJZlSV69sqYGNlDw4M30HtpcYCbQz7NBmVFrd6gF28cYvWWpwIz22YR3kJ
+6VHpaNIg+rd2sJAipUeBCRboO6GO+veq5UWRlBUxAIl78xoZkDkiTH8ASzlwMaj7
++MSIqL8hS1EPIr+hAaZ9MuJNotY7n2kYh4Nkv8MnCIX/rW6hyzgiyAQZ7BaLGc7z
+mpV0XQoQbbJ4eYP5ckRvvEczaSDQteWQFWZm1N8Yl6auqYAGx7LZd62KAqAIeyi4
+2Y4DqUGJGbfjK3NLJ1nLqjuv3HBAIragYhiBlPAffiNTHr+lYar2JiEwYnoWJDK1
+1nAVd6GcQmvo+Nb1FBSlYg+WyiOil0YRzW4RkjP8L1sajYm9j4QrO+0Tz5LhIhkv
+VXrPbZCPjBFn3zGz//2Pj7Q1wpB3bI5W1A3nqzsriZn85GkR0yGWRH71j7HjCHzQ
+5VC772Lhi2oo6Wfov7Q/eKQGhxTR211mNB5fu9XQu3w5crzWjTudbZnOl6/Um48o
+bOeew26eq+ufJo1rLvKt
+=qiQx
 -----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 384cdee..dafaaab 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
@@ -105,10 +105,6 @@ src_prepare() {
 
 	epatch_user
 
-	# http://debbugs.gnu.org/12047#8
-	sed -i -e '/freebsd.*)/,+2s:[^ ]*crt\(begin\|\end\)\.o::' configure.ac \
-		|| die "unable to sed configure.ac"
-
 	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.
@@ -317,26 +313,23 @@ pkg_postinst() {
 	elisp-site-regen
 	eselect emacs update ifunset
 
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		# new installation, or new slot
-		if use X; then
-			elog "You need to install some fonts for Emacs. Installing"
-			elog "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. Therefore, several Emacs versions can"
-		elog "be installed at the same time. See emacs.eselect(5) for details."
+	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
-		elog "If you upgrade from a previous major version of Emacs, then it"
-		elog "is strongly recommended that you use app-admin/emacs-updater to"
-		elog "rebuild all byte-compiled elisp files of the installed Emacs"
-		elog "packages."
 	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() {