Version bump, drop old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

16 files changed, 87 insertions, 243 deletions

diff --git a/gnome-extra/cinnamon-menus/ChangeLog b/gnome-extra/cinnamon-menus/ChangeLog
index d448f819c1b3..28bc13618e06 100644
--- a/gnome-extra/cinnamon-menus/ChangeLog
+++ b/gnome-extra/cinnamon-menus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/cinnamon-menus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-menus/ChangeLog,v 1.7 2015/03/15 13:24:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-menus/ChangeLog,v 1.8 2015/06/07 11:08:47 pacho Exp $
+
+*cinnamon-menus-2.4.2 (07 Jun 2015)
+
+  07 Jun 2015; Pacho Ramos <pacho@gentoo.org> +cinnamon-menus-2.4.2.ebuild,
+  -cinnamon-menus-2.2.0.ebuild, -cinnamon-menus-2.4.0.ebuild:
+  Version bump, drop old
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org> cinnamon-menus-2.4.1.ebuild:
   x86 stable, bug 534012
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index 9fa9e9eff516..b547a062115d 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST cinnamon-menus-2.2.0.tar.gz 542548 SHA256 e354273c29bc610925d81263c90c9e67137a39fb8d241e125d530842a60ec286 SHA512 f59501f17545adcf0de847587f42cf7aa2c40d4aa97a4ca7026c659c0a93dbf7edefcb7543f6bf089bd6389c673360b9725ca0f97d8b00519b2f6f775ca34d02 WHIRLPOOL f8892875975c8f4f2c2c720cb2b97fb7b86bdc00308d4b4ea5868e99e1c858c07236a45ab34d68f0087bd48687f44cfc5b13c4aceffe92385327d2ed637b124a
-DIST cinnamon-menus-2.4.0.tar.gz 542576 SHA256 f59eaa66fd0bccc62017edbec67b64cc0a45435f4b42ea16ed29c72eb55e9bcb SHA512 8ed25ff16a4c8a4e6980733f3316aa24c98e4d81c404a8c35e9d394f361cec8400e0e21bd359534f11b21252465c31430911ad4fb234ce001aec705cd67e400c WHIRLPOOL d98f102edd9929dcef9bdf0e05a9da8ef9dc09e44540fc9194129b8bda2caf4436f314bf6665312399c532d4f53185830694aa9f1212890424e2d8ffd15a993a
 DIST cinnamon-menus-2.4.1.tar.gz 518008 SHA256 7ab04bb668c80c3a1acccaa07f1b5d22023f397841735f4c4243c10cda717e5c SHA512 dc8504e822128c64b725b12515784c065cdb822f128ec661ece9a6867e80ccc7eabac49818e9984b31040f6e5592f607e3765da0f7b57509461b6c57a8621bc2 WHIRLPOOL 6533f1f28cba04515ef94130bdb276a654696c9a29c996a3f46ff50d1e460d759768a0003897e6806e3cfaad4235d007a642db7096e438aed0b97141567175ca
-EBUILD cinnamon-menus-2.2.0.ebuild 1043 SHA256 5c3bac22e02477bac375da8e4f02bbe86cd7e7d5e4fb884daae740a1ad8fb9ab SHA512 e1794b31eb18542f020e67a607d6a4bd4591b8cee06146862ccd9e7f79e00d6928b9733b5de554b83dd796846f211a151b59b5205598fc5732bde700d55ce3ce WHIRLPOOL 0457ef096a2fd730855af03116dd122da8a99098a17dfd3e6c8762e746f7cfe35b666e243fafe8d4628f3967a12d2aabc59c75de30b63d99db285f1112aac020
-EBUILD cinnamon-menus-2.4.0.ebuild 1045 SHA256 cc0774919fcba36783a5b4308d9bd9baa8c4ea53172ff3f3c4154f3a2f839fdb SHA512 e085efc8196a30c6245cf483c1f5c995db7b224aefed44138ab03512130adc4015ae79bddb140b5ebc29d96d86ec2cdaf90aa5573154b16d0a57a1e3c9c2855a WHIRLPOOL 4cb07ebd9f36e5ee5f85fc73b6ebde2b826db013cb26e1a64047ebb54a5613f7c82d965fb19d95fe552c35aec5b7657ebe8ec04393bdb9a4b44f166984c1b967
+DIST cinnamon-menus-2.4.2.tar.gz 518054 SHA256 6f3a2c64b47f3704d639213096ca44aee9a35ec8cd7d8d72fff52efc798928ed SHA512 d7c9ad185c7277441a41be4bdab82ee0e1c2fe1b402079dffc593a2bd0cc360995a5625170dd706fef7befd27e58a27cf2d1c4724091940a7009cbb68fee6025 WHIRLPOOL 6f0d081003c8ff828a28d0880f77818c57b92a4e964e4a11f19d1612968a5a215be5189f882cc825917037af8e817345a8577c62133561593c7cd1ac8569f33a
 EBUILD cinnamon-menus-2.4.1.ebuild 891 SHA256 fb8c30f7a55930640b2ae8244d086e003c86586ca831ed746b0f48369216b1e9 SHA512 7b7e44112b51d978d7d9e3635725bf715d3c8f58dacc5c156767639ff072426d210ad68d5f5e38fa4e39b0910fc1cb1ad0816a5aaa60036e54dd9053f5cdd91b WHIRLPOOL b22890f8e0212867265a077e9dc15a4dea2d8029b95ecb36d6221b167cad2167ff650fef837510f562e9c503754b9ce5c9280874e944945ef179bfaee518188c
