Suggest gnustep-update for libobjc2, fix test on gnustep-make < 2.6.2

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

4 files changed, 27 insertions, 19 deletions

diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index 6f00b92c103a..1ff06a2dc45b 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnustep-base/gnustep-make
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.104 2012/02/09 15:11:16 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.105 2012/02/09 21:34:34 voyageur Exp $
+
+  09 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  gnustep-make-2.6.2.ebuild:
+  Suggest gnustep-update for libobjc2, fix test on gnustep-make < 2.6.2
 
   09 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org>
   gnustep-make-2.6.2.ebuild:
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index 76214c9b9918..70c1ed46d078 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -13,13 +13,13 @@ DIST gnustep-make-2.6.2.tar.gz 562770 RMD160 683b6a034d4bb7e17b64209c7e7e289e9e9
 EBUILD gnustep-make-2.4.0.ebuild 2335 RMD160 fb557f9e3ccbbe3c9d6505b5ea0240c5bf45be4f SHA1 6f8d32ff50ebe43e7697cde8f3f2c9307858430c SHA256 3efca9d4073527e756cfbc562cef3eb4b9c0dd09032be33ff89fe9be141883a1
 EBUILD gnustep-make-2.6.0.ebuild 2488 RMD160 4269a947fe5c159525e1f9773913889d03fe7812 SHA1 4f916eb0f834a930ccede5e3fc0a0f0a29a76b01 SHA256 cb622ead93fe859763c2266979ab02f27e3c578ef639c1e08b59352f895bb208
 EBUILD gnustep-make-2.6.1-r1.ebuild 2486 RMD160 46faa0e60887bea22eb5a4b585c5818be1255e27 SHA1 cdce750b077ccbfee4512f3aa0e6047f82834107 SHA256 f1ed6fbd1c5c1443662e4d330c9db4b16fb2eea7565f87637f925904bd6041a6
-EBUILD gnustep-make-2.6.2.ebuild 3148 RMD160 937852c8579efcb9ab6f90b1762634f9d76fdfc7 SHA1 19844b709e030432f629eb9a9191509872811b30 SHA256 faefe31407f525c71249ec981fc743bcacdd33665582a73c8ff5c98469e35490
-MISC ChangeLog 19362 RMD160 94521f908d8a615b03e58148ce8b31d5bef3eb63 SHA1 0fe041b1d846d835bbb78383d8c9d27c8b5c9df0 SHA256 26df2b1958e8878d9be30a4d4395cd8e6fdd95663a00b9060bd13a4e09708efd
+EBUILD gnustep-make-2.6.2.ebuild 3284 RMD160 a4a03b516eab50b20ec5431092c47bb7f9e47aa5 SHA1 513ca81b232f5dd34fa106710d100032648c8ce6 SHA256 7daa463bd3306b30ce555fb8ca84b44e74b9477043b144ef5e1c689f3cb251b6
+MISC ChangeLog 19519 RMD160 b533a7b8cc2843fc1d121fe3c767bb05f5e2df7f SHA1 cb588b423a93dc1e6400a173ece5631253ef3cba SHA256 afd8b237971e6721c58feccec7c9393901b6ca182080c9a53b7823246ec6a414
 MISC metadata.xml 898 RMD160 b9f3536bfebd8b110106c0acd25867ee18ee8913 SHA1 5c8af107c44ff235ab4817c553059aaee486af36 SHA256 00307fc5770d94f69c9c30ce99884a198bb71c5a14e85454b9bf164abc1f8b0f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8z4h8ACgkQFYEBGcdFJfLlngEAhv4z4pXy3iwY2//9N8e+YI0b
-URYj0v9Vo9Z6kfjAXSgA/2L1ym1UDAwdaOCJCfLn/wO3z1l02M8OdhvDh6eOjUQD
-=pbU8
+iF4EAREIAAYFAk80O/YACgkQFYEBGcdFJfI5cAEAm2yxmYmfxbQqCBH3Mpb/ckju
+bN9V0a/mrbyan/dPVtAA/0u4fk6s2UHC5h1WrY9ShfO3mlKlnrf4MIYTg8aoUIJ/
+=oIMO
 -----END PGP SIGNATURE-----
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
index 4dc095f4d83d..a770e445c535 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.2 2012/02/09 15:11:16 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.3 2012/02/09 21:34:34 voyageur Exp $
 
 EAPI=4
 
