Version bump for Cinnamon 2.4, bug #529780.

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

3 files changed, 75 insertions, 16 deletions

diff --git a/gnome-extra/cinnamon-desktop/ChangeLog b/gnome-extra/cinnamon-desktop/ChangeLog
index 983c59118fc0..3c913276f145 100644
--- a/gnome-extra/cinnamon-desktop/ChangeLog
+++ b/gnome-extra/cinnamon-desktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/cinnamon-desktop
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-desktop/ChangeLog,v 1.5 2014/07/23 15:17:39 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-desktop/ChangeLog,v 1.6 2015/01/11 16:26:11 eva Exp $
+
+*cinnamon-desktop-2.4.2 (11 Jan 2015)
+
+  11 Jan 2015; Gilles Dartiguelongue <eva@gentoo.org>
+  +cinnamon-desktop-2.4.2.ebuild:
+  Version bump for Cinnamon 2.4, bug #529780.
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> cinnamon-desktop-2.2.3.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index b6fbe0daaad8..62b513bd9953 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -2,23 +2,15 @@
 Hash: SHA256
 
 DIST cinnamon-desktop-2.2.3.tar.gz 555916 SHA256 0950bdee8671e4693bfd375f01a25fb8ef5d38d246338600083cd181400619d8 SHA512 61d7e44cbb3f973613a88596eb937d8edd77e4ada210ba6c859b5381b4921b4dae67703a90cbba89f477b85d0ebf6da01093a93d29165797c67afc59c0f2c6a1 WHIRLPOOL 82734f617b6cc0a641371f6aa163a8215dfaec40e7ab2831b203a1ac67688a489f970667c32fad3909b7e4b5074adc2e8da210a84309730b3502df2bb3d1ef14
+DIST cinnamon-desktop-2.4.2.tar.gz 524074 SHA256 62e2ff4fad405f8d4e7259dbeb2daf65c6f8b9995f2bb1e595a7cc0c2a7f9e0a SHA512 a36c26c262de72c8380c4d399129d610657a1d3ff3a45e688156c60f21957deb7fafb6deaafb442d85cb3ceea2e3c57dd59cb67588804a1e60607d6dbc7e6088 WHIRLPOOL a58cf18725c1f8dafd43495328f4727471ec09c7b851a031022befc10cce1cd12f05df14f59a1be4ffad6c6715d43f6b2b3a22bb1e1158976a898e1ee6b1512e
 EBUILD cinnamon-desktop-2.2.3.ebuild 1356 SHA256 6a7cd17cae908ccef7a6ba69ab0801be50899625ef10088e1a8ce24e74801d50 SHA512 78bca581fd4f1f8ac92bff87bf3b0e9c6e2307c6e5023c6fdc1cddbb7571deb021f1f133c37a012242ce935212c653d8327be287ad7bc51b50fc858271e9a1d0 WHIRLPOOL 03f35a0b82f8833e8e3b8d9a0fa6f50fd17e2835c3b61445c9ec0c285c9ed7bf1bc2b5ec7b1b7498a94e8a96f96da7f2da094eb8f8b9ee4f293a70f9e93a65dd
