From f845ceff80d90dc8ed7a93c90cf0e560b6745b6f Mon Sep 17 00:00:00 2001
From: Matthieu Sozeau <mattam@gentoo.org>
Date: Thu, 14 Sep 2006 16:14:07 +0000
Subject: Added support for SLOT'ed packages in rebuild script (Portage
 version: 2.1-r2)  (Unsigned Manifest commit)

---
 dev-lang/ocaml/Manifest               | 26 ++++++++------------------
 dev-lang/ocaml/files/ocaml-rebuild.sh | 12 ++++++++++--
 2 files changed, 18 insertions(+), 20 deletions(-)

(limited to 'dev-lang')

diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index c8e8aada72cb..12fb333f7ed1 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,14 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ocaml-3.08.3-gcc4.patch 710 RMD160 7c7399b1a1aa383815021721b4f4a5261137dc15 SHA1 19482bd2cc736a54645e0b48c82edd9863be0375 SHA256 007606bb38a7d66a003a94c9b45288055faacf5f15334a9ff6c33fdc91504e09
 MD5 c57fc46d92565b5d44c8c4f2a4a072d3 files/ocaml-3.08.3-gcc4.patch 710
 RMD160 7c7399b1a1aa383815021721b4f4a5261137dc15 files/ocaml-3.08.3-gcc4.patch 710
 SHA256 007606bb38a7d66a003a94c9b45288055faacf5f15334a9ff6c33fdc91504e09 files/ocaml-3.08.3-gcc4.patch 710
-AUX ocaml-rebuild.sh 1215 RMD160 2e7af6229e01e408fa6e95eac621d3bda54c5819 SHA1 55c337b05dc5e8fae52acbd36ebc9c89cdf84db0 SHA256 866d0ff4e107c4f4d74a86a1aad63d5347ed89474b4f362e36bd51ffa7adf266
-MD5 3148840e70f4bb5263bdf7cd6c97e6d9 files/ocaml-rebuild.sh 1215
-RMD160 2e7af6229e01e408fa6e95eac621d3bda54c5819 files/ocaml-rebuild.sh 1215
-SHA256 866d0ff4e107c4f4d74a86a1aad63d5347ed89474b4f362e36bd51ffa7adf266 files/ocaml-rebuild.sh 1215
+AUX ocaml-rebuild.sh 1361 RMD160 a9c452fbea18de3b38d8240f887f8595e529643e SHA1 2a682ce872c51e66a5ab13160da16b0f6d8bd366 SHA256 a8004cd4bca96ab3fc595fcfd7dbe88903833f9e430149c3d04c9fda84362b64
+MD5 bcc5109143faee7e7b8f7f76bd4726a7 files/ocaml-rebuild.sh 1361
+RMD160 a9c452fbea18de3b38d8240f887f8595e529643e files/ocaml-rebuild.sh 1361
+SHA256 a8004cd4bca96ab3fc595fcfd7dbe88903833f9e430149c3d04c9fda84362b64 files/ocaml-rebuild.sh 1361
 DIST ocaml-3.08.3.tar.bz2 2026597 RMD160 83fcab89371f228c35d826eb204c80e3380ddf27 SHA1 2ebbc72faea2ae8b96a42c489ecbcf34df9dbe76 SHA256 20aca649bacd75728d3566ccb52bd7a2899208fbc6de8aceb3bf19a87894e539
 DIST ocaml-3.08.4.tar.bz2 2054019 RMD160 448ed9af56cacb9c32208d064e1c9732a2086bd2 SHA256 8d4322791d0dd424f355636ba50934ac17dbefde269736dad0da0683c8888684
 DIST ocaml-3.09.1.tar.bz2 2035552
@@ -29,10 +26,10 @@ EBUILD ocaml-3.09.2.ebuild 2353 RMD160 c3ec3599935c542b1b4f8902dbcf26128a9127b2
 MD5 d7dec3674629f644149eaaeaa6097521 ocaml-3.09.2.ebuild 2353
 RMD160 c3ec3599935c542b1b4f8902dbcf26128a9127b2 ocaml-3.09.2.ebuild 2353
 SHA256 8a99be1178440cb8de327f22a0989a0dee1945ac0eabd3c149b7ec6a6ea587a2 ocaml-3.09.2.ebuild 2353
-MISC ChangeLog 12702 RMD160 8c76621aeb5a2f2e03f80a11c156c02db4e83da8 SHA1 5e5b941f4cce2889a909fd74362a72b359f07948 SHA256 98bccadb00ddfb57cd5a3506f5140f0ea3fdf9ade037f993d6b4a0de2698b202
-MD5 dee5939738d294559981f7209e2f582d ChangeLog 12702
-RMD160 8c76621aeb5a2f2e03f80a11c156c02db4e83da8 ChangeLog 12702
-SHA256 98bccadb00ddfb57cd5a3506f5140f0ea3fdf9ade037f993d6b4a0de2698b202 ChangeLog 12702
+MISC ChangeLog 12799 RMD160 bff875bccb1ee2e229f4c61ba75dd43590960209 SHA1 b476a4909f72a3882e114ca5cbe99aa9cf144aa0 SHA256 a49efaea0cbf0a96c8d76a8fe2041cd3080ae418f6c09d83969f05b187553cb6
+MD5 8fee44cd70f41f14a9b01d1d6782aab2 ChangeLog 12799
+RMD160 bff875bccb1ee2e229f4c61ba75dd43590960209 ChangeLog 12799
+SHA256 a49efaea0cbf0a96c8d76a8fe2041cd3080ae418f6c09d83969f05b187553cb6 ChangeLog 12799
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -49,10 +46,3 @@ SHA256 7ba7b26383ed92c6b59673420b2ce8a45452ef2e4de0808ebc76be223933c490 files/di
 MD5 ea45ed7daaee5c9ecf53013b90f7a82f files/digest-ocaml-3.09.2 244
 RMD160 01eeb8fd583185a7d8bf4c76f4d13cdd2caad23a files/digest-ocaml-3.09.2 244
 SHA256 4799bbb3279e3ec6a3541cbc418388633fcb7d32dbe0177334675586a8afa029 files/digest-ocaml-3.09.2 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEtRV3KRy60XGEcJIRAvS8AJ4lVoXf6xTNw2I7TZZlShmhvHNobACdHPFZ
-UIZp1gEMgkxH4jx4TdwO4VU=
-=Xyir
------END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/files/ocaml-rebuild.sh b/dev-lang/ocaml/files/ocaml-rebuild.sh
index 26b5630f60c8..fa76994b3c7e 100644
--- a/dev-lang/ocaml/files/ocaml-rebuild.sh
+++ b/dev-lang/ocaml/files/ocaml-rebuild.sh
@@ -30,11 +30,19 @@ do
   dir=`dirname $dep`
   pkg=`basename $dir`
   category=`cat $dir/CATEGORY`
+  slot=`cat $dir/SLOT`
 
   toclean="=$category/$pkg $toclean"
   tocleanstr="\"$category/$pkg\" $tocleanstr"
-  tobuild=">=$category/$pkg $tobuild"
-  tobuildstr="\">=$category/$pkg\" $tobuildstr"
+
+  if [ $slot -eq 0 ]
+  then
+	tobuild=">=$category/$pkg $tobuild"
+	tobuildstr="\">=$category/$pkg\" $tobuildstr"
+  else
+  	tobuild="=$category/$pkg $tobuild"
+	tobuildstr="\"=$category/$pkg\" $tobuildstr"
+  fi
 done
 
 echo Cleaning $tocleanstr
-- 
cgit v1.2.3-65-gdbad