summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2007-03-07 04:30:00 +0000
committerChristian Faulhammer <fauli@gentoo.org>2007-03-07 04:30:00 +0000
commitae9409ad2f231822ec5f38f221b7e702a26276cb (patch)
treec5285af502d2a1beddd94342cf2682865f9ebfe4 /app-editors
parentstable x86; bug 169461 (diff)
downloadhistorical-ae9409ad2f231822ec5f38f221b7e702a26276cb.tar.gz
historical-ae9409ad2f231822ec5f38f221b7e702a26276cb.tar.bz2
historical-ae9409ad2f231822ec5f38f221b7e702a26276cb.zip
corrected behaviour for copying subdirs.el and clean up
Package-Manager: portage-2.1.2-r9
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs-cvs/ChangeLog7
-rw-r--r--app-editors/emacs-cvs/Manifest44
-rw-r--r--app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild4
-rw-r--r--app-editors/emacs-cvs/emacs-cvs-22.0.95.ebuild214
-rw-r--r--app-editors/emacs-cvs/emacs-cvs-22.0.9999-r4.ebuild221
-rw-r--r--app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild4
-rw-r--r--app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.953
-rw-r--r--app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r40
8 files changed, 25 insertions, 472 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 330287295f12..8494a7607707 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,11 @@
# 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.89 2007/03/04 12:07:03 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.90 2007/03/07 04:30:00 opfer Exp $
+
+ 07 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+ -emacs-cvs-22.0.95.ebuild, emacs-cvs-22.0.95-r1.ebuild,
+ -emacs-cvs-22.0.9999-r4.ebuild, emacs-cvs-22.0.9999-r5.ebuild:
+ corrected behaviour for copying subdirs.el and clean up
*emacs-cvs-22.0.9999-r5 (04 Mar 2007)
*emacs-cvs-22.0.95-r1 (04 Mar 2007)
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index e645e09ee549..c9346bdbfd15 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -38,43 +38,29 @@ 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
-EBUILD emacs-cvs-22.0.95-r1.ebuild 6897 RMD160 41060695a5c2dfc5024b8666e0ad7e4ca61927dd SHA1 122497b4a8c55194f77c3b141910e79a8a23f6b6 SHA256 e772c2c7cf1d97e436d8065620e59157d3cc18def007e9c476f46a7e623bc8a3
-MD5 f55a88210ad766d4021ceb6a25ae58d3 emacs-cvs-22.0.95-r1.ebuild 6897
-RMD160 41060695a5c2dfc5024b8666e0ad7e4ca61927dd emacs-cvs-22.0.95-r1.ebuild 6897
-SHA256 e772c2c7cf1d97e436d8065620e59157d3cc18def007e9c476f46a7e623bc8a3 emacs-cvs-22.0.95-r1.ebuild 6897
-EBUILD emacs-cvs-22.0.95.ebuild 6834 RMD160 d0be18cfb8fde38e043c5ac980ab8fc867b70ce5 SHA1 9ea38ddecfb850d4a2d8eb6fe583aca559053018 SHA256 4a901c5954d63a3553357694975a152d0d8ae997a440c53ec1f6346832e8d94d
-MD5 3c4fbd25803d8515a00de621b0e8ee09 emacs-cvs-22.0.95.ebuild 6834
-RMD160 d0be18cfb8fde38e043c5ac980ab8fc867b70ce5 emacs-cvs-22.0.95.ebuild 6834
-SHA256 4a901c5954d63a3553357694975a152d0d8ae997a440c53ec1f6346832e8d94d emacs-cvs-22.0.95.ebuild 6834
-EBUILD emacs-cvs-22.0.9999-r4.ebuild 6990 RMD160 00f4bacae7087eeba414444e093f0edf2b8e4d18 SHA1 d9b7a5f6adb353e052590f51d932ef5f6802bf2d SHA256 275652fd18aeeed0ed8d9ba13c99f486f0b9e16eff5190bffc0600f603cf9bfa
-MD5 31e8fd356d55afe1eaeb9995f9d5449d emacs-cvs-22.0.9999-r4.ebuild 6990
-RMD160 00f4bacae7087eeba414444e093f0edf2b8e4d18 emacs-cvs-22.0.9999-r4.ebuild 6990
-SHA256 275652fd18aeeed0ed8d9ba13c99f486f0b9e16eff5190bffc0600f603cf9bfa emacs-cvs-22.0.9999-r4.ebuild 6990
-EBUILD emacs-cvs-22.0.9999-r5.ebuild 7050 RMD160 a0a84069d41b03324b428eda510d49da5caec278 SHA1 b1cf63c3ed992003eb84cdf412a47670913bf0b0 SHA256 0013313ffe85472ad9e56372f0fde6c278c54f8793c8049faa5581497f788cb9
-MD5 c68df07473f348d6d589fbdb6d3d4463 emacs-cvs-22.0.9999-r5.ebuild 7050
-RMD160 a0a84069d41b03324b428eda510d49da5caec278 emacs-cvs-22.0.9999-r5.ebuild 7050
-SHA256 0013313ffe85472ad9e56372f0fde6c278c54f8793c8049faa5581497f788cb9 emacs-cvs-22.0.9999-r5.ebuild 7050
+EBUILD emacs-cvs-22.0.95-r1.ebuild 6899 RMD160 2a4a3c8134a755c07e61cf049e2f9386c4fd6ef2 SHA1 8f73a9a828c8ffd13fdc3fa63fe1ce042ab027a7 SHA256 7c359df47e77a0e9869157cc82a6e05af2eece4671b816f66d05c6353f4e3e4d
+MD5 e6679945249420bf6a682fff14be1324 emacs-cvs-22.0.95-r1.ebuild 6899
+RMD160 2a4a3c8134a755c07e61cf049e2f9386c4fd6ef2 emacs-cvs-22.0.95-r1.ebuild 6899
+SHA256 7c359df47e77a0e9869157cc82a6e05af2eece4671b816f66d05c6353f4e3e4d emacs-cvs-22.0.95-r1.ebuild 6899
+EBUILD emacs-cvs-22.0.9999-r5.ebuild 7052 RMD160 741d3faeb8950aa4611f91dcf0b2dbac2be6f68d SHA1 5bc19ee631314af8e185d94afdec4d357ffa72ba SHA256 3948cda27681c3719e0cb6c4a8ad5bb31c2e493d52b97bb8cfd6880016f7b8fa
+MD5 38b0e92475364151e03beedde0d8917f emacs-cvs-22.0.9999-r5.ebuild 7052
+RMD160 741d3faeb8950aa4611f91dcf0b2dbac2be6f68d emacs-cvs-22.0.9999-r5.ebuild 7052
+SHA256 3948cda27681c3719e0cb6c4a8ad5bb31c2e493d52b97bb8cfd6880016f7b8fa emacs-cvs-22.0.9999-r5.ebuild 7052
EBUILD emacs-cvs-23.0.0-r1.ebuild 5881 RMD160 df6922c877a1d7ba6771da3bd0a2cdd9f55d8aa4 SHA1 60125d56df9d513f6ac96912300e6213b4e2e2d7 SHA256 90371536428f8729321eb096dc4889be5ee9fb55a30bf29ea3f9ddc9c113787e
MD5 dd043fac2310b7995525245ad0213a21 emacs-cvs-23.0.0-r1.ebuild 5881
RMD160 df6922c877a1d7ba6771da3bd0a2cdd9f55d8aa4 emacs-cvs-23.0.0-r1.ebuild 5881
SHA256 90371536428f8729321eb096dc4889be5ee9fb55a30bf29ea3f9ddc9c113787e emacs-cvs-23.0.0-r1.ebuild 5881
-MISC ChangeLog 17128 RMD160 abccd4c244c1bce9eb39bded2e06fd98e31a5002 SHA1 1a94a0732d29257d9e894c42984e6eca44b875e0 SHA256 f8ce80868be374781c71a5e8f379b627e95e016083735975b270a4913c09661c
-MD5 dcd14d57343b06b5438beba0bec7cd91 ChangeLog 17128
-RMD160 abccd4c244c1bce9eb39bded2e06fd98e31a5002 ChangeLog 17128
-SHA256 f8ce80868be374781c71a5e8f379b627e95e016083735975b270a4913c09661c ChangeLog 17128
+MISC ChangeLog 17365 RMD160 457b8c9b16f4feddcbe2305c3f08d9cdab3e4859 SHA1 192157e3bd29cc6ae0a8d8e89228eb3ad3930d23 SHA256 16eb3998c58b88318eb87b74e2621cdb38e3e3082640cd0f0b32866c451cdbe8
+MD5 09a029369e14ab1036ed59d0efb7efd1 ChangeLog 17365
+RMD160 457b8c9b16f4feddcbe2305c3f08d9cdab3e4859 ChangeLog 17365
+SHA256 16eb3998c58b88318eb87b74e2621cdb38e3e3082640cd0f0b32866c451cdbe8 ChangeLog 17365
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 d6f599895923b8ba7322cd3778f8cbd6 files/digest-emacs-cvs-22.0.95 247
-RMD160 d862c5cc0a3c1e37d1d191a39b8b27fee97feb83 files/digest-emacs-cvs-22.0.95 247
-SHA256 a2976d3a758f1cd9304edc61dcbec515ccc29f2daafd8918926b2af9ba407ed1 files/digest-emacs-cvs-22.0.95 247
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 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r4 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r4 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r4 0
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
@@ -84,7 +70,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
-iD8DBQFF6rY0NQqtfCuFneMRAjLBAJ9fFO7liCB/ya0hTNU23t7K93JKAwCeOE5B
-4lvRO+mV2X4BvkT8jMlhWuk=
-=fwC0
+iD8DBQFF7j+ONQqtfCuFneMRAv+rAJ0TfyX/bMtQi4vwJRvBnS+QL9ev3QCeOz6S
+4ojilX6FKAAWPQ+YMZUsUYM=
+=aACL
-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild
index a06c0e1be007..2902cd9de22b 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild
@@ -1,6 +1,6 @@
# 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.95-r1.ebuild,v 1.1 2007/03/04 12:07:03 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild,v 1.2 2007/03/07 04:30:00 opfer Exp $
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
@@ -191,7 +191,7 @@ update-alternatives() {
pkg_postinst() {
test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
- cp ${ROOT}/usr/share/emacs{/${PV},}/site-lisp/subdirs.el
+ cp ${ROOT}/usr/share/emacs{/${SLOT},}/site-lisp/subdirs.el
use ppc-macos || update-alternatives
elisp-site-regen
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.95.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.95.ebuild
deleted file mode 100644
index 5edfb5f1ec33..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.95.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# 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.95.ebuild,v 1.2 2007/03/02 20:42:02 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 )
- 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.95"
-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} <<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
-}
-
-update-alternatives() {
- # extract the suffix of the manpages to determine the correct compression program
- local suffix=$(echo /usr/share/man/man1/emacs.emacs-*.1*|sed 's/.*\.1//')
-
- # this creates symlinks for binaries and man pages, so the correct ones in a slotted
- # environment can be accessed
- 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
-
- for j in emacs emacsclient etags ctags
- do
- alternatives_auto_makesym "/usr/share/man/man1/$j.1${suffix}" "/usr/share/man/man1/$j.emacs-*"
- done
-}
-
-pkg_postinst() {
- use ppc-macos || update-alternatives
- elisp-site-regen
-
- # ecompress from Portage 2.2.* does auto-compression
- # which is not desired for the dir file, so remove it to
- # let it be recreated
- rm "${D}/usr/share/info/emacs-${SLOT}/dir.bz2" 2> /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-r4.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r4.ebuild
deleted file mode 100644
index bb76860836d0..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r4.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# 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-r4.ebuild,v 1.2 2007/03/02 20:42:02 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 )
- 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.95"
-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} <<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
-
- make_desktop_entry emacs Emacs /usr/share/emacs/${SLOT}/etc/images/icons/emacs_48.png editors
-}
-
-update-alternatives() {
- # extract the suffix of the manpages to determine the correct compression program
- local suffix=$(echo /usr/share/man/man1/emacs.emacs-*.1*|sed 's/.*\.1//')
-
- # this creates symlinks for binaries and man pages, so the correct ones in a slotted
- # environment can be accessed
- 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
-
- for j in emacs emacsclient etags ctags
- do
- alternatives_auto_makesym "/usr/share/man/man1/$j.1${suffix}" "/usr/share/man/man1/$j.emacs-*"
- done
-}
-
-pkg_postinst() {
- use ppc-macos || update-alternatives
- elisp-site-regen
-
- # ecompress from Portage 2.2.* does auto-compression
- # which is not desired for the dir file, so remove it to
- # let it be recreated
- rm "${D}/usr/share/info/emacs-${SLOT}/dir.bz2" 2> /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-r5.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild
index 68702f040136..a7bbcb753ab7 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild
@@ -1,6 +1,6 @@
# 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-r5.ebuild,v 1.1 2007/03/04 12:07:03 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild,v 1.2 2007/03/07 04:30:00 opfer Exp $
ECVS_AUTH="pserver"
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -198,7 +198,7 @@ update-alternatives() {
pkg_postinst() {
test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
- cp ${ROOT}/usr/share/emacs{/${PV},}/site-lisp/subdirs.el
+ cp ${ROOT}/usr/share/emacs{/${SLOT},}/site-lisp/subdirs.el
use ppc-macos || update-alternatives
elisp-site-regen
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.95 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.95
deleted file mode 100644
index 9f2aeea69b7a..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.95
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 07ae2a749fec6decbdf65ae3673d5546 emacs-22.0.95.tar.gz 37754533
-RMD160 e5aa6001a255538dbc8fb2d548d1b67979f94033 emacs-22.0.95.tar.gz 37754533
-SHA256 5e25e8f221fe18f07feadd831bb482e6cde53c9470713c63f059ff2d3e715b1d emacs-22.0.95.tar.gz 37754533
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r4 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r4
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r4
+++ /dev/null