From 63554e41c177775897d2611153d6d8251216713b Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Tue, 20 Mar 2007 06:32:39 +0000 Subject: [PATCH] version bump for 22.0.96 pretest Package-Manager: portage-2.1.2.2 --- app-editors/emacs-cvs/ChangeLog | 9 +- app-editors/emacs-cvs/Manifest | 33 ++- .../emacs-cvs/emacs-cvs-22.0.96.ebuild | 212 +++++++++++++++++ .../emacs-cvs/emacs-cvs-22.0.9999-r6.ebuild | 217 ++++++++++++++++++ .../emacs-cvs/files/digest-emacs-cvs-22.0.96 | 3 + .../files/digest-emacs-cvs-22.0.9999-r6 | 0 6 files changed, 469 insertions(+), 5 deletions(-) create mode 100644 app-editors/emacs-cvs/emacs-cvs-22.0.96.ebuild create mode 100644 app-editors/emacs-cvs/emacs-cvs-22.0.9999-r6.ebuild create mode 100644 app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.96 create mode 100644 app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r6 diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index b0c7a739c567..dca5a67ad85b 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -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.94 2007/03/18 15:31:37 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.95 2007/03/20 06:32:39 opfer Exp $ + +*emacs-cvs-22.0.9999-r6 (20 Mar 2007) +*emacs-cvs-22.0.96 (20 Mar 2007) + + 20 Mar 2007; Christian Faulhammer + +emacs-cvs-22.0.96.ebuild, +emacs-cvs-22.0.9999-r6.ebuild: + version bump for 22.0.96 pretest 18 Mar 2007; Fabian Groffen -files/emacs-cvs-21.3.50-nofink.diff, diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest index 7c0498c6af8d..6c1aaa6b5556 100644 --- a/app-editors/emacs-cvs/Manifest +++ b/app-editors/emacs-cvs/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 50emacs-23.0.0.envd 38 RMD160 78ada93c0a6e3019d225eaecac89a5554d5344b9 SHA1 8451fb9088e819c0c996df5abd692fd91366bd68 SHA256 6179b1cbc85458d3cb49605ec095aa9ddfedcbd3b68dcbad01679717d5b86b1a MD5 0b379e4c82898cbd3b9929d752b7bfab files/50emacs-23.0.0.envd 38 RMD160 78ada93c0a6e3019d225eaecac89a5554d5344b9 files/50emacs-23.0.0.envd 38 @@ -35,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.95.tar.gz 37754533 RMD160 e5aa6001a255538dbc8fb2d548d1b67979f94033 SHA1 90cd5a6078d26b3bd0eb4f2da0561df759bc880f SHA256 5e25e8f221fe18f07feadd831bb482e6cde53c9470713c63f059ff2d3e715b1d +DIST emacs-22.0.96.tar.gz 37846686 RMD160 d980f7f8ec6c646a9b741718284b081987f9d73c SHA1 e2942bdbf693a0814fcc3b34d5ae55765d5d4ad8 SHA256 a9fa904e00e09d8b68e701edda208bd274053d26d0b50d97d6c977084e5c307d EBUILD emacs-cvs-22.0.95-r1.ebuild 6646 RMD160 697d6d627a63b30035a038ca152c75d2bb112501 SHA1 6d850116d04fe4bca37a1587607d2e72c030851d SHA256 b79786aa5bd7bdb5a7aefe661e6306d5fb438e5c81eb03d4e257fdb1bc0e4321 MD5 929746de96c4d661d535e0140ff7d324 emacs-cvs-22.0.95-r1.ebuild 6646 RMD160 697d6d627a63b30035a038ca152c75d2bb112501 emacs-cvs-22.0.95-r1.ebuild 6646 SHA256 b79786aa5bd7bdb5a7aefe661e6306d5fb438e5c81eb03d4e257fdb1bc0e4321 emacs-cvs-22.0.95-r1.ebuild 6646 +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.9999-r5.ebuild 6703 RMD160 ab79349ce31820c581f441a28f5c804c19a9d5e7 SHA1 e0329d4c0e5a832017010b54cdb54e594f5da628 SHA256 99b8f86bd83a042c1d957ca692ef70324a378aa348d14c4e30a9d57d5980f982 MD5 056489a8d8c2b8ab768d99f2e395f54f emacs-cvs-22.0.9999-r5.ebuild 6703 RMD160 ab79349ce31820c581f441a28f5c804c19a9d5e7 emacs-cvs-22.0.9999-r5.ebuild 6703 SHA256 99b8f86bd83a042c1d957ca692ef70324a378aa348d14c4e30a9d57d5980f982 emacs-cvs-22.0.9999-r5.ebuild 6703 +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-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 18343 RMD160 6b04018b9941baee989e5f9c05f2e6a837ba03dc SHA1 d7287e38df6eb548d15a1b6ceeea63c7fa470161 SHA256 d83f1d04095f466a0ae892d1d701de1aa44ca28879cea8dacb86ab60217a1065 -MD5 3d0089dc270bef0ea417e366704708de ChangeLog 18343 -RMD160 6b04018b9941baee989e5f9c05f2e6a837ba03dc ChangeLog 18343 -SHA256 d83f1d04095f466a0ae892d1d701de1aa44ca28879cea8dacb86ab60217a1065 ChangeLog 18343 +MISC ChangeLog 18565 RMD160 62f10df53df9d983a5dbabd0ef41cd1f6c4370bf SHA1 92fed4b6d2901ea49942b7771cf955dabcd61ee4 SHA256 06d9514eb4662f00815d50bd9c22a99b2a8586b1120f73a11cf33e783d2daeb0 +MD5 642b9fccb7aa8608f42baf0b1560a030 ChangeLog 18565 +RMD160 62f10df53df9d983a5dbabd0ef41cd1f6c4370bf ChangeLog 18565 +SHA256 06d9514eb4662f00815d50bd9c22a99b2a8586b1120f73a11cf33e783d2daeb0 ChangeLog 18565 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 @@ -58,9 +70,22 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata 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 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 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-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-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) + +iD8DBQFF/3/RNQqtfCuFneMRAjj3AJ9xFymLwwXQJD0KkbvGKN97DJc2lwCcDp49 +MKTJ3B9znPpoLh6PBVZo1pI= +=WjX6 +-----END PGP SIGNATURE----- diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.96.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.96.ebuild new file mode 100644 index 000000000000..8516792dc75d --- /dev/null +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.96.ebuild @@ -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.96.ebuild,v 1.1 2007/03/20 06:32:39 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.96" +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} <00emacs-cvs-${SLOT}-gentoo.el < /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-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r6.ebuild new file mode 100644 index 000000000000..714ed414030e --- /dev/null +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r6.ebuild @@ -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-r6.ebuild,v 1.1 2007/03/20 06:32:39 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.96" +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} <00emacs-cvs-${SLOT}-gentoo.el < /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.96 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.96 new file mode 100644 index 000000000000..4797c8cee129 --- /dev/null +++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.96 @@ -0,0 +1,3 @@ +MD5 09fabcb5becb050acf1c88639330dac6 emacs-22.0.96.tar.gz 37846686 +RMD160 d980f7f8ec6c646a9b741718284b081987f9d73c emacs-22.0.96.tar.gz 37846686 +SHA256 a9fa904e00e09d8b68e701edda208bd274053d26d0b50d97d6c977084e5c307d emacs-22.0.96.tar.gz 37846686 diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r6 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r6 new file mode 100644 index 000000000000..e69de29bb2d1 -- 2.26.2