Make install phase idempotent by moving files in .../bin instead of directory itself.

Package-Manager: portage-2.1-r1

3 files changed, 39 insertions, 26 deletions

diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index 3f7b2ed6f364..5fde69eec846 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/bzip2
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.42 2006/04/23 16:40:07 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.43 2006/07/01 17:33:09 kanaka Exp $
+
+  01 Jul 2006; Joel Martin <kanaka@gentoo.org> bzip2-1.0.3-r6.ebuild:
+  Make install phase idempotent by moving files in .../bin instead of
+  directory itself.
 
   28 Apr 2006; Joshua Kinard <kumba@gentoo.org> bzip2-1.0.3-r6.ebuild:
   Marked stable on mips.
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 33b49ba9d854..0cdf79dad713 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1,61 +1,69 @@
-AUX bzip2-1.0.2-NULL-ptr-check.patch 838 RMD160 fb3131d6770357f9515c4fe7862fb83846ead484 SHA1 02c3112f173bca5d9b15a516a6b01da1c116ba59 SHA256 68b3fb53c688499c79b0fc4d1d69903bfeb599f4ad852d50f5643a1e26d26e3e size 838
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX bzip2-1.0.2-NULL-ptr-check.patch 838 RMD160 fb3131d6770357f9515c4fe7862fb83846ead484 SHA1 02c3112f173bca5d9b15a516a6b01da1c116ba59 SHA256 68b3fb53c688499c79b0fc4d1d69903bfeb599f4ad852d50f5643a1e26d26e3e
 MD5 cc73bebefba3a38c58fc49b49d7d25a7 files/bzip2-1.0.2-NULL-ptr-check.patch 838
 RMD160 fb3131d6770357f9515c4fe7862fb83846ead484 files/bzip2-1.0.2-NULL-ptr-check.patch 838
 SHA256 68b3fb53c688499c79b0fc4d1d69903bfeb599f4ad852d50f5643a1e26d26e3e files/bzip2-1.0.2-NULL-ptr-check.patch 838
-AUX bzip2-1.0.2-bzgrep.patch 626 RMD160 4e9a2d4ff8d6954fb3b81e048c2dce14019d89f4 SHA1 bdbf26d37b682d7ee90e069e483da90a4d857b36 SHA256 17db9eb083bcca2b31b000d209fbde9707d0ef3a22e9ba0bbc836e67d9dafc0e size 626
+AUX bzip2-1.0.2-bzgrep.patch 626 RMD160 4e9a2d4ff8d6954fb3b81e048c2dce14019d89f4 SHA1 bdbf26d37b682d7ee90e069e483da90a4d857b36 SHA256 17db9eb083bcca2b31b000d209fbde9707d0ef3a22e9ba0bbc836e67d9dafc0e
 MD5 dbeea89d55ec8759ef24434afc2316ab files/bzip2-1.0.2-bzgrep.patch 626
 RMD160 4e9a2d4ff8d6954fb3b81e048c2dce14019d89f4 files/bzip2-1.0.2-bzgrep.patch 626
 SHA256 17db9eb083bcca2b31b000d209fbde9707d0ef3a22e9ba0bbc836e67d9dafc0e files/bzip2-1.0.2-bzgrep.patch 626
-AUX bzip2-1.0.2-chmod.patch 2780 RMD160 24997a18f8bcce8a273c9610a72de612c7d5a29a SHA1 b1daca700951dc7a6b05171218e55ace141d2c31 SHA256 68d77b0cf362d7ef19a5c546de1e821abf682bde7a7b5095c4299cbf37c45acb size 2780
+AUX bzip2-1.0.2-chmod.patch 2780 RMD160 24997a18f8bcce8a273c9610a72de612c7d5a29a SHA1 b1daca700951dc7a6b05171218e55ace141d2c31 SHA256 68d77b0cf362d7ef19a5c546de1e821abf682bde7a7b5095c4299cbf37c45acb
 MD5 a0833247f0c02ccb65cceb33ea521457 files/bzip2-1.0.2-chmod.patch 2780
 RMD160 24997a18f8bcce8a273c9610a72de612c7d5a29a files/bzip2-1.0.2-chmod.patch 2780
 SHA256 68d77b0cf362d7ef19a5c546de1e821abf682bde7a7b5095c4299cbf37c45acb files/bzip2-1.0.2-chmod.patch 2780
