Fix compilation with libpng-1.5, bug 384553. Remove old.
authorUlrich Müller <ulm@gentoo.org>
Tue, 27 Sep 2011 16:03:29 +0000 (16:03 +0000)
committerUlrich Müller <ulm@gentoo.org>
Tue, 27 Sep 2011 16:03:29 +0000 (16:03 +0000)
Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

app-editors/emacs/ChangeLog
app-editors/emacs/Manifest
app-editors/emacs/emacs-21.4-r23.ebuild
app-editors/emacs/emacs-22.3-r8.ebuild
app-editors/emacs/emacs-23.2-r2.ebuild [deleted file]

index d39e3750a19bcb54c93504f39fcad700b32b51f6..278e616c639beb950a5b07e7344e9262f633c619 100644 (file)
@@ -1,6 +1,10 @@
 # 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.431 2011/09/25 13:00:16 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.432 2011/09/27 16:03:29 ulm Exp $
+
+  27 Sep 2011; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r23.ebuild,
+  emacs-22.3-r8.ebuild, -emacs-23.2-r2.ebuild:
+  Fix compilation with libpng-1.5, bug 384553. Remove old.
 
   25 Sep 2011; Tony Vroon <chainsaw@gentoo.org> emacs-23.3-r2.ebuild:
   Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El
index df0d6bbebc322047f54b934d4d4263cd1c014ab1..bed3b7a25aadf5eb82edb72402af55f8b3d4c637 100644 (file)
@@ -1,20 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
 DIST emacs-18.59-patches-5.tar.bz2 17964 RMD160 55c561bf455fc101a65c4ec29956b6cecaa8f632 SHA1 7e9532ff07aa8141856382ef11344221453269fd SHA256 ab41883691956d705a9306f2a2bc803aff1ceea43da7e9539ff0ed51d2ae0953
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
-DIST emacs-21.4-patches-11.tar.bz2 13005 RMD160 2a55e7e102659d978e9069f56d188c91a721f468 SHA1 f1068df11532aadc38c0ebb618f9d420add3f2bb SHA256 10f76aa765ae9de34b3a36fbfa8391cb1be1dd97e0f78700623b3d9a3c68902c
+DIST emacs-21.4-patches-12.tar.bz2 13207 RMD160 1a35ce8b479ab783b3bf2d827bbae98c0b5185e1 SHA1 35c72d283f72eb479860766ce792b93b8af6cab6 SHA256 849ba3d3e75d759fcc8157057a9872338f4a99c3f776dbdce48036317b0f1125
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
-DIST emacs-22.3-patches-7.tar.bz2 5788 RMD160 0b3eead2c4bb2e523e51102bfcb863cdf0351555 SHA1 d0c696b8f7b09ded161ad4e0215903a165902c8b SHA256 1fe220dbc1388fffb19fdc4fda3643c7f177ce4e07757b238f381f49b528b6cd
+DIST emacs-22.3-patches-8.tar.bz2 5974 RMD160 a17c6e291b6c0d246d30a27baceaa882b12a1250 SHA1 fbb03538973be5f416edbffebc567f6346caef4b SHA256 72a68bd14ce2efd52b0425c56649d735f4b3c0e630de73e0eb51ddf947d56ff7
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
-DIST emacs-23.2-patches-2.tar.bz2 2248 RMD160 e8e6d8ac11b9d9f61edca4046381f93deec24d17 SHA1 261f32cde33890d77efde5448c6aedf72377f1f1 SHA256 5a5c257847ec952d4ca8e9c1c296ae906043b9fb989c40042d25cdb27a81768c
-DIST emacs-23.2a.tar.bz2 38641827 RMD160 68fa504b06856a82a2aa4aa12f5bd4d574d55320 SHA1 6ff2b076ade518ab62d3350e74a67df9a4b20d2f SHA256 4d9a2d18b1cd69a1b849dda1fd9423c2809194a73d144e50cc4cb9e7abc7781f
 DIST emacs-23.3-patches-1.tar.bz2 1675 RMD160 f167c15e8d1c6a9629967aa3f910cc476e22315e SHA1 51522c8af1c0991ef189f8537e6636f7e1b30553 SHA256 caec6e052a564e75de2873e2d0e4ffb8169bde3c4f786e1a04b8781df31456fe
 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
