another prerelease; should fix #181261

Package-Manager: portage-2.1.2.9

5 files changed, 30 insertions, 23 deletions

diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog
index 283e6648d7cf..c0a05a40a9c7 100644
--- a/dev-libs/dietlibc/ChangeLog
+++ b/dev-libs/dietlibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/dietlibc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.72 2007/06/11 12:13:01 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.73 2007/06/12 07:00:16 hollow Exp $
+
+*dietlibc-0.31_pre20070612 (12 Jun 2007)
+
+  12 Jun 2007; Benedikt Böhm <hollow@gentoo.org>
+  -dietlibc-0.31_pre20070611.ebuild, +dietlibc-0.31_pre20070612.ebuild:
+  another prerelease; should fix #181261
 
 *dietlibc-0.31_pre20070611 (11 Jun 2007)
 
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index 64dbbe2de208..e97c94e2464d 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -26,7 +26,7 @@ DIST dietlibc-0.28.tar.bz2 560540 RMD160 242cbcd5b7e7f341713f587598cddc9d6ee39f5
 DIST dietlibc-0.30-patches-r0.tar.bz2 13466 RMD160 aef639595e93bd319744901aa87ae15d331709f2 SHA1 f71163605ea54cef6a336a2c360beec38234858e SHA256 bdc14a428b53dcd57bbce2337198e43473964624021d5a4918c5147753e75251
 DIST dietlibc-0.30.tar.bz2 567046 RMD160 98d4e20e106f60835ed4a22d3013d9a34957f18a SHA1 cab8631f8ca1902d6668584f72f71706bee020eb SHA256 2c8733825d364d374f0179a403a57e4a382fbb9852431228ef19062a5de183b5
 DIST dietlibc-0.31_pre20070503.tar.bz2 564475 RMD160 e8b3a8c5cc337f85104679bf920fe82d3ee115cc SHA1 f536c00b30bc40f1063f64a5092815b2b4efe4f4 SHA256 988e04fd628ed90b259e08489cd86e1fa705e83632a145bd05197935c9c9b7f9
-DIST dietlibc-0.31_pre20070611.tar.bz2 565237 RMD160 e6622486f36fd1a1209886450aca23901528cb31 SHA1 6f33839b0c0e013b1730905f73d878ac8bf530fa SHA256 f629883a1fa2df35874d59a02ee064abddcc61fbac8d394d6a3bc752e6736695
+DIST dietlibc-0.31_pre20070612.tar.bz2 565685 RMD160 c8d4aa98e68131a1fdca4e93d6e287aeddc07204 SHA1 2adccb512537b8e4f51e759f42857ef11a8dabb3 SHA256 a35b72a0af0feba4b1a3c5550714fb8b9fa581f3c62dc2bef035aeda3be61106
 DIST dietlibc-patches-0.30-r2.tar.bz2 31582 RMD160 6cd2a89cb47131360ed6e6a8cbcbe79aad84b18a SHA1 9c0bb84a7449edbfaccf0cbe694ccf8f57e26566 SHA256 03a3ea9bba39fb78511a59e80bcbdafdc82a0859b31b6af925854052a79f06fe
 DIST dietlibc-patches-0.31_pre20070503.tar.bz2 26838 RMD160 f3f85d514a117fb1b8e8f73801e1332b33f9224d SHA1 bdac1e39bebb53a14ef7e39c564baab86a1bce33 SHA256 00aeabb7bb41807e577a1e08095270f5f660139b369d078ca8ee697ca6795012
 EBUILD dietlibc-0.28.ebuild 1575 RMD160 9508b5719d3cf8b38d9eed54f4803838729c809b SHA1 1410d8c9b98a7ea2f15efac7c93bba56274c8733 SHA256 e70704a8a284268012a38fed5e39f0280e9ebcb2bf2bdf2799817c467e90c44f
@@ -45,14 +45,14 @@ EBUILD dietlibc-0.31_pre20070503.ebuild 1298 RMD160 9f2116ff75aa459aa8eed8c8c949
 MD5 b132076dc1b2df02f47493d6610fa271 dietlibc-0.31_pre20070503.ebuild 1298
 RMD160 9f2116ff75aa459aa8eed8c8c949f215651bdc06 dietlibc-0.31_pre20070503.ebuild 1298
 SHA256 efdf8797dff9281e245c0dd90f15541bd9da70ba62f6416d1507279edbb998a5 dietlibc-0.31_pre20070503.ebuild 1298