-AUX bzip2-1.0.2-progress.patch 6141 RMD160 213842d0d7742dce4c1d938b79134b9e910bc8ec SHA1 90a0032645886b633c9b730d0a1abb88c88a9873 SHA256 a76f6d082a1a1fef2eff111177d7c7568e1d457fb2b98cde71bbbe6ea1c7c787 size 6141
+AUX bzip2-1.0.2-progress.patch 6141 RMD160 213842d0d7742dce4c1d938b79134b9e910bc8ec SHA1 90a0032645886b633c9b730d0a1abb88c88a9873 SHA256 a76f6d082a1a1fef2eff111177d7c7568e1d457fb2b98cde71bbbe6ea1c7c787
 MD5 5f7a98f0aaaed6554126d30e28383ee0 files/bzip2-1.0.2-progress.patch 6141
 RMD160 213842d0d7742dce4c1d938b79134b9e910bc8ec files/bzip2-1.0.2-progress.patch 6141
 SHA256 a76f6d082a1a1fef2eff111177d7c7568e1d457fb2b98cde71bbbe6ea1c7c787 files/bzip2-1.0.2-progress.patch 6141
-AUX bzip2-1.0.3-makefile-CFLAGS.patch 412 RMD160 bfaa7213cc80066bcfe92bd7e5f65640dfa16a7c SHA1 c96c61b6862998f928b52938b9497831718c02b8 SHA256 336b9b0150282b765555cc5aab91b7ecef6cadcf9b35ad81e5fef7341ecdc21f size 412
+AUX bzip2-1.0.3-makefile-CFLAGS.patch 412 RMD160 bfaa7213cc80066bcfe92bd7e5f65640dfa16a7c SHA1 c96c61b6862998f928b52938b9497831718c02b8 SHA256 336b9b0150282b765555cc5aab91b7ecef6cadcf9b35ad81e5fef7341ecdc21f
 MD5 ac08797208ed37631f0f375860b7a027 files/bzip2-1.0.3-makefile-CFLAGS.patch 412
 RMD160 bfaa7213cc80066bcfe92bd7e5f65640dfa16a7c files/bzip2-1.0.3-makefile-CFLAGS.patch 412
 SHA256 336b9b0150282b765555cc5aab91b7ecef6cadcf9b35ad81e5fef7341ecdc21f files/bzip2-1.0.3-makefile-CFLAGS.patch 412
-AUX bzip2-1.0.3-makefile-LDFLAGS.patch 482 RMD160 ec746e52242f687650f577d559abfe757147fb1b SHA1 bc30f1fdd2b52762f6007f3c6b99cd11d10269fd SHA256 80638fd8eb1e5587a6a5243f7d20cad1f09d409f3d1f181aa7daf2f27fe5f481 size 482
+AUX bzip2-1.0.3-makefile-LDFLAGS.patch 482 RMD160 ec746e52242f687650f577d559abfe757147fb1b SHA1 bc30f1fdd2b52762f6007f3c6b99cd11d10269fd SHA256 80638fd8eb1e5587a6a5243f7d20cad1f09d409f3d1f181aa7daf2f27fe5f481
 MD5 229d3efda4fa04ec02e72883bf783b08 files/bzip2-1.0.3-makefile-LDFLAGS.patch 482
 RMD160 ec746e52242f687650f577d559abfe757147fb1b files/bzip2-1.0.3-makefile-LDFLAGS.patch 482
 SHA256 80638fd8eb1e5587a6a5243f7d20cad1f09d409f3d1f181aa7daf2f27fe5f481 files/bzip2-1.0.3-makefile-LDFLAGS.patch 482
-AUX bzip2-1.0.3-no-test.patch 161 RMD160 8611ae7d6fe578e7fd24585e158c10468caca2f1 SHA1 6a8a9495e71f291aaf5bd89b134e83ccd0b5e006 SHA256 806dcb0f9f46a2b0b3ef04212405708198a25e281617e27a44c565948c159a49 size 161
+AUX bzip2-1.0.3-no-test.patch 161 RMD160 8611ae7d6fe578e7fd24585e158c10468caca2f1 SHA1 6a8a9495e71f291aaf5bd89b134e83ccd0b5e006 SHA256 806dcb0f9f46a2b0b3ef04212405708198a25e281617e27a44c565948c159a49
 MD5 55623d1117616943ca093e67c20e8ae1 files/bzip2-1.0.3-no-test.patch 161
 RMD160 8611ae7d6fe578e7fd24585e158c10468caca2f1 files/bzip2-1.0.3-no-test.patch 161
 SHA256 806dcb0f9f46a2b0b3ef04212405708198a25e281617e27a44c565948c159a49 files/bzip2-1.0.3-no-test.patch 161
