summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Martin <kanaka@gentoo.org>2006-07-01 17:33:09 +0000
committerJoel Martin <kanaka@gentoo.org>2006-07-01 17:33:09 +0000
commit53b4a0fee1d912a2be65168b5cb0c694204f8086 (patch)
tree5f95813d37c527a90780d6d8c30031cbaa42d0ff /app-arch
parentDrop ~arm, too. (diff)
downloadgentoo-2-53b4a0fee1d912a2be65168b5cb0c694204f8086.tar.gz
gentoo-2-53b4a0fee1d912a2be65168b5cb0c694204f8086.tar.bz2
gentoo-2-53b4a0fee1d912a2be65168b5cb0c694204f8086.zip
Make install phase idempotent by moving files in .../bin instead of directory itself.
(Portage version: 2.1-r1)
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/bzip2/ChangeLog6
-rw-r--r--app-arch/bzip2/bzip2-1.0.3-r6.ebuild7
2 files changed, 9 insertions, 4 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/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"