-MISC ChangeLog 1158 SHA256 cbf706afbedffec59a7303ee03ec419e1da32f9ffcdb39db5f53e291a6dbd248 SHA512 a546d824024f5343c274706d9a90efb79ef281e811516ae10887de15eae828f3b62f7a67a397d1295bd1bfea18a1f77dccef4c59ce0f3ff0825e7abab9d1a070 WHIRLPOOL 24aae05113dd8faf209893b09d597120ea3dc6c1e1e7c31715b27c4ac4d246cd7bc315f760391ff4b69c1f2d546b1f31b79311984682e9e1987c111ff1a2cc53
+EBUILD cinnamon-menus-2.4.2.ebuild 895 SHA256 683fd0f84ef10003ed8c08d7e3488b54d3b00467b279553941e43eaa0026af9c SHA512 b5537c10f7377fa0d29633d816421033bddb6188c718600d1cdcf7de72c142cac08ffe9eca304bf50066d09b4b8938864ccfefb0a78117cde19aedb9a9199448 WHIRLPOOL 971a1f1459a0a8e17cf281694aff78084d3ef529d5c2ed2c786e42135e751b0b05635135a2ee260c1fe03fde570acad784567f2ea93070133e75eab94f053c6e
+MISC ChangeLog 1359 SHA256 1f4891e9f587d0054fab647aaaff3bb3ca01bf0109a6519924434ef7bde86f6c SHA512 8a1b985ff681e91d69a445ab89014edecc817ca98604284063e8276d881cdcf01b25fd26a7aa68ad6b4b2832f6727ef49a9a1920c2eaa75bfe874f4ab679430e WHIRLPOOL 47a74dd6513860f18f4d5b3ca7ea2ec3814962f4addb9c8ececd8e6765323da85a7aebf5394ace25a508f4bc4e3a53210b2dff9e83789002c76dd95b5efdedfd
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUFh/AACgkQCaWpQKGI+9StYACdH0lv8zULrZBUCryKIxpaoSTd
-KU8An0dTofgsA0YuFMAiJ+13+5Oxl9+1
-=rxOE
+iEYEAREIAAYFAlV0JkAACgkQCaWpQKGI+9Q16wCfYfadXnxl3OkhxoEyxl9DTJQu
+OuMAn2H9y/iB7OVqv5iP5a4g+PuxYIL0
+=8h32
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-2.2.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.2.0.ebuild
deleted file mode 100644
index 7f151dd91527..000000000000
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-2.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-menus/cinnamon-menus-2.2.0.ebuild,v 1.3 2014/07/23 15:17:41 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes --enable-debug=minimum) \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.2.ebuild
index 4e90d3d222ae..f6c5ba751905 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.0.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.0.ebuild,v 1.1 2015/01/11 17:01:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.2.ebuild,v 1.1 2015/06/07 11:08:47 pacho Exp $
 
 EAPI="5"
-GCONF_DEBUG="no"
+GCONF_DEBUG="yes"
 
 inherit gnome2
 
@@ -15,11 +15,11 @@ LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="debug +introspection"
+IUSE="+introspection"
 
 RDEPEND="
 	>=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
@@ -30,10 +30,7 @@ DEPEND="${RDEPEND}
 src_configure() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
 	gnome2_src_configure \
-		$(usex debug --enable-debug=yes --enable-debug=minimum) \
 		$(use_enable introspection) \
 		--disable-static
 }