-AUX bzip2-1.0.3-saneso.patch 323 RMD160 d240f6d8d23f0584ee4bb4171935897a18f0c09e SHA1 9350fcd409ecdc930da27017ea88941e01b17627 SHA256 4b016b5831f6102bdd1f9d766609ee287f952a749d72f70e408fcc0adfd614c1 size 323
+AUX bzip2-1.0.3-saneso.patch 323 RMD160 d240f6d8d23f0584ee4bb4171935897a18f0c09e SHA1 9350fcd409ecdc930da27017ea88941e01b17627 SHA256 4b016b5831f6102bdd1f9d766609ee287f952a749d72f70e408fcc0adfd614c1
 MD5 d1cf85cb43e35c9ecba9954295318ab8 files/bzip2-1.0.3-saneso.patch 323
 RMD160 d240f6d8d23f0584ee4bb4171935897a18f0c09e files/bzip2-1.0.3-saneso.patch 323
 SHA256 4b016b5831f6102bdd1f9d766609ee287f952a749d72f70e408fcc0adfd614c1 files/bzip2-1.0.3-saneso.patch 323
-AUX bzip2-1.0.3-shared-largefile-support.patch 404 RMD160 b8720c32af7133135bc81ef3e9b1b906ef6b6d44 SHA1 5bc282decc6aeaa75ecee47e69a2e94421710e2b SHA256 a253e534237980430bd5a5eb2d6f142c0b6ec2be644bc827126548a479dcfd85 size 404
+AUX bzip2-1.0.3-shared-largefile-support.patch 404 RMD160 b8720c32af7133135bc81ef3e9b1b906ef6b6d44 SHA1 5bc282decc6aeaa75ecee47e69a2e94421710e2b SHA256 a253e534237980430bd5a5eb2d6f142c0b6ec2be644bc827126548a479dcfd85
 MD5 613ebf0fa8c5fd2ed2973ffe0d727e2a files/bzip2-1.0.3-shared-largefile-support.patch 404
 RMD160 b8720c32af7133135bc81ef3e9b1b906ef6b6d44 files/bzip2-1.0.3-shared-largefile-support.patch 404
 SHA256 a253e534237980430bd5a5eb2d6f142c0b6ec2be644bc827126548a479dcfd85 files/bzip2-1.0.3-shared-largefile-support.patch 404
-DIST bzip2-1.0.3.tar.gz 669075 RMD160 7ac2a122c254d1fcd54ca8af96a1814e9e245a1a SHA256 4aaa8e7b4ecf03d91c33e8bf92d489533fa6c1f99e825c34058003f18eb68c13 size 669075
-EBUILD bzip2-1.0.3-r5.ebuild 2220 RMD160 7f3a8e66079eb79ba56b7bb0297f4d972f5afc52 SHA1 c99d018d9792e63114eed7a3170563090c5be20a SHA256 edb05fcb75ce487ad0699eba566b35957fe470476db25bd88b07005dc5d2c54b size 2220
+DIST bzip2-1.0.3.tar.gz 669075 RMD160 7ac2a122c254d1fcd54ca8af96a1814e9e245a1a SHA1 7e749510f65c86fbfff37b97144a02f1b8b8617f SHA256 4aaa8e7b4ecf03d91c33e8bf92d489533fa6c1f99e825c34058003f18eb68c13
+EBUILD bzip2-1.0.3-r5.ebuild 2220 RMD160 7f3a8e66079eb79ba56b7bb0297f4d972f5afc52 SHA1 c99d018d9792e63114eed7a3170563090c5be20a SHA256 edb05fcb75ce487ad0699eba566b35957fe470476db25bd88b07005dc5d2c54b
 MD5 a8859052e282ebc02dafdb66abf24dec bzip2-1.0.3-r5.ebuild 2220
 RMD160 7f3a8e66079eb79ba56b7bb0297f4d972f5afc52 bzip2-1.0.3-r5.ebuild 2220
 SHA256 edb05fcb75ce487ad0699eba566b35957fe470476db25bd88b07005dc5d2c54b bzip2-1.0.3-r5.ebuild 2220
