Remove vulnerable revision wrt security bug 431178.

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

3 files changed, 18 insertions, 331 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index e7204017a840..bcb5ac0bb9e5 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # 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.538 2012/10/08 15:05:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.539 2012/10/09 07:21:40 ulm Exp $
+
+  08 Oct 2012; Ulrich Müller <ulm@gentoo.org> -emacs-23.4-r3.ebuild:
+  Remove vulnerable revision wrt security bug 431178.
 
   08 Oct 2012; Anthony G. Basile <blueness@gentoo.org> emacs-23.4-r4.ebuild,
   emacs-24.1-r1.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 181ab7919737..ecd73b17e099 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,7 +8,6 @@ DIST emacs-21.4-patches-13.tar.bz2 13287 SHA256 892764ff98f0640ca65b57099a24c76a
 DIST emacs-21.4a.tar.gz 20403483 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 SHA512 6932db498e7b6b904d90f817e335690c5c681510812332c514af1d84d91b9841ea3eff0357429c7bf866a55ab94d03193fc9cdbf403a9fe4b71d2673c23b863e WHIRLPOOL e711032d23b0e0b33bf95e006d6fc518ddfde4780d23d589fde47ccd94e60687cc9b65b85e04e7af4e8c9161fd8faebf13d28f4f43eb94e7bb7520d537f28751
 DIST emacs-22.3-patches-8.tar.bz2 5974 SHA256 72a68bd14ce2efd52b0425c56649d735f4b3c0e630de73e0eb51ddf947d56ff7 SHA512 b3489e57db9b7c4d9202238acd6f956b6adeaf09ec161b639ad59e0eea8e2152d5fad24e777a486310eaed68be1c7bf77e474a9aced0041820e74582f7e2e73d WHIRLPOOL 85d127fb9b367d73d8f2674e21096a23b474faf54fa21f178ea0e0dadbb285d1d7c627b7609b7c92ba27590340cf76afc4df4a5c991c252a7ce80b2f6569cf06
 DIST emacs-22.3.tar.gz 39587396 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16 SHA512 6cba24921ba9bd27458334b92c6f8fcacc4d5af0f70a067d57ab068eb8d0925143f109847515548584f80c9439d96a9d05158d10a73dda917187bd16a6758584 WHIRLPOOL 74c612213b8f6fc1fc6e243adc27b5a5ff5528100f3c319925519e23477fe2c642d2cf7b382d7b70c8b2b9d7be508773193c95bbf14cb7c55046f76bf4b81225
-DIST emacs-23.4-patches-6.tar.bz2 3416 SHA256 a10b45101dbd3f7e4d0bcdf483736b445abf76efdd5d181607ca86180472930d SHA512 b7913b1c6b70b85656007f69b4dd08455a3bcb4eeeeec502c4754b818584e1c186d0be1e8b56ac4358b4bf64997961d72234136e52c09fa115a7a24a3911c06f WHIRLPOOL ef3ae5086863f834b3d46ba3c45c04d4ae27bd95fab225895e3052763716600df89e2b7f6b4dad437cd81e82411ac861aa7a923b66e11064f7719c4d9c868543
 DIST emacs-23.4-patches-7.tar.bz2 3852 SHA256 cfcf49838ed200d28b0073af65768931253e4db3c7b812f3a4809c6d47a6a418 SHA512 bcc3a3ab50281d1d17f906d10b3b922367e41756c5291609cabfeb0a165d061d2c40cd92f7257cba8ad3d92351e69b8647792a4fa0320479f5944e877cfe1cdf WHIRLPOOL c2f14420f2457e45a646f417c84f14a4942714229362f85ae355e2f1daf141cef706c00c00c65cdfc6e93d25e1a98d5ce11380983d1a35822ebdbc5c43253413
 DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
 DIST emacs-24.1-patches-6.tar.bz2 5133 SHA256 b98c143c40ec17134919aeea3c903a4fdc320eaa8072e84fe10dbff978dd2496 SHA512 10de2753289a003d726fb963e783a1413b66d474f9106856da846986b1c2fe38cbdeea22b45ac6549bf8748c16910d2a577011964c238f0664c170379d912895 WHIRLPOOL b4eb0f54d23a96c16e61efb88dfad3b3cdb8035ed8c2759ba70512b56bc017b89b553a2ed9b4b1d2d6bfb1ed8ee5218bd60ce8d80a9514c665e8669ef5b93f35
