Bumped version and fixed compilation on 32-bit userland with 64-bit kernel on ppc.

(Portage version: 2.0.51.22-r2)

4 files changed, 80 insertions, 11 deletions

diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog
index cb58c0002451..8fa73a25af64 100644
--- a/dev-libs/dietlibc/ChangeLog
+++ b/dev-libs/dietlibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/dietlibc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.50 2005/08/07 19:57:41 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.51 2005/09/04 16:03:16 hansmi Exp $
+
+*dietlibc-0.29 (04 Sep 2005)
+
+  04 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> +dietlibc-0.29.ebuild:
+  Bumped version and fixed compilation on 32-bit userland with 64-bit kernel on
+  ppc.
 
   07 Aug 2005; Jason Wever <weeve@gentoo.org> dietlibc-0.28.ebuild:
   Stable on SPARC.
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index 89b6b35e3d21..134733d53b15 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,17 +1,19 @@
-MD5 f4ff4cadf30440fea58e8315fbba1978 ChangeLog 7104
-MD5 980bbcf54d614e6da13205de20ea7e78 dietlibc-0.25.ebuild 1579
 MD5 5d0a9f95d5fdcfaacf56c046a76c41f2 dietlibc-0.27.ebuild 2631
-MD5 9c7763722687f9cc6ac09608f1919650 dietlibc-0.28.ebuild 1574
+MD5 980bbcf54d614e6da13205de20ea7e78 dietlibc-0.25.ebuild 1579
 MD5 6d7429e88eda74e2e5a1d89dcda32c33 metadata.xml 400
+MD5 f4ff4cadf30440fea58e8315fbba1978 ChangeLog 7104
+MD5 9c7763722687f9cc6ac09608f1919650 dietlibc-0.29.ebuild 1574
+MD5 9c7763722687f9cc6ac09608f1919650 dietlibc-0.28.ebuild 1574
+MD5 ea791631782529db92c7b23198391a7a files/gcc-33-r2.patch 1077
+MD5 ee309afd4c5bd953a5133fb3383124de files/gcc-33-r3.patch 451
+MD5 a6911c79e510ea03173a809f5d7e6a40 files/digest-dietlibc-0.25 66
+MD5 9022467ec4210d62330f0eb1d8c93394 files/dietlibc-0.26-ssp.patch 1632
+MD5 c55906ff5d2b87d811ba215657a41ab2 files/digest-dietlibc-0.29 66
 MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.24-dirent-prototype.patch 668
+MD5 8c25662fd30d966f24ec20ef491075a6 files/dietlibc-sparc64-makefile.patch 499
 MD5 02d59156de2a7a0f914dc5769e26cdcf files/0.25-gcc34.patch 3454
-MD5 9022467ec4210d62330f0eb1d8c93394 files/dietlibc-0.26-ssp.patch 1632
 MD5 e326170b86e838c08e64d75b8d6d0f67 files/dietlibc-0.28-Makefile.patch 529
-MD5 8c25662fd30d966f24ec20ef491075a6 files/dietlibc-sparc64-makefile.patch 499
-MD5 a6911c79e510ea03173a809f5d7e6a40 files/digest-dietlibc-0.25 66
-MD5 771865efe3795f379b15c0bb6d61a857 files/digest-dietlibc-0.27 66
+MD5 65a68ed33fd14d52b23a2fe28e06dfc9 files/ssp.c 3065
 MD5 483744830092f64a7f5fefc773ced02a files/digest-dietlibc-0.28 66
-MD5 ea791631782529db92c7b23198391a7a files/gcc-33-r2.patch 1077
-MD5 ee309afd4c5bd953a5133fb3383124de files/gcc-33-r3.patch 451
 MD5 9247251c0adc5ce1b626d7092ae0c903 files/gcc-33.patch 482
-MD5 65a68ed33fd14d52b23a2fe28e06dfc9 files/ssp.c 3065
+MD5 771865efe3795f379b15c0bb6d61a857 files/digest-dietlibc-0.27 66
diff --git a/dev-libs/dietlibc/dietlibc-0.29.ebuild b/dev-libs/dietlibc/dietlibc-0.29.ebuild
new file mode 100644
index 000000000000..6e72edb53854
--- /dev/null
+++ b/dev-libs/dietlibc/dietlibc-0.29.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 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.1 2005/09/04 16:03:16 hansmi 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/files/digest-dietlibc-0.29 b/dev-libs/dietlibc/files/digest-dietlibc-0.29
new file mode 100644
index 000000000000..08c8ea8d9b21
--- /dev/null
+++ b/dev-libs/dietlibc/files/digest-dietlibc-0.29
@@ -0,0 +1 @@
+MD5 16d31dd7b5f9124e8ea8280c3f646e13 dietlibc-0.29.tar.bz2 555075