Version bump for Cinnamon 2.6

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

3 files changed, 208 insertions, 1 deletions

diff --git a/gnome-extra/cinnamon-control-center/ChangeLog b/gnome-extra/cinnamon-control-center/ChangeLog
index 892b9b418e8a..976c9b8364b4 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.19 2015/05/12 18:44:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.20 2015/06/14 01:57:50 tetromino Exp $
+
+*cinnamon-control-center-2.6.0 (13 Jun 2015)
+
+  13 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +cinnamon-control-center-2.6.0.ebuild,
+  +files/cinnamon-control-center-2.6.0-optional.patch:
+  Version bump for Cinnamon 2.6
 
   12 May 2015; Pacho Ramos <pacho@gentoo.org>
   cinnamon-control-center-2.4.2-r2.ebuild:
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild
new file mode 100644
index 000000000000..45ef78f212bd
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild
@@ -0,0 +1,101 @@
+# 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.6.0.ebuild,v 1.1 2015/06/14 01:57:50 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"
+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-0.7
+	>=net-misc/networkmanager-0.9.8[modemmanager]
+	>=sys-auth/polkit-0.103
+	>=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.14: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 )
+"
+# <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
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		|| ( >=app-admin/system-config-printer-gnome-1.3.5
+			app-admin/system-config-printer )
+		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.6.0-optional.patch
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-systemd doesn't do anything in $PN-2.2.5
+	gnome2_src_configure \
+		--disable-static \
+		--enable-documentation \
+		--without-libsocialweb \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable input_devices_wacom wacom)
+}
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch
new file mode 100644
index 000000000000..b76405c28dad
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch
@@ -0,0 +1,99 @@
+diff --git a/configure.ac b/configure.ac
+index 144bf78..a83e1eb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -121,7 +121,6 @@ PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES cinnamon-desktop x11)
+ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
+ 
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
+ PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+                   libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
+@@ -197,15 +196,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.14)
++       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)
+@@ -408,6 +443,13 @@ fi
+ #else
+ #	AC_MSG_NOTICE([   Using ConsoleKit for session tracking])
+ #fi
++
++if test "x$build_color" = "xtrue"; then
++	AC_MSG_NOTICE([** Colord support (Color management panel)])
++else
++	AC_MSG_NOTICE([   Colord support disabled])
++fi
++
+ if test "x$build_wacom" = "xtrue"; then
+ 	AC_MSG_NOTICE([** Wacom support (Wacom panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 76fbc88..466c2c6 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -18,6 +18,12 @@ else
+ disabled_panels += network
+ endif
+ 
++if BUILD_COLOR
++enabled_panels += color
++else
++disabled_panels += color
++endif
++
+ if BUILD_WACOM
+ enabled_panels += wacom
+ else