Version bump for Cinnamon 2.4, bug #529814.

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

3 files changed, 87 insertions, 10 deletions

diff --git a/gnome-extra/cinnamon-session/ChangeLog b/gnome-extra/cinnamon-session/ChangeLog
index 3aec46ff37e8..ef1326cce000 100644
--- a/gnome-extra/cinnamon-session/ChangeLog
+++ b/gnome-extra/cinnamon-session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/cinnamon-session
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-session/ChangeLog,v 1.10 2014/09/19 17:28:55 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-session/ChangeLog,v 1.11 2015/01/11 17:46:15 eva Exp $
+
+*cinnamon-session-2.4.2 (11 Jan 2015)
+
+  11 Jan 2015; Gilles Dartiguelongue <eva@gentoo.org>
+  +cinnamon-session-2.4.2.ebuild:
+  Version bump for Cinnamon 2.4, bug #529814.
 
   19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
   cinnamon-session-2.2.2.ebuild:
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index e637e143a7df..614ff6ce5e34 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -3,17 +3,15 @@ Hash: SHA256
 
 AUX cinnamon-session-2.2.0-automagic-upower.patch 1141 SHA256 68fdc0ee0b1bf40b91ffd6d338f7e967a54f9750a3aa0c307fc5caa93211488a SHA512 c50cfb631c8ace4afe73ab486fddf2febb127c43e296c643b5aa167cd5a83bd5c266d317845e2c0d300827866729d3c0ec45c2f5091924fe8e77851e0844e288 WHIRLPOOL a190b78ebc95fc28c9f36b1b8a1fd268e69a913e1e80a040ce9b55f61645216327a4e939c9c85e53a76961e93d9075d0c867c6cd7af3912f0b87eb8623116385
 DIST cinnamon-session-2.2.2.tar.gz 902668 SHA256 16e94442dc8c3d666ca2b576088b7dd4b179e48a3af96ac92ac94864c1f51288 SHA512 6d3e506d1276ce4fe9b4ea8ff09130137c8c36a3328a90bbde84cde3f18d3e9e507b5dc4f81c67b3a170b87aa28a1386da5da6b12acc57796e01f4509735d98e WHIRLPOOL 042717131e0dd6a2dec8b6e5c1a6fe32f00d1e4208d537f6b75dd9ee1f1f1c8922636fa98d43ab7c32c5bb585dc2be646b573f0c65c5c70d3951a221bbc6bda6
+DIST cinnamon-session-2.4.2.tar.gz 903389 SHA256 b8d5fb19a24023f2100b2f757f16b9f2e4bc0892d9b571795e118fb558b9a49d SHA512 303499a86f010c2d24f485ddae52e9ea22fcb30c6c666f0e33443a72e8db55c77ff8c9b7aca4555e8f4cc111b8064e03f996ff4486bc2cbb949ebb14e7c00f9f WHIRLPOOL 8207de617a15326d8f69df1e1e3fa58e5f25663478bb5a29671730b82b04047b8cfeb364c8e5f8db0923ad13e8263a02fa0b6ca6a8c84951576e647cf1badb3c
 EBUILD cinnamon-session-2.2.2.ebuild 1732 SHA256 e27e784265725f60bff7144daacf74325d20d8e4077d01184d55e694d9d8f42a SHA512 ede3af28c78943785832c9b1275a25a3d30a3c593c4e9f51a0d662b972775b3127fa697c945345e5fbad42993858bdeac234b77492eeeb33a900914abdadd341 WHIRLPOOL a3db0d405ee12f7998918db6fcd2514b2db96e1bc02320b5863f637fce883a1a64e2a6c605509285e7f08dbc53e5e47d6c64272822f84ad9ec40cb3ecbc2a25f
