Fixing SRC_URI, cleaning up the patch-mess; Logic cleanup

(Portage version: 2.1_pre7-r5)

4 files changed, 25 insertions, 26 deletions

diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog
index 524b76543ff3..1f6da10114cf 100644
--- a/dev-libs/dietlibc/ChangeLog
+++ b/dev-libs/dietlibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/dietlibc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.54 2006/04/06 18:45:25 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.55 2006/04/11 10:23:21 phreak Exp $
+
+  11 Apr 2006; Christian Heim <phreak@gentoo.org> dietlibc-0.29-r1.ebuild:
+  Fixing SRC_URI, cleaning up the patch-mess; Logic cleanup
 
 *dietlibc-0.29-r1 (06 Apr 2006)
 
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index 0ea63fd14885..a49fc6ef142a 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 dffed851474376e7840dec48b0168d59 ChangeLog 7719
 RMD160 92e1b5543e4abcf51a6093092f8f3cd9c7b4fd4d ChangeLog 7719
 SHA256 4af1b609fa2a6871b7ffcbdda862c5cb9ee33a2bd274c331c54deb1765c121fa ChangeLog 7719
@@ -13,9 +10,9 @@ SHA256 a7e4d6bc0cb4f09b06e809df7637ab372f92fd9d3990cd7a6b08c7caa50f85f2 dietlibc
 MD5 5893f3f2f10b3e58f4fbf09fd68f11b3 dietlibc-0.28.ebuild 1575
 RMD160 9508b5719d3cf8b38d9eed54f4803838729c809b dietlibc-0.28.ebuild 1575
 SHA256 e70704a8a284268012a38fed5e39f0280e9ebcb2bf2bdf2799817c467e90c44f dietlibc-0.28.ebuild 1575
-MD5 5294ef68812faf07ae63a4f346c038d2 dietlibc-0.29-r1.ebuild 1917
-RMD160 5e9d85627b4cbf960ee3d942f044c74653f36202 dietlibc-0.29-r1.ebuild 1917
-SHA256 39dbe01505a880ede700bb526a1d8d634ae25c22e9770dab79ed25d199c61e4e dietlibc-0.29-r1.ebuild 1917
+MD5 a412567596dd873364ecc06bc0a637cc dietlibc-0.29-r1.ebuild 1984
+RMD160 8bfb78ef07842801e052d13eca9dc8b88d7c3ea5 dietlibc-0.29-r1.ebuild 1984
+SHA256 760d425841534bc59b55d1e835cb32aaf807b332c4f0dd89852c7c3dbf91b926 dietlibc-0.29-r1.ebuild 1984
 MD5 335d8fa79c4c6e0a0df3986e2bf9be47 dietlibc-0.29.ebuild 1859
 RMD160 dcc1e2225476f0799be643084adb52fb8d7d8946 dietlibc-0.29.ebuild 1859
 SHA256 e76a51ae87fc4cdd076d8662284ba030a5a80501754f825924861c3dd0d3656a dietlibc-0.29.ebuild 1859
@@ -46,9 +43,9 @@ SHA256 3bc8de906d669ad1933df42bc93e13776cd11cfe64932b0e0edf46929ad7f6a1 files/di
 MD5 c55906ff5d2b87d811ba215657a41ab2 files/digest-dietlibc-0.29 66
 RMD160 492344b9b5cdc60dc8321541f761dbab8098f3f2 files/digest-dietlibc-0.29 66
 SHA256 7a496c4b04d1f64b297f0a74f7f26e5fb84c50cd86c273f471f1916912a7b209 files/digest-dietlibc-0.29 66
-MD5 ad61bfe71cf9c8ba92ee96f15d105a1a files/digest-dietlibc-0.29-r1 515
-RMD160 fc4507dca27a49c3c1c93e25b6fef28395c7f93a files/digest-dietlibc-0.29-r1 515
-SHA256 65e4839d63a170fde6eeb35b9fe08f1721ab5697b1be4d39cc74c9656d29ced5 files/digest-dietlibc-0.29-r1 515
+MD5 01381c381c17764ccad1a0ab50021568 files/digest-dietlibc-0.29-r1 515
+RMD160 86712c5f0763225d0b95dfefa3c38b6771558db6 files/digest-dietlibc-0.29-r1 515
+SHA256 98ea6a7913275d45021270073592a6480e2aa516d1f3c853e26e9432f64ff9d0 files/digest-dietlibc-0.29-r1 515
 MD5 ea791631782529db92c7b23198391a7a files/gcc-33-r2.patch 1077
 RMD160 41a0ab776eed6f3ba482c2a1ad642b3d8cdef729 files/gcc-33-r2.patch 1077
 SHA256 6f0e514e5c889c2c10d6e60f80da6248a82d88fadd22a61b5b461be8c31cba17 files/gcc-33-r2.patch 1077
