version bump - works with gcc 3.4

4 files changed, 75 insertions, 10 deletions

diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog
index bc6ed73891ee..e3d0987abc45 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.28 2004/03/25 21:39:12 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.29 2004/05/29 22:06:44 lv Exp $
+
+*dietlibc-0.25 (29 May 2004)
+
+  29 May 2004; Travis Tilley <lv@gentoo.org> +dietlibc-0.25.ebuild:
+  version bump - works with gcc 3.4
 
   25 Mar 2004; Jason Wever <weeve@gentoo.org> dietlibc-0.24.ebuild:
   Added fix for bug #45716.
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index 2e3eb1a3f183..4269817c647a 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,15 +1,17 @@
-MD5 99f39b6365d3b7ecd09d1d75f9f4d66b ChangeLog 4001
-MD5 7f22da20a9fbbb5403e100c4379fbf58 dietlibc-0.22-r2.ebuild 1668
 MD5 6d39b863e86a8acaba6db6ec9402ecd1 dietlibc-0.23.ebuild 1758
+MD5 a4c7bf10ccb1ae9d8485b1bbf640185f dietlibc-0.25.ebuild 1526
+MD5 7f22da20a9fbbb5403e100c4379fbf58 dietlibc-0.22-r2.ebuild 1668
+MD5 0f00af4e5fd18c8540541b64c4e20239 dietlibc-0.24.ebuild 1531
+MD5 917e54a57723ba91e3709ce00b7bb380 ChangeLog 4133
 MD5 6d7429e88eda74e2e5a1d89dcda32c33 metadata.xml 400
-MD5 5a339db2191c1576ebd20347a1825573 dietlibc-0.24.ebuild 1624
-MD5 e33c0d8f3c56f85d1caa98118824fceb files/0.22-dirent-prototype.patch 563
-MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.23-dirent-prototype.patch 668
-MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.24-dirent-prototype.patch 668
-MD5 67b93dd4033c0e66d42b6bade33c73fc files/dietlibc-0.22_xdr_security_fix.patch 5566
+MD5 8c25662fd30d966f24ec20ef491075a6 files/dietlibc-sparc64-makefile.patch 499
 MD5 4713f8664ff94fb53c7696d9204406ed files/dietlibc-0.23-hppa.patch 3954
 MD5 2644f8611fcb7a147ec9ef76eaf5992a files/digest-dietlibc-0.22-r2 66
+MD5 67b93dd4033c0e66d42b6bade33c73fc files/dietlibc-0.22_xdr_security_fix.patch 5566
+MD5 9247251c0adc5ce1b626d7092ae0c903 files/gcc-33.patch 482
+MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.24-dirent-prototype.patch 668
+MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.23-dirent-prototype.patch 668
+MD5 e33c0d8f3c56f85d1caa98118824fceb files/0.22-dirent-prototype.patch 563
 MD5 b06d21ffc62c7a660a29351e55213a0b files/digest-dietlibc-0.23 66
 MD5 11048a235efe4eefcfffc4ccffa60821 files/digest-dietlibc-0.24 66
-MD5 9247251c0adc5ce1b626d7092ae0c903 files/gcc-33.patch 482
-MD5 8c25662fd30d966f24ec20ef491075a6 files/dietlibc-sparc64-makefile.patch 499
+MD5 a6911c79e510ea03173a809f5d7e6a40 files/digest-dietlibc-0.25 66
diff --git a/dev-libs/dietlibc/dietlibc-0.25.ebuild b/dev-libs/dietlibc/dietlibc-0.25.ebuild
new file mode 100644
index 000000000000..e89c1ab38a41
--- /dev/null
+++ b/dev-libs/dietlibc/dietlibc-0.25.ebuild
@@ -0,0 +1,57 @@
+# 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.25.ebuild,v 1.1 2004/05/29 22:06:44 lv Exp $
+
+inherit eutils flag-o-matic fixheadtails gcc
+
+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"
+
+	# 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/files/digest-dietlibc-0.25 b/dev-libs/dietlibc/files/digest-dietlibc-0.25
new file mode 100644
index 000000000000..3c27066c30a9
--- /dev/null
+++ b/dev-libs/dietlibc/files/digest-dietlibc-0.25
@@ -0,0 +1 @@
+MD5 a24c99d65b7443d17d0b15b74a1b39a0 dietlibc-0.25.tar.bz2 509606