diff --git a/gnome-extra/cinnamon-screensaver/ChangeLog b/gnome-extra/cinnamon-screensaver/ChangeLog
index 453f2067c41c..1b9d5b607da7 100644
--- a/gnome-extra/cinnamon-screensaver/ChangeLog
+++ b/gnome-extra/cinnamon-screensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/cinnamon-screensaver
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.12 2015/03/15 13:24:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.13 2015/06/07 11:12:20 pacho Exp $
+
+*cinnamon-screensaver-2.4.2 (07 Jun 2015)
+
+  07 Jun 2015; Pacho Ramos <pacho@gentoo.org>
+  +cinnamon-screensaver-2.4.2.ebuild, -cinnamon-screensaver-2.2.4.ebuild,
+  -cinnamon-screensaver-2.4.0.ebuild:
+  Version bump, drop old
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org> cinnamon-screensaver-2.4.1.ebuild:
   x86 stable, bug 534012
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index c739b8a8051a..2976bbeb4953 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST cinnamon-screensaver-2.2.4.tar.gz 141772 SHA256 5fed9a7504856dc362390e3f020b5faa5b4e9a2b4dd09b0e87c04ee18bd40bfa SHA512 b9ed0fa3f660cc6697682f510375bb68eb59517a0d91801f6e047380a9e452747633c1eed3a1b3f82b941e6a890c80206b1a7caf01bb84458c030cfb6441f921 WHIRLPOOL 8bdea21732b9bdbd12aa0ffe4723b54d359ed8a61b8a163532f7045d4effc99a341664be79764e7e15160cb27c87abedcaf7f9869d418c16bb8e6d7058f66990
-DIST cinnamon-screensaver-2.4.0.tar.gz 142214 SHA256 fc3a4a1ea9c15db7c5c9fa0fce5e6cf60215778e19c96a19f202ab2afbb9aad8 SHA512 e60837d3b5e77f326a9b1f61a04dbb87d121593f10943d21a0bc4b6f31dffa56e12f7fd633452d618079c5305443cd19a24ee99c46c695e0cde3322d673fff43 WHIRLPOOL 3014d14d9fa8a6af6c035bc672aa793867816d10207b423ead75332f38dc92ef8071cb4a27b608ab5b40b9c626f3ba459e98b0136cf56afc405b23cc8daf14cc
 DIST cinnamon-screensaver-2.4.1.tar.gz 142276 SHA256 e73c5d483cd4faeb8d7a4fec9bb1ab73df5cef5d05a3ab268f7a29947d2a483e SHA512 816cca80f2fe7bd333c3e23cea88e18262cb43b776d3280ab25bf8757aec338e24bb4fff867c6113b98b4f5d4988859e3c0ab41e552ee4f4ce122ba1cb4c2be7 WHIRLPOOL 6c56f2676242a8bf6e2666e819c17448d935046a4d552aec78403b9567ff8bd23e13d01cc224dc284331da57932d4b320fe8a25efae9169a091b3bfe917747c6
-EBUILD cinnamon-screensaver-2.2.4.ebuild 2048 SHA256 361d9b134f3edbb1edfe6892b55caf39342557f89157c4fda7154b6511f4f973 SHA512 8aa7fa0c83fe1f24709255fee4f8471fa4e9b0143d7cce007ef25327801cfc780ba5bdc856bbacb10f98577c36927a08be7012496dbf4813694d676867cc62ba WHIRLPOOL a34f8f2dae7987c2285d7ac17107c7679dd7b02e3e157d473fe6ebeb57af1184c6873bd68c6639da50003d45c120db80182bcfda231f661b40bda98d7e93db6b
-EBUILD cinnamon-screensaver-2.4.0.ebuild 2171 SHA256 3f943f9753a6170174435cf19674c84783ed2a3988d86ca603889957711298f7 SHA512 de169433aed2b07b61d38e94b8daeb2c2c2d619cac0054065376d32313433591ddb2727d35e09bdd1a9ffa92ab225fa7cab4c450c5cdc22dbc48de9036a28a0f WHIRLPOOL 4976bfde0a1a8e8d06b4165ad38c6fe939fb16e286169b58c53379f87789205d47218b4f646761df172994101960b9a9df84dc65856923cbf60a31ff3f2b4e1e
+DIST cinnamon-screensaver-2.4.2.tar.gz 142557 SHA256 52afb2c9b5b00e1d026469c7f2b1865ca44c784b920e35bfcd61d2a75b87bbda SHA512 54131d1c8aab2abf31210031f0888e9913535ce2697e3310c6f86a9edefe832fc46b0340af792d88d97788aa65c15d210e703dc3b15d419f08f64352444ccc61 WHIRLPOOL 56f87bc6fdf5eba04cd68df9546d6451ba1d7c146903813b76e368e6a71f45a97814923cdfa5bba881d4e53761b3c711a51a139e38c09c3ecc29902aa3b9949d
 EBUILD cinnamon-screensaver-2.4.1.ebuild 2163 SHA256 446b815b452d3308a997aad45837ada17d79cce7b0a15d9d452d98c36300ae5f SHA512 98e9cd427e8df0c98412e1f42b6ab406a05c0df230a420d1bc3e78cd216b1907c4799a87d8ba786da0064995e796d705d35e23c04926ccc7befd8dd89da45c7c WHIRLPOOL 2265c67dcdba9e564caaa61971684f26234e137d88a0b460821da7625615d521687cfb91d4b03223f44e9e89407ec9438e1b2bef2f78a61167b5b937fa8994f6
