gentoo resync : 01.12.2017

4 files changed, 179 insertions, 4 deletions

diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 8aeb13fa6fb2..a0120338d781 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -5,11 +5,14 @@ DIST cinnamon-settings-daemon-2.8.4.tar.gz 2935478 SHA256 2f7e8764a842d9b4f21c1e
 DIST cinnamon-settings-daemon-3.0.1.tar.gz 2912459 SHA256 0abe839e04a36a052bb486f90e84c25ae6ccc92b74223813d9666eaac257677b SHA512 848f1bc38e84edf9a8af48e55b7581881fbc9920dce9a4fc38627456dea7cbfe330bebba4bb46d1c231dd85bd3445d365b5e415485ac202e72335fe337a800e8 WHIRLPOOL 91b5b0455c2dcde8868eb8e1adf52229e3dd94fb4c4842d537b89e1c72cd8f8f54af854765c62eb382015b8f3299400f21a9034974440ce9b7d305be4ffb82fb
 DIST cinnamon-settings-daemon-3.2.0.tar.gz 2915197 SHA256 0726e8ce4b1008229fe157ba0888a2effa1d9efa4e60735faf67af1fde8586f1 SHA512 1977402fddf62cf29c0285fd2be8c951dcf5f1d914e3ce53e2e738cfdb211096653b9256028fcb887e403d11dc2105e976eda05cf97c95afe6101c84c72abb12 WHIRLPOOL f051d50a41c22035ef1ffc48fe557d791966aacea2a81f76598868d6d79afe3d02ef56d17d7a67bd3802beb2d287f882c152021e2495ab4dae5af18f3a9d5959
 DIST cinnamon-settings-daemon-3.4.2.tar.gz 3102793 SHA256 b30a3b64e4263e4dbe2678c0cff5cef97944282fabb8f4b6fa3ca6c65c8f1522 SHA512 597f3a08e5c2168d0fc3da4b83c85f4c1f4451573cccc79bcb2a3debaab7f4714244e0300dce8ddc62de40b2f4c1c44ff282d280a1437d14041b44d4541c83e0 WHIRLPOOL 85922de3b93e07565adeda762e4d5278e75038db7ab7ae372494a8050fc11302eed8b0a53c19a691b8b4f93e35f8182d58b88d56809103671dcf97308b3b5b5d
-DIST cinnamon-settings-daemon-3.4.4.tar.gz 3102951 SHA256 b883879a13f9120d2e17ad22fa2cf3ebe50a87d814c82e2f067b2bc32e7273f1 SHA512 93a7609a5c1b9c34061f9ba7836ace58cfa5549d9be811a1a5ca50e2cb9fc9e9462d9f356f50c9115cca93fa42f29ff9d130c184e19cccf9c0ee814fb39bc6d6 WHIRLPOOL 6fc3edb6697be3f24c7a6321f7a315620ef040b7cc2bb557b5e0f4f3bac2210fcac2e7127fd89629066024d6f862b0c79463fefc0ebb9734a2c387b7036cc964
+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 2741 BLAKE2B 9ade19ed457f9d6aa17e7bb11c23412a87139b732a73407b385a62abfac2de224022c906708f41af7dd48223c9d9fb42455f2313fda0a4a86cccbb9215ad315c SHA512 b9b353976b6308f881462ab71ce815e2a61c78c2721de69592395411ccb28718db3c647ff0f0f98bc2c44bb884ca4076502effff0a06356c23ef7bb82a27afb2
 EBUILD cinnamon-settings-daemon-2.8.4.ebuild 2651 BLAKE2B c82c4643de889bee2f2b2b06d96f61b2b3f28c0288cc7072abc47242339963d7fc200f09c738cb767983262214bb83031219a825afe7b1871848d21093fb0651 SHA512 bae8ac3e239db5780b3a700af5766f82e591e2e7caf834e19521e6b3b47fa061e01c15eb96af4bc87fd646d753f39d9f1657da74a6870bac1d298de8ad74c622
 EBUILD cinnamon-settings-daemon-3.0.1.ebuild 2127 BLAKE2B b27f8210d431bb09563863e2e76ecb5e0e8e575289bc80c5a0d117732ea006ce96e0d2f1206d09363ba94b98a14c3969749d79d1d04cb1b16584056124ed445c SHA512 2cd23b7c5fb8b974e8bdf199f6baec37f6a51e872c4851d30d137bacde4055178b3f509e21a82814bf5fef4a2c249af3c32dc34fa9d21471a802476ce4341e98
 EBUILD cinnamon-settings-daemon-3.2.0.ebuild 2129 BLAKE2B 04a7d41002d9ae54699c3d6797c8d58240a2239a8a43b8ef995126703e74f6fc4e73b810c98da091b5ca71568da63acf13ae07894ba9cdc5dfca6150eb565c26 SHA512 df00468ad86b1d7327c53257f6157ea771ee419a02c9c088477886acd5d362aeb9aa3126c8f30d3d4c59aff2f34176d00f0f9a575947e4be935bfc36ac4dad99
 EBUILD cinnamon-settings-daemon-3.4.2.ebuild 2129 BLAKE2B bd195a092c8f68255ba5a2c09815a5311e4c35e2a281418bab097f0c78770207efd1ce6ac4ced749f965e75ef677ad8f2112b2d25ac653a2425a279e139424ef SHA512 18e49014871be8347a777fdc0d1833360173815280552bd88f1b547b798d33714718113b93ae8f8ee5ca80061c1f1e63073e29d45f1723b66b6951d02f8f96da
 EBUILD cinnamon-settings-daemon-3.4.4.ebuild 2129 BLAKE2B bd195a092c8f68255ba5a2c09815a5311e4c35e2a281418bab097f0c78770207efd1ce6ac4ced749f965e75ef677ad8f2112b2d25ac653a2425a279e139424ef SHA512 18e49014871be8347a777fdc0d1833360173815280552bd88f1b547b798d33714718113b93ae8f8ee5ca80061c1f1e63073e29d45f1723b66b6951d02f8f96da
