From c9c2378c1e8b0b5cbf11e49644992c25055f935a Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Fri, 26 Jan 2007 08:42:59 +0000 Subject: [PATCH] fixed double compression of info documentation, reported by Tassilo Horn in bug #162675 added a live cvs ebuild, again Package-Manager: portage-2.1.1-r2 --- app-editors/emacs-cvs/ChangeLog | 10 +- app-editors/emacs-cvs/Manifest | 28 ++- .../emacs-cvs/emacs-cvs-22.0.92-r1.ebuild | 186 ++++++++++++++++++ .../emacs-cvs/emacs-cvs-22.0.9999.ebuild | 186 ++++++++++++++++++ .../files/digest-emacs-cvs-22.0.92-r1 | 1 + .../files/digest-emacs-cvs-22.0.9999 | 1 + 6 files changed, 404 insertions(+), 8 deletions(-) create mode 100644 app-editors/emacs-cvs/emacs-cvs-22.0.92-r1.ebuild create mode 100644 app-editors/emacs-cvs/emacs-cvs-22.0.9999.ebuild create mode 100644 app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.92-r1 create mode 100644 app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999 diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index fc579e43154f..9d77c25f6931 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -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.62 2007/01/05 14:16:50 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.63 2007/01/26 08:42:59 opfer Exp $ + +*emacs-cvs-22.0.9999 (26 Jan 2007) +*emacs-cvs-22.0.92-r1 (26 Jan 2007) + + 26 Jan 2007; Christian Faulhammer + +emacs-cvs-22.0.92-r1.ebuild, +emacs-cvs-22.0.9999.ebuild: + fixed double compression of info documentation, reported by Tassilo Horn + in bug #162675 added a live cvs ebuild, again 05 Jan 2007; Christian Faulhammer emacs-cvs-22.0.91.ebuild, emacs-cvs-22.0.92.ebuild, diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest index 67d2600d3ece..da5d32c790aa 100644 --- a/app-editors/emacs-cvs/Manifest +++ b/app-editors/emacs-cvs/Manifest @@ -37,18 +37,26 @@ EBUILD emacs-cvs-22.0.91.ebuild 5645 RMD160 68d41d7e89b45c3bc2e8da118ad37cb40544 MD5 bd0a164f8a23ee9a785529056d6e7313 emacs-cvs-22.0.91.ebuild 5645 RMD160 68d41d7e89b45c3bc2e8da118ad37cb40544fcbf emacs-cvs-22.0.91.ebuild 5645 SHA256 0301bb7fbd5807303528755730978678873e6cfbeb74c01452a07df27752e068 emacs-cvs-22.0.91.ebuild 5645 +EBUILD emacs-cvs-22.0.92-r1.ebuild 5605 RMD160 a3286092a450dd9adb3ca4bde91f525db14b54d9 SHA1 a4094d2220304933903f578ebbcd3def58ba88ca SHA256 3f4bfe42626b2268a5116aa46267853e10ce1e485b37c4643705b1f880222f89 +MD5 949994306cffdef1a318c2d64c53e744 emacs-cvs-22.0.92-r1.ebuild 5605 +RMD160 a3286092a450dd9adb3ca4bde91f525db14b54d9 emacs-cvs-22.0.92-r1.ebuild 5605 +SHA256 3f4bfe42626b2268a5116aa46267853e10ce1e485b37c4643705b1f880222f89 emacs-cvs-22.0.92-r1.ebuild 5605 EBUILD emacs-cvs-22.0.92.ebuild 5647 RMD160 cd281bde5837fc7e6f9c4d353b48bd7686745831 SHA1 cffcced061fd11a13fcfdc38926a9731eef7a56a SHA256 ba6813696cc1fb096bb39d9fadaad4c493931a20c26a9b9563533216fac678ab MD5 89d0f35e6c3877a21756432d5db09387 emacs-cvs-22.0.92.ebuild 5647 RMD160 cd281bde5837fc7e6f9c4d353b48bd7686745831 emacs-cvs-22.0.92.ebuild 5647 SHA256 ba6813696cc1fb096bb39d9fadaad4c493931a20c26a9b9563533216fac678ab emacs-cvs-22.0.92.ebuild 5647 +EBUILD emacs-cvs-22.0.9999.ebuild 5587 RMD160 b477fb37a522446167e720e213fd2509a745a40d SHA1 e475598cfe1205e3739c0d40526196365ae30b77 SHA256 9c7914cdc352f9ab520c40573296c4a5fbc3c7e97884b387438dee0cf0d8b3c8 +MD5 f0facab4a8bc3d8f8910f11cfd35aaac emacs-cvs-22.0.9999.ebuild 5587 +RMD160 b477fb37a522446167e720e213fd2509a745a40d emacs-cvs-22.0.9999.ebuild 5587 +SHA256 9c7914cdc352f9ab520c40573296c4a5fbc3c7e97884b387438dee0cf0d8b3c8 emacs-cvs-22.0.9999.ebuild 5587 EBUILD emacs-cvs-23.0.0-r1.ebuild 5949 RMD160 357b51f2fcfcb4b202288061576462c17e5e80fa SHA1 369e0ff81e01023e5eba5ae766c429ebfec70e62 SHA256 1911b98e56882c801d49d64b3a4b20cb5999c49c7ea0da86ae6c47d16f3744b5 MD5 802cdeaa37487dd1a50bdf23e84d75ad emacs-cvs-23.0.0-r1.ebuild 5949 RMD160 357b51f2fcfcb4b202288061576462c17e5e80fa emacs-cvs-23.0.0-r1.ebuild 5949 SHA256 1911b98e56882c801d49d64b3a4b20cb5999c49c7ea0da86ae6c47d16f3744b5 emacs-cvs-23.0.0-r1.ebuild 5949 -MISC ChangeLog 11159 RMD160 cca52ea23544e5f73d18735f0a1f32185fbc5a9a SHA1 385282c5090f24bd9a5074b09a458881f1aba471 SHA256 3544d170251641fec2e7bc4e37ede7826a4a05e8a3819fbcbe0fb6996944ae2c -MD5 8ed15fa7311006cb243863ecd1fa73ea ChangeLog 11159 -RMD160 cca52ea23544e5f73d18735f0a1f32185fbc5a9a ChangeLog 11159 -SHA256 3544d170251641fec2e7bc4e37ede7826a4a05e8a3819fbcbe0fb6996944ae2c ChangeLog 11159 +MISC ChangeLog 11496 RMD160 a133fad4877c3a787ec3836b31b2fe67e3295e02 SHA1 a0e25d2b5c53269b99cda652ced09bbf56ba7413 SHA256 014dc88f5f008c522c2f096b2efc25508170a8d814e1a9b6683642656c58fc1c +MD5 ce5f3f60a7b4f3b5a5f5a7c7cd975351 ChangeLog 11496 +RMD160 a133fad4877c3a787ec3836b31b2fe67e3295e02 ChangeLog 11496 +SHA256 014dc88f5f008c522c2f096b2efc25508170a8d814e1a9b6683642656c58fc1c ChangeLog 11496 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 @@ -59,13 +67,19 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.92 1 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.92 1 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.92 1 +MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.92-r1 1 +RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.92-r1 1 +SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.92-r1 1 +MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.9999 1 +RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.9999 1 +SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.9999 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) -iD8DBQFFnl39NQqtfCuFneMRAk+gAJ9CyMyOj/04Y1P5JMULPn5Xng9NgwCfQWPG -ftweOjswQoqWqjmrq6lGgSI= -=Nzql +iD8DBQFFub73NQqtfCuFneMRAsYYAKCLkIs3TGQfXFEM24f0Vkr6DiPGmwCfR0IK +W7ZI18jZld1CAaXENSzlwcg= +=LwZd -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.92-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.92-r1.ebuild new file mode 100644 index 000000000000..e077e9502e7e --- /dev/null +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.92-r1.ebuild @@ -0,0 +1,186 @@ +# 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.92-r1.ebuild,v 1.1 2007/01/26 08:42:59 opfer Exp $ + +ECVS_AUTH="pserver" +ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" +ECVS_MODULE="emacs" +ECVS_BRANCH="EMACS_PRETEST_22_0_92" + +inherit elisp-common cvs alternatives flag-o-matic eutils + +IUSE="X Xaw3d aqua gif gtk jpeg png spell tiff source gzip-el toolkit-scroll-bars" + +S="${WORKDIR}/emacs" + +DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor." +SRC_URI="" +HOMEPAGE="http://www.gnu.org/software/emacs" + +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-5.3 + spell? ( || ( app-text/ispell app-text/aspell ) ) + X? ( || ( ( $X_DEPEND ) virtual/x11 ) ) + X? ( gif? ( >=media-libs/giflib-4.1.0.1b ) + jpeg? ( >=media-libs/jpeg-6b ) + tiff? ( >=media-libs/tiff-3.5.7 ) + png? ( >=media-libs/libpng-1.2.5 ) + gtk? ( =x11-libs/gtk+-2* ) + !gtk? ( Xaw3d? ( x11-libs/Xaw3d ) ) ) + sys-libs/zlib" + +PROVIDE="virtual/emacs virtual/editor" + +SLOT="22.0.92" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" + +DFILE=emacs-${SLOT}.desktop + +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" +} + +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" + else + einfo "Configuring to build with lucid toolkit support" + myconf="${myconf} $(use_with Xaw3d toolkit-scroll-bars)" + myconf="${myconf} --without-gtk" + myconf="${myconf} --with-x-toolkit=lucid" + 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" + make bootstrap || die "make carbon emacs bootstrap failed" + else + econf \ + --program-suffix=.emacs-${SLOT} \ + --without-carbon \ + ${myconf} || die "econf emacs failed" + make bootstrap || die "make emacs bootstrap failed" + fi +} + +src_install () { + make DESTDIR=${D} install || die + 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 <${D}/etc/env.d/50emacs-cvs-${SLOT} <00emacs-cvs-${SLOT}-gentoo.el <