-MISC ChangeLog 2098 SHA256 3bf85e4608a30091dd09f3b711cd26b9cc0569c9adf4631c9760b36c80cca52d SHA512 9d2accc5d66388530f46113ee279558ec81281056d21c5f2ffa1a2856b6095bfc40887ea4e028b0ad2ddf830e32f8acf744c043b68c7b85e1bf0df1cd56c742f WHIRLPOOL b882005b6ef49ccddb11465abd4b06c060db07f5441c82cc2d65d8d885bcb1b5f60dd7fca5e16f928392bb3a3cbce653c7416b9862bf8020c479b515264a67b3
+EBUILD cinnamon-screensaver-2.4.2.ebuild 2022 SHA256 d89d8288fa7669525aad04e80d52d6ccf55cc449596b55562451a4ee9daa2259 SHA512 1f3606be8ed877a732cfb1619fc2122920c5193fb1aa1dc3636ec56cff97fd114229e140d3f94db023e3193522fb0ded20bcdfc1f66a6963759550d0c6701f95 WHIRLPOOL a6166c1b1d23169f9970c34a8c944e681a71be209cd9a0a6204fef2742037a409e6daddc75c895d32c005d28e2bf185322fabb1386f7deecdb9e1ed8f4bd70dc
+MISC ChangeLog 2325 SHA256 4ece8cc91c82fb52c2537bc193339389b88b732f0b2db1a22862e74f0bf014ac SHA512 4cb5814636f36eb9a677874dea30f38dba49b3e30f2e6ea57dadc86296ccab7c437cbbb2caf585b782f76618509d66bea88ad73cd0a343c2c3681aaff89ca2ce WHIRLPOOL a881a7a472cd49511129c1dd6c328a11292b983750c31f84771ceaaff285625bec056fe1c83b4c784a9bd9922df243e31fd8365743ebba5bd94e94bd64f81856
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUFh/YACgkQCaWpQKGI+9RwsgCcDLA6qErDP9tyumpM6SGSlJFq
-xXMAnj7q/gH9C0tKh0C+ytEll38/uKR1
-=/g6s
+iEYEAREIAAYFAlV0JxUACgkQCaWpQKGI+9T3vQCfapIBo9ZpFI4JOMDWVPbOx/jM
+mbcAnA/p8b19eFO8h5SOFBwWXbpbBnMj
+=Qne1
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.0.ebuild
deleted file mode 100644
index 7ef60b53204c..000000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.0.ebuild,v 1.2 2015/01/20 11:59:18 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.25.6:2
-	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-extra/cinnamon-desktop-2.4:0=
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.71
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/gnome-icon-theme-symbolic
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="
-	!~gnome-extra/cinnamon-1.8.8.1
-	!systemd? ( sys-auth/consolekit )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-src_prepare() {
-	# https://github.com/linuxmint/cinnamon-screensaver/issues/80
-	sed -i -e 's/X-Cinnamon/X-Cinnamon;/' src/cinnamon-screensaver.desktop.in.in || die
-
-	epatch_user
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	gnome2_src_configure \
-		$(use_enable doc docbook-docs) \
-		$(use_enable pam locking) \
-		$(use_with systemd) \
-		--with-mit-ext \
-		--with-pam-prefix=/etc \
-		--with-xf86gamma-ext \
-		--with-kbd-layout-indicator
-	# Do not use --without-console-kit, it would provide no benefit: there is
-	# no build-time or run-time check for consolekit, $PN merely listens to
-	# consolekit's messages over dbus.
-}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.4.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.2.ebuild
index 927f33065850..2d76353100b7 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.4.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.2.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/cinnamon-screensaver/cinnamon-screensaver-2.2.4.ebuild,v 1.4 2015/01/20 11:52:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.2.ebuild,v 1.1 2015/06/07 11:12:20 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -13,13 +13,13 @@ SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="debug doc pam systemd"
-KEYWORDS="amd64 x86"
+IUSE="doc pam systemd"
+KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.25.6:2
+	>=dev-libs/glib-2.25.6:2[dbus]
 	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-extra/cinnamon-desktop-1.0:0=
+	>=gnome-extra/cinnamon-desktop-2.4:0=
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	>=gnome-base/libgnomekbd-3.6
 	>=dev-libs/dbus-glib-0.71
@@ -39,7 +39,6 @@ COMMON_DEPEND="
 "
 # our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
 RDEPEND="
-	=gnome-extra/cinnamon-2.2*
 	!~gnome-extra/cinnamon-1.8.8.1
 	!systemd? ( sys-auth/consolekit )
 "
