gentoo resync : 29.05.2018

9 files changed, 0 insertions, 754 deletions

diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 949a130a9344..305bc3622bfc 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,18 +1,4 @@
-AUX cinnamon-settings-daemon-2.6.2-optional.patch 3775 BLAKE2B 6f4917fd115d774001ff91ac0c3addd5bed19f1c02a831384c3f26203c1d641ba976945eba081bae8eac18fa923819d844a7e089e715bf4a2ae640b1a6b370c1 SHA512 f572ac63e951e5b47ec06af26da78c21812f1b44ae11b531be6878c9b80f968790c1af3abb8445ba0ddc379001143dd3ce4cfa19e0b87339854e594ec714bd8c
 AUX cinnamon-settings-daemon-3.0.1-optional.patch 3242 BLAKE2B 6f2b64711df08f037155360728ad3f1da4184e2531e2b516b1e656379a9fc8edc26757a9b758f435c227b68c8a9936654b2147602f41b38e6eb198b4045bd10c SHA512 77d0e4c7f72b43b14e5d3106fde06d119f2e20b372e5cfa3565b67cdba6d1150fc1c59866df7db85307d1b3d8b0b2c90d5e04acbb6429e801a3aedd6135f72e8
-DIST cinnamon-settings-daemon-2.8.3.tar.gz 2935149 BLAKE2B 17f4f93c4f7a41e503ab325daf2b7cdac5aa1e7a4f084533622cdf8d9fe5996653986a95f3bcc29910d763d00971cdc4e5ef396416b4ef742492acd14bd02aa0 SHA512 a66ab0943f4a370fb203ba73dfa9f938ab2fc418c7876b7a048fc438ed8eaef3f5f7789ce86c0c2039ed61473c1b3fb9c60205571140291448854c03cba36f76
-DIST cinnamon-settings-daemon-2.8.4.tar.gz 2935478 BLAKE2B e9fd12370f03c742064abfaa22488d3fcd556fd695f9e8e90f19c429144d1c0f8428dc8e814a1dbb647779f585671333fedc8a9b8028f0937729d4daf2274dc9 SHA512 fab449efdfe4f12d17d61299b9c264d0bd70d88811406da68eab48943dbcd75ef3a87551eba653660efc4006c45f7eaa59d9ac3616a6da6808d35e59dd0a6d7f
-DIST cinnamon-settings-daemon-3.0.1.tar.gz 2912459 BLAKE2B 4519cab3a0b6af10ec3aba1cb922a62a2a73cbb532ba2e052a6261f2e428a91bf3eee437d06d4d696ce947b82f284b2201ef465a6e7ebb9b45a15ee989fda8af SHA512 848f1bc38e84edf9a8af48e55b7581881fbc9920dce9a4fc38627456dea7cbfe330bebba4bb46d1c231dd85bd3445d365b5e415485ac202e72335fe337a800e8
-DIST cinnamon-settings-daemon-3.2.0.tar.gz 2915197 BLAKE2B e3891077ac807c30ad7bb5755a598aab153fac9b3a8c9681e8275a63ff46ad66a596427074bae4722d68ab5ed9260b41a668ce1bffbfbb420e0737cf2b220dbb SHA512 1977402fddf62cf29c0285fd2be8c951dcf5f1d914e3ce53e2e738cfdb211096653b9256028fcb887e403d11dc2105e976eda05cf97c95afe6101c84c72abb12
-DIST cinnamon-settings-daemon-3.4.2.tar.gz 3102793 BLAKE2B 1794d60426937f5b654d8b5f8d78c878c0d44f33e33f76df975acccc96badf13ec04e98c7a768b609164cf44464ad9af90465fd6c08c8314adb9475a74db9203 SHA512 597f3a08e5c2168d0fc3da4b83c85f4c1f4451573cccc79bcb2a3debaab7f4714244e0300dce8ddc62de40b2f4c1c44ff282d280a1437d14041b44d4541c83e0
-DIST cinnamon-settings-daemon-3.4.4.tar.gz 3102951 BLAKE2B d799621861d2450d401788b344dd7c26347054a2756081a8c85526b9f31f9a468ea97695dc26a9c060692efcf0189aae958988f3c911b5a8f7028873158ee3b4 SHA512 93a7609a5c1b9c34061f9ba7836ace58cfa5549d9be811a1a5ca50e2cb9fc9e9462d9f356f50c9115cca93fa42f29ff9d130c184e19cccf9c0ee814fb39bc6d6
 DIST cinnamon-settings-daemon-3.6.1.tar.gz 995005 BLAKE2B c512fe53b707099dca0926893f03056d508bbe22026367c3212a99f22df60d629e02e080fccdeb73151c7aa7e93396b47bede1820059f4a53eace11a56ae5521 SHA512 48a28decff08a191f4ec604386c3bb5c07001d4bc4f7b6d1da379626b41650653fdd14205bbed5321c41fbc281e8638b17e1de30dbba5d299f79cde03216cb33
