Add missing cinnamon 2.2 blocker, bug #529812.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

diff --git a/gnome-extra/cjs/ChangeLog b/gnome-extra/cjs/ChangeLog
index 36eb29c13ce55acf26be19f54a902f014953fd22..d6d9ff1687d20476a9bc70a9122cf61679666f3e 100644 (file)
--- a/gnome-extra/cjs/ChangeLog
+++ b/gnome-extra/cjs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/cjs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cjs/ChangeLog,v 1.8 2015/01/11 15:58:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cjs/ChangeLog,v 1.9 2015/01/11 16:01:23 eva Exp $
+
+  11 Jan 2015; Gilles Dartiguelongue <eva@gentoo.org> cjs-2.4.0.ebuild:
+  Add missing cinnamon 2.2 blocker, bug #529812.
 
 *cjs-2.4.0 (11 Jan 2015)
 

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 8349c48c4071a79f9b6c7ea366690892ef3057df..8db4967362deba3d71694ab16ca318c3b6c09f39 100644 (file)
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -7,13 +7,13 @@ AUX cjs-2.4.0-disable-unittest-3.patch 1119 SHA256 4f4eefee8e623bfd1a9fe38f790b6
 DIST cjs-2.2.2.tar.gz 355632 SHA256 870709463709a92b9d19c351211952bdec5a5e660d8f4a5d2ec4411885e00fca SHA512 358675d8295586e9b6e45f903b5de3c95788084d09aa67385a4c9662b3a07d15fd3befd7a7c1884f1ced8718a5aa8177714212d81af24cfd4cf3b0b857c6542f WHIRLPOOL c42d153c7b0de1a261c63f752431ae690a47afd373654b280ce347af9c6e3b755ca751d55cb1dc57fbbadd3cfda4c11c28d7b10b50b22c7cfc80db627278147e
 DIST cjs-2.4.0.tar.gz 323188 SHA256 b4118a1b6c10e6f16feb60295dc8d120b85e6388180f6203e80f9ea002b9f8a3 SHA512 9e0927e442a056da73ae8a67bfd4709edf52221ff546b0599c611991ffb3c1202441362eecbc78e2930c50ad937ff12dc47207a895ae5b9e51a0bdd5ea368496 WHIRLPOOL bc9581a88a15ef97223012c1be5c710082df7006ac8c1c6e0bbd3ebfbac66f486bfdfc7582d2ec1679d886cee2d1b3cedd5227ad60a7715b0cde27bdf2ab72ea
 EBUILD cjs-2.2.2.ebuild 1689 SHA256 ad2d1d27fb1853ce5c5dc54b28d8c3eede6565c74c432566d68a556e7be8a682 SHA512 92f46dc5e3f5580a762674fbf1c46c6766d79b88a7d249db9a49573f543c52ce7aaad0f0cbbabe4ce7f0f12409fcb953a0577d01cbd54fc80ce2767849b11a49 WHIRLPOOL bd31495173e1597b83a1139b9d7a2ee98a576ada76571c1246e85fd47beceb51395a4aaf252d189c1dd864af059066ee29f695ece78638e4a868a966d154b4ac
-EBUILD cjs-2.4.0.ebuild 1774 SHA256 09c5f5b3f0620145079f3207ce6676b65d2f90d7bedb60526d8c988dc9f9a11c SHA512 9460635c7bb1a6c2c92f4e8ada9256f987544edb27283cfb08f1ea8f61e59d7ae7b3c2bec789be790a0cb5c00adb7e77d209221209e92153898a4e8b7be19c76 WHIRLPOOL 72275dc6b435f320b527ddb433cedb40536e3afbf61741548d9f5c02f0ffb253760d86d4954f2471a1bf6d66f8d53541e160a180620592b3e15a79bd7425505d
-MISC ChangeLog 1330 SHA256 7b077f22218b6dcb8428809850ed9a5dbda8f24d98453834445657b3780f4367 SHA512 00d2b601c3f3204d998d148d06fe4b02140da8d08f6177cf7a467dd126b208580b01def3f9db10014e95b0f27f0bd4ee8a5db80af870d574da58be9ebc289258 WHIRLPOOL 4de09d1aed576142d168c9f6c4bdd7e002babe84ae666ab7d641a86e09a43ae0a2b68a161904d162360c76dafcd167a54be40c557ed66e24d5ef2f204fa87d3d
+EBUILD cjs-2.4.0.ebuild 1803 SHA256 dda41d6e9224f7e1682f1075da2eaf0e7d45bfaad77d8fad50f0ab3bc32fd86e SHA512 f03fca3835cf1d01645b9fc2980725d705e70f551d6b06a978ab68e83b661d9d9920c77c740daa7b1c7c7af17050e5857176e89ee451895f3793a4e7ae3976e0 WHIRLPOOL 27627980d9a433f464d637f22ece8daca71dac4ed4950009e933b91db748ea3ebfd8ca9ae74118cbe240348067cb87448f541b4b705103a655cbe8f5a0e95c3b
+MISC ChangeLog 1452 SHA256 446815095f41bed6e1030f7acf64088c7b57a144b295636d28b4eb779e6d64b4 SHA512 1509b0c269bebc02e0a9b3876a581e749286050bc32d867e4d634368992e5916b7803944ef56005e9a7e3ecebfd296e185f33079360ac3d8372e203a6a0e5aa5 WHIRLPOOL e8a820a704c3e95b7ab8b1a5ba5d6a340aeb806117a1f1446e1e67f3dcbc05151f5d1403298977e2529c406b48e5bc3c1f5dbee95380ad96eac44ac76ba8f5a4
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSynasACgkQ1fmVwcYIWAbVEgCgk0MuIlcZSQlBYD5hMr7wqE7j
-U+QAoJZg2o3SYJPPDJV8puMgca3F4iAT
-=oWeT
+iEYEAREIAAYFAlSynlQACgkQ1fmVwcYIWAbjEwCcDKbqLmUQCdzWqVPTOzap6AUM
+95sAnROC+3/YxDzCUHVb66pzVO3n+Gqx
+=1P3C
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/cjs/cjs-2.4.0.ebuild b/gnome-extra/cjs/cjs-2.4.0.ebuild
index 353aee492c775fcfba1041ff4eb0e6a7a264510f..35ff8516bf70deb50d64314dc0cab99f472aa790 100644 (file)
--- a/gnome-extra/cjs/cjs-2.4.0.ebuild
+++ b/gnome-extra/cjs/cjs-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cjs/cjs-2.4.0.ebuild,v 1.1 2015/01/11 15:58:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cjs/cjs-2.4.0.ebuild,v 1.2 2015/01/11 16:01:23 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -31,9 +31,10 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
        test? ( sys-apps/dbus )
 "
-
-# Large amount of tests are broken even in master.
-#RESTRICT="test"
+# Cinnamon 2.2 does not work with this release.
+RDEPEND="${RDEPEND}
+       !<gnome-extra/cinnamon-2.4
+"
 
 src_prepare() {
        # Disable broken unittests