Version bump, fix upower dependencies, drop old

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

4 files changed, 15 insertions, 117 deletions

diff --git a/gnome-extra/cinnamon-control-center/ChangeLog b/gnome-extra/cinnamon-control-center/ChangeLog
index e51c90404a4a..15b745df3859 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.3 2014/05/31 22:33:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.4 2014/06/01 08:13:19 pacho Exp $
+
+*cinnamon-control-center-2.2.9 (01 Jun 2014)
+
+  01 Jun 2014; Pacho Ramos <pacho@gentoo.org>
+  +cinnamon-control-center-2.2.9.ebuild, -cinnamon-control-center-2.2.5.ebuild,
+  -cinnamon-control-center-2.2.7.ebuild:
+  Version bump, fix upower dependencies, drop old
 
   31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
   cinnamon-control-center-2.2.5.ebuild, cinnamon-control-center-2.2.7.ebuild:
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 7235605f0acd..62adbc0b9301 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -3,20 +3,14 @@ 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.5.tar.gz 4853804 SHA256 a1584d58eaba6a307debbaa94c1ddde1d46d4035d3c2905c7ed9c7a7ea83401d SHA512 3e39a4465aeedf7084ba75b085a95bf20f4fe7d759ddd1e18cf43270366bd09544a98b35843fd357af33519c5f939668edada2c35912abda80c6c267a99e1f3a WHIRLPOOL d6638214fd83a6ccbd68c2225baf714942a62ff0a85a3c75cc5aa4dca118f201668ec7224a0196d4a17ddcf0914d01bd8909e0ad84762c9f3b8975f899bbe075
-DIST cinnamon-control-center-2.2.7.tar.gz 4855169 SHA256 9585a9920e91561d7f4d7a85fe4d3321835d685ca6cbcb1e62c5c1b1d140dfbd SHA512 4dc0e90d6eea6ae759c4d358f1a6b8d0d16eaa7c2d9002d6b3b92aad321b1d4e720df368e9071db3e929bf84b59009f3d47ec9655494a77a76f6a19f1bb8750c WHIRLPOOL d693daf9369c831614ee136befb7e6928b8f9a538dcbf42ae3a918ebc6fb62241ceaa58b28280e7a8adb252ab3b16500a26550de34acab0e91595d8b741573f5
-EBUILD cinnamon-control-center-2.2.5.ebuild 3013 SHA256 3c89ab5c08cfa4db7122d1f9c7ec117a914dfb134ba8141befcb6aac7fc42e8e SHA512 e0e2c5bbbdcbddbbdb144d570af465977e8c3df0d92ce3743bc5dba46a801eb3836da9ae1064161221dccdd25e52607fc6cd567afbf980ef81929dea7cd495bb WHIRLPOOL 849ba6f166c297455826a12994fe7382492196290435e9b6ee5e609c93849f62d296ca50c45b2dbd8c5f765630cb156a9c37b70c1018a6f0a34d52acb5cbbdfc
-EBUILD cinnamon-control-center-2.2.7.ebuild 3013 SHA256 c1fb9398778e290490a68ca8d291f95da7b8e03ef2c0dcf90adb25c6bc879bbe SHA512 ddabb3d7ec98a8f33d2d8851d3f5d70ddd45f795111232cbd9a163b47718a921722293653f29ffc96fef8533d6a67946e14a8b3e42458db44bd998ace48472a6 WHIRLPOOL a2df8c75d4edc684ec7290abe6c961595368a5cc7d7d0a708fb401c0c7eb3d67761f2b6c11ac705092bbe0b4c489d39d14f2666cc9dd8292e0e66dc7791f979b
-MISC ChangeLog 925 SHA256 7e82cff62cacb2bcb9f198f275914d43b0c50a9b06c61656308e2d9c03dc939f SHA512 7ad3c066831eb1d8db70088423ec52e824ad43e859b8f92b2759339c1e32a8be2b432223cae6159540e3e2d9188fa8f6b1aaf330bab89016ae6bbf02f59adb62 WHIRLPOOL 102096f29204f0e0d92b2e594da1b574867fe9024afbdcf938910d82b0bf17c9c7bf568d9dcf581722296b3aeef50fc33b58825e9ec5c873156e48f069bc0633
+DIST cinnamon-control-center-2.2.9.tar.gz 4852457 SHA256 76b32187298f4d934ded2a2a898c371e7644fe9f3142b41bf9acf39d11436491 SHA512 9cda51d9b196e41ed4e4aaf6c86b13378c050cc00dea32d892978929f44945d1a244551e1ac0e94485394a8839e29d6398a6b0d6effe568235b557cd05c3a9a8 WHIRLPOOL 4cb6272fe390cb4da7bedfcc0912b5c2b5104d80dc5d9fc1d9463141f7e494793e450b46567e04a105280b1dbe2aad8eb537bfcf9307eb9f9f75777bb24fa34d
+EBUILD cinnamon-control-center-2.2.9.ebuild 3009 SHA256 018a3a2c132b07cbf5aefda75c69a6820dcec49c8521788e15b402d703762265 SHA512 811097d40314a987eee5019fe3dcf50b93af88b0deaa51490f758b48857475fb796aaedf313ce505a33cf8e3f5d3427a4ad02b3ae9fdf41d76fc281d3a87f850 WHIRLPOOL fb310a4e3f97d048a6ea36787d5408053b1c2f35715f998dc34afc5ba4fc75802720f13f5964fddf9599f463e00a9963dfd964c6d86e8739ebeb60bc42bc5571
+MISC ChangeLog 1185 SHA256 70af0587d93a1bd4a12ecda1016b559888db923121884d276f55f6e6e707c49b SHA512 ea0e82ba772219a23127d32a40f6d52d22df51882fcd3310815d571c65cdb5d5d7d053d7408cc14f2ea3b4b9885a044dceb779912525d61f5c712ca01138bfe6 WHIRLPOOL a8910bdc1bf140f20f09a18cf955592ebf7ed4ee299bab81c59cf83852089f5cf5df6167697316e633f2e65e6026c02b95f98bbd6dc88904df4cee39c3866cce
 MISC metadata.xml 392 SHA256 c000f51bfac9296d6a015c136e6a079d1e013cd68436589473205b9f6a352dc5 SHA512 059abffc02a5d0338acaeaf1e9874fd34aa455458c7cedcae37a5a2a6194851446755dac509f68554d47c2afb675e0934e95e57a2515724ed575df34f2e0d80a WHIRLPOOL f379cc0c4d84c9bc2d7135e1e7f83f43206971c1dba811d9abbafc429e0320dcc3e7f1333e56857eacae8b51529200d38e065ad9b898bac69727c921f2dd0366
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTilhBAAoJEEdUh39IaPFNIxwH/1ijIX809cx7tcQquxBnvCI2
-AbtPRPlu7Reis1YpYMAjV66ghf/0H82drjPUfSTn2MsWO+W4Xxsugu5s5N2Mjxw8
-kfmqRnXIEC6dNZ6C5qaY5FRjVOi0kMZzrA/nA3sn/u/Ma+ODJsUbUoeaG3w/LJi4
-N6TQ+vRUm9++JRLv836sEpGH04i97pIiu8Oe16EMzzVdGyG1w+ZA4GZK8qE8rBxU
-GNIc6XvGhbS4YUjnH709X+QlP0dOokaJuP4vuYTUc1i3OnfAK62XowurfFV8y0DH
-lFDHl+GB1TJyLNQZBB0eeKKH6dET0kh5J6urd7hWgygARDXj4vLioLTGZBhyj/w=
-=DUPR
+iEYEAREIAAYFAlOK4KAACgkQCaWpQKGI+9T1AQCdHkiy0ZVlHEF8u1BSXqqNJ5+T
+6f4AnRH1nGrsnuT//ULTL1hUWbwBeVK0
+=fAiM
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.7.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.7.ebuild
deleted file mode 100644
index 41e0d6e3dd0d..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.7.ebuild
+++ /dev/null
@@ -1,103 +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-control-center/cinnamon-control-center-2.2.7.ebuild,v 1.2 2014/05/31 22:33:33 ssuominen 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 socialweb"
-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
-	>=net-misc/networkmanager-0.8.9[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
-	>=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.8: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 )
-	socialweb? ( net-libs/libsocialweb )
-
-"
-# <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-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		>=app-admin/system-config-printer-gnome-1.3.5
-		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.2.5-optional.patch
-	# fix wrong nm-applet dependency
-	epatch "${FILESDIR}"/${PN}-2.2.5-nm-applet.patch
-	epatch_user
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-systemd doesn't do anything in $PN-2.2.5
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_with socialweb libsocialweb) \
-		$(use_enable input_devices_wacom wacom)
-}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.5.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.9.ebuild
index c49dc2ba45cf..c50877a57458 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.5.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.5.ebuild,v 1.2 2014/05/31 22:33:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.9.ebuild,v 1.1 2014/06/01 08:13:19 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"