Version bump for Cinnamon 2.6

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

14 files changed, 566 insertions, 24 deletions

diff --git a/gnome-extra/cinnamon-control-center/ChangeLog b/gnome-extra/cinnamon-control-center/ChangeLog
index 892b9b418e8a..976c9b8364b4 100644
--- a/gnome-extra/cinnamon-control-center/ChangeLog
+++ b/gnome-extra/cinnamon-control-center/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/cinnamon-control-center
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.19 2015/05/12 18:44:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.20 2015/06/14 01:57:50 tetromino Exp $
+
+*cinnamon-control-center-2.6.0 (13 Jun 2015)
+
+  13 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +cinnamon-control-center-2.6.0.ebuild,
+  +files/cinnamon-control-center-2.6.0-optional.patch:
+  Version bump for Cinnamon 2.6
 
   12 May 2015; Pacho Ramos <pacho@gentoo.org>
   cinnamon-control-center-2.4.2-r2.ebuild:
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 5bc6d58c870e..297c79286969 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -3,14 +3,29 @@ Hash: SHA256
 
 AUX cinnamon-control-center-2.2.5-optional.patch 3164 SHA256 409d944613f8e66cc413673239888d5fc8bb2e56f635909b14fd9f26d33474ba SHA512 587e93d79386f32ab122b329042e971eda6ba41a3bbf53ce300ba312701a817254cea1814ab777ded2689f29b974af02d07cf827ec5e801dcf47aab23664c5b1 WHIRLPOOL dcb1ab88b0b00e3d091d2b64778a9f37cfcf601dff6641d9aa8c3f365c10a694f3fc937d3cbea04285b9e07f716dee3f8e5ffb1af238e23d1d859769b23b49d9
 AUX cinnamon-control-center-2.4.2-networkmanager-version.patch 1570 SHA256 9b42ea89bfd7206e6131e720a026ddc7074c54a1d8cb460f5dd35818b07e05a9 SHA512 ca040071c60326ec686f7bccc5a1a8650299227c965bb4e41fc6b2e27ef7a965f6ed58bc764bdc45e09b263be444b4575c2c457f70a6807405c8e4218a0bbd58 WHIRLPOOL ef8eaefceac0b2d3aea0a1eda9dd72489d41ad8ea41363596969b462b3852a9f343a6736ddab341b484d9c8d8f117347c0e14bf42f64e5fae9730ac1734cceca
+AUX cinnamon-control-center-2.6.0-optional.patch 3343 SHA256 19e76ccce6ab38287dad72f3f51396cd74c78b4bfba56db67d43b85c58b0b04a SHA512 542b9b2e52354340c0c048f1b9884a5e5473f7300cd2ec9dfa05cb1cf4cb4daec50dfeb374b91c6e107090ab23a83f13ec468bc0e73f487716ab29aa95b1423a WHIRLPOOL cbcc049324de0aa671bd192692d16c1a25599bea79b36f239fb1afd3849ab8b8be582951f29f96c9ba181f1d46fc6783bad282514fa69540284d729c823aef74
 DIST cinnamon-control-center-2.4.2.tar.gz 4305006 SHA256 7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188 SHA512 c3b4e5af84b7e6e01deaae51ed29e184158860c5effa2550b9d285902c2c35b690cb867ae747b437ed2ac2d0e75b0e6b36c97f9af3c5bf3f4621bdf304d5c253 WHIRLPOOL 41a32cb1c97f0fd3c57d67891c66082b66db6dc5a43737d50fdc6a17819c64d9b58ac2b679baa7f9bdd906643c02c161b4a72fd208b48561cdd43807a58f5621
+DIST cinnamon-control-center-2.6.0.tar.gz 4169903 SHA256 bbc39ac8ddcbc06b6aada1ef271f95f5f0d0fe439bec38b9cd847af420305c49 SHA512 ed383484b751a9d98de7f136c21c5eb6ce7cfe1418945bd0725aa9e9f08397eb78854b38db258434ed8895dbadd2ce29b5a423a9025dea17fb4876f8847ff125 WHIRLPOOL 7e6d3373e97116d5b531f4fcff85984050fd5d7ad343137b76e30089b3c6f4ff5409f68867289f3967a257a67cd04059f2aa02c48a4e0e4c29b43755d6f4cd84
 EBUILD cinnamon-control-center-2.4.2-r2.ebuild 3050 SHA256 c0c409dce6ea4860df177f0216f86d56365c38d58ad7bc05a115431e76cf95ce SHA512 043a7b5bc9f76fbcf09a7e42ec3b2b2ee5549e265815aea1641ed6d4c9b318a25716358918d1b96a085435c229bf538003c40dcae831ebcca0bec34f50cae008 WHIRLPOOL e009e85c3245d6ca21635647732edb85ab28c6e005dd6bc31b9a7242d2aab0e53d368264fc42d73c60730d27b20d3982e4898c92ec52d39b7bcd5538d203eaef
