install was hardcoded in the Makefile. Fix bug #218896.

Package-Manager: portage-2.1.4.4

4 files changed, 38 insertions, 5 deletions

diff --git a/dev-util/devel-chroots/ChangeLog b/dev-util/devel-chroots/ChangeLog
index 7adc048e9c99..4cfc19e8b9dd 100644
--- a/dev-util/devel-chroots/ChangeLog
+++ b/dev-util/devel-chroots/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/devel-chroots
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devel-chroots/ChangeLog,v 1.33 2008/06/03 01:27:11 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devel-chroots/ChangeLog,v 1.34 2008/06/12 23:48:08 darkside Exp $
+
+  12 Jun 2008; Jeremy Olexa <darkside@gentoo.org>
+  +files/devel-chroots-1.0.1-install.patch, devel-chroots-1.0.1.ebuild:
+  install was hardcoded in the Makefile. Fix bug #218896.
 
   03 Jun 2008; Jeremy Olexa <darkside@gentoo.org>
   devel-chroots-2.1.0.ebuild:
diff --git a/dev-util/devel-chroots/Manifest b/dev-util/devel-chroots/Manifest
index e8a1c996e12d..8667f56aaa50 100644
--- a/dev-util/devel-chroots/Manifest
+++ b/dev-util/devel-chroots/Manifest
@@ -1,8 +1,9 @@
+AUX devel-chroots-1.0.1-install.patch 1447 RMD160 008fbc239970de9dfc0a20da26d543772b551089 SHA1 d7225e076ecf4e095f8c233c02a8da8a01c06fa9 SHA256 fdc66865b5ca10a1b8a2ebce3ba60bfe4f293891fefd94fac4bd196a292da143
 DIST devel-chroots-1.0.1.tar.gz 7272 RMD160 7cadddd482cd669ccb79f4d4483e69db350471d9 SHA1 45b5fcf351a8778b242ee1314045a52e2802ac62 SHA256 8cf06733d31ec4066274df1972dad55ee8686a59edb6a0ca5ae56b81b397ffa5
 DIST devel-chroots-2.0.0.tar.gz 6196 RMD160 540c387cd2e15b7fd0c37d946ba66bd3db85b5ef SHA1 e38ee461bbbf74a3d6b8fb8c67cf2abc6ff0d93d SHA256 fc0d3ec46dab3b42bec2f1692068451869f1221911c749ed859bbb6b51d91785
 DIST devel-chroots-2.1.0.tar.gz 5590 RMD160 7b2f7a1b5bf0f37cbd91ea5b1ad707fe64dbb449 SHA1 b2f9d304eba39bc7b52b5db2f858ef5d3553cfed SHA256 3a603e64fd2bb435ad430c3e7a1dd8797fd6ec06d3e12958256d6ba18003c3b4
-EBUILD devel-chroots-1.0.1.ebuild 1082 RMD160 f72540e96e0fa26db811a34780b23ad93e5f0ae9 SHA1 bf3c257af2c97bc8e69ed6e1ff7ac87bbf0425a9 SHA256 6289dd8608bb5a1ba8522e12d6e36d0caf2cdbef52a00e295e44ba8d992f98a4
+EBUILD devel-chroots-1.0.1.ebuild 1193 RMD160 6e776f0ab998d2af08f3c0e69949faa6c3dc269b SHA1 8515d314cdefddf45eebcaa3005e712836a83867 SHA256 f2f4dd4546966c2593323354c1685d54c76c1aa9e66c8a7b034cc91af91704b2
 EBUILD devel-chroots-2.0.0.ebuild 999 RMD160 6313d5b95ab93d0700fef812c88ff7e0c65a8cb1 SHA1 f66919bde2a4d56f11452f78d662e711c37bf7b0 SHA256 d9795bc60b2eb6d6545be543089259bd6a6a659b18661036e6f7337bac6f0487
 EBUILD devel-chroots-2.1.0.ebuild 733 RMD160 cfae25a7e2efdf5385fe0a3bc9cfd15290041e87 SHA1 97232944d44b1c28b3619ccd98fb261ba8c9841c SHA256 363d03ccbc4fd9e494f07bf360c856bfa1b658efc48e48216912bd51b17e93ba