@@ -19,16 +18,25 @@ DIST leim-21.4.tar.gz 3291433 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5
 EBUILD emacs-18.59-r8.ebuild 4466 SHA256 5d9cb405643e4c9cf25305391971337e1f5df1b7cd33bde8e487eb792031e7e7 SHA512 fdf65eb9de75318b1e7bfe0372ef1b8ba7aebe55a933bbc3857e92008ef41075c675fff352bde92d1179c7fc757bd091a138af204dc4d02119f7a96ea02bd01e WHIRLPOOL 56bcc9a7f992203c275ae74717a6df401572f25f4e4489fac688e22595a8c115345ddbf41efff631023eb074839038e1049510c1debd73d77054dc51fb5b8bc6
 EBUILD emacs-21.4-r24.ebuild 5285 SHA256 834f38a1984cc3556cd96b617d2c0e143250379c71a4baa948e4a6dedfcea2a8 SHA512 fcbfbaa394773a004a299bd0aefeda2395c2f41661b617a79c80fa74bea6fa6d15d3fac442dfee075506a4820825c10b3832fa79ff518cddc224bf9a378fdbea WHIRLPOOL 59e496f7e4563902bbefa98ecce51aa2fc937da2c8aaec968b036ea5e2a748503592a0540712968ac21e2c730a7d040d153c24ca74a98e354f11fd58f055fc04
 EBUILD emacs-22.3-r10.ebuild 7738 SHA256 6bfadad0dcd007ef6d3ba792c62336ca39826aa020b00087fc92ddc58a3dfaf8 SHA512 e828546a0c6f4c17c5012a423051c8c9c9470a153d2d67546fb04db5f3d0577b88f0d3c48422e762e7ea4c3645796285c2f28cfea7064403f980a622164d3a40 WHIRLPOOL 86f2fe55690f5ff07a09167ff2d643b76cf1150d729de5bfe186af1de216167655a3ce1b3ae21a886fee0aebc1a562639d3163eb3507d638dcebf62526edf237
-EBUILD emacs-23.4-r3.ebuild 10590 SHA256 9f25ed1cb7a34c60bea8fffee962bab332629dcfc58d4ee5424fd354623438ed SHA512 8244a2f102109147278ac654cfbd95cd235cea68e2529712c6d0a2b0055f7efbca2fea5f965f5948b8a84429d7c13663822b1404e0b0f08676bfeb0784e4f3da WHIRLPOOL 3db20304fda72c42feac277aaec97503fb11a0c2725156a357c7ee2661dc08b83f780dad142f01df9e07fca7b4fd701864fa9885e89cf923867a6871d4744897
 EBUILD emacs-23.4-r4.ebuild 10643 SHA256 44fa400454832bf7ac8af0664ed929d94364fbe52c9b605daf5779e5f378eef0 SHA512 fa7a463320cbbc1fc1945626760b40cff314f40540aff3dd6d64bbad998a834368923626449e69093233af5465acc6cc6098a53a31531fa19b0c332059e0937a WHIRLPOOL 2fb3c6bf22dafc93e6c55fc2bdcefd9020c6fb2043ea4202a335eaaf607c28585a83fdfb6f6452ba27d58280c1b5545dd269ad9740d78a79bddc4c73d688b54f
 EBUILD emacs-24.1-r1.ebuild 11019 SHA256 54ee6a356f1c541dadd49952e3a3764bf16365dd457a07a3be952d6ac266e86e SHA512 353e8c5739d974285778a2aa54b0125b8b9311f1dc8f5fbf958b050645aedf745a99d292ccb02aa67ce160ef0bf1fe123cdde84f66a70d30411d2669720931a6 WHIRLPOOL 1afc8e801080482a1926024179f2cd2b0884ec455d14283c0de22a8a6e155f5b938f83952a2cee45c4672712cf2932a48c9b45e53b2bea00c6cb78fdbfbcb6d1
 EBUILD emacs-24.2.ebuild 10972 SHA256 7af2de02af8274f1e672505146285ff9a39376c48e3b4a08b16586f118495d66 SHA512 13a30b010e76431434e0ad1b2ba05728e03b9ac14ca55bbad2cea15d2574fcafc7a925a8a0985d1024796f9f63e85521b9c108a01bdee20d3a591ccfd882b8e4 WHIRLPOOL 089a0584ae59f7487b4895c564ac6392a857fd92faf045efea714444c8e8e66811302987be44332da862e594beae64fce872dd781b36efc97563115231bbc630
