Cinnamon-2.x has its own control center

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

5 files changed, 259 insertions, 2 deletions

diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index b8fcf2220612..c49e7400574f 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
-EBUILD cinnamon-control-center-2.2.5.ebuild 2974 SHA256 182cbe255198c4ccf09c012117e0fc98992c84eab21643e5a02282982877d9d4 SHA512 87fae92be009fd97e6873fbcf744097c3cad90a92245f47aa375904a747d37d56bb09394061ee87dc618c63d76a1567554a36d342a293a3274f39f2d5a06e16e WHIRLPOOL 81c08d1d89e7e1601fa6afbd18a29f8b9479fea79f08ad27049b737b31eb7850811e1d545cc546f421fd3780a4bc13c9c5219a49930f8ef045d9633da38939a2
-MISC ChangeLog 451 SHA256 a366879460d0dd08bf88ac88d0da745ec183cc9bc1de78ba0c6b76c21f72f972 SHA512 81055e858a96b573101469eeafcca64ed9659492822c73873d11994de68d43407c75dcc90fd962791729f64d85f260f2bdc7b9a1206f5da90c6be649435503bb WHIRLPOOL 4aebab39d7c6e14e51a17343c51d151b798d70f6cceaed653bc05b16df6b6afe20d6a7bc3f402cdd48c4b61052251aa0455d3c9f80687fd407e8a3c18a69c8b6
+EBUILD cinnamon-control-center-2.2.5.ebuild 2980 SHA256 f99e8a954647f7b3892c33103c4b392a0211d270c7c9dead0baa631856f7f3de SHA512 6efbc5adfb48e54cb9160a5947227f42d9285da431ad8eaaca3dd7fc22bfee72ba18a598f0dc7243723a716e492c9c832771346ab78744799f619f13c2d88cfc WHIRLPOOL a57a7a8422ac3e2861ced9b40abdc324a254f90ccfe906eb7e636b8634bc876b9eb754c2c4afa502b1c84457428e77a127985cfb93532bf0b94c43796430fb00
+MISC ChangeLog 561 SHA256 1ccb795c50bca2f4900e94d2020e1061d42e7f02045d79045c272a426ec68496 SHA512 ca667a2680208f87c0c0c97241208e06b5b88b740e38703cb7cabfe8d3cdd6d05683ea69bfd8bbad68a3ef8039783509725bbe82eac43d20dd31bf6a354b91a9 WHIRLPOOL 988d3440757fe4b6f5f3c1e2b5755c5df51f515777f24a4ab10e798a818bfbcfda4a01488d72cba171dce77c6cad542ed9d5b5c5c961c5b82b5e5d3272a7fe1c
 MISC metadata.xml 392 SHA256 c000f51bfac9296d6a015c136e6a079d1e013cd68436589473205b9f6a352dc5 SHA512 059abffc02a5d0338acaeaf1e9874fd34aa455458c7cedcae37a5a2a6194851446755dac509f68554d47c2afb675e0934e95e57a2515724ed575df34f2e0d80a WHIRLPOOL f379cc0c4d84c9bc2d7135e1e7f83f43206971c1dba811d9abbafc429e0320dcc3e7f1333e56857eacae8b51529200d38e065ad9b898bac69727c921f2dd0366
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTavHpAAoJEJ0WA1zPCt1h36wH/j9qTw1c62oURAc9IbWSqomK
+7W3GKlBZlVIxxhpSMMSCOcGO6t8nUNWHI5YSQMkrLQ18WaDylyhmYkHsgqkCD/FR
+rr3chAwBRiESrYPCjqKPQFLqyz67P8HVq2Lx3kzmjIt9enOKq1OrEQXLM4fRfQkY
+fU8hAEhQYm9gwnuU3Ti+014jbg/IQzoogwbPjmJ8HqXRe5wpBss4B2Mh7877PhP2
+wOdUYumTE/HfVFDRFbMX4ELjNpwRLFsNyD7Zz/r29qXBt/t2s0Sh+CV1ADJpj4Ru
+m9Jgeu7TmiGKBVMHKN5XodwAo6p84mtGx7XCzJTy2tuVpT0EUCdQDxn1f9R222M=
+=hFdM
+-----END PGP SIGNATURE-----
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.5.ebuild
new file mode 100644
index 000000000000..4d6e63ead0d3
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.5.ebuild
@@ -0,0 +1,103 @@
+# 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.1 2014/05/08 02:55:25 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 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
+	>=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/files/cinnamon-control-center-2.2.5-nm-applet.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-nm-applet.patch
new file mode 100644
index 000000000000..fbdf0662b6da
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-nm-applet.patch
@@ -0,0 +1,36 @@
+From 17ebeb557335c297d4925e04a2f5b02a2410e48c Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 7 May 2014 22:23:25 -0400
+Subject: [PATCH] network: the new libnm-gtk wifi API was introduced in
+ 0.9.8.0, not 0.9.9.0
+
+See https://git.gnome.org/browse/network-manager-applet/commit/?id=3a18b5a92f774680336758834f0b7f71968f469e
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b900c53..d0271af 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -93,7 +93,7 @@ CANBERRA_REQUIRED_VERSION=0.13
+ GDKPIXBUF_REQUIRED_VERSION=2.23.0
+ POLKIT_REQUIRED_VERSION=0.103
+ NETWORK_MANAGER_REQUIRED_VERSION=0.8.992
+-LIBNM_GTK_REQUIRED_VERSION=0.9.9.0
++LIBNM_GTK_REQUIRED_VERSION=0.9.8.0
+ LIBNOTIFY_REQUIRED_VERSION=0.7.3
+ CINNAMON_DESKTOP_REQUIRED_VERSION=1.0.0
+ CLUTTER_REQUIRED_VERSION=1.11.3
+@@ -139,7 +139,7 @@ PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_V
+                   libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
+ 		  libnm-gtk >= $NETWORK_MANAGER_REQUIRED_VERSION)
+ 
+-# Check for libnm-gtk + 0.9.9.0
++# Check for libnm-gtk + 0.9.8.0
+ PKG_CHECK_MODULES(LIBNM_GTK_COMPAT, libnm-gtk >= $LIBNM_GTK_REQUIRED_VERSION
+ 		  libnm-gtk >= $LIBNM_GTK_REQUIRED_VERSION,
+                   [have_libnmgtk=yes], have_libnmgtk=no)
+-- 
+1.9.2
+
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch
new file mode 100644
index 000000000000..e6a1f41c3eff
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch
@@ -0,0 +1,93 @@
+diff --git a/configure.ac b/configure.ac
+index b900c53..0656e18 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -123,7 +123,6 @@ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
+ PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
+                   cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
+ PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+                   libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
+@@ -182,15 +181,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.8)
++       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)
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index ff8ea98..4a7fba7 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -3,7 +3,6 @@ NULL =
+ enabled_panels = \
+ 	common \
+ 	screen \
+-	color \
+ 	display \
+ 	region \
+ 	universal-access \
+@@ -15,6 +14,12 @@ enabled_panels = \
+ 
+ disabled_panels = $(NULL)
+ 
++if BUILD_COLOR
++enabled_panels += color
++else
++disabled_panels += color
++endif
++
+ if BUILD_WACOM
+ enabled_panels += wacom
+ else
diff --git a/gnome-extra/cinnamon-control-center/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
new file mode 100644
index 000000000000..8037d478c3bf
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome</herd>
+	<use>
+		<flag name="colord">Support color management using
+			<pkg>x11-misc/colord</pkg></flag>
+		<flag name="socialweb">Add support for desktop background images from
+			Flickr using <pkg>net-libs/libsocialweb</pkg></flag>
+	</use>
+</pkgmetadata>