-EBUILD emacs-21.4-r23.ebuild 5022 RMD160 b7ece01e4d6bd874b4f719682ec89ad02e92356b SHA1 9191514319e49ab2747df372089cba4e8a8a8b90 SHA256 59d12555ab365a0dba567d33fe7b816568de6a337cd02c6a756781c161b93f40
-EBUILD emacs-22.3-r8.ebuild 7874 RMD160 213faef35dfe75d32e0c325399302af10a5d810f SHA1 2d3cd24c7e9f5ff79e27daf11c337c8fddc3b041 SHA256 e6a2d9a214be37d16e342a4d56ef473db2076940270ac879073f781e4a9372e2
-EBUILD emacs-23.2-r2.ebuild 9169 RMD160 da42435c54872e15a786f36e586b39855b33686f SHA1 b84b1d60ba0f4f3a9aa8b1952aa3cfd40c731b1c SHA256 7dd8751820b59c7b6619e05d879263fe91a56269a74240daf9d6326e44a942e1
+EBUILD emacs-21.4-r23.ebuild 5017 RMD160 e92ddfdee1ff2b9c2df52d976723eda5ad4811ee SHA1 b343d241c2512c4272a2bf6fc0bca06a8f66a921 SHA256 f4ba366b89cd724cfd7a0860a62a6acfcf4ef0d26b4705b53a203ea8f1def9fb
+EBUILD emacs-22.3-r8.ebuild 7874 RMD160 5428fd00d6b704386e0e0f6f3840dfaccab865fc SHA1 3774048cac24618c52184d4036f63a1156c6e1db SHA256 4ff86dd8f43791a2734939367c9a2e29e71f0c318b3c7057909e436882c2ec16
 EBUILD emacs-23.3-r1.ebuild 10269 RMD160 4a384f15d098757c99f15d0592a49d2415b9d2f5 SHA1 5c1a2259f4911c8e238a4cdcfe686998ecad7039 SHA256 8b50b0f54553270a1c71a948110fe0d101a2f11ffe847913d60abb4aa716130a
 EBUILD emacs-23.3-r2.ebuild 10499 RMD160 619e3a5eb5e1f1d748445a62e946f5beaeb8dcd8 SHA1 191e7c5a633287e0b20f9b89b25c6e16fe52eb51 SHA256 cc4bc41be44c3af9e452ba2e8d7f0aeb9149a77412719673935a8880d1d394cb
-MISC ChangeLog 61642 RMD160 bc5598aecee4a3ece1146604710c89dbd9b90e94 SHA1 87a58ee0ca8b717bb934e1787bab49f12b5b3e42 SHA256 519a74ebee463112b6f959eb33887f28e0b4ec981ad78bed2543563840547586
+MISC ChangeLog 61814 RMD160 b07053e05341b1fb277e6f40c4c3ccb9ba7b4c6f SHA1 dc339acd7b12b5b443fa15e9e545ed62dd4f99c2 SHA256 cc3a2ce3d26edb92e26bea9b2cfcbc1f59c954301cb2954d0088c573d27daf5e
 MISC metadata.xml 1799 RMD160 a7f84fb65e4183986c56293d6736de494c866afe SHA1 09be81d68015c843266b1b2f0e4fb3d3903bb1c6 SHA256 160051b131c440f42d74910a95c00692a7e63778dc60cb331d6033abbd302808
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk6B9YMACgkQOeoy/oIi7uyE8gCfeUvaWRip2Br6QgsIOcNZc3v9
+JYYAn0tQ3zRjizFRhFdb3OBWNRgtdlqQ
+=M+Fl
+-----END PGP SIGNATURE-----
index ea8fa3e119411a91fd16fc8c548a73cb9ca6b966..fe92d10c268e4de8e218855b33d040a6d55a5c06 100644 (file)
@@ -1,6 +1,6 @@
 # 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-21.4-r23.ebuild,v 1.2 2011/08/02 05:41:31 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r23.ebuild,v 1.3 2011/09/27 16:03:29 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -10,7 +10,7 @@ inherit flag-o-matic eutils toolchain-funcs autotools
 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.gz
-       mirror://gentoo/${P}-patches-11.tar.bz2
+       mirror://gentoo/${P}-patches-12.tar.bz2
        leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
 LICENSE="GPL-2 FDL-1.1 BSD as-is MIT"
index 76b72540db4cce011dbdbdd538b73bfeae54e817..0211eb0f98f42659146c4556a84ca831b566df05 100644 (file)
@@ -1,6 +1,6 @@
 # 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-22.3-r8.ebuild,v 1.1 2011/08/22 19:14:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r8.ebuild,v 1.2 2011/09/27 16:03:29 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -10,7 +10,7 @@ inherit autotools elisp-common eutils flag-o-matic
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.gz
-       mirror://gentoo/${P}-patches-7.tar.bz2"
+       mirror://gentoo/${P}-patches-8.tar.bz2"
 
 LICENSE="GPL-3 FDL-1.2 BSD as-is MIT"
 SLOT="22"