diff --git a/gnome-extra/cinnamon-translations/ChangeLog b/gnome-extra/cinnamon-translations/ChangeLog
index 45c6806e748f..4234bcce71e4 100644
--- a/gnome-extra/cinnamon-translations/ChangeLog
+++ b/gnome-extra/cinnamon-translations/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/cinnamon-translations
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-translations/ChangeLog,v 1.11 2015/03/15 13:24:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-translations/ChangeLog,v 1.12 2015/06/07 11:14:25 pacho Exp $
+
+*cinnamon-translations-2.4.4 (07 Jun 2015)
+
+  07 Jun 2015; Pacho Ramos <pacho@gentoo.org>
+  +cinnamon-translations-2.4.4.ebuild, -cinnamon-translations-2.2.4.ebuild,
+  -cinnamon-translations-2.4.2.ebuild:
+  Version bump, drop old
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org>
   cinnamon-translations-2.4.3.ebuild:
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 7fb400777b27..cd46bcebc305 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST cinnamon-translations-2.2.4.tar.gz 10488455 SHA256 6c1f43dac3629fc5155325859bd14ad841c5950d76e0a090369398c6b7674de0 SHA512 459d3b6dfd1314d6a80e152a7cea69b2d5ec18f7033f850ab17ac57cc4a23b06aae3e6e0745bfd6b68c9781b191c09c307a86b7fd27f788f87d14169b321d206 WHIRLPOOL d9e6dc06e41e03034225a893f94627faf2d4db205e0fb92c06066fc20f5bb11aee6e407f26a0729631c62d52731e588bc959dca457fa78fd903ab58955356119
-DIST cinnamon-translations-2.4.2.tar.gz 6692218 SHA256 e03b6ed7ab6cb08d1cb2959057fd939d9cd7a36d3089f8b17ea245cb25fb8f67 SHA512 a261d37a948e0df7c61b7ad00c53d74bbaacc3e7b0bf03d7ef907f30067d70a97e3ceaf8e55bbfafb15bff333a6d0148163cfa5339361d8d3f85449788d2cd84 WHIRLPOOL 7454c02daeacf26ff591f6b571cb9baaee79f31fa8002a36b4e01c17447c531a035d48b4764f6c56463c6e21a556e073ca741853fa745f9332491d8bdc502209
 DIST cinnamon-translations-2.4.3.tar.gz 6921907 SHA256 258bd92ebd28aa29152b0dedc98e0d349b888b1e4a4ae890c28d27204478861a SHA512 a7fa16a013a519d83eace059ecb196dd18389a9eeffc894c8926e2bacace1be69aaab3358886d1a629758490df3023d18d797c07c41d67f76c96c7d92e0d1e39 WHIRLPOOL 8daa1411887fe12407f34359110d8cb2ef544245ce93fb6608d1ab2b23a34e90d61e36b6ca8bdc34d3bdfa1bd81ebc29dbfedfc2a50d86b7351f1d47708f315b
-EBUILD cinnamon-translations-2.2.4.ebuild 1470 SHA256 d024f8bdcb5fcb4a0d140fa3547bd3529db79788e95c043f9732f195ef89fb1c SHA512 0200b0fc743e5e4736185d9a047eb51c4202ba71687c196196fa5c83aa36f9427617de442a7e50bbd506da00cee787c70a46a2f11ea66f210eded58a7f43bbd2 WHIRLPOOL 25ba202eeb006af769f5f969a8a0799a123b0a405f35b04aff451498a996ef87a5c1c25cdb0fe919569393eeba2e7a676779d457306daff8306d0d06b3d3a45d
-EBUILD cinnamon-translations-2.4.2.ebuild 1461 SHA256 c5d7abe5c77e833336b13a9a8288da0b0d315292a4dbd3df30705975b3d8dd32 SHA512 e1f7bb0a24aac8e10ab8e7c36c3d0ec3e39bc40f5aa9faa9e4dc807fdc2a1ff623d557971538c644b82cb231769775fa6f98dfaeb51ac0e9ab0fc920186735b7 WHIRLPOOL 3385f64f7fc8ecbf3f5472e44084e34c1da5f9c8c2917bc26f21ef94d72fc0b371dc125ecf4f21af52cbec085d7bfcd07ef1866a2b26dd467667d3bf9c3ea75e
+DIST cinnamon-translations-2.4.4.tar.gz 6971880 SHA256 7e6f14dc98be622874ac5a50b45191a2147dda145bcd0f6f52ef56df0762c202 SHA512 43ed9877b41dcc224055bf04c66e87ffea6d7d841aaf46a5f6f2ec232b7e5d249b67c3bee4af3a8918fedf66a1be645d23d2b45a2160cbdefb777c8e3d64cc2c WHIRLPOOL f250b7016193fc9e5fe6f0d045adae3e007c3d5405a04f7a9a968a7a2d7452a88b5c08ac8780e3f7061549909a83505fb2c271e3256f1c02d5cd7efa770274c4
 EBUILD cinnamon-translations-2.4.3.ebuild 1464 SHA256 5704316a865136fdb27afaa480340c460404ac5359f858601045e11f728118ba SHA512 9df6c2a90fac54283d47717838b84329f720415a5d82af7c2c7015b61712e7d98690f7a285a0e82a32b13d64d5d3a112599c776a58bf882ec4f403456e1e9d15 WHIRLPOOL 6f6cff94edb9228babdd2d341df773fffbf4e2f07382228bb003708cb90d5860a94b7f9e5cf559d39296cdb8678a7dc6159906e785c615002df766d32b7410bc
