Add /etc/emacs to the lisp load-path; site-start.el will move to this new location...
authorUlrich Müller <ulm@gentoo.org>
Tue, 13 Dec 2011 22:20:51 +0000 (22:20 +0000)
committerUlrich Müller <ulm@gentoo.org>
Tue, 13 Dec 2011 22:20:51 +0000 (22:20 +0000)
Package-Manager: portage-2.1.10.40/cvs/Linux x86_64

app-editors/emacs-vcs/Manifest
app-editors/emacs/ChangeLog
app-editors/emacs/Manifest
app-editors/emacs/emacs-23.3-r3.ebuild [new file with mode: 0644]

index f8f825e026c12ed1edf68c762465e622f5bf5672..94c89c473b9954aeac303f1f21b42b0415d98658 100644 (file)
@@ -3,16 +3,16 @@ Hash: SHA1
 
 DIST emacs-24.0.91.tar.gz 50973768 RMD160 6479b85929c98f18d7ffeb4d288677ee8d744a72 SHA1 7eda9e9861638cfc328582e27831ece799ba9929 SHA256 1850909dccde9a331b4585bdc3d26a30b90a81a7d2469536fddd6ba61d246bbe
 DIST emacs-24.0.92.tar.gz 50996706 RMD160 4530f9208765ef168bfb55831371cecc089e2433 SHA1 6d876d3f187be67c210242e8106e8f38c314f77d SHA256 861369d3006e59837bd2daac9931b17148d60cc16d074fb532b51ef9c5d1975f
-EBUILD emacs-vcs-23.3.9999.ebuild 10908 RMD160 a7f4a6432e6a8a951816acd8590a309bb6c5080e SHA1 fc0be729616dba48286cdb60fa88fc9757170757 SHA256 28518fd0986dcaee87d961ad3b996c7dc7d28f93fffbec3275902ae42f7d48aa
-EBUILD emacs-vcs-24.0.91.ebuild 10620 RMD160 c9811525531dc79bb25a306a49dc09f87cf09b99 SHA1 0e693b29b229c76030f525cc73039ec08793c57d SHA256 5db7c8c5db553818e84747cf8f34e2ec60220863b34794b9c1760f19f60e2048
-EBUILD emacs-vcs-24.0.92.ebuild 10620 RMD160 a0b12272556b0bf25a02b2fdab42430d0c6cb5aa SHA1 696cbf2a0efc81ee9bfe98e3350a474b703f4e5f SHA256 a5459506b7f8b36c57dc12d06e25be828d54fc7d73c94f92a537a9c564e3e85e
-EBUILD emacs-vcs-24.0.9999-r1.ebuild 10626 RMD160 67f0c3936e87af217641a847f0ce22ceaecee1d0 SHA1 d2e317c309bad2e3adacf128c1983b53a36eff4a SHA256 607ba9983d37493d045233fe2359f23d40eef9beed3f20b9b3fc0bf0926a23eb
-MISC ChangeLog 61231 RMD160 24f1b273b01e756aa223668c53e6e441e5368faf SHA1 705d65365fcba62b00c4d6c31a6821acb7e9eee4 SHA256 b8c20a600f5af6f878c9c5841b69cc3edac53f3277bd5757968caf3c8141a190
+EBUILD emacs-vcs-23.3.9999.ebuild 10628 RMD160 6f05978ccdbc2e70f3526d3f8a631309850918e7 SHA1 464a5ff144bdab982bf302a71f3a867697395325 SHA256 8a3759371f9d485a82aebc976fa86129cafa393c58a642184013a20b7fda8812
+EBUILD emacs-vcs-24.0.91.ebuild 10774 RMD160 aa2df99b88234bb5477e46763c4ededfca2fe230 SHA1 85fd5c9f37137bafded72bba095b4f03a692b987 SHA256 277d78fa6857256214b5faf841876ae7ae857ba8e5eb6e68d1e9f976621c60af
+EBUILD emacs-vcs-24.0.92.ebuild 10774 RMD160 5251d8092029f7a4d1a436190b96344cfc00bc59 SHA1 410d4a791b9397d92a30a19098e423d57509260c SHA256 ac9d78016fbbe55fd37d29a44f73e5a43efb4fefb756a914bd6330166d9bed24
+EBUILD emacs-vcs-24.0.9999-r2.ebuild 10779 RMD160 55c395d04b67923a9b4f43c23c64296150b2896e SHA1 f00e052b80071c289a2a80c4464e01cda4c7c0e7 SHA256 682af60352b62a37a08b6f7d880f60f31b4fc9657bc894b9f801449ffc66a54e
+MISC ChangeLog 61554 RMD160 9a65fa20c3faf2a7bbffac461bdd0b7afaad3382 SHA1 2eeb7fe136e9b343f8dbd23549fb1d4b256daf68 SHA256 8e7d76c605ba4a035a5a25e92989895b833ebf84c6a802436604c7ea522fce92
 MISC metadata.xml 2159 RMD160 c0ec88f19a4e19271ea414b5e4429d0ca3ec4548 SHA1 3f8c32f164afe13baf231c60a2b64ca9912e5bfb SHA256 b1008bb18ce3aacd84175d61ac8254d017a4a9ba67d5b376f21a39e5699be3ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7eIAQACgkQOeoy/oIi7uwfogCg12IBM0GtyCQLcKdbusKMkghe
