make subdirs patch obsolete by some changes in the ebuild and straighten behaviour...
authorChristian Faulhammer <fauli@gentoo.org>
Sun, 4 Mar 2007 12:07:03 +0000 (12:07 +0000)
committerChristian Faulhammer <fauli@gentoo.org>
Sun, 4 Mar 2007 12:07:03 +0000 (12:07 +0000)
Package-Manager: portage-2.1.2-r9

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

index e7ad80258052dea6e01659cdbda4cae97c614e01..330287295f1251a2027788510bf6f402476e2ded 100644 (file)
@@ -1,6 +1,14 @@
 # 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.88 2007/03/02 20:42:02 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.89 2007/03/04 12:07:03 opfer Exp $
+
+*emacs-cvs-22.0.9999-r5 (04 Mar 2007)
+*emacs-cvs-22.0.95-r1 (04 Mar 2007)
+
+  04 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  +emacs-cvs-22.0.95-r1.ebuild, +emacs-cvs-22.0.9999-r5.ebuild:
+  make subdirs patch obsolete by some changes in the ebuild and straighten
+  behaviour for USE=gzip-el
 
   02 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   emacs-cvs-22.0.95.ebuild, emacs-cvs-22.0.9999-r4.ebuild,
index f49c8b8e9f4b770475029ce41d4a1e02e3f9862c..e645e09ee5491d576fe23299edd634faa42d010f 100644 (file)
@@ -38,6 +38,10 @@ 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.95.tar.gz 37754533 RMD160 e5aa6001a255538dbc8fb2d548d1b67979f94033 SHA1 90cd5a6078d26b3bd0eb4f2da0561df759bc880f SHA256 5e25e8f221fe18f07feadd831bb482e6cde53c9470713c63f059ff2d3e715b1d
+EBUILD emacs-cvs-22.0.95-r1.ebuild 6897 RMD160 41060695a5c2dfc5024b8666e0ad7e4ca61927dd SHA1 122497b4a8c55194f77c3b141910e79a8a23f6b6 SHA256 e772c2c7cf1d97e436d8065620e59157d3cc18def007e9c476f46a7e623bc8a3
+MD5 f55a88210ad766d4021ceb6a25ae58d3 emacs-cvs-22.0.95-r1.ebuild 6897
+RMD160 41060695a5c2dfc5024b8666e0ad7e4ca61927dd emacs-cvs-22.0.95-r1.ebuild 6897
+SHA256 e772c2c7cf1d97e436d8065620e59157d3cc18def007e9c476f46a7e623bc8a3 emacs-cvs-22.0.95-r1.ebuild 6897
 EBUILD emacs-cvs-22.0.95.ebuild 6834 RMD160 d0be18cfb8fde38e043c5ac980ab8fc867b70ce5 SHA1 9ea38ddecfb850d4a2d8eb6fe583aca559053018 SHA256 4a901c5954d63a3553357694975a152d0d8ae997a440c53ec1f6346832e8d94d
 MD5 3c4fbd25803d8515a00de621b0e8ee09 emacs-cvs-22.0.95.ebuild 6834
 RMD160 d0be18cfb8fde38e043c5ac980ab8fc867b70ce5 emacs-cvs-22.0.95.ebuild 6834
@@ -46,14 +50,18 @@ EBUILD emacs-cvs-22.0.9999-r4.ebuild 6990 RMD160 00f4bacae7087eeba414444e093f0ed
 MD5 31e8fd356d55afe1eaeb9995f9d5449d emacs-cvs-22.0.9999-r4.ebuild 6990
 RMD160 00f4bacae7087eeba414444e093f0edf2b8e4d18 emacs-cvs-22.0.9999-r4.ebuild 6990
 SHA256 275652fd18aeeed0ed8d9ba13c99f486f0b9e16eff5190bffc0600f603cf9bfa emacs-cvs-22.0.9999-r4.ebuild 6990
+EBUILD emacs-cvs-22.0.9999-r5.ebuild 7050 RMD160 a0a84069d41b03324b428eda510d49da5caec278 SHA1 b1cf63c3ed992003eb84cdf412a47670913bf0b0 SHA256 0013313ffe85472ad9e56372f0fde6c278c54f8793c8049faa5581497f788cb9
+MD5 c68df07473f348d6d589fbdb6d3d4463 emacs-cvs-22.0.9999-r5.ebuild 7050
+RMD160 a0a84069d41b03324b428eda510d49da5caec278 emacs-cvs-22.0.9999-r5.ebuild 7050
+SHA256 0013313ffe85472ad9e56372f0fde6c278c54f8793c8049faa5581497f788cb9 emacs-cvs-22.0.9999-r5.ebuild 7050
 EBUILD emacs-cvs-23.0.0-r1.ebuild 5881 RMD160 df6922c877a1d7ba6771da3bd0a2cdd9f55d8aa4 SHA1 60125d56df9d513f6ac96912300e6213b4e2e2d7 SHA256 90371536428f8729321eb096dc4889be5ee9fb55a30bf29ea3f9ddc9c113787e
 MD5 dd043fac2310b7995525245ad0213a21 emacs-cvs-23.0.0-r1.ebuild 5881
 RMD160 df6922c877a1d7ba6771da3bd0a2cdd9f55d8aa4 emacs-cvs-23.0.0-r1.ebuild 5881
 SHA256 90371536428f8729321eb096dc4889be5ee9fb55a30bf29ea3f9ddc9c113787e emacs-cvs-23.0.0-r1.ebuild 5881