@@ -23,13 +23,17 @@ DEPEND="${GNUSTEP_CORE_DEPEND}
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	if ( use libobjc2 && ! has_version gnustep-base/gnustep-make[libobjc2] ) || \
-		( ! use libobjc2 && has_version gnustep-base/gnustep-make[libobjc2] ) || \
-		( use libobjc2 && has_version <gnustep-base-2.6.2 ) ; then
-		ewarn "TOGGLED libobjc2 USE-FLAG WARNING:"
-		ewarn "You changed the libojbc2 use-flag"
-		ewarn "You must rebuild all gnustep packages installed."
-		# Suggest gnustep-updater once it can do the trick
+	if has_version gnustep-base/gnustep-make; then
+		if ( use libobjc2 && ! has_version gnustep-base/gnustep-make[libobjc2] ) || \
+			( ! use libobjc2 && has_version gnustep-base/gnustep-make[libobjc2] ) || \
+			( use libobjc2 && has_version <gnustep-base/gnustep-make-2.6.2 ) ; then
+			ewarn "TOGGLED libobjc2 USE-FLAG WARNING:"
+			ewarn "You changed the libojbc2 use-flag"
+			ewarn "You must rebuild all gnustep packages installed."
+			ewarn ""
+			ewarn "To do so, please emerge gnustep-base/gnustep-updater and run:"
+			ewarn "# gnustep-updater -l"
+		fi
 	fi
 }
 
diff --git a/gnustep-base/gnustep-updater/Manifest b/gnustep-base/gnustep-updater/Manifest
index fa555a4384aa..534d902c3df5 100644
--- a/gnustep-base/gnustep-updater/Manifest
+++ b/gnustep-base/gnustep-updater/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST gnustep-updater-0.1.tar.bz2 2946 RMD160 aab9d164b8d7aac24a3a16c3a37e9ce5c13fc41f SHA1 223eba147d3d4d58962a1df4efe2a7c6cfbb954e SHA256 9ba6cedb66c8aec04a96fec8480aa396a3776f5535c9bd7512c9162497bead80
 DIST gnustep-updater-0.2.tar.bz2 3523 RMD160 5fe0b5e77ddc00305cce8fe82bec5d27684673b9 SHA1 4e4c02378802741f68c2eb6032d20097b36b59bd SHA256 9bd5cb66ff8a4365e365d630691a79349b642e3af720fdaeef5ed25589ca7953
 EBUILD gnustep-updater-0.1.ebuild 706 RMD160 c3d528b7570a67dc7cf3b54602a04d905dc4e4ec SHA1 063a47c08d32aa7eba04cac6da222630e1ba881b SHA256 d0a5f76a80d2814a9ebe613f1f01730596a036ba5773e7c7b32922e694a04f66
-EBUILD gnustep-updater-0.2.ebuild 706 RMD160 fc124746ce4e293147094be68deb4f728bfa4d9b SHA1 ee1ba968489210208f928f71dc8ef8199722b179 SHA256 0a11fff67b13e5ba4f49ba250ba4e89f1bef8310ff5cd4b0d3cfa4a79e768a78
-MISC ChangeLog 624 RMD160 237c9aeb06326f9740a1dae1c045ddcc4cac8d9d SHA1 6df40725dcc58ac57a136e6f588ea14d93ce7467 SHA256 e81db2287d2f127cde1478cf41fc970cf2e2ffd8547fb19c4f6d9dbf74b465a1
+EBUILD gnustep-updater-0.2.ebuild 726 RMD160 ec84c9f6ab9cba6123ff656b985eb52ce920a11a SHA1 faf8375dc515ca31e33975dbfbbab40a9f7175a1 SHA256 843a783415b1791e7ba4dcf11742ae16607accf4b9d3b04bef80c11c47705945
+MISC ChangeLog 752 RMD160 904787a226b845224ce5c179ff8c1c84bb9f2488 SHA1 eb7ab927fdfa9489651a0d810f55063b02d753d8 SHA256 5616600706f65ab5096f1bde4b66aee94730ca5249508b140080ff905c70588f
 MISC metadata.xml 295 RMD160 839a44804cdc164137fba46517bf4e43f3b10a90 SHA1 f66842d9390a0cb6f6424e8edaeb448c80e9881c SHA256 aa853a6111ffe26fb56cbe9c0fa2b8c47ec8853b65b587b8e087be661005eb17
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk80Od0ACgkQFYEBGcdFJfKYtAEApqyHLncATKVeKSqpL0bBUit7
-1kuXpBz6J2leEI99w04A/AqyyAVfxHOIChUbI9UBqh2r15DsbAGQTFmTj3PjFPRJ
-=odfq
+iF4EAREIAAYFAk80PF4ACgkQFYEBGcdFJfImkQD/ddLYX8CVeBY0ErDnDz25palM
+YxtNjZrPkNyc3SaEexsBAJY7yq+cQmWUfV7BCDkYyg8X4FXb9OoNiDQaF/tTNMs/
+=bLtW
 -----END PGP SIGNATURE-----