old ebuilds

12 files changed, 3 insertions, 760 deletions

diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index d96f69981596..40055d938fca 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -3,22 +3,11 @@ Hash: SHA1
 
 MD5 29cb6a9e4acff4f296f8af11d1f702f6 ChangeLog 13613
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 e89210ddf781e36e04afce8d7108c65a ncurses-5.3-r5.ebuild 3863
 MD5 2d0cc2efb3441450e5d7a06b36a04d13 ncurses-5.4-r1.ebuild 4782
-MD5 56119e8feb5337d1d5bc4125c6ddaf2a ncurses-5.4-r2.ebuild 5432
-MD5 c0a47569107ff1bf2cc2bdfad2f9d864 ncurses-5.4-r3.ebuild 5383
-MD5 1ce139bb792e99a0810847bb3eec735f ncurses-5.4-r4.ebuild 5810
 MD5 b4aecd68587454301648cf0c2d81a149 ncurses-5.4-r5.ebuild 5921
 MD5 42bb017699458eb0d24c630da5f79e5d ncurses-8.1.ebuild 413
-MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r2 64
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ncurses-8.1 0
-MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r3 64
-MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r4 64
-MD5 f96d1b4b0bf94f1d38ce950df0efb37e files/ncurses-5.3-xterm.patch 1002
 MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342
-MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r5 64
-MD5 143b9126206485a5faeb817fd94b1054 files/ncurses-5.3-coreutils.patch 1581
-MD5 c5b265c81eb2dea26b66cd656c61e99c files/ncurses-5.3-share-sed.patch 686
 MD5 1ecbf68a55269d2cebeb997f6973fc1d files/ncurses-5.4-share-sed.patch 686
 MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495
 MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r1 64