-MISC ChangeLog 1017 SHA256 7dc91fadad50c4ed06e1c89f1f824337eff73d1d4096a7048ebd870164e0320e SHA512 a7cfff2078ea2e46648650a3f793ffa70faf68a061925c286f73da5bc8ce45620d1ae534a853f2b9310f2a752b5298e7cac2f117ef94d2ebe497473c3cebd928 WHIRLPOOL 196eb96f4469cb050ae152cdc3e727ccd308524b3842a06d9591c1fcb435bd32b3dd99211541bb341220851d874f0da3210bb35a4404d679a26d3de616249d43
+EBUILD cinnamon-desktop-2.4.2.ebuild 1802 SHA256 18b16971f620b18e611f6cb21b012b6fb78a2fbf1c6242d1d77edbd6467775bb SHA512 848a87c242d6a7152e1c5fa7bd5a6152a6c8a65eb0326c3a9bc1bf6b514256b712d49fb830ccefccae8f9c0c40eeb33029cff0c5515c4539d81e0127e730dfe0 WHIRLPOOL 12b1b8daee34ec7dab81c66fb73ff85a23a4340c5db9e4df056787d7c5378d5a2af3d626a101799ea090337e37170ff31fbb98182bb81822cb984e7319bef0d9
+MISC ChangeLog 1191 SHA256 c2d5993b64ee7fb7457a6b0bace753c2ba75b0aa5a5e16c26c39761726cfb475 SHA512 998fae9029c53051465ea22261cf9b9fdac119de2ebd794c3825aae38668ccb21f4f68c0b8e94bac6b30b1b72b766718521792e8b6a52fb01708e4513efdc121 WHIRLPOOL f07e1589ae9afca7902cf7f5a5f5f416eaad93cebc3b33fbdfc9b3935416d83962685d1fdde62105639c303aa2343244955d6346f6bf6f0d0996f4ab5ae59071
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9IUAAoJELp701BxlEWfhhkQAKOgv3KbSUL4OOSe4eXVQfYH
-D8KAemnTujP8Mz7eaMXy6ol9ZGmA5IP5pnYRN7JjtCtNOUGpr3AZBgFuEKVGQhjF
-I6QIIUNViSRzFSnuWLwaIC0lVzMIKSMtd3E6R4l4GUStXy5UT031/EN5t/wTq7/M
-cSzYygujkw8ZVQcS6R8/1RMTLUwpxyic7XyizLPwlBzjBp+e3rmu65NIUab3NSQQ
-hrZrH4yXXZRJT8dord2H4GbGa7tiXX7aoZreogO0WfjMPcGEAq1RyG/8p6UmFVc/
-HC17Udfu4SOaPqKcPWfjZ68TwIpWX0oXCIxEDC+eCYsfGo1MdrUDGb89YMR5+4zK
-WQ6r1ZNE5vFcnBEzzIBXUSWFBFT+JhCWmi0EMR/trr5PNN/7gw6c4BzJN9LqQm39
-pmy2ZMMipw/Bi7Sf/t4+EWpGDx/5xwwRoCOFjTc7MuBuPHyTNSYk8+9hduesVd6R
-ZL1VcWyt2akHwIy1rrz2TZzrFyQIIjhyY/gnWFFZ7SsQTSXZDqDxZIn1ZaOEQhGA
-plhGcDInOQJtvdTRVL+t1P8YWYtDXot/fQyZPn5atofNQo1nYAjVnVTZbNggRvv/
-hExUWwxpDBO/eYSM4fVBxmhkT4sEgNq0m9fHorOpyuTIa8PTq8zqS43RXkCDkHc/
-LtYMeMbLfmMVw/JVtOSQ
-=jXG1
+iEYEAREIAAYFAlSypCQACgkQ1fmVwcYIWAZtuwCfV/wpHn1jlgRlqUkshl7ShjAO
+visAoORTphYSF+zNnimtRhNS6kFX82KM
+=Mr3P
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.4.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.4.2.ebuild
new file mode 100644
index 000000000000..384326d37a5e
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.4.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.4.2.ebuild,v 1.1 2015/01/11 16:26:11 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-any-r1
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[introspection?]
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXrandr-1.3
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.6
+	x11-proto/randrproto
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+
+	# Fix intltool unittest
+	echo "schemas/org.cinnamon.desktop.keybindings.gschema.xml.in.in" >> po/POTFILES.in
+	echo "schemas/org.cinnamon.desktop.keybindings.media-keys.gschema.xml.in.in" >> po/POTFILES.in
+	echo "schemas/org.cinnamon.desktop.notifications.gschema.xml.in.in" >> po/POTFILES.in
+	echo "schemas/org.cinnamon.desktop.privacy.gschema.xml.in.in" >> po/POTFILES.in
+
+	python_fix_shebang files
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS README"
+
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}