-MISC ChangeLog 1908 SHA256 175ad2c4f4cc6e61a805c6d31e9cb02d4eb51dbce59e6fd3ea77c3d556826cd3 SHA512 abfd34516be0bd1ada51e7f49179be81f2ec385aa951d0b95818b025d08bc51cc346c404e362f3d666bcfc942b185d0c82446b37d17d410545029474235a001b WHIRLPOOL 1a53afdc362d100e6eb921cb9b4139a232ce9e2c7468b235ce777e28e3e9bea96833e52c594ca9125546aa20861fa3e8ee03ea5abd9fb891e5845c325a7fa9eb
+EBUILD cinnamon-translations-2.4.4.ebuild 1465 SHA256 c337304440ff039bfdea190021ddc07f238698c180ad0f071665dd8941c5de41 SHA512 531792cf57be754ac4fccadd09fcc70da51f12fb0ebb9ce9a428b8a31f4d63125433dcec262158dfd9560001104c5992d44cf7c9a892c59f7978f52799ed0054 WHIRLPOOL 7da92df1539576c2ce80f2bdd8c0903ea2c77a63d7cfc26c864278bd10b8db0bf1fbf3be1004cedf7fbeb709e15d4584d895c230ceb605813cc75a0d55ad22ad
+MISC ChangeLog 2139 SHA256 765992cc3e1625f0b11cdcc5bcfd95c60b92048a53913dd5d97176a51097389d SHA512 cd97a2f097a0db8a6c0a4e0b03650b9c43b762dbca0a79bb1457ef92f7bca3fc35716ace967fc5757a5163a53d496c16ad76e8f7d3f1d64fbf53d04f2b0d732e WHIRLPOOL 829a9675ceb5dfb1e5d26ba6e2e8b2ce282b0ca6509439757688547040db65de614689dc0d18b54897bfbbfd251a5cbc287f2dbf56aa84b70ade14c7d528b5da
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUFiAkACgkQCaWpQKGI+9RP9QCgggBlX6XHB2p+FGbhr6XCNcDr
-I9QAn2q3Kz482C0IxS5WpBrSDIrWnwkR
-=NIaT
+iEYEAREIAAYFAlV0J5IACgkQCaWpQKGI+9TLrgCfYmhj1di1wpgRPX2N1uhsR6yw
+QpcAn3c5nQ9grNPGzOIxNfNMdIX8MYmt
+=5ine
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.2.4.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.2.4.ebuild
deleted file mode 100644
index a1c13d9f4a91..000000000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-2.2.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-translations/cinnamon-translations-2.2.4.ebuild,v 1.3 2014/12/19 13:37:56 pacho Exp $
-
-EAPI=5
-
-PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en_AU en_CA en_GB en@shaw eo es es_AR et eu fa fi fil fo fr fr_CA ga gd gl gu he hi hr hu hy ia id is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pl ps pt pt_BR ro ru rue rw shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv ta te tg th tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
-
-inherit eutils l10n
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="test" # tests are for upstream translators and need network access
-
-src_prepare() {
-	l10n_find_plocales_changes "${S}/mo-export" "" ""
-	epatch_user
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	install_locale() {
-		# Cinnamon components use LOCALEDIR=$datadir/cinnamon/locale
-		dodir "/usr/share/cinnamon/locale"
-		insinto "/usr/share/cinnamon/locale"
-		doins -r "mo-export/${1}"
-	}
-	l10n_for_each_locale_do install_locale
-}
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.4.ebuild
index 06de269bbbdc..4c9836cd6c89 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.2.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.4.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.2.ebuild,v 1.1 2015/01/11 16:58:35 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.4.ebuild,v 1.1 2015/06/07 11:14:25 pacho Exp $
 
 EAPI=5
-
-PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en_AU en_CA en_GB en@shaw eo es es_AR et eu fa fi fil fo fr fr_CA ga gd gl gu he hi hr hu hy ia id is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pl ps pt pt_BR ro ru rue rw shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv ta te tg th tl tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
+PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA fy ga gd gl gu he hi hr hu hy ia id is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pl ps pt pt_BR ro ru rue rw shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv ta te tg th tl tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
 
 inherit eutils l10n
 
diff --git a/gnome-extra/cjs/ChangeLog b/gnome-extra/cjs/ChangeLog
index 1123d56e3755..c876f68ec40a 100644
--- a/gnome-extra/cjs/ChangeLog
+++ b/gnome-extra/cjs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2015/04/08 17:56:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cjs/ChangeLog,v 1.14 2015/06/07 11:17:33 pacho Exp $
+
+*cjs-2.4.2 (07 Jun 2015)
+
+  07 Jun 2015; Pacho Ramos <pacho@gentoo.org> +cjs-2.4.2.ebuild,
+  -cjs-2.2.2.ebuild, metadata.xml:
+  Version bump, drop old
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> cjs-2.2.2.ebuild:
   Drop old Python implementations
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 2f1f8c52014e..9f1011091a90 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -4,28 +4,16 @@ Hash: SHA256
 AUX cjs-2.4.0-disable-unittest-1.patch 1702 SHA256 9e24eb201ed8dc4aae9d5a3178321c38af47b47b493ed8a233822db97609fff3 SHA512 c19b4738a1b99a916ed8a1be5817c39b3436718655d38b748c00b68d94a033f0eac2a91f4c1b3604272d23175f93839aead446ae594789b5b7938e3f27411078 WHIRLPOOL 3fd6d4cfe4cf0b458413f2994480819f59d06eb752c6e95e32d773061ff10b4a14247ddb718d6500f308f278f803ee825c438fa392b71d4d9597a15241b9dc8f
 AUX cjs-2.4.0-disable-unittest-2.patch 2128 SHA256 e0635d70b826154ba8cbf90b689aa6fc2647d64d5bce6f95f7270600aab5a837 SHA512 69c40eae62f9bb5a4944d8e8d63b0ba43346d0c0547df58c4693eddf149d735d7288b2857cb1c0a652be92e8c74142f15415ff1afe17445fdc63074d5335638a WHIRLPOOL 66ee22c0fd9ac19917ed9542011da55d921676ae145a3c8f509530b7479a7520b428b26b8d780269f72459c1b9df83ba53c471e139492dce295db1b2b5bb54b0
 AUX cjs-2.4.0-disable-unittest-3.patch 1119 SHA256 4f4eefee8e623bfd1a9fe38f790b6481b2abaae1fa5e3eb12716941b4ae27002 SHA512 c94e7248c5d9623a15fa8ff4c629029a2ca976300381ae03462ae53ce9c55dcb7ec2ce9b669dfc3ab9ccc03a56f58114c9eb43cbfb22fb40b937a4e08b3569a0 WHIRLPOOL 8be04902c0b5900ed088c26fccbfd226564c014d862d9ccb62a01b486551ef0b009b3489441dcf806eff7ffcf316dc118f9757646f2fd3bc53987a2a19674026