-MISC metadata.xml 465 BLAKE2B 94ed490c574591fb92b2ec383745236d613e2da73ad092f141aaab90c84ff372d08741769f74edb1dbd86f60bc510f9c37e6c74e35cf975ee0ed3e250f14003f SHA512 c6b88abc595c2514ea1abfd440839811ae3479064eb85bab92f08bd9564f406aea382f130e92ed38c9cd9573d6050dd6b054ee900f1151822ac6b6fe13673a96
+EBUILD cinnamon-settings-daemon-3.6.1-r1.ebuild 2042 BLAKE2B 0f4d9470504699d50f01e28724cdf9b0df33df3de57370a83df5a2bdf647f2d26f364dc4075fd73baaa12fd6aff091618b280492c96ab470e2dbf95f93d51cb8 SHA512 a8263d140b47f940fb7b417ed56e758d6914b6e86b21ccb599be4f4f77d8275b1dec3cc1f9c7e0cf6e1ad11c857a0b69190e4dbfdeba633dc461afbad4b67481
+EBUILD cinnamon-settings-daemon-3.6.1.ebuild 2096 BLAKE2B bea3fb08478f5b018dabf2c9c3ff1d4a0442eb226757cfd761d3671bdd9c6460ed5db7afb253586a9295561e7d53caf278b895c4dd666bbddb4bfc7069aa3b53 SHA512 50d49219acd3b1919dc8273f2f73249961bcc591823da39479550bd50a6d73bbbde3d907d9452ac9b14329a42b900cd3cc4617e69cc4061edda4f5f0deb8b928
+MISC metadata.xml 453 BLAKE2B 430a92263b5593b373d945790b066af782b50e58008c4cbe045b768b757bf0ff286629df2a1e35b8fa13582aea2e134a8b55468e1abb3b67598f4f338c4f67f2 SHA512 b4525358e2f21c39d179f8003bd27122af405a7c79dbde94bb0d3b5086f9c39691c9dae986cacbe669316e92459cec19a40af2ed651d0abfcbbbce0857054ee8
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..d0037fe9aaf4
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 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"
+RESTRICT=test
+
+# 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:=
+	>=sys-power/upower-0.9.11
+
+	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= )
+	!systemd? (	sys-auth/elogind:0= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-util/intltool-0.37.1
+	x11-proto/kbproto
+	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/cinnamon-settings-daemon-3.6.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild
new file mode 100644
index 000000000000..33d4587404d7
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 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-proto/kbproto
+	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/metadata.xml b/gnome-extra/cinnamon-settings-daemon/metadata.xml
index 9738f243081c..aab7fdc66a7f 100644
--- a/gnome-extra/cinnamon-settings-daemon/metadata.xml
+++ b/gnome-extra/cinnamon-settings-daemon/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>cinnamon@gentoo.org</email>
-        <name>Cinnamon Project</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<use>
 		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>