diff options
author | Ulrich Müller <ulm@gentoo.org> | 2008-01-30 17:15:42 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2008-01-30 17:15:42 +0000 |
commit | 307e6d4852292424c3db7949ee8ceea20eea4947 (patch) | |
tree | 98168cff740a66cb741f3b1fd568b92ce5b1f137 /app-editors | |
parent | Fixed startup config file reading problem when scapy is used as a library, bu... (diff) | |
download | gentoo-2-307e6d4852292424c3db7949ee8ceea20eea4947.tar.gz gentoo-2-307e6d4852292424c3db7949ee8ceea20eea4947.tar.bz2 gentoo-2-307e6d4852292424c3db7949ee8ceea20eea4947.zip |
Remove old CVS snapshots.
(Portage version: 2.1.4)
Diffstat (limited to 'app-editors')
13 files changed, 11 insertions, 833 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index 3ce72fe26a09..c205d61a5f16 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.183 2008/01/26 18:52:34 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.184 2008/01/30 17:15:41 ulm Exp $ + + 30 Jan 2008; Ulrich Mueller <ulm@gentoo.org> + -files/emacs-cvs-format-int.patch, + -files/emacs-cvs-hack-local-variables.patch, + -files/emacs-cvs-make-tramp-temp-file.patch, + -files/emacs-cvs-makeinfo-regexp.patch, + -files/emacs-cvs-no-x-compile.patch, + -emacs-cvs-22.1.50_p20070829-r2.ebuild, + -emacs-cvs-23.0.0_p20070920-r1.ebuild: + Remove old CVS snapshots. 26 Jan 2008; Ulrich Mueller <ulm@gentoo.org> -files/emacs-cvs-disable_alsa_detection-r1.patch, diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild deleted file mode 100644 index d907a6eedd98..000000000000 --- a/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild +++ /dev/null @@ -1,244 +0,0 @@ -# Copyright 1999-2008 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.1.50_p20070829-r2.ebuild,v 1.7 2008/01/26 18:52:34 ulm Exp $ - -WANT_AUTOCONF="2.5" -WANT_AUTOMAKE="latest" - -inherit autotools elisp-common eutils flag-o-matic - -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" -HOMEPAGE="http://www.gnu.org/software/emacs/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-3 FDL-1.2 BSD" -SLOT="22" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="alsa gif gpm gtk gzip-el hesiod jpeg kerberos motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xpm" -RESTRICT="strip" - -RDEPEND="sys-libs/ncurses - >=app-admin/eselect-emacs-0.7-r1 - net-libs/liblockfile - hesiod? ( net-dns/hesiod ) - kerberos? ( virtual/krb5 ) - spell? ( || ( app-text/ispell app-text/aspell ) ) - alsa? ( media-libs/alsa-lib ) - gpm? ( sys-libs/gpm ) - X? ( - x11-libs/libXmu - x11-libs/libXt - x11-misc/xbitmaps - x11-misc/emacs-desktop - gif? ( media-libs/giflib ) - jpeg? ( media-libs/jpeg ) - tiff? ( media-libs/tiff ) - png? ( media-libs/libpng ) - svg? ( >=gnome-base/librsvg-2.0 ) - xpm? ( x11-libs/libXpm ) - gtk? ( =x11-libs/gtk+-2* ) - !gtk? ( - Xaw3d? ( x11-libs/Xaw3d ) - !Xaw3d? ( - motif? ( virtual/motif ) - ) - ) - )" - -DEPEND="${RDEPEND} - gzip-el? ( app-arch/gzip )" - -# FULL_VERSION keeps the full version number, which is needed in order to -# determine some path information correctly for copy/move operations later on -FULL_VERSION="${PV%%_*}" -EMACS_SUFFIX="emacs-${SLOT}-cvs" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" - epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch" - epatch "${FILESDIR}/${PN}-makeinfo-regexp.patch" - epatch "${FILESDIR}/${PN}-hack-local-variables.patch" - epatch "${FILESDIR}/${PN}-format-int.patch" - - 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 alsa; then - # ALSA is detected even if not requested by its USE flag. - # Suppress it by supplying pkg-config with a wrong library name. - sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \ - || die "unable to sed configure.in" - fi - 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 - - 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 - - local myconf - - if use alsa && ! use sound; then - echo - einfo "Although sound USE flag is disabled you chose to have alsa," - einfo "so sound is switched on anyway." - echo - myconf="${myconf} --with-sound" - else - myconf="${myconf} $(use_with sound)" - fi - - if use X; then - myconf="${myconf} --with-x" - myconf="${myconf} $(use_with toolkit-scroll-bars)" - myconf="${myconf} $(use_with jpeg) $(use_with tiff)" - myconf="${myconf} $(use_with gif) $(use_with png)" - myconf="${myconf} $(use_with xpm) $(use_with svg rsvg)" - - # GTK+ is the default toolkit if USE=gtk is chosen with other - # possibilities. Emacs upstream thinks this should be standard - # policy on all distributions - if use gtk; then - echo - einfo "Configuring to build with GTK support, disabling all other toolkits" - echo - 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" - elif use motif; then - einfo "Configuring to build with motif toolkit support" - myconf="${myconf} --with-x-toolkit=motif" - myconf="${myconf} --without-gtk" - else - einfo "Configuring to build with no toolkit" - myconf="${myconf} --with-x-toolkit=no" - myconf="${myconf} --without-gtk" - fi - else - myconf="${myconf} --without-x" - fi - - myconf="${myconf} $(use_with hesiod)" - myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)" - myconf="${myconf} $(use_with gpm)" - - econf \ - --program-suffix=-${EMACS_SUFFIX} \ - --infodir=/usr/share/info/${EMACS_SUFFIX} \ - --without-carbon \ - ${myconf} || die "econf emacs failed" - - emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed" -} - -src_install () { - local i m - - emake install DESTDIR="${D}" || die "make install failed" - - rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ - || die "removing duplicate emacs executable failed" - mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \ - || die "moving Emacs executable failed" - - # move info documentation to the correct place - einfo "Fixing info documentation ..." - for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do - mv "${i}" "${i}.info" || die "mv info failed" - done - - # move man pages to the correct place - einfo "Fixing manpages ..." - for m in "${D}"/usr/share/man/man1/* ; do - mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed" - done - - # avoid collision between slots, see bug #169033 e.g. - rm "${D}"/usr/share/emacs/site-lisp/subdirs.el - rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores - keepdir /var/lib/games/emacs/ - - if use source; then - insinto /usr/share/emacs/${FULL_VERSION}/src - # This is not meant to install all the source -- just the - # C source you might find via find-function - doins src/*.[ch] - sed 's/^X//' >10${PN}-${SLOT}-gentoo.el <<-EOF - - ;;; ${PN}-${SLOT} site-lisp configuration - - (if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - X (setq find-function-C-source-directory - X "/usr/share/emacs/${FULL_VERSION}/src")) - EOF - elisp-site-file-install 10${PN}-${SLOT}-gentoo.el - fi - - dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed" -} - -emacs-infodir-rebuild() { - # Depending on the Portage version, the Info dir file is compressed - # or removed. It is only rebuilt by Portage if our directory is in - # INFOPATH, which is not guaranteed. So we rebuild it ourselves. - - local infodir=/usr/share/info/${EMACS_SUFFIX} f - einfo "Regenerating Info directory index in ${infodir} ..." - rm -f "${ROOT}"${infodir}/dir{,.*} - for f in "${ROOT}"${infodir}/*.info*; do - [[ ${f##*/} == *[0-9].info* ]] \ - || install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null - done - echo -} - -pkg_postinst() { - test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el || - cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el - - local f - for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do - test -e "${f}" || touch "${f}" - done - - elisp-site-regen - emacs-infodir-rebuild - eselect emacs update --if-unset - - 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 on the X server's" - elog "machine would satisfy basic Emacs requirements under X11." - fi - - echo - elog "You can set the version to be started by /usr/bin/emacs through" - elog "the Emacs eselect module, which also redirects man and info pages." - elog "You can therefore test emacs-cvs along with the stable release." - elog "\"man emacs.eselect\" for details." -} - -pkg_postrm() { - elisp-site-regen - emacs-infodir-rebuild - eselect emacs update --if-unset -} diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild deleted file mode 100644 index 2a48e281cab2..000000000000 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild,v 1.7 2008/01/26 18:52:34 ulm Exp $ - -WANT_AUTOCONF="2.5" -WANT_AUTOMAKE="latest" - -inherit autotools elisp-common eutils flag-o-matic - -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" -HOMEPAGE="http://www.gnu.org/software/emacs/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-3 FDL-1.2 BSD" -SLOT="23-unicode" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="alsa gif gpm gtk gzip-el hesiod jpeg kerberos motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft xpm" -RESTRICT="strip" - -RDEPEND="sys-libs/ncurses - >=app-admin/eselect-emacs-0.7-r1 - net-libs/liblockfile - hesiod? ( net-dns/hesiod ) - kerberos? ( virtual/krb5 ) - spell? ( || ( app-text/ispell app-text/aspell ) ) - alsa? ( media-libs/alsa-lib ) - gpm? ( sys-libs/gpm ) - X? ( - x11-libs/libXmu - x11-libs/libXt - x11-misc/xbitmaps - x11-misc/emacs-desktop - gif? ( media-libs/giflib ) - jpeg? ( media-libs/jpeg ) - tiff? ( media-libs/tiff ) - png? ( media-libs/libpng ) - svg? ( >=gnome-base/librsvg-2.0 ) - xpm? ( x11-libs/libXpm ) - xft? ( media-libs/fontconfig virtual/xft >=dev-libs/libotf-0.9.4 ) - gtk? ( =x11-libs/gtk+-2* ) - !gtk? ( - Xaw3d? ( x11-libs/Xaw3d ) - !Xaw3d? ( - motif? ( virtual/motif ) - ) - ) - )" - -DEPEND="${RDEPEND} - gzip-el? ( app-arch/gzip )" - -# FULL_VERSION keeps the full version number, which is needed in order to -# determine some path information correctly for copy/move operations later on -FULL_VERSION="${PV%%_*}" -EMACS_SUFFIX="emacs-${SLOT}" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" - epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch" - epatch "${FILESDIR}/${PN}-makeinfo-regexp.patch" - epatch "${FILESDIR}/${PN}-no-x-compile.patch" - epatch "${FILESDIR}/${PN}-hack-local-variables.patch" - epatch "${FILESDIR}/${PN}-format-int.patch" - - 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 alsa; then - # ALSA is detected even if not requested by its USE flag. - # Suppress it by supplying pkg-config with a wrong library name. - sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \ - || die "unable to sed configure.in" - fi - 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 - - 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 - - local myconf - - if use alsa && ! use sound; then - echo - einfo "Although sound USE flag is disabled you chose to have alsa," - einfo "so sound is switched on anyway." - echo - myconf="${myconf} --with-sound" - else - myconf="${myconf} $(use_with sound)" - fi - - if use X; then - myconf="${myconf} --with-x" - myconf="${myconf} $(use_with toolkit-scroll-bars)" - myconf="${myconf} $(use_enable xft font-backend)" - myconf="${myconf} $(use_with xft freetype)" - myconf="${myconf} $(use_with xft)" - myconf="${myconf} $(use_with jpeg) $(use_with tiff)" - myconf="${myconf} $(use_with gif) $(use_with png)" - myconf="${myconf} $(use_with xpm) $(use_with svg rsvg)" - - # GTK+ is the default toolkit if USE=gtk is chosen with other - # possibilities. Emacs upstream thinks this should be standard - # policy on all distributions - if use gtk; then - echo - einfo "Configuring to build with GTK support, disabling all other toolkits" - echo - 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" - elif use motif; then - einfo "Configuring to build with motif toolkit support" - myconf="${myconf} --with-x-toolkit=motif" - myconf="${myconf} --without-gtk" - else - einfo "Configuring to build with no toolkit" - myconf="${myconf} --with-x-toolkit=no" - myconf="${myconf} --without-gtk" - fi - else - myconf="${myconf} --without-x" - fi - - myconf="${myconf} $(use_with hesiod)" - myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)" - myconf="${myconf} $(use_with gpm)" - - econf \ - --program-suffix=-${EMACS_SUFFIX} \ - --infodir=/usr/share/info/${EMACS_SUFFIX} \ - --without-carbon \ - ${myconf} || die "econf emacs failed" - - emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed" -} - -src_install () { - local i m - - emake install DESTDIR="${D}" || die "make install failed" - - rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ - || die "removing duplicate emacs executable failed" - mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \ - || die "moving Emacs executable failed" - - # move info documentation to the correct place - einfo "Fixing info documentation ..." - for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do - mv "${i}" "${i}.info" || die "mv info failed" - done - - # move man pages to the correct place - einfo "Fixing manpages ..." - for m in "${D}"/usr/share/man/man1/* ; do - mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed" - done - - # avoid collision between slots, see bug #169033 e.g. - rm "${D}"/usr/share/emacs/site-lisp/subdirs.el - rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores - keepdir /var/lib/games/emacs/ - - if use source; then - insinto /usr/share/emacs/${FULL_VERSION}/src - # This is not meant to install all the source -- just the - # C source you might find via find-function - doins src/*.[ch] - sed 's/^X//' >10${PN}-${SLOT}-gentoo.el <<-EOF - - ;;; ${PN}-${SLOT} site-lisp configuration - - (if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - X (setq find-function-C-source-directory - X "/usr/share/emacs/${FULL_VERSION}/src")) - EOF - elisp-site-file-install 10${PN}-${SLOT}-gentoo.el - fi - - dodoc AUTHORS BUGS CONTRIBUTE README README.unicode || die "dodoc failed" -} - -emacs-infodir-rebuild() { - # Depending on the Portage version, the Info dir file is compressed - # or removed. It is only rebuilt by Portage if our directory is in - # INFOPATH, which is not guaranteed. So we rebuild it ourselves. - - local infodir=/usr/share/info/${EMACS_SUFFIX} f - einfo "Regenerating Info directory index in ${infodir} ..." - rm -f "${ROOT}"${infodir}/dir{,.*} - for f in "${ROOT}"${infodir}/*.info*; do - [[ ${f##*/} == *[0-9].info* ]] \ - || install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null - done - echo -} - -pkg_postinst() { - test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el || - cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el - - local f - for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do - test -e "${f}" || touch "${f}" - done - - elisp-site-regen - emacs-infodir-rebuild - eselect emacs update --if-unset - - 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 on the X server's" - elog "machine would satisfy basic Emacs requirements under X11." - fi - - echo - elog "You can set the version to be started by /usr/bin/emacs through" - elog "the Emacs eselect module, which also redirects man and info pages." - elog "You can therefore test emacs-cvs along with the stable release." - elog "\"man emacs.eselect\" for details." -} - -pkg_postrm() { - elisp-site-regen - emacs-infodir-rebuild - eselect emacs update --if-unset -} diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50-r2 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50-r2 deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50-r2 +++ /dev/null diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50_p20070829-r2 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50_p20070829-r2 deleted file mode 100644 index cf34b95faeba..000000000000 --- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50_p20070829-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 43f9c1306726f4b69d5ab8e3edca6c44 emacs-cvs-22.1.50_p20070829.tar.bz2 20915594 -RMD160 47f3c1c543de65c49deadbcdf4e83236aaa68f1b emacs-cvs-22.1.50_p20070829.tar.bz2 20915594 -SHA256 c27196e9359d5ad4f30e3552c7897c995798324a323a4b47060b98426a71891f emacs-cvs-22.1.50_p20070829.tar.bz2 20915594 diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0_p20070920-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0_p20070920-r1 deleted file mode 100644 index c55affeeaa4b..000000000000 --- a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0_p20070920-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 27b820d538bf6bd408951570a6bc120a emacs-cvs-23.0.0_p20070920.tar.bz2 21944733 -RMD160 4ca3f66530c44a82e1badba4dfc934b2e5e5b8d7 emacs-cvs-23.0.0_p20070920.tar.bz2 21944733 -SHA256 c38d4be31e047f5a470b1664a2721b3dcb83b3876cb3490a86e05804aebf4f2a emacs-cvs-23.0.0_p20070920.tar.bz2 21944733 diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.50-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.50-r1 deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.50-r1 +++ /dev/null diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.60-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.60-r1 deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.60-r1 +++ /dev/null diff --git a/app-editors/emacs-cvs/files/emacs-cvs-format-int.patch b/app-editors/emacs-cvs/files/emacs-cvs-format-int.patch deleted file mode 100644 index 851bcb91f4d9..000000000000 --- a/app-editors/emacs-cvs/files/emacs-cvs-format-int.patch +++ /dev/null @@ -1,79 +0,0 @@ -2007-11-15 Andreas Schwab <schwab@suse.de> - - * editfns.c (Fformat): Correctly format EMACS_INT values. Also - take precision into account when formatting an integer. - ---- src/editfns.c 8 Aug 2007 07:49:19 -0000 1.439.2.3 -+++ src/editfns.c 16 Nov 2007 00:18:55 -0000 1.439.2.8 -@@ -3543,8 +3543,10 @@ usage: (format STRING &rest OBJECTS) */ - precision[n+1] = 10 * precision[n+1] + *format - '0'; - } - -- if (format - this_format_start + 1 > longest_format) -- longest_format = format - this_format_start + 1; -+ /* Extra +1 for 'l' that we may need to insert into the -+ format. */ -+ if (format - this_format_start + 2 > longest_format) -+ longest_format = format - this_format_start + 2; - - if (format == end) - error ("Format string ends in middle of format specifier"); -@@ -3605,7 +3607,7 @@ usage: (format STRING &rest OBJECTS) */ - && *format != 'i' && *format != 'X' && *format != 'c') - error ("Invalid format operation %%%c", *format); - -- thissize = 30; -+ thissize = 30 + (precision[n] > 0 ? precision[n] : 0); - if (*format == 'c') - { - if (! SINGLE_BYTE_CHAR_P (XINT (args[n])) -@@ -3803,23 +3805,35 @@ usage: (format STRING &rest OBJECTS) */ - format - this_format_start); - this_format[format - this_format_start] = 0; - -- if (INTEGERP (args[n])) -+ if (format[-1] == 'e' || format[-1] == 'f' || format[-1] == 'g') -+ sprintf (p, this_format, XFLOAT_DATA (args[n])); -+ else - { -- if (format[-1] == 'd') -- sprintf (p, this_format, XINT (args[n])); -- /* Don't sign-extend for octal or hex printing. */ -+ if (sizeof (EMACS_INT) > sizeof (int)) -+ { -+ /* Insert 'l' before format spec. */ -+ this_format[format - this_format_start] -+ = this_format[format - this_format_start - 1]; -+ this_format[format - this_format_start - 1] = 'l'; -+ this_format[format - this_format_start + 1] = 0; -+ } -+ -+ if (INTEGERP (args[n])) -+ { -+ if (format[-1] == 'd') -+ sprintf (p, this_format, XINT (args[n])); -+ /* Don't sign-extend for octal or hex printing. */ -+ else -+ sprintf (p, this_format, XUINT (args[n])); -+ } -+ else if (format[-1] == 'd') -+ /* Maybe we should use "%1.0f" instead so it also works -+ for values larger than MAXINT. */ -+ sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n])); - else -- sprintf (p, this_format, XUINT (args[n])); -+ /* Don't sign-extend for octal or hex printing. */ -+ sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n])); - } -- else if (format[-1] == 'e' || format[-1] == 'f' || format[-1] == 'g') -- sprintf (p, this_format, XFLOAT_DATA (args[n])); -- else if (format[-1] == 'd') -- /* Maybe we should use "%1.0f" instead so it also works -- for values larger than MAXINT. */ -- sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n])); -- else -- /* Don't sign-extend for octal or hex printing. */ -- sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n])); - - if (p > buf - && multibyte diff --git a/app-editors/emacs-cvs/files/emacs-cvs-hack-local-variables.patch b/app-editors/emacs-cvs/files/emacs-cvs-hack-local-variables.patch deleted file mode 100644 index ed73505c68a2..000000000000 --- a/app-editors/emacs-cvs/files/emacs-cvs-hack-local-variables.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- lisp/files.el 13 Oct 2007 14:09:56 -0000 1.896.2.28 -+++ lisp/files.el 2 Nov 2007 11:02:12 -0000 1.896.2.29 -@@ -2764,8 +2764,8 @@ - ;; If caller wants only the safe variables, - ;; install only them. - (dolist (elt result) -- (unless (or (memq (car elt) unsafe-vars) -- (memq (car elt) risky-vars)) -+ (unless (or (member elt unsafe-vars) -+ (member elt risky-vars)) - (hack-one-local-variable (car elt) (cdr elt)))) - ;; Query, except in the case where all are known safe - ;; if the user wants no quuery in that case. diff --git a/app-editors/emacs-cvs/files/emacs-cvs-make-tramp-temp-file.patch b/app-editors/emacs-cvs/files/emacs-cvs-make-tramp-temp-file.patch deleted file mode 100644 index 382e8aec328f..000000000000 --- a/app-editors/emacs-cvs/files/emacs-cvs-make-tramp-temp-file.patch +++ /dev/null @@ -1,216 +0,0 @@ ---- emacs-orig/lisp/net/tramp-fish.el 2007-07-29 17:32:55.000000000 +0200 -+++ emacs/lisp/net/tramp-fish.el 2007-10-06 17:39:38.000000000 +0200 -@@ -752,8 +752,8 @@ - (error "Implementation does not handle immediate return")) - - (with-parsed-tramp-file-name default-directory nil -- (let ((temp-name-prefix (tramp-make-tramp-temp-file v)) -- command input output stderr outbuf tmpfil ret) -+ (let (command input tmpinput output tmpoutput stderr tmpstderr -+ outbuf tmpfil ret) - ;; Compute command. - (setq command (mapconcat 'tramp-shell-quote-argument - (cons program args) " ")) -@@ -765,15 +765,14 @@ - ;; INFILE is on the same remote host. - (setq input (with-parsed-tramp-file-name infile nil localname)) - ;; INFILE must be copied to remote host. -- (setq input (concat temp-name-prefix ".in")) -- (copy-file -- infile -- (tramp-make-tramp-file-name method user host input) -- t))) -+ (setq input (tramp-make-tramp-temp-file v) -+ tmpinput (tramp-make-tramp-file-name method user host input)) -+ (copy-file infile tmpinput t))) - (when input (setq command (format "%s <%s" command input))) - - ;; Determine output. -- (setq output (concat temp-name-prefix ".out")) -+ (setq output (tramp-make-tramp-temp-file v) -+ tmpoutput (tramp-make-tramp-file-name method user host output)) - (cond - ;; Just a buffer - ((bufferp destination) -@@ -799,7 +798,9 @@ - (cadr destination) nil localname)) - ;; stderr must be copied to remote host. The temporary - ;; file must be deleted after execution. -- (setq stderr (concat temp-name-prefix ".err")))) -+ (setq stderr (tramp-make-tramp-temp-file v) -+ tmpstderr (tramp-make-tramp-file-name -+ method user host stderr)))) - ;; stderr to be discarded - ((null (cadr destination)) - (setq stderr "/dev/null")))) -@@ -808,9 +809,6 @@ - (setq outbuf (current-buffer)))) - (when stderr (setq command (format "%s 2>%s" command stderr))) - -- ;; If we have a temporary file, it must be removed after operation. -- (when (and input (string-match temp-name-prefix input)) -- (setq command (format "%s; rm %s" command input))) - ;; Goto working directory. - (unless - (tramp-fish-send-command-and-check -@@ -838,16 +836,15 @@ - ;; We should show the output anyway. - (when outbuf - (with-current-buffer outbuf (insert-file-contents tmpfil)) -- (when display (display-buffer outbuf))) -- ;; Remove output file. -- (delete-file (tramp-make-tramp-file-name method user host output))) -+ (when display (display-buffer outbuf)))) - ;; When the user did interrupt, we should do it also. - (error (setq ret 1))) -- (unless ret -- ;; Provide error file. -- (when (and stderr (string-match temp-name-prefix stderr)) -- (rename-file (tramp-make-tramp-file-name method user host stderr) -- (cadr destination) t))) -+ -+ ;; Provide error file. -+ (when tmpstderr (rename-file tmpstderr (cadr destination) t)) -+ ;; Cleanup. -+ (when tmpinput (delete-file tmpinput)) -+ (when tmpoutput (delete-file tmpoutput)) - ;; Return exit status. - ret))) - ---- emacs-orig/lisp/net/tramp.el 2007-08-28 22:09:58.000000000 +0200 -+++ emacs/lisp/net/tramp.el 2007-10-06 17:39:38.000000000 +0200 -@@ -3175,7 +3175,7 @@ - - ;; Compose copy command. - (setq spec `((?h . ,host) (?u . ,user) (?p . ,port) -- (?t . ,(tramp-make-tramp-temp-file v)) -+ (?t . ,(tramp-make-tramp-temp-file v 'dont-create)) - (?k . ,(if keep-date " " ""))) - copy-program (tramp-get-method-parameter - method 'tramp-copy-program) -@@ -3584,13 +3584,42 @@ - (tramp-temporary-file-directory))) - (file-name-extension filename t))) - --(defsubst tramp-make-tramp-temp-file (vec) -- (format -- "/tmp/%s%s" -- tramp-temp-name-prefix -- (if (get-buffer-process (tramp-get-connection-buffer vec)) -- (process-id (get-buffer-process (tramp-get-connection-buffer vec))) -- (emacs-pid)))) -+(defsubst tramp-make-tramp-temp-file (vec &optional dont-create) -+ "Create a temporary file on the remote host identified by VEC. -+Return the local name of the temporary file. -+If DONT-CREATE is non-nil, just the file name is returned without -+creation of the temporary file. This is not the preferred way to run, -+but it is necessary during connection setup, because we cannot create -+a remote file at this time. This parameter shall NOT be set to -+non-nil else." -+ (if dont-create -+ ;; It sounds a little bit stupid to create a LOCAL file name. -+ ;; But we intend to use the remote directory "/tmp", and we have -+ ;; no chance to check whether a temporary file exists already -+ ;; remotely, because we have no working connection yet. -+ (make-temp-name (expand-file-name tramp-temp-name-prefix "/tmp")) -+ -+ (let ((prefix -+ (tramp-make-tramp-file-name -+ (tramp-file-name-method vec) -+ (tramp-file-name-user vec) -+ (tramp-file-name-host vec) -+ (expand-file-name tramp-temp-name-prefix "/tmp"))) -+ result) -+ (while (not result) -+ ;; `make-temp-file' would be the first choice for -+ ;; implementation. But it calls `write-region' internally, -+ ;; which also needs a temporary file - we would end in an -+ ;; infinite loop. -+ (setq result (make-temp-name prefix)) -+ (if (file-exists-p result) -+ (setq result nil) -+ ;; This creates the file by side effect. -+ (set-file-times result) -+ (set-file-modes result (tramp-octal-to-decimal "0700")))) -+ -+ ;; Return the local part. -+ (with-parsed-tramp-file-name result nil localname)))) - - (defun tramp-handle-executable-find (command) - "Like `executable-find' for Tramp files." -@@ -3642,8 +3671,7 @@ - (error "Implementation does not handle immediate return")) - - (with-parsed-tramp-file-name default-directory nil -- (let ((temp-name-prefix (tramp-make-tramp-temp-file v)) -- command input stderr outbuf ret) -+ (let (command input tmpinput stderr tmpstderr outbuf ret) - ;; Compute command. - (setq command (mapconcat 'tramp-shell-quote-argument - (cons program args) " ")) -@@ -3655,11 +3683,9 @@ - ;; INFILE is on the same remote host. - (setq input (with-parsed-tramp-file-name infile nil localname)) - ;; INFILE must be copied to remote host. -- (setq input (concat temp-name-prefix ".in")) -- (copy-file -- infile -- (tramp-make-tramp-file-name method user host input) -- t))) -+ (setq input (tramp-make-tramp-temp-file v) -+ tmpinput (tramp-make-tramp-file-name method user host input)) -+ (copy-file infile tmpinput t))) - (when input (setq command (format "%s <%s" command input))) - - ;; Determine output. -@@ -3688,7 +3714,9 @@ - (cadr destination) nil localname)) - ;; stderr must be copied to remote host. The temporary - ;; file must be deleted after execution. -- (setq stderr (concat temp-name-prefix ".err")))) -+ (setq stderr (tramp-make-tramp-temp-file v) -+ tmpstderr (tramp-make-tramp-file-name -+ method user host stderr)))) - ;; stderr to be discarded - ((null (cadr destination)) - (setq stderr "/dev/null")))) -@@ -3697,9 +3725,6 @@ - (setq outbuf (current-buffer)))) - (when stderr (setq command (format "%s 2>%s" command stderr))) - -- ;; If we have a temporary file, it must be removed after operation. -- (when (and input (string-match temp-name-prefix input)) -- (setq command (format "%s; rm %s" command input))) - ;; Goto working directory. - (tramp-send-command - v (format "cd %s" (tramp-shell-quote-argument localname))) -@@ -3719,13 +3744,13 @@ - (error - (kill-buffer (tramp-get-connection-buffer v)) - (setq ret 1))) -- (unless ret -- ;; Check return code. -- (setq ret (tramp-send-command-and-check v nil)) -- ;; Provide error file. -- (when (and stderr (string-match temp-name-prefix stderr)) -- (rename-file (tramp-make-tramp-file-name method user host stderr) -- (cadr destination) t))) -+ -+ ;; Check return code. -+ (unless ret (setq ret (tramp-send-command-and-check v nil))) -+ ;; Provide error file. -+ (when tmpstderr (rename-file tmpstderr (cadr destination) t)) -+ ;; Cleanup. -+ (when tmpinput (delete-file tmpinput)) - ;; Return exit status. - ret))) - -@@ -6113,7 +6138,7 @@ - l-user (or l-user "") - l-port (or l-port "") - spec `((?h . ,l-host) (?u . ,l-user) (?p . ,l-port) -- (?t . ,(tramp-make-tramp-temp-file vec))) -+ (?t . ,(tramp-make-tramp-temp-file vec 'dont-create))) - command - (concat - command " " diff --git a/app-editors/emacs-cvs/files/emacs-cvs-makeinfo-regexp.patch b/app-editors/emacs-cvs/files/emacs-cvs-makeinfo-regexp.patch deleted file mode 100644 index 6e0c2aa9f945..000000000000 --- a/app-editors/emacs-cvs/files/emacs-cvs-makeinfo-regexp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in 12 Sep 2007 07:03:30 -0000 1.474 -+++ configure.in 15 Sep 2007 19:45:32 -0000 1.475 -@@ -1347,7 +1347,7 @@ - dnl By this stage, configure has already checked for egrep and set EGREP, - dnl or exited with an error if no egrep was found. - if test "$MAKEINFO" != "no" && \ -- test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[[^0-9]]*([[5-9]]|4\.[[6-9]])'`" = x; then -+ test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[6-9]]|4\.[[1-5]][[0-9]]+)'`" = x; then - MAKEINFO=no - fi - diff --git a/app-editors/emacs-cvs/files/emacs-cvs-no-x-compile.patch b/app-editors/emacs-cvs/files/emacs-cvs-no-x-compile.patch deleted file mode 100644 index 941cb3e9adeb..000000000000 --- a/app-editors/emacs-cvs/files/emacs-cvs-no-x-compile.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- emacs-orig/src/dispextern.h 2007-09-13 10:50:51.000000000 +0000 -+++ emacs/src/dispextern.h 2007-10-12 21:57:44.000000000 +0000 -@@ -853,9 +853,11 @@ - /* Continuation lines width at the start of the row. */ - int continuation_lines_width; - -+#ifdef HAVE_WINDOW_SYSTEM - /* Non-NULL means the current clipping area. This is temporarily - set while exposing a region. Coordinates are frame-relative. */ - XRectangle *clip; -+#endif - }; - - |