Do not suggest emerge @ocaml-rebuild if portage 2.2 is not used, it is not going to work, bug #444254

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 16 insertions, 9 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index ce45d54e84b2..02471f22c3bf 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.209 2013/02/07 12:44:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.210 2013/02/07 20:38:48 aballier Exp $
+
+  07 Feb 2013; Alexis Ballier <aballier@gentoo.org> ocaml-4.00.1.ebuild:
+  Do not suggest emerge @ocaml-rebuild if portage 2.2 is not used, it is not
+  going to work, bug #444254
 
   07 Feb 2013; Alexis Ballier <aballier@gentoo.org> ocaml-4.00.1.ebuild:
   Bump to EAPI 5, use PV subslot because we want to rebuild everything
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 729fc2a21046..369573cca3c0 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -13,13 +13,13 @@ DIST ocaml-patches-4.tar.bz2 2429 SHA256 42e7120e8b682dfbef9e5f5cc95adfc67f0ca72
 EBUILD ocaml-3.11.2.ebuild 4127 SHA256 89abc74d30c03d2755623f3b9eadcb1a4b975fb9b668616f380640b6af76aeea SHA512 ac4a51bdf2e199635a2ab8fa18cab1907ef5f4357bc9695d23462d4cda4e836867a6de6c9d07f93522094ce764331d47528a6a46182fd3342a382dbae363da0c WHIRLPOOL 8b0d3bd3a359443dad4f4611af785cf857a2d3cbb8736f41fff28b7e86519036e7810fa3dbcba60fb07a4e79bb8148400b256b36a3390491151883ebb2c15132
 EBUILD ocaml-3.12.1.ebuild 4045 SHA256 924440c4a1a73ea30cd8833d85cde70f9ad95eb9ce5e13326f9b288569dd52e9 SHA512 3f6c6430eaac2020759134ea26012e2c657dd49f42fc54bbc6fff133639bdd78bfbe381d44b53281c9dd51d8a86eeaa25729b9766a12f45c2fd31a757df9ef94 WHIRLPOOL 1355f4ae0c98153efdfc95cd74a67383176d2141c5bef77cf41fd44b22901c3b5446d4aa0d7c83c7bd4d4a3fac564328a7a434051b523b64e827bd81db20d0d9
 EBUILD ocaml-4.00.0.ebuild 3982 SHA256 77df6c597358aa57ff5e8824ecfce494d1ef74df931506c21f9ba491d3afeb8e SHA512 e27a43c83c6241bdd18fb846580252dd448d19d8cc6c03bbe74e973c1416399ac7d08aa87187090e077bd6291649163fb6d2bdded632d92c34d495ad3b4441d5 WHIRLPOOL 76f2d6be1d4455f691bd43a10de531d064b89833a30351084d1fe28a2e0624769920fbcd8ef82f7f741f2c7ff28075e6b2bf14768f3002141835e4f26ef1e199
-EBUILD ocaml-4.00.1.ebuild 3789 SHA256 f5239f25f2a1cf8e840b1dbeaa8c030dc85065f5c176c82959e918ed03591e6f SHA512 d35b3ffc9105d840a99d7708afaabdba53bff427854aae45992eacf1c7d1077821b2a54162fa76a69e3ccd973db009e0c57bd5a8f6b65a418fe1a8caea8b8655 WHIRLPOOL 0dace8edc332fc32734289a0e4a940c7fd1a41c4cef6f79a78190b45f9763bf9e9e39161ea44170c11b3eb012ac0b9d8d5e67e7bd9a4c66517c1a1a3171795a0
-MISC ChangeLog 32388 SHA256 115e76ca1cf7af13fc642efd6177264836931ae38ac5fddd18e1814ff09176d8 SHA512 72a72cfce3e8d79a9bb7c9c1115d7f844f10d14eca7defa6317da64cc41e4e3a1fb94c9f21445a0c7536a06be37191c64fa492d2955b287549ae9f9737e37c16 WHIRLPOOL 4bc872edcdb3c0bdd410213ef64d6541994762f4a70125b393f2e36fa1c00e634abc0ee8ba6a922af47917161215c16d56e1e43641a3a5034f081bb2e88b87c8
+EBUILD ocaml-4.00.1.ebuild 3822 SHA256 419d89d6088d769cb39d40a9c934910a33536ee0f3a551750863a547541afd7f SHA512 6417eae23f22fbd3159886b941d0675f1fe47242fe32c6e1d4e264204f17895e13681dffc5f648b7c98446653c73ab8b2557017aa00d544e11868bba94cf202f WHIRLPOOL 8e2753b1088617f2514aff28e9b24547920d3825271aea90785370d5b8aa7476c81a43df6008e545d4ca3dca66c952a1ad303a151c966ee5775c9ae19f0387b2
+MISC ChangeLog 32568 SHA256 4c8794cbf92fce4cf6821818f16131997c7e52fb0bf74ee0a0c1b044f870d0e6 SHA512 8f21bc157f7a40fcb801e511d9311a4d58dc6ab2421646adf59eb6484ff15e876435945183a4688633ced8d35f1346785acc6fc79ad5b0576d19d802c34b00cf WHIRLPOOL 07da2423079fd55706a0f3efe2c3d5cbb3c5fb636c31eff9ac4d9b6e3d461bbd954ce981e64d3d9acb150dd0e9231e85fdd5374ab2593dda9f327b32e8bec82e
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEToZkACgkQvFcC4BYPU0pfJACgkXdZwVLl6L/aibivID7ld1KE
-MvMAn3x3oVNFCLx8XgyAMrJFtE7LeiOQ
-=ZZlq
+iEYEAREIAAYFAlEUENoACgkQvFcC4BYPU0pJvACeIdNb/UhepT938zGDxA2o/VDg
+ZOYAn0hZ4pleX/+aluktd/rPCUAEbMG9
+=JoIc
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-4.00.1.ebuild b/dev-lang/ocaml/ocaml-4.00.1.ebuild
index eb3b6a3d6462..3204575586d1 100644
--- a/dev-lang/ocaml/ocaml-4.00.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.00.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-4.00.1.ebuild,v 1.2 2013/02/07 12:44:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-4.00.1.ebuild,v 1.3 2013/02/07 20:38:48 aballier Exp $
 
 EAPI="5"
 
@@ -119,7 +119,10 @@ pkg_postinst() {
 	ewarn "OCaml is not binary compatible from version to version, so you"
 	ewarn "need to rebuild all packages depending on it, that are actually"
 	ewarn "installed on your system. To do so, you can run:"
-	ewarn "emerge @ocaml-rebuild"
-	ewarn "Or, (almost) equivalently: emerge -1 /usr/$(get_libdir)/ocaml"
+	if has_version '>=sys-apps/portage-2.2' ; then
+		ewarn "emerge @ocaml-rebuild"
+	else
+		ewarn "emerge -1 /usr/$(get_libdir)/ocaml"
+	fi
 	echo
 }