Version bump for Cinnamon 2.4, bug #529868.

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

3 files changed, 22 insertions, 15 deletions

diff --git a/gnome-extra/cinnamon-control-center/ChangeLog b/gnome-extra/cinnamon-control-center/ChangeLog
index e41ca41b94d0..3ee7a3e6d249 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.12 2014/12/19 13:37:51 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.13 2015/01/11 18:35:29 eva Exp $
+
+*cinnamon-control-center-2.4.2 (11 Jan 2015)
+
+  11 Jan 2015; Gilles Dartiguelongue <eva@gentoo.org>
+  -cinnamon-control-center-2.2.10.ebuild,
+  +cinnamon-control-center-2.4.2.ebuild:
+  Version bump for Cinnamon 2.4, bug #529868.
 
   19 Dec 2014; Pacho Ramos <pacho@gentoo.org>
   cinnamon-control-center-2.2.11.ebuild:
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index f3bfa4f28a6e..258c65db971f 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -3,16 +3,16 @@ Hash: SHA256
 
 AUX cinnamon-control-center-2.2.5-nm-applet.patch 1366 SHA256 f19a142d93b2649e2d20075e05d0ef7be00b315d61f50a0218fa45d62c56429e SHA512 0f088f14e3bda696c04ee23af8c42804d0d638f7529a4ac693d794002554d8f1deaa6c3cb300c784ac55aee5b1848c20999533fa5dbed3f67bb93dba0e807155 WHIRLPOOL 408c1f9ddaf1af5120a82b133179e1f3c74bbaf6c47e917d13cd420475951d1587bcca357931dd7bc08fc36f9871d97d95117b4a48893c24ff88e30d0c231462
 AUX cinnamon-control-center-2.2.5-optional.patch 3164 SHA256 409d944613f8e66cc413673239888d5fc8bb2e56f635909b14fd9f26d33474ba SHA512 587e93d79386f32ab122b329042e971eda6ba41a3bbf53ce300ba312701a817254cea1814ab777ded2689f29b974af02d07cf827ec5e801dcf47aab23664c5b1 WHIRLPOOL dcb1ab88b0b00e3d091d2b64778a9f37cfcf601dff6641d9aa8c3f365c10a694f3fc937d3cbea04285b9e07f716dee3f8e5ffb1af238e23d1d859769b23b49d9
-DIST cinnamon-control-center-2.2.10.tar.gz 4855304 SHA256 5bdd6570e5a2ac2bc4760f3cec5fe7240015f7de9e8756b949e301cf3a474cef SHA512 9fc9bd3dbaa2cc53adb2b66e3a36a94f0095892deb067579492eeae31b1a9878356025f5a78d1a5e9d325b2a79550dbbe29a8162eeb880aabffd5d6c71ae5919 WHIRLPOOL 5045ea10602c64c0a4798aa9762eeaa2be6a360ddeb401999676ee4deb929a72f744d5198363ef3e27251ca6277f470d6114d6542dedc332603d7a89b9b8d05e
 DIST cinnamon-control-center-2.2.11.tar.gz 4855291 SHA256 9cd9d9dcad3a6f9a1957f3c92a2be5316dd74a91e9efa62a6e5f9fada110929f SHA512 e1de66f6ccf2122e8adc2a036b3424bf0ea416db492700d4cedab9b13db852ca9ae0aef4ed0264f850c4743a5b0a62a812785e2c45ef7bf59555025e0aed5eca WHIRLPOOL 7678ea607a460b69817ce14b2bbaaeff5d7523848a68e3791157841cbd4fe99d87a8e3559142fff732619aede9cf86de9aa41f644b00fa2fb4aa71d39ec44f3a
-EBUILD cinnamon-control-center-2.2.10.ebuild 3039 SHA256 0130f5a9738d5132db8b6847d0069cae630598c37e020271ab227477ab414ef0 SHA512 f8b0b2634d1e4544e9e97705926e8e55b8713b9d4a8e67e13a0439c8f3bc4ef776cb34c8f8e5cbf5dc005c11a72f6420716ed00aa9b3fc2fcc8dfc9ab0139a7f WHIRLPOOL bd7a802a3137007613d5aabb24b0b9b6d9468dc003b8652b2f8e94d68f290e94f93b0daa5da6a9cb0fe038af9207a6fbaf9db593382ce2d5890383e492991e9c
+DIST cinnamon-control-center-2.4.2.tar.gz 4305006 SHA256 7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188 SHA512 c3b4e5af84b7e6e01deaae51ed29e184158860c5effa2550b9d285902c2c35b690cb867ae747b437ed2ac2d0e75b0e6b36c97f9af3c5bf3f4621bdf304d5c253 WHIRLPOOL 41a32cb1c97f0fd3c57d67891c66082b66db6dc5a43737d50fdc6a17819c64d9b58ac2b679baa7f9bdd906643c02c161b4a72fd208b48561cdd43807a58f5621
 EBUILD cinnamon-control-center-2.2.11.ebuild 3041 SHA256 42f0ab68c50fbe97cfa6b4826b74e2d93da2f043e4a293845aa2fc183bdc6a0a SHA512 81f5dbbd6f34d317f802906c8fa190ca039d5a84b5381b384c4721bf44bc64f2ab2e6ae3ea8890478ac75d8edd5c7ef1b9181a0faca0674f9f098c9681c32087 WHIRLPOOL 76dc36f7a3d832f4dd36d44f44d87b1740d3151166c4dbb4973ab218f88bc4b78df55c824adf80599e72de3c8961e31b0c3fcb6620da3ad62a55a1b987a809a3
