From 5cfad6eb58073858de49637098bf9f6d82b17c93 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Fri, 2 Feb 2007 14:38:03 +0000 Subject: [PATCH] create symlinks for man pages, as reported by Ulrich Mueller ; remove some tabs in IUSE; correct (hopefully) .desktop entry Package-Manager: portage-2.1.1-r2 --- app-editors/emacs-cvs/ChangeLog | 12 +- app-editors/emacs-cvs/Manifest | 28 ++- .../emacs-cvs/emacs-cvs-22.0.93-r2.ebuild | 205 +++++++++++++++++ .../emacs-cvs/emacs-cvs-22.0.9999-r2.ebuild | 210 ++++++++++++++++++ .../files/digest-emacs-cvs-22.0.93-r2 | 3 + .../files/digest-emacs-cvs-22.0.9999-r2 | 1 + app-editors/emacs/Manifest | 21 +- 7 files changed, 465 insertions(+), 15 deletions(-) create mode 100644 app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild create mode 100644 app-editors/emacs-cvs/emacs-cvs-22.0.9999-r2.ebuild create mode 100644 app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93-r2 create mode 100644 app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r2 diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index 49ccf61baf8e..884ad5a686d3 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,16 @@ # 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.74 2007/02/02 07:59:43 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.75 2007/02/02 14:38:03 opfer Exp $ + +*emacs-cvs-22.0.9999-r2 (02 Feb 2007) +*emacs-cvs-22.0.93-r2 (02 Feb 2007) + + 02 Feb 2007; Christian Faulhammer + +emacs-cvs-22.0.93-r2.ebuild, +emacs-cvs-22.0.9999-r2.ebuild: + create symlinks for man pages, as reported by Ulrich Mueller + + remove some tabs in IUSE + correct (hopefully) .desktop entry 02 Feb 2007; Christian Faulhammer emacs-cvs-22.0.93-r1.ebuild, emacs-cvs-22.0.9999-r1.ebuild: diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest index 3e7fb7143e3e..92e5d2d3cb84 100644 --- a/app-editors/emacs-cvs/Manifest +++ b/app-editors/emacs-cvs/Manifest @@ -38,18 +38,26 @@ EBUILD emacs-cvs-22.0.93-r1.ebuild 6264 RMD160 d633cd26aeca7969398afd0dd375d63cf MD5 26396a88a288a60876fc61d051f2a56b emacs-cvs-22.0.93-r1.ebuild 6264 RMD160 d633cd26aeca7969398afd0dd375d63cfe8f832c emacs-cvs-22.0.93-r1.ebuild 6264 SHA256 c95efc6ed9616a60d9646b1fe5e01829361ace3ee97214f97f5c9dce44fc8a8a emacs-cvs-22.0.93-r1.ebuild 6264 +EBUILD emacs-cvs-22.0.93-r2.ebuild 6506 RMD160 62b4a38553cdd0cad28a64c83e7e635591704a5e SHA1 52cda18779214030c10ff29bab3d090f66ae66ca SHA256 c3ac113e2e823671ac9a688c277339fe096e087fbe35ffb375ee21fc2dbf7919 +MD5 17f931eee3eb2d3c1fe509b57f111ae0 emacs-cvs-22.0.93-r2.ebuild 6506 +RMD160 62b4a38553cdd0cad28a64c83e7e635591704a5e emacs-cvs-22.0.93-r2.ebuild 6506 +SHA256 c3ac113e2e823671ac9a688c277339fe096e087fbe35ffb375ee21fc2dbf7919 emacs-cvs-22.0.93-r2.ebuild 6506 EBUILD emacs-cvs-22.0.9999-r1.ebuild 6320 RMD160 8c9a94f0374d60318e4f2e5f6d5dcb38b0e52df0 SHA1 9759c6aac3e10b2483ac1bd73c368956a8c0672f SHA256 ffc23d2bed42b79dbf62d95acaf186beec6640f024c1b55f3e1a5c9a212d367a MD5 d043eede4230334f40ce61e989f9eb4a emacs-cvs-22.0.9999-r1.ebuild 6320 RMD160 8c9a94f0374d60318e4f2e5f6d5dcb38b0e52df0 emacs-cvs-22.0.9999-r1.ebuild 6320 SHA256 ffc23d2bed42b79dbf62d95acaf186beec6640f024c1b55f3e1a5c9a212d367a emacs-cvs-22.0.9999-r1.ebuild 6320 +EBUILD emacs-cvs-22.0.9999-r2.ebuild 6563 RMD160 3194411feb2b13460a3cc03dcb88dfe61fb9da2a SHA1 8e6fcb9c257b05af7a8a4a36f90d35c9eb99f317 SHA256 5cb508199cc4baf052d57f78aa64569a050137300fc04fffafdcb1498c7baf21 +MD5 7a1ab97b46899dd5da37bb2387f7da31 emacs-cvs-22.0.9999-r2.ebuild 6563 +RMD160 3194411feb2b13460a3cc03dcb88dfe61fb9da2a emacs-cvs-22.0.9999-r2.ebuild 6563 +SHA256 5cb508199cc4baf052d57f78aa64569a050137300fc04fffafdcb1498c7baf21 emacs-cvs-22.0.9999-r2.ebuild 6563 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 13702 RMD160 95f7c43eff490cc7bb76c71c0ab4eb6d00730064 SHA1 02e75897f0fe723efc20d3f3f443450c8c93c791 SHA256 8654f656651b341243c87da5ca2ff7b85971ab67d4f72c61bb1f5d7506fed360 -MD5 ca60e2b6655c999d2ed49bd267cd8be7 ChangeLog 13702 -RMD160 95f7c43eff490cc7bb76c71c0ab4eb6d00730064 ChangeLog 13702 -SHA256 8654f656651b341243c87da5ca2ff7b85971ab67d4f72c61bb1f5d7506fed360 ChangeLog 13702 +MISC ChangeLog 14049 RMD160 8b315202ad76dfa75a16b9a6ac57ea7e905c6627 SHA1 49bd805b7640e95a3d1bb804091b65d2c1d1c901 SHA256 a56fc3002419c86bea4ddac5a99721251dc20964ff4c709c080170ca8ad8b889 +MD5 0356a4fbdf52dadae5bafbd96bb81a88 ChangeLog 14049 +RMD160 8b315202ad76dfa75a16b9a6ac57ea7e905c6627 ChangeLog 14049 +SHA256 a56fc3002419c86bea4ddac5a99721251dc20964ff4c709c080170ca8ad8b889 ChangeLog 14049 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 @@ -57,16 +65,22 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata MD5 6be53866d89e1729a1b8e95197a92e12 files/digest-emacs-cvs-22.0.93-r1 247 RMD160 950a3ffa592585b775efb646394050c72c7020a7 files/digest-emacs-cvs-22.0.93-r1 247 SHA256 96f31c2909fddc7c78c9ab53a2d31af907624424c22698aee57a8c160c9c93fa files/digest-emacs-cvs-22.0.93-r1 247 +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 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.9999-r1 1 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.9999-r1 1 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.9999-r1 1 +MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.9999-r2 1 +RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.9999-r2 1 +SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.9999-r2 1 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-23.0.0-r1 1 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-23.0.0-r1 1 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-23.0.0-r1 1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFwu9QNQqtfCuFneMRApSnAJ9Sp9H8+yxVKXB+fdf7LHm8NX5KSQCgkCpg -5ajb7ErbbJpC9bqxwfKAHuA= -=Gdcx +iD8DBQFFw0z2NQqtfCuFneMRAmvUAKCNblI0ZaVFrJwaKExFYH8wLBn2rwCeJnbc +/37G8Dgx8c+wdDAS4aN0UZc= +=rukP -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild new file mode 100644 index 000000000000..dcfa37ed0a24 --- /dev/null +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild @@ -0,0 +1,205 @@ +# 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.93-r2.ebuild,v 1.1 2007/02/02 14:38: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 ) 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} + epatch "${FILESDIR}/emacs-subdirs-el-gentoo.diff" + use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff" + 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" + epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" + 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" + else use lesstif; + 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-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r2.ebuild new file mode 100644 index 000000000000..b7e274d95e1e --- /dev/null +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r2.ebuild @@ -0,0 +1,210 @@ +# 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-r2.ebuild,v 1.1 2007/02/02 14:38: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 ) 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" + +src_unpack() { + cvs_src_unpack + cd ${S} + epatch "${FILESDIR}/emacs-subdirs-el-gentoo.diff" + use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff" + 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" + epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" + 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" + else use lesstif; + 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.93-r2 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93-r2 new file mode 100644 index 000000000000..f366c32d3a9d --- /dev/null +++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93-r2 @@ -0,0 +1,3 @@ +MD5 4e768a1489e514fbb78d1a5f9c512846 emacs-22.0.93.tar.gz 37118034 +RMD160 c70a745662495c68470f2b483f61d68d09e8ed73 emacs-22.0.93.tar.gz 37118034 +SHA256 44dd612b521a47d923c759525b1134bbc571350cae80bdc543c31f30acc7739e emacs-22.0.93.tar.gz 37118034 diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r2 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r2 new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r2 @@ -0,0 +1 @@ + diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index e5fb61d56986..2dce72d0bb12 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -66,14 +66,18 @@ EBUILD emacs-21.4-r5.ebuild 5065 RMD160 b3147487d3e9535af22b010933b85cc0389335b0 MD5 a56fe02c52fa8ea3884fd82326720a49 emacs-21.4-r5.ebuild 5065 RMD160 b3147487d3e9535af22b010933b85cc0389335b0 emacs-21.4-r5.ebuild 5065 SHA256 9fa1e747a2087bf97f27211a3ec1c5fd67f8ee078cc06f85046fdf24f5a9be61 emacs-21.4-r5.ebuild 5065 +EBUILD emacs-21.4-r6.ebuild 5319 RMD160 4bdbb01188a0a48ca14ac4df94d00f7afda5211e SHA1 0ea0a886efdfa9f2e426428196b94531f48bb3a8 SHA256 390e25bb939f6292bd616a28439a1e589d89164b4b620de683ecd04af862a40a +MD5 754f180232d43faacba283fcb37c29f0 emacs-21.4-r6.ebuild 5319 +RMD160 4bdbb01188a0a48ca14ac4df94d00f7afda5211e emacs-21.4-r6.ebuild 5319 +SHA256 390e25bb939f6292bd616a28439a1e589d89164b4b620de683ecd04af862a40a emacs-21.4-r6.ebuild 5319 EBUILD emacs-22.0.50_pre20050225.ebuild 5557 RMD160 11e3ea0cc9bdad886ce7ecb4946925dfda0d83ed SHA1 296bba1410b3575fd1ccf54bbcef7756adc5038a SHA256 12629d258f388c211c18ed21bb65cb6479b3375913a921e85305fab8ae9bbd39 MD5 7e17815f1e5c1a8a92e12ce8a4a20951 emacs-22.0.50_pre20050225.ebuild 5557 RMD160 11e3ea0cc9bdad886ce7ecb4946925dfda0d83ed emacs-22.0.50_pre20050225.ebuild 5557 SHA256 12629d258f388c211c18ed21bb65cb6479b3375913a921e85305fab8ae9bbd39 emacs-22.0.50_pre20050225.ebuild 5557 -MISC ChangeLog 16221 RMD160 ea1336763c16fe005f796e0dd0e6816f97d93dad SHA1 8f68162dad13a8e3a2b6dbbb4a3dc9d3e5757a83 SHA256 2c4a11b3480f53d0fa1a75e641ac7d80dada4e84f73e8e8f2784dc5958ffe3ae -MD5 55fa55325a2f763ec023cbdbef512a71 ChangeLog 16221 -RMD160 ea1336763c16fe005f796e0dd0e6816f97d93dad ChangeLog 16221 -SHA256 2c4a11b3480f53d0fa1a75e641ac7d80dada4e84f73e8e8f2784dc5958ffe3ae ChangeLog 16221 +MISC ChangeLog 16420 RMD160 4b8e94ecaf1e48be566050526c0656b309e7033a SHA1 628f69e1cd89895f7e501461b24cfb5dd146af5e SHA256 fa9d43da4b12c526ca40788b73dfc0f18b76d4a971d287da901bb737e3614eba +MD5 383e9341104d2a6e9b1d89f9ad6b58e7 ChangeLog 16420 +RMD160 4b8e94ecaf1e48be566050526c0656b309e7033a ChangeLog 16420 +SHA256 fa9d43da4b12c526ca40788b73dfc0f18b76d4a971d287da901bb737e3614eba ChangeLog 16420 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 @@ -84,13 +88,16 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r5 473 RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r5 473 SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r5 473 +MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r6 473 +RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r6 473 +SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r6 473 MD5 56b020a4e966468679ce67d99479c7f7 files/digest-emacs-22.0.50_pre20050225 440 RMD160 bd1c85e484649b0f59d8e862c56464ca05d82540 files/digest-emacs-22.0.50_pre20050225 440 SHA256 263c0f93c22b5467286e5ff0054a83697b60e25ea6e3c44f38ce61fa181d97b6 files/digest-emacs-22.0.50_pre20050225 440 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFnl/mNQqtfCuFneMRAu+DAJ4ld5lyzeb4s0NAvOk8aFwet567qgCgluMl -EhrR9PlnPA+fe5wVzgGjzLQ= -=yOk5 +iD8DBQFFw02ONQqtfCuFneMRAj5qAJ9mR3mD3uwk01SB8gHAkHHrHz6VrgCfa6NZ +hx3izFeSy42LXwsYsiNHzFE= +=h+iB -----END PGP SIGNATURE----- -- 2.26.2