-MISC ChangeLog 3959 SHA256 67f0a5db625ad8d51ba76caaeb0beb3588d6e841278c4ae014817742db7af157 SHA512 c146f66b48d8e4407914ede3e5d0b64775c9063feebc2486204edca07f5344fb07bed3ab68c3e8dd0f05efaa130c0eee04220dc38dd508fe64d2efac6f5257f2 WHIRLPOOL 3d24e6c83b28e4a7adc073fe9e042d6694095fc47918a3ca3e8dd970236ee3bfaf88eda436af21b76b04cacbf04680e5b5a9fdbb9b11d9d22e950d6a64f7dde1
+EBUILD cinnamon-control-center-2.6.0.ebuild 2861 SHA256 610557512898af7db7a6fd47ad441e79ad2e53a6abf72890d552579109d410d2 SHA512 919a7671601332566c54586e175748f89fc59a9069fd0242e4215c67a57825bcc0d58b380e4ae213e7c1dc0de7cd0981338e7405d744a21543d36fdd910deb9a WHIRLPOOL a3ad44136b4722bd4dfa2599db5625c18c3b194f144f72ea973b82672b5850cefe54f4e90f5698933e37d657cf4cbc2bff289b6532c0de7662a0ee0c2ca225b3
+MISC ChangeLog 4197 SHA256 9f25bd36202a7d2ebf991fe76bc3333f45a2bd99a56a6c557ec22632da090614 SHA512 f361a3ed391ef56e852be50b24ba064cfbf5bd9433da64ccb35dce8012ab8d77fe5b416a0681e4512b58da364adc9f61bc10f9594a9f72d1d0b1c6b460192892 WHIRLPOOL ec61ad502e9d7b953b8a9a118e7f9c27faebda6a2684115e561aef6f5bdb83d6f2603967ebfb09f9375d52ab44b561f8319af78df4c287f01864d760f77f08e9
 MISC metadata.xml 264 SHA256 2e50112b25938beb221f3c808331e92cfd6fefec0e4d09313dbea942dae1eaab SHA512 599b439e6a6aa39fe870f55d3cf63797340d856d394d687674e07f90197431877de7f564a7d31d8d669ce264075fbf5b93838d5bfe908673a4eddf65f07646a0 WHIRLPOOL 1faf78d340058ded6aa2c05353cb3bb474c574bf81ed456734488e0f26936732c99f68254347875627bca3962a7b1c76e26fe0f5e8460e2affa9549ac580c0e3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVSShwACgkQCaWpQKGI+9RmRwCfXmqDwT1U5QWVtc96Ml/9Xl/b
