Remove old version.

Package-Manager: portage-2.1.2.9

4 files changed, 13 insertions, 236 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 1989cacbf7a1..00d2a8283d12 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,20 +1,20 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.133 2007/06/12 21:46:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.134 2007/06/12 22:06:37 ulm Exp $
+
+  12 Jun 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.0.97.ebuild:
+  Remove old version.
 
   12 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
   emacs-cvs-22.1.50.ebuild:
   Add ~sparc-fbsd keyword.
 
-  12 Jun 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
-  Add ~x86-fbsd keyword.
-
   06 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50.ebuild:
   Include check for change of upstream version number.
 
   02 Jun 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.0.99.ebuild,
   -emacs-cvs-22.0.9999-r10.ebuild:
-  Clean up following release of Emacs 22.1.
+  Clean up, following release of Emacs 22.1.
 
   01 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.990.ebuild,
   emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-22.1.50.ebuild,
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 0d1186439670..c167c1d017c6 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -29,12 +29,7 @@ AUX emacs.desktop.in 236 RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 SHA1 0e
 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.97.tar.gz 37900456 RMD160 3bd5abe6fdf4e1574b6fda4b2e85cfbf171fbab4 SHA1 60a50581ac93fc850225a929cc0c04dec0e51f36 SHA256 1b2cd679a1cbb1b6971291beac5d68ae55be538691c1fc8164f936899b8a913b
 DIST emacs-22.0.990.tar.gz 38184881 RMD160 5c86b66a429c7291a5e6d89a94c6804b36037068 SHA1 d6ccf5ae41e3d3382fd43c0524ea660a497f9053 SHA256 5621de0c29a55a6f2b57e9c2da101b4e2c69a6b30c3c7238c62b08fd7081c67c
-EBUILD emacs-cvs-22.0.97.ebuild 6715 RMD160 fc3feebf814f6063a7ba2cdcebb42d90237b8afc SHA1 81e9412cc902a06a0a86a5660175044447cacafc SHA256 2c6dd9da54cd723a8a4d83f02c50921b8cc7e4b83c8a4d9a0b3e68c030585bdd
-MD5 55f44f9de99ae865353616c46c357a0c emacs-cvs-22.0.97.ebuild 6715
-RMD160 fc3feebf814f6063a7ba2cdcebb42d90237b8afc emacs-cvs-22.0.97.ebuild 6715
-SHA256 2c6dd9da54cd723a8a4d83f02c50921b8cc7e4b83c8a4d9a0b3e68c030585bdd emacs-cvs-22.0.97.ebuild 6715
 EBUILD emacs-cvs-22.0.990.ebuild 7426 RMD160 d2481b5cab9ca400c4d749f6468ab4038fd5d186 SHA1 da90a70b6efed5d35b8ed09e46b4d611bb0b55d4 SHA256 ff7bce0d62ef6e8e73de1eae048c4b9f505553b0054fe755b5736e367752df1e
 MD5 923a512c786c0f667600a277ddf7070e emacs-cvs-22.0.990.ebuild 7426
 RMD160 d2481b5cab9ca400c4d749f6468ab4038fd5d186 emacs-cvs-22.0.990.ebuild 7426
@@ -51,17 +46,14 @@ EBUILD emacs-cvs-23.0.0-r6.ebuild 7865 RMD160 c30119b2624b7be4260cc04d5b3d557ef4
 MD5 fea95fc60d0ddbd7ea8088a7c85ea68e emacs-cvs-23.0.0-r6.ebuild 7865
 RMD160 c30119b2624b7be4260cc04d5b3d557ef420a1cf emacs-cvs-23.0.0-r6.ebuild 7865
 SHA256 e50edf390dc6bc54d1676586729bf81628eeb09388251e0f5367db3048d25dce emacs-cvs-23.0.0-r6.ebuild 7865
-MISC ChangeLog 25767 RMD160 e8a83c4826e15451382b98fcd4896f7a9fcde3e3 SHA1 5cd565f6c5e24b3823e5f2fadb44d5e998382cf5 SHA256 caee5cdc27c1855afc3fab9da6412918f1a663a4eff4866ba7eb6f51eda5b73e
-MD5 332f297974b1fe4b52ddd8308648359f ChangeLog 25767
-RMD160 e8a83c4826e15451382b98fcd4896f7a9fcde3e3 ChangeLog 25767
-SHA256 caee5cdc27c1855afc3fab9da6412918f1a663a4eff4866ba7eb6f51eda5b73e ChangeLog 25767
+MISC ChangeLog 25769 RMD160 ce34048f6088b3cf99c80ca90ed134b14f886d7f SHA1 30c4e15359e0b6ba0f76c5165db848dec47da892 SHA256 adfd43179b5255abd53e0fd4cc78e17d49b20294e609aeaeeb67434a0748f5f5
+MD5 5c7ed487bc17470a46a29edcbc74a57b ChangeLog 25769
+RMD160 ce34048f6088b3cf99c80ca90ed134b14f886d7f ChangeLog 25769
+SHA256 adfd43179b5255abd53e0fd4cc78e17d49b20294e609aeaeeb67434a0748f5f5 ChangeLog 25769
 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 a45c1cc2431a74255c981575cf033f94 files/digest-emacs-cvs-22.0.97 247