-EBUILD dietlibc-0.31_pre20070611.ebuild 1153 RMD160 3e021da322bab5c4ac2497550ef3375f3a7d46fa SHA1 5efe6748d9786802269436df68278329c2598551 SHA256 7055ced99c3885186e0556995bd4fb5658b76f1f0eb71fc15216ac9f8078812c
-MD5 b2c48fc7d00d0bdb533940935210bf96 dietlibc-0.31_pre20070611.ebuild 1153
-RMD160 3e021da322bab5c4ac2497550ef3375f3a7d46fa dietlibc-0.31_pre20070611.ebuild 1153
-SHA256 7055ced99c3885186e0556995bd4fb5658b76f1f0eb71fc15216ac9f8078812c dietlibc-0.31_pre20070611.ebuild 1153
-MISC ChangeLog 10519 RMD160 202b1a3a148f8fe578d1b12efcf64c835aa7d1c3 SHA1 519d76d50f0afa635dffb8e12cd82e6e6a2cd82b SHA256 c281d1d8a55eda955af54a441cd6bc637abfdebef07c36cfc91e5ee511feb994
-MD5 fb5dc652b692b241482cab36494d0ad7 ChangeLog 10519
-RMD160 202b1a3a148f8fe578d1b12efcf64c835aa7d1c3 ChangeLog 10519
-SHA256 c281d1d8a55eda955af54a441cd6bc637abfdebef07c36cfc91e5ee511feb994 ChangeLog 10519
+EBUILD dietlibc-0.31_pre20070612.ebuild 1176 RMD160 1bde563ab5cd747785707655f646bffccf786d7e SHA1 5ac8a93fe709a45357387c02a2f8bd18ad5bedd3 SHA256 b6f2e7995a63cd6bfd1e3662bea134af3a63ceffb3837c8d89103ce35727c42c
+MD5 7eba4eafa7d6a7df45c4cf128e84de43 dietlibc-0.31_pre20070612.ebuild 1176
+RMD160 1bde563ab5cd747785707655f646bffccf786d7e dietlibc-0.31_pre20070612.ebuild 1176
+SHA256 b6f2e7995a63cd6bfd1e3662bea134af3a63ceffb3837c8d89103ce35727c42c dietlibc-0.31_pre20070612.ebuild 1176
+MISC ChangeLog 10725 RMD160 50b9b1aafdc7d3eaf00a577b4d7abaa97200e39b SHA1 f8b045624860d82b51887e755d7fcb90ca622966 SHA256 a3961911849268e8632f47d0c9dc8b798e06d593ae243521d85543377efcdd1d
+MD5 6e0ad87716048a3905ec2677edf5f041 ChangeLog 10725
+RMD160 50b9b1aafdc7d3eaf00a577b4d7abaa97200e39b ChangeLog 10725
+SHA256 a3961911849268e8632f47d0c9dc8b798e06d593ae243521d85543377efcdd1d ChangeLog 10725
 MISC metadata.xml 470 RMD160 db39535bf43d1cea49d04c2ed52bbbc94c94d0cb SHA1 f62e5efb0981e616d453f7f00f3497e5d6f64949 SHA256 34784c3fc1a9a2c548ca86b04f3729cfd045140fcd54b6caeb8c53ce05f16639
 MD5 3effe4dd8085cc629d8f6a42cbc10a31 metadata.xml 470
 RMD160 db39535bf43d1cea49d04c2ed52bbbc94c94d0cb metadata.xml 470
@@ -69,6 +69,6 @@ SHA256 aafa58362537fa91103dc1ccff71803961652fd74434ab96416a83ee5a4a4e9f files/di
 MD5 de6c684f7143e144a8ba603f9efa8abf files/digest-dietlibc-0.31_pre20070503 581
 RMD160 aa7e7c679d8349eb097c16314f71bb1dfdc431b1 files/digest-dietlibc-0.31_pre20070503 581
 SHA256 50ddd8382f69adf187632f87a2bdab01beed92ff2df93e15987684adbbdfe125 files/digest-dietlibc-0.31_pre20070503 581
