Revert gpm support

4 files changed, 31 insertions, 25 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index a55311853d98..1efe896caad1 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.61 2004/03/30 18:54:38 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.62 2004/04/03 00:48:42 avenj Exp $
+
+  02 Apr 2004; Jon Portnoy <avenj@gentoo.org> ncurses-5.4.ebuild, 
+  ncurses-5.4-r1.ebuild :
+  Revert gpm support entirely due to bootstrap problems.
 
   30 Mar 2004; <rac@gentoo.org> ncurses-5.4-r1.ebuild, ncurses-5.4.ebuild:
   Make gpm support not come in if USE=bootstrap, fix bootstrap with USE=gpm set
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index fab1fe0f6650..12c9d6607e5b 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,23 +1,23 @@
-MD5 b4119802bb6e4cd7667eaeb09eb929e5 ncurses-5.4-r1.ebuild 4003
-MD5 ac5ab557d506a10a6781d80a16a91408 ncurses-5.3-r4.ebuild 2847
-MD5 24564dfc526e9e98459ff33505e1504a ncurses-5.4.ebuild 3795
+MD5 f068902b081ddbe63db52482c678f511 ChangeLog 10137
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 6eadb93d736e38cee7262e64629d0003 ncurses-5.3-r1.ebuild 2311
+MD5 6c106fbeea1c453e10d37667cefd35ae ncurses-5.3-r2.ebuild 2459
 MD5 af7a0de2f75ba90257759319bfdda6fc ncurses-5.3-r3.ebuild 2675
+MD5 ac5ab557d506a10a6781d80a16a91408 ncurses-5.3-r4.ebuild 2847
 MD5 db75ec065134459591abd33360d27283 ncurses-5.3-r5.ebuild 3829
-MD5 29ba380994c436889188e1e54d57cee1 ChangeLog 9984
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 6c106fbeea1c453e10d37667cefd35ae ncurses-5.3-r2.ebuild 2459
-MD5 f96d1b4b0bf94f1d38ce950df0efb37e files/ncurses-5.3-xterm.patch 1002
-MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4 64
-MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495
-MD5 c5b265c81eb2dea26b66cd656c61e99c files/ncurses-5.3-share-sed.patch 686
-MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342
-MD5 1ecbf68a55269d2cebeb997f6973fc1d files/ncurses-5.4-share-sed.patch 686
+MD5 1db1513c22111aaa569b0afa0cc5575a ncurses-5.4.ebuild 3712
+MD5 647729e3d0ca7ff1cd33c5ededdade18 ncurses-5.4-r1.ebuild 4240
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r1 64
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r2 64
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r3 64
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r4 64
+MD5 fdef42c6fdd01e99c3e36b443e8a25c2 files/ncurses-5.2.20020511-gcc31.patch 703
+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 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r1 64
 MD5 143b9126206485a5faeb817fd94b1054 files/ncurses-5.3-coreutils.patch 1581
-MD5 fdef42c6fdd01e99c3e36b443e8a25c2 files/ncurses-5.2.20020511-gcc31.patch 703
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4 64
+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
diff --git a/sys-libs/ncurses/ncurses-5.4-r1.ebuild b/sys-libs/ncurses/ncurses-5.4-r1.ebuild
index 810fa5027e31..8596669dd629 100644
--- a/sys-libs/ncurses/ncurses-5.4-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r1.ebuild,v 1.9 2004/03/30 18:54:38 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r1.ebuild,v 1.10 2004/04/03 00:48:42 avenj Exp $
 
 inherit eutils flag-o-matic 64-bit gnuconfig
 filter-flags -fno-exceptions
@@ -12,10 +12,13 @@ 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 gpm"
+IUSE="debug"
 
-DEPEND="virtual/glibc
-	!bootstrap? ( gpm? ( sys-libs/gpm ) )"
+DEPEND="virtual/glibc"
+# 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}
@@ -47,7 +50,8 @@ src_compile() {
 	( use build || use bootstrap ) \
 		&& myconf="${myconf} --without-cxx --without-cxx-binding --without-ada"
 
-	use gpm && myconf="${myconf} --with-gpm"
+	# 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
diff --git a/sys-libs/ncurses/ncurses-5.4.ebuild b/sys-libs/ncurses/ncurses-5.4.ebuild
index 909e6c9d437b..95311710af28 100644
--- a/sys-libs/ncurses/ncurses-5.4.ebuild
+++ b/sys-libs/ncurses/ncurses-5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4.ebuild,v 1.8 2004/03/30 18:54:38 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4.ebuild,v 1.9 2004/04/03 00:48:42 avenj Exp $
 
 inherit eutils flag-o-matic 64-bit gnuconfig
 filter-flags -fno-exceptions
@@ -12,10 +12,9 @@ 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 gpm"
+IUSE="debug"
 
-DEPEND="virtual/glibc
-	!bootstrap? ( gpm? ( sys-libs/gpm ) )"
+DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
@@ -46,7 +45,6 @@ src_compile() {
 	( use build || use bootstrap ) \
 		&& myconf="${myconf} --without-cxx --without-cxx-binding --without-ada"
 
-	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