-RMD160 1a034da94a1d0ea15deae209e53da79099b0ed97 files/digest-emacs-cvs-22.0.97 247
-SHA256 2cf2e7a1662db28db007818b2a58d1a4156216dcfdc2f8cee0dbba49517476a3 files/digest-emacs-cvs-22.0.97 247
 MD5 07fa6d117472cfb4f75c1d00ec300709 files/digest-emacs-cvs-22.0.990 250
 RMD160 46f7fa259ce23c2a8ee97d9cc5e88b8f93d29b60 files/digest-emacs-cvs-22.0.990 250
 SHA256 00f87abb7a35a8ee4f7f6624fb1ac8e567fe7977dcd7405d603e754122ddb5c4 files/digest-emacs-cvs-22.0.990 250
@@ -75,9 +67,9 @@ MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r6 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r6 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r6 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGbxRRAiZjviIA2XgRArRGAJ0dCS09G+rHdo3QpejLmG2HJ80u3QCg0z9h
-0nFWunPevKKMrDnua/MzoYU=
-=qvMJ
+iD8DBQFGbxj5Oeoy/oIi7uwRAge7AJ9Far8pvBktsSTFM8tYDZJZ5BEscwCg2fub
+FVn4iA+hoglM4faDKCuaoYM=
+=yVYe
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild
deleted file mode 100644
index 557a1e53054c..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild
+++ /dev/null
@@ -1,212 +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.97.ebuild,v 1.4 2007/05/15 15:02:26 ulm Exp $
-
-WANT_AUTOCONF="2.61"
-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/editor"
-
-SLOT="22"
-OLD_SLOT="22.0.97"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~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"
-
-	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-${OLD_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-${OLD_SLOT}.emacs-${OLD_SLOT} || die "removing duplicate emacs executable failed"
-	dohard /usr/bin/emacs.emacs-${OLD_SLOT} /usr/bin/emacs-${OLD_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-${OLD_SLOT}
-	mv "${D}"/usr/share/info/{,emacs-${OLD_SLOT}/}dir || die "mv dir failed"
-	for i in "${D}"/usr/share/info/*
-	do
-		if [ "${i##*/}" != emacs-${OLD_SLOT} ] ; then
-			mv ${i} ${i/info/info/emacs-${OLD_SLOT}}.info
-		fi
-	done
-
-	insinto /etc/env.d
-	cat >"${D}"/etc/env.d/50emacs-cvs-${OLD_SLOT} <<EOF
-INFOPATH=/usr/share/info/emacs-${OLD_SLOT}
-EOF
-	einfo "Fixing manpages..."
-	for m in  "${D}"/usr/share/man/man1/* ; do
-		mv ${m} ${m/.1/.emacs-${OLD_SLOT}.1} || die "mv man failed"
-	done
-
-	# avoid collision between slots
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-
-	if use source; then
-		insinto /usr/share/emacs/${OLD_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-${OLD_SLOT}-gentoo.el <<EOF
-(when (substring emacs-version 0 (length "${OLD_SLOT}"))
-  (setq find-function-C-source-directory "/usr/share/emacs/${OLD_SLOT}/src"))
-EOF
-		elisp-site-file-install 00emacs-cvs-${OLD_SLOT}-gentoo.el
-	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() {
-	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${OLD_SLOT},}/site-lisp/subdirs.el
-
-	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 "${ROOT}/usr/share/info/emacs-${OLD_SLOT}/dir.*" 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() {
-	update-alternatives
-	elisp-site-regen
-}
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.97 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.97
deleted file mode 100644
index d0683d45d6a3..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.97
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bfcda2615b9761d1dc546e1c907c584a emacs-22.0.97.tar.gz 37900456
-RMD160 3bd5abe6fdf4e1574b6fda4b2e85cfbf171fbab4 emacs-22.0.97.tar.gz 37900456
-SHA256 1b2cd679a1cbb1b6971291beac5d68ae55be538691c1fc8164f936899b8a913b emacs-22.0.97.tar.gz 37900456