-MD5 a012a3947a14f44de4b061a725d454a4 files/digest-dietlibc-0.31_pre20070611 280
-RMD160 fe4a6705092f114e3fd27795783b32875001afa5 files/digest-dietlibc-0.31_pre20070611 280
-SHA256 30c5acab24317f7d22dbd82e6e7c9de514a82733494775ef0771a1cc6248e819 files/digest-dietlibc-0.31_pre20070611 280
+MD5 0c12025443a0a5fedccb57324881d9e9 files/digest-dietlibc-0.31_pre20070612 280
+RMD160 4da72b2e10afc1f33a486324662c9af2339cae04 files/digest-dietlibc-0.31_pre20070612 280
+SHA256 7816d288c2a68a1b59549e999f00f1f2f712ac49240f0d9d6fc8269d5fc0ab55 files/digest-dietlibc-0.31_pre20070612 280
diff --git a/dev-libs/dietlibc/dietlibc-0.31_pre20070611.ebuild b/dev-libs/dietlibc/dietlibc-0.31_pre20070612.ebuild
index 661275b64ba1..d2b128e201e5 100644
--- a/dev-libs/dietlibc/dietlibc-0.31_pre20070611.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.31_pre20070612.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.31_pre20070611.ebuild,v 1.1 2007/06/11 12:13:01 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.31_pre20070612.ebuild,v 1.1 2007/06/12 07:00:16 hollow Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,6 +15,8 @@ IUSE="debug"
 
 DEPEND=""
 
+DIETHOME=/usr/diet
+
 pkg_setup() {
 	# Replace sparc64 related C[XX]FLAGS (see bug #45716)
 	use sparc && replace-sparc64-flags
@@ -27,14 +29,13 @@ pkg_setup() {
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" || die "make failed"
+	emake prefix=${DIETHOME} CFLAGS="${CFLAGS}" || die "make failed"
 }
 
 src_install() {
-	local prefix=/usr/diet
-	emake prefix=${prefix} DESTDIR="${D}" install || die "make install failed"
-	dobin "${D}"${prefix}/bin/* || die "dobin failed"
-	doman "${D}"${prefix}/man/*/* || die "doman failed"
-	rm -r "${D}"${prefix}/{man,bin}
+	emake prefix=${DIETHOME} DESTDIR="${D}" install || die "make install failed"
+	dobin "${D}"${DIETHOME}/bin/* || die "dobin failed"
+	doman "${D}"${DIETHOME}/man/*/* || die "doman failed"
+	rm -r "${D}"${DIETHOME}/{man,bin}
 	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
 }
diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.31_pre20070611 b/dev-libs/dietlibc/files/digest-dietlibc-0.31_pre20070611
deleted file mode 100644
index 10ea7aea5ccb..000000000000
--- a/dev-libs/dietlibc/files/digest-dietlibc-0.31_pre20070611
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5ab239da31536690aa750477dba752a5 dietlibc-0.31_pre20070611.tar.bz2 565237
-RMD160 e6622486f36fd1a1209886450aca23901528cb31 dietlibc-0.31_pre20070611.tar.bz2 565237
-SHA256 f629883a1fa2df35874d59a02ee064abddcc61fbac8d394d6a3bc752e6736695 dietlibc-0.31_pre20070611.tar.bz2 565237
diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.31_pre20070612 b/dev-libs/dietlibc/files/digest-dietlibc-0.31_pre20070612
new file mode 100644
index 000000000000..25c7f084c446
--- /dev/null
+++ b/dev-libs/dietlibc/files/digest-dietlibc-0.31_pre20070612
@@ -0,0 +1,3 @@
+MD5 6ab9b1e58ba8a4ade3e25aa22918b912 dietlibc-0.31_pre20070612.tar.bz2 565685
+RMD160 c8d4aa98e68131a1fdca4e93d6e287aeddc07204 dietlibc-0.31_pre20070612.tar.bz2 565685
+SHA256 a35b72a0af0feba4b1a3c5550714fb8b9fa581f3c62dc2bef035aeda3be61106 dietlibc-0.31_pre20070612.tar.bz2 565685