-MISC ChangeLog 16830 RMD160 1d6bcc5ad5ca79da4f24010a65287fa6ab2a2087 SHA1 6a0fa6d639decdc821135e7804cb6a9c28b670bc SHA256 ab3f890d7785ed422ad96fd525f95c0b20d0c059be34c9288004e7de794e6321
-MD5 f4dea7752909fc883415c4c687650f41 ChangeLog 16830
-RMD160 1d6bcc5ad5ca79da4f24010a65287fa6ab2a2087 ChangeLog 16830
-SHA256 ab3f890d7785ed422ad96fd525f95c0b20d0c059be34c9288004e7de794e6321 ChangeLog 16830
+MISC ChangeLog 17128 RMD160 abccd4c244c1bce9eb39bded2e06fd98e31a5002 SHA1 1a94a0732d29257d9e894c42984e6eca44b875e0 SHA256 f8ce80868be374781c71a5e8f379b627e95e016083735975b270a4913c09661c
+MD5 dcd14d57343b06b5438beba0bec7cd91 ChangeLog 17128
+RMD160 abccd4c244c1bce9eb39bded2e06fd98e31a5002 ChangeLog 17128
+SHA256 f8ce80868be374781c71a5e8f379b627e95e016083735975b270a4913c09661c ChangeLog 17128
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -61,16 +69,22 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata
 MD5 d6f599895923b8ba7322cd3778f8cbd6 files/digest-emacs-cvs-22.0.95 247
 RMD160 d862c5cc0a3c1e37d1d191a39b8b27fee97feb83 files/digest-emacs-cvs-22.0.95 247
 SHA256 a2976d3a758f1cd9304edc61dcbec515ccc29f2daafd8918926b2af9ba407ed1 files/digest-emacs-cvs-22.0.95 247
+MD5 d6f599895923b8ba7322cd3778f8cbd6 files/digest-emacs-cvs-22.0.95-r1 247
+RMD160 d862c5cc0a3c1e37d1d191a39b8b27fee97feb83 files/digest-emacs-cvs-22.0.95-r1 247
+SHA256 a2976d3a758f1cd9304edc61dcbec515ccc29f2daafd8918926b2af9ba407ed1 files/digest-emacs-cvs-22.0.95-r1 247
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r4 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r4 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r5 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r5 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r5 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)
 
-iD8DBQFF6IvwNQqtfCuFneMRAs/5AJ90dQDoDg1WHLYF8RVbP0HzKd53pQCfSJPx
-0YmZI5+JUs5XbYWthrImpNA=
-=Y/c5
+iD8DBQFF6rY0NQqtfCuFneMRAjLBAJ9fFO7liCB/ya0hTNU23t7K93JKAwCeOE5B
+4lvRO+mV2X4BvkT8jMlhWuk=
+=fwC0
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild
new file mode 100644 (file)
index 0000000..a06c0e1
--- /dev/null
@@ -0,0 +1,216 @@
+# 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.95-r1.ebuild,v 1.1 2007/03/04 12:07:03 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 )
+       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.95"
+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
+
+       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
+
+       # 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{/${PV},}/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 "${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-r5.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild
new file mode 100644 (file)
index 0000000..68702f0
--- /dev/null
@@ -0,0 +1,223 @@
+# 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-r5.ebuild,v 1.1 2007/03/04 12:07:03 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 )
+       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.95"
+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
+
+       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
+
+       # 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
+
+       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() {
+       test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
+               cp ${ROOT}/usr/share/emacs{/${PV},}/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 "${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.95-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.95-r1
new file mode 100644 (file)
index 0000000..9f2aeea
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 07ae2a749fec6decbdf65ae3673d5546 emacs-22.0.95.tar.gz 37754533
+RMD160 e5aa6001a255538dbc8fb2d548d1b67979f94033 emacs-22.0.95.tar.gz 37754533
+SHA256 5e25e8f221fe18f07feadd831bb482e6cde53c9470713c63f059ff2d3e715b1d emacs-22.0.95.tar.gz 37754533
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r5 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r5
new file mode 100644 (file)
index 0000000..e69de29