From d4bd6695641f6d2ec7ff8681913d304e995902f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 May 2018 03:22:09 +0100 Subject: gentoo resync : 29.05.2018 --- gnome-extra/cinnamon-control-center/Manifest | 7 -- .../cinnamon-control-center-3.0.1.ebuild | 93 ------------------ .../cinnamon-control-center-3.2.0.ebuild | 92 ------------------ .../cinnamon-control-center-3.2.1.ebuild | 90 ----------------- .../cinnamon-control-center-2.8.0-optional.patch | 107 --------------------- 5 files changed, 389 deletions(-) delete mode 100644 gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild delete mode 100644 gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild delete mode 100644 gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild delete mode 100644 gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch (limited to 'gnome-extra/cinnamon-control-center') diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest index c818f6658b31..7e76de75aa63 100644 --- a/gnome-extra/cinnamon-control-center/Manifest +++ b/gnome-extra/cinnamon-control-center/Manifest @@ -1,10 +1,3 @@ -AUX cinnamon-control-center-2.8.0-optional.patch 3453 BLAKE2B 244d7bcc80e1450e947f5d58cd69912bd46bacd50a574b6959c1ba8dee017c8e46577636d1027ee91b15bd91ffba23ce1da4b61408d7ccb2e29feb363b80d6a8 SHA512 b74e69516baf9df9870941ca6a463b6a7afa37cb4b333c0da6fd6e2e60c09762afabebe145f1efd8accb08ff5dd4e0e88698598a8ade8d3024e2613813c3d6d1 -DIST cinnamon-control-center-3.0.1.tar.gz 3834138 BLAKE2B ecc6f496deacf967026698be22477e90cd72973e3fbb49ef65c54522c0d910d41ff70a5d4adb7d6d0bb65d3e47b8188def6201af75be4ae4309354a2669e362e SHA512 97f726cddb12afd697a542bf40b89c84e8256cc7e1bff31eaf3ed86ba9ffe23660085e4e4123f955f1aa4aa31930b209c2a26649f2dec55d10a4803d86942e46 -DIST cinnamon-control-center-3.2.0.tar.gz 3837279 BLAKE2B eee6a735b8686229d27d90d655e1598700b329dd72c61cc0535e4f423eb9ff2534b0f733db872db65a8a5372bf71ab69c2a9cec7b4d189e06e3f89bf9ec6be80 SHA512 19a3481ba52784c733e5aae9603596a29fc12c78f21b8fe08492deda8c3eeac2bdbfc2da24f29dc5db6f6de02a26a43f67f3141dbfbd07c26f0e38a872c39216 -DIST cinnamon-control-center-3.2.1.tar.gz 3838032 BLAKE2B 615cee8d3bb4498c2faa9ae7bf776ab872169c9e0eb98412383e927f9dc199deb8d70ac3efad7e13c2ce6892a634a80dd114ec228cd4c308ba043799d7853ee0 SHA512 77f98aa47a10ef280ca7c3f8662e770d87a5427c91093382d3c289abcc0eac38317a31cd47a19a8ee67a4579375b84392f45d239b98fe494f7abfe10ef186554 DIST cinnamon-control-center-3.6.5.tar.gz 3888881 BLAKE2B 9b867d6467ece64a3e2d5e8a87a83235f85738e4b5ee7ea9db31f63c5681b1eec24388ff29b54bc1e01c12e3a15d5eb445c72ffe8576c211f708945ed5dde2bf SHA512 09e482976fbefbd388151736fde4d4e198f3584b47f270ad7d0ce4299029012fa7c7825e221a094c8536ebd5824406bb943a8aad5cf51d60dc22dcf5c02b3b91 -EBUILD cinnamon-control-center-3.0.1.ebuild 2570 BLAKE2B 6ada17476cb4b042c0d841e46a3688050028041e7a4dbba7d37f6b13a3c1140875598e79c6bd3c37374b1463ef07990a42624aca420993aa2f2f8b7c90ecc94d SHA512 3106f15d699c3563bb86f903ef2eba8aafea789683843dabb988bf2b5e82ee0959850cb2011440971e946afb611f89fa5cbf0ebe35b5c78479d65ee65162134b -EBUILD cinnamon-control-center-3.2.0.ebuild 2544 BLAKE2B 5bad35b53916fe856adf1cb16fc2789b7d171f732b4d980c86bc1cd2882192a6912f4d9bcf6093ed204768c8ca0adbb1472d25772a00d3567a19bfa28a4a7bf2 SHA512 1a04ee650e2f704a55684d5539a9ac986f49923042c0679feb360dd92ce12c527b0e0054deb937a4360e78385b435e5eb745fb09751d0601315c27ef01147660 -EBUILD cinnamon-control-center-3.2.1.ebuild 2520 BLAKE2B b5f22fe85ae0ce3cb929c177458f461bd82cd0ba8b56d95326bf067855a054318ea23cbd13add59159ef307ebb9681ed6ec255d5133a4f2eb4bb88d2966de96b SHA512 9aeca0bca0b798bba3d9a701d516173bf8f8f1be1df6e9655fa32b6c15b96736345d07442b865536571c5bb87bc1f484a8091b1d43bd7db582ffaa2c4018ffed EBUILD cinnamon-control-center-3.6.5.ebuild 2466 BLAKE2B 7a3bb2afeb1618e7d020c4d5320baf222ddbac924b4fcf3f0ccebf10072e9ccc990a0781a7a20d3feb6017c9e7370b8b62c33d36ba71612f1ed5d2f2c71e877a SHA512 9f3b7c43c256d1565904eef0262e276f53b9e2d272e6546f54645e0852a1432f32e1ee51019df243d21c234ea6845d0d2f232ba56d676a3549679c02733afa52 MISC metadata.xml 452 BLAKE2B 0b3f734916acf4ee8b2fb22b8b419dd63a18c107c4521d874a7c4a2ea45fd8ffd9ce7f44e85a7b4642a989dd0c96a80f02af4e57e64d99f650ab821b2a89f746 SHA512 e063012f6cd1d892a124a3c47c247ec36351993af36c3c5cf0be0b1fafa12119f1e7506013a3fb97616b8343c924d4bcd341350c4e575fb042d63c957c8cc666 diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild deleted file mode 100644 index 500f58d7c46c..000000000000 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -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 debug input_devices_wacom systemd" -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 - >=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 -- cgit v1.2.3