bumps to newer upstream CVS tags
authorChristian Faulhammer <fauli@gentoo.org>
Wed, 4 Apr 2007 06:43:24 +0000 (06:43 +0000)
committerChristian Faulhammer <fauli@gentoo.org>
Wed, 4 Apr 2007 06:43:24 +0000 (06:43 +0000)
Package-Manager: portage-2.1.2.2

app-editors/emacs-cvs/ChangeLog
app-editors/emacs-cvs/Manifest
app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild [new file with mode: 0644]
app-editors/emacs-cvs/emacs-cvs-22.0.9999-r7.ebuild [new file with mode: 0644]
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.97 [new file with mode: 0644]
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r7 [new file with mode: 0644]

index 9e6755a47081f6ad945d8de62a500e733277bac4..e61db25203ec4a614e109c17e2c258c7603d957e 100644 (file)
@@ -1,6 +1,13 @@
 # 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.96 2007/03/26 07:14:53 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.97 2007/04/04 06:43:24 opfer Exp $
+
+*emacs-cvs-22.0.9999-r7 (04 Apr 2007)
+*emacs-cvs-22.0.97 (04 Apr 2007)
+
+  04 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
+  +emacs-cvs-22.0.97.ebuild, +emacs-cvs-22.0.9999-r7.ebuild:
+  bumps to newer upstream CVS tags
 
   26 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   -emacs-cvs-22.0.95-r1.ebuild, -emacs-cvs-22.0.9999-r5.ebuild:
index 8b8544261b6f6363c608ba9165cc61361985773a..596bb24159a1fa9182cc0d6f954f908fe2929680 100644 (file)
@@ -38,22 +38,31 @@ MD5 97a1860f95596f13a074a96456ffeac4 files/emacs.desktop.in 236
 RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 files/emacs.desktop.in 236
 SHA256 8bbfa1b6bb241fd3653b5b1c25ef1ecd298c63d7e0fdc87baab8b274eb627342 files/emacs.desktop.in 236
 DIST emacs-22.0.96.tar.gz 37846686 RMD160 d980f7f8ec6c646a9b741718284b081987f9d73c SHA1 e2942bdbf693a0814fcc3b34d5ae55765d5d4ad8 SHA256 a9fa904e00e09d8b68e701edda208bd274053d26d0b50d97d6c977084e5c307d
+DIST emacs-22.0.97.tar.gz 37900456 RMD160 3bd5abe6fdf4e1574b6fda4b2e85cfbf171fbab4 SHA1 60a50581ac93fc850225a929cc0c04dec0e51f36 SHA256 1b2cd679a1cbb1b6971291beac5d68ae55be538691c1fc8164f936899b8a913b
 EBUILD emacs-cvs-22.0.96.ebuild 6755 RMD160 1e85ee6f7fd6deac5fe854551b955593e2f188cb SHA1 088f137516311fc82a58dbfe46556f19fcedfc44 SHA256 ce1a8a369cb7437b4f1ed7b78a000a15ce0362bffd6db47e02a2a6395615dd07
 MD5 5cc7d82ae0b3668e31cafdfa3ad48b56 emacs-cvs-22.0.96.ebuild 6755
 RMD160 1e85ee6f7fd6deac5fe854551b955593e2f188cb emacs-cvs-22.0.96.ebuild 6755
 SHA256 ce1a8a369cb7437b4f1ed7b78a000a15ce0362bffd6db47e02a2a6395615dd07 emacs-cvs-22.0.96.ebuild 6755
+EBUILD emacs-cvs-22.0.97.ebuild 6755 RMD160 3304ed8447fc6c77e8a5622d726bcb160a1581d7 SHA1 e6cd068d9de405e796fc433f65b5e949da0ef469 SHA256 ae18fed7a831275955095c62755d73d4332d67144f6b25d19c37ff266bf73bdb
+MD5 293ab565aa8b7665016b9a375eefee35 emacs-cvs-22.0.97.ebuild 6755
+RMD160 3304ed8447fc6c77e8a5622d726bcb160a1581d7 emacs-cvs-22.0.97.ebuild 6755
+SHA256 ae18fed7a831275955095c62755d73d4332d67144f6b25d19c37ff266bf73bdb emacs-cvs-22.0.97.ebuild 6755
 EBUILD emacs-cvs-22.0.9999-r6.ebuild 6815 RMD160 5adb594c05c5502371ff159d1370927092964177 SHA1 440f5fc27c0712ef3caf82c4b477edcae23b2663 SHA256 96f0b4dc09b45c4c87c8fab177ad987758798c90de92b5ffc4d4cdeeb60b8203
 MD5 9f3ad1fa8004b91a0f73d4c29eb3f9c0 emacs-cvs-22.0.9999-r6.ebuild 6815
 RMD160 5adb594c05c5502371ff159d1370927092964177 emacs-cvs-22.0.9999-r6.ebuild 6815
 SHA256 96f0b4dc09b45c4c87c8fab177ad987758798c90de92b5ffc4d4cdeeb60b8203 emacs-cvs-22.0.9999-r6.ebuild 6815