@@ -26,7 +15,7 @@ MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r5 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBeADVHTu7gpaalycRAqgTAJ0dLtIvcI6Xj55tyldTxAvWutwkggCgtadb
-8z1PSKlvTeUtLRJruC0ogcQ=
-=2t0E
+iD8DBQFBeAJfHTu7gpaalycRAjTeAKCvxjwuhSMBm9fUK+fyRejRSUIpYACeM97F
+O+W0Trh7k3xH/hq+2zgDWGw=
+=/3tj
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.3-r5 b/sys-libs/ncurses/files/digest-ncurses-5.3-r5
deleted file mode 100644
index e8f327278e5b..000000000000
--- a/sys-libs/ncurses/files/digest-ncurses-5.3-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5dcc9faa93157eafa572494bffed131a ncurses-5.3.tar.gz 2067718
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.4-r2 b/sys-libs/ncurses/files/digest-ncurses-5.4-r2
deleted file mode 100644
index fdf84beb38f9..000000000000
--- a/sys-libs/ncurses/files/digest-ncurses-5.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 069c8880072060373290a4fefff43520 ncurses-5.4.tar.gz 2154022
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.4-r3 b/sys-libs/ncurses/files/digest-ncurses-5.4-r3
deleted file mode 100644
index fdf84beb38f9..000000000000
--- a/sys-libs/ncurses/files/digest-ncurses-5.4-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 069c8880072060373290a4fefff43520 ncurses-5.4.tar.gz 2154022
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.4-r4 b/sys-libs/ncurses/files/digest-ncurses-5.4-r4
deleted file mode 100644
index fdf84beb38f9..000000000000
--- a/sys-libs/ncurses/files/digest-ncurses-5.4-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 069c8880072060373290a4fefff43520 ncurses-5.4.tar.gz 2154022
diff --git a/sys-libs/ncurses/files/ncurses-5.3-coreutils.patch b/sys-libs/ncurses/files/ncurses-5.3-coreutils.patch
deleted file mode 100644
index 94e9e5623542..000000000000
--- a/sys-libs/ncurses/files/ncurses-5.3-coreutils.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -urN ncurses-5.3/configure ncurses-5.3.coretutils/configure
---- ncurses-5.3/configure	2002-09-22 02:49:14.000000000 +0200
-+++ ncurses-5.3.coretutils/configure	2004-01-11 16:40:25.690883976 +0200
-@@ -1963,7 +1963,7 @@
- if test "$GCC" = yes ; then
- 	echo "$as_me:1964: checking version of gcc" >&5
- echo $ECHO_N "checking version of gcc... $ECHO_C" >&6
--	GCC_VERSION="`${CC} --version|head -1`"
-+	GCC_VERSION="`${CC} --version|head -n 1`"
- 	echo "$as_me:1967: result: $GCC_VERSION" >&5
- echo "${ECHO_T}$GCC_VERSION" >&6
- fi
-@@ -2850,7 +2850,7 @@
- if test "$GXX" = yes; then
- 	echo "$as_me:2851: checking version of g++" >&5
- echo $ECHO_N "checking version of g++... $ECHO_C" >&6
--	GXX_VERSION="`${CXX-g++} --version|head -1`"
-+	GXX_VERSION="`${CXX-g++} --version|head -n 1`"
- 	echo "$as_me:2854: result: $GXX_VERSION" >&5
- echo "${ECHO_T}$GXX_VERSION" >&6
- 	case $GXX_VERSION in
-diff -urN ncurses-5.3/configure.in ncurses-5.3.coretutils/configure.in
---- ncurses-5.3/configure.in	2002-09-15 02:11:28.000000000 +0200
-+++ ncurses-5.3.coretutils/configure.in	2004-01-11 16:40:25.733877440 +0200
-@@ -83,7 +83,7 @@
- GCC_VERSION=none
- if test "$GCC" = yes ; then
- 	AC_MSG_CHECKING(version of gcc)
--	GCC_VERSION="`${CC} --version|head -1`"
-+	GCC_VERSION="`${CC} --version|head -n 1`"
- 	AC_MSG_RESULT($GCC_VERSION)
- fi
- 
-@@ -158,7 +158,7 @@
- GXX_VERSION=none
- if test "$GXX" = yes; then
- 	AC_MSG_CHECKING(version of g++)
--	GXX_VERSION="`${CXX-g++} --version|head -1`"
-+	GXX_VERSION="`${CXX-g++} --version|head -n 1`"
- 	AC_MSG_RESULT($GXX_VERSION)
- 	case $GXX_VERSION in
- 	1*|2.[[0-6]]*)
diff --git a/sys-libs/ncurses/files/ncurses-5.3-share-sed.patch b/sys-libs/ncurses/files/ncurses-5.3-share-sed.patch
deleted file mode 100644
index f069ac6c895e..000000000000
--- a/sys-libs/ncurses/files/ncurses-5.3-share-sed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN ncurses-5.3/misc/run_tic.in ncurses-5.3.share/misc/run_tic.in
---- ncurses-5.3/misc/run_tic.in	2001-10-14 08:44:33.000000000 +0800
-+++ ncurses-5.3.share/misc/run_tic.in	2004-02-21 15:46:09.000000000 +0800
-@@ -81,7 +81,8 @@
- umask 022
- 
- # Construct the name of the old (obsolete) pathname, e.g., /usr/lib/terminfo.
--TICDIR=`echo $TERMINFO | sed -e 's@/share/@/lib/@'`
-+# make sure only last share directory in the $TERMINFO path is changed to lib
-+TICDIR=`echo $TERMINFO | sed -e 's@/share/terminfo$@/lib/terminfo@'`
- 
- # Remove the old terminfo stuff; we don't care if it existed before, and it
- # would generate a lot of confusing error messages if we tried to overwrite it.
diff --git a/sys-libs/ncurses/files/ncurses-5.3-xterm.patch b/sys-libs/ncurses/files/ncurses-5.3-xterm.patch
deleted file mode 100644
index d774fc66b0a9..000000000000
--- a/sys-libs/ncurses/files/ncurses-5.3-xterm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ncurses-5.3/misc/terminfo.src.orig	2002-10-05 20:40:53.000000000 +0200
-+++ ncurses-5.3/misc/terminfo.src	2003-05-23 15:50:57.000000000 +0200
-@@ -2752,8 +2752,8 @@
- 
- xterm-xfree86|xterm-new|xterm terminal emulator (XFree86 4.0 Window System), 
- 	npc, 
--	kDC=\E[3;2~, kEND=\EO2F, kHOM=\EO2H, kIC=\E[2;2~, 
--	kLFT=\EO2D, kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\EO2C, 
-+	kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, 
-+	kLFT=\E[1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\E[1;2C, 
- 	kb2=\EOE, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, 
- 	kcuu1=\EOA, kend=\EOF, kent=\EOM, kf1=\EOP, kf10=\E[21~, 
- 	kf11=\E[23~, kf12=\E[24~, kf13=\EO2P, kf14=\EO2Q, 
-@@ -2922,8 +2922,8 @@
- 
- # This is xterm for ncurses.
- xterm|xterm terminal emulator (X Window System), 
--	use=xterm-r6, 
--#	use=xterm-xfree86, 
-+#	use=xterm-r6, 
-+	use=xterm-xfree86, 
- 
- # These entries allow access to the X titlebar and icon name as a status line. 
- # Note that twm (and possibly window managers descended from it such as tvtwm, 
diff --git a/sys-libs/ncurses/ncurses-5.3-r5.ebuild b/sys-libs/ncurses/ncurses-5.3-r5.ebuild
deleted file mode 100644
index a306b5dfd2b6..000000000000
--- a/sys-libs/ncurses/ncurses-5.3-r5.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.3-r5.ebuild,v 1.20 2004/09/23 18:57:33 vapier Exp $
-
-inherit eutils flag-o-matic 64-bit gnuconfig
-
-DESCRIPTION="console display library"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html"
-SRC_URI="mirror://gnu/ncurses/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="x86 ppc sparc alpha hppa mips amd64 ia64 ppc64 s390"
-IUSE="debug"
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-xterm.patch
-	epatch ${FILESDIR}/${P}-coreutils.patch
-	# Bug #42336.
-	epatch ${FILESDIR}/${P}-share-sed.patch
-
-	filter-flags -fno-exceptions
-	gnuconfig_update
-}
-
-src_compile() {
-	use debug && myconf="${myconf} --without-debug"
-
-	# Shared objects are compiled properly with -fPIC, but
-	# standard libs also require this.
-	64-bit && append-flags -fPIC
-
-	# From version 5.3, ncurses also build c++ bindings, and as
-	# we do not have a c++ compiler during bootstrap, disable
-	# building it.  We will rebuild ncurses after gcc's second
-	# build in bootstrap.sh.
-	# <azarah@gentoo.org> (23 Oct 2002)
-	( use build || use bootstrap ) \
-		&& myconf="${myconf} --without-cxx --without-cxx-binding --without-ada"
-
-	# We need the basic terminfo files in /etc, bug #37026.  We will
-	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
-	# src_install() ...
-	econf \
-		--libdir=/lib \
-		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
-		--disable-termcap \
-		--with-shared \
-		--with-rcs-ids \
-		--without-ada \
-		--enable-symlinks \
-		${myconf} || die "configure failed"
-
-	# do not work with -j2 on P4 - <azarah@gentoo.org> (23 Oct 2002)
-	make || die "make failed"
-}
-
-src_install() {
-	local x=
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	# Move static and extraneous ncurses libraries out of /lib
-	cd ${D}/lib
-	dodir /usr/lib
-	mv libform* libmenu* libpanel* ${D}/usr/lib
-	mv *.a ${D}/usr/lib
-	# bug #4411
-	gen_usr_ldscript libncurses.so || die "gen_usr_ldscript failed"
-	gen_usr_ldscript libcurses.so || die "gen_usr_ldscript failed"
-
-# Breaks ncurses-5.3-xterm.patch
-#	# With this fix, the default xterm has color as it should
-#	cd ${D}/usr/share/terminfo/x
-#	mv xterm xterm.orig
-#	dosym xterm-color /usr/share/terminfo/x/xterm
-
-	# We need the basic terminfo files in /etc, bug #37026
-	einfo "Installing basic terminfo files in /etc..."
-	for x in dumb linux rxvt screen sun vt{52,100,102,220} xterm
-	do
-		local termfile="$(find "${D}/usr/share/terminfo/" -name "${x}" 2>/dev/null)"
-		local basedir="$(basename $(dirname "${termfile}"))"
-
-		if [ -n "${termfile}" ]
-		then
-			dodir /etc/terminfo/${basedir}
-			mv ${termfile} ${D}/etc/terminfo/${basedir}/
-			dosym ../../../../etc/terminfo/${basedir}/${x} \
-				/usr/share/terminfo/${basedir}/${x}
-		fi
-	done
-
-	# Build fails to create this ...
-	dosym ../share/terminfo /usr/lib/terminfo
-
-	if use build
-	then
-		cd ${D}
-		rm -rf usr/share/man
-		cd usr/share/terminfo
-		cp -a l/linux n/nxterm v/vt100 ${T}
-		rm -rf *
-		mkdir l x v
-		cp -a ${T}/linux l
-		cp -a ${T}/nxterm x/xterm
-		cp -a ${T}/vt100 v
-		# bash compilation requires static libncurses libraries, so
-		# this breaks the "build a new build image" system.  We now
-		# need to remove libncurses.a from the build image manually.
-		# cd ${D}/usr/lib; rm *.a
-	else
-		# Install xterm-debian terminfo entry to satisfy bug #18486
-		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/lib:${D}/lib \
-			TERMINFO=${D}/usr/share/terminfo \
-			${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti
-
-		cd ${S}
-		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO
-		dodoc doc/*.doc
-		dohtml -r doc/html/
-	fi
-}
-
-pkg_postinst() {
-	# Old ncurses may still be around from old build tbz2's.
-	rm -f ${ROOT}/lib/libncurses.so.5.2
-	rm -f ${ROOT}/usr/lib/lib{form,menu,panel}.so.5.2
-}
diff --git a/sys-libs/ncurses/ncurses-5.4-r2.ebuild b/sys-libs/ncurses/ncurses-5.4-r2.ebuild
deleted file mode 100644
index 62f9f0d316da..000000000000
--- a/sys-libs/ncurses/ncurses-5.4-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r2.ebuild,v 1.10 2004/09/23 18:57:33 vapier Exp $
-
-inherit eutils flag-o-matic 64-bit gnuconfig
-
-DESCRIPTION="console display library"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html"
-SRC_URI="mirror://gnu/ncurses/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="build bootstrap debug uclibc"
-
-DEPEND="virtual/libc"
-# This doesn't fix the problem. bootstrap builds ncurses again with
-# normal USE flags while bootstrap is unset, which apparently causes
-# things to break -- avenj  2 Apr 04
-#	!bootstrap? ( gpm? ( sys-libs/gpm ) )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-xterm.patch
-	# Bug #42336.
-	epatch ${FILESDIR}/${P}-share-sed.patch
-	gnuconfig_update
-}
-
-src_compile() {
-	local myconf=
-
-	filter-flags -fno-exceptions
-
-	use debug || myconf="${myconf} --without-debug"
-
-	# Shared objects are compiled properly with -fPIC, but
-	# standard libs also require this.
-	64-bit && append-flags -fPIC
-	filter-ldflags -pie
-
-	# From version 5.3, ncurses also build c++ bindings, and as
-	# we do not have a c++ compiler during bootstrap, disable
-	# building it.  We will rebuild ncurses after gcc's second
-	# build in bootstrap.sh.
-	# <azarah@gentoo.org> (23 Oct 2002)
-	( use build || use bootstrap || use uclibc ) \
-		&& myconf="${myconf} --without-cxx --without-cxx-binding --without-ada"
-
-	# see note about DEPEND above -- avenj@gentoo.org  2 Apr 04
-#	use gpm && myconf="${myconf} --with-gpm"
-
-	# We need the basic terminfo files in /etc, bug #37026.  We will
-	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
-	# src_install() ...
-	econf \
-		--libdir=/$(get_libdir) \
-		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
-		--disable-termcap \
-		--with-shared \
-		--with-rcs-ids \
-		--without-ada \
-		--enable-symlinks \
-		${myconf} \
-		|| die "configure failed"
-
-	# A little hack to fix parallel builds ... they break when
-	# generating sources so if we generate the sources first (in
-	# non-parallel), we can then build the rest of the package
-	# in parallel.  This is not really a perf hit since the source
-	# generation is quite small.  -vapier
-	emake -j1 sources || die "make sources failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	local x=
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	# Move static and extraneous ncurses libraries out of /lib
-	cd ${D}/$(get_libdir)
-	dodir /usr/$(get_libdir)
-	mv libform* libmenu* libpanel* ${D}/usr/$(get_libdir)
-	mv *.a ${D}/usr/$(get_libdir)
-	# bug #4411
-	gen_usr_ldscript libncurses.so || die "gen_usr_ldscript failed"
-	gen_usr_ldscript libcurses.so || die "gen_usr_ldscript failed"
-
-	# We need the basic terminfo files in /etc, bug #37026
-	einfo "Installing basic terminfo files in /etc..."
-	# added some for uclibc
-	#for x in dumb linux rxvt screen sun vt{52,100,102,220} xterm
-	for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} xterm xterm-color xterm-xfree86
-	do
-		local termfile="$(find "${D}/usr/share/terminfo/" -name "${x}" 2>/dev/null)"
-		local basedir="$(basename $(dirname "${termfile}"))"
-
-		if [ -n "${termfile}" ]
-		then
-			dodir /etc/terminfo/${basedir}
-			mv ${termfile} ${D}/etc/terminfo/${basedir}/
-			dosym ../../../../etc/terminfo/${basedir}/${x} \
-				/usr/share/terminfo/${basedir}/${x}
-		fi
-	done
-
-	# Build fails to create this ...
-	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > ${D}/etc/env.d/50ncurses
-
-	if use build
-	then
-		cd ${D}
-		rm -rf usr/share/man
-		cd usr/share/terminfo
-		cp -a l/linux n/nxterm v/vt100 ${T}
-		rm -rf *
-		mkdir l x v
-		cp -a ${T}/linux l
-		cp -a ${T}/nxterm x/xterm
-		cp -a ${T}/vt100 v
-		# bash compilation requires static libncurses libraries, so
-		# this breaks the "build a new build image" system.  We now
-		# need to remove libncurses.a from the build image manually.
-		# cd ${D}/usr/lib; rm *.a
-		# remove extraneous ncurses libraries
-		cd ${D}/usr/lib; rm -f lib{form,menu,panel}*
-		cd ${D}/usr/include; rm -f {eti,form,menu,panel}.h
-	else
-		if ( use bootstrap || use uclibc ) ; then
-			cd ${D}/usr/lib; rm -f lib{form,menu,panel,ncurses++}*
-			cd ${D}/usr/include; rm -f {eti,form,menu,panel}.h cursesapp.h curses?.h cursslk.h etip.h
-		fi
-		# Install xterm-debian terminfo entry to satisfy bug #18486
-		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir):${D}/$(get_libdir) \
-			TERMINFO=${D}/usr/share/terminfo \
-			${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti
-
-		if use uclibc ; then
-			cp ${D}/usr/share/terminfo/x/xterm-debian ${D}/etc/terminfo/x/
-			rm -rf ${D}/usr/share/terminfo/*
-		fi
-
-		cd ${S}
-		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO
-		dodoc doc/*.doc
-		dohtml -r doc/html/
-	fi
-}
-
-pkg_preinst() {
-	if [ ! -f "${ROOT}/etc/env.d/50ncurses" ]
-	then
-		mkdir -p "${ROOT}/etc/env.d"
-		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > \
-			${ROOT}/etc/env.d/50ncurses
-	fi
-}
-
-pkg_postinst() {
-	# Old ncurses may still be around from old build tbz2's.
-	rm -f ${ROOT}/lib/libncurses.so.5.[23]
-	rm -f ${ROOT}/usr/lib/lib{form,menu,panel}.so.5.[23]
-	if [ "$(get_libdir)" != "lib" ] ;then
-		rm -f ${ROOT}/$(get_libdir)/libncurses.so.5.[23]
-		rm -f ${ROOT}/usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23]
-	fi
-}
diff --git a/sys-libs/ncurses/ncurses-5.4-r3.ebuild b/sys-libs/ncurses/ncurses-5.4-r3.ebuild
deleted file mode 100644
index ccf611bab5fe..000000000000
--- a/sys-libs/ncurses/ncurses-5.4-r3.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r3.ebuild,v 1.10 2004/09/23 18:57:33 vapier Exp $
-
-inherit eutils flag-o-matic 64-bit gnuconfig
-
-DESCRIPTION="console display library"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html"
-SRC_URI="mirror://gnu/ncurses/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~x86 ~ppc ~sparc ~mips alpha ~arm ~hppa ~amd64 ia64 ~ppc64 ~s390"
-IUSE="build bootstrap debug doc uclibc"
-
-DEPEND="virtual/libc"
-# This doesn't fix the problem. bootstrap builds ncurses again with
-# normal USE flags while bootstrap is unset, which apparently causes
-# things to break -- avenj  2 Apr 04
-#	!bootstrap? ( gpm? ( sys-libs/gpm ) )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-xterm.patch
-	# Bug #42336.
-	epatch ${FILESDIR}/${P}-share-sed.patch
-	gnuconfig_update
-}
-
-src_compile() {
-	local myconf=
-
-	filter-flags -fno-exceptions
-
-	use debug || myconf="${myconf} --without-debug"
-
-	# Shared objects are compiled properly with -fPIC, but
-	# standard libs also require this.
-	64-bit && append-flags -fPIC
-	filter-ldflags -pie
-
-	# From version 5.3, ncurses also build c++ bindings, and as
-	# we do not have a c++ compiler during bootstrap, disable
-	# building it.  We will rebuild ncurses after gcc's second
-	# build in bootstrap.sh.
-	# <azarah@gentoo.org> (23 Oct 2002)
-	( use build || use bootstrap || use uclibc ) \
-		&& myconf="${myconf} --without-cxx --without-cxx-binding --without-ada"
-
-	# see note about DEPEND above -- avenj@gentoo.org  2 Apr 04
-#	use gpm && myconf="${myconf} --with-gpm"
-
-	# We need the basic terminfo files in /etc, bug #37026.  We will
-	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
-	# src_install() ...
-	econf \
-		--libdir=/$(get_libdir) \
-		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
-		--disable-termcap \
-		--with-shared \
-		--with-rcs-ids \
-		--without-ada \
-		--enable-symlinks \
-		${myconf} \
-		|| die "configure failed"
-
-	# A little hack to fix parallel builds ... they break when
-	# generating sources so if we generate the sources first (in
-	# non-parallel), we can then build the rest of the package
-	# in parallel.  This is not really a perf hit since the source
-	# generation is quite small.  -vapier
-	emake -j1 sources || die "make sources failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	local x=
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	# Move static and extraneous ncurses libraries out of /lib
-	cd ${D}/$(get_libdir)
-	dodir /usr/$(get_libdir)
-	mv libform* libmenu* libpanel* *.a ${D}/usr/$(get_libdir)
-	# bug #4411
-	gen_usr_ldscript libncurses.so || die "gen_usr_ldscript failed"
-	gen_usr_ldscript libcurses.so || die "gen_usr_ldscript failed"
-
-	# We need the basic terminfo files in /etc, bug #37026
-	einfo "Installing basic terminfo files in /etc..."
-	# added some for uclibc
-	#for x in dumb linux rxvt screen sun vt{52,100,102,220} xterm
-	for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} xterm xterm-color xterm-xfree86
-	do
-		local termfile="$(find "${D}/usr/share/terminfo/" -name "${x}" 2>/dev/null)"
-		local basedir="$(basename $(dirname "${termfile}"))"
-
-		if [ -n "${termfile}" ]
-		then
-			dodir /etc/terminfo/${basedir}
-			mv ${termfile} ${D}/etc/terminfo/${basedir}/
-			dosym ../../../../etc/terminfo/${basedir}/${x} \
-				/usr/share/terminfo/${basedir}/${x}
-		fi
-	done
-
-	# Build fails to create this ...
-	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > ${D}/etc/env.d/50ncurses
-
-	if use build
-	then
-		cd ${D}
-		rm -rf usr/share/man
-		cd usr/share/terminfo
-		cp -a l/linux n/nxterm v/vt100 ${T}
-		rm -rf *
-		mkdir l x v
-		cp -a ${T}/linux l
-		cp -a ${T}/nxterm x/xterm
-		cp -a ${T}/vt100 v
-		# bash compilation requires static libncurses libraries, so
-		# this breaks the "build a new build image" system.  We now
-		# need to remove libncurses.a from the build image manually.
-		# cd ${D}/usr/lib; rm *.a
-		# remove extraneous ncurses libraries
-		cd ${D}/usr/lib; rm -f lib{form,menu,panel}*
-		cd ${D}/usr/include; rm -f {eti,form,menu,panel}.h
-	else
-		if use bootstrap ; then
-			cd ${D}/usr/lib; rm -f lib{form,menu,panel,ncurses++}*
-			cd ${D}/usr/include; rm -f {eti,form,menu,panel}.h cursesapp.h curses?.h cursslk.h etip.h
-		fi
-		# Install xterm-debian terminfo entry to satisfy bug #18486
-		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir):${D}/$(get_libdir) \
-			TERMINFO=${D}/usr/share/terminfo \
-			${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti
-
-		if use uclibc ; then
-			cp ${D}/usr/share/terminfo/x/xterm-debian ${D}/etc/terminfo/x/
-			rm -rf ${D}/usr/share/terminfo/*
-		fi
-
-		cd ${S}
-		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
-		use doc && dohtml -r doc/html/
-	fi
-}
-
-pkg_preinst() {
-	if [ ! -f "${ROOT}/etc/env.d/50ncurses" ]
-	then
-		mkdir -p "${ROOT}/etc/env.d"
-		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > \
-			${ROOT}/etc/env.d/50ncurses
-	fi
-}
-
-pkg_postinst() {
-	# Old ncurses may still be around from old build tbz2's.
-	rm -f ${ROOT}/lib/libncurses.so.5.[23] ${ROOT}/usr/lib/lib{form,menu,panel}.so.5.[23]
-	if [ "$(get_libdir)" != "lib" ] ; then
-		rm -f ${ROOT}/$(get_libdir)/libncurses.so.5.[23] \
-			${ROOT}/usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23]
-	fi
-}
diff --git a/sys-libs/ncurses/ncurses-5.4-r4.ebuild b/sys-libs/ncurses/ncurses-5.4-r4.ebuild
deleted file mode 100644
index 39f990a01397..000000000000
--- a/sys-libs/ncurses/ncurses-5.4-r4.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r4.ebuild,v 1.5 2004/09/23 18:57:33 vapier Exp $
-
-inherit eutils flag-o-matic 64-bit gnuconfig
-
-DESCRIPTION="console display library"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html"
-SRC_URI="mirror://gnu/ncurses/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="build bootstrap debug doc uclibc unicode"
-
-DEPEND="virtual/libc"
-# This doesn't fix the problem. bootstrap builds ncurses again with
-# normal USE flags while bootstrap is unset, which apparently causes
-# things to break -- avenj  2 Apr 04
-#	!bootstrap? ( gpm? ( sys-libs/gpm ) )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-xterm.patch
-	# Bug #42336.
-	epatch ${FILESDIR}/${P}-share-sed.patch
-	gnuconfig_update
-}
-
-src_compile() {
-	local myconf=
-
-	filter-flags -fno-exceptions
-
-	use debug || myconf="${myconf} --without-debug"
-
-	# Shared objects are compiled properly with -fPIC, but
-	# standard libs also require this.
-	64-bit && append-flags -fPIC
-	filter-ldflags -pie
-
-	# From version 5.3, ncurses also build c++ bindings, and as
-	# we do not have a c++ compiler during bootstrap, disable
-	# building it.  We will rebuild ncurses after gcc's second
-	# build in bootstrap.sh.
-	# <azarah@gentoo.org> (23 Oct 2002)
-	( use build || use bootstrap || use uclibc ) \
-		&& myconf="${myconf} --without-cxx --without-cxx-binding --without-ada"
-
-	# see note about DEPEND above -- avenj@gentoo.org  2 Apr 04
-#	use gpm && myconf="${myconf} --with-gpm"
-
-	# enable utf-8 support
-	use unicode && myconf="${myconf} --enable-widec"
-
-	# We need the basic terminfo files in /etc, bug #37026.  We will
-	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
-	# src_install() ...
-	econf \
-		--libdir=/$(get_libdir) \
-		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
-		--disable-termcap \
-		--with-shared \
-		--with-rcs-ids \
-		--without-ada \
-		--enable-symlinks \
-		${myconf} \
-		|| die "configure failed"
-
-	# A little hack to fix parallel builds ... they break when
-	# generating sources so if we generate the sources first (in
-	# non-parallel), we can then build the rest of the package
-	# in parallel.  This is not really a perf hit since the source
-	# generation is quite small.  -vapier
-	emake -j1 sources || die "make sources failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	local x=
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	# Move static and extraneous ncurses libraries out of /lib
-	cd ${D}/$(get_libdir)
-	dodir /usr/$(get_libdir)
-	mv libform* libmenu* libpanel* *.a ${D}/usr/$(get_libdir)
-
-	if use unicode ; then
-		gen_usr_ldscript libncursesw.so
-		for i in ${D}/usr/$(get_libdir)/*w.*; do
-			local libncurses=${i/${D}/}
-			dosym ${libncurses} ${libncurses/w./.}
-		done
-		for i in ${D}/$(get_libdir)/libncursesw.so*; do
-			local libncurses=${i/${D}}
-			dosym ${libncurses} ${libncurses/w./.}
-		done
-	else
-		# bug #4411
-		gen_usr_ldscript libncurses.so || die "gen_usr_ldscript failed"
-		gen_usr_ldscript libcurses.so || die "gen_usr_ldscript failed"
-	fi
-
-	# We need the basic terminfo files in /etc, bug #37026
-	einfo "Installing basic terminfo files in /etc..."
-	# added some for uclibc
-	#for x in dumb linux rxvt screen sun vt{52,100,102,220} xterm
-	for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} xterm xterm-color xterm-xfree86
-	do
-		local termfile="$(find "${D}/usr/share/terminfo/" -name "${x}" 2>/dev/null)"
-		local basedir="$(basename $(dirname "${termfile}"))"
-
-		if [ -n "${termfile}" ]
-		then
-			dodir /etc/terminfo/${basedir}
-			mv ${termfile} ${D}/etc/terminfo/${basedir}/
-			dosym ../../../../etc/terminfo/${basedir}/${x} \
-				/usr/share/terminfo/${basedir}/${x}
-		fi
-	done
-
-	# Build fails to create this ...
-	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > ${D}/etc/env.d/50ncurses
-
-	if use build
-	then
-		cd ${D}
-		rm -rf usr/share/man
-		cd usr/share/terminfo
-		cp -a l/linux n/nxterm v/vt100 ${T}
-		rm -rf *
-		mkdir l x v
-		cp -a ${T}/linux l
-		cp -a ${T}/nxterm x/xterm
-		cp -a ${T}/vt100 v
-		# bash compilation requires static libncurses libraries, so
-		# this breaks the "build a new build image" system.  We now
-		# need to remove libncurses.a from the build image manually.
-		# cd ${D}/usr/lib; rm *.a
-		# remove extraneous ncurses libraries
-		cd ${D}/usr/$(get_libdir); rm -f lib{form,menu,panel}*
-		cd ${D}/usr/include; rm -f {eti,form,menu,panel}.h
-	else
-		if use bootstrap ; then
-			cd ${D}/usr/$(get_libdir); rm -f lib{form,menu,panel,ncurses++}*
-			cd ${D}/usr/include; rm -f {eti,form,menu,panel}.h cursesapp.h curses?.h cursslk.h etip.h
-		fi
-		# Install xterm-debian terminfo entry to satisfy bug #18486
-		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir):${D}/$(get_libdir) \
-			TERMINFO=${D}/usr/share/terminfo \
-			${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti
-
-		if use uclibc ; then
-			cp ${D}/usr/share/terminfo/x/xterm-debian ${D}/etc/terminfo/x/
-			rm -rf ${D}/usr/share/terminfo/*
-		fi
-
-		cd ${S}
-		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
-		use doc && dohtml -r doc/html/
-	fi
-}
-
-pkg_preinst() {
-	if [ ! -f "${ROOT}/etc/env.d/50ncurses" ]
-	then
-		mkdir -p "${ROOT}/etc/env.d"
-		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > \
-			${ROOT}/etc/env.d/50ncurses
-	fi
-}
-
-pkg_postinst() {
-	# Old ncurses may still be around from old build tbz2's.
-	rm -f ${ROOT}/lib/libncurses.so.5.[23] ${ROOT}/usr/lib/lib{form,menu,panel}.so.5.[23]
-	if [ "$(get_libdir)" != "lib" ] ; then
-		rm -f ${ROOT}/$(get_libdir)/libncurses.so.5.[23] \
-			${ROOT}/usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23]
-	fi
-}