Remove old.

(Portage version: 2.2_rc30/cvs/Linux i686)

3 files changed, 6 insertions, 453 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index e177642c0658..9c2ffd139cb9 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,11 +1,13 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.315 2009/04/14 16:29:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.316 2009/04/14 16:43:46 ulm Exp $
 
-  14 Apr 2009; Jeroen Roovers <jer@gentoo.org> emacs-21.4-r18.ebuild:
-  Stable for HPPA (bug #264504).
+  14 Apr 2009; Ulrich Mueller <ulm@gentoo.org> -emacs-21.4-r17.ebuild,
+  -emacs-22.3-r1.ebuild:
+  Remove old.
 
-  14 Apr 2009; Jeroen Roovers <jer@gentoo.org> emacs-22.3-r2.ebuild:
+  14 Apr 2009; Jeroen Roovers <jer@gentoo.org> emacs-21.4-r18.ebuild,
+  emacs-22.3-r2.ebuild:
   Stable for HPPA (bug #264504).
 
   06 Apr 2009; Raúl Porcel <armin76@gentoo.org> emacs-21.4-r18.ebuild,
diff --git a/app-editors/emacs/emacs-21.4-r17.ebuild b/app-editors/emacs/emacs-21.4-r17.ebuild
deleted file mode 100644
index 73f528412705..000000000000
--- a/app-editors/emacs/emacs-21.4-r17.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild,v 1.17 2009/03/12 01:00:05 ulm Exp $
-
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic eutils toolchain-funcs autotools
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
-	mirror://gentoo/${P}-patches-6.tar.bz2
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2 FDL-1.1 BSD as-is X11"
-SLOT="21"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="X Xaw3d leim motif nls sendmail"
-
-RDEPEND="sys-libs/ncurses
-	X? (
-		x11-libs/libXext
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXmu
-		x11-libs/libXpm
-		app-emacs/emacs-common-gentoo
-		>=media-libs/giflib-4.1.0.1b
-		>=media-libs/jpeg-6b-r2
-		>=media-libs/tiff-3.5.5-r3
-		>=media-libs/libpng-1.2.1
-		Xaw3d? ( x11-libs/Xaw3d )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-	)
-	sendmail? ( virtual/mta )
-	>=app-admin/eselect-emacs-1.2"
-
-DEPEND="${RDEPEND}
-	X? ( x11-misc/xbitmaps )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SUFFIX=patch epatch
-
-	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"
-
-	# install emacsclient.1 man page (bug 165466)
-	sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die
-
-	# This will need to be updated for X-Compilation
-	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-		"${S}/src/s/gnu-linux.h" || die
-
-	eautoconf
-}
-
-src_compile() {
-	export SANDBOX_ON=0
-
-	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
-	filter-flags -fstack-protector
-
-	# emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002)
-	unset LDFLAGS
-
-	# ever since GCC 3.2
-	replace-flags -O[3-9] -O2
-
-	# -march is known to cause signal 6 on some environment
-	filter-flags "-march=*"
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	if use X ; then
-		myconf="${myconf}
-			--with-x
-			--with-xpm
-			--with-jpeg
-			--with-tiff
-			--with-gif
-			--with-png"
-
-		if use Xaw3d ; then
-			einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
-			myconf="${myconf} --with-x-toolkit=athena"
-			use motif \
-				&& ewarn "USE flag \"motif\" ignored (superseded by \"Xaw3d\")"
-		elif use motif ; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			# do not build emacs with any toolkit, bug 35300
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-	econf ${myconf} || die "econf 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
-
-	einstall || die "einstall failed"
-	for i in "${D}"/usr/bin/* ; do
-		mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed"
-	done
-	mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed"
-	rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT}
-
-	# move info documentation to the correct place
-	mkdir "${T}/emacs-${SLOT}"
-	mv "${D}/usr/share/info/dir" "${T}"
-	for i in "${D}"/usr/share/info/*
-	do
-		mv "${i}" "${T}/emacs-${SLOT}/${i##*/}.info"
-	done
-	mv "${T}/emacs-${SLOT}" "${D}/usr/share/info"
-	mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}"
-
-	# move man pages to the correct place
-	for m in "${D}"/usr/share/man/man1/* ; do
-		mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv ${m} failed"
-	done
-
-	# avoid collision between slots
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-
-	# fix permissions
-	find "${D}" -perm 664 |xargs chmod -f 644 2>/dev/null
-	find "${D}" -type d |xargs chmod -f 755 2>/dev/null
-
-	keepdir /usr/share/emacs/${PV}/leim
-	keepdir /usr/share/emacs/site-lisp
-
-	dodoc BUGS ChangeLog README
-}
-
-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
-	[ -d "${ROOT}"${infodir} ] || return	# may occur with FEATURES=noinfo
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	rm -f "${ROOT}"${infodir}/dir{,.*}
-	for f in "${ROOT}"${infodir}/*.info*; do
-		[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
-			&& 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() {
-	test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
-		cp "${ROOT}"/usr/share/emacs{/${PV},}/site-lisp/subdirs.el
-
-	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 sendmail && ! has_version "virtual/mta"; then
-		elog "You disabled sendmail support for Emacs. If you later install"
-		elog "a MTA then you will need to recompile Emacs. See Bug #11104."
-	fi
-}
-
-pkg_postrm() {
-	emacs-infodir-rebuild
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-22.3-r1.ebuild b/app-editors/emacs/emacs-22.3-r1.ebuild
deleted file mode 100644
index e23087776862..000000000000
--- a/app-editors/emacs/emacs-22.3-r1.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r1.ebuild,v 1.12 2009/03/12 01:00:05 ulm Exp $
-
-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-3 FDL-1.2 BSD as-is X11"
-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 kerberos 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 )
-	kerberos? ( virtual/krb5 )
-	spell? ( || ( app-text/aspell app-text/ispell ) )
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		app-emacs/emacs-common-gentoo
-		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}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/emacs-22.1-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/emacs-22.3-freebsd-sparc.patch"
-	# SuperH support (bug 238210)
-	epatch "${FILESDIR}/emacs-22.2-sh.patch"
-	# Fix sporadic segmentation faults in unexec (bug 236579)
-	epatch "${FILESDIR}/emacs-22.3-linux-random-heap.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/Lucid) 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)"
-	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
-
-	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"
-}
-
-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
-	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
-	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
-
-	local c=";;"
-	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]
-		c=""
-	fi
-
-	sed 's/^X//' >"${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	X  ${c}(setq find-function-C-source-directory
-	X  ${c}      "/usr/share/emacs/${FULL_VERSION}/src")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "/usr/share/info/emacs-${SLOT}"))
-	X    (and path
-	X	 ;; move Emacs Info dir to beginning of list
-	X	 (setq Info-directory-list
-	X	       (cons dir (delete dir (split-string path ":" t)))))))
-	EOF
-	elisp-site-file-install "${SITEFILE}" || die
-
-	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
-	[ -d "${ROOT}"${infodir} ] || return	# may occur with FEATURES=noinfo
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	rm -f "${ROOT}"${infodir}/dir{,.*}
-	for f in "${ROOT}"${infodir}/*.info*; do
-		[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
-			&& 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
-
-	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
-}