From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B29791388C1 for ; Sun, 15 Nov 2015 22:31:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 838C7E0802; Sun, 15 Nov 2015 22:30:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B57FE0802 for ; Sun, 15 Nov 2015 22:30:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F60E340766 for ; Sun, 15 Nov 2015 22:30:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5C889E5 for ; Sun, 15 Nov 2015 22:30:53 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1447626590.3932f8f1124901173bfaf50ff1dc72715c15b7f3.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/files/, gnome-extra/cinnamon-control-center/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/cinnamon-control-center/Manifest gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.0.ebuild gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch X-VCS-Directories: gnome-extra/cinnamon-control-center/files/ gnome-extra/cinnamon-control-center/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 3932f8f1124901173bfaf50ff1dc72715c15b7f3 X-VCS-Branch: master Date: Sun, 15 Nov 2015 22:30:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8df17954-573b-441c-8348-ba12180f63ee X-Archives-Hash: 346e3ab80cb539576722f3136795e091 commit: 3932f8f1124901173bfaf50ff1dc72715c15b7f3 Author: Pacho Ramos gentoo org> AuthorDate: Sun Nov 15 21:42:31 2015 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun Nov 15 22:29:50 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3932f8f1 gnome-extra/cinnamon-control-center: Version bump Package-Manager: portage-2.2.24 gnome-extra/cinnamon-control-center/Manifest | 1 + .../cinnamon-control-center-2.8.0.ebuild | 102 ++++++++++++++++++++ .../cinnamon-control-center-2.8.0-optional.patch | 107 +++++++++++++++++++++ 3 files changed, 210 insertions(+) diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest index 587f3aa..7f2d57b 100644 --- a/gnome-extra/cinnamon-control-center/Manifest +++ b/gnome-extra/cinnamon-control-center/Manifest @@ -1,3 +1,4 @@ DIST cinnamon-control-center-2.4.2.tar.gz 4305006 SHA256 7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188 SHA512 c3b4e5af84b7e6e01deaae51ed29e184158860c5effa2550b9d285902c2c35b690cb867ae747b437ed2ac2d0e75b0e6b36c97f9af3c5bf3f4621bdf304d5c253 WHIRLPOOL 41a32cb1c97f0fd3c57d67891c66082b66db6dc5a43737d50fdc6a17819c64d9b58ac2b679baa7f9bdd906643c02c161b4a72fd208b48561cdd43807a58f5621 DIST cinnamon-control-center-2.6.0-pyongyang.tar.xz 32912 SHA256 d26e31c1377abc1c3e47e1c8e78572e0169d21bdfddb920ab839bec4e1bbe8a7 SHA512 3c6d6a970382a8e0429cc78873e4d230d5848f2a6ae4feee4d28db28cb21124f59cd7b4632f3a427f91dd7e497ee32dd3f7ba5139a3c1566264904939007d28e WHIRLPOOL a1a4102ddb13e00414b58352c3eabbd02dc425f2b3a59027a579d9ac78bdd0fd7dcacc8c204ceaeb858944202af72bbfcecabb48aa1e7ddf4ff6ec4e682fb97d DIST cinnamon-control-center-2.6.0.tar.gz 4169903 SHA256 bbc39ac8ddcbc06b6aada1ef271f95f5f0d0fe439bec38b9cd847af420305c49 SHA512 ed383484b751a9d98de7f136c21c5eb6ce7cfe1418945bd0725aa9e9f08397eb78854b38db258434ed8895dbadd2ce29b5a423a9025dea17fb4876f8847ff125 WHIRLPOOL 7e6d3373e97116d5b531f4fcff85984050fd5d7ad343137b76e30089b3c6f4ff5409f68867289f3967a257a67cd04059f2aa02c48a4e0e4c29b43755d6f4cd84 +DIST cinnamon-control-center-2.8.0.tar.gz 4090227 SHA256 ce4bca5044a65605c24d77118036394728c9bf4cfc424a4acf0e1f0c190f55bb SHA512 c3e5789dea3527310508bc51d2a7c4f9df8bb295419a6576075cc41471a53f7ca349de4946dc6df198706be1528caff7ad81b5c02619da98cdb7e383398905b1 WHIRLPOOL 32f1f52534e0697605f8dbce528558661e5ef6c8b517d371eceaa1c032a36b5c4232340fc8d66d85044adff09da52cdbd9e950ddcb42829de9012470bb32778b diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.0.ebuild new file mode 100644 index 0000000..e8fdca9 --- /dev/null +++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.0.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 ) +" +# = 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..c5c2d1a 100644 +--- a/panels/Makefile.am ++++ b/panels/Makefile.am +@@ -2,7 +2,6 @@ NULL = + + enabled_panels = \ + common \ +- color \ + display \ + region \ + universal-access \ +@@ -18,6 +17,12 @@ else + disabled_panels += network + endif + ++if BUILD_COLOR ++enabled_panels += color ++else ++disabled_panels += color ++endif ++ + if BUILD_WACOM + enabled_panels += wacom + else