-MISC ChangeLog 75786 SHA256 94ee66255e5a7995c8e714c9ae98e3fad7bb4e61f6463652bf5b845ab21e6516 SHA512 eb1d4b8eb6f2b726b553881b22ab46c2c85f6a4f97f3f8e86bf610d48ba01b60ca1675dadba3817dc51d145f3ccbfe2077e63e45533a527a09002c83abedf620 WHIRLPOOL 78af303c29db3f8731f0bed37ed11cbfcedb1a522e5719d19d4ea487cc64d70291ef39e1e28098101b6aadd0a3136b741cb76306480597ed192aa6201934ee85
+MISC ChangeLog 75906 SHA256 20424d8bcb2ef3cc7811971ec8bf9f5742ed04463209009189fd2a352e5cb20f SHA512 dffe2bd211e4dbb245ddd987e4add25c1c592469c0b2e442f1e6e34df5708d77d1d8a118d558d804ae8f632503f82ba318f778e0dbbdf0312dafadce48176d34 WHIRLPOOL 51d7c3c802d9bdeba3ec4211c62d4374c847e5cb59f4ff136d66921816f60b81c68989ebc5bed4128fcab2f7796b2781e1076f7df05f4f72cff21ef0d3cee7a3
 MISC metadata.xml 2554 SHA256 94ab92fa323dcb5747564f95bfd1e2a3eca2511cd3e95b48e4ca95ea40ac8238 SHA512 24207b2227969f1d87126bbca5046f10f848f22584fa9c2a23a88ebb854e4344cc564902be1e6e1b86ae8b9da416f65ccf6172d4595633d6063f78893f9ae0c1 WHIRLPOOL db5cb9f87e4804152bf0a41807497733f4a4c382dd634b2ba7cc41fb6bda07191adca7e68b11dcac79d681b3b17dc9a4d629d0b8d152cd8c148883e754385155
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBy658ACgkQl5yvQNBFVTXDUQCgiSDEuN7C5ex0iK4tXRT2EXc5
-sJ0AoKSQFXTzyCbPS68WRM6Vc1VI1cFq
-=Ljx0
+iQIcBAEBCAAGBQJQc9K3AAoJEDxpGckxwJCB7ckP/32HBSWOeWWbABXmEGBsxlhH
+Uc22R/mIz8/0vrRjxLMvAgLt59Im/ZpJ1r/urPdWlX/tZHeYxgOKMpdm79qd1mbU
+hQ91klhs7P+lCgbhlF98yjas51KZJswWFq83ZESlh1/U3hYo2623mNq/MSMP8a/V
+ODJO7UdbqjK9EDFREiHPh4kHRtHoHaC7sMaKYhiyrdB3uQfHbBwLQCOVEWP9YNq8
+LqF8i7Y96qHWkRzJ1spMIpBhoroWPLX70/UoAEGAi/2e4BTwieS+CpGBuaVnrdYL
+e7SSNBRLOahrROpMHlxWdC0wtdtb2FHGgS3UUuc+cjcNuwsydIHTIqkFabeZ+PLu
+0p1SRD6fBu1y47rFmNZvvhUxEJc5pgdisEfuJ+aqYjzCs7zpPYKLAYNfOFuHNS6n
+Hk3H9MRVQtAeM5V3DNEB+SmJQqGPNlYhXXEfMMrDncHCcIBnF24PoVu9iUUMEqHu
+zdAMk7MeAAxXDbe2DdaQy5QVIyPXD8yIdh0oy2f8Ey9Q5pl1Is0Ff4c4UJdULueC
+EWjqVjQ6wNH+aPPKYMQCkZfUbAFbOYXaD/ZJPi+sEsOTpJgsw2wLfMVR81ZFt2mL
+R2mgxGcjBPNBFaZUF1j64GmBqCYHiSl4nHFW0LzQcmsi8xE2kgujYwHRH5NkrfTn
+vXIJtoRkEugepbUxtna4
+=zDjb
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-23.4-r3.ebuild b/app-editors/emacs/emacs-23.4-r3.ebuild
deleted file mode 100644
index 63e134e33b29..000000000000
--- a/app-editors/emacs/emacs-23.4-r3.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# 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-r3.ebuild,v 1.14 2012/09/25 19:12:18 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-6.tar.bz2"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="23"
-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 ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="alsa aqua athena dbus games 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
-	>=app-emacs/emacs-common-gentoo-1.3-r3[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 )
-	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}"
-
-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
-
-	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
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf="${myconf} GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
-	# 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
-	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 -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}
-		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() {
-	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
-}