prune old files and fix prototypes

14 files changed, 25 insertions, 226 deletions

diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog
index cd191605f2fe..f3529b8586f7 100644
--- a/dev-libs/dietlibc/ChangeLog
+++ b/dev-libs/dietlibc/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-libs/dietlibc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.13 2003/05/25 14:51:36 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.14 2003/06/16 14:17:06 vapier Exp $
 
   25 May 2003; Martin Holzer <mholzer@gentoo.org> dietlibc-0.20.ebuild,
   dietlibc-0.21.ebuild, dietlibc-0.22-r1.ebuild, dietlibc-0.22-r2.ebuild,
@@ -9,7 +9,11 @@
 
 *dietlibc-0.22-r2 (14 May 2003)
 
-  14 May 2003; John Mylchreest <johnm@gentoo.org>; dietlibc-0.22-r2.ebuild:
+  16 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added a small prototype patch ... prototypes used 'long int' while
+  actual function used 'off_t' ... set them both to 'off_t'.
+
+  14 May 2003; John Mylchreest <johnm@gentoo.org> dietlibc-0.22-r2.ebuild:
   Updated dietlibc to compile with -fstack-protector
 
 *dietlibc-0.22-r1 (30 Mar 2003)
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index 916db5ee1e90..31b4f27956db 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,14 +1,5 @@
-MD5 7626cf1c0708aa1a5bb29cdd50869bbe ChangeLog 1659
-MD5 ecd18f67d71c47acf216ad2643d559a3 dietlibc-0.16.ebuild 997
-MD5 90eafcf4aca2e223e06e0d91c47813b7 dietlibc-0.20.ebuild 1003
-MD5 8da829fee1e127d320dd00d652eb5986 dietlibc-0.21.ebuild 1075
-MD5 909165eb68d4d8dfd5dfe8b552ee2fd7 dietlibc-0.22.ebuild 1081
-MD5 bba73d83aeaa1468cc3ed8c728795543 dietlibc-0.22-r1.ebuild 1147
-MD5 4048417915649c718d2f34dccd3503b8 dietlibc-0.22-r2.ebuild 1193
-MD5 ad60ceed0734f3675846105fb63272de files/digest-dietlibc-0.16 66
-MD5 3ed5df794190d860ed03567fb1c1a0de files/digest-dietlibc-0.20 66
-MD5 071556303cd2740fe38e5c605a0ea8cc files/digest-dietlibc-0.21 66
-MD5 2644f8611fcb7a147ec9ef76eaf5992a files/digest-dietlibc-0.22 66
-MD5 67b93dd4033c0e66d42b6bade33c73fc files/dietlibc-0.22_xdr_security_fix.patch 5566
-MD5 2644f8611fcb7a147ec9ef76eaf5992a files/digest-dietlibc-0.22-r1 66
+MD5 36fea4a810230f06c3c2c3b6d97ae579 dietlibc-0.22-r2.ebuild 1241
+MD5 6ca99c2dcf5987ffb200ad4e741c08e0 ChangeLog 1841
 MD5 2644f8611fcb7a147ec9ef76eaf5992a files/digest-dietlibc-0.22-r2 66