-EBUILD cinnamon-settings-daemon-2.8.3.ebuild 2743 BLAKE2B 4ecfb776fe8078e49004770dba03d2ea3ab063dc4b0043e602477405b92e44d3b35c452b4a206ebf9dc8a84da38e4c7ab7e5b6b0fd85a4d4f6ab778d50cf6430 SHA512 ebbd8677c20572324a7f9efdb35644d2bea26e3613bf72e49e1ce19417b3c2c0eba4650a1b95de844b30d97d659e1e5b682ab947e4140ac8f9bcc93436cd4b92
-EBUILD cinnamon-settings-daemon-2.8.4.ebuild 2653 BLAKE2B a12bce7c3f29fc6503d390b77cd600c3a4180ba67210d0ae46b245a182bd61377914d2483689ede16c354ee2fc305952b80b9c4ac5dbfc10b20813bec05dbdde SHA512 6e13d9bfe4827af4d53163d4029a78f9628db95a21fa8e42be2714529f45f461b2e2f2b29b446fffb81be3dba4b648f3b5c85d7d8a7efa38a15f41105cccc476
-EBUILD cinnamon-settings-daemon-3.0.1.ebuild 2129 BLAKE2B 46736507a0ff3e18f378d1fab7ffa6ba174cefa862ae091c70e9a8e208696741bc89106d2ea51193385df2735ff6c5d0fd5abee94124fe19b588037127c4a25d SHA512 4b8a365552a70b7a7c7d6aeb2c4dadb530fa71e77105093193fcd68ced04689e9fe422ecf57cd9ec910c1dc6fe88a1f9908bfbd8b0e1cc3b9d6cabaef0ef0d3e
-EBUILD cinnamon-settings-daemon-3.2.0.ebuild 2131 BLAKE2B 306efc5536596bd3b787998046ca3e1fdc85a2382e5563e0c3fa12ca2eb4383d68e215a2fa2a7cbfebc7c76dc309dfce66a0d4db1c35ca4f1e8fd5ca69d06ea7 SHA512 af4dd51eefea5884818d10e8408d00c304ecf8ab45fca3a70a1048cc7e7c172c5e8fcd5ecde4266e7c1c03dca914fbe8ae78b846cbc7f3f2b0884a9956301c97
-EBUILD cinnamon-settings-daemon-3.4.2.ebuild 2131 BLAKE2B 306efc5536596bd3b787998046ca3e1fdc85a2382e5563e0c3fa12ca2eb4383d68e215a2fa2a7cbfebc7c76dc309dfce66a0d4db1c35ca4f1e8fd5ca69d06ea7 SHA512 af4dd51eefea5884818d10e8408d00c304ecf8ab45fca3a70a1048cc7e7c172c5e8fcd5ecde4266e7c1c03dca914fbe8ae78b846cbc7f3f2b0884a9956301c97
-EBUILD cinnamon-settings-daemon-3.4.4.ebuild 2131 BLAKE2B 306efc5536596bd3b787998046ca3e1fdc85a2382e5563e0c3fa12ca2eb4383d68e215a2fa2a7cbfebc7c76dc309dfce66a0d4db1c35ca4f1e8fd5ca69d06ea7 SHA512 af4dd51eefea5884818d10e8408d00c304ecf8ab45fca3a70a1048cc7e7c172c5e8fcd5ecde4266e7c1c03dca914fbe8ae78b846cbc7f3f2b0884a9956301c97
 EBUILD cinnamon-settings-daemon-3.6.1-r1.ebuild 2042 BLAKE2B 5941be45774f98c77b5cff4ea89403166943715c46a7904f634c394fc168bc6aeccd9dfbd35869cf36dd0fa4af89ec286aebaf9be861722dc4096399c9ed3ea8 SHA512 41702acbfccba846c82ebec1e88a9b15c3b5946cd73231075086b7bac52734f15d8061e02f80e7431469b204d2f2e8259dd5d101361f48357c5e1c0fbcee10f0