diff --git a/app-editors/emacs/emacs-23.2-r2.ebuild b/app-editors/emacs/emacs-23.2-r2.ebuild
deleted file mode 100644 (file)
index 3851046..0000000
+++ /dev/null
@@ -1,294 +0,0 @@
-# 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.2-r2.ebuild,v 1.15 2011/08/02 17:44:03 ulm Exp $
-
-EAPI=2
-
-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-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 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="alsa dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
-RESTRICT="strip"
-
-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 )
-               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? ( 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[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
-
-       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 -fstack-protector -fstack-protector-all    #285778
-
-       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
-               echo
-               einfo "Although sound USE flag is disabled you chose to have alsa,"
-               einfo "so sound is switched on anyway."
-               echo
-               myconf="${myconf} --with-sound"
-       else
-               myconf="${myconf} $(use_with sound)"
-       fi
-
-       if use X; then
-               myconf="${myconf} --with-x"
-               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)"
-               myconf="${myconf} $(use_with xft)"
-
-               if use xft; then
-                       myconf="${myconf} $(use_with m17n-lib libotf)"
-                       myconf="${myconf} $(use_with m17n-lib m17n-flt)"
-               else
-                       myconf="${myconf} --without-libotf --without-m17n-flt"
-                       use m17n-lib && ewarn \
-                               "USE flag \"m17n-lib\" has no effect because 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; then
-                       einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
-                       myconf="${myconf} --with-x-toolkit=athena"
-               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 motif; do
-                       use ${f} || continue
-                       [ "${tk}" ] \
-                               && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
-                       tk="${tk}${tk:+ }${f}"
-               done
-       else
-               myconf="${myconf} --without-x"
-       fi
-
-       myconf="${myconf} $(use_with hesiod)"
-       myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
-       myconf="${myconf} $(use_with gpm) $(use_with dbus)"
-
-       econf \
-               --program-suffix=-${EMACS_SUFFIX} \
-               --infodir=/usr/share/info/${EMACS_SUFFIX} \
-               --with-crt-dir=/usr/$(get_libdir) \
-               --with-gameuser="${GAMES_USER_DED:-games}" \
-               ${myconf} || die "econf emacs failed"
-}
-
-src_compile() {
-       export SANDBOX_ON=0                     # for the unbelievers, see Bug #131505
-       emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
-       local i m
-
-       emake install DESTDIR="${D}" || die "make install failed"
-
-       rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-               || die "removing duplicate emacs executable failed"
-       mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
-               || die "moving Emacs executable failed"
-
-       # move man pages to the correct place
-       for m in "${D}"/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 "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-               || die "moving info dir failed"
-       touch "${D}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-
-       # avoid collision between slots, see bug #169033 e.g.
-       rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-       rm -rf "${D}"/usr/share/{applications,icons}
-       rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
-       keepdir /var/lib/games/emacs
-
-       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/*.[ch]
-               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}      "/usr/share/emacs/${FULL_VERSION}/src")
-       X  (let ((path (getenv "INFOPATH"))
-       X       (dir "/usr/share/info/${EMACS_SUFFIX}")
-       X       (re "\\\\\`/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 || die "dodoc failed"
-}
-
-pkg_preinst() {
-       # Depending on Portage version and user's settings, the Info dir file
-       # may have been compressed or removed. We rebuild it in both cases.
-       local infodir=/usr/share/info/${EMACS_SUFFIX} f
-       if [ -f "${D}"${infodir}/dir.orig ]; then
-               # prefer existing file if it has survived to here
-               mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
-       else
-               einfo "Regenerating Info directory index in ${infodir} ..."
-               rm -f "${D}"${infodir}/dir{,.*}
-               for f in "${D}"${infodir}/*; do
-                       if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-                               install-info --info-dir="${D}"${infodir} "${f}" \
-                                       || die "install-info failed"
-                       fi
-               done
-       fi
-}
-
-pkg_postinst() {
-       local f
-       for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-               [ -e "${f}" ] || touch "${f}"
-       done
-       chown "${GAMES_USER_DED:-games}" "${ROOT}"/var/lib/games/emacs
-
-       elisp-site-regen
-       eselect emacs update ifunset
-
-       if use X; then
-               echo
-               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."
-       fi
-
-       echo
-       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."
-       echo
-       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
-}