-2IYAnjXraUn5OCrCii6LfVylo/cADIWr
-=51To
+iQJ8BAEBCABmBQJVfN+fXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNQb4QALZpBzDl77o0jByTsAjmJOnc
+ZwiRGAE5DqC1Ebkao+gJJnoZBFS1W/Ah8dx9SwuCidfQWuCBmtxpqaYWkOLjHNMV
+eRvFYQfMewHJL5x1TRcJzc70z07GYU6Xuf6gAgC8JHCcIGWsztsdeE/Ti0hMOR6q
+Va0YRM0/z3NsFBJBzUe/mHoA4iNJzPNo5SOyQs1voyEn33uP8Ejw75U8JB11yDh/
+SX8wsE4Yb3BQ6uAi+4H3QaBDOJF0QypZ+7pwidcotJ4xaPdTzAePILshinVN93/w
+Xp1mWzxuR5rv0sc7DANq4EY8SDG8txFXHSWCiW5DyWFxw/AQ1kFqGkdcJRXR+Oso
+WdfP9jDZB0OvPAllyuNAXf7MtPtEDCayqwfW1mBJa8/mmfxb1f5LAPCIoPqZtdWR
+JRImfR3Vk7vkYjPzf0tOl0yATYaMN78795nGXfqkBLX0cEHiJg7yem+PbJVN2Ce1
+9Oracby79OnpBQ0fDpVgdQwAJYBwERtyyH6tDJCVa41NLecF3O2Kf8DHvBs+/zAL
+OcD8OEjl3dH2JJ+8RJLQzbQ0hK6DHw3gtyQJ19r2Km47V6OhfxGe5XT5+avtezgc
++qCn+cYjyGqo/OmF0hkJi+wZzczJSFvZ245ZNLYBpc4QVWrgdzpTeVtej4QJrNpL
+QxRno9L4+V7AnZueP/vq
+=jpnt
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild
new file mode 100644
index 000000000000..45ef78f212bd
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild,v 1.1 2015/06/14 01:57:50 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups input_devices_wacom"
+KEYWORDS="~amd64 ~x86"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# FIXME: modemmanager is not optional
+#        networkmanager is not optional
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31:2
+	dev-libs/libxml2:2
+	>=gnome-base/libgnomekbd-2.91.91:0=
+	>=gnome-extra/cinnamon-desktop-1.0:0=
+	>=gnome-extra/cinnamon-menus-1.0:0=
+	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
+	>=gnome-extra/nm-applet-0.9.8
+	media-libs/fontconfig
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-1.1[glib]
+	>=net-misc/modemmanager-0.7
+	>=net-misc/networkmanager-0.9.8[modemmanager]
+	>=sys-auth/polkit-0.103
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.4.1:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libxklavier
+	colord? ( >=x11-misc/colord-0.1.14:0= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/gtk+-3.8:3
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+	x11-themes/gnome-icon-theme
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		|| ( >=app-admin/system-config-printer-gnome-1.3.5
+			app-admin/system-config-printer )
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# make some panels optional
+	epatch "${FILESDIR}"/${PN}-2.6.0-optional.patch
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-systemd doesn't do anything in $PN-2.2.5
+	gnome2_src_configure \
+		--disable-static \
+		--enable-documentation \
+		--without-libsocialweb \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable input_devices_wacom wacom)
+}
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch
new file mode 100644
index 000000000000..b76405c28dad
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch
@@ -0,0 +1,99 @@
+diff --git a/configure.ac b/configure.ac
+index 144bf78..a83e1eb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -121,7 +121,6 @@ PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES cinnamon-desktop x11)
+ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
+ 
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
+ PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+                   libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
+@@ -197,15 +196,51 @@ if test x"$enable_cups" != x"no" ; then
+   AC_SUBST(CUPS_LIBS)
+ fi
+ 
++build_color=false
++AC_ARG_ENABLE(color,
++       AC_HELP_STRING([--disable-color],
++               [disable color management panel]),
++       [case "${enableval}" in
++               yes) WANT_COLOR=yes ;;
++               no) WANT_COLOR=no ;;
++               *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
++       esac],
++       [WANT_COLOR=yes]) dnl Default value
++
++if test x$WANT_COLOR = xyes; then
++       PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
++       build_color=true
++fi
++if test "x$build_color" = xtrue ; then
++       AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
++fi
++AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
++AC_SUBST(COLOR_PANEL_CFLAGS)
++AC_SUBST(COLOR_PANEL_LIBS)
++
+ build_wacom=false
+-PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
++AC_ARG_ENABLE(wacom,
++       AC_HELP_STRING([--disable-wacom],
++               [disable wacom management panel]),
++       [case "${enableval}" in
++               yes) WANT_WACOM=yes ;;
++               no) WANT_WACOM=no ;;
++               *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
++       esac],
++       [WANT_WACOM=yes]) dnl Default value
++
++if test x$WANT_WACOM = xyes; then
++        PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
+                   cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION
+                   xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+                   cinnamon-desktop
+-                  gtk+-3.0 >= 3.8.0],
+-                  [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
+-
++                  gtk+-3.0 >= 3.8.0])
++        build_wacom="true"
++        AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])]
++fi
+ AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
++AC_SUBST(WACOM_PANEL_CFLAGS)
++AC_SUBST(WACOM_PANEL_LIBS)
+ 
+ # This is a hard-dependency for the region and user-accounts panels
+ PKG_CHECK_MODULES(ISOCODES, iso-codes)
+@@ -408,6 +443,13 @@ fi
+ #else
+ #	AC_MSG_NOTICE([   Using ConsoleKit for session tracking])
+ #fi
++
++if test "x$build_color" = "xtrue"; then
++	AC_MSG_NOTICE([** Colord support (Color management panel)])
++else
++	AC_MSG_NOTICE([   Colord support disabled])
++fi
++
+ if test "x$build_wacom" = "xtrue"; then
+ 	AC_MSG_NOTICE([** Wacom support (Wacom panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 76fbc88..466c2c6 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -18,6 +18,12 @@ else
+ disabled_panels += network
+ endif
+ 
++if BUILD_COLOR
++enabled_panels += color
++else
++disabled_panels += color
++endif
++
+ if BUILD_WACOM
+ enabled_panels += wacom
+ else
diff --git a/gnome-extra/cinnamon-menus/ChangeLog b/gnome-extra/cinnamon-menus/ChangeLog
index 28bc13618e06..59a22855a030 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.8 2015/06/07 11:08:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-menus/ChangeLog,v 1.9 2015/06/14 01:54:46 tetromino Exp $
+
+*cinnamon-menus-2.6.0 (13 Jun 2015)
+
+  13 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +cinnamon-menus-2.6.0.ebuild:
+  Version bump for Cinnamon 2.6
 
 *cinnamon-menus-2.4.2 (07 Jun 2015)
 
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index b547a062115d..56d2f1d86dc4 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -3,14 +3,28 @@ Hash: SHA256
 
 DIST cinnamon-menus-2.4.1.tar.gz 518008 SHA256 7ab04bb668c80c3a1acccaa07f1b5d22023f397841735f4c4243c10cda717e5c SHA512 dc8504e822128c64b725b12515784c065cdb822f128ec661ece9a6867e80ccc7eabac49818e9984b31040f6e5592f607e3765da0f7b57509461b6c57a8621bc2 WHIRLPOOL 6533f1f28cba04515ef94130bdb276a654696c9a29c996a3f46ff50d1e460d759768a0003897e6806e3cfaad4235d007a642db7096e438aed0b97141567175ca
 DIST cinnamon-menus-2.4.2.tar.gz 518054 SHA256 6f3a2c64b47f3704d639213096ca44aee9a35ec8cd7d8d72fff52efc798928ed SHA512 d7c9ad185c7277441a41be4bdab82ee0e1c2fe1b402079dffc593a2bd0cc360995a5625170dd706fef7befd27e58a27cf2d1c4724091940a7009cbb68fee6025 WHIRLPOOL 6f0d081003c8ff828a28d0880f77818c57b92a4e964e4a11f19d1612968a5a215be5189f882cc825917037af8e817345a8577c62133561593c7cd1ac8569f33a
+DIST cinnamon-menus-2.6.0.tar.gz 208838 SHA256 8fe81ffe9818aa9412b4d89daf846f4c0c01f170838b121d4cba027a48068574 SHA512 2dc52e930bd597651aeb8f6c6c213241a9a7a75124bb86ee2d714a0268bb571df1739fa411edb15e1743744d0ec4c90711c22fd3967f28574c27d65f6ca3a00d WHIRLPOOL affc54689648d897edfa2a2a1d1a5c1580c6dfd079a9d7d28fef1d3762d800c19078e0b3ac9e9aee64935a83548e4c5db37ff5335b543bafae2f4e169babe8cd
 EBUILD cinnamon-menus-2.4.1.ebuild 891 SHA256 fb8c30f7a55930640b2ae8244d086e003c86586ca831ed746b0f48369216b1e9 SHA512 7b7e44112b51d978d7d9e3635725bf715d3c8f58dacc5c156767639ff072426d210ad68d5f5e38fa4e39b0910fc1cb1ad0816a5aaa60036e54dd9053f5cdd91b WHIRLPOOL b22890f8e0212867265a077e9dc15a4dea2d8029b95ecb36d6221b167cad2167ff650fef837510f562e9c503754b9ce5c9280874e944945ef179bfaee518188c
 EBUILD cinnamon-menus-2.4.2.ebuild 895 SHA256 683fd0f84ef10003ed8c08d7e3488b54d3b00467b279553941e43eaa0026af9c SHA512 b5537c10f7377fa0d29633d816421033bddb6188c718600d1cdcf7de72c142cac08ffe9eca304bf50066d09b4b8938864ccfefb0a78117cde19aedb9a9199448 WHIRLPOOL 971a1f1459a0a8e17cf281694aff78084d3ef529d5c2ed2c786e42135e751b0b05635135a2ee260c1fe03fde570acad784567f2ea93070133e75eab94f053c6e
-MISC ChangeLog 1359 SHA256 1f4891e9f587d0054fab647aaaff3bb3ca01bf0109a6519924434ef7bde86f6c SHA512 8a1b985ff681e91d69a445ab89014edecc817ca98604284063e8276d881cdcf01b25fd26a7aa68ad6b4b2832f6727ef49a9a1920c2eaa75bfe874f4ab679430e WHIRLPOOL 47a74dd6513860f18f4d5b3ca7ea2ec3814962f4addb9c8ececd8e6765323da85a7aebf5394ace25a508f4bc4e3a53210b2dff9e83789002c76dd95b5efdedfd
+EBUILD cinnamon-menus-2.6.0.ebuild 1045 SHA256 15cba274ee84af5b884d679607c3ac92cffbb0334e677282281242c176a56bce SHA512 82edec6515511fef6bf97689d46767ad68a930040f47a46afe76191598ee826a30f26bbf28a9fdc1bbb513372dc2121d15ee1e1674bd6fc2916a4304d513d480 WHIRLPOOL 28d444aca7237945b41898a4e1255232ebd6b72a30c422359ef4e46471a08e6cf42c1aa05a8822601fc2fb2f468ed404a603063c1d6f678de6df5b6801283b2c
+MISC ChangeLog 1524 SHA256 b4f9425e64e874a4496eb2259616ba66e8c9a883e4e5cefe2d660acc7c056717 SHA512 fdb1094a2ce9ad58c6548a43d4aef4adc65cb61f6d6b29b8cc1375df33bd37cbdadffb6033fc8866b2281d9de77b2f3c47666cbb31e2c17663405dcbed7acbd3 WHIRLPOOL 761fade912c51738754da8222d33d40434a476033173a55aa17e42241a15254f46eae49fc915f975864446c68e2e59b81d23da1bec600f12957c127021dd9596
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV0JkAACgkQCaWpQKGI+9Q16wCfYfadXnxl3OkhxoEyxl9DTJQu
-OuMAn2H9y/iB7OVqv5iP5a4g+PuxYIL0
-=8h32
+iQJ8BAEBCABmBQJVfN7nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNrl4QAKzkxbUfaKv672eIeLgbbuW4
+d6XNu8cmascdHpCNAsEix+L82BEd0UpMKNp2sVs9XMFjDWCwReRodwMQOmVOzE4n
+z1bVT3COvjlD9Flj5JZWyXAzyvYjU91/AAU8wAlgQx9GjKVylVUfnPSl89KdAfnq
+t+Pb2Ou+tkziWHFG/0vbP2xEjc3HrKhdmAH5T5TMC11atfNBSrDOPUv04fl2V4qK
+yFpJVW0IKN6rhC+jGWL9Uu5eOtuBjMI6ws5mXgBySpOcgIHK5gn+lBKXIX7K7Tlj
+GDtwdaFkiB4+DCsbgylv98xjsTonIWKtnB/xfXUWnPfoeknQaFEZjnmDwvdwzLOa
+xHQvoE4WqxPXn32b8WIxTN1jFV0DPPtZUAVbzVdtW8tEKHNQZBkCnbQgbSr05ot0
+6ESp1Y70p1wFHhGiXP96Elysr+IaMnHgxwuqWnAhsrKr3QbITO2h7mRyFlDVw31g
+t++ETmsObkNPOGUwR7LPJiuwtbAs+wpEh+RxgW2hVr6I6kCZd/2m0oWWBUJpsvX5
+CbIwQ3bdeDosYzm+OSdHcSijqC1vzUu8wgKiZxM1ym6LQWnpHRU4En9la63Bywfk
+bdnCPr7oGd2CACUV4aud6UX2ahrkPW7rt527NBoxO4Alp//sNWUwY8VuFTXvaP/f
+JjW2rQk8zlRLXry6MoMh
+=ZAsm
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-2.6.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.6.0.ebuild
new file mode 100644
index 000000000000..0958da9397c4
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-2.6.0.ebuild
@@ -0,0 +1,44 @@
+# 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.6.0.ebuild,v 1.1 2015/06/14 01:54:46 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils 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="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.29.15:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--disable-static
+}
diff --git a/gnome-extra/cinnamon-screensaver/ChangeLog b/gnome-extra/cinnamon-screensaver/ChangeLog
index 1b9d5b607da7..cf0dfc9a0561 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.13 2015/06/07 11:12:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.14 2015/06/14 01:56:46 tetromino Exp $
+
+*cinnamon-screensaver-2.6.3 (13 Jun 2015)
+
+  13 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +cinnamon-screensaver-2.6.3.ebuild,
+  +files/cinnamon-screensaver-2.6.3-automagic-logind.patch:
+  Version bump for Cinnamon 2.6
 
 *cinnamon-screensaver-2.4.2 (07 Jun 2015)
 
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 2976bbeb4953..ffca98f56ff2 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,16 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cinnamon-screensaver-2.6.3-automagic-logind.patch 1124 SHA256 99d43c908427f15c8ab103e6b4d7e8e4a1a887b00173de89b0bee6ba68d685e7 SHA512 56c6a2ec1ed5b98583912935f3bcd7d7143d3d2a86bbe48809d39e29d2f451210b83155ec3fbdd1c05c720ec18c458b9be21e948d22db1f546409030889b36cc WHIRLPOOL cb05b9c526d7dcd6731cefa22f2af3274727c9ed8b30fb70a78a4059e86cc0ad28f7d30e5f63c87c6123d8239134a92e8e601a7fe9cf970c8dbf592291250de3
 DIST cinnamon-screensaver-2.4.1.tar.gz 142276 SHA256 e73c5d483cd4faeb8d7a4fec9bb1ab73df5cef5d05a3ab268f7a29947d2a483e SHA512 816cca80f2fe7bd333c3e23cea88e18262cb43b776d3280ab25bf8757aec338e24bb4fff867c6113b98b4f5d4988859e3c0ab41e552ee4f4ce122ba1cb4c2be7 WHIRLPOOL 6c56f2676242a8bf6e2666e819c17448d935046a4d552aec78403b9567ff8bd23e13d01cc224dc284331da57932d4b320fe8a25efae9169a091b3bfe917747c6
 DIST cinnamon-screensaver-2.4.2.tar.gz 142557 SHA256 52afb2c9b5b00e1d026469c7f2b1865ca44c784b920e35bfcd61d2a75b87bbda SHA512 54131d1c8aab2abf31210031f0888e9913535ce2697e3310c6f86a9edefe832fc46b0340af792d88d97788aa65c15d210e703dc3b15d419f08f64352444ccc61 WHIRLPOOL 56f87bc6fdf5eba04cd68df9546d6451ba1d7c146903813b76e368e6a71f45a97814923cdfa5bba881d4e53761b3c711a51a139e38c09c3ecc29902aa3b9949d
+DIST cinnamon-screensaver-2.6.3.tar.gz 145989 SHA256 cef3e6ccbb77e91f7e4ef04115b45696c5b6070b8517a60c8782b1f0a67a348a SHA512 d18fac08f7a56e79629b1e78c7ea69bb14c8e906a56252d523bc1129e97f58a3f6a6dc9b9adc21b3e2fb8826783e74375abb50b5b14d35f178522eb5c6d7e509 WHIRLPOOL 4b534d363f04dbd7f3785e19c9ebd847f78b8263aadcf8f9e1ab80dc4183a866f8d269704ebe5bdb9c18b5f5dcd44b5908f5859d72d16f775e2d7d3052614b5b
 EBUILD cinnamon-screensaver-2.4.1.ebuild 2163 SHA256 446b815b452d3308a997aad45837ada17d79cce7b0a15d9d452d98c36300ae5f SHA512 98e9cd427e8df0c98412e1f42b6ab406a05c0df230a420d1bc3e78cd216b1907c4799a87d8ba786da0064995e796d705d35e23c04926ccc7befd8dd89da45c7c WHIRLPOOL 2265c67dcdba9e564caaa61971684f26234e137d88a0b460821da7625615d521687cfb91d4b03223f44e9e89407ec9438e1b2bef2f78a61167b5b937fa8994f6
 EBUILD cinnamon-screensaver-2.4.2.ebuild 2022 SHA256 d89d8288fa7669525aad04e80d52d6ccf55cc449596b55562451a4ee9daa2259 SHA512 1f3606be8ed877a732cfb1619fc2122920c5193fb1aa1dc3636ec56cff97fd114229e140d3f94db023e3193522fb0ded20bcdfc1f66a6963759550d0c6701f95 WHIRLPOOL a6166c1b1d23169f9970c34a8c944e681a71be209cd9a0a6204fef2742037a409e6daddc75c895d32c005d28e2bf185322fabb1386f7deecdb9e1ed8f4bd70dc
-MISC ChangeLog 2325 SHA256 4ece8cc91c82fb52c2537bc193339389b88b732f0b2db1a22862e74f0bf014ac SHA512 4cb5814636f36eb9a677874dea30f38dba49b3e30f2e6ea57dadc86296ccab7c437cbbb2caf585b782f76618509d66bea88ad73cd0a343c2c3681aaff89ca2ce WHIRLPOOL a881a7a472cd49511129c1dd6c328a11292b983750c31f84771ceaaff285625bec056fe1c83b4c784a9bd9922df243e31fd8365743ebba5bd94e94bd64f81856
+EBUILD cinnamon-screensaver-2.6.3.ebuild 2682 SHA256 81c594a2d32bb242b62ec1ce9c48ed951bb0ef4a1f45604438ac6c6a0f2f025f SHA512 064589f1fe622d8485d94961d8896135fa6c5f9fa0fa7ce898b595e1f08a89c5757a52b27de18614a95436de34908aae4fac70a5d561cd876aa9d40769740b7b WHIRLPOOL fb6ee892b5b6bb124e9e3ef6ab91790a422c4b5d101e6eaf02227401f7dcc183ef47aaad1b9dad00278a1193abbd730c79d5c9d287a3263c08a70d19f23329bb
+MISC ChangeLog 2562 SHA256 9a898f0e5badef70166d373217aa467785eb353c419bf54f00b2a5e0abfd932b SHA512 bc94b654e2cacff9b3ec72f6c8a917fb7a39a4f4dae5a5d50cf0a796d344fe62f242d2ab5857d7b49e6d5733f54fea6a8ff11c75ad9a7755a7164508b64986db WHIRLPOOL 7dc09a86a4c1bff40734727fe23eced813393f471f1e8239ce3b956ebad008cc24de3f9b1f6b300e25a8166cec437f5863b7072b61ae058d3ab06ed270aa0ca2
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV0JxUACgkQCaWpQKGI+9T3vQCfapIBo9ZpFI4JOMDWVPbOx/jM
-mbcAnA/p8b19eFO8h5SOFBwWXbpbBnMj
-=Qne1
+iQJ8BAEBCABmBQJVfN9gXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNuaEP+weI+BqCz8jZNSwQMCC8f3Mz
+xpqUuqQD7RyQ2EeFFjc1fie7iEb9Nh9EOg18UY7rBfMdUsrvSSZG4+zyay8an8+7
+LmSXBPtbAAalKQSJKGRVUF1MxKEseuriVgU5iUec1jXdT0n2D42rvogZvLYv8ld7
+Nb5wmUNavIgsNWN7yjdb0WoAZdxEURj8HILXuesZP1kjdCHrCcQ5DJjA2If9ZMB/
+zshwe7KXTqY3GOjvxafHqbP1IhFrzDTp21mKs/bk2WS7RRLruL+32JfBB7Sp4Vtp
+Vup/H4TKevywEXQNl2E0BEbvy0Huu9TPdsWx0/7sU8XiMxhAZ/lQIbtp0L5N45c9
+P7qw+iFx/04jLS57rChgm++F0leNKN0PrhJE93r51VLsk6ve8L43UzciVhHUoWmA
+wLNdwfqYpzlb7lCdDVUbipcfX2B9rNbbm7maTw3vltCJ4P7IPDwBZjnF7PL2XFFT
+xALaCsHPfZoVPn8rPzPvI9K47MnNROiKjE7G3F23k4B1iOA+nFs96ZocdVvS5bFY
+Ka5UVQVjWK8DZReT8Y2h6FF48gCLgWqas6NPXZJ8UAZdGfdrinAj1KV8ujHuLWeG
+TeO9114XQ2+6BsqvU8SFljaGZI9udQk9pA64WWLOScy61nCX48Hgf7AWV6LALow+
+80xxW4DsIRpAdnWjU821
+=eCCO
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.3.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.3.ebuild
new file mode 100644
index 000000000000..9669fdee73d7
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.3.ebuild
@@ -0,0 +1,107 @@
+# 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.6.3.ebuild,v 1.1 2015/06/14 01:56:46 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 multilib python-single-r1
+
+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="doc pam systemd"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:3[introspection]
+
+	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
+
+	${PYTHON_DEPS}
+
+	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 )
+
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+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 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.6.3-automagic-logind.patch
+
+	# Fix xscreensaver paths for gentoo
+	sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr$(get_libdir)/misc/xscreensaver/#" \
+		-i data/screensavers/xscreensaver@cinnamon.org/main || die
+
+	python_fix_shebang data/screensavers
+
+	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_enable systemd logind) \
+		--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.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+}
diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch
new file mode 100644
index 000000000000..cc12685296cd
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch
@@ -0,0 +1,33 @@
+From b382066324d2c42c3d5d04fbb21cf144c79daff0 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 13 Jun 2015 17:16:34 -0400
+Subject: [PATCH] Make logind check non-automagic
+
+---
+ configure.ac | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c6c424c..0eae195 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -581,7 +581,15 @@ dnl ---------------------------------------------------------------------------
+ dnl logind support
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
++AC_ARG_ENABLE([logind],
++              AS_HELP_STRING([--disable-logind], [Do not check for logind]),
++              [enable_logind=$enableval],
++              [enable_logind=auto])
++
++have_logind=no
++if test x$enable_logind != xno ; then
++    PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
++fi
+ 
+ if test x$have_logind = xyes ; then
+         AC_DEFINE(HAVE_LOGIND, 1, [logind support])
+-- 
+2.4.3
+
diff --git a/gnome-extra/cjs/ChangeLog b/gnome-extra/cjs/ChangeLog
index c876f68ec40a..664e5a5b43f9 100644
--- a/gnome-extra/cjs/ChangeLog
+++ b/gnome-extra/cjs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2015/06/07 11:17:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cjs/ChangeLog,v 1.15 2015/06/14 01:59:02 tetromino Exp $
+
+*cjs-2.6.0 (14 Jun 2015)
+
+  14 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org> +cjs-2.6.0.ebuild:
+  Version bump for Cinnamon 2.6
 
 *cjs-2.4.2 (07 Jun 2015)
 
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 9f1011091a90..8ee8d354ca71 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -6,14 +6,28 @@ AUX cjs-2.4.0-disable-unittest-2.patch 2128 SHA256 e0635d70b826154ba8cbf90b689aa
 AUX cjs-2.4.0-disable-unittest-3.patch 1119 SHA256 4f4eefee8e623bfd1a9fe38f790b6481b2abaae1fa5e3eb12716941b4ae27002 SHA512 c94e7248c5d9623a15fa8ff4c629029a2ca976300381ae03462ae53ce9c55dcb7ec2ce9b669dfc3ab9ccc03a56f58114c9eb43cbfb22fb40b937a4e08b3569a0 WHIRLPOOL 8be04902c0b5900ed088c26fccbfd226564c014d862d9ccb62a01b486551ef0b009b3489441dcf806eff7ffcf316dc118f9757646f2fd3bc53987a2a19674026
 DIST cjs-2.4.1.tar.gz 323514 SHA256 e1def70d518e2a333c5bb2d480d2a5539efcbb6781d81ade08c2982818e2c47b SHA512 f00828420d8234e14a41d4265f19380e08fcb4bfd51b2eef196a5a0b501212ff07998eb6271c296a842ba9bdb8e9dd6eee7f57a67ed91683cd139774126f76e7 WHIRLPOOL 63153b4094176921c534b5ebc10f86afc8fbe073a3ed8eddd333a7364115818168a46f2c51786e23e084898095e0da9fa42e63cb5506cd2828cc3d3544138eb8
 DIST cjs-2.4.2.tar.gz 324509 SHA256 1310a2bfdebd6a50a09718abf3627daab097233781757509121257445e0423e3 SHA512 95c46808120392f4c9d74d5d94ee030be1b3a8a36ddabbd12560ea0ed16ac6bdeb78016a09eec315536ee094109c6f6fe07ee624300bd1eae88fdbdefbed0565 WHIRLPOOL e0dca618e2d166ee29ebc303d162dd7cd37c8d5381d68fd1c5824aba173cd651ab9825437f2096aede2be667bcd9633a21acd3bdee9002fee1d2f350cc454730