-0NEAoNelSehq8DKrP+ls0LqZ45qQNmjo
-=OdnY
+iEYEARECAAYFAk7n0iIACgkQOeoy/oIi7uypRQCeOTM3CFyv+5mPt8/vVaC3b+IO
+bGIAn3+ieCI53TUANsgptYG21+puVFkq
+=jNsu
 -----END PGP SIGNATURE-----
index ea0b663d4659162ef932bc36e4fd875f75831c55..ec36a93c1d902146c189d634e7154c7fed51cedd 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.442 2011/12/06 13:44:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.443 2011/12/13 22:20:51 ulm Exp $
+
+*emacs-23.3-r3 (13 Dec 2011)
+
+  13 Dec 2011; Ulrich Mueller <ulm@gentoo.org> +emacs-23.3-r3.ebuild:
+  Add /etc/emacs to the lisp load-path; site-start.el will move to this new
+  location. New patchset with sources for CEDET grammars, corresponding to the
+  emacs-23.3b tarball. Remove obsolete code in pkg_preinst().
 
   06 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-22.3-r8.ebuild,
   emacs-23.3-r1.ebuild, emacs-23.3-r2.ebuild:
index 40976af976af095730d7aee240cfa29e9b01c9ee..496b54a68aa9eec6ca2fe5bb3637c1147c8d9539 100644 (file)
@@ -10,6 +10,7 @@ DIST emacs-22.3-patches-8.tar.bz2 5974 RMD160 a17c6e291b6c0d246d30a27baceaa882b1
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST emacs-23.3-patches-1.tar.bz2 1675 RMD160 f167c15e8d1c6a9629967aa3f910cc476e22315e SHA1 51522c8af1c0991ef189f8537e6636f7e1b30553 SHA256 caec6e052a564e75de2873e2d0e4ffb8169bde3c4f786e1a04b8781df31456fe
 DIST emacs-23.3-patches-2.tar.bz2 1936 RMD160 c1cbe26f05e68efe0768445a3918892e995a59dd SHA1 3f55305dab83084b01f8958371d4e0fd4114b88b SHA256 403f88c0b814817734f275e6ee6ff4c8f27858a2429ea7d0a029c2d89ebaa5de
+DIST emacs-23.3-patches-3.tar.bz2 14783 RMD160 5a609bfded363d63f6146c482881d63ea6fe8b08 SHA1 da25e5ab9e5c10d36fdffe17ee3825822f8618b7 SHA256 1c8b404d52a5f66861e1533c785642c5c0a371d55287b5df7d9c2587a24d1bbd
 DIST emacs-23.3a.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a