-MISC ChangeLog 1764 SHA256 2d0f7093181fbd0e34347aa71f5abab8c3a56afb08ef53f46ba0758ac9793ea7 SHA512 87c68c38de4e9f09a83f8d3f4d76470aa8127a00c72c3109bcb310f564534561e76cae4113540eab07efd7e670675bd6c8557a179b2017599f7b1cd55e369cd6 WHIRLPOOL 49a79cf74374ec54a1fc7a5058d09d5465c63619edb0c36477fc1e6a1330203049db5fd192156d7c352361f2414b2fba90b7ba69494c9c972c848c785dab264e
+EBUILD cinnamon-session-2.4.2.ebuild 1728 SHA256 f3959e8173472d0f54ca6564d648aaa7a103441a6a058b065af8d410b55ebcf2 SHA512 4ca6461ea6a315810d9daf2dd21a546cb0474dd7c192acc3e4da3536a276e1e7b604010b117456f71fa8428637d37b793deffa865c195eef218ea02cccf027b7 WHIRLPOOL 0a8fa525ebc170780a164ada3f33c45f5fe81eb709a7743bfc975d4f7090905c16d0fcdcf5fbf5e6c45f97317d95937a3d6c792ee10bbe42780e36f5351cfe6a
+MISC ChangeLog 1932 SHA256 456866faf7b0d3f1f2c8d6b1049bddd32f4146c116a55e5bc7925a3cdf65e439 SHA512 ed2ac0eef064d08c46e054000e5bff09a81be9961a0baa009d4fb924c9da4c631cd43ffa692be668da854d6c5ba9e4fcad027d55a56d4551bdf9a785ca55d461 WHIRLPOOL 9a92fffd58cd48a56ea600394db051df77e5d1b7d171feba06f8440009b5df4fc2c6c58dcb023bc8c08d4e66d5ce928b1b1bbc53569f3b190cca9f9db67f0ad7
 MISC metadata.xml 269 SHA256 4ef60693f0ad4a1afd7f0eb141960c38de3eba07901718525dccad91cbe0a17e SHA512 7b8752b8368299202d474604f040f20c085de81839b819af60bf94ed5b97b8e5211a9f8ff1a54e8fcd42580398a06ad4da277508a1000439cfb05b8bed4846d4 WHIRLPOOL dd447eec4894dde21d3d06fba1d0ee11c8fbe77eb0805d30c80a3079a9e46831d27066ad4ca7de8ed07da1f1727cf11016e713475e61a4a769b2cd5a3a602791
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUHGfSAAoJEEdUh39IaPFNX0EH/jjHGxHLcL5+MHuv3Qg79MaM
-2y76m85i8xlQ5z93N6LtxkOULkBdPa2Hqz0oOo5AQD45qjOkknp+AJX8BXgJXFRD
-71Ir1zobZyqlsVvCFMJz2IVgmo7IBbdGg+q634VuykvEvjvJTQfARsLl1ha3VDGj
-KDg04Xc59ZHX6slf91QR4h03J2PvDAPm7iW6MYQit+7Ndp/fG3zDXCDw3u2glyMZ
-yVsnA3Tm8S/Ow3iOIEby+nec71fPE5renlE8tsCT5Yg99chaEhoG4mv7sv/Dljgz
-KsKQFDQQR2XMl+1M5UC44j/l+7gk4GxgzcPjLMLRDhwNtfQnTQ/qiwDlmNGRLtg=
-=3NSP
+iEYEAREIAAYFAlSytugACgkQ1fmVwcYIWAZJMACg2iGyZ5LurqzVL3MJ121ed4ut
+EWoAnjbURb0WARwuEWlcCCGeGM63ogAZ
+=xbWg
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.4.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.4.2.ebuild
new file mode 100644
index 000000000000..999ff18645ae
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.4.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-session/cinnamon-session-2.4.2.ebuild,v 1.1 2015/01/11 17:46:15 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gconf ipv6 systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.76
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/json-glib-0.10
+	media-libs/libcanberra
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.90.7:3
+	x11-libs/cairo
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	virtual/opengl
+	gconf? ( gnome-base/gconf:2 )
+	systemd? ( >=sys-apps/systemd-183 )
+	!systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+
+	gnome-base/gnome-common
+"
+#	gnome-base/gnome-common for eautoreconf
+
+src_prepare() {
+	# make upower check non-automagic
+	epatch "${FILESDIR}/${PN}-2.2.0-automagic-upower.patch"
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS README README.md"
+
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable doc docbook-docs) \
+		$(use_enable gconf) \
+		$(use_enable ipv6) \
+		$(use_enable systemd) \
+		$(usex systemd --disable-old-upower --enable-old-upower)
+}