+DIST cjs-2.6.0.tar.gz 324623 SHA256 bb65b7238eabb265de256d6de0a183018a4ec28b7d161d439a809875ca6e2927 SHA512 49d920a81965575aa1ea9777dd1b41911cd61bc3b29ecb87d1c1923cf3a5d43520a9b036bfca006539be27ea7c83c1c9ddea7beafaf470d255322dad0bd170ec WHIRLPOOL 197199f4c5d53c0a6c77d411b0c3fce93cef81a4dd91b84387e0402b2b7d7e51e273c449a05cf39c1491c20b911847682e3d8dbe2c2549c4bf738e477d10b51b
 EBUILD cjs-2.4.1.ebuild 1801 SHA256 935fb3e4139fe8b2e677e95fd577c3f6c2cfec025d24af9f45337d1271b05fa7 SHA512 673ddcdf8cfbda4346e24b1e66c284e04ace69256883c9d252ba5c44ab4a64c2ae95b43478916b660b5a649a1cf108c9d0e9231953800806e356512a5cc0bec4 WHIRLPOOL cd27e845cff458e673108c3a69bea8c604da243b65ca45bef12ddfd1f61bec2d03f0516c8ec55db555bf78d354bcd8ed8dcbb337dbc438daf33915df6cbba099
 EBUILD cjs-2.4.2.ebuild 1805 SHA256 6ff5a8674ce3bc041efd6d849f16ce127ccf2297328aadbdb46d51c99070e5e4 SHA512 1404b96a83445ecdb464954449de1cbb4b7dd3215fbd30e5f38e1c55395541d59ad6ba12d2a89312e097270d0d476f05336fbce372b74a55a916d04d9161cbd5 WHIRLPOOL 74d7ad60a01c278be8269ebf4cec5d0dc45033c275157b2aabc2ad5d80777612af5726178d1172d8b56d92d3a03edbc16781e7abf36213d0e8f24ef515e7894d
