version bump as per bug #54790. x86 stable for 0.24 and 0.25

6 files changed, 85 insertions, 15 deletions

diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog
index 84d8650db490..3f0ec2cd3792 100644
--- a/dev-libs/dietlibc/ChangeLog
+++ b/dev-libs/dietlibc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/dietlibc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.31 2004/06/24 23:04:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.32 2004/07/18 07:59:15 dragonheart Exp $
+
+*dietlibc-0.26 (18 Jul 2004)
+
+  18 Jul 2004; Daniel Black <dragonheart@gentoo.org> +dietlibc-0.26.ebuild
+  dietlibc-0.24.ebuild, dietlibc-0.25.ebuild:
+  version bump as per bug #54790. May not work properly. No 3.4 patch applied -
+  wasn't sure if necessary. x86 stable for 0.24 and 0.25
 
   01 Jun 2004; Mike Frysinger <vapier@gentoo.org> +files/0.25-gcc34.patch,
   dietlibc-0.25.ebuild:
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index 9369f9c3e10e..a35839132caf 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,18 +1,20 @@
-MD5 ebbfc614fb242e813eaa35429ef94172 dietlibc-0.23.ebuild 1756
-MD5 241a0e81607f4a3ba0e94ef00edc29db dietlibc-0.25.ebuild 1569
+MD5 2234aa627587837108201994fe36b5f5 ChangeLog 4275
 MD5 38e3d6d5a07b52b28a667d850d3cfe1c dietlibc-0.22-r2.ebuild 1667
+MD5 ebbfc614fb242e813eaa35429ef94172 dietlibc-0.23.ebuild 1756
 MD5 13968bbe7bb9a5232aeb20ba9838ea43 dietlibc-0.24.ebuild 1525
-MD5 2234aa627587837108201994fe36b5f5 ChangeLog 4275
 MD5 6d7429e88eda74e2e5a1d89dcda32c33 metadata.xml 400
-MD5 8c25662fd30d966f24ec20ef491075a6 files/dietlibc-sparc64-makefile.patch 499
+MD5 241a0e81607f4a3ba0e94ef00edc29db dietlibc-0.25.ebuild 1569
+MD5 f37e34f076d1906786ca51f593e4b18a dietlibc-0.26.ebuild 1574
+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 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 a6911c79e510ea03173a809f5d7e6a40 files/digest-dietlibc-0.25 66
+MD5 9247251c0adc5ce1b626d7092ae0c903 files/gcc-33.patch 482
+MD5 8c25662fd30d966f24ec20ef491075a6 files/dietlibc-sparc64-makefile.patch 499
 MD5 02d59156de2a7a0f914dc5769e26cdcf files/0.25-gcc34.patch 3454
+MD5 a6911c79e510ea03173a809f5d7e6a40 files/digest-dietlibc-0.25 66
+MD5 4c8bea996353605b5d0b6184d8836ffe files/digest-dietlibc-0.26 66
diff --git a/dev-libs/dietlibc/dietlibc-0.24.ebuild b/dev-libs/dietlibc/dietlibc-0.24.ebuild
index 8a0d187df9fa..52448b20643c 100644
--- a/dev-libs/dietlibc/dietlibc-0.24.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.10 2004/06/24 23:04:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.24.ebuild,v 1.11 2004/07/18 07:59:15 dragonheart Exp $
 
 inherit eutils flag-o-matic fixheadtails gcc
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha arm ~hppa ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha arm ~hppa ~amd64"
 IUSE=""
 
 DEPEND=">=sys-apps/sed-4"
diff --git a/dev-libs/dietlibc/dietlibc-0.25.ebuild b/dev-libs/dietlibc/dietlibc-0.25.ebuild
index 31d6242434a6..0fe80964c175 100644
--- a/dev-libs/dietlibc/dietlibc-0.25.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.3 2004/06/24 23:04:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.25.ebuild,v 1.4 2004/07/18 07:59:15 dragonheart Exp $
 
 inherit eutils flag-o-matic fixheadtails gcc
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha arm ~hppa ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha arm ~hppa ~amd64"
 IUSE=""
 
 DEPEND=">=sys-apps/sed-4"
diff --git a/dev-libs/dietlibc/dietlibc-0.26.ebuild b/dev-libs/dietlibc/dietlibc-0.26.ebuild
new file mode 100644
index 000000000000..7b1f7a12ba4b
--- /dev/null
+++ b/dev-libs/dietlibc/dietlibc-0.26.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.26.ebuild,v 1.1 2004/07/18 07:59:15 dragonheart 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
+
+#		&& 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/files/digest-dietlibc-0.26 b/dev-libs/dietlibc/files/digest-dietlibc-0.26
new file mode 100644
index 000000000000..bedd79836fbe
--- /dev/null
+++ b/dev-libs/dietlibc/files/digest-dietlibc-0.26
@@ -0,0 +1 @@
+MD5 68a4d1685dfc6d36ed12a5d5bb91fb80 dietlibc-0.26.tar.bz2 525208