Remove old.

Package-Manager: portage-2.1.11.12-r1/cvs/Linux x86_64

3 files changed, 18 insertions, 340 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 410f2bab5d92..264c9f0f7c77 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.524 2012/09/02 17:56:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.525 2012/09/02 18:29:09 ulm Exp $
+
+  02 Sep 2012; Ulrich Müller <ulm@gentoo.org> -emacs-23.4-r1.ebuild:
+  Remove old.
 
   02 Sep 2012; Raúl Porcel <armin76@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 44a5779cdeb1..c62c23fbabdc 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-2.tar.bz2 1535 SHA256 ee12b40d769497b98b609933f9f122f9b45873ac84447832930158822f52f920 SHA512 8423d36d6f20e9941553fafcfdb4b35030ff00c94ef9bd119d958b0ed7079a473964737b638b1d5223e0e1c317ba8daf8decbd7008ebe3e821c99849638d701f WHIRLPOOL 1217e8a806985b85d6177cb93b5687341fabcf50ebcaef6f3cb02fbf19993101ee61c2bd498e73fa17f6391ff7f1baf0bc9ef0cd18b30b4fb1895cb135c5bd5e
 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
@@ -21,18 +20,27 @@ DIST leim-21.4.tar.gz 3291433 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5
 EBUILD emacs-18.59-r8.ebuild 4465 SHA256 03ea44d6947cb16fc6e9d23c320eff236ead308bcc8235a12b66d6b3377b94e0 SHA512 42da84793eca79c79cc5e9b9bc12d655858e3038036d1c5956e21d151ad90b8b5fc05402bdba0b7d49cfbdff8eb3c6d51cbffb90e1bf0821a01bd3252b4c9a57 WHIRLPOOL f3ec16d7dec537ec3ab26ea845d931b9fb15cfbf19e651cabb86c8daee3aa1559a7ce8d1a7232201d56569185b6a6f7becdb464ddaffa5e409a484563172f5ea
 EBUILD emacs-21.4-r24.ebuild 5284 SHA256 776809827be73ed5d05200481616f773874afe57d3a1961af45d9a3ee21bf996 SHA512 b79676649cdf365d46766e0fbd9d194f4e67088edcce0f5629432ad50c31f82a10a0dfc02e087f7826f6bd1be420ceafc3f1d11a1eb28495922c47e0363baea0 WHIRLPOOL e2342b766e6330d05164cf6a32637d7016c11aa9bb1b890d532c8deff2269aff82af549945965c4dafaec53284758057732003159bd2bcf1ecf784bf266c4981
 EBUILD emacs-22.3-r10.ebuild 7737 SHA256 6476d809c6212337eef942a0f316334086b31cf489be6ad371909aba3e35bdbd SHA512 8f451780e91b31e78b67644c1d1b7440de3b291577641b2d791efefa88e7bbcdb7b833cd9feb8892a7b3e5f2820abfe27d503dde8c6df4c19c0d2552d1e3fc94 WHIRLPOOL 00dd2e49e6b3805187ec4bd5466098c764e86c140bd745a35d49dc102e2a2e258bc45b67389fcba5471bcdb0005542fecfb731811e696f5fec56d06289d98381
-EBUILD emacs-23.4-r1.ebuild 10927 SHA256 f90b9b96217413739c1dbb2459459be7ca4e38ed84d519d46799deedeb3ffd49 SHA512 b3a08232c260826507d0ffdd49e4dbc14b5cfadc63a44aa6c70ca6cff9efe70413dcbb4a3ab9f3d675da8f27a49f805bab9cd5b2da3d98f9aec1fd22632e70e0 WHIRLPOOL 15c166469c31297e11bfcd84ac2d594fbf04e0773717d5e78307cb99727f386bd5e16a1e9c129334b665f5737dc80984d01673025120d867571601cc1e56a535
 EBUILD emacs-23.4-r3.ebuild 10592 SHA256 85e6426f16500f39e3d6f418677e2a5815d732d5524a019da8871aac41bf2f3f SHA512 c436352b3aef9a41a32e44e7ad278ea764bc2c43839577020e6688ce390bc993bec2530e4f0487f848be5312ccaf30d1b41bf0f2e045b4dbc405a62cc95f5e06 WHIRLPOOL 6e2810a39c841c67b3dd4fe25e0698c4200869d715459b81674e6e477404d089a38eb956ca22b76162cb5b84db1c86ad824a24f52b781216930ad2156b832de7
 EBUILD emacs-23.4-r4.ebuild 10589 SHA256 f05c13bacff9047d7fdd0248b4318fb68e9a74a6b4d6d8d0fd18fad01357aaf9 SHA512 9360b5d9414f358998590a36f69e6f37955719f5ecc86c95923d6c75493c0a0278c614a79aebccccef04cbaab33d266d48a34559cc1e9c61806822cfda7f7f42 WHIRLPOOL 8d1428254d6626f3bca63f58065f6bd299b7809af5978704469228eea99bb90c822df036c0f4e0f76136487719edde78ea06520f5d6c0bd8a02a15e12c22a82e
 EBUILD emacs-24.1-r1.ebuild 11018 SHA256 8babc2ec42b907e0d12a34e88959b6cb518deccdd52494ca4c35c097c68c2e7e SHA512 a880fd7b95036057d4c628810536b334c6b88dbfb1e911b246a67c57ea849a084f241dd894e2fa9aba98452789a79ccc69005877a695f35149609aba97deb913 WHIRLPOOL 82ababc256eb479d33db44c10ef5366b1e4b11d93bf7f11b97e4ecfc2c609c3be44f468ad6955da03ca884e94a36ca85763596a5b9fe53f38263b46c82f89c04
 EBUILD emacs-24.1.ebuild 11019 SHA256 9503252f00d8fa45c94e04c6cabd0ddcca4913b415e9063787eb3a6761d746d9 SHA512 c1432db9e5c174fc2de411d66c2a26a77dfd1d9defffe6b83fc112dae7358e59a9f27c45efc2627952fafe8e76167930ecc04ad63819a038ff15576c41175b32 WHIRLPOOL 185b91bd00fcfe8ab59d264b1a279654b95425611702076ab60f8584e284ea84cfa8246b004c2a79d82d42b1e73ddf17b69e573ae0b7225ae9e63f18ce6cfb9b
 EBUILD emacs-24.2.ebuild 10977 SHA256 f4c8323318860c89d5bdee6f8876f72ebe7373ef279f8d994f2f7a58b301c7ca SHA512 df5311de2bdd70dc6cd920b56033facfa52931d665957f82473e1264a50ba2f9f015fed2a527b99c71db49a64a8c95085d698c630bb00b11395a77fee96a3199 WHIRLPOOL 7e3035b9d8146e40949cf9c3b0258b76a51227739c1bf160364849cdfb466194f333ceb4547b63f6f159d987945e00a9319f732e0dc81caa3ef08c69fb16fc1a