@@ -64,10 +61,3 @@ SHA256 a35ab2cd397c28d850667d99ca39eab1c521c141c9bb4826fb9c91310406d52c files/ss
 MD5 3effe4dd8085cc629d8f6a42cbc10a31 metadata.xml 470
 RMD160 db39535bf43d1cea49d04c2ed52bbbc94c94d0cb metadata.xml 470
 SHA256 34784c3fc1a9a2c548ca86b04f3729cfd045140fcd54b6caeb8c53ce05f16639 metadata.xml 470
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFENWPcflZ8QqxhrsMRAnRHAKCg/9plwTHlKDP8vpIOF78IoeFcqACgq2+2
-0cV1qnKadV+4a4f7ouxATIc=
-=TKKE
------END PGP SIGNATURE-----
diff --git a/dev-libs/dietlibc/dietlibc-0.29-r1.ebuild b/dev-libs/dietlibc/dietlibc-0.29-r1.ebuild
index cd2e7a08c79b..9ec5dc96b5bb 100644
--- a/dev-libs/dietlibc/dietlibc-0.29-r1.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.29-r1.ebuild
@@ -1,14 +1,14 @@
 # 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-r1.ebuild,v 1.2 2006/04/06 18:54:00 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.29-r1.ebuild,v 1.3 2006/04/11 10:23:21 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
-	http://dev.gentoo.org/~phreak/distfiles/dietlibc-patches-${PVR}.tar.bz2
-	http://dev.gentoo.org/~hollow/distfiles/dietlibc-patches-${PVR}.tar.bz2"
+	http://dev.gentoo.org/~phreak/distfiles/${P}-patches-${PR}.tar.bz2
+	http://dev.gentoo.org/~hollow/distfiles/${P}-patches-${PR}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -37,9 +37,15 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${WORKDIR}"/${PN}-patches/[0-1]*.patch
-	use ppc && \
-		epatch "${WORKDIR}"/${PN}-patches/20_ppc32-userland-on-64bit.patch
+	use !ppc && \
+		EPATCH_EXCLUDE="${PN}-0.29-ppc32-userland-on-64bit.patch"
+
+	epatch "${WORKDIR}"/patches/*.patch
+
+	echo
+	ebegin "Preparing \${S}/lib/ssp.c"
+	cp -a "${WORKDIR}/tools/ssp.c" "${S}/lib"
+	eend $?
 }
 
 src_compile() {
diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.29-r1 b/dev-libs/dietlibc/files/digest-dietlibc-0.29-r1
index 1cdbe16b7536..933d8be8018e 100644
--- a/dev-libs/dietlibc/files/digest-dietlibc-0.29-r1
+++ b/dev-libs/dietlibc/files/digest-dietlibc-0.29-r1
@@ -1,6 +1,6 @@
+MD5 39974cbd289c7d5e7d56b192d9ed98c3 dietlibc-0.29-patches-r1.tar.bz2 4934
+RMD160 bd98d2888ce3d224a876b4dee35554c71b4f3bbd dietlibc-0.29-patches-r1.tar.bz2 4934
+SHA256 2fe18944c97eccf27d18416e86b05e9081a34f11a7049b78c655f9b1ebc258fc dietlibc-0.29-patches-r1.tar.bz2 4934
 MD5 16d31dd7b5f9124e8ea8280c3f646e13 dietlibc-0.29.tar.bz2 555075
 RMD160 be78077abe892bbabeb38b30f430a5982e3c9c3b dietlibc-0.29.tar.bz2 555075
 SHA256 41df3b5d07d5de1dcf712eda3ddd27bc9843c9413e8cecefced09db873cf18db dietlibc-0.29.tar.bz2 555075
-MD5 ebb530946f66760a6622015edb83fade dietlibc-patches-0.29-r1.tar.bz2 4907
-RMD160 6ebf6b0cd2977f365d7a70a997d4f90cfe03c92c dietlibc-patches-0.29-r1.tar.bz2 4907
-SHA256 5e609430d50df57507e9986af73d91fc4e33199a88958869359bed2b2731b62e dietlibc-patches-0.29-r1.tar.bz2 4907