failed patch commented out, and older ebuilds removed

6 files changed, 16 insertions, 335 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 875a9bb72425..e42fe9870f09 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,12 +1,21 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.10 2002/07/24 16:27:38 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.11 2002/08/01 03:27:16 seemant Exp $
 
 
 *ncurses-5.2.20020511-r1 (9 Jun 2002)
+	
+  31 Jul 2002; Seemant Kulleen <seemant@gentoo.org> :
+
+  the second gcc-3.1 patch (from files/) attempts to replace lines in the
+  cursesw.cc file that do not even exist any longer.  the patch fails.  It
+  has been commented out, with the hope that whoever generated it for the
+  older snapshots will investigate and sort this out.  ncurses, it must be
+  noted, appears to work well in production, despite the failed patch,
+  anyway.
+
   24 Jul 2002; Spider <spider@gentoo.org> :
   change CXXFLAGS in the ebuild to accomodate for -fno-exceptions
-  
 
   15 Jul 2002; Mark Guertin <gerk@gentoo.org>
   Added ppc to keywords
diff --git a/sys-libs/ncurses/ncurses-5.2-r3.ebuild b/sys-libs/ncurses/ncurses-5.2-r3.ebuild
deleted file mode 100644
index 62c6e72bd20b..000000000000
--- a/sys-libs/ncurses/ncurses-5.2-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2-r3.ebuild,v 1.9 2002/07/11 06:30:56 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Linux console display libarary"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html"
-DEPEND="virtual/glibc"
-KEYWORDS="x86"
-LICENSE="MIT"
-SLOT="5"
-
-src_compile() {
-	if [ -z "$DEBUG" ]
-	then
-		myconf="${myconf} --without-debug"
-	fi
-	rm -rf test
-	./configure --prefix=/usr --libdir=/lib --mandir=/usr/share/man --enable-symlinks --enable-termcap --with-shared --with-rcs-ids --host=${CHOST}  ${myconf} || die
-	echo "all:" > test/Makefile
-	# Parallel make fails sometimes so I removed MAKEOPTS
-	make || die
-}
-
-src_install() {
-	dodir /usr/lib
-	echo "install:" >> ${S}/test/Makefile
-	make DESTDIR=${D} install || die
-
-	cd ${D}/lib
-	ln -s libncurses.a libcurses.a
-	chmod 755 ${D}/lib/*.${PV}
-	dodir /usr/lib
-	mv libform* libmenu* libpanel* ../usr/lib
-	mv *.a ../usr/lib
-
-	#with this fix, the default xterm has color as it should
-	cd ${D}/usr/share/terminfo/x
-	mv xterm xterm.orig
-	ln -s xterm-color xterm
-
-	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
-		cd ${D}/usr/lib
-		#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.	
-		#rm *.a
-	else
-		cd ${S}
-		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO
-		dodoc doc/*.doc
-		docinto html
-		dodoc doc/html/*.html
-		docinto html/ada
-		dodoc doc/html/ada/*.htm
-		docinto html/ada/files
-		dodoc doc/html/ada/files/*.htm
-		docinto html/ada/funcs
-		dodoc doc/html/ada/funcs/*.htm
-		docinto html/man
-		dodoc doc/html/man/*.html
-	fi
-}
-
-
-
diff --git a/sys-libs/ncurses/ncurses-5.2-r4.ebuild b/sys-libs/ncurses/ncurses-5.2-r4.ebuild
deleted file mode 100644
index 52cbefe72816..000000000000
--- a/sys-libs/ncurses/ncurses-5.2-r4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2-r4.ebuild,v 1.7 2002/07/11 06:30:56 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Linux console display libarary"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz http://www.ibiblio.org/gentoo/distfiles/ncurses-5.2-20010908.patch.gz"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html http://dickey.his.com"
-DEPEND="virtual/glibc"
-KEYWORDS="x86"
-LICENSE="MIT"
-SLOT="5"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	cat ${DISTDIR}/ncurses-5.2-20010908.patch.gz | gzip -d | patch -p1 || die
-}
-
-src_compile() {
-	if [ -z "$DEBUG" ]
-	then
-		myconf="${myconf} --without-debug"
-	fi
-	rm -rf test
-	./configure --prefix=/usr --libdir=/lib --mandir=/usr/share/man --enable-symlinks --enable-termcap --with-shared --with-rcs-ids --host=${CHOST}  ${myconf} || die
-	echo "all:" > test/Makefile
-	echo "install:" >> test/Makefile
-	# Parallel make fails sometimes so I removed MAKEOPTS
-	make || die
-}
-
-src_install() {
-	dodir /usr/lib
-	make DESTDIR=${D} install || die
-
-	cd ${D}/lib
-	ln -s libncurses.a libcurses.a
-	chmod 755 ${D}/lib/*.${PV}
-	dodir /usr/lib
-	mv libform* libmenu* libpanel* ../usr/lib
-	mv *.a ../usr/lib
-	dosym /lib/libncurses.so /usr/lib/libncurses.so.5.2
-
-	#with this fix, the default xterm has color as it should
-	cd ${D}/usr/share/terminfo/x
-	mv xterm xterm.orig
-	ln -s xterm-color xterm
-
-	if [ "`use build`" ]
-	then
-		cd ${D}
-		rm -rf usr/share/man
-		cd usr/share/terminfo
-		cp -a l/linux x/xterm v/vt100 ${T}
-		rm -rf *
-		mkdir l x v
-		cp -a ${T}/linux l
-		cp -a ${T}/xterm x
-		cp -a ${T}/vt100 v
-		cd ${D}/usr/lib
-		rm *.a
-	else
-		cd ${S}
-		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO
-		dodoc doc/*.doc
-		docinto html
-		dodoc doc/html/*.html
-		docinto html/ada
-		dodoc doc/html/ada/*.htm
-		docinto html/ada/files
-		dodoc doc/html/ada/files/*.htm
-		docinto html/ada/funcs
-		dodoc doc/html/ada/funcs/*.htm
-		docinto html/man
-		dodoc doc/html/man/*.html
-	fi
-}
-
-
-
diff --git a/sys-libs/ncurses/ncurses-5.2.20020112a.ebuild b/sys-libs/ncurses/ncurses-5.2.20020112a.ebuild
deleted file mode 100644
index 866189dc6f13..000000000000
--- a/sys-libs/ncurses/ncurses-5.2.20020112a.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2.20020112a.ebuild,v 1.3 2002/07/11 06:30:56 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Linux console display libarary"
-SRC_URI="ftp://ftp.debian.org/debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html"
-DEPEND="virtual/glibc"
-KEYWORDS="x86"
-LICENSE="MIT"
-SLOT="5"
-
-src_compile() {
-	if [ -z "$DEBUG" ]
-	then
-		myconf="${myconf} --without-debug"
-	fi
-	rm -rf test
-	./configure --prefix=/usr --libdir=/lib --mandir=/usr/share/man --enable-symlinks --enable-termcap --with-shared --with-rcs-ids --host=${CHOST}  ${myconf} || die
-	echo "all:" > test/Makefile
-	# Parallel make fails sometimes so I removed MAKEOPTS
-	make || die
-}
-
-src_install() {
-	dodir /usr/lib
-	echo "install:" >> ${S}/test/Makefile
-	make DESTDIR=${D} install || die
-
-	cd ${D}/lib
-	ln -s libncurses.a libcurses.a
-	chmod 755 ${D}/lib/*.${PV}
-	dodir /usr/lib
-	mv libform* libmenu* libpanel* ../usr/lib
-	mv *.a ../usr/lib
-
-	#with this fix, the default xterm has color as it should
-	cd ${D}/usr/share/terminfo/x
-	mv xterm xterm.orig
-	ln -s xterm-color xterm
-
-	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
-		cd ${D}/usr/lib
-		#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.	
-		#rm *.a
-	else
-		cd ${S}
-		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO
-		dodoc doc/*.doc
-		dohtml -r doc/html/
-#		docinto html/ada
-#		dodoc doc/html/ada/*.htm
-#		docinto html/ada/files
-#		dodoc doc/html/ada/files/*.htm
-#		docinto html/ada/funcs
-#		dodoc doc/html/ada/funcs/*.htm
-#		docinto html/man
-#		dodoc doc/html/man/*.html
-	fi
-}
-
-
-
diff --git a/sys-libs/ncurses/ncurses-5.2.20020511-r1.ebuild b/sys-libs/ncurses/ncurses-5.2.20020511-r1.ebuild
index 550727483631..ccb7ed7a6e66 100644
--- a/sys-libs/ncurses/ncurses-5.2.20020511-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-5.2.20020511-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2.20020511-r1.ebuild,v 1.6 2002/07/24 16:27:38 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2.20020511-r1.ebuild,v 1.7 2002/08/01 03:27:16 seemant Exp $
 
 MY_PV=${PV%.*}
 
@@ -49,7 +49,10 @@ src_compile() {
 
 	echo "all:" > test/Makefile
 
-	patch -p1 <${FILESDIR}/ncurses-5.2.20020511-gcc31.patch
+	# this patch is completely invalid.  whoever was responsible for
+	# generating it for the previous snapshots, please investigate with
+	# regards to this current snapshot.
+	#	patch -p1 <${FILESDIR}/ncurses-5.2.20020511-gcc31.patch
 
 	#emake still doesn't work circa 25 Mar 2002
 	make || die
diff --git a/sys-libs/ncurses/ncurses-5.2.20020511.ebuild b/sys-libs/ncurses/ncurses-5.2.20020511.ebuild
deleted file mode 100644
index b1d9fd445b98..000000000000
--- a/sys-libs/ncurses/ncurses-5.2.20020511.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2.20020511.ebuild,v 1.3 2002/07/16 03:52:51 gerk Exp $
-
-MY_PV=${PV%.*}
-
-S=${WORKDIR}/${PN}-${MY_PV}
-DESCRIPTION="Linux console display libarary"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${PN}-${MY_PV}.tar.gz
-	http://www.ibiblio.org/gentoo/distfiles/${PN}-${PV}.diff.bz2"
-	#ftp://dickey.his.com/${PN}/${PV}/patch-${MY_PV}-20020427.sh.gz
-	#ftp://dickey.his.com/${PN}/${PV}/${PN}-${MY_PV}-20020429.patch.gz
-	#ftp://dickey.his.com/${PN}/${PV}/${PN}-${MY_PV}-20020511.patch.gz"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html"
-DEPEND="virtual/glibc"
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="x86 ppc"
-
-src_unpack() {
-	unpack ${PN}-${MY_PV}.tar.gz ; cd ${S}
-	#this is how the gentoo patch was created.  avoids a dependency
-	#on sharutils for uudecode :/
-	#( zcat ${DISTDIR}/patch-${MY_PV}-20020427.sh.gz | sh ) || die
-	#( zcat ${DISTDIR}/${PN}-${MY_PV}-20020429.patch.gz | patch -p1 ) || die
-	#( zcat ${DISTDIR}/${PN}-${MY_PV}-20020511.patch.gz | patch -p1 ) || die
-	#this is the generated patch..
-	( bzcat ${DISTDIR}/${PN}-${PV}.diff.bz2 | patch -p1 ) || die
-}
-
-src_compile() {
-	[ -z "$DEBUGBUILD" ] && myconf="${myconf} --without-debug"
-
-	rm -rf test
-	./configure \
-		--prefix=/usr \
-		--libdir=/lib \
-		--mandir=/usr/share/man \
-		--enable-symlinks \
-		--enable-termcap \
-		--with-shared \
-		--with-rcs-ids \
-		--host=${CHOST} ${myconf} || die
-
-	echo "all:" > test/Makefile
-	#emake still doesn't work circa 25 Mar 2002
-	make || die
-}
-
-src_install() {
-	dodir /usr/lib
-	echo "install:" >> ${S}/test/Makefile
-	make DESTDIR=${D} install || die
-
-	cd ${D}/lib
-	ln -s libncurses.a libcurses.a
-	chmod 755 ${D}/lib/*.${MY_PV}
-	dodir /usr/lib
-	mv libform* libmenu* libpanel* ../usr/lib
-	mv *.a ../usr/lib
-
-	#with this fix, the default xterm has color as it should
-	cd ${D}/usr/share/terminfo/x
-	mv xterm xterm.orig
-	ln -s xterm-color xterm
-
-	if [ -n "`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
-		cd ${D}/usr/lib
-		#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.
-		#rm *.a
-	else
-		cd ${S}
-		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO
-		dodoc doc/*.doc
-		dohtml -r doc/html/
-#		docinto html/ada
-#		dodoc doc/html/ada/*.htm
-#		docinto html/ada/files
-#		dodoc doc/html/ada/files/*.htm
-#		docinto html/ada/funcs
-#		dodoc doc/html/ada/funcs/*.htm
-#		docinto html/man
-#		dodoc doc/html/man/*.html
-	fi
-}