clean up
authorChristian Faulhammer <fauli@gentoo.org>
Fri, 2 Mar 2007 19:08:42 +0000 (19:08 +0000)
committerChristian Faulhammer <fauli@gentoo.org>
Fri, 2 Mar 2007 19:08:42 +0000 (19:08 +0000)
Package-Manager: portage-2.1.2-r9

app-editors/emacs-cvs/ChangeLog
app-editors/emacs-cvs/emacs-cvs-22.0.94.ebuild [deleted file]
app-editors/emacs-cvs/emacs-cvs-22.0.9999-r3.ebuild [deleted file]
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.94 [deleted file]
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r3 [deleted file]
app-editors/emacs/ChangeLog
app-editors/emacs/emacs-21.4-r6.ebuild [deleted file]
app-editors/emacs/files/digest-emacs-21.4-r6 [deleted file]

index 85f6511b1ec00fb227d988934ffdc709b6df5ef6..69d6153de8a78604c3540acb8c42525b5e49eda2 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.86 2007/03/02 07:16:59 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.87 2007/03/02 19:08:42 opfer Exp $
+
+  02 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  -emacs-cvs-22.0.94.ebuild, -emacs-cvs-22.0.9999-r3.ebuild:
+  clean up
 
 *emacs-cvs-22.0.9999-r4 (02 Mar 2007)
 *emacs-cvs-22.0.95 (02 Mar 2007)
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.94.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.94.ebuild
deleted file mode 100644 (file)
index c5cf0eb..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.94.ebuild,v 1.3 2007/02/27 18:40:22 opfer Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit alternatives autotools elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-SRC_URI="ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-IUSE="alsa aqua gif gnome gtk gzip-el jpeg lesstif motif nls png spell source tiff toolkit-scroll-bars X Xaw3d "
-
-RESTRICT="$RESTRICT nostrip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-misc/xbitmaps || ( media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi )"
-
-DEPEND="sys-libs/ncurses
-       sys-libs/zlib
-       spell? ( || ( app-text/ispell app-text/aspell ) )
-       X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
-       X? ( gif? ( media-libs/giflib )
-               jpeg? ( media-libs/jpeg )
-               tiff? ( media-libs/tiff )
-               png? ( media-libs/libpng )
-               gtk? ( =x11-libs/gtk+-2* )
-               !gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-               !Xaw3d? ( motif? ( x11-libs/openmotif ) )
-               !motif? ( lesstif? ( x11-libs/lesstif ) )
-               gnome? ( gnome-base/gnome-desktop ) )
-       alsa? ( media-sound/alsa-headers )
-       gzip-el? ( app-arch/gzip  )
-       nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="22.0.94"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-S="${WORKDIR}/emacs-${PV}"
-
-src_unpack() {
-       unpack ${A}
-
-       cd "${S}"
-       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 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
-
-       epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-       epatch "${FILESDIR}/emacs-subdirs-el-gentoo.diff"
-       use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff"
-
-       eautoreconf
-}
-
-src_compile() {
-       export SANDBOX_ON=0                     # for the unbelievers, see Bug #131505
-       ALLOWED_FLAGS=""
-       strip-flags
-       unset LDFLAGS
-       replace-flags -O[3-9] -O2
-       sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
-
-       local myconf
-
-       if use X; then
-               myconf="${myconf} --with-x"
-               myconf="${myconf} --with-xpm"
-               myconf="${myconf} $(use_with toolkit-scroll-bars)"
-               myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-               myconf="${myconf} $(use_with gif) $(use_with png)"
-               if use gtk; then
-                       einfo "Configuring to build with GTK support"
-                       myconf="${myconf} --with-x-toolkit=gtk"
-               elif use Xaw3d; then
-                       einfo "Configuring to build with Xaw3d(athena) support"
-                       myconf="${myconf} --with-x-toolkit=athena"
-                       myconf="${myconf} --without-gtk"
-                       myconf="${myconf} --with-x-toolkit=lucid"
-               elif use motif; then
-                       einfo "Configuring to build with motif toolkit support"
-                       myconf="${myconf} --without-gtk"
-                       myconf="${myconf} --with-x-toolkit=motif"
-               elif use lesstif; then
-                       einfo "Configuring to build with lesstif toolkit support"
-                       myconf="${myconf} --without-gtk"
-                       myconf="${myconf} --with-x-toolkit=motif"
-               fi
-       else
-               myconf="${myconf} --without-x"
-       fi
-
-       if use aqua; then
-               einfo "Configuring to build with Carbon Emacs"
-               econf \
-                       --enable-carbon-app=/Applications/Gentoo \
-                       --without-x \
-                       $(use_with jpeg) $(use_with tiff) \
-                       $(use_with gif) $(use_with png) \
-                        || die "econf carbon emacs failed"
-       else
-               econf \
-                       --program-suffix=.emacs-${SLOT} \
-                       --without-carbon \
-                       ${myconf} || die "econf emacs failed"
-       fi
-
-       emake CC="$(tc-getCC) " bootstrap \
-               || die "make bootstrap failed."
-}
-
-src_install () {
-       emake install DESTDIR="${D}" || die "make install failed"
-
-       rm "${D}"/usr/bin/emacs-${SLOT}.emacs-${SLOT} || die "removing duplicate emacs executable failed"
-       dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} || die
-
-       if use aqua ; then
-               einfo "Installing Carbon Emacs..."
-               dodir /Applications/Gentoo/Emacs.app
-               pushd mac/Emacs.app
-               tar -chf - . | ( cd "${D}/Applications/Gentoo/Emacs.app"; tar -xf -)
-               popd
-       fi
-
-       # fix info documentation
-       einfo "Fixing info documentation..."
-       dodir /usr/share/info/emacs-${SLOT}
-       mv "${D}"/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
-       for i in "${D}"/usr/share/info/*
-       do
-               if [ "${i##*/}" != emacs-${SLOT} ] ; then
-                       mv ${i} ${i/info/info/emacs-${SLOT}}.info
-               fi
-       done
-
-       if has_version 'app-text/aspell' ; then
-               # defaults to aspell if installed
-               elisp-site-file-install "${FILESDIR}/40aspell-gentoo.el"
-       fi
-       insinto /etc/env.d
-       cat >"${D}"/etc/env.d/50emacs-cvs-${SLOT} <<EOF
-INFOPATH=/usr/share/info/emacs-${SLOT}
-EOF
-       einfo "Fixing manpages..."
-       for m in  "${D}"/usr/share/man/man1/* ; do
-               mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv man failed"
-       done
-
-       if use source; then
-               insinto /usr/share/emacs/${SLOT}/src
-               # This is not meant to install all the source -- just the
-               # C source you might find via find-function
-               doins src/*.[ch]
-               cat >00emacs-cvs-${SLOT}-gentoo.el <<EOF
-(when (substring emacs-version 0 (length "${SLOT}"))
-  (setq find-function-C-source-directory "/usr/share/emacs/${SLOT}/src"))
-EOF
-               elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
-       fi
-
-       if ! use gzip-el; then
-               find ${D} -type f -name \*.el.gz -print0 |xargs -0 gunzip
-       fi
-       dodoc BUGS ChangeLog README
-}
-
-update-alternatives() {
-       # extract the suffix of the manpages to determine the correct compression program
-       local suffix=$(echo /usr/share/man/man1/emacs.emacs-*.1*|sed 's/.*\.1//')
-
-       # this creates symlinks for binaries and man pages, so the correct ones in a slotted
-       # environment can be accessed
-       for i in emacs emacsclient etags ctags b2m ebrowse \
-               rcs-checkin grep-changelog ;
-       do
-               alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/$i.emacs-*"
-       done
-
-       for j in emacs emacsclient etags ctags
-       do
-               alternatives_auto_makesym "/usr/share/man/man1/$j.1${suffix}" "/usr/share/man/man1/$j.emacs-*"
-       done
-}
-
-pkg_postinst() {
-       use ppc-macos || update-alternatives
-       elisp-site-regen
-
-       # ecompress from Portage 2.2.* does auto-compression
-       # which is not desired for the dir file, so remove it to
-       # let it be recreated
-       rm "${D}/usr/share/info/emacs-${SLOT}/dir.bz2" 2> /dev/null
-
-       if use X; then
-               elog "You need to install some fonts for Emacs.  Under monolithic"
-               elog "XFree86/Xorg you typically had such fonts installed by default."
-               elog "With modular Xorg, you will have to perform this step yourself."
-               elog "Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic"
-               elog "Emacs requirements under X11."
-       fi
-}
-
-pkg_postrm() {
-       use ppc-macos || update-alternatives
-       elisp-site-regen
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r3.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r3.ebuild
deleted file mode 100644 (file)
index ae38ac3..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r3.ebuild,v 1.2 2007/02/27 18:40:22 opfer Exp $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="HEAD"
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit alternatives autotools cvs elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-SRC_URI=""
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-IUSE="alsa aqua gif gnome gtk gzip-el jpeg lesstif motif nls png spell source tiff toolkit-scroll-bars X Xaw3d "
-
-RESTRICT="$RESTRICT nostrip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-misc/xbitmaps || ( media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi )"
-
-DEPEND="sys-libs/ncurses
-       sys-libs/zlib
-       spell? ( || ( app-text/ispell app-text/aspell ) )
-       X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
-       X? ( gif? ( media-libs/giflib )
-               jpeg? ( media-libs/jpeg )
-               tiff? ( media-libs/tiff )
-               png? ( media-libs/libpng )
-               gtk? ( =x11-libs/gtk+-2* )
-               !gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-               !Xaw3d? ( motif? ( x11-libs/openmotif ) )
-               !motif? ( lesstif? ( x11-libs/lesstif ) )
-               gnome? ( gnome-base/gnome-desktop ) )
-       alsa? ( media-sound/alsa-headers )
-       gzip-el? ( app-arch/gzip  )
-       nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="22.0.94"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-S="${WORKDIR}/emacs"
-
-src_unpack() {
-       cvs_src_unpack
-
-       cd "${S}"
-       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 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
-
-       epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-       epatch "${FILESDIR}/emacs-subdirs-el-gentoo.diff"
-       use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff"
-
-       eautoreconf
-}
-
-src_compile() {
-       export SANDBOX_ON=0                     # for the unbelievers, see Bug #131505
-       ALLOWED_FLAGS=""
-       strip-flags
-       unset LDFLAGS
-       replace-flags -O[3-9] -O2
-       sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
-
-       local myconf
-
-       if use X; then
-               myconf="${myconf} --with-x"
-               myconf="${myconf} --with-xpm"
-               myconf="${myconf} $(use_with toolkit-scroll-bars)"
-               myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-               myconf="${myconf} $(use_with gif) $(use_with png)"
-               if use gtk; then
-                       einfo "Configuring to build with GTK support"
-                       myconf="${myconf} --with-x-toolkit=gtk"
-               elif use Xaw3d; then
-                       einfo "Configuring to build with Xaw3d(athena) support"
-                       myconf="${myconf} --with-x-toolkit=athena"
-                       myconf="${myconf} --without-gtk"
-                       myconf="${myconf} --with-x-toolkit=lucid"
-               elif use motif; then
-                       einfo "Configuring to build with motif toolkit support"
-                       myconf="${myconf} --without-gtk"
-                       myconf="${myconf} --with-x-toolkit=motif"
-               elif use lesstif; then
-                       einfo "Configuring to build with lesstif toolkit support"
-                       myconf="${myconf} --without-gtk"
-                       myconf="${myconf} --with-x-toolkit=motif"
-               fi
-       else
-               myconf="${myconf} --without-x"
-       fi
-
-       if use aqua; then
-               einfo "Configuring to build with Carbon Emacs"
-               econf \
-                       --enable-carbon-app=/Applications/Gentoo \
-                       --without-x \
-                       $(use_with jpeg) $(use_with tiff) \
-                       $(use_with gif) $(use_with png) \
-                        || die "econf carbon emacs failed"
-       else
-               econf \
-                       --program-suffix=.emacs-${SLOT} \
-                       --without-carbon \
-                       ${myconf} || die "econf emacs failed"
-       fi
-
-       emake CC="$(tc-getCC) " bootstrap \
-               || die "make bootstrap failed."
-}
-
-src_install () {
-       emake install DESTDIR="${D}" || die "make install failed"
-
-       rm "${D}"/usr/bin/emacs-${SLOT}.emacs-${SLOT} || die "removing duplicate emacs executable failed"
-       dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} || die
-
-       if use aqua ; then
-               einfo "Installing Carbon Emacs..."
-               dodir /Applications/Gentoo/Emacs.app
-               pushd mac/Emacs.app
-               tar -chf - . | ( cd "${D}/Applications/Gentoo/Emacs.app"; tar -xf -)
-               popd
-       fi
-
-       # fix info documentation
-       einfo "Fixing info documentation..."
-       dodir /usr/share/info/emacs-${SLOT}
-       mv "${D}"/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
-       for i in "${D}"/usr/share/info/*
-       do
-               if [ "${i##*/}" != emacs-${SLOT} ] ; then
-                       mv ${i} ${i/info/info/emacs-${SLOT}}.info
-               fi
-       done
-
-       if has_version 'app-text/aspell' ; then
-               # defaults to aspell if installed
-               elisp-site-file-install "${FILESDIR}/40aspell-gentoo.el"
-       fi
-       insinto /etc/env.d
-       cat >"${D}"/etc/env.d/50emacs-cvs-${SLOT} <<EOF
-INFOPATH=/usr/share/info/emacs-${SLOT}
-EOF
-       einfo "Fixing manpages..."
-       for m in  "${D}"/usr/share/man/man1/* ; do
-               mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv man failed"
-       done
-
-       if use source; then
-               insinto /usr/share/emacs/${SLOT}/src
-               # This is not meant to install all the source -- just the
-               # C source you might find via find-function
-               doins src/*.[ch]
-               cat >00emacs-cvs-${SLOT}-gentoo.el <<EOF
-(when (substring emacs-version 0 (length "${SLOT}"))
-  (setq find-function-C-source-directory "/usr/share/emacs/${SLOT}/src"))
-EOF
-               elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
-       fi
-
-       if ! use gzip-el; then
-               find ${D} -type f -name \*.el.gz -print0 |xargs -0 gunzip
-       fi
-       dodoc BUGS ChangeLog README
-
-       make_desktop_entry emacs Emacs /usr/share/emacs/${SLOT}/etc/images/icons/emacs_48.png   editors
-}
-
-update-alternatives() {
-       # extract the suffix of the manpages to determine the correct compression program
-       local suffix=$(echo /usr/share/man/man1/emacs.emacs-*.1*|sed 's/.*\.1//')
-
-       # this creates symlinks for binaries and man pages, so the correct ones in a slotted
-       # environment can be accessed
-       for i in emacs emacsclient etags ctags b2m ebrowse \
-               rcs-checkin grep-changelog ;
-       do
-               alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/$i.emacs-*"
-       done
-
-       for j in emacs emacsclient etags ctags
-       do
-               alternatives_auto_makesym "/usr/share/man/man1/$j.1${suffix}" "/usr/share/man/man1/$j.emacs-*"
-       done
-}
-
-pkg_postinst() {
-       use ppc-macos || update-alternatives
-       elisp-site-regen
-
-       # ecompress from Portage 2.2.* does auto-compression
-       # which is not desired for the dir file, so remove it to
-       # let it be recreated
-       rm "${D}/usr/share/info/emacs-${SLOT}/dir.bz2" 2> /dev/null
-
-       if use X; then
-               elog "You need to install some fonts for Emacs.  Under monolithic"
-               elog "XFree86/Xorg you typically had such fonts installed by default."
-               elog "With modular Xorg, you will have to perform this step yourself."
-               elog "Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic"
-               elog "Emacs requirements under X11."
-       fi
-}
-
-pkg_postrm() {
-       use ppc-macos || update-alternatives
-       elisp-site-regen
-}
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.94 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.94
deleted file mode 100644 (file)
index d98e589..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1bcf94dcce09279f32c05acbd0b98eca emacs-22.0.94.tar.gz 37596398
-RMD160 30e5930219a9d7391110cab73046ac1da49c94fc emacs-22.0.94.tar.gz 37596398
-SHA256 0d76c94dd90510c047a54831115e499d6b628a8ec7119fa1876fb556667e24c6 emacs-22.0.94.tar.gz 37596398
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r3 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r3
deleted file mode 100644 (file)
index e69de29..0000000
index e7cc3caa420f0f57ee57ca0c927f50e8c66a0518..bc833511fdf395beb26c8e7b25bf19386d2bd4d2 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.122 2007/03/02 18:44:45 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.123 2007/03/02 19:04:40 opfer Exp $
+
+  02 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  -emacs-21.4-r6.ebuild:
+  clean up
 
   02 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   -files/emacs-22.0.50.desktop, -files/emacs-nofink-gentoo.diff:
diff --git a/app-editors/emacs/emacs-21.4-r6.ebuild b/app-editors/emacs/emacs-21.4-r6.ebuild
deleted file mode 100644 (file)
index acc03bb..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r6.ebuild,v 1.7 2007/03/02 18:38:54 opfer Exp $
-
-inherit flag-o-matic eutils alternatives toolchain-funcs
-
-DESCRIPTION="An incredibly powerful, extensible text editor"
-HOMEPAGE="http://www.gnu.org/software/emacs"
-SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
-       leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="21"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="X Xaw3d leim lesstif motif nls nosendmail"
-
-RDEPEND="sys-libs/ncurses
-       X? ( || ( ( x11-libs/libXext
-                               x11-libs/libICE
-                               x11-libs/libSM
-                               x11-libs/libXmu
-                               x11-libs/libXpm
-                               || ( media-fonts/font-adobe-100dpi
-                                       media-fonts/font-adobe-75dpi )
-                       )
-                       virtual/x11
-               )
-               >=media-libs/giflib-4.1.0.1b
-               >=media-libs/jpeg-6b-r2
-               >=media-libs/tiff-3.5.5-r3
-               >=media-libs/libpng-1.2.1
-               !arm? (
-               Xaw3d? ( x11-libs/Xaw3d )
-               !Xaw3d? ( || ( x11-libs/libXaw virtual/x11 ) )
-               motif? (
-                       lesstif? ( x11-libs/lesstif )
-                       !lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
-               )
-       )
-       nls? ( sys-devel/gettext )
-       !nosendmail? ( virtual/mta )"
-
-DEPEND="${RDEPEND}
-       >=sys-devel/autoconf-2.58
-       X? ( || ( x11-misc/xbitmaps virtual/x11 ) )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-DFILE=emacs-${SLOT}.desktop
-
-src_unpack() {
-
-       unpack ${A}
-
-       cd ${S}
-       epatch "${FILESDIR}/emacs-21.3-xorg.patch"
-       epatch "${FILESDIR}/emacs-21.3-amd64.patch"
-       epatch "${FILESDIR}/emacs-21.3-hppa.patch"
-       epatch "${FILESDIR}/emacs-21.2-sh.patch"
-       epatch "${FILESDIR}/emacs-21.4-libungif-gif-gentoo.patch"
-
-       use ppc64 && epatch "${FILESDIR}/emacs-21.3-ppc64.patch"
-
-       epatch "${FILESDIR}/emacs-subdirs-el-gentoo.diff"
-
-       # This will need to be updated for X-Compilation
-       sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-                  ${S}/src/s/gnu-linux.h
-}
-
-src_compile() {
-       export SANDBOX_ON=0
-
-       # -fstack-protector gets internal compiler error at xterm.c (bug 33265)
-       filter-flags -fstack-protector
-
-       # emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002)
-       unset LDFLAGS
-
-       # ever since GCC 3.2
-       replace-flags -O[3-9] -O2
-
-       # this fixes bug 152006
-       use ppc64 && append-flags -mno-fp-in-toc -mno-sum-in-toc
-
-       # -march is known to cause signal 6 on some environment
-       filter-flags "-march=*"
-
-       export WANT_AUTOCONF=2.1
-       autoconf
-
-       local myconf
-       use nls || myconf="${myconf} --disable-nls"
-       if use X ; then
-               if use motif && use lesstif; then
-                       append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
-                       export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif"
-               fi
-               myconf="${myconf}
-                       --with-x
-                       --with-xpm
-                       --with-jpeg
-                       --with-tiff
-                       --with-gif
-                       --with-png"
-               if use Xaw3d ; then
-                       myconf="${myconf} --with-x-toolkit=athena"
-               elif use motif ; then
-                       myconf="${myconf} --with-x-toolkit=motif"
-               else
-                       # do not build emacs with any toolkit, bug 35300
-                       myconf="${myconf} --with-x-toolkit=no"
-               fi
-       else
-               myconf="${myconf} --without-x"
-       fi
-       econf ${myconf} || die
-       emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-       einstall || die
-       for i in ${D}/usr/bin/* ; do
-               mv ${i} ${i}.emacs-${SLOT} || die "mv ${i} failed"
-       done
-       mv ${D}/usr/bin/emacs{-${PV},}.emacs-${SLOT} || die "mv emacs failed"
-       dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT}
-
-       einfo "Fixing info documentation..."
-       mkdir ${T}/emacs-${SLOT}
-       mv ${D}/usr/share/info/dir ${T}
-       for i in ${D}/usr/share/info/*
-       do
-               mv ${i} ${T}/emacs-${SLOT}/${i##*/}.info
-       done
-       mv ${T}/emacs-${SLOT} ${D}/usr/share/info
-       mv ${T}/dir ${D}/usr/share/info/emacs-${SLOT}
-
-       if has_version 'app-text/aspell' ; then
-               # defaults to aspell if installed
-               elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
-       fi
-
-       newenvd ${FILESDIR}/60emacs-${SLOT}.envd 60emacs-${SLOT}
-
-       einfo "Fixing manpages..."
-       for m in ${D}/usr/share/man/man1/* ; do
-               mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv ${m} failed"
-       done
-
-       einfo "Fixing permissions..."
-       find ${D} -perm 664 |xargs chmod -f 644 2>/dev/null
-       find ${D} -type d |xargs chmod -f 755 2>/dev/null
-
-       keepdir /usr/share/emacs/${PV}/leim
-       keepdir /usr/share/emacs/site-lisp
-
-       dodoc BUGS ChangeLog README
-
-       insinto /usr/share/applications
-       doins ${FILESDIR}/${DFILE}
-}
-
-update-alternatives() {
-       # extract the suffix of the manpages to determine the correct compression program
-       local suffix=$(echo /usr/share/man/man1/emacs.emacs-*.1*|sed 's/.*\.1//')
-
-       # this creates symlinks for binaries and man pages, so the correct ones in a slotted
-       # environment can be accessed
-       for i in emacs emacsclient etags ctags b2m ebrowse \
-               rcs-checkin grep-changelog ; do
-               alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/${i}.emacs-*"
-       done
-
-       for j in emacs etags ctags gfdl
-       do
-               alternatives_auto_makesym "/usr/share/man/man1/$j.1${suffix}" "/usr/share/man/man1/$j.emacs-*"
-       done
-}
-
-pkg_postinst() {
-       update-alternatives
-       if use nosendmail; then
-               while read line; do einfo "${line}"; done<<'EOF'
-
-You disabled sendmail support for Emacs.  If you later install a MTA
-then you will need to recompile Emacs. See Bug #11104.
-
-EOF
-       fi
-       if use X; then
-               while read line; do einfo "${line}"; done<<'EOF'
-
-You need to install some fonts for Emacs.  Under monolithic
-XFree86/Xorg you typically had such fonts installed by default.         With
-modular Xorg, you will have to perform this step yourself.
-
-Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic
-Emacs requirements under X11.
-
-EOF
-       fi
-
-
-}
-
-pkg_postrm() {
-       update-alternatives
-}
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r6 b/app-editors/emacs/files/digest-emacs-21.4-r6
deleted file mode 100644 (file)
index 6898ecf..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 8f9d97cbd126121bd5d97e5e31168a87 emacs-21.4a.tar.gz 20403483
-RMD160 c312e739935b56d08783bbfe97992297a363cb8a emacs-21.4a.tar.gz 20403483
-SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 emacs-21.4a.tar.gz 20403483
-MD5 32938cb5a7505d995a1e835639d19707 leim-21.4.tar.gz 3291433
-RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca leim-21.4.tar.gz 3291433
-SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b leim-21.4.tar.gz 3291433