gentoo new year resync : 01.01.2021

3 files changed, 2 insertions, 91 deletions

diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 801b272bce06..876de20cb79c 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,5 +1,3 @@
-DIST cinnamon-control-center-4.4.0.tar.gz 3868474 BLAKE2B 88e22670427416139468c35918105cc664c531aa5084636226498a09b27f56300c8541feff8f93a5ec860372436af01fdeb2ca2c0761b34a6f298439538dfb44 SHA512 3f176c067312bad68ed8ce2461937d8e8cd188839ab3cf786fb76930905691b8f5a91d700f1d88d75448eeecfd23b645b77ee15c0ec02e08718f7c9ac800677f
 DIST cinnamon-control-center-4.6.2.tar.gz 3877007 BLAKE2B f64ebfedc73eb92b96f81fb2743d818ec1602a550130d362eadba4c66a24a0e1f2bdffbe0bf80b23426ab57cead910c78b061b52e4eb82d0e6173d1da2d62749 SHA512 c759c14cc295ba15bde87ad1544d4bdef284d8e3fb8fbee528e9a258aaf83c6f6d76944042230725804ea6c05bd2cb5cbb59cb7507378b952221f381fc47075e
-EBUILD cinnamon-control-center-4.4.0.ebuild 2520 BLAKE2B e03b2b5f1c310ebad94a320aad6271dfd06ab1c50ba1b1224af69e311c1b0a37c39bb26d2ac8ea5837db9a0ee2d44eaf752fd0369dfcbcccab6ed4a1fb2ae979 SHA512 f83e1f69368c7465249ddfe34900168b8257130bd8610a69811c099bf947ae8bd9a94937c4319cbf9153c922b78d23adfef607dc2e27f68942d4ef19f4478621
-EBUILD cinnamon-control-center-4.6.2.ebuild 2427 BLAKE2B 06a1cb6c53580985758b04432ab161a5a3cbfde5927d228a4133a4311859d396acdb7aa90be085a1c8e6b454c2d869d2d22617c0820a9d1107c0a14f83a2ee18 SHA512 f367192f64dad91ec7aa3f03645781fae3673b620c0065cdf4e85ba8c73c59eb1b4e1b52f8f5369de05d255b57bb2cf310a3c6cb4e511b26438c863cac770163
+EBUILD cinnamon-control-center-4.6.2.ebuild 2426 BLAKE2B 6de5c8e4ff99d70fcd6767860b93106592480041159cc9bfb659121a18622215fa096f22679497bf43fa887e01d39a4cec1cf0470ea76e6fbb27a1b56f0cd5a9 SHA512 fcadee18f256224b15a56066f3a421aa98085f28323f2adaca612e033a759e5ce24cdf96e493fe3761453867ee600eff360424201361c27d8852f504fb01a719
 MISC metadata.xml 608 BLAKE2B 4087b4540c1a4822bc57dbfa96b3f61f318c4e6112a530519dae25d8f41e3e7e0f10dc2b213c429eac05c54ae1ac6947766abd0def5d046881ccaa544a4d0cc2 SHA512 03d0eaa7834c6cc0bc89ced18ce558020641b4e802707178778e4aeaeedb5939333182289934ae61109226633bafc0be7d40f3a139d092da73426c266a3f5abe
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.4.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.4.0.ebuild
deleted file mode 100644
index e4af1639f023..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.4.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://projects.linuxmint.com/cinnamon/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord debug input_devices_wacom +networkmanager +modemmanager systemd"
-REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="~amd64 ~x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-COMMON_DEPEND="
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2
-	>=gnome-base/libgnomekbd-2.91.91:0=
-	>=gnome-extra/cinnamon-desktop-4.4:0=
-	>=gnome-extra/cinnamon-menus-4.4:0=
-	>=gnome-extra/cinnamon-settings-daemon-4.4:0=
-	media-libs/fontconfig
-	networkmanager? (
-		>=net-misc/networkmanager-1.2.0:=[modemmanager?]
-		>=gnome-extra/nm-applet-1.2.0
-		modemmanager? ( >=net-misc/modemmanager-0.7 )
-	)
-	>=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-5.1
-	colord? ( >=x11-misc/colord-0.1.14:0= )
-	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 )
-	x11-themes/adwaita-icon-theme
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40.1
-	sys-devel/autoconf-archive
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# cups, documentation, and systemd don't do anything
-	# and have been removed in the next release. So 
-	# disable them for now.
-	gnome2_src_configure \
-		--disable-static \
-		--disable-onlineaccounts \
-		--disable-cups \
-		--disable-documentation \
-		--disable-systemd \
-		$(use_enable colord color) \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable networkmanager) \
-		$(use_enable modemmanager)
-}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
index 4bfeb3e86e90..a26fd8b7ad74 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+colord debug input_devices_wacom +networkmanager +modemmanager systemd"
 REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 # False positives caused by nested configure scripts
 QA_CONFIGURE_OPTIONS=".*"