-EBUILD cinnamon-settings-daemon-3.6.1.ebuild 2098 BLAKE2B e756b248d5eafd43490c551c621bddaec27fa33e5e72fdaeabee6932d605351ae137c0f9482c3d4cc5342dfbcf775824e7ba115c03f63577db9806c98866b67f SHA512 77daac478eddec0292f7c69dc2e25c97561b538293231cc68adc16661dbf0c3a8b100f4a8ca195effaf4497d1b1d49cad7e5724dd8cf8aed2958cac478cb6e6e
 MISC metadata.xml 453 BLAKE2B 430a92263b5593b373d945790b066af782b50e58008c4cbe045b768b757bf0ff286629df2a1e35b8fa13582aea2e134a8b55468e1abb3b67598f4f338c4f67f2 SHA512 b4525358e2f21c39d179f8003bd27122af405a7c79dbde94bb0d3b5086f9c39691c9dae986cacbe669316e92459cec19a40af2ed651d0abfcbbbce0857054ee8
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
deleted file mode 100644
index 016d70f05fcd..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/libgnomekbd-3.6
-	>=gnome-base/librsvg-2.36.2
-	>=gnome-extra/cinnamon-desktop-2.6.3:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3]
-	>=media-sound/pulseaudio-0.9.16:0=
-	sys-apps/dbus
-	>=sys-auth/polkit-0.97
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.10:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxklavier
-	virtual/libgudev:=
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		x11-drivers/xf86-input-wacom
-		x11-libs/libXtst )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils )
-	systemd? ( sys-apps/systemd:0= )
-	!systemd? ( sys-auth/consolekit:0= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-util/intltool-0.37.1
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# make colord and wacom optional
-	epatch "${FILESDIR}"/${PN}-2.6.2-optional.patch
-
-	# Disable broken test
-	sed -e '/g_test_add_func ("\/color\/edid/d' \
-		-i plugins/color/gcm-self-test.c || die
-
-	# Fix intltool unittest
-	cat >>"${S}"/po/POTFILES.in <<EOF
-data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
-plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
-plugins/keyboard/csd-keyboard-xkb.c
-plugins/wacom/csd-wacom-device.c
-plugins/wacom/csd-wacom-osd-window.c
-plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
-EOF
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS README"
-
-	# no point in disabling gudev since other plugins pull it in
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gudev \
-		--enable-man \
-		--enable-polkit \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable systemd logind) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	unset DISPLAY
-	Xemake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild
deleted file mode 100644
index 57a99bc20855..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/libgnomekbd-3.6
-	>=gnome-base/librsvg-2.36.2
-	>=gnome-extra/cinnamon-desktop-2.6.3:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3]
-	>=media-sound/pulseaudio-0.9.16:0=
-	sys-apps/dbus
-	>=sys-auth/polkit-0.97
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.10:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxklavier
-	virtual/libgudev:=
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		x11-drivers/xf86-input-wacom
-		x11-libs/libXtst )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils )
-	systemd? ( sys-apps/systemd:0= )
-	!systemd? ( sys-auth/consolekit:0= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-util/intltool-0.37.1
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# make colord and wacom optional
-	eapply "${FILESDIR}"/${PN}-2.6.2-optional.patch
-
-	# Disable broken test
-	sed -e '/g_test_add_func ("\/color\/edid/d' \
-		-i plugins/color/gcm-self-test.c || die
-
-	# Fix intltool unittest
-	cat >>"${S}"/po/POTFILES.in <<EOF
-data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
-plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
-plugins/keyboard/csd-keyboard-xkb.c
-plugins/wacom/csd-wacom-device.c
-plugins/wacom/csd-wacom-osd-window.c
-plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
-EOF
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# no point in disabling gudev since other plugins pull it in
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gudev \
-		--enable-man \
-		--enable-polkit \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable systemd logind) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild
deleted file mode 100644
index 26b72223362b..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/libgnomekbd-3.6
-	>=gnome-base/librsvg-2.36.2
-	>=gnome-extra/cinnamon-desktop-2.8.0:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.97
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.10:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxklavier
-	virtual/libgudev:=
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		x11-drivers/xf86-input-wacom
-		x11-libs/libXtst )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	systemd? (
-		sys-apps/systemd:0=
-		>=sys-power/upower-0.9.11:= )
-	!systemd? (
-		sys-auth/consolekit:0=
-		|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-util/intltool-0.37.1
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# make colord and wacom optional
-	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
-
-	# Disable broken test
-	sed -e '/g_test_add_func ("\/color\/edid/d' \
-		-i plugins/color/gcm-self-test.c || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# no point in disabling gudev since other plugins pull it in
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gudev \
-		--enable-man \
-		--enable-polkit \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable systemd logind) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild
deleted file mode 100644
index 9ec0e9bcb654..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/libgnomekbd-3.6
-	>=gnome-base/librsvg-2.36.2
-	>=gnome-extra/cinnamon-desktop-2.8.0:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.97
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.10:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxklavier
-	virtual/libgudev:=
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		x11-drivers/xf86-input-wacom
-		x11-libs/libXtst )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	systemd? (
-		sys-apps/systemd:0=
-		>=sys-power/upower-0.9.11:= )
-	!systemd? (
-		sys-auth/consolekit:0=
-		|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-util/intltool-0.37.1
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# make colord and wacom optional
-	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
-
-	# Disable broken test
-	sed -e '/g_test_add_func ("\/color\/edid/d' \
-		-i plugins/color/gcm-self-test.c || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# no point in disabling gudev since other plugins pull it in
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gudev \
-		--enable-man \
-		--enable-polkit \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable systemd logind) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild
deleted file mode 100644
index 9ec0e9bcb654..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/libgnomekbd-3.6
-	>=gnome-base/librsvg-2.36.2
-	>=gnome-extra/cinnamon-desktop-2.8.0:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.97
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.10:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxklavier
-	virtual/libgudev:=
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		x11-drivers/xf86-input-wacom
-		x11-libs/libXtst )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	systemd? (
-		sys-apps/systemd:0=
-		>=sys-power/upower-0.9.11:= )
-	!systemd? (
-		sys-auth/consolekit:0=
-		|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-util/intltool-0.37.1
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# make colord and wacom optional
-	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
-
-	# Disable broken test
-	sed -e '/g_test_add_func ("\/color\/edid/d' \
-		-i plugins/color/gcm-self-test.c || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# no point in disabling gudev since other plugins pull it in
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gudev \
-		--enable-man \
-		--enable-polkit \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable systemd logind) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild
deleted file mode 100644
index 9ec0e9bcb654..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/libgnomekbd-3.6
-	>=gnome-base/librsvg-2.36.2
-	>=gnome-extra/cinnamon-desktop-2.8.0:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.97
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.10:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxklavier
-	virtual/libgudev:=
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		x11-drivers/xf86-input-wacom
-		x11-libs/libXtst )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	systemd? (
-		sys-apps/systemd:0=
-		>=sys-power/upower-0.9.11:= )
-	!systemd? (
-		sys-auth/consolekit:0=
-		|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-util/intltool-0.37.1
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# make colord and wacom optional
-	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
-
-	# Disable broken test
-	sed -e '/g_test_add_func ("\/color\/edid/d' \
-		-i plugins/color/gcm-self-test.c || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# no point in disabling gudev since other plugins pull it in
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gudev \
-		--enable-man \
-		--enable-polkit \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable systemd logind) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild
deleted file mode 100644
index 5967c0fed3f1..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/libgnomekbd-3.6
-	>=gnome-base/librsvg-2.36.2
-	>=gnome-extra/cinnamon-desktop-2.8.0:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.97
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.10:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxklavier
-	virtual/libgudev:=
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		x11-drivers/xf86-input-wacom
-		x11-libs/libXtst )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	systemd? (
-		sys-apps/systemd:0=
-		>=sys-power/upower-0.9.11:= )
-	!systemd? (
-		sys-auth/elogind:0=
-		|| ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-util/intltool-0.37.1
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# make colord and wacom optional
-	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
-
-	# Disable broken test
-	sed -e '/g_test_add_func ("\/color\/edid/d' \
-		-i plugins/color/gcm-self-test.c || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# no point in disabling gudev since other plugins pull it in
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gudev \
-		--enable-polkit \
-		--enable-logind \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.6.2-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.6.2-optional.patch
deleted file mode 100644
index e5abe075f5e9..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.6.2-optional.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 884ce49f5bcdca37a30fef94d6649af012c88fee Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 13 Jun 2015 18:03:09 -0400
-Subject: [PATCH] Make logind, colord, wacom optional and non-automagic
-
----
- configure.ac        | 31 +++++++++++++++++++++++++++----
- plugins/Makefile.am |  7 ++++++-
- 2 files changed, 33 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ce79a6d..095a7a3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -260,14 +260,28 @@ dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE(color,
-+              AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
-+              enable_color=yes)
-+build_color=false
-+if test x"$enable_color" != x"no" ; then
-+  PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+  build_color=true
-+fi
-+
-+AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"])
- 
- dnl ---------------------------------------------------------------------------
- dnl - wacom
- dnl ---------------------------------------------------------------------------
-+AC_ARG_ENABLE(wacom,
-+              AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),,
-+              enable_wacom=auto)
- build_wacom=false
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
--                  [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+if test x"$enable_wacom" != x"no" ; then
-+  PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-+                    [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+fi
- 
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
- 
-@@ -373,7 +387,15 @@ dnl ====================================================================
- dnl Check for logind
- dnl ====================================================================
- 
--PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
-+AC_ARG_ENABLE([logind],
-+              AS_HELP_STRING([--disable-logind], [Do not check for logind]),
-+              [enable_logind=$enableval],
-+              [enable_logind=auto])
-+
-+have_logind=no
-+if test x$enable_logind != xno ; then
-+    PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
-+fi
- 
- if test x$have_logind = xyes; then
-     AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
-@@ -595,6 +617,7 @@ echo "
-         LCMS DICT support:        ${have_new_lcms}
-         Libnotify support:        ${have_libnotify}
- 
-+        Colord support:           ${build_color}
-         Wacom support:            ${build_wacom}
- 
-         Smartcard support:        ${have_smartcard_support}
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index b9cb3a6..f37eec0 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -6,7 +6,6 @@ enabled_plugins =	\
- 	automount	\
- 	background  \
- 	clipboard	\
--	color		\
- 	cursor		\
- 	dummy		\
-     datetime    \
-@@ -23,6 +22,12 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_WACOM
- enabled_plugins += wacom
- else
--- 
-2.4.3
-