small tweaks to get them ready for testing 4.3

6 files changed, 12 insertions, 136 deletions

diff --git a/sys-libs/readline/files/digest-readline-4.1-r3 b/sys-libs/readline/files/digest-readline-4.1-r3
deleted file mode 100644
index 9872f692ea49..000000000000
--- a/sys-libs/readline/files/digest-readline-4.1-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d0c31936fb627237275fdfd991fe3873 readline-4.1.tar.gz 744169
diff --git a/sys-libs/readline/files/digest-readline-4.2 b/sys-libs/readline/files/digest-readline-4.2
deleted file mode 100644
index 4e43f1cadaac..000000000000
--- a/sys-libs/readline/files/digest-readline-4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1005aef64e772b369c4421785334a3f5 readline-4.2.tar.gz 851018
diff --git a/sys-libs/readline/readline-4.1-r3.ebuild b/sys-libs/readline/readline-4.1-r3.ebuild
deleted file mode 100644
index a52f11c7f6ed..000000000000
--- a/sys-libs/readline/readline-4.1-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.1-r3.ebuild,v 1.11 2002/10/04 06:37:38 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Another cute console display library"
-SRC_URI="ftp://ftp.gnu.org/gnu/readline/${P}.tar.gz
-	ftp://sunsite.uio.no/pub/gnu/readline/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
-SLOT="0"
-HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2-r2"
-
-RDEPEND="virtual/glibc"
-
-src_compile() {
-
-	# Don't install redunant rluserman.info
-	sed -e 's|${INSTALL_DATA.*rluserman\.info.*|: &|' doc/Makefile.in \
-		> doc/Makefile.in.new
-	mv doc/Makefile.in.new doc/Makefile.in
-
-	./configure --host=${CHOST} --with-curses \
-		--prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
-	assert "configure failed"
-	make ${MAKEOPTS} || die "make failed"
-	cd shlib
-	make ${MAKEOPTS} || die "make in shlib failed"
-
-}
-
-
-src_install() {
-
-	make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-	assert "make install failed"
-	cd shlib
-	make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-	assert "make install in shlib failed"
-
-	cd ..
-
-        dodir /lib
-	mv ${D}/usr/lib/*.so* ${D}/lib
-	dosym libhistory.so.${PV} /lib/libhistory.so
-	dosym libreadline.so.${PV} /lib/libreadline.so
-	# Needed because make install uses ${D} for the link
-	dosym libhistory.so.${PV} /lib/libhistory.so.4
-	dosym libreadline.so.${PV} /lib/libreadline.so.4
-	chmod 755 ${D}/lib/*.${PV}
-
-        dodoc CHANGELOG CHANGES COPYING MANIFEST README USAGE
-	docinto ps
-	dodoc doc/*.ps
-	docinto html
-	dodoc doc/*.html
-
-}
diff --git a/sys-libs/readline/readline-4.2.ebuild b/sys-libs/readline/readline-4.2.ebuild
deleted file mode 100644
index ac4ec5d4baba..000000000000
--- a/sys-libs/readline/readline-4.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.2.ebuild,v 1.10 2002/10/04 06:37:42 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Another cute console display library"
-SRC_URI="ftp://ftp.gnu.org/gnu/readline/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
-SLOT="0"
-HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2-r2"
-
-RDEPEND="virtual/glibc"
-
-src_compile() {
-
-    try ./configure --host=${CHOST} --with-curses \
-        --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
-    try make ${MAKEOPTS}
-    cd shlib
-    try make ${MAKEOPTS}
-
-}
-
-
-src_install() {
-
-	try make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-	cd shlib
-	try make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-
-	cd ..
-
-        dodir /lib
-	mv ${D}/usr/lib/*.so* ${D}/lib
-	dosym libhistory.so.${PV} /lib/libhistory.so
-	dosym libreadline.so.${PV} /lib/libreadline.so
-	# Needed because make install uses ${D} for the link
-	dosym libhistory.so.${PV} /lib/libhistory.so.4
-	dosym libreadline.so.${PV} /lib/libreadline.so.4
-	chmod 755 ${D}/lib/*.${PV}
-
-        dodoc CHANGELOG CHANGES COPYING MANIFEST README USAGE
-	docinto ps
-	dodoc doc/*.ps
-	docinto html
-	dodoc doc/*.html
-
-
-}
-
-
-
-
diff --git a/sys-libs/readline/readline-4.2a.ebuild b/sys-libs/readline/readline-4.2a.ebuild
index 9f529910ceb9..bd443ef715e0 100644
--- a/sys-libs/readline/readline-4.2a.ebuild
+++ b/sys-libs/readline/readline-4.2a.ebuild
@@ -1,30 +1,30 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.2a.ebuild,v 1.10 2002/10/04 06:37:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.2a.ebuild,v 1.11 2002/10/16 09:50:09 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Another cute console display library"
 SRC_URI="ftp://ftp.gnu.org/gnu/readline/${P}.tar.gz
 	 ftp://gatekeeper.dec.com/pub/GNU/readline/${P}.tar.gz"
-LICENSE="GPL-2"
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+
 KEYWORDS="x86 ppc sparc sparc64 alpha"
 SLOT="0"
-HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+LICENSE="GPL-2"
 
 DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2-r2"
-
-RDEPEND="virtual/glibc"
+	>=sys-libs/ncurses-5.2-r2
+	>=sys-apps/bash-2.05a-r3"
 
 src_compile() {
 
 	./configure --host=${CHOST} --with-curses \
 		--prefix=/usr --mandir=/usr/share/man \
 		--infodir=/usr/share/info || die
-	emake ${MAKEOPTS} || die
+	
+	emake || die
 	cd shlib
-	emake ${MAKEOPTS} || die
-
+	emake || die
 }
 
 
@@ -52,9 +52,5 @@ src_install() {
 	dodoc doc/*.ps
 	docinto html
 	dodoc doc/*.html
-
 }
 
-
-
-
diff --git a/sys-libs/readline/readline-4.3-r1.ebuild b/sys-libs/readline/readline-4.3-r1.ebuild
index 361aa4ace766..3a1971240a37 100644
--- a/sys-libs/readline/readline-4.3-r1.ebuild
+++ b/sys-libs/readline/readline-4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r1.ebuild,v 1.3 2002/10/16 09:35:29 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r1.ebuild,v 1.4 2002/10/16 09:50:09 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Another cute console display library"
@@ -20,9 +20,9 @@ DEPEND=">=sys-apps/bash-2.05b-r2
 src_compile() {
 
 	econf --with-curses || die
-	emake ${MAKEOPTS} || die
+	emake || die
 	cd shlib
-	emake ${MAKEOPTS} || die
+	emake || die
 
 }