add patch from Frank Eibisch to correct wrapper not to use old options for gcc3 (bug #41763); some repoman cleanup

6 files changed, 46 insertions, 20 deletions

diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog
index f53835989e10..e5edae29b149 100644
--- a/dev-libs/dietlibc/ChangeLog
+++ b/dev-libs/dietlibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/dietlibc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.25 2004/02/17 14:54:09 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.26 2004/02/20 02:51:45 mr_bones_ Exp $
+
+  19 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> dietlibc-0.23.ebuild,
+  dietlibc-0.24.ebuild, files/gcc-33.patch:
+  add patch from Frank Eibisch to correct wrapper not to use old options for gcc
+  3 (bug #41763); some repoman cleanup
 
   17 Feb 2004; David Holm <dholm@gentoo.org> dietlibc-0.24.ebuild:
   Added to ~ppc.
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index c94aa2cc39c1..68298c611567 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,13 +1,14 @@
-MD5 a11814451a2c4b02d51fd24f16f6cf3e ChangeLog 3444
-MD5 523becdc42d4ad3862dd6e733ab8d703 dietlibc-0.22-r2.ebuild 1663
-MD5 f21eba3304ab262185b47e351ca913a1 dietlibc-0.23.ebuild 1679
-MD5 b5ec97aa954e884088aec86344210618 dietlibc-0.24.ebuild 1796
+MD5 559ff84fbf5a77ba911999f1a1f0422f ChangeLog 3690
+MD5 7f22da20a9fbbb5403e100c4379fbf58 dietlibc-0.22-r2.ebuild 1668
+MD5 6d39b863e86a8acaba6db6ec9402ecd1 dietlibc-0.23.ebuild 1758
 MD5 6d7429e88eda74e2e5a1d89dcda32c33 metadata.xml 400
+MD5 8dabc545c7e054883a07315d4dea839e dietlibc-0.24.ebuild 1883
+MD5 9247251c0adc5ce1b626d7092ae0c903 files/gcc-33.patch 482
 MD5 e33c0d8f3c56f85d1caa98118824fceb files/0.22-dirent-prototype.patch 563
+MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.23-dirent-prototype.patch 668
 MD5 67b93dd4033c0e66d42b6bade33c73fc files/dietlibc-0.22_xdr_security_fix.patch 5566
 MD5 2644f8611fcb7a147ec9ef76eaf5992a files/digest-dietlibc-0.22-r2 66
-MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.23-dirent-prototype.patch 668
 MD5 b06d21ffc62c7a660a29351e55213a0b files/digest-dietlibc-0.23 66
-MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.24-dirent-prototype.patch 668
 MD5 11048a235efe4eefcfffc4ccffa60821 files/digest-dietlibc-0.24 66
+MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.24-dirent-prototype.patch 668
 MD5 4713f8664ff94fb53c7696d9204406ed files/dietlibc-0.23-hppa.patch 3954
diff --git a/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild b/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild
index 005323a4f6aa..f7c3fbd10da3 100644
--- a/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.8 2003/12/06 15:55:40 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild,v 1.9 2004/02/20 02:51:45 mr_bones_ Exp $
 
 inherit eutils flag-o-matic
-filter-flags "-fstack-protector"
 
 DESCRIPTION="A minimal libc"
 SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2"
@@ -14,7 +13,10 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc hppa amd64 alpha"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	filter-flags "-fstack-protector"
+
+	unpack ${A}
+	cd ${S}
 
 	epatch ${FILESDIR}/${P}_xdr_security_fix.patch
 	epatch ${FILESDIR}/${PV}-dirent-prototype.patch
diff --git a/dev-libs/dietlibc/dietlibc-0.23.ebuild b/dev-libs/dietlibc/dietlibc-0.23.ebuild
index 7a7380be8299..463e1f47f910 100644
--- a/dev-libs/dietlibc/dietlibc-0.23.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.23.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.23.ebuild,v 1.6 2003/12/20 01:14:28 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.23.ebuild,v 1.7 2004/02/20 02:51:45 mr_bones_ Exp $
 
-inherit eutils flag-o-matic
-filter-flags "-fstack-protector"
+inherit eutils flag-o-matic gcc
 
 DESCRIPTION="A minimal libc"
 SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2"
@@ -14,9 +13,13 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc ~hppa ~amd64 ~alpha"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	filter-flags "-fstack-protector"
 
-	epatch ${FILESDIR}/${PV}-dirent-prototype.patch
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${PV}-dirent-prototype.patch"
+	[ $(gcc-major-version) -eq 3 ] && epatch "${FILESDIR}/gcc-33.patch"
 	[ "${ARCH}" = "hppa" ] && epatch "${FILESDIR}/${P}-hppa.patch"
 	mv Makefile Makefile.orig
 	sed -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
diff --git a/dev-libs/dietlibc/dietlibc-0.24.ebuild b/dev-libs/dietlibc/dietlibc-0.24.ebuild
index d384e933cb3c..1b8dc508df4c 100644
--- a/dev-libs/dietlibc/dietlibc-0.24.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.24.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.24.ebuild,v 1.5 2004/02/17 14:54:09 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.24.ebuild,v 1.6 2004/02/20 02:51:45 mr_bones_ Exp $
 
-inherit eutils flag-o-matic fixheadtails
+inherit eutils flag-o-matic fixheadtails gcc
 
 DESCRIPTION="A minimal libc"
 HOMEPAGE="http://www.fefe.de/dietlibc/"
@@ -11,13 +11,15 @@ SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc ~hppa ~amd64 ~alpha ~ppc"
+IUSE=""
 
 DEPEND=">=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
-	epatch ${FILESDIR}/${PV}-dirent-prototype.patch
+	epatch "${FILESDIR}/${PV}-dirent-prototype.patch"
+	[ $(gcc-major-version) -eq 3 ] && epatch "${FILESDIR}/gcc-33.patch"
 
 	# depending on glibc to provide guard symbols, does not work with -nostdlib building
 	filter-flags "-fstack-protector"
diff --git a/dev-libs/dietlibc/files/gcc-33.patch b/dev-libs/dietlibc/files/gcc-33.patch
new file mode 100644
index 000000000000..1ff6127f24b1
--- /dev/null
+++ b/dev-libs/dietlibc/files/gcc-33.patch
@@ -0,0 +1,13 @@
+--- 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,