+MD5 67b93dd4033c0e66d42b6bade33c73fc files/dietlibc-0.22_xdr_security_fix.patch 5566
+MD5 e33c0d8f3c56f85d1caa98118824fceb files/0.22-dirent-prototype.patch 563
diff --git a/dev-libs/dietlibc/dietlibc-0.16.ebuild b/dev-libs/dietlibc/dietlibc-0.16.ebuild
deleted file mode 100644
index e5cb7ebac7b0..000000000000
--- a/dev-libs/dietlibc/dietlibc-0.16.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.16.ebuild,v 1.8 2003/02/13 10:36:59 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A minimal libc"
-SRC_URI="http://www.fefe.de/dietlibc/${P}.tar.bz2"
-HOMEPAGE="http://www.fefe.de/dietlibc"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	mv Makefile Makefile.orig
-
-	sed -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
-		-e "s:^prefix.*:prefix=/usr/diet:" \
-		-e "s:^#DESTDIR=/tmp/fef.*:DESTDIR=${D}:" \
-		Makefile.orig > Makefile
-	# does not say anything about this in the install docs - uncommenting (Thilo)
-	#mkdir ${S}/include/asm
-	#cp /usr/include/asm/posix_types.h ${S}/include/asm
-}
-
-
-src_compile() {
-	emake || die
-}
-
-src_install () {
-
-	make install || die
-
-	exeinto /usr/bin
-	newexe bin-i386/diet-i diet
-
-	doman diet.1
-	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
-}
diff --git a/dev-libs/dietlibc/dietlibc-0.20.ebuild b/dev-libs/dietlibc/dietlibc-0.20.ebuild
deleted file mode 100644
index 9e90f7d302b3..000000000000
--- a/dev-libs/dietlibc/dietlibc-0.20.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.20.ebuild,v 1.5 2003/05/25 14:51:36 mholzer Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A minimal libc"
-SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.fefe.de/dietlibc"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	mv Makefile Makefile.orig
-
-	sed -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
-		-e "s:^prefix.*:prefix=/usr/diet:" \
-		-e "s:^#DESTDIR=/tmp/fef.*:DESTDIR=${D}:" \
-		Makefile.orig > Makefile
-	# does not say anything about this in the install docs - uncommenting (Thilo)
-	#mkdir ${S}/include/asm
-	#cp /usr/include/asm/posix_types.h ${S}/include/asm
-}
-
-
-src_compile() {
-	emake || die
-}
-
-src_install () {
-
-	make install || die
-
-	exeinto /usr/bin
-	newexe bin-i386/diet-i diet
-
-	doman diet.1
-	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
-}
diff --git a/dev-libs/dietlibc/dietlibc-0.21.ebuild b/dev-libs/dietlibc/dietlibc-0.21.ebuild
deleted file mode 100644
index 7e2b2a745813..000000000000
--- a/dev-libs/dietlibc/dietlibc-0.21.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.21.ebuild,v 1.5 2003/05/25 14:51:36 mholzer Exp $
-
-DESCRIPTION="A minimal libc"
-SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.fefe.de/dietlibc/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	mv Makefile Makefile.orig
-
-	sed -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
-		-e "s:^prefix.*:prefix=/usr/diet:" \
-		-e "s:^#DESTDIR=/tmp/fef.*:DESTDIR=${D}:" \
-		Makefile.orig > Makefile
-	# does not say anything about this in the install docs - uncommenting (Thilo)
-	#mkdir ${S}/include/asm
-	#cp /usr/include/asm/posix_types.h ${S}/include/asm
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	make install || die
-
-	exeinto /usr/bin
-#	newexe bin-i386/diet-i diet
-	newexe bin-$(uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/')/diet-i diet
-
-	doman diet.1
-	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
-}
diff --git a/dev-libs/dietlibc/dietlibc-0.22-r1.ebuild b/dev-libs/dietlibc/dietlibc-0.22-r1.ebuild
deleted file mode 100644
index 26abe0a974f9..000000000000
--- a/dev-libs/dietlibc/dietlibc-0.22-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.22-r1.ebuild,v 1.3 2003/05/25 14:51:36 mholzer Exp $
-
-inherit eutils
-
-DESCRIPTION="A minimal libc"
-SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.fefe.de/dietlibc/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc hppa"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${P}_xdr_security_fix.patch
-
-	mv Makefile Makefile.orig
-
-	sed -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
-		-e "s:^prefix.*:prefix=/usr/diet:" \
-		-e "s:^#DESTDIR=/tmp/fef.*:DESTDIR=${D}:" \
-		Makefile.orig > Makefile
-	# does not say anything about this in the install docs - uncommenting (Thilo)
-	#mkdir ${S}/include/asm
-	#cp /usr/include/asm/posix_types.h ${S}/include/asm
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	make install || die
-
-	exeinto /usr/bin
-#	newexe bin-i386/diet-i diet
-	newexe bin-$(uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/')/diet-i diet
-
-	doman diet.1
-	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
-}
diff --git a/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild b/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild
index 765acabbda48..4bc6baa6d83b 100644
--- a/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild,v 1.2 2003/05/25 14:51:36 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild,v 1.3 2003/06/16 14:17:06 vapier Exp $
 
 inherit eutils flag-o-matic
 filter-flags "-fstack-protector"
@@ -17,9 +17,9 @@ src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	epatch ${FILESDIR}/${P}_xdr_security_fix.patch
+	epatch ${FILESDIR}/${PV}-dirent-prototype.patch
 
 	mv Makefile Makefile.orig