-MISC ChangeLog 3768 RMD160 14547581b59f96b7c7fa93fc5c8a909c4276d459 SHA1 59db21d8b070f22787d33bdd06e743e944be79a8 SHA256 9f4f3b33284f1bb0b49060d980ce8ee29fbede910154da0e28d8414b70516d43
+MISC ChangeLog 3949 RMD160 88e75d30d7008697f7c4d0fb9cac1cabb5689976 SHA1 7d80f79ce342f32dc05fe8314bdb60e540c30b11 SHA256 5104ecd2366449d40ecd05b4728cb3ab7e79e7fa07ffde59eda9e5a89fa88ce9
 MISC metadata.xml 452 RMD160 8639966c8cb9d5aae603e40c1927b91c778c75a9 SHA1 7f0d91b92847e3e381ce45e964c39942ca8dca7f SHA256 fb7181f7682acebaa59fc2c2be8df60eb70a933d68af5ee1430d646836814fed
diff --git a/dev-util/devel-chroots/devel-chroots-1.0.1.ebuild b/dev-util/devel-chroots/devel-chroots-1.0.1.ebuild
index 27649e68dd76..5137de3d16b3 100644
--- a/dev-util/devel-chroots/devel-chroots-1.0.1.ebuild
+++ b/dev-util/devel-chroots/devel-chroots-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devel-chroots/devel-chroots-1.0.1.ebuild,v 1.9 2007/07/12 01:05:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devel-chroots/devel-chroots-1.0.1.ebuild,v 1.10 2008/06/12 23:48:08 darkside Exp $
 
 DESCRIPTION="Gentoo Developer chroots installation/configuration launcher"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/docs/devel-chroots-intro.xml"
@@ -19,6 +19,13 @@ IUSE=""
 
 DEPEND="app-misc/screen net-misc/wget sys-apps/sed"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i -e 's/\/bin\/install/install/' Makefile || die "sed failed"
+}
+
 src_compile() {
 	emake || die "emake failed"
 
diff --git a/dev-util/devel-chroots/files/devel-chroots-1.0.1-install.patch b/dev-util/devel-chroots/files/devel-chroots-1.0.1-install.patch
new file mode 100644
index 000000000000..893ff7902100
--- /dev/null
+++ b/dev-util/devel-chroots/files/devel-chroots-1.0.1-install.patch
@@ -0,0 +1,21 @@
+--- Makefile.orig	2008-06-12 18:32:17.000000000 -0500
++++ Makefile	2008-06-12 18:32:39.000000000 -0500
+@@ -5,13 +5,13 @@
+ 
+ install:
+ 
+-	/bin/install -D --mode=0755 -p --group=root --owner=root "src/scripts/devel-chroots" "${DESTDIR}/usr/bin/devel-chroots"
+-	/bin/install -D --mode=0755 -p --group=root --owner=root "src/scripts/devel-chroots-umount-all" "${DESTDIR}/usr/bin/devel-chroots-umount-all"
++	install -D --mode=0755 -p --group=root --owner=root "src/scripts/devel-chroots" "${DESTDIR}/usr/bin/devel-chroots"
++	install -D --mode=0755 -p --group=root --owner=root "src/scripts/devel-chroots-umount-all" "${DESTDIR}/usr/bin/devel-chroots-umount-all"
+ 
+-	/bin/install -D --mode=0755 -p --group=root --owner=root "devel-chroots-hostname" "${DESTDIR}/usr/bin/devel-chroots-hostname"
++	/install -D --mode=0755 -p --group=root --owner=root "devel-chroots-hostname" "${DESTDIR}/usr/bin/devel-chroots-hostname"
+ 
+-	/bin/install -D --mode=0755 -p --group=root --owner=root "config/devel-chroots-core.conf" "${DESTDIR}/etc/devel-chroots-core.conf"
+-	/bin/install -D --mode=0755 -p --group=root --owner=root "config/devel-chroots-user.conf" "${DESTDIR}/etc/devel-chroots-user.conf"
++	install -D --mode=0755 -p --group=root --owner=root "config/devel-chroots-core.conf" "${DESTDIR}/etc/devel-chroots-core.conf"
++	install -D --mode=0755 -p --group=root --owner=root "config/devel-chroots-user.conf" "${DESTDIR}/etc/devel-chroots-user.conf"
+ 
+ clean:
+