-EBUILD bzip2-1.0.3-r6.ebuild 2354 RMD160 42bc6c281dff60bd021f57700e14d88b2c6a17f5 SHA1 bab75dd4fc76c5386edfba5c49b90ed226bcc16d SHA256 a391c5575c25744d077c2501c1e919215f092de26a120b98b9c4a6f5bc8d9e95 size 2354
-MD5 4b139e239a70d3441f4f6c84eff74159 bzip2-1.0.3-r6.ebuild 2354
-RMD160 42bc6c281dff60bd021f57700e14d88b2c6a17f5 bzip2-1.0.3-r6.ebuild 2354
-SHA256 a391c5575c25744d077c2501c1e919215f092de26a120b98b9c4a6f5bc8d9e95 bzip2-1.0.3-r6.ebuild 2354
-MISC ChangeLog 8299 RMD160 7c6af4670333de6fbaaa23097c2dede2e715a6ad SHA1 4ceb38bdba3adbac696acc210d60580f2fa74008 SHA256 cc100c5de7d33e842d26a2cda4def0a8fce50a232e996c651590deabd34303dc size 8299
-MD5 45b5273cc5efe8daceba07874ec256de ChangeLog 8299
-RMD160 7c6af4670333de6fbaaa23097c2dede2e715a6ad ChangeLog 8299
-SHA256 cc100c5de7d33e842d26a2cda4def0a8fce50a232e996c651590deabd34303dc ChangeLog 8299
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 size 164
+EBUILD bzip2-1.0.3-r6.ebuild 2386 RMD160 6d08ab2da28aa357af1027a38b9aa29ba50e0009 SHA1 cf34e94780fc563a84a186048385142866e95c4f SHA256 e144b53228d9bd1f63585df8be414c1e527d52065a2882229362d7cae2b601ca
+MD5 47b5ff12e41eebc6d6d57945819c04a5 bzip2-1.0.3-r6.ebuild 2386
+RMD160 6d08ab2da28aa357af1027a38b9aa29ba50e0009 bzip2-1.0.3-r6.ebuild 2386
+SHA256 e144b53228d9bd1f63585df8be414c1e527d52065a2882229362d7cae2b601ca bzip2-1.0.3-r6.ebuild 2386
+MISC ChangeLog 8461 RMD160 3ec69ae79791ebe5577cbd5ff4eb19571a9eb5b2 SHA1 630c24f529f0daefc2e21183048420b3f89cca07 SHA256 2bf647d2d4cbc4f5ede4c9296095943ed8b8d6f9570d217255d09be9f39da5b9
+MD5 ce7ab9c5207e7d751d1cf653d86e1457 ChangeLog 8461
+RMD160 3ec69ae79791ebe5577cbd5ff4eb19571a9eb5b2 ChangeLog 8461
+SHA256 2bf647d2d4cbc4f5ede4c9296095943ed8b8d6f9570d217255d09be9f39da5b9 ChangeLog 8461
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
 MD5 22697ba9a4a75c2f675d528a5e3c4604 files/digest-bzip2-1.0.3-r5 235
 RMD160 65663f650ee924ec32e9a25930e8c6e46c6ddaca files/digest-bzip2-1.0.3-r5 235
 SHA256 6382eb176f58def89afcb6a2df6ef92d99ecf768602dec13b3f93da5e92a2559 files/digest-bzip2-1.0.3-r5 235
-size 235 files/digest-bzip2-1.0.3-r5 235
 MD5 22697ba9a4a75c2f675d528a5e3c4604 files/digest-bzip2-1.0.3-r6 235
 RMD160 65663f650ee924ec32e9a25930e8c6e46c6ddaca files/digest-bzip2-1.0.3-r6 235
 SHA256 6382eb176f58def89afcb6a2df6ef92d99ecf768602dec13b3f93da5e92a2559 files/digest-bzip2-1.0.3-r6 235
-size 235 files/digest-bzip2-1.0.3-r6 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFEprM9baW+3NC9cLgRApvsAJ9xx5nNwEk4LcpzBvE8IIoES9KWSwCfckh5
+qKYJ8uKvnsfStrLjNpIxLms=
+=x9QS
+-----END PGP SIGNATURE-----
diff --git a/app-arch/bzip2/bzip2-1.0.3-r6.ebuild b/app-arch/bzip2/bzip2-1.0.3-r6.ebuild
index a092e1d4e47d..0319f630a286 100644
--- a/app-arch/bzip2/bzip2-1.0.3-r6.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.3-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.3-r6.ebuild,v 1.12 2006/04/23 16:40:07 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.3-r6.ebuild,v 1.13 2006/07/01 17:33:09 kanaka Exp $
 
 inherit eutils multilib toolchain-funcs flag-o-matic
 
@@ -58,8 +58,9 @@ src_install() {
 	if ! use build ; then
 		make PREFIX="${D}"/usr LIBDIR=$(get_libdir) install || die
 
-		# move bzip2 binaries to / and use the shared libbz2.so
-		mv "${D}"/usr/bin "${D}"/
+		# move bzip2 binaries to /bin and use the shared libbz2.so
+		mkdir -p "${D}"/bin
+		mv "${D}"/usr/bin/* "${D}"/bin/
 		into /
 		if ! use static ; then
 			newbin bzip2-shared bzip2 || die "dobin shared"