Removal of 21.4 due to bug 118386, ungif removal.

(Portage version: 2556-svn)

3 files changed, 7 insertions, 169 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index a731523034d0..995fe898a50e 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.75 2005/12/12 03:52:00 spyderous Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.76 2006/01/10 10:46:24 ferringb Exp $
+
+  10 Jan 2006; <ferringb@gentoo.org> -emacs-21.4.ebuild:
+  Removing 21.4; stale version that is succeeded by 21.4-r1 in keywords.
+  Reason for removal is bug 118386, ungif being screwed over for a good chunk
+  of time thus removed.
 
   12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; emacs-21.4-r1.ebuild,
   emacs-22.0.50_pre20050225.ebuild:
diff --git a/app-editors/emacs/emacs-21.4.ebuild b/app-editors/emacs/emacs-21.4.ebuild
deleted file mode 100644
index 8c932a897df8..000000000000
--- a/app-editors/emacs/emacs-21.4.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4.ebuild,v 1.11 2005/05/21 20:22:13 usata Exp $
-
-inherit flag-o-matic eutils alternatives toolchain-funcs
-
-DESCRIPTION="An incredibly powerful, extensible text editor"
-HOMEPAGE="http://www.gnu.org/software/emacs"
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz
-	leim? ( mirror://gnu/emacs/leim-21.3.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="21"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="X Xaw3d gnome leim lesstif motif nls nosendmail"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/gdbm
-	X? ( virtual/x11
-		>=media-libs/libungif-4.1.0.1b
-		>=media-libs/jpeg-6b-r2
-		>=media-libs/tiff-3.5.5-r3
-		>=media-libs/libpng-1.2.1
-		!arm? (
-		Xaw3d? ( x11-libs/Xaw3d )
-		motif? (
-			lesstif? ( x11-libs/lesstif )
-			!lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
-		gnome? ( gnome-base/gnome-desktop )
-		)
-	)
-	nls? ( sys-devel/gettext )
-	!nosendmail? ( virtual/mta )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
-
-PROVIDE="virtual/emacs virtual/editor"
-SANDBOX_DISABLED="1"
-
-DFILE=emacs-${SLOT}.desktop
-
-src_unpack() {
-	# Emacs 21.4 uses leim from 21.3
-	ln -s emacs-21.4 emacs-21.3
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/emacs-21.3-xorg.patch
-	epatch ${FILESDIR}/emacs-21.3-amd64.patch
-	epatch ${FILESDIR}/emacs-21.3-hppa.patch
-	use ppc64 && epatch ${FILESDIR}/emacs-21.3-ppc64.patch
-
-	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
-
-	# 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
-}
-
-src_compile() {
-
-	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
-	filter-flags -fstack-protector
-
-	# bug #77430
-	unset LDFLAGS
-
-	# gcc 3.4 with -O3 or stronger flag spoils emacs
-	if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then
-		replace-flags -O[3-9] -O2
-	fi
-
-	export WANT_AUTOCONF=2.1
-	autoconf
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	if use X ; then
-		if use motif && use lesstif; then
-			append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
-			export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif"
-		fi
-		myconf="${myconf}
-			--with-x
-			--with-xpm
-			--with-jpeg
-			--with-tiff
-			--with-gif
-			--with-png"
-		if use Xaw3d ; then
-			myconf="${myconf} --with-x-toolkit=athena"
-		elif use motif ; then
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			# do not build emacs with any toolkit, bug 35300
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	for i in ${D}/usr/bin/* ; do
-		mv ${i} ${i}.emacs-${SLOT} || die "mv ${i} failed"
-	done
-	mv ${D}/usr/bin/emacs{-${PV},}.emacs-${SLOT} || die "mv emacs failed"
-
-	einfo "Fixing info documentation..."
-	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
-		gzip -9 ${T}/emacs-${SLOT}/${i##*/}.info
-	done
-	mv ${T}/emacs-${SLOT} ${D}/usr/share/info
-	mv ${T}/dir ${D}/usr/share/info/emacs-${SLOT}
-
-	newenvd ${FILESDIR}/60emacs-${SLOT}.envd 60emacs-${SLOT}
-
-	einfo "Fixing manpages..."
-	for m in ${D}/usr/share/man/man1/* ; do
-		mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv ${m} failed"
-	done
-
-	einfo "Fixing permissions..."
-	find ${D} -perm 664 |xargs chmod 644
-	find ${D} -type d |xargs chmod 755
-
-	keepdir /usr/share/emacs/${PV}/leim
-	keepdir /usr/share/emacs/site-lisp
-
-	dodoc BUGS ChangeLog README
-
-	if use gnome ; then
-		insinto /usr/share/gnome/apps/Application
-		doins ${FILESDIR}/${DFILE}
-	fi
-}
-
-update-alternatives() {
-	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
-}
-
-pkg_postinst() {
-	update-alternatives
-	if use nosendmail ; then
-	ewarn
-	ewarn "You disabled sendmail support for Emacs. If you will install any MTA"
-	ewarn "you need to recompile Emacs after that. See bug #11104."
-	ewarn
-	fi
-}
-
-pkg_postrm() {
-	update-alternatives
-}
diff --git a/app-editors/emacs/files/digest-emacs-21.4 b/app-editors/emacs/files/digest-emacs-21.4
deleted file mode 100644
index 57a8aeb49fa3..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0a68ea5b29bb2f081ba8dd85d37bb9bc emacs-21.4.tar.gz 20516657
-MD5 1c968c37e22be0f0d8f8cd57cebe5a5e leim-21.3.tar.gz 3291224