bump, to reflect upstream's changes, reported by Martin Schoenmakers <aiviru@diamond...
authorChristian Faulhammer <fauli@gentoo.org>
Mon, 20 Nov 2006 08:00:41 +0000 (08:00 +0000)
committerChristian Faulhammer <fauli@gentoo.org>
Mon, 20 Nov 2006 08:00:41 +0000 (08:00 +0000)
Package-Manager: portage-2.1.1-r2

app-editors/emacs-cvs/ChangeLog
app-editors/emacs-cvs/Manifest
app-editors/emacs-cvs/emacs-cvs-22.0.91.ebuild [new file with mode: 0644]
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r1
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r2
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r3
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.90
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.91 [new file with mode: 0644]
app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0
app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r1

index 769a19aacd599ee2bc9bf532193a8e20aca8e25b..6bb7e9e2f6a77dbf54a0d07ca5abea78a1464b7b 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.53 2006/10/30 00:10:19 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.54 2006/11/20 08:00:41 opfer Exp $
+
+*emacs-cvs-22.0.91 (20 Nov 2006)
+
+  20 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
+  +emacs-cvs-22.0.91.ebuild:
+  bump, to reflect upstream's changes, reported by Martin Schoenmakers
+  <aiviru@diamond-age.net> and Christer Ekholm <che@chrekh.se> in bug 155690
 
 *emacs-cvs-23.0.0-r1 (30 Oct 2006)
 
index 18fcda821b10e247db256c6ad9a24d706f4a7c1e..4839b8c85bd7c80691b4305fe9f7b40626f53704 100644 (file)
@@ -57,6 +57,10 @@ EBUILD emacs-cvs-22.0.90.ebuild 5383 RMD160 a2489d2fe0cfe15d1926bd14952a7330ffb4
 MD5 8136caf18f203a26be18cf1b17a2ed09 emacs-cvs-22.0.90.ebuild 5383
 RMD160 a2489d2fe0cfe15d1926bd14952a7330ffb449d7 emacs-cvs-22.0.90.ebuild 5383
 SHA256 a0389d71b39a8e1f98b7f9b8c2a34a9b7cc1ab242bf501054ee7d599ff0167d0 emacs-cvs-22.0.90.ebuild 5383
+EBUILD emacs-cvs-22.0.91.ebuild 5380 RMD160 cf7d01d4dd8725b7c6905ae675cb1918d6ecf960 SHA1 f55997361fac36d300f11d1a5be8147facde1f18 SHA256 7ea8ec730a2e7366eabc6082486b52ba4f27ffd8b56090985e128b5fc3677e03
+MD5 0474964adae8525a70a9a2c52424a904 emacs-cvs-22.0.91.ebuild 5380
+RMD160 cf7d01d4dd8725b7c6905ae675cb1918d6ecf960 emacs-cvs-22.0.91.ebuild 5380
+SHA256 7ea8ec730a2e7366eabc6082486b52ba4f27ffd8b56090985e128b5fc3677e03 emacs-cvs-22.0.91.ebuild 5380
 EBUILD emacs-cvs-23.0.0-r1.ebuild 5704 RMD160 5f446838d4d51538ccde2f51e51b7c3bb67b7c33 SHA1 1b172ec48d6b24f6919c8a0872d6720080d55d6c SHA256 458b4f797d6bf09ff3bb497197f69282cb659b71fffeb84a849557f475581c8c
 MD5 544d3c5ee49373763258f91f7e4ef9d1 emacs-cvs-23.0.0-r1.ebuild 5704
 RMD160 5f446838d4d51538ccde2f51e51b7c3bb67b7c33 emacs-cvs-23.0.0-r1.ebuild 5704
@@ -65,36 +69,39 @@ EBUILD emacs-cvs-23.0.0.ebuild 5238 RMD160 69658f6f15cde1d369751fe3bcdcd93325df1
 MD5 10d02dd5a3cbe31f162edaebf502797c emacs-cvs-23.0.0.ebuild 5238
 RMD160 69658f6f15cde1d369751fe3bcdcd93325df1c60 emacs-cvs-23.0.0.ebuild 5238
 SHA256 032229a1d06307801e350ad47d2f2caea70f57230cb8b80c75a9fc14508292d2 emacs-cvs-23.0.0.ebuild 5238
