Remove old.

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)

7 files changed, 8 insertions, 425 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 29de5388cf5b..a14b05cd0d8d 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.273 2008/09/14 15:47:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.274 2008/09/22 07:44:38 ulm Exp $
+
+  22 Sep 2008; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-22.1-backup-buffer.patch, -files/emacs-22.1-format-int.patch,
+  -files/emacs-22.1-hack-local-variables.patch,
+  -files/emacs-22.1-oldxmenu-qa.patch,
+  -files/emacs-22.1-s390x-non-multilib.patch, -emacs-22.1-r4.ebuild:
+  Remove old.
 
   14 Sep 2008; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r17.ebuild,
   emacs-22.3.ebuild:
diff --git a/app-editors/emacs/emacs-22.1-r4.ebuild b/app-editors/emacs/emacs-22.1-r4.ebuild
deleted file mode 100644
index 889655f2f706..000000000000
--- a/app-editors/emacs/emacs-22.1-r4.ebuild
+++ /dev/null
@@ -1,266 +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/emacs-22.1-r4.ebuild,v 1.4 2008/06/04 12:26:51 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://gnu/emacs/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2 BSD"
-SLOT="22"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="alsa gif gtk gzip-el hesiod jpeg motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
-RESTRICT="strip"
-
-RDEPEND="!<app-editors/emacs-cvs-22.1
-	sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	net-libs/liblockfile
-	hesiod? ( net-dns/hesiod )
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	alsa? ( media-libs/alsa-lib )
-	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 )
-		xpm? ( x11-libs/libXpm )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? (
-			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	alsa? ( dev-util/pkgconfig )
-	X? ( gtk? ( dev-util/pkgconfig ) )
-	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}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/${P}-freebsd-sparc.patch"
-	epatch "${FILESDIR}/${P}-oldxmenu-qa.patch"
-	epatch "${FILESDIR}/${P}-backup-buffer.patch"
-	epatch "${FILESDIR}/${P}-hack-local-variables.patch"
-	epatch "${FILESDIR}/${P}-format-int.patch"
-	epatch "${FILESDIR}/${P}-s390x-non-multilib.patch"
-	epatch "${FILESDIR}/${P}-vcdiff-tmp-race.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
-	if use hppa; then # bug #193703
-		replace-flags -O[2-9] -O
-	else
-		replace-flags -O[3-9] -O2
-	fi
-	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
-
-	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)"
-
-		# 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
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d (Athena) toolkit"
-			myconf="${myconf} --with-x-toolkit=athena"
-			myconf="${myconf} --without-gtk"
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			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
-
-		local f tk=
-		for f in gtk Xaw3d motif; do
-			use ${f} || continue
-			[ "${tk}" ] \
-				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
-			tk="${tk}${tk:+ }${f}"
-		done
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	myconf="${myconf} $(use_with hesiod)"
-
-	econf \
-		--program-suffix=-emacs-${SLOT} \
-		--infodir=/usr/share/info/emacs-${SLOT} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	emake CC="$(tc-getCC)" || die "emake failed"
-
-	einfo "Recompiling patched lisp files..."
-	(cd lisp; emake recompile) || die "emake recompile failed"
-	(cd src; emake versionclean)
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
-	local i m
-
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \
-		|| die "moving Emacs executable failed"
-
-	# move info documentation to the correct place
-	einfo "Fixing info documentation ..."
-	for i in "${D}"/usr/share/info/emacs-${SLOT}/*; 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-${SLOT}.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 /usr/share/emacs/site-lisp
-	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-${SLOT} 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
-	rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
-	echo
-}
-
-pkg_postinst() {
-	[ -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
-		[ -e "${f}" ] || touch "${f}"
-	done
-
-	elisp-site-regen
-	emacs-infodir-rebuild
-
-	if [[ $(readlink "${ROOT}"/usr/bin/emacs) == emacs.emacs-${SLOT}* ]]; then
-		# transition from pre-eselect revision
-		eselect emacs set emacs-${SLOT}
-	else
-		eselect emacs update ifunset
-	fi
-
-	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 "Therefore, several Emacs versions can be installed at the same time."
-	elog "\"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/files/emacs-22.1-backup-buffer.patch b/app-editors/emacs/files/emacs-22.1-backup-buffer.patch
deleted file mode 100644
index 0e53cef521f1..000000000000
--- a/app-editors/emacs/files/emacs-22.1-backup-buffer.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- emacs-22.1-orig/lisp/files.el	2007-05-25 14:43:31.000000000 +0200
-+++ emacs-22.1/lisp/files.el	2007-08-21 08:26:36.000000000 +0200
-@@ -3119,9 +3119,8 @@
- 	  (set-default-file-modes ?\700)
- 	  (while (condition-case ()
- 		     (progn
--		       (condition-case nil
--			   (delete-file to-name)
--			 (file-error nil))
-+		       (and (file-exists-p to-name)
-+			    (delete-file to-name))
- 		       (copy-file from-name to-name nil t)
- 		       nil)
- 		   (file-already-exists t))
diff --git a/app-editors/emacs/files/emacs-22.1-format-int.patch b/app-editors/emacs/files/emacs-22.1-format-int.patch
deleted file mode 100644
index 851bcb91f4d9..000000000000
--- a/app-editors/emacs/files/emacs-22.1-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/files/emacs-22.1-hack-local-variables.patch b/app-editors/emacs/files/emacs-22.1-hack-local-variables.patch
deleted file mode 100644
index ed73505c68a2..000000000000
--- a/app-editors/emacs/files/emacs-22.1-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/files/emacs-22.1-oldxmenu-qa.patch b/app-editors/emacs/files/emacs-22.1-oldxmenu-qa.patch
deleted file mode 100644
index 4c962c1527a3..000000000000
--- a/app-editors/emacs/files/emacs-22.1-oldxmenu-qa.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- emacs-22.1-orig/oldXMenu/ChgPane.c	2007-02-27 04:04:22.000000000 +0100
-+++ emacs-22.1/oldXMenu/ChgPane.c	2007-06-04 00:47:56.000000000 +0200
-@@ -13,6 +13,7 @@
-  *
-  */
- 
-+#include <config.h>
- #include "XMenuInt.h"
- 
- int
---- emacs-22.1-orig/oldXMenu/ChgSel.c	2007-02-27 04:04:22.000000000 +0100
-+++ emacs-22.1/oldXMenu/ChgSel.c	2007-06-04 00:47:42.000000000 +0200
-@@ -13,6 +13,7 @@
-  *
-  */
- 
-+#include <config.h>
- #include "XMenuInt.h"
- 
- int
diff --git a/app-editors/emacs/files/emacs-22.1-s390x-non-multilib.patch b/app-editors/emacs/files/emacs-22.1-s390x-non-multilib.patch
deleted file mode 100644
index d444557f07cc..000000000000
--- a/app-editors/emacs/files/emacs-22.1-s390x-non-multilib.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.in	7 Jan 2008 08:53:18 -0000	1.444.2.6
-+++ configure.in	17 Jan 2008 04:04:51 -0000	1.444.2.7
-@@ -1532,7 +1532,7 @@
- ### The standard library on x86-64 GNU/Linux distributions can 
- ### be located in either /usr/lib64 or /usr/lib.
- case "${canonical}" in
--  x86_64-*-linux-gnu* )
-+  x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
-     if test -d /usr/lib64; then
-       AC_DEFINE(HAVE_X86_64_LIB64_DIR, 1,
-         [Define to 1 if the file /usr/lib64 exists.])
---- src/m/ibms390x.h	8 Jan 2008 04:04:33 -0000	1.4.2.3
-+++ src/m/ibms390x.h	17 Jan 2008 04:03:58 -0000	1.4.2.4
-@@ -161,10 +161,18 @@
- #define XPNTR(a) XUINT (a)
- 
- #undef START_FILES
-+#ifdef HAVE_X86_64_LIB64_DIR
- #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
-+#else
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
-+#endif
- 
- #undef LIB_STANDARD
-+#ifdef HAVE_X86_64_LIB64_DIR
- #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
-+#else
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
-+#endif
- 
- /* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519
-    (do not change this comment) */