-MISC ChangeLog 2373 SHA256 48de5c2ce1c2a49be82624bb55eb26b4c2460cd63e78924a111436c73d2baafe SHA512 5b31be88df09015d94a14072f274065e4c36056a73df0c554c4621d23c260306ea93f633d2511b6b28c876143e42c8c88a8abe4dcbbe20494b7a47ffbb048d56 WHIRLPOOL fa341649efbacee79fd8c94cbb11b3ef24150f9c2afa0c927713be5d02fa7419c1041f7d97292edb4720a4285a845bef49c23494b12e1010259e22b718a53076
+EBUILD cinnamon-control-center-2.4.2.ebuild 2962 SHA256 37dbbb4c2e0b3ad29b85c94d666fcf6582dddeeaaeeaf281812177cabd9136e0 SHA512 a5e15ebafd93f8714804deea334689bc329d12089070855f0c64bde214d0cfdf46c97bc013594ba2ebb4284f9ffa14c0e5891f3e3f802322b37d09ac76d1b47b WHIRLPOOL 3d4bd42674a8f6070c89fcb0c4af3a1ce9a3bd2fb9c7522fb17adaaa50b7c486bfbde10c214b5c626f78b3d0bfb85bdc6aafe38d64bcb432458553db743c0103
+MISC ChangeLog 2601 SHA256 b261f65fe829e3d81939bc0964dda722d5d5975a8fb54e99e4d853ebfc68bce8 SHA512 611b99c4d4d4eaee1acb09081f2ad3eb101980cd9c302b68f7063f2cb7c1ccfe109033df18a31e868b23a69d033a06d33531184928c3e6cde0943fcf4ee935db WHIRLPOOL 3d170635d164657409904e5caee09f2cdf929f6b3be063bc81f4a6ff582519e8a7de59b2ecc937f6dfd69ae8fcec8f9df2c978a1e0499c0ab1ec33664d5e3380
 MISC metadata.xml 392 SHA256 c000f51bfac9296d6a015c136e6a079d1e013cd68436589473205b9f6a352dc5 SHA512 059abffc02a5d0338acaeaf1e9874fd34aa455458c7cedcae37a5a2a6194851446755dac509f68554d47c2afb675e0934e95e57a2515724ed575df34f2e0d80a WHIRLPOOL f379cc0c4d84c9bc2d7135e1e7f83f43206971c1dba811d9abbafc429e0320dcc3e7f1333e56857eacae8b51529200d38e065ad9b898bac69727c921f2dd0366
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSUKjAACgkQCaWpQKGI+9RFGQCfWdfHZD5wCR74hQCxxe+vVTHq
-8wMAnAunqvGwNAiZnAB7ZU05E5oGcSfA
-=c4SA
+iEYEAREIAAYFAlSywnIACgkQ1fmVwcYIWAZ36gCeKTCqxotJKMMgVKtw1JhPVLV8
+3z0AoJzTh3NQ3uM61xH/zhreZ4r5bhdS
+=BUVR
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.10.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2.ebuild
index bd00a853afb2..c39170d03a91 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.10.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.2.10.ebuild,v 1.5 2014/11/03 16:11:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2.ebuild,v 1.1 2015/01/11 18:35:29 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+colord +cups input_devices_wacom socialweb"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 # False positives caused by nested configure scripts
 QA_CONFIGURE_OPTIONS=".*"
@@ -34,8 +34,8 @@ COMMON_DEPEND="
 	media-libs/fontconfig
 	>=media-libs/libcanberra-0.13[gtk3]
 	>=media-sound/pulseaudio-1.1[glib]
-	net-misc/modemmanager
-	>=net-misc/networkmanager-0.8.9[modemmanager]
+	>=net-misc/modemmanager-0.7
+	>=net-misc/networkmanager-0.9.8[modemmanager]
 	>=sys-auth/polkit-0.103
 	|| ( >=sys-power/upower-0.9.1:= sys-power/upower-pm-utils )
 	>=x11-libs/gdk-pixbuf-2.23.0:2
@@ -84,9 +84,9 @@ DEPEND="${COMMON_DEPEND}
 src_prepare() {
 	# make some panels optional
 	epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch
-	# fix wrong nm-applet dependency
-	epatch "${FILESDIR}"/${PN}-2.2.5-nm-applet.patch
+
 	epatch_user
+
 	eautoreconf
 	gnome2_src_prepare
 }