-DIST cjs-2.2.2.tar.gz 355632 SHA256 870709463709a92b9d19c351211952bdec5a5e660d8f4a5d2ec4411885e00fca SHA512 358675d8295586e9b6e45f903b5de3c95788084d09aa67385a4c9662b3a07d15fd3befd7a7c1884f1ced8718a5aa8177714212d81af24cfd4cf3b0b857c6542f WHIRLPOOL c42d153c7b0de1a261c63f752431ae690a47afd373654b280ce347af9c6e3b755ca751d55cb1dc57fbbadd3cfda4c11c28d7b10b50b22c7cfc80db627278147e
 DIST cjs-2.4.1.tar.gz 323514 SHA256 e1def70d518e2a333c5bb2d480d2a5539efcbb6781d81ade08c2982818e2c47b SHA512 f00828420d8234e14a41d4265f19380e08fcb4bfd51b2eef196a5a0b501212ff07998eb6271c296a842ba9bdb8e9dd6eee7f57a67ed91683cd139774126f76e7 WHIRLPOOL 63153b4094176921c534b5ebc10f86afc8fbe073a3ed8eddd333a7364115818168a46f2c51786e23e084898095e0da9fa42e63cb5506cd2828cc3d3544138eb8
-EBUILD cjs-2.2.2.ebuild 1684 SHA256 686579618d3177cbaed54d1c4348beae6683cae59eee32b1fe0e6a6aff229f27 SHA512 7e489d3a0ced1241c6273ed8ada3a499ed6b03a6387bef2058bc3b87c227c755831cf25d1584acf4e93319bfa230fba9ad3d0cb0f3456c8f97b02fe7caa83308 WHIRLPOOL 8215214932f5fd7f6447499b47afa62c1387c384642f4cdee9b6c76bb416bacbb76991198f430fe45e64104f61121dfb1dde6d75b72cba516bf401e3cd45af8d
+DIST cjs-2.4.2.tar.gz 324509 SHA256 1310a2bfdebd6a50a09718abf3627daab097233781757509121257445e0423e3 SHA512 95c46808120392f4c9d74d5d94ee030be1b3a8a36ddabbd12560ea0ed16ac6bdeb78016a09eec315536ee094109c6f6fe07ee624300bd1eae88fdbdefbed0565 WHIRLPOOL e0dca618e2d166ee29ebc303d162dd7cd37c8d5381d68fd1c5824aba173cd651ab9825437f2096aede2be667bcd9633a21acd3bdee9002fee1d2f350cc454730
 EBUILD cjs-2.4.1.ebuild 1801 SHA256 935fb3e4139fe8b2e677e95fd577c3f6c2cfec025d24af9f45337d1271b05fa7 SHA512 673ddcdf8cfbda4346e24b1e66c284e04ace69256883c9d252ba5c44ab4a64c2ae95b43478916b660b5a649a1cf108c9d0e9231953800806e356512a5cc0bec4 WHIRLPOOL cd27e845cff458e673108c3a69bea8c604da243b65ca45bef12ddfd1f61bec2d03f0516c8ec55db555bf78d354bcd8ed8dcbb337dbc438daf33915df6cbba099