-MISC ChangeLog 2052 SHA256 78380243f29c19720737620ce10ec5ad58f8066adff8309dd9237ea544e28411 SHA512 4d154d1542045c20e6fd63c2cd455e4ab89bfc9c6a26397faaefddb5393807986b4133662d595719be94c2e497eabfe236f5088fb4d4effcc6681e46d41326e5 WHIRLPOOL deeb90333f4835d1c9d0fc1bf9ee0ce1b3844d93df5fab097467149506f51db77b356205f4a28c64d635328bc7224c24dc38c8f90d582989d7192ca0f8f690c1
+EBUILD cjs-2.6.0.ebuild 1811 SHA256 fdcb07838348ec1a7e889014b402394cc0d1da1003e6e3ed3e25bc8f8a193bac SHA512 a56dd1ed491e4dc370ba988c2bdc3d4b876c8d784d5c096626e6b0c7924f2d682ac25a66d11eb2f17b611ead5efb78ee478bbca296d64f0be140cbefcbb98110 WHIRLPOOL e0e49e243c627946c296daa1836802e1ec9cfdee0bf1179901df3c787df481b6ad8bd7ae32ee6d0adc794fc95206ed78814c0c0b616a960421c098fdc6d24400
+MISC ChangeLog 2193 SHA256 e9e10331cdec770c3ffb0a6554301b057ae0fde470b911767c0664583db099bf SHA512 5cac1d2456effdf8f80984c2bba98d8f9a3ceed6f03e2d39e1d71592a90c303ffe4da2af24e38cac050b27d7e11254b9cc12f3a92ba2aaf5575546605b8de747 WHIRLPOOL 4180e8ee06dbe9f86189d2c769d78db915b6c2c8b74b3ea8552936b15d3dc83d0db182e46d9b9b116c87e3f2acc91875c9da5a7c9ac79b27db40612d8f6c4208
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV0KE4ACgkQCaWpQKGI+9SGGQCePeKOLjPRRT79DmXcmJz+PSpz
-WngAniVdg2N/LaDYatAtfNnSrBhZVeNj
-=kzQB
+iQJ8BAEBCABmBQJVfN/nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNmCEP/0IeVBeoY14dTBO/zcARh0B8
+acha149DesZBIlggztEtBzweiUE0FzvaQjZd8k1LEYPFev9pal5XV7TVKT0ch/+R
+GjjOcXafFQpVd3jfWEoW+uHRuh0fx7OvFZOF5QMCZeeSe2YUuqrdB547UlSXjCnO
+CSfCwqIXPK5IqLZuxhoqIsIz5cjUVujqZslbpCf/8V5GSKMYmDzX80jK6rrjTXkR
+u4iBd+FimOLc1ZCxYkbKmUtJHbBLTNjaFkyO0wANY+zWR2yuAfmiWggAIcRcbrZV
+gBtwWWw3n90f/CO968w6hw/gd2V3n/MroSq/AE2G/+NfqBLd2NN4QQaaig2psRmH
+tqkgcIeLA+753tlAadYxGUtPHw55oGHKiS8nbRLmHj633ShYY+Jo6m1q/G/doA0R
+QqmF4ZRyBYtE7yH6wuHJB7AS3JmBg2xyKJ+etxBco5i9cYB2dMYlxtxjeRLoFiRl
+BnBEx44vjlnVjfMgMIfSbYYa0BEBqNaoWtsuAdGr6b+aL/TLkcKFnVLV+aVWWzDM
+jd8s8fcNGNDi7OUQJ9lNe75Ipqp/cvW6yk3vivo6FKjj06LsgGWGL65XeVlqYkaD
+wqGC2bfNnLHWO3l2097oBYAszKhhXqNz9dHDDRqJM4wzMQuJrv3YdtjxJbQuu6FY
+W15NtjHqbRQqL/fkKbkV
+=Cgwf
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cjs/cjs-2.6.0.ebuild b/gnome-extra/cjs/cjs-2.6.0.ebuild
new file mode 100644
index 000000000000..ea17ec9339a5
--- /dev/null
+++ b/gnome-extra/cjs/cjs-2.6.0.ebuild
@@ -0,0 +1,75 @@
+# 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.6.0.ebuild,v 1.1 2015/06/14 01:59:02 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2 pax-utils virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+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="+cairo examples gtk test"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/spidermonkey:24
+	>=dev-libs/glib-2.37.3:2
+	>=dev-libs/gobject-introspection-1.38:=
+	sys-libs/readline:0
+	virtual/libffi
+	cairo? ( x11-libs/cairo[X,glib] )
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+# 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
+}
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	# XXX: Do NOT enable coverage, completely useless for portage installs
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		--disable-coverage \
+		$(use_with cairo) \
+		$(use_with gtk)
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for cjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/cjs-console"
+}