-MISC ChangeLog 73915 SHA256 27881f9bbebc9742fa6e059279a937dedb182bb21dddcdb6091ab03fb3d754ef SHA512 d6fcc9fcc4bdb5a316b6128e0123664014fb476e6e3fc58c768b28ed8eca9409aa0b7af21e151ec0f15b065dc68fa3cdd415b87527451a8481cea40a55d7eeb4 WHIRLPOOL 35f665fec7aa9124b0d72a0c958936f9f43d0a5d1e49e61e9e2c9e672c667e4d2bf2f5ddcb0bcd826e05df40a8ea4505c7f99dd5ef54ac8638833b1781f03a00
+MISC ChangeLog 73996 SHA256 77414689d3adf7f147bcfe0aeb28394dd022c27b2ac96889c45b8055bdff2b10 SHA512 70c1024d92dd49c72ace0dc28fcddd6b70b6a7a1715bddb8908bdf20e178e09b64011c9e1406bfe264a2e71b990a553fff28ff25a05398e3c5a6be90e85084c5 WHIRLPOOL e3216a6bdc164537cb0993babe1b72bedef5f1f0140ab3db4336977d902dd8b8e7a907760412c62a198422f2a321a3f07561ed70e7c30b4643ec4722991abfa0
 MISC metadata.xml 2456 SHA256 8bdd732f4d55f61ff12d6b3e2bb86fde9179d6e28a2db04fa8f6e1ce370309b1 SHA512 187c76b76f48ef69232ce84a51e316f636b8cd14489de29313698ba3b1ac8abe7d705fc3c833d2c685d4a671df35508c5d973f32cd43eaf03ecd7e8e8740448f WHIRLPOOL eed1249a1876926833184777917d88d281a0b1ec86f79cfb064b60d4cc09a9047cf08beb726dfe3fb9f5f36c58ebe16b1989f5bd158a9b945cc489039807c4e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBDnc4ACgkQuQc30/atMkBNvwCdEt+qUO2xxYkE/DX8QUN07eF/
-g48AmwVb71a1t4iuPKs+yJWY5QDXP91J
-=MO/7
+iQIcBAEBCAAGBQJQQ6dRAAoJEDxpGckxwJCBj8wP/21CWW/TdtnXpK8WEeEYUwlu
+KUJ6nUb9siHmbX9f2r4eS9SqFoLQZuG3VA2HopZmbql5dc/lzZ3oVQD3jpCyfr2c
+SWlAZ3qexRKbmzJm1WMj2/iHkYq5Ro794P8Jlzg8MhLw8wSCeIhPoR1BgHaQeU2X
+hwDgqG2QmrVuwbMINqJnxqFSyR4VNHRNU2hHRcIw2+35AKrk7E4nYZcr121NHjwn
+7VymCrK+Mv1NC1dAfIjvUZFPIIhR5x6f5x2AaUzwWhIo7nbhM/uszI94Y2wo2O6m
+dvOeirhhMgjgDyn+D0F3T2bVAIDxtcJcTAt2Z0gRzo/kre4cJVsne/xNGY+cIL3L
+J0gxxy43pNLyLYeya0lueVTnsqZTf/v2ND/XaRfShW0iwJqUW+QAjlwJwJbNz1L/
+KaxYTMtL+YvK2+g45zoADY5dQJvISc1oXkHpuNkX1bAySWuHcZihJyfMlMi02fs/
+zGxU4mp2gf9lVWJCyon+fOqi6X8k3PzWQEm4HMrvdcsRL+UrFpnUWgk3warnhPRN
+M0rJXfPhRUge0iZHchgvZ557kYwOpWXkUYMDr9G2v5r6YjUO/7EFeFUbevZJCyb9
+YDLEiAGwjiGZvHBehJRtOtWYrKvvDrKsJACcaijnXFXFeOmfW/wyOVLHGH5VRS8b
+t8ayZADzJJ2Zu0KEKXFn
+=Q3m2
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-23.4-r1.ebuild b/app-editors/emacs/emacs-23.4-r1.ebuild
deleted file mode 100644
index 80ad1bb732a8..000000000000
--- a/app-editors/emacs/emacs-23.4-r1.ebuild
+++ /dev/null
@@ -1,333 +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-r1.ebuild,v 1.14 2012/06/01 17:12:08 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-2.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 ~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 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 )"
-
-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
-}