-MISC ChangeLog 1901 SHA256 d187b930b8d0212fd28a9a3bf1d0deda90f9d1179edcf54481b8ebe96b286916 SHA512 c007f5098d76af5c78ef4fd54e5c7769b0a43ff502e3b7e0af5ca693fb30e6a69f15c95dc1701f3752c3656a72fccae0239fc97916dcf225089fbdca96eb6d3e WHIRLPOOL a1cf80db3d0827a26bb78c11be9862910b718902645f734e1638904e2f591d48a0dedc64e0045bad450757d241b2c3e6b959fe182adfe505b74116bd155004da
-MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
+EBUILD cjs-2.4.2.ebuild 1805 SHA256 6ff5a8674ce3bc041efd6d849f16ce127ccf2297328aadbdb46d51c99070e5e4 SHA512 1404b96a83445ecdb464954449de1cbb4b7dd3215fbd30e5f38e1c55395541d59ad6ba12d2a89312e097270d0d476f05336fbce372b74a55a916d04d9161cbd5 WHIRLPOOL 74d7ad60a01c278be8269ebf4cec5d0dc45033c275157b2aabc2ad5d80777612af5726178d1172d8b56d92d3a03edbc16781e7abf36213d0e8f24ef515e7894d
+MISC ChangeLog 2052 SHA256 78380243f29c19720737620ce10ec5ad58f8066adff8309dd9237ea544e28411 SHA512 4d154d1542045c20e6fd63c2cd455e4ab89bfc9c6a26397faaefddb5393807986b4133662d595719be94c2e497eabfe236f5088fb4d4effcc6681e46d41326e5 WHIRLPOOL deeb90333f4835d1c9d0fc1bf9ee0ce1b3844d93df5fab097467149506f51db77b356205f4a28c64d635328bc7224c24dc38c8f90d582989d7192ca0f8f690c1
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJWvjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJeAP/39RW2xBANkcOxjuQNs52+Q8
-zvchjUXHJdXRkEIAkdBC27VT8jl/CoLqGJdekdfBO6qeVUo3IeABOi9o+zelBF44
-Z2Aht8YG0yLI/HHSmlyS2TMYdW/40k0Nur3xu3CnCyGS3BuXCh9CCPyFPPgBFXWb
-WuKoOi5HQY1FCXvvFUC6XwBmI2QdrCmJOPAQ+OCovk2nylK5liVHJ1Bhg7ob6wWn
-V1bNO7bqfapbrqliApP+HacEhbCuXdAO2R48r6tNHchwM6hhImwa07IDbUHwyWxq
-2qC5VJnU2tlWwYYzhLopezKcgYFzcgS7aVMDwYKmCIfLca5ReVXzmnjTK9AiekIk
-iVaeovFwdH59Zlw9PglL7SJ/ojeSOvUB9F1sXeGr4TVPAncKisiOHNDatPzEE/k0
-IRQnYB6obovKhIDZ8oAX3JFfIoWN/6tC/UP/2AmHwvWzONMeUqizPz2/1bETrXe0
-HUuP1wYC0ma00ZLpjzG1fSzAvW7TD6sQQzRqn2KnxVFLmlRXekcBnaFi0FYo7k8c
-5pRAMZaklaMeKqnq+YqOiWYjbbz/IDZ7R70RA15HE1n4mQWaJ3L/vFqlb8Lu6T2D
-TlIjdVn1GVIIsswwupsFEx6xf2g3MYEYGcpigYx7fwVIeuuyHPkFxbk74ffqP6/G
-oHngnVGNVytX8vhcuKde
-=DytK
+iEYEAREIAAYFAlV0KE4ACgkQCaWpQKGI+9SGGQCePeKOLjPRRT79DmXcmJz+PSpz
+WngAniVdg2N/LaDYatAtfNnSrBhZVeNj
+=kzQB
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cjs/cjs-2.2.2.ebuild b/gnome-extra/cjs/cjs-2.4.2.ebuild
index f20cd7eb8ccd..7f91cf649ef2 100644
--- a/gnome-extra/cjs/cjs-2.2.2.ebuild
+++ b/gnome-extra/cjs/cjs-2.4.2.ebuild
@@ -1,13 +1,11 @@
 # 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.2.2.ebuild,v 1.4 2015/04/08 17:56:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cjs/cjs-2.4.2.ebuild,v 1.1 2015/06/07 11:17:33 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
 
-inherit autotools gnome2 pax-utils python-any-r1 virtualx
+inherit autotools eutils gnome2 pax-utils virtualx
 
 DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
 HOMEPAGE="http://cinnamon.linuxmint.com/"
@@ -15,30 +13,33 @@ SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
-IUSE="examples test"
-KEYWORDS="amd64 x86"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	>=dev-lang/spidermonkey-1.8.5:0
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.32
-	sys-libs/ncurses
+	dev-lang/spidermonkey:24
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/gobject-introspection-1.38:=
 	sys-libs/readline:0
-	x11-libs/cairo[glib]
 	virtual/libffi
+	cairo? ( x11-libs/cairo[X,glib] )
+	gtk? ( x11-libs/gtk+:3 )
 "
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
+	gnome-base/gnome-common
 	sys-devel/gettext
 	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
+	epatch "${FILESDIR}"/${PN}-2.4.0-disable-unittest-*.patch
+
 	epatch_user
 	eautoreconf
 	gnome2_src_prepare
@@ -51,7 +52,9 @@ src_configure() {
 	gnome2_src_configure \
 		--disable-systemtap \
 		--disable-dtrace \
-		--disable-coverage
+		--disable-coverage \
+		$(use_with cairo) \
+		$(use_with gtk)
 }
 
 src_test() {
diff --git a/gnome-extra/cjs/metadata.xml b/gnome-extra/cjs/metadata.xml
index 6e0e2ecb48ca..da6fd63d0085 100644
--- a/gnome-extra/cjs/metadata.xml
+++ b/gnome-extra/cjs/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>