add pre release for new SSP stuff; remove old cruft where possible

(Portage version: 2.1.2.5)

9 files changed, 62 insertions, 232 deletions

diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog
index 207caf068f2f..06af16ee8a4f 100644
--- a/dev-libs/dietlibc/ChangeLog
+++ b/dev-libs/dietlibc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/dietlibc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.67 2007/04/20 13:54:13 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.68 2007/05/03 21:26:52 hollow Exp $
+
+*dietlibc-0.31_pre20070503 (03 May 2007)
+
+  03 May 2007; Benedikt Böhm <hollow@gentoo.org> -files/gcc-33.patch,
+  -files/0.25-gcc34.patch, -dietlibc-0.25.ebuild, -dietlibc-0.29.ebuild,
+  +dietlibc-0.31_pre20070503.ebuild:
+  add pre release for new SSP stuff; remove old cruft where possible
 
   20 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   dietlibc-0.30-r2.ebuild:
diff --git a/dev-libs/dietlibc/dietlibc-0.25.ebuild b/dev-libs/dietlibc/dietlibc-0.25.ebuild
deleted file mode 100644
index 1edf1c0ad7ab..000000000000
--- a/dev-libs/dietlibc/dietlibc-0.25.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.25.ebuild,v 1.11 2006/01/07 08:23:28 phreak Exp $
-
-inherit eutils flag-o-matic fixheadtails toolchain-funcs
-
-DESCRIPTION="A minimal libc"
-HOMEPAGE="http://www.fefe.de/dietlibc/"
-SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha arm hppa amd64"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}/0.24-dirent-prototype.patch"
-	[ $(gcc-major-version) -eq 3 ] \
-		&& epatch ${FILESDIR}/gcc-33.patch \
-		&& epatch ${FILESDIR}/${PV}-gcc34.patch
-
-	# depending on glibc to provide guard symbols, does not work with -nostdlib building
-	filter-flags -fstack-protector -fstack-protector-all
-
-	# Fix for 45716
-	replace-sparc64-flags
-
-	sed -i \
-		-e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
-		-e "s:^prefix.*:prefix=/usr/diet:" \
-		-e "s:^#DESTDIR=.*:DESTDIR=${D}:" \
-		Makefile \
-		|| die "sed Makefile failed"
-
-	# New fix for sparc64 and dietlibc, fixes bug #45601
-	[ "${PROFILE_ARCH}" = "sparc64" ] && \
-		epatch ${FILESDIR}/dietlibc-sparc64-makefile.patch
-
-	ht_fix_all
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install || die "make install failed"
-
-	exeinto /usr/bin
-	newexe bin-$(uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/' -e 's/sparc64/sparc/')/diet-i diet || die "newexe failed"
-
-	doman diet.1
-	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
-}
diff --git a/dev-libs/dietlibc/dietlibc-0.29.ebuild b/dev-libs/dietlibc/dietlibc-0.29.ebuild
deleted file mode 100644
index dbd4bff3c937..000000000000
--- a/dev-libs/dietlibc/dietlibc-0.29.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.29.ebuild,v 1.2 2006/01/07 08:23:28 phreak Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A minimal libc"
-HOMEPAGE="http://www.fefe.de/dietlibc/"
-SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/0.24-dirent-prototype.patch
-	# No longer needed with 0.29
-	#epatch "${FILESDIR}"/gcc-33-r3.patch
-	epatch "${FILESDIR}"/dietlibc-sparc64-makefile.patch #45601
-
-	filter-flags -fstack-protector -fstack-protector-all
-
-	# Ok so let's make dietlibc ssp aware (Aug 7 2004) -solar
-	cp ${FILESDIR}/ssp.c "${S}"/lib/ || die "Failed to copy ssp.c into lib for compile"
-	epatch "${FILESDIR}"/dietlibc-0.26-ssp.patch
-
-	replace-sparc64-flags #45716
-
-	# Fix for a non-available gcc option on hppa (20 Jul 2005) KillerFox
-	test_flag -fno-stack-protector && \
-		append-flags -D__dietlibc__ -fno-stack-protector-all -fno-stack-protector
-	epatch "${FILESDIR}"/dietlibc-0.28-Makefile.patch
-}
-
-src_compile() {
-	local make_opt=
-
-	use debug && make_opt="DEBUG=1"
-
-	# Fix a compilation problem using the 32-bit userland with 64-bit kernel on
-	# PowerPC, because with that configuration, dietlibc detects a ppc64 system.
-	# -- hansmi, 2005-09-04
-	use ppc && sed -i -e 's/^MYARCH:=.*$/MYARCH=ppc/' Makefile
-
-	emake CFLAGS="${CFLAGS}" ${make_opt} || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	dobin "${D}"/usr/diet/bin/* || die "dobin"
-	doman "${D}"/usr/diet/man/*/* || die "doman"
-	rm -r "${D}"/usr/diet/{man,bin}
-	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
-}
diff --git a/dev-libs/dietlibc/dietlibc-0.31_pre20070503.ebuild b/dev-libs/dietlibc/dietlibc-0.31_pre20070503.ebuild
new file mode 100644
index 000000000000..1e26b872fa80
--- /dev/null
+++ b/dev-libs/dietlibc/dietlibc-0.31_pre20070503.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.31_pre20070503.ebuild,v 1.1 2007/05/03 21:26:52 hollow Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A minimal libc"
+HOMEPAGE="http://www.fefe.de/dietlibc/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~phreak/distfiles/${PN}-patches-${PVR}.tar.bz2
+	http://dev.gentoo.org/~hollow/distfiles/${PN}-patches-${PVR}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+DEPEND=""
+
+pkg_setup() {
+	# Replace sparc64 related C[XX]FLAGS (see bug #45716)
+	use sparc && replace-sparc64-flags
+
+	# gcc-hppa suffers support for SSP, compilation will fail
+	use hppa && strip-unsupported-flags
+
+	# debug flags
+	use debug && append-flags -g
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/patches/*.patch
+}
+
+src_compile() {
+	# parallel make is b0rked
+	emake -j1 CFLAGS="${CFLAGS}" || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dobin "${D}"/usr/diet/bin/* || die "dobin failed"
+	doman "${D}"/usr/diet/man/*/* || die "doman failed"
+	rm -r "${D}"/usr/diet/{man,bin}
+	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
+}
diff --git a/dev-libs/dietlibc/files/0.25-gcc34.patch b/dev-libs/dietlibc/files/0.25-gcc34.patch
deleted file mode 100644
index 1b66e0bfc087..000000000000
--- a/dev-libs/dietlibc/files/0.25-gcc34.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -r -u dietlibc-0.24.orig/include/sys/cdefs.h dietlibc-0.24/include/sys/cdefs.h
---- dietlibc-0.24.orig/include/sys/cdefs.h	2003-10-08 02:44:25.000000000 +0300
-+++ dietlibc-0.24/include/sys/cdefs.h	2004-05-14 16:54:00.315533488 +0300
-@@ -62,5 +62,10 @@
- #define __attribute_dontuse__
- #define __deprecated__
- #endif
--
-+#ifdef __i386__
-+/* regparm exists only on i386 */
-+#define FASTCALL(n) __attribute__((regparm(n)))
-+#else
-+#define FASTCALL(n)
-+#endif
- #endif
-diff -r -u dietlibc-0.24.orig/lib/alloc.c dietlibc-0.24/lib/alloc.c
---- dietlibc-0.24.orig/lib/alloc.c	2003-11-07 19:22:33.000000000 +0200
-+++ dietlibc-0.24/lib/alloc.c	2004-05-14 16:56:57.104657456 +0300
-@@ -44,14 +44,8 @@
- 
- /* a simple mmap :) */
- 
--#ifdef __i386__
--/* regparm exists only on i386 */
--static void *do_mmap(size_t size) __attribute__((regparm(1)));
--static size_t get_index(size_t _size) __attribute__((regparm(1)));
--static void* __small_malloc(size_t _size) __attribute__((regparm(1)));
--#endif
- 
--static void *do_mmap(size_t size) {
-+static FASTCALL(1) void *do_mmap(size_t size) {
-   return mmap(0, size, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1, (size_t)0);
- }
- 
-@@ -70,7 +64,7 @@
- 
- static inline int __ind_shift() { return (MEM_BLOCK_SIZE==4096)?4:5; }
- 
--static size_t get_index(size_t _size) {
-+static FASTCALL(1) size_t get_index(size_t _size) {
-   register size_t idx=0;
-   if (_size) {
-     register size_t size=((_size-1)&(MEM_BLOCK_SIZE-1))>>__ind_shift();
-@@ -80,9 +74,7 @@
- }
- 
- /* small mem */
--static void __small_free(void*_ptr,size_t _size) __attribute__((regparm(2)));
--
--static void __small_free(void*_ptr,size_t _size) {
-+static FASTCALL(2) void __small_free(void*_ptr,size_t _size) {
-   __alloc_t* ptr=BLOCK_START(_ptr);
-   size_t size=_size;
-   size_t idx=get_index(size);
-@@ -93,7 +85,7 @@
-   __small_mem[idx]=ptr;
- }
- 
--static void* __small_malloc(size_t _size) {
-+static FASTCALL(1) void* __small_malloc(size_t _size) {
-   __alloc_t *ptr;
-   size_t size=_size;
-   size_t idx;
-diff -r -u dietlibc-0.24.orig/libpthread/pthread_internal.c dietlibc-0.24/libpthread/pthread_internal.c
---- dietlibc-0.24.orig/libpthread/pthread_internal.c	2003-11-04 18:06:58.000000000 +0200
-+++ dietlibc-0.24/libpthread/pthread_internal.c	2004-05-14 16:59:44.030280904 +0300
-@@ -49,10 +49,7 @@
- static inline unsigned long hash_tid(int tid) { return (tid&(NR_BUCKETS-1)); }
- 
- /* O(1) */
--#if defined(__i386__)
--static void __thread_add_tid_(_pthread_descr*root,_pthread_descr thread) __attribute__((regparm(2)));
--#endif
--static void __thread_add_tid_(_pthread_descr*root,_pthread_descr thread) {
-+static FASTCALL(2) void __thread_add_tid_(_pthread_descr*root,_pthread_descr thread) {
-   _pthread_descr tmp=*root;
-   thread->prev=root;
-   thread->next=tmp;
-@@ -76,12 +73,12 @@
- /* find thread by thread-id O(n) (LOCK struct if found) */
- /* O(n*) linear to the number of thread in the same bucket */
- #if defined(__i386__)
--static _pthread_descr __thread_find_(int pid) __attribute__((regparm(1)));
-+static FASTCALL(1) _pthread_descr __thread_find_(int pid);
- _pthread_descr __thread_find(int pid) { return __thread_find_(pid); }
- #else
- _pthread_descr __thread_find(int pid) __attribute__((alias("__thread_find_")));
- #endif
--static _pthread_descr __thread_find_(int pid) {
-+static FASTCALL(1) _pthread_descr __thread_find_(int pid) {
-   _pthread_descr cur;
-   if (__thread_started==PTHREAD_ONCE_INIT) { /* uninitialised */
-     LOCK(&_main_thread);
diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.25 b/dev-libs/dietlibc/files/digest-dietlibc-0.25
deleted file mode 100644
index 49d03ac0d4ea..000000000000
--- a/dev-libs/dietlibc/files/digest-dietlibc-0.25
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a24c99d65b7443d17d0b15b74a1b39a0 dietlibc-0.25.tar.bz2 509606
-RMD160 8f6c301b524d5758697d875b5de16e9e0f6ba199 dietlibc-0.25.tar.bz2 509606
-SHA256 413bbd04d88cf13786df5073315eede915d658c52c960e11797e59c8b5072d53 dietlibc-0.25.tar.bz2 509606
diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.29 b/dev-libs/dietlibc/files/digest-dietlibc-0.29
deleted file mode 100644
index 5f0632090bbe..000000000000
--- a/dev-libs/dietlibc/files/digest-dietlibc-0.29
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 16d31dd7b5f9124e8ea8280c3f646e13 dietlibc-0.29.tar.bz2 555075
-RMD160 be78077abe892bbabeb38b30f430a5982e3c9c3b dietlibc-0.29.tar.bz2 555075
-SHA256 41df3b5d07d5de1dcf712eda3ddd27bc9843c9413e8cecefced09db873cf18db dietlibc-0.29.tar.bz2 555075
diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.31_pre20070503 b/dev-libs/dietlibc/files/digest-dietlibc-0.31_pre20070503
new file mode 100644
index 000000000000..2ea2fb878405
--- /dev/null
+++ b/dev-libs/dietlibc/files/digest-dietlibc-0.31_pre20070503
@@ -0,0 +1,6 @@
+MD5 16e695e032ea2c957f4227cb169ac2ca dietlibc-0.31_pre20070503.tar.bz2 564475
+RMD160 e8b3a8c5cc337f85104679bf920fe82d3ee115cc dietlibc-0.31_pre20070503.tar.bz2 564475
+SHA256 988e04fd628ed90b259e08489cd86e1fa705e83632a145bd05197935c9c9b7f9 dietlibc-0.31_pre20070503.tar.bz2 564475
+MD5 56487dbb8875bf8a2360228e3172f8fe dietlibc-patches-0.31_pre20070503.tar.bz2 26838
+RMD160 f3f85d514a117fb1b8e8f73801e1332b33f9224d dietlibc-patches-0.31_pre20070503.tar.bz2 26838
+SHA256 00aeabb7bb41807e577a1e08095270f5f660139b369d078ca8ee697ca6795012 dietlibc-patches-0.31_pre20070503.tar.bz2 26838
diff --git a/dev-libs/dietlibc/files/gcc-33.patch b/dev-libs/dietlibc/files/gcc-33.patch
deleted file mode 100644
index 1ff6127f24b1..000000000000
--- a/dev-libs/dietlibc/files/gcc-33.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- diet.c	2003-10-10 15:17:46.000000000 +0200
-+++ diet.c	2004-02-15 19:03:01.000000000 +0100
-@@ -26,8 +26,8 @@
- 
- static const char* Os[] = {
-   "i386","-Os","-mpreferred-stack-boundary=2",
--	 "-malign-functions=1","-malign-jumps=1",
--	 "-malign-loops=1","-fomit-frame-pointer",0,
-+	 "-falign-functions","-falign-jumps",
-+	 "-falign-loops","-fomit-frame-pointer",0,
-   "x86_64","-Os","-fno-omit-frame-pointer",0,
-   "sparc","-Os","-mcpu=supersparc",0,
-   "sparc64","-Os","-m64",0,