-MISC ChangeLog 9323 RMD160 0c45d7d0ba2ca2f2b1045f01d4ad0a0919ee00f5 SHA1 0f15d111f4549f6f4adf5618963ed97b2d26e2d2 SHA256 11762fbea9821048f11bb0b87af1ebce545d57ba6b8d0db62bd3448b11c77967
-MD5 c194176df6b8822b34c3eda4e737bba4 ChangeLog 9323
-RMD160 0c45d7d0ba2ca2f2b1045f01d4ad0a0919ee00f5 ChangeLog 9323
-SHA256 11762fbea9821048f11bb0b87af1ebce545d57ba6b8d0db62bd3448b11c77967 ChangeLog 9323
+MISC ChangeLog 9587 RMD160 64567d0e26e629ed4b6ed0f54222922633c2ed9d SHA1 7a3f89b71aac36c41210f80fcd7e9ba165d76e36 SHA256 7d6537a7b1be4db98ec8716071a72d5c01f736f3ef299a39cfae197e0ecf6ed2
+MD5 4e8589fa03cee6966de491fefc828035 ChangeLog 9587
+RMD160 64567d0e26e629ed4b6ed0f54222922633c2ed9d ChangeLog 9587
+SHA256 7d6537a7b1be4db98ec8716071a72d5c01f736f3ef299a39cfae197e0ecf6ed2 ChangeLog 9587
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r1 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r1 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r2 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r2 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r3 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r3 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.90 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.90 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.90 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0 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
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.50-r1 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.50-r1 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.50-r1 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.50-r2 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.50-r2 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.50-r2 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.50-r3 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.50-r3 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.50-r3 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.90 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.90 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.90 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.91 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.91 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.91 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-23.0.0 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-23.0.0 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-23.0.0 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.5 (GNU/Linux)
 
-iD8DBQFFRULzyiNZaEAZA+ARAtgfAJ0a+QQ9NJvhfncZil4PFxV/bxwmhgCdFVJZ
-p9AEnRBQ2OfeB0YsTYOv73Y=
-=5KmE
+iD8DBQFFYWC7NQqtfCuFneMRAjJrAJ9W2q5DuGo4UX448sPHLLZys52D+gCeLjLj
+RRS6XSQTIYDiHUusOoRMct0=
+=BfdC
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.91.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.91.ebuild
new file mode 100644 (file)
index 0000000..7b91bf2
--- /dev/null
@@ -0,0 +1,184 @@
+# Copyright 1999-2006 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.91.ebuild,v 1.1 2006/11/20 08:00:41 opfer Exp $
+
+ECVS_AUTH="pserver"
+ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
+ECVS_MODULE="emacs"
+ECVS_BRANCH="HEAD"
+
+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
+       >=sys-apps/portage-2.0.51_rc1"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="22.0.91"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~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
+}
+
+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
+                       gzip -9 ${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
+
+       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
+
+       if ! use gzip-el; then
+               find ${D} -type f -name \*.el.gz -print0 |xargs -0 gunzip
+       fi
+       dodoc BUGS ChangeLog README
+       insinto /usr/share/applications
+       cp ${FILESDIR}/emacs.desktop.in ${DFILE}
+       sed -i -e "s,@PV@,${SLOT},g" ${DFILE}
+       doins ${DFILE}
+}
+
+update-alternatives() {
+       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
+}
+
+pkg_postinst() {
+       use ppc-macos || update-alternatives
+       elisp-site-regen
+       if use X; then
+               while read line; do einfo "${line}"; done<<'EOF'
+
+You need to install some fonts for Emacs.  Under monolithic
+XFree86/Xorg you typically had such fonts installed by default.         With
+modular Xorg, you will have to perform this step yourself.
+
+Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic
+Emacs requirements under X11.
+
+EOF
+       fi
+}
+
+pkg_postrm() {
+       use ppc-macos || update-alternatives
+       elisp-site-regen
+}
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.91 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.91
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
@@ -0,0 +1 @@
+