From b85d59a521454aa52ccdd6cdbafabc114ea3f6cc Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Mon, 26 Feb 2007 07:33:28 +0000 Subject: [PATCH] if USE=gzip-el is not set, Emacs' build system will not compress el files even if the gzip binary is found; 22.0.94: A new pretest version has been released; 22.0.9999-r3: Fitted SLOT to the new pretest version Package-Manager: portage-2.1.2-r9 --- app-editors/emacs-cvs/ChangeLog | 11 +- app-editors/emacs-cvs/Manifest | 29 ++- .../emacs-cvs/emacs-cvs-22.0.94.ebuild | 214 +++++++++++++++++ .../emacs-cvs/emacs-cvs-22.0.9999-r3.ebuild | 221 ++++++++++++++++++ .../emacs-cvs/files/digest-emacs-cvs-22.0.94 | 3 + .../files/digest-emacs-cvs-22.0.9999-r3 | 0 6 files changed, 470 insertions(+), 8 deletions(-) create mode 100644 app-editors/emacs-cvs/emacs-cvs-22.0.94.ebuild create mode 100644 app-editors/emacs-cvs/emacs-cvs-22.0.9999-r3.ebuild create mode 100644 app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.94 create mode 100644 app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r3 diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index 2c131bd90de6..8d8534bc8cbc 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,15 @@ # 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.82 2007/02/20 22:21:59 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.83 2007/02/26 07:33:28 opfer Exp $ + +*emacs-cvs-22.0.9999-r3 (26 Feb 2007) +*emacs-cvs-22.0.94 (26 Feb 2007) + + 26 Feb 2007; Christian Faulhammer + +emacs-cvs-22.0.94.ebuild, +emacs-cvs-22.0.9999-r3.ebuild: + if USE=gzip-el is not set, Emacs' build system will not compress el files + even if the gzip binary is found; 22.0.94: A new pretest version has been + released; 22.0.9999-r3: Fitted SLOT to the new pretest version 20 Feb 2007; Christian Faulhammer +files/emacs-cvs-blessmail-build.patch, emacs-cvs-22.0.93-r2.ebuild: diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest index a40a863dd8b5..106b6523eb0d 100644 --- a/app-editors/emacs-cvs/Manifest +++ b/app-editors/emacs-cvs/Manifest @@ -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.93.tar.gz 37118034 RMD160 c70a745662495c68470f2b483f61d68d09e8ed73 SHA1 1c226f1c03e33fef66b759e6afd6eb580adc948b SHA256 44dd612b521a47d923c759525b1134bbc571350cae80bdc543c31f30acc7739e +DIST emacs-22.0.94.tar.gz 37596398 RMD160 30e5930219a9d7391110cab73046ac1da49c94fc SHA1 aad7c8ee33a8f46297fa48050c02e87f2b638e33 SHA256 0d76c94dd90510c047a54831115e499d6b628a8ec7119fa1876fb556667e24c6 EBUILD emacs-cvs-22.0.93-r2.ebuild 6745 RMD160 f51b789971cf92ab87a081ade5db2c6c0b4348e4 SHA1 2120d4babd1fee60d3f0a3ef4ab5bd1740b74ff4 SHA256 e129655a9b8cbb7395c374c25f341eb92dc09aea8c77c86d3aa697dd1fc95e0b MD5 3be0eac2733216ac9543ba014d250b4b emacs-cvs-22.0.93-r2.ebuild 6745 RMD160 f51b789971cf92ab87a081ade5db2c6c0b4348e4 emacs-cvs-22.0.93-r2.ebuild 6745 SHA256 e129655a9b8cbb7395c374c25f341eb92dc09aea8c77c86d3aa697dd1fc95e0b emacs-cvs-22.0.93-r2.ebuild 6745 +EBUILD emacs-cvs-22.0.94.ebuild 6858 RMD160 9991935d0e86c31eb2506b86ca4d26faf0a7be63 SHA1 91f78d070a7bade098c21b1a0bb8cde955b7bb47 SHA256 13aed72ebb5a01540d2383dc267478d8d9d422f68295e19494443afa0485d264 +MD5 1a0e916e6a59083fe2ae66af2638b800 emacs-cvs-22.0.94.ebuild 6858 +RMD160 9991935d0e86c31eb2506b86ca4d26faf0a7be63 emacs-cvs-22.0.94.ebuild 6858 +SHA256 13aed72ebb5a01540d2383dc267478d8d9d422f68295e19494443afa0485d264 emacs-cvs-22.0.94.ebuild 6858 EBUILD emacs-cvs-22.0.9999-r2.ebuild 6739 RMD160 e825492844163a33a22efec6072a16dc3dd26659 SHA1 3e0e611d6eac28c3f48b87ec0bf3abd2ba3aee3e SHA256 52ac5df7b6b0b4a710a1c4c05356d15c216486e6cfd95f6773c44307a6cf32ce MD5 2da62a2d364735a4a47314f14d91ece3 emacs-cvs-22.0.9999-r2.ebuild 6739 RMD160 e825492844163a33a22efec6072a16dc3dd26659 emacs-cvs-22.0.9999-r2.ebuild 6739 SHA256 52ac5df7b6b0b4a710a1c4c05356d15c216486e6cfd95f6773c44307a6cf32ce emacs-cvs-22.0.9999-r2.ebuild 6739 +EBUILD emacs-cvs-22.0.9999-r3.ebuild 7014 RMD160 856d3755ff238524faddd754470fb19bce2f73c4 SHA1 d85f95de747c6b9248ea4c2e072a4685e666aa24 SHA256 0f4fa2b1c5946fcf70a21c2aa4c7cb29a15b224641f5f2f2bdc41214ee34a3b5 +MD5 81e915618db4b74f386e96f3913199ea emacs-cvs-22.0.9999-r3.ebuild 7014 +RMD160 856d3755ff238524faddd754470fb19bce2f73c4 emacs-cvs-22.0.9999-r3.ebuild 7014 +SHA256 0f4fa2b1c5946fcf70a21c2aa4c7cb29a15b224641f5f2f2bdc41214ee34a3b5 emacs-cvs-22.0.9999-r3.ebuild 7014 EBUILD emacs-cvs-23.0.0-r1.ebuild 5904 RMD160 2bb97d0bb0fbb4e426297d58b3a97402e21f4764 SHA1 b816af746a3646a3ff5767db41f85cfc4a4b0117 SHA256 9a20533595e3949519d4e75e3857c1c729dfaf124e891253e63631ff962a8b9b MD5 61bac54173aa6dc34e29d7f75935ff36 emacs-cvs-23.0.0-r1.ebuild 5904 RMD160 2bb97d0bb0fbb4e426297d58b3a97402e21f4764 emacs-cvs-23.0.0-r1.ebuild 5904 SHA256 9a20533595e3949519d4e75e3857c1c729dfaf124e891253e63631ff962a8b9b emacs-cvs-23.0.0-r1.ebuild 5904 -MISC ChangeLog 15586 RMD160 584214849e9dd19d36b8b56356cf5cdc6f300762 SHA1 3326571dc60a14108f105f626129cfa5649143d2 SHA256 7cfc64f225c80dc424d685ff1f4c992898c61f6141b90ee47685e57f7b877657 -MD5 aaa67f4b33b61445b9dfe8d80d7e9774 ChangeLog 15586 -RMD160 584214849e9dd19d36b8b56356cf5cdc6f300762 ChangeLog 15586 -SHA256 7cfc64f225c80dc424d685ff1f4c992898c61f6141b90ee47685e57f7b877657 ChangeLog 15586 +MISC ChangeLog 15992 RMD160 1508b90781844f94a9fa6f3f7f9169e4b7d5f02b SHA1 fa040e32a49cb16f63a44c4c52ad0dbd6703006b SHA256 ae366a96699f9ca4539698da1410c4f98481ab0e6b062256d6581a4c169b6470 +MD5 fde69b09d80c7b0b60ab343f1bda4ab9 ChangeLog 15992 +RMD160 1508b90781844f94a9fa6f3f7f9169e4b7d5f02b ChangeLog 15992 +SHA256 ae366a96699f9ca4539698da1410c4f98481ab0e6b062256d6581a4c169b6470 ChangeLog 15992 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 6be53866d89e1729a1b8e95197a92e12 files/digest-emacs-cvs-22.0.93-r2 247 RMD160 950a3ffa592585b775efb646394050c72c7020a7 files/digest-emacs-cvs-22.0.93-r2 247 SHA256 96f31c2909fddc7c78c9ab53a2d31af907624424c22698aee57a8c160c9c93fa files/digest-emacs-cvs-22.0.93-r2 247 +MD5 34b424a87f91dcf8730242f4d91851da files/digest-emacs-cvs-22.0.94 247 +RMD160 462b502fac8d318d75e8374f32418257a308ee5f files/digest-emacs-cvs-22.0.94 247 +SHA256 044b508912544a633cf90752e447bd6719a5f9da3e6aa69cf6400a7d22daa70f files/digest-emacs-cvs-22.0.94 247 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r2 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r2 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r2 0 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r3 0 +RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r3 0 +SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r3 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) -iD8DBQFF23RbNQqtfCuFneMRAmt9AJ97+NihC+avyww50RPNH8ZdCUiYTQCfb8+H -89S09JxHNJV0Bo6ur3etxpQ= -=Z0ws +iD8DBQFF4o0gNQqtfCuFneMRAuR/AJ9vDUrVSvNdemULd1/tS8KsKw9tWwCghre2 +LirGhE2cY+pQFIgegcfrIuQ= +=locT -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.94.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.94.ebuild new file mode 100644 index 000000000000..da3863e27fc3 --- /dev/null +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.94.ebuild @@ -0,0 +1,214 @@ +# 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.1 2007/02/26 07:33:28 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.93" +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} <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-r3.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r3.ebuild new file mode 100644 index 000000000000..ab2858f2b9f5 --- /dev/null +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r3.ebuild @@ -0,0 +1,221 @@ +# 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.1 2007/02/26 07:33:28 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} <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.94 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.94 new file mode 100644 index 000000000000..d98e5899fe6e --- /dev/null +++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.94 @@ -0,0 +1,3 @@ +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 new file mode 100644 index 000000000000..e69de29bb2d1 -- 2.26.2