-
 	sed -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
 		-e "s:^prefix.*:prefix=/usr/diet:" \
 		-e "s:^#DESTDIR=/tmp/fef.*:DESTDIR=${D}:" \
diff --git a/dev-libs/dietlibc/dietlibc-0.22.ebuild b/dev-libs/dietlibc/dietlibc-0.22.ebuild
deleted file mode 100644
index 45a6a071105b..000000000000
--- a/dev-libs/dietlibc/dietlibc-0.22.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.22.ebuild,v 1.5 2003/05/25 14:51:36 mholzer Exp $
-
-DESCRIPTION="A minimal libc"
-SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.fefe.de/dietlibc/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	mv Makefile Makefile.orig
-
-	sed -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
-		-e "s:^prefix.*:prefix=/usr/diet:" \
-		-e "s:^#DESTDIR=/tmp/fef.*:DESTDIR=${D}:" \
-		Makefile.orig > Makefile
-	# does not say anything about this in the install docs - uncommenting (Thilo)
-	#mkdir ${S}/include/asm
-	#cp /usr/include/asm/posix_types.h ${S}/include/asm
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	make install || die
-
-	exeinto /usr/bin
-#	newexe bin-i386/diet-i diet
-	newexe bin-$(uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/')/diet-i diet
-
-	doman diet.1
-	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
-}
diff --git a/dev-libs/dietlibc/files/0.22-dirent-prototype.patch b/dev-libs/dietlibc/files/0.22-dirent-prototype.patch
new file mode 100644
index 000000000000..a5ee1d543b90
--- /dev/null
+++ b/dev-libs/dietlibc/files/0.22-dirent-prototype.patch
@@ -0,0 +1,13 @@
+--- include/dirent.h.orig	2003-06-16 10:08:35.000000000 -0400
++++ include/dirent.h	2003-06-16 10:08:45.000000000 -0400
+@@ -35,8 +35,8 @@
+ struct dirent *readdir (DIR *__dirp) __THROW;
+ struct dirent64 *readdir64 (DIR *__dirp) __THROW;
+ void rewinddir (DIR *__dirp) __THROW;
+-void seekdir (DIR *__dirp, long int __pos) __THROW;
+-long int telldir (DIR *__dirp) __THROW;
++void seekdir (DIR *__dirp, off_t __pos) __THROW;
++off_t telldir (DIR *__dirp) __THROW;
+ 
+ int scandir(const char *dir, struct dirent ***namelist,
+       int (*selection)(const struct dirent *),
diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.16 b/dev-libs/dietlibc/files/digest-dietlibc-0.16
deleted file mode 100644
index ea92a98e9c2d..000000000000
--- a/dev-libs/dietlibc/files/digest-dietlibc-0.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1cd48d6753d8b466ce24585c817efff6 dietlibc-0.16.tar.bz2 381124
diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.20 b/dev-libs/dietlibc/files/digest-dietlibc-0.20
deleted file mode 100644
index 9784eafe5792..000000000000
--- a/dev-libs/dietlibc/files/digest-dietlibc-0.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 35ddbcd9878d88ff05f7e7d8834dee32 dietlibc-0.20.tar.bz2 419937
diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.21 b/dev-libs/dietlibc/files/digest-dietlibc-0.21
deleted file mode 100644
index cf1fc41400f3..000000000000
--- a/dev-libs/dietlibc/files/digest-dietlibc-0.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9a8d54f1d057b9cf5c4522478158684 dietlibc-0.21.tar.bz2 426399
diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.22 b/dev-libs/dietlibc/files/digest-dietlibc-0.22
deleted file mode 100644
index d80396c5cefb..000000000000
--- a/dev-libs/dietlibc/files/digest-dietlibc-0.22
+++ /dev/null
@@ -1 +0,0 @@
-MD5 877b12ab0b2bbff340095cf2cf074418 dietlibc-0.22.tar.bz2 454012
diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.22-r1 b/dev-libs/dietlibc/files/digest-dietlibc-0.22-r1
deleted file mode 100644
index d80396c5cefb..000000000000
--- a/dev-libs/dietlibc/files/digest-dietlibc-0.22-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 877b12ab0b2bbff340095cf2cf074418 dietlibc-0.22.tar.bz2 454012