@@ -17,12 +18,13 @@ EBUILD emacs-21.4-r23.ebuild 5010 RMD160 2b7019a59d7ba82a320c8464c3c2b6c098410b5
 EBUILD emacs-22.3-r8.ebuild 7832 RMD160 d74e25b91dbe8783930d1647dec3cf8e44b49b17 SHA1 92e6d6b50578faf6f669e6b2389d7599712048e9 SHA256 b9a75b8b6f468f984441ab725779ff581c8ddbfa14ccff404cc11381d0db741b
 EBUILD emacs-23.3-r1.ebuild 10301 RMD160 885b752594822d1425e3afe95e997ea9fb5a2776 SHA1 90bcec933661eb0f5066a6ae679ecdb6b7ac42d0 SHA256 93cf3fe5516ed9b9f0e06ae9de0472e55c47d89d0c7824da5269e71d548e4d0c
 EBUILD emacs-23.3-r2.ebuild 10656 RMD160 015444a016093e78a11dec0ad71857e1fcc7ef61 SHA1 600b0741c75f0bc0ab246380ce1d105c83186cd3 SHA256 821938b07f1303e0b0a2a8751f1d98760c4623bb87817c722c9f8e60a9f6d106
-MISC ChangeLog 63138 RMD160 69ce473157f18ce90e2073d85cde1a5ffe0a35f7 SHA1 7df2fa47d87626ab0e9395d3b931ade82c69ab39 SHA256 0b8e6079c7d84265cd96ea855876e3be15b3de8a4ed6aabd48b0849e1611048f
+EBUILD emacs-23.3-r3.ebuild 10418 RMD160 5b2be564b91dc0bd58393a0aac212e5f8a64d544 SHA1 f2d471288c3241a24ab8f27f51da6bb5195276e9 SHA256 1df63f620c4fa6d9ba6b9a481b8e083864bbbeb8280428974475baed1f44531b
+MISC ChangeLog 63456 RMD160 13215fd7530c2ef0730f33ce81c1b41c1d4cb9a5 SHA1 189029e645a75d38a33dc89e4bb9b0567eedd6ee SHA256 60bc7438621cf026edb6e949a26784a8dd2714f57474ee01f27062973999355f
 MISC metadata.xml 1644 RMD160 911d63b0a921d248984f3c5efeb1922f05aa5111 SHA1 7281388d7c274016274e888d97821fda9e5c958c SHA256 7c703ad3af721dfa1d9737f78cd848b7c69a7b906ead5c5fe8fd1db23a1d3166
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7eHoEACgkQOeoy/oIi7uxUIACgpEeXDNt9jJ30LGUL7kRbHJfE
-6DAAnjHRBfDSE0HRZCoB/ja3dYM7sqsC
-=1lAt
+iEYEARECAAYFAk7n0hwACgkQOeoy/oIi7uzUGQCgmPiSk7L9BsFSkGT3Tb7SEapz
+AUUAn1sbdHYh/d0fSEVPQCi03d1bGY7c
+=7ld7
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-23.3-r3.ebuild b/app-editors/emacs/emacs-23.3-r3.ebuild
new file mode 100644 (file)
index 0000000..dbe983f
--- /dev/null
@@ -0,0 +1,322 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r3.ebuild,v 1.1 2011/12/13 22:20:51 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}a.tar.bz2
+       mirror://gentoo/${P}-patches-3.tar.bz2"
+
+LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2 Emacs-23-CEDET-grammars"
+SLOT="23"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-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}
+       dev-util/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() {
+       ALLOWED_FLAGS=""
+       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"
+               elif use Xaw3d || use athena; then
+                       einfo "Configuring to build with Athena/Lucid toolkit"
+                       myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d 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
+
+               local f tk=
+               for f in gtk Xaw3d athena motif; do
+                       use ${f} || continue
+                       [[ ${tk} ]] \
+                               && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
+                       tk="${tk}${tk:+ }${f}"
+               done
+       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="/etc/emacs:${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 () {
+       local i m
+
+       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
+       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
+       mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
+               || die "moving info dir failed"
+}
+
+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
+}