Install ocaml-rebuild.sh in /usr/sbin rather than keeping it in PORTDIR, fix bug #175668

Package-Manager: portage-2.1.2.7

3 files changed, 21 insertions, 14 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 889cdb78810b..f3e98000fda2 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.101 2007/05/11 19:42:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.102 2007/05/12 08:25:44 aballier Exp $
+
+  12 May 2007; Alexis Ballier <aballier@gentoo.org> ocaml-3.09.3-r1.ebuild:
+  Install ocaml-rebuild.sh in /usr/sbin rather than keeping it in PORTDIR, fix
+  bug #175668
 
   11 May 2007; Alexis Ballier <aballier@gentoo.org> ocaml-3.09.3.ebuild,
   ocaml-3.09.3-r1.ebuild:
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 9af77c5cb118..505b85313f64 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -32,18 +32,18 @@ EBUILD ocaml-3.09.2.ebuild 2402 RMD160 6bc854705b08c0ef5e9d05d6e6009d6c463f2d33
 MD5 8cb80568d2fffd2db8db680e611b1323 ocaml-3.09.2.ebuild 2402
 RMD160 6bc854705b08c0ef5e9d05d6e6009d6c463f2d33 ocaml-3.09.2.ebuild 2402
 SHA256 8144897559ad397542ece72e1d503d561add45cf8ac3daab8c2fd1020e38a030 ocaml-3.09.2.ebuild 2402
-EBUILD ocaml-3.09.3-r1.ebuild 4558 RMD160 7770f41176a7feef6a09d44ca1de5283b8e12acb SHA1 839baa3c351ac8e5cc1c9234d97745c8407bb2db SHA256 b701a837fb8e17f7c44b0904b67a2bbff071eb6a85a97be9474eb956a518d5f7
-MD5 7620dc6b605b3e71dd6d7509ef4bd1e1 ocaml-3.09.3-r1.ebuild 4558
-RMD160 7770f41176a7feef6a09d44ca1de5283b8e12acb ocaml-3.09.3-r1.ebuild 4558
-SHA256 b701a837fb8e17f7c44b0904b67a2bbff071eb6a85a97be9474eb956a518d5f7 ocaml-3.09.3-r1.ebuild 4558
+EBUILD ocaml-3.09.3-r1.ebuild 4663 RMD160 e75f17c182675bfe72ab881f43eaa48d94507948 SHA1 e90c624d2e0c8ce27cbede1b5470fe9801871110 SHA256 c5836e843baafece30fae645aaad5e5890709bd2ec1f82de8fddec6cc4aa7740
+MD5 f44298883515fdb052a5f4727215ac92 ocaml-3.09.3-r1.ebuild 4663
+RMD160 e75f17c182675bfe72ab881f43eaa48d94507948 ocaml-3.09.3-r1.ebuild 4663
+SHA256 c5836e843baafece30fae645aaad5e5890709bd2ec1f82de8fddec6cc4aa7740 ocaml-3.09.3-r1.ebuild 4663
 EBUILD ocaml-3.09.3.ebuild 2502 RMD160 2a015120aec3b6ce103ffeebdae265e1ced4aa49 SHA1 44bdb0801fe812386f53a75b3ba376ae1b54eee6 SHA256 fad524f73b1a807254283cc48dc742f18a8fec1a5b3123a86435a014cbc2125f
 MD5 e44a3de37fac8ae24a87c9f1d4019c7a ocaml-3.09.3.ebuild 2502
 RMD160 2a015120aec3b6ce103ffeebdae265e1ced4aa49 ocaml-3.09.3.ebuild 2502
 SHA256 fad524f73b1a807254283cc48dc742f18a8fec1a5b3123a86435a014cbc2125f ocaml-3.09.3.ebuild 2502
-MISC ChangeLog 15957 RMD160 c7560445bc57408ad3bfa6981aba4d0619607a94 SHA1 f3f163a8063e12efa0b966a681be559d383f5c3a SHA256 640e43c70fa36b45c2d7bfb7bd185c62f7097c175a7a5a7b9672795f68bd4742
-MD5 5329eb81ecfb99bd139d63b466d0a45e ChangeLog 15957
-RMD160 c7560445bc57408ad3bfa6981aba4d0619607a94 ChangeLog 15957
-SHA256 640e43c70fa36b45c2d7bfb7bd185c62f7097c175a7a5a7b9672795f68bd4742 ChangeLog 15957
+MISC ChangeLog 16127 RMD160 e4844fcf3acfc5a032a4c7297c7e06b7417da759 SHA1 8a702f45e9c2f46ed0499365cbb0fbdd0ad82247 SHA256 c50bcc4981426e0282ed374a438055198a40343ac8be49ade3cafc63a95793e6
+MD5 c76f1c6b494a50bb5c97e124cebed111 ChangeLog 16127
+RMD160 e4844fcf3acfc5a032a4c7297c7e06b7417da759 ChangeLog 16127
+SHA256 c50bcc4981426e0282ed374a438055198a40343ac8be49ade3cafc63a95793e6 ChangeLog 16127
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -63,7 +63,7 @@ SHA256 19708f759185ed39623e03921462ba20fb6f3533268673d2bcd7dd07cef57350 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGRMadvFcC4BYPU0oRAmoZAKCSKecRnuVwJid8cacHR00nhxsBEQCgqoih
-d4HHXsTtYJUCo1E3wmBf8CE=
-=HEln
+iD8DBQFGRXmUvFcC4BYPU0oRAtZIAJ9KfdQcklBYC0qdtB9HpK4YPP2PvACeI2tw
+JNy2WUHSMqT0AJ6GSWt+M8U=
+=j+Fs
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild b/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild
index 236a6fa8eef4..c0793ee4335c 100644
--- a/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.09.3-r1.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-lang/ocaml/ocaml-3.09.3-r1.ebuild,v 1.4 2007/05/11 19:42:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild,v 1.5 2007/05/12 08:25:44 aballier Exp $
 
 inherit flag-o-matic eutils multilib pax-utils versionator toolchain-funcs
 
@@ -113,6 +113,9 @@ src_install() {
 		echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
 		doenvd "${T}"/99ocamldoc
 	fi
+
+	# Install ocaml-rebuild.sh script rather than keeping it in $PORTDIR
+	dosbin "${FILESDIR}/ocaml-rebuild.sh"
 }
 
 pkg_postinst() {
@@ -126,7 +129,7 @@ pkg_postinst() {
 	elog "OCaml is not binary compatible from version to version, so you (may)"
 	elog "need to rebuild all packages depending on it, that are actually"
 	elog "installed on your system. To do so, you can run:"
-	elog "sh ${FILESDIR}/ocaml-rebuild.sh [-h | emerge options]"
+	elog "/usr/sbin/ocaml-rebuild.sh [-h | emerge options]"
 	elog "Which will call emerge on all old packages with the given options"
 	echo
 }