+EBUILD emacs-cvs-22.0.9999-r7.ebuild 6815 RMD160 fb5bbd13afdaa034b6578e559818506482da805c SHA1 4a00455faa49105fcb53e31c394fc06b08f4e0b9 SHA256 8a877e66734e3f0eae2b52a8dedc7dbe3a8eeeccf698e3ce160f811f79d530d9
+MD5 76600f09d52258114f7a01355aca305f emacs-cvs-22.0.9999-r7.ebuild 6815
+RMD160 fb5bbd13afdaa034b6578e559818506482da805c emacs-cvs-22.0.9999-r7.ebuild 6815
+SHA256 8a877e66734e3f0eae2b52a8dedc7dbe3a8eeeccf698e3ce160f811f79d530d9 emacs-cvs-22.0.9999-r7.ebuild 6815
 EBUILD emacs-cvs-23.0.0-r1.ebuild 5771 RMD160 7bdd88696d8dd6acff620f08d13054a000d6818f SHA1 d1a8e32ddf54d005149c4e49c1ad2da457511265 SHA256 8a4ae4af7b36a80b1a219755f43e312cfac08cef8a8b9eafc22619e16983bf78
 MD5 34741c31c1ea6765df206a263b34bfd8 emacs-cvs-23.0.0-r1.ebuild 5771
 RMD160 7bdd88696d8dd6acff620f08d13054a000d6818f emacs-cvs-23.0.0-r1.ebuild 5771
 SHA256 8a4ae4af7b36a80b1a219755f43e312cfac08cef8a8b9eafc22619e16983bf78 emacs-cvs-23.0.0-r1.ebuild 5771
-MISC ChangeLog 18696 RMD160 a35e41e5efdc92df1d59ec0d0907d9bbfdbf9f58 SHA1 a9c046b02282d2a213844264ceadd83828ba5ba6 SHA256 620b0a5af55700c487209a38937a85e8df15eb611727a4c299852234b66fff35
-MD5 5d90315bc85f90e88559d3557acdcfe7 ChangeLog 18696
-RMD160 a35e41e5efdc92df1d59ec0d0907d9bbfdbf9f58 ChangeLog 18696
-SHA256 620b0a5af55700c487209a38937a85e8df15eb611727a4c299852234b66fff35 ChangeLog 18696
+MISC ChangeLog 18920 RMD160 c70707571f8f2f52fcb1c6cd813fe50ae52a7c29 SHA1 bd41d2be5c7ed7b20e3969851fb8565f3bd0b8b4 SHA256 2bbea48f97ba684748e5ca474f5a4ce112364b9972cca5c10e10eef0b7b3d7fd
+MD5 b66b441e58fccbada5236dd32ba352d2 ChangeLog 18920
+RMD160 c70707571f8f2f52fcb1c6cd813fe50ae52a7c29 ChangeLog 18920
+SHA256 2bbea48f97ba684748e5ca474f5a4ce112364b9972cca5c10e10eef0b7b3d7fd ChangeLog 18920
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -61,16 +70,22 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata
 MD5 01d52a9a1e26b99e5687f6898db299ed files/digest-emacs-cvs-22.0.96 247
 RMD160 3a36a623e9a4eeebc76ce3315de31dc60f49457e files/digest-emacs-cvs-22.0.96 247
 SHA256 1319658529d77893d7ccf241ca85d5e8c0805818f9ec7a8f92b99fff821c92c1 files/digest-emacs-cvs-22.0.96 247
+MD5 a45c1cc2431a74255c981575cf033f94 files/digest-emacs-cvs-22.0.97 247
+RMD160 1a034da94a1d0ea15deae209e53da79099b0ed97 files/digest-emacs-cvs-22.0.97 247
+SHA256 2cf2e7a1662db28db007818b2a58d1a4156216dcfdc2f8cee0dbba49517476a3 files/digest-emacs-cvs-22.0.97 247
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r6 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r6 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r6 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r7 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r7 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r7 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r1 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r1 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r1 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGB3L5NQqtfCuFneMRAo3IAJ91ATyMUNoXdoW0p0niOYgGUXuT9gCZASy5
-HlTjfc/BuxomQ4C8BKvwK1Q=
-=4LcY
+iD8DBQFGE0kaNQqtfCuFneMRAgJ4AJ9Sk+dONzrHT6HjJdoXgIiaBqYyhACeMxwh
+B1+5QFw0GtdCLDreM10nV70=
+=2Z6W
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild
new file mode 100644 (file)
index 0000000..dd76045
--- /dev/null
@@ -0,0 +1,212 @@
+# 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.97.ebuild,v 1.1 2007/04/04 06:43:24 opfer Exp $
+
+WANT_AUTOCONF="2.61"
+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 )
+       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.97"
+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"
+       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
+
+       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
+
+       # avoid collision between slots
+       rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
+
+       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
+
+       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() {
+       test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
+               cp ${ROOT}/usr/share/emacs{/${SLOT},}/site-lisp/subdirs.el
+
+       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 "${ROOT}/usr/share/info/emacs-${SLOT}/dir.*" 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-r7.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r7.ebuild
new file mode 100644 (file)
index 0000000..912036c
--- /dev/null
@@ -0,0 +1,217 @@
+# 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-r7.ebuild,v 1.1 2007/04/04 06:43:24 opfer Exp $
+
+ECVS_AUTH="pserver"
+ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
+ECVS_MODULE="emacs"
+ECVS_BRANCH="HEAD"
+
+WANT_AUTOCONF="2.61"
+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 )
+       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.97"
+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"
+       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
+
+       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
+
+       # avoid collision between slots
+       rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
+
+       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
+
+       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() {
+       test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
+               cp ${ROOT}/usr/share/emacs{/${SLOT},}/site-lisp/subdirs.el
+
+       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 "${ROOT}/usr/share/info/emacs-${SLOT}/dir.*" 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.97 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.97
new file mode 100644 (file)
index 0000000..d0683d4
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 bfcda2615b9761d1dc546e1c907c584a emacs-22.0.97.tar.gz 37900456
+RMD160 3bd5abe6fdf4e1574b6fda4b2e85cfbf171fbab4 emacs-22.0.97.tar.gz 37900456
+SHA256 1b2cd679a1cbb1b6971291beac5d68ae55be538691c1fc8164f936899b8a913b emacs-22.0.97.tar.gz 37900456
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r7 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r7
new file mode 100644 (file)
index 0000000..e69de29