commit: 5262145bd0a849a97569837b4236c669279c6826 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sat May 26 11:13:32 2018 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sat May 26 11:30:54 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5262145b
gnome-extra/cinnamon-control-center: remove old Package-Manager: Portage-2.3.28, Repoman-2.3.9 gnome-extra/cinnamon-control-center/Manifest | 3 - .../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, 385 deletions(-) diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest index 77d8ee9dd66..0c37f75e876 100644 --- a/gnome-extra/cinnamon-control-center/Manifest +++ b/gnome-extra/cinnamon-control-center/Manifest @@ -1,4 +1 @@ -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 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 500f58d7c46..00000000000 --- 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 ) -" -# <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} - systemd? ( >=sys-apps/systemd-31 ) - !systemd? ( app-admin/openrc-settingsd sys-auth/consolekit ) - x11-themes/adwaita-icon-theme - colord? ( >=gnome-extra/gnome-color-manager-3 ) - cups? ( - 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-base/xorg-proto - - dev-libs/libxslt - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - - gnome-base/gnome-common - sys-devel/autoconf-archive -" -# Needed for autoreconf -# gnome-base/gnome-common - -src_prepare() { - # make some panels optional - eapply "${FILESDIR}"/${PN}-2.8.0-optional.patch - 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) \ - $(usex debug --enable-debug=yes ' ') \ - $(use_enable input_devices_wacom wacom) -} diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild deleted file mode 100644 index 94fc1bf250a..00000000000 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild +++ /dev/null @@ -1,92 +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 ) -" -# <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} - systemd? ( >=sys-apps/systemd-31 ) - !systemd? ( app-admin/openrc-settingsd sys-auth/consolekit ) - x11-themes/adwaita-icon-theme - colord? ( >=gnome-extra/gnome-color-manager-3 ) - cups? ( - 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-base/xorg-proto - - 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 - eapply "${FILESDIR}"/${PN}-2.8.0-optional.patch - 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) \ - $(usex debug --enable-debug=yes ' ') \ - $(use_enable input_devices_wacom wacom) -} diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild deleted file mode 100644 index a3713bb7b68..00000000000 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild +++ /dev/null @@ -1,90 +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 ) -" -# <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} - systemd? ( >=sys-apps/systemd-31 ) - !systemd? ( app-admin/openrc-settingsd sys-auth/consolekit ) - x11-themes/adwaita-icon-theme - colord? ( >=gnome-extra/gnome-color-manager-3 ) - cups? ( - 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-base/xorg-proto - - dev-libs/libxslt - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - - gnome-base/gnome-common - sys-devel/autoconf-archive -" -src_prepare() { - # make some panels optional - eapply "${FILESDIR}"/${PN}-2.8.0-optional.patch - eautoreconf - gnome2_src_prepare -} - -src_configure() { - # --enable-systemd doesn't do anything in $PN-2.2.5 - gnome2_src_configure \ - --disable-static \ - --enable-documentation \ - $(use_enable colord color) \ - $(use_enable cups) \ - $(usex debug --enable-debug=yes ' ') \ - $(use_enable input_devices_wacom wacom) \ - $(use_enable systemd) -} diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch deleted file mode 100644 index d5beadf7e0e..00000000000 --- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch +++ /dev/null @@ -1,107 +0,0 @@ -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..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
