summaryrefslogtreecommitdiff
path: root/gnome-extra
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/Manifest.gzbin12050 -> 12056 bytes
-rw-r--r--gnome-extra/chrome-gnome-shell/Manifest2
-rw-r--r--gnome-extra/chrome-gnome-shell/metadata.xml6
-rw-r--r--gnome-extra/cinnamon-control-center/Manifest4
-rw-r--r--gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild91
-rw-r--r--gnome-extra/cinnamon-control-center/metadata.xml7
-rw-r--r--gnome-extra/cinnamon-desktop/Manifest4
-rw-r--r--gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild69
-rw-r--r--gnome-extra/cinnamon-desktop/metadata.xml4
-rw-r--r--gnome-extra/cinnamon-menus/Manifest4
-rw-r--r--gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild38
-rw-r--r--gnome-extra/cinnamon-menus/metadata.xml4
-rw-r--r--gnome-extra/cinnamon-screensaver/Manifest7
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild93
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild94
-rw-r--r--gnome-extra/cinnamon-screensaver/metadata.xml4
-rw-r--r--gnome-extra/cinnamon-session/Manifest8
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild69
-rw-r--r--gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch65
-rw-r--r--gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch21
-rw-r--r--gnome-extra/cinnamon-session/metadata.xml4
-rw-r--r--gnome-extra/cinnamon-settings-daemon/Manifest7
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild85
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild87
-rw-r--r--gnome-extra/cinnamon-settings-daemon/metadata.xml4
-rw-r--r--gnome-extra/cinnamon-translations/Manifest6
-rw-r--r--gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild34
-rw-r--r--gnome-extra/cinnamon-translations/metadata.xml4
-rw-r--r--gnome-extra/cinnamon/Manifest5
-rw-r--r--gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild229
-rw-r--r--gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch19
-rw-r--r--gnome-extra/cjs/Manifest6
-rw-r--r--gnome-extra/cjs/cjs-3.6.1.ebuild67
-rw-r--r--gnome-extra/cjs/metadata.xml4
-rw-r--r--gnome-extra/libgda/Manifest2
-rw-r--r--gnome-extra/libgda/metadata.xml25
-rw-r--r--gnome-extra/mousetweaks/Manifest2
-rw-r--r--gnome-extra/mousetweaks/metadata.xml34
-rw-r--r--gnome-extra/nemo/Manifest6
-rw-r--r--gnome-extra/nemo/metadata.xml7
-rw-r--r--gnome-extra/nemo/nemo-3.6.4.ebuild85
-rw-r--r--gnome-extra/office-runner/Manifest2
-rw-r--r--gnome-extra/office-runner/metadata.xml19
43 files changed, 1253 insertions, 84 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 8b79b69bca19..2286c530739d 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
Binary files differ
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
index 9d63dda6194e..e874b28461f1 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -7,4 +7,4 @@ DIST chrome-gnome-shell-9.tar.xz 151984 SHA256 11fdfaa12208ec87ddbac27fc9652609c
EBUILD chrome-gnome-shell-8-r1.ebuild 2135 BLAKE2B 2f74d0cce221510f4724d90e23908c67eedd894740bc459ae65cb931091149f49012c0371a2d230dc115660b62369e4d050e66b04d42c6cb230e9be4b42dd6f3 SHA512 a53ddffc9b2a923fcbd3854963d1906166d43db8c5e6df026c006a6a898399d5cb8357df0ec2774e1572096d79fd79998ceeacd5b0d6d0b7adcbc8a00f81d2bf
EBUILD chrome-gnome-shell-8.1.ebuild 1850 BLAKE2B 9043111237a6a81411ba64f2c5485404c11a7df31545b1425333ed40ca2e6aff44e8787bc80e34af8c9147a5897238179430dfa83ded87796a283a9501ac0d2c SHA512 dac582a4e32e80e762c534421536926ddd299534aa6c72fe90986de1e2cb78467a9996162e17fa978382720b7d458a832c0e56db1615ca038e9d2458bf2c5c76
EBUILD chrome-gnome-shell-9.ebuild 1868 BLAKE2B 1406711b618d76f8d59957a58575298eed99311788288b7c6fa982d0726698063f388e834e742e477150208fc5b72b7777c6c4cd0e02032181c6c0ff4f0736b5 SHA512 84cbb17759a69935ddadf9386dfc649fa9b00bd6574ec5a346cfe5ead80a94fbda18d0de49b1ecc602c1e12526ff31d53494fa56280a88d36ec74ea7629b2bff
-MISC metadata.xml 573 BLAKE2B cabfcb275b9f0ad8fa1c6d8b673dd58bf5c7487eb55e43d20e76ddaa5018159131c8f0cf9e9ae7170beb6222d0bc782e18eb9dbf464d16cc14742062db34b18c SHA512 aa570e3593e9652312853bfb1d6ce86e3a1f75c28f70bea9a2c551dc1bd067abccf7813c050978a1725b9a085517277913337b05ac833080b441168e93a5e27c
+MISC metadata.xml 538 BLAKE2B 730cc561a29ab8e4506843dfaa1520af6a8ef1b3139856fbb4e7ba077eab90f28f0440c0b511e0c11167961971ebe0b1b7b53ce386d2f82d4d20b0e9f41664a9 SHA512 fed3f8fac456d95085878b4f3a5f9a0c139df07d4c3a515412727f4e4a805456736d5e36df6397e2a38dbf7043f4e83e2ffddf2615749fa7a43734a17b0ea3b2
diff --git a/gnome-extra/chrome-gnome-shell/metadata.xml b/gnome-extra/chrome-gnome-shell/metadata.xml
index a24e5c1ae81a..3d84d898ca45 100644
--- a/gnome-extra/chrome-gnome-shell/metadata.xml
+++ b/gnome-extra/chrome-gnome-shell/metadata.xml
@@ -6,9 +6,9 @@
<name>Yuri Konotopov</name>
</maintainer>
<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<bugs-to>https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues</bugs-to>
<remote-id type="github">GNOME/chrome-gnome-shell</remote-id>
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 9d4c555f8d16..c96237013bef 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -3,8 +3,10 @@ DIST cinnamon-control-center-2.8.1.tar.gz 4090162 SHA256 595076ef89949c31357cd45
DIST cinnamon-control-center-3.0.1.tar.gz 3834138 SHA256 3d9f0eb45168a91101f99452b38184dd6417dd89064be4523e565bd721a521fe SHA512 97f726cddb12afd697a542bf40b89c84e8256cc7e1bff31eaf3ed86ba9ffe23660085e4e4123f955f1aa4aa31930b209c2a26649f2dec55d10a4803d86942e46 WHIRLPOOL 68f0d2292d4fa43de31d9ed8cf4d15f1fc887e26ebc7c21cfec9c180ca01f6b7b11be0e88c5a4f2f84b35c2a6162565cb5b8eb647d563d8cd939e700dc76f4ff
DIST cinnamon-control-center-3.2.0.tar.gz 3837279 SHA256 60696d6793e2e7de6746ee65b3dfd64948ad5eb8a46182abefb3c464e4a2ea2c SHA512 19a3481ba52784c733e5aae9603596a29fc12c78f21b8fe08492deda8c3eeac2bdbfc2da24f29dc5db6f6de02a26a43f67f3141dbfbd07c26f0e38a872c39216 WHIRLPOOL bcc9767b024a91a5cec947f95a1674e7abc25a8b29081a42fa4ec032ef1ee2b40f34bc369bfce1ed7418281b4da16012cc2f3a592987a4e6a7fcd457b7fa5d90
DIST cinnamon-control-center-3.2.1.tar.gz 3838032 SHA256 12a29a3293cde58ae6fd6fdbab7eef4a2119ac8f515ca9218e75cccc3aacd15c SHA512 77f98aa47a10ef280ca7c3f8662e770d87a5427c91093382d3c289abcc0eac38317a31cd47a19a8ee67a4579375b84392f45d239b98fe494f7abfe10ef186554 WHIRLPOOL f6bb2c879877389673c72b5a8faa9974d5d67b4404776633f0954155d5fc1cdc483b8c900c13e680880d7ee6a02c4d876c0f4ad1facae2123ed5fb5a61a9ab62
+DIST cinnamon-control-center-3.6.5.tar.gz 3888881 BLAKE2B 9b867d6467ece64a3e2d5e8a87a83235f85738e4b5ee7ea9db31f63c5681b1eec24388ff29b54bc1e01c12e3a15d5eb445c72ffe8576c211f708945ed5dde2bf SHA512 09e482976fbefbd388151736fde4d4e198f3584b47f270ad7d0ce4299029012fa7c7825e221a094c8536ebd5824406bb943a8aad5cf51d60dc22dcf5c02b3b91
EBUILD cinnamon-control-center-2.8.1.ebuild 2673 BLAKE2B 126f0bdb37a5e0f5d8fff53597bbf628c8f7194521ada3cf7feaec6303b9567852f06a9b9686405c4825cb61b8e2caf49b7ef8f2cfd5732753864cd3ff50e3f2 SHA512 5ad2c1910d15c6202751a1c5298d0e4c12cdff20ca03f826c4b3defa9acfe352de5b95363c020e25c4bffd2bbd70f768b86d3ef8b70d2b7ba39fc9002b31dd5a
EBUILD cinnamon-control-center-3.0.1.ebuild 2611 BLAKE2B 9a4ba0fd9dbd45cf87cf1b2ddafd26023a1c7e6c3cbddafb7072b6ef8b99d8d80e3f14483533e9a9486a3e9102a354b11cfb2828867577fc08461154bd62c3e2 SHA512 f4373e0845807fc3182a086ebbacee8e5a18c015c6ef2d1c2f00211cf8f3ea162f9c55daed64b5a1c100d3621d7446ca6bb8f4cdec86099a2ab51c911fb52fcd
EBUILD cinnamon-control-center-3.2.0.ebuild 2585 BLAKE2B 2dd57986cf8c80549a91ae4a0934aedf09d4c6fb577ba9c75cfcec349c4e2cfe082e6f52988b4084294ca014db1181ae343b34d75a47f05a4793b6ff6f9c80a9 SHA512 4dbb1a7f539a6a38e99472ada1703d0b27a6e761c62b266b500b9b66e59a955d698387431e9f8adfbf68511bc9a8ff4e5d36c416d5d0314406990b49a11e595a
EBUILD cinnamon-control-center-3.2.1.ebuild 2561 BLAKE2B 52a21e3c82a9a738ac88f1a3cedc516c3510e05072f3b2d0b85553fa7340e87917339cb490893f77a15480edf117953b091423b8c713642e3e302bf1cc00f3e8 SHA512 423385581a6c1702d2064aca5a3e85eecbd0e43c4fa92368ff959e92891fac2aa1c411c7cf215e73900917844ce281bec3d4b37185cb148d172e7236bb0d968b
-MISC metadata.xml 467 BLAKE2B 3b79f7bcbd02270a75c526da1f9191b4c2d0de533d110d0fa766c9e57e431605d8a8859fb19fd11685a3ad97c0784a144b1841a6bc203c8c1ae2b400310bddfc SHA512 7d0ac6b976cf87f9178808cc9b14c6901ab1ae66124fad8e398e9f06ca8a91c3de21da27636cd632f0deac707720ab21b879b6d68461a04db8685e7cd8bd768d
+EBUILD cinnamon-control-center-3.6.5.ebuild 2509 BLAKE2B 0c4b387005f7659cb6881aabdc7a5c77a57ccadc59d41a07abb0526073b423b05ece976c88c452221f4fb26e69c0171b89d37db39e145ea7efc4af13a1bf7c2e SHA512 3b3e9c7f13f596b0fcc83c3e02d18e81db1862d78e78a449d2626885b401a0f11fa4b73627763cb6174e5e1b6fd88d13d7484dca2cd9df80b4c4d9c053ae4db7
+MISC metadata.xml 452 BLAKE2B 0b3f734916acf4ee8b2fb22b8b419dd63a18c107c4521d874a7c4a2ea45fd8ffd9ce7f44e85a7b4642a989dd0c96a80f02af4e57e64d99f650ab821b2a89f746 SHA512 e063012f6cd1d892a124a3c47c247ec36351993af36c3c5cf0be0b1fafa12119f1e7506013a3fb97616b8343c924d4bcd341350c4e575fb042d63c957c8cc666
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
new file mode 100644
index 000000000000..7204e5d76bcc
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 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/elogind )
+ 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-proto/xproto
+ x11-proto/xf86miscproto
+ x11-proto/kbproto
+
+ 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() {
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # --enable-systemd doesn't do anything in $PN-2.2.5
+ gnome2_src_configure \
+ --disable-static \
+ --enable-documentation \
+ --disable-onlineaccounts \
+ $(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/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
index 2056a4559429..dbc06458f865 100644
--- a/gnome-extra/cinnamon-control-center/metadata.xml
+++ b/gnome-extra/cinnamon-control-center/metadata.xml
@@ -2,12 +2,11 @@
<!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>
+ <flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
</use>
<upstream>
<remote-id type="github">linuxmint/cinnamon-control-center</remote-id>
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 147cd35efca1..be6508f9d7ea 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -4,9 +4,11 @@ DIST cinnamon-desktop-3.0.2.tar.gz 577776 SHA256 a8bbf148b9ee25f21fb2c196a54c95e
DIST cinnamon-desktop-3.2.0.tar.gz 572478 SHA256 84c29fd9256370b6789613292fd12ec7893c1b752487dc938b056a3d68607212 SHA512 e93ec4ee44152b800f75848bd9327b46f4ab0c6b2f4d0dc7f6d6f631eda0d486b995a5bb1537b2c85774fb3a48ae99332937fa8b6021aa08d98b98fc25a8429f WHIRLPOOL de9ab65cc297d8000ee9c74245080da95e12ac2e2c39a1a02316fb4d257693acee8414d98950790e9c880c6acaca0c6d535a236ab6605edbccd30d93008a9f2b
DIST cinnamon-desktop-3.2.4.tar.gz 570814 SHA256 f9920082b299c85d11cfdb6747026f5f044eabf3a09c0164873fa2850561abad SHA512 d07dbc63df4b689cb1fdeb7032c9f19557de0849def929a9ffc99d5aa1bb49edd37899256152d1245e1d43690821ed61a10e63f82962f787f5e06d999dadaf76 WHIRLPOOL 0474c43c922b517ba0a227bff5b9a48b737621f3bdcf01628c37f9ed3b7ce8cf910dc5ae3ec990c0416cae1c9ac1c882b8637862fc4cebd92c9b9d82cfbce392
DIST cinnamon-desktop-3.4.2.tar.gz 570232 SHA256 58d594a896f2ce843b8dbc4430e1e538caa5f795e0bca07e5429ba953523c2c9 SHA512 821b49aefa2c4fff54a2ebf4ed61d8bd8ccb193d5ba113b9e5e917d7abe6baf4e85f721bdaf9dc206b4d6b1ba3080eff0c7925ab4d1970e0a58895e8891b4f8a WHIRLPOOL 5588077eeadeafd8ce75452b5cb8501080c2dfed43dde873e7cabc3c9d62eea85ff4c49e30adac854798b5963b870a5bb27270020ca433ea198fd83008233329
+DIST cinnamon-desktop-3.6.2.tar.gz 571728 BLAKE2B 17a3297b75a1ba9e34ff5ef8b7252748b4300fe40381b8d5942fcf5baaf7532a560cdbd918d2dc7ed34921e357c61f74d947a5e2174cd7b0310f91015a4bc4f4 SHA512 75af7ec916d43d02eebe9a83214cdb538067f6b674ca76e109f3bed909e61df11ec83350e97505ddaaed24f097e7b20512822e30b52d14a39d6a0e3d582d05fb
EBUILD cinnamon-desktop-2.8.1.ebuild 1667 BLAKE2B 3cdcd4795d1e4d41ac84d5ae3c281ca0fa807cf45b352586bdab735fa78bfe777a0474bf875f0ea2c01be962bb36234e4a6c0ed4b624c146586a3ccf8ca58437 SHA512 e4204597edcf5e9a49174abe82ddd9ccdd65ff9785017328ac8323ce44090b68f58c36a98bebe07fa83d07b801dc8b0310f496e2026023a484421cd70ec5226f
EBUILD cinnamon-desktop-3.0.2.ebuild 1697 BLAKE2B 545f0aadd610e177123e4eee3060f735ecfad2cbec9a9ccc77de08dd1d76520b7e9f02eeff8073f6cd4a7ff708dd9b11f81df946cc9003aa860cf3731e5a2511 SHA512 bfe955ae7cff1c85b970ec9ad8bccebf491d5ff86b5019c3fb858bb9c1dd6a9aa0a25b6974885889064e1524b60579cc49443a562e90878ef83411edd27d3dcc
EBUILD cinnamon-desktop-3.2.0.ebuild 1673 BLAKE2B 0762ea6ff30652e4ec1a4772bd714f2c4d12d5100962c959fd4c1fd56a26b38222281d063fdd4af6f68fd997c6e777a085b0bac3b8fd7bf407cd40718a1fe72b SHA512 82a24036ad9e62d4417e5b0d823d1afa414d3336e645dd24a0f248a683385f5c42cf73c6e64540d601ae9f1f258e4a4a9457d51e69d11984ae6c36e635be95c8
EBUILD cinnamon-desktop-3.2.4.ebuild 1679 BLAKE2B b687238b60628262cb6d3d96614b831d29e4e5ef9fa47a359c1b0ee5e001d2d2e030a2be447757ca0dfe6bb18646a1db3e2b36b1fd16c1c53013ba3fa341ec9f SHA512 3ffe482cbb3993b554832a377b0192a6bbe2c3b50f92b7e0ead48a99877b19aafae6b109c84167310b8d7cb19c7bbd98eb01f43302c15acf7399f8ae6f4fdeba
EBUILD cinnamon-desktop-3.4.2.ebuild 1705 BLAKE2B ca49c74af422e94772440d734e4efb878634c11aa3c315cc65fd32d091a9793ff1b64920dcb40f3b33663b0e279940aa73bddc043e33a6933ada0a9e5ac5b615 SHA512 02fded4450d126d41528911207e6073c4e310bdfb2c2e786d73979b9a96cb59ff4ab4e28628bf11c9eda4a5453a3bbe96bd85c857cce5459f6235e0375dcef7e
-MISC metadata.xml 355 BLAKE2B beeded651d500641950cb68cf93541ad0e1d91fc5c2fdbca8250a62a028ba5e34ae1bdc284069c8a1321ec9f51ba15e26e0b9e11c9bcfc309cdcc25908e622d9 SHA512 0ba7baee0aa30973297f85b1b1e4ed37789cf9aa3fa3302ff86512be2829c6a3c797b14b27b822aff54639f7fb716debaf5bfad2e255ba0666157245a415022d
+EBUILD cinnamon-desktop-3.6.2.ebuild 1705 BLAKE2B ca49c74af422e94772440d734e4efb878634c11aa3c315cc65fd32d091a9793ff1b64920dcb40f3b33663b0e279940aa73bddc043e33a6933ada0a9e5ac5b615 SHA512 02fded4450d126d41528911207e6073c4e310bdfb2c2e786d73979b9a96cb59ff4ab4e28628bf11c9eda4a5453a3bbe96bd85c857cce5459f6235e0375dcef7e
+MISC metadata.xml 343 BLAKE2B ad89f9bce993b3d57620eadf715cff2aec3e4ef058e3edc34f8b02478be2a783f6d3e90c645818ce7a6dea30274fd67ca093f2284123e677fceb0b89da80c95d SHA512 628ef0f1097a5afc62968982247ae10d2db811fd0e82944d64d1b7bb2f6dec888cf16a5bb2ddf5ca1317860abc099cbd63916381a4be69568dd0c21405fe0e18
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
new file mode 100644
index 000000000000..547abb541964
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.37.3:2[dbus]
+ media-sound/pulseaudio[glib]
+ >=x11-libs/gdk-pixbuf-2.22:2[introspection?]
+ >=x11-libs/gtk+-3.3.16:3[introspection?]
+ >=x11-libs/libXext-1.1
+ >=x11-libs/libXrandr-1.3
+ x11-libs/cairo:=[X]
+ x11-libs/libX11
+ x11-libs/libxkbfile
+ x11-misc/xkeyboard-config
+ >=gnome-base/gsettings-desktop-schemas-3.5.91
+ introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+ sys-apps/accountsservice
+"
+RDEPEND="${COMMON_DEPEND}
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-doc-am-1.4
+ >=dev-util/intltool-0.40.6
+ gnome-base/gnome-common
+ x11-proto/randrproto
+ x11-proto/xproto
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ python_setup
+}
+
+src_prepare() {
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection)
+}
+
+src_install() {
+ gnome2_src_install
+
+ # set sane default gschema values for systemd users
+ if use systemd; then
+ insinto /usr/share/glib-2.0/schemas/
+ newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
+ fi
+}
diff --git a/gnome-extra/cinnamon-desktop/metadata.xml b/gnome-extra/cinnamon-desktop/metadata.xml
index e05983511df8..4664002df8ad 100644
--- a/gnome-extra/cinnamon-desktop/metadata.xml
+++ b/gnome-extra/cinnamon-desktop/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>
<upstream>
<remote-id type="github">linuxmint/cinnamon-desktop</remote-id>
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index a8dd84114071..e978c333b4b9 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -2,8 +2,10 @@ DIST cinnamon-menus-2.8.0.tar.gz 208853 SHA256 06a6e0a11644dfba8459b2b77fac61563
DIST cinnamon-menus-3.0.2.tar.gz 211077 SHA256 e17494e65edb6ca8b36e05ca21316db8ce6864d4f9bfa9312a661d5c39054ad7 SHA512 a309c10e21be1f5fe7e558017cc0573e7ae421ef860465411190bb071eb42caa8013f52ec71257322ec3dd37de998c78cd9014c4f4daca1edde413db6bed6b7f WHIRLPOOL 2bf6b26a40e45121c8adb40df0a3873aaf171beca14af8759adc725313b97fcce3ff150551bfe43d72e6caa835ebac9d1fe379852b280b967828486cd2951edf
DIST cinnamon-menus-3.2.0.tar.gz 211237 SHA256 96eb3303151fabc18ccf2719849149d08f7391d22d0a6b72e82326009bb243b5 SHA512 5cec12ce4bf64880283064e3d5d169dc22ce692974b40a0f7eeebbb820780c941d9a2116eb6a2eb2bf3a3165262d23da47743390f56bfca6e74b298cf4be0aac WHIRLPOOL f988a4b90be60d9689e50f38fb192ce67de808f59f97d9a77f78a112277021517d917be7c2027623fb5094d819ee2ce8149a5ed7c9a371c1edec6ffe143ddcb5
DIST cinnamon-menus-3.4.0.tar.gz 181649 SHA256 c0d60a612ab67ce76021b22821aff548e9779a6c3b2cc9ef393aca80c0044aad SHA512 77ec3f608323b263b70aefb633ecef83e68b82224e64d2cf3c6dc95c12537f81b41de08ab400596e2af0ecec1effa731ab66a83bddaffdb3bb6c8a7ef835f5b7 WHIRLPOOL be491935d33df5e56e688eca577836e4da6e66805a91fb2260b533751328607881d318f9d751e9b7928b8e7d7bf78aa1b2741b264285fb80c12f8c44a31e3b6b
+DIST cinnamon-menus-3.6.0.tar.gz 180165 BLAKE2B a014c120bc84206914be69fcae0f4ec09b98a281012ed3f6f2f21f46762ea0b5e289c6dbd321fb7889f6172c9e7150673513e4c15dbd2e634c48efcefa816176 SHA512 dc90dbb8633ac77f4c8be7b013e3d6f9ba8f4e830f7e8c09ec7dcb9566a3768171a59cdc90b6cd11ad015b93629cdf6fc8c2397656f74603a517c0fbc97d3b14
EBUILD cinnamon-menus-2.8.0.ebuild 911 BLAKE2B 43fce9e96cc04fb796bb8d8a444dc8b989379fa901c615c2a14fa1c021565b7cd0da0660156599ddeb1806ba27da9bc860a77e0cf258be364bd469c08f340827 SHA512 23252a7163487b8f5952155e6628d3f9c4cc2208c2b7023346007493913cba0a0439b5dc8c4967b4f410a7f184085b64e54f717d441a55a6d46f06300828a7a7
EBUILD cinnamon-menus-3.0.2.ebuild 869 BLAKE2B 9c69ea8169fac6ccd0a5dc03b9bdd2ef592a957e796917f48ebdd383d53c3b2d67077c430ff32b58fac21791ab031fde1c35bd92479a16a857b6ab81a64c6f99 SHA512 2723bc1745a7ae044ac58e71e6b3968e1544690640bef0aeb6e2c292805c0961a57dcc6e2cdd1cf1941aae613e4079ed563bf01824bbbfb2ae0dc7bea9b6ed94
EBUILD cinnamon-menus-3.2.0.ebuild 871 BLAKE2B 2b60fe6584081a917aee991e353f461c578eb18995f9abfd516d3c83df5524b6259984d7d5453f0704cc8af6532b4dae784ce7df0fe3100f502596e3ad58d184 SHA512 23270c9b4ba89e41481690bfe62bd3a87908836cbe7beffbb3d99a4e23a13d27c348b8806053b78b9461d1b601981806700e5415d42556e9f5fc6198db607d3b
EBUILD cinnamon-menus-3.4.0.ebuild 871 BLAKE2B 021a856fc81e7d4c0442c55e18098ba0b4c5af442cc13a8590de2bcd8e9be4e67e901c571af611f748295e559862cc1097d300f20b2f7d2c07c3e7721eef8d4a SHA512 7f2ba0cee5846fc29184a5e0c85f622828f4a1b40b57b75a856028e8b7ed1b221fe69587c9db8eb55f88869fc4beed59f84ba740b506db3b4fb427adc20845a1
-MISC metadata.xml 353 BLAKE2B 7e69078549109afecc3c1a6e3ff15759fb7bab920cf5c1e9ad863a930cdc82a17f7bc56730fa54e780b902ebda51a7ee4c670f9bc76b6b408516609b6e277bdf SHA512 6e0125dcde66da81f020e5af9b733a823cc5763d2a565b8b4fbed0d5f484868dba4e6848f691faa50272a1cbb276f778c7b2d1864261798677a237959e4f77d5
+EBUILD cinnamon-menus-3.6.0.ebuild 871 BLAKE2B 021a856fc81e7d4c0442c55e18098ba0b4c5af442cc13a8590de2bcd8e9be4e67e901c571af611f748295e559862cc1097d300f20b2f7d2c07c3e7721eef8d4a SHA512 7f2ba0cee5846fc29184a5e0c85f622828f4a1b40b57b75a856028e8b7ed1b221fe69587c9db8eb55f88869fc4beed59f84ba740b506db3b4fb427adc20845a1
+MISC metadata.xml 341 BLAKE2B be1e94bc533e24d0daae51089eb50e5e3f30db907094797872e42eefdfe7e8f6abe0f0cb7174bf650e0f20f9a5fc58a4e7243913c29f2cd7e06ca4e46bc4ba63 SHA512 177880a66033caf631d8b8c794da66a122feb891f1208fe6d6f9a3e7675f3cae22d85d0cdd1dd5c17b9098e8e38e823b96385e19f75439ea4d0b32a1f6e81f83
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
new file mode 100644
index 000000000000..2dece04e2b33
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2
+
+DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +introspection"
+
+RDEPEND="
+ >=dev-libs/glib-2.29.15:2
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+ dev-libs/gobject-introspection-common
+ >=dev-util/intltool-0.40
+ gnome-base/gnome-common
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(usex debug --enable-debug=yes ' ') \
+ $(use_enable introspection) \
+ --disable-static
+}
diff --git a/gnome-extra/cinnamon-menus/metadata.xml b/gnome-extra/cinnamon-menus/metadata.xml
index 9725f06bf81f..9f2cc8ae0d4c 100644
--- a/gnome-extra/cinnamon-menus/metadata.xml
+++ b/gnome-extra/cinnamon-menus/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>
<upstream>
<remote-id type="github">linuxmint/cinnamon-menus</remote-id>
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 1913ea8f6c08..4a82efe652c4 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -7,7 +7,8 @@ DIST cinnamon-screensaver-3.2.13.tar.gz 143389 SHA256 7b1a0c156cc0e1983d6ed43704
DIST cinnamon-screensaver-3.2.2.tar.gz 120816 SHA256 d8ec85d3b984f527790d68d61156adea84f84f35bc956d32923d5116d4937df2 SHA512 0ebc5da00973b6b7972e3f7a2ee671d204cadf25ae99af8a53fd176a5070598aaec9a0def86dca47538e6334c2b6d19db09bc0ac1ec226c85b439c0762a40d18 WHIRLPOOL dfd8ba669cd5732b5ff9e32fd9a1f5076da6da333d6a0822060340948b85aba34f043bd39a24797a7cef5ea0eb2f2e5acd931e3a76883da388bd5179f9df9c33
DIST cinnamon-screensaver-3.2.6.tar.gz 124287 SHA256 5e0795d46f5f6f93e79139e87449c8a20438bc94af67f002b1b6ba3726db4741 SHA512 78b0347e5d6ae7970d070410d0a4aac08b2dbd69442d278f4869aa636f13de19c1d03118dce2f540739c37cbeebd5fa53ebf31270033fa8393220d6c35672d00 WHIRLPOOL e52657d656a5ee3b2290270c9a3f0c54c462338f35dd6c0edf4611b91c2fb0e0693587b1d63a4a2b7cf36882c655a2a4508601d45a7f6333af98b0648861afbc
DIST cinnamon-screensaver-3.4.1.tar.gz 153389 SHA256 e25b68c74d7307eb0db30cf31d2f819981e25cf7371b339a08895c0506d55341 SHA512 3b5b35bfac37d220a260917633a2f0ed79bcc4d479cc9924a86eb73e864b2893d037eabf6c70b0ba68d93008b649399e29dd42b8490e58662db4840ee470e137 WHIRLPOOL 8704947ef29a9782dcfd82ed0da24d2d487a4b4a5b181886c1f5934e401a70a8c29aee4f10aab4ee193c7657a0da8e1ed626f302fd5a175113e2014c306a04b3
-DIST cinnamon-screensaver-3.4.2.tar.gz 154119 SHA256 9a86449eb6b2c1c2c31e3e18a336106c2fbfd0d6b68647ada1eff22867605335 SHA512 1d226f72c1f7d8e264bee8b1c175cf32866dfdbf7738383552c4d218dc6ca1f04ef37f56c91793ff42358dcf6b832ba1962b8e39129683b5bf9cd3c3c2b1a764 WHIRLPOOL ad147532cf461def895678f5be71b3807979bc0b16b232a21b94b2d61a52513044ba66601ffe622df97bb4cccf92734551d1d5631966fcefa7e350365d926ca8
+DIST cinnamon-screensaver-3.4.2.tar.gz 154119 BLAKE2B 2350f8aa1d256f964ef2da0e05b867da5a807b7799b47961e16e83fb25bdc0086b080638904b7d6dce44680640c73bcb2dc6946d2c0c7924291c9eb1aefea42e SHA512 1d226f72c1f7d8e264bee8b1c175cf32866dfdbf7738383552c4d218dc6ca1f04ef37f56c91793ff42358dcf6b832ba1962b8e39129683b5bf9cd3c3c2b1a764
+DIST cinnamon-screensaver-3.6.1.tar.gz 154729 BLAKE2B cd94413791d0500f01ec8eefc9b003e635c1bdac35d37768097ba19aff3005359e6596d3795dcf41ded9338f33dc9b68f6fdd5b7556eef9fbdcb88b8de4dd500 SHA512 9fd5ad0227993277d8ea773cbf80de7d3d7145eb38014e3673d2c31f9947dae0f45cd961077c56cd17deb6422b128ea56c909f4974ab55953bd42c63a2a2fc37
EBUILD cinnamon-screensaver-2.8.0-r1.ebuild 2639 BLAKE2B 55d73774c1515a66304c819e72d9f8286aff00bbe8da6261b5a86ddfe1aa2aaafae164a281c9c5da1004037c701e4e1e3933ba575501eff9853ae72a14dd9c7d SHA512 b3ecddf3dd1a38cbc805458ce3f2f2aa529ed7e5bff934882ebdc9c4b28ea0982e9368b88876f69ccf800d0cd9a738f4b605c40c5d5c0b45ca26a276ff26ba90
EBUILD cinnamon-screensaver-3.0.1.ebuild 2596 BLAKE2B 61a8fe3305c52c8316ad6878fce2063ea68d78c91cc4e743cc5d1a7503be4c0a373af7dc1236a81e30ac4890187b99a32833ccd274a68e54a42625db18c3da7e SHA512 8a335ff13abf3ec0bfad3d697a424e3bc088867e9aefa782c34b4a117ebf20b8443be330bf8d9524f3f119b314fa65d0a4cbe9b784becb8ecf7c743d6601b734
EBUILD cinnamon-screensaver-3.2.13-r1.ebuild 2153 BLAKE2B 05a21fa6d3129e7ba38345bfe3d7e758273b192b3b662856e4a54a90d2e973f282c4171d50d6db91237e71b357bc56cf86e8d970c2df068ee7f9bd13e70ed4ce SHA512 0ed55eaece836ebb60fad02932d8e985921a80a0c477ce1928f246f5d04c845e2c4c0ed1f2f88c8995197a546e95a57562eea0f29e138ca4363c733804d8bb38
@@ -17,4 +18,6 @@ EBUILD cinnamon-screensaver-3.2.2.ebuild 2094 BLAKE2B 5c2f6423404a45214fe43e00be
EBUILD cinnamon-screensaver-3.2.6.ebuild 2159 BLAKE2B 32d836992715ce4587caff1e0d41e2cb580a9e8966a3a58b4411c905604796e2eee84013f4ae955eaab22b38b8cec7026684d2577f0a6f2c889ddbb0e33dc57e SHA512 47ea8d306639cd452ce2bcaccc041a83cc52016ae3dfbdc670c2843c2753ae6ece01d1b3ca83d9252a2859935aca93c69800826404955b2503e43a5d17043aaf
EBUILD cinnamon-screensaver-3.4.1.ebuild 2248 BLAKE2B 0f89284cd790bb25c5a262d4c6c8e36c3f41040c01f837f91643365bc55abaada7046d21739371e51992fb8e4e24e0668ead9edc1e9bc976b8ed648b882d59eb SHA512 d5972271196e6a35911d79f4929fa55c3daf169fa8fedaa03af59b158aad05d60ec6545b48fe900384154d193b3fbc5fced2b2dce319c577278231e0b3e8cfa4
EBUILD cinnamon-screensaver-3.4.2.ebuild 2248 BLAKE2B 0f89284cd790bb25c5a262d4c6c8e36c3f41040c01f837f91643365bc55abaada7046d21739371e51992fb8e4e24e0668ead9edc1e9bc976b8ed648b882d59eb SHA512 d5972271196e6a35911d79f4929fa55c3daf169fa8fedaa03af59b158aad05d60ec6545b48fe900384154d193b3fbc5fced2b2dce319c577278231e0b3e8cfa4
-MISC metadata.xml 359 BLAKE2B b2885baaff7ed4460fb8f094b614eb0d3c9b02df68a40a45e2818e3bfd7b411085f40288464d1a5cad9c5466d91241c32e9211acf0a7687db993291b839afc8c SHA512 b14f874ee8905b318561a312337a65ca2d6dfae3cb2cdedc5466c0e22ffc7f851530e509732d38a9676f27b8623a18f7a49dd2aff6f624803f72d0a54582a75b
+EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2099 BLAKE2B a35f7f3e32850d3682b349b5c88065a608764624cb170d7a101a341b97b31465bc9b6fbec23edfae2cc0293b35e6f23f648f1703a84d6c832d3694394650245d SHA512 74d52fb6fdf937a7f5d8c891b4e5227449b87c010713b3f1484cce645f4aaeb7160a0d066cb79b473ed13b86b9003ab260d40df5750c9c0acf65d95990516e53
+EBUILD cinnamon-screensaver-3.6.1.ebuild 2213 BLAKE2B ccdcaa8a67c5d27952de8753c6030f98dab82f586a011ac801a4105f462a967506b412badae0ecd587c3ab93f58ff9c23aa99d7b6fa03be1625d735f8a3e44cc SHA512 369929a2a9acd868b1f5aeecfcb754fa5c9fdb28fd69c6dede76b2e27cedf2d3f91db5a2888ecb4863b2a395dd2ff1321415f71f8b855ef84cd6338557f03382
+MISC metadata.xml 347 BLAKE2B 773184a65ac7d37b4a3d999c2a191c93b5b02fbe7a7649132b67673d6285a7cfdddc699e18d9c30312e776c8a323d773722b45fbd75991fb46fee079b689ccfc SHA512 4467748a71035d2147a185121e657c8fa84f7d62c80c5a5bc2eadea631d1dde6c741e1e33c39f839cca9c9a48dfbad99706633bccc48af4c5009b490f353d4be
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..57085c813e0f
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd xinerama"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.3:2[dbus]
+ >=x11-libs/gtk+-3.1.4:3[introspection]
+ >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+ >=gnome-base/gsettings-desktop-schemas-0.1.7
+ >=gnome-base/libgnomekbd-3.6
+ >=dev-libs/dbus-glib-0.78
+
+ net-libs/webkit-gtk:4[introspection]
+
+ sys-apps/dbus
+ x11-libs/libxklavier
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXScrnSaver
+ x11-libs/libXxf86misc
+ x11-libs/libXxf86vm
+ x11-themes/adwaita-icon-theme
+
+ !systemd? ( sys-auth/elogind )
+
+ ${PYTHON_DEPS}
+
+ pam? ( virtual/pam )
+ systemd? ( >=sys-apps/systemd-31:0= )
+ xinerama? ( x11-libs/libXinerama )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="${COMMON_DEPEND}
+ !~gnome-extra/cinnamon-1.8.8.1
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ dev-python/xapp[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.35
+ gnome-base/gnome-common
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-proto/xextproto
+ x11-proto/randrproto
+ x11-proto/scrnsaverproto
+ x11-proto/xf86miscproto
+ doc? (
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+ python_setup
+}
+
+src_prepare() {
+ python_fix_shebang screensavers
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(usex debug --enable-debug ' ') \
+ $(use_enable xinerama)
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ if ! has_version x11-misc/xscreensaver; then
+ elog "${PN} can use screensavers from x11-misc/xscreensaver"
+ fi
+
+}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild
new file mode 100644
index 000000000000..566c3485d0d5
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.3:2[dbus]
+ >=x11-libs/gtk+-3.1.4:3[introspection]
+ >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+ >=gnome-base/gsettings-desktop-schemas-0.1.7
+ >=gnome-base/libgnomekbd-3.6
+ >=dev-libs/dbus-glib-0.78
+
+ net-libs/webkit-gtk:4[introspection]
+
+ sys-apps/dbus
+ x11-libs/libxklavier
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXScrnSaver
+ x11-libs/libXxf86misc
+ x11-libs/libXxf86vm
+ x11-themes/adwaita-icon-theme
+
+ !systemd? ( sys-auth/elogind )
+
+ ${PYTHON_DEPS}
+
+ pam? ( virtual/pam )
+ systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="${COMMON_DEPEND}
+ !~gnome-extra/cinnamon-1.8.8.1
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ dev-python/xapp[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.35
+ gnome-base/gnome-common
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-proto/xextproto
+ x11-proto/randrproto
+ x11-proto/scrnsaverproto
+ x11-proto/xf86miscproto
+ doc? (
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+ python_setup
+}
+
+src_prepare() {
+ python_fix_shebang screensavers
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(usex debug --enable-debug ' ') \
+ # Do not use --without-console-kit, it would provide no benefit: there is
+ # no build-time or run-time check for consolekit, $PN merely listens to
+ # consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ if ! has_version x11-misc/xscreensaver; then
+ elog "${PN} can use screensavers from x11-misc/xscreensaver"
+ fi
+
+}
diff --git a/gnome-extra/cinnamon-screensaver/metadata.xml b/gnome-extra/cinnamon-screensaver/metadata.xml
index 0c72d1717c58..00e290bb5707 100644
--- a/gnome-extra/cinnamon-screensaver/metadata.xml
+++ b/gnome-extra/cinnamon-screensaver/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>
<upstream>
<remote-id type="github">linuxmint/cinnamon-screensaver</remote-id>
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 3bfed63ccdb9..7b7a2e2f4ba3 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,15 +1,19 @@
AUX cinnamon-session-2.6.2-automagic.patch 1913 BLAKE2B 25af28ac4f088730396f2fb4837cbe854abd8ce9ec21930dae88c18fd4c1b92a12632183e4d828584d7eaa2a262dcf2a75584ec277712f266d47f0a7ec90a55f SHA512 fbeb1a7a5d05e3a7f2f4b65dcda39f78cd5168975b7ade9cc379a51f4c05d12ab97161b68dffef4f37e598199d71a4c7f4c2321cf826b02761ecf72d37ae3a45
AUX cinnamon-session-3.0.1-automagic.patch 1470 BLAKE2B 799b731979f9a5326d61ec130db092a6b52d10eb0f434302b49fa0996fc9b6c3073ff312bd5f84faf1b12936919209db6159a7ad235f765af78b622b06b700db SHA512 571cdc733a66821abd927a7132bc27ebbc214023eb6c2985213409272d11baad1f734350d2a0853c27ebc35a059ca9d3766c4db658b558e013d5850a13f5e971
+AUX cinnamon-session-3.6.1-elogind.patch 1948 BLAKE2B 616dde6cb6612126074524df8662fc30cf59c126a37cfa9d82b09c086d31f47af64d9f96210a8d430b9eb3aca7279b93ce38f31e4574274064d103dc2f142b97 SHA512 ad8c067514318c126aab6d72da7004a0c07964cb9cac8c3763ec39b07d222a9dd6425eb464f1f0047d55c61f8a335611bd46e1546e2f170b43959207ff98c75f
+AUX cinnamon-session-3.6.1-elogind2.patch 743 BLAKE2B 4827c2cc5c8bcb74b0a31dc81c4fd4a25ade00f3a22371627cc3bdb5e3fb4476f7b66954ab6101681bef04bd7e38531851f2e371e6dee32c6294fc6f6faa240c SHA512 03e7beeaf6a93aaedcbe070c6182d3fcc898bd8410a65c63a9c5dcce310e97a4a4654e88e91e7aa7d8c12eef12d8f02eba89d8e007842c27d04dc9165c642de3
DIST cinnamon-session-2.8.2.tar.gz 591438 SHA256 0a7236c75fef67c1a1c173e184c083ff2879e870428bdc3cb53a892cb0bfaf79 SHA512 4f713cc5d9ec21bb118a2761792b1a86b43c386e0042f3f1c57ab6fa01fb7fd34463d83e63c794950dfe8358e757277a87d649340cda33f72fe4c89c7cf099bc WHIRLPOOL 6f202a79a27cdf6a8bbe1ed62d5b4a6c6edd5746b8b50a448fc8874cb5de4b45c4201e1bce25760072ee2874438e87505405810b45c7e10019fdbfc4c7cc9b6b
DIST cinnamon-session-2.8.3.tar.gz 591500 SHA256 306eb9448500b15b0d06826b66f438d767d001b706fd345c53b4a91d308ae4a9 SHA512 a581af6a00a5273ab4cf7b91ac4770b78d8ab670cf238c396e2087113795de059b4eaa3abcc8440b5eaa5cf0c4edc9696b183f9ce81803af36b9a3a37b5d5977 WHIRLPOOL d3c9d0f6791522c2c24801faacb0a5be34d658cceeaed2459d5f006c24e683d1ea39876045c505dd526ec972912e6c8bde8fffe703da6fa0f69a43f2e579ab61
DIST cinnamon-session-3.0.1.tar.gz 592265 SHA256 d8935747bc8aa70518e70a7d338eaf9109b5307d8a44d49dc57e0f15d69e9c89 SHA512 cdbf9f910954976854aa1b90033781269dc9d521b86edd3e97ae936b59a9ac4ffa956ba37a51ba11beac73e38a732913ce147557e999484bd68529677eed21e8 WHIRLPOOL 9af4cf92685e6a07220779ed8ef73c7435dff08e3771bbc87994d5294f998129b0d114a3092987b8fc59b49f936616d135ca59327d9979c70d9aec55238a0332
DIST cinnamon-session-3.2.0.tar.gz 595530 SHA256 d7c3d951ae0dddef96941c9f08f028a099443888db41981524f618a92624e0ca SHA512 00475069849c7bb1d874c65200128128068e6500475c61053f07deabacb98046bf344ab5d3b4537487c48103dd6c6a8316d1326396e606a0d44bc486db9267d6 WHIRLPOOL 1753d5f99a98b718e0db8b945e94ade2c316bb7965943f2b1605b10dcc08a5e74661b4b7edcf8afdceb167c0ceffd57a0f97612c2638b13278240f695fae344e
DIST cinnamon-session-3.4.1.tar.gz 595567 SHA256 20426fe91347193b13ede47d2b2f14af4321f95274267304dc9844e2a5178948 SHA512 caac3b445e2dca8e040bdb215e8aca833cbcdb77611e435aab5ebcd4b0f9b6bddb117d97763d26e99d42bbacb7ec51171e6927d87dbdd7d6ed0f5287648dee0e WHIRLPOOL aaf997cc1c6b62484be5e466b5d80f221e62b80a4d65e8ec91f5bd51e429df71154ceb5be742a5a3fdb8affebe5407339b4a8eb1593f1ec70909c3e7dabb4e50
-DIST cinnamon-session-3.4.2.tar.gz 595721 SHA256 bfeb8a73cc8c7d9dfd728d34df0f578bd2ad8ed88f7de9d7cd5d3ae08f454530 SHA512 4a2f49f1717418a7d87df5f46e47c9d3a95bc4484aad6760e5391289100ebec734a300fd2540fd4ff0385a5169c15c01c081a002cc842d9d57d817d15dd6963d WHIRLPOOL 7b4cc7c37b7ea02de59923752064edede742a9619a9dee86776475149cf3aa602d358b50cefa94601c8343119651792644f86f50ed27dacfb324b94fefab70ad
+DIST cinnamon-session-3.4.2.tar.gz 595721 BLAKE2B 7f50d208d6928144a6b47153fd21f4a90875eec8b37fac5b4efb3d7a70a8806561710a10568a2f597ff5f471e8a4d2deb6ce9e233d8c6a0616c966a7c74ca654 SHA512 4a2f49f1717418a7d87df5f46e47c9d3a95bc4484aad6760e5391289100ebec734a300fd2540fd4ff0385a5169c15c01c081a002cc842d9d57d817d15dd6963d
+DIST cinnamon-session-3.6.1.tar.gz 205682 BLAKE2B 5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4 SHA512 a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137
EBUILD cinnamon-session-2.8.2.ebuild 1582 BLAKE2B dcfd8b604c2d7a5c01c041f0539624c191e81ddaf3cbdb0b6564fcfe4c3305ddcd2bffcdaa2bea947bd2a5218b4e9287cf78aed542187043641c3423ed11ca3d SHA512 80076e1274b641acfdce833baf0bab4d6bb07a2736cef07d9654c5c300f186680b4fba99663d7a398365e625dbfa03ed49355db00b917bb42cb8411e1b3c6acd
EBUILD cinnamon-session-2.8.3.ebuild 1514 BLAKE2B 2cd4bccadb4525a42203cd8fda3686d36cb279ddb0fddce7ba1f3e5e0314433540d5c8e240b585768d076f2c49d7ebd56a596916978513d5079f27c6d44326fb SHA512 b98dd92afdb560fc56cf3a2c099107f5db639cd417f9b235bcd4671a95ecbbad76439e6bf2f97aa0e2db62a542f60a060c8c7769cad99d359387b4665291a4dd
EBUILD cinnamon-session-3.0.1.ebuild 1514 BLAKE2B c11e91af2692addda8cb991216b4bcb199caeb84833f2e76bb42dcc5415ed92dce35fbc82a8ff54d27550706f915f33e5f742d32bbd695e9d0abb00ef8fd0b7d SHA512 fc351c3e943a366a4f21c08c046c6f0e3d44e11064c233f8c9465973aabde43f96369478f5cf46700d7fbf39315197f73601baa1a1fad42d9be12ecfe08a0d11
EBUILD cinnamon-session-3.2.0.ebuild 1516 BLAKE2B 0ae4a2d7091ae89542a9fe48c49ee107acf352c0844c7a7aa7ee1a704329616aebc6287fcd97705b7f6a3978644e36cfad4e81d7c5bbafd0d9958839b2ff1419 SHA512 5bcf426ccfea1d07cd8679a52e4c9bbb45301459f425e549b4fc700c8a9fd47aa0025390dd3025ee6ac48692467cabc2591ac817e4a7d229e9ea64a140a1d7e2
EBUILD cinnamon-session-3.4.1.ebuild 1516 BLAKE2B 83488fb908998effe8ad1ac8e3f45b00fc941b6d34cba67d1996808ace9e9aad38f32601ebc3e731733cf4cbe47edaab0bdc5c2f2cd3126a0375a89c0b4bee37 SHA512 9d0aec5ac77901ba904bbe8f7fde160b5d4d993b779f5708dbbf7c2e783e873052b6470ed4099a7ca516c55fc0cd9d11a396d7c2f8b32fc5d0a5bd08abadf740
EBUILD cinnamon-session-3.4.2.ebuild 1516 BLAKE2B 83488fb908998effe8ad1ac8e3f45b00fc941b6d34cba67d1996808ace9e9aad38f32601ebc3e731733cf4cbe47edaab0bdc5c2f2cd3126a0375a89c0b4bee37 SHA512 9d0aec5ac77901ba904bbe8f7fde160b5d4d993b779f5708dbbf7c2e783e873052b6470ed4099a7ca516c55fc0cd9d11a396d7c2f8b32fc5d0a5bd08abadf740
-MISC metadata.xml 355 BLAKE2B 555425fa429a3dc1dc1e04f6dea7fa9ef7bce524b1c4c3ad9e998c464337a90874ce8be7621b8fb6a99ebddd07df3f5a66af41641acf6d592775c69943b92910 SHA512 5ab00ed770845599d3afc384ab32fc886c4626cb1492ef0db65d9202c15c17d09e759e646a05a00f825b4c47c906e4d185cbff2b8a2fa8ba63d739b69d9faccb
+EBUILD cinnamon-session-3.6.1-r4.ebuild 1542 BLAKE2B a478ffe7d1da51f01583e94a8478749296c5922e878598d8ec4d402e9e27de58f4f5e779d1bff1ac0becb00f1fbd9dfd1d39da0a0d654477d3f781a8ff49abd8 SHA512 9744d0854472e0fd449a3261c1113ff2085f2fd1c1584cae513daab89e91843b06cc977bea8722416d80c5a69aa209a6ba6af6cec2ee3942f6fa9eaf92cbf564
+MISC metadata.xml 343 BLAKE2B 6526f06bd8b9c250154c56a126b12c40b9c61fc52b6d4175f9b5e86e3a3ef5b1eba4af9db0b9ef768aaac361e941f2ab93f4e2d6291afb5cc1657c20f69d825b SHA512 dbdf14a6641b809dcdf364577f4e9ca9ca31d6db62a74f74bbbf1f5ee962e69452fb027098735bda31138c27dd43692b78915eca1ad40ab5a29938a28a56b610
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
new file mode 100644
index 000000000000..d5da4702700c
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 systemd"
+
+COMMON_DEPEND="
+ >=dev-libs/dbus-glib-0.88
+ >=dev-libs/glib-2.37.3:2
+ media-libs/libcanberra
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3:3
+ x11-libs/cairo
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXcomposite
+ x11-libs/libXext
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/pango[X]
+ virtual/opengl
+ systemd? ( >=sys-apps/systemd-183
+ sys-auth/polkit )
+ !systemd? ( sys-power/upower
+ sys-auth/polkit[elogind] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ >=gnome-extra/cinnamon-desktop-2.6[systemd=]
+ !systemd? ( sys-auth/elogind[policykit] )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40.6
+ virtual/pkgconfig
+ doc? ( app-text/xmlto )
+
+ gnome-base/gnome-common
+"
+
+src_prepare() {
+ # make upower and logind check non-automagic
+ eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
+ eapply "${FILESDIR}/${PN}-3.6.1-elogind.patch"
+ eapply "${FILESDIR}/${PN}-3.6.1-elogind2.patch"
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-gconf \
+ --disable-static \
+ --enable-logind \
+ $(use_enable doc docbook-docs) \
+ $(use_enable ipv6)
+}
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch
new file mode 100644
index 000000000000..fdbda72ca22e
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch
@@ -0,0 +1,65 @@
+diff --git a/cinnamon-session/Makefile.am b/cinnamon-session/Makefile.am
+index 789d47d..d8093d4 100644
+--- a/cinnamon-session/Makefile.am
++++ b/cinnamon-session/Makefile.am
+@@ -71,6 +71,7 @@ cinnamon_session_CPPFLAGS = \
+ $(XEXT_CFLAGS) \
+ $(GCONF_CFLAGS) \
+ $(LOGIND_CFLAGS) \
++ $(ELOGIND_CFLAGS) \
+ -I$(top_srcdir)/egg \
+ -DLOCALE_DIR=\""$(datadir)/locale"\" \
+ -DDATA_DIR=\""$(datadir)/cinnamon-session"\" \
+@@ -91,6 +92,7 @@ cinnamon_session_LDADD = \
+ $(UPOWER_LIBS) \
+ $(GCONF_LIBS) \
+ $(LOGIND_LIBS) \
++ $(ELOGIND_LIBS) \
+ $(EXECINFO_LIBS)
+
+ libcsmutil_la_SOURCES = \
+diff --git a/cinnamon-session/csm-systemd.c b/cinnamon-session/csm-systemd.c
+index cef991c..dc2aa2e 100644
+--- a/cinnamon-session/csm-systemd.c
++++ b/cinnamon-session/csm-systemd.c
+@@ -32,7 +32,11 @@
+ #include <sys/types.h>
+ #include <pwd.h>
+
++#ifdef HAVE_ELOGIND
++#include <elogind/sd-login.h>
++#else
+ #include <systemd/sd-login.h>
++#endif
+
+ #include <glib.h>
+ #include <glib-object.h>
+diff --git a/configure.ac b/configure.ac
+index 38db5a3..8dafc6a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -113,15 +113,23 @@ AC_ARG_ENABLE([logind],
+
+ have_logind=no
+ if test x$enable_logind != xno ; then
+- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183], [have_logind=yes], [have_logind=no])
++ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no])
+ fi
+
+ if test x$have_logind = xyes; then
+ AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
+ fi
+
++have_elogind=no
++PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
++if test x$have_elogind = xyes; then
++ AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported])
++fi
++
+ AC_SUBST(LOGIND_CFLAGS)
+ AC_SUBST(LOGIND_LIBS)
++AC_SUBST(ELOGIND_CFLAGS)
++AC_SUBST(ELOGIND_LIBS)
+
+ dnl ====================================================================
+ dnl Option to disable DBus user session support.
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch
new file mode 100644
index 000000000000..a58703bc1bf3
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch
@@ -0,0 +1,21 @@
+diff --git a/configure.ac b/configure.ac
+index c46b35f..5bde44a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -113,7 +113,7 @@ AC_ARG_ENABLE([logind],
+
+ have_logind=no
+ if test x$enable_logind != xno ; then
+- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no])
++ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no])
+ fi
+
+ if test x$have_logind = xyes; then
+@@ -124,6 +124,7 @@ have_elogind=no
+ PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
+ if test x$have_elogind = xyes; then
+ AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported])
++ AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
+ fi
+
+ AC_SUBST(LOGIND_CFLAGS)
diff --git a/gnome-extra/cinnamon-session/metadata.xml b/gnome-extra/cinnamon-session/metadata.xml
index 01596926d67b..ad3cba8d7130 100644
--- a/gnome-extra/cinnamon-session/metadata.xml
+++ b/gnome-extra/cinnamon-session/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>
<upstream>
<remote-id type="github">linuxmint/cinnamon-session</remote-id>
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>
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 36165764170a..eb61412df90d 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,7 +1,9 @@
DIST cinnamon-translations-2.8.3.tar.gz 7701375 SHA256 8585670a2765ac6580b98477b2eb02ed3afe64be0ba09f8c3e61613c0a987cad SHA512 9902d79439624e4fb445cb41f6ff55076875fd9080abaf6c3debc7dfad0ea94d0d611bb6631717e4e15cb2b817d0e454df680d8c55d3a678acc87c04bf443b22 WHIRLPOOL 6984aef96d872a3e2cbe3b912ca2555ab44853d306a37c6e55d368438848fbef4aac01dd73d513cf386ffd6909fd64b448cfe98df18de7d371021f7a45d8a200
DIST cinnamon-translations-3.0.3.tar.gz 7938822 SHA256 5f8eeb3c2d4af9ecd6a42cdf79cea6e6c92194aad6d37cf0a37724505da971a8 SHA512 f639f310a954a3b310117d324cdc627554b82833ad66b76395e8ead26cf8337998b665bea92c4263c20275440e6fc529a4b770e85d12d84b8b74529154c29b0c WHIRLPOOL ff9f0cdbdad0a01f64a851547bb3451b7b89e65b89816e113abbea42d48c672615445794e8e242367701a93c80daccb1af1028841039866ea55b2a7371787212
-DIST cinnamon-translations-3.2.0.tar.gz 7938813 SHA256 18cfe229900979b35686c638ba00530e88be33aeb473364067daf28b22aa9ca8 SHA512 3bdb2b50afac2d2b1d730c86168294d5e32b24f3eda38722d019c912805d2238559b31260e496debcb84e872d65dc5f7e12d4223e3b1006067616c5b83ed934c WHIRLPOOL 8de63a42fa0d408dc7c57108ea9457b5e0790dce66808b79071a4bc988ba4f31f39988f2247e9be51898654a8929e692d86f32e52a85408f9a9c0b549e566723
+DIST cinnamon-translations-3.2.0.tar.gz 7938813 BLAKE2B 12d3b4ce6fc41e5e224a0681f6133ee3f8e701b24eb420b38401969d5474101ca68b08b20f5195fabcba581bfe9f0afb5b3d3b01518f1ae4abe4488f585714d7 SHA512 3bdb2b50afac2d2b1d730c86168294d5e32b24f3eda38722d019c912805d2238559b31260e496debcb84e872d65dc5f7e12d4223e3b1006067616c5b83ed934c
+DIST cinnamon-translations-3.6.3.tar.gz 9486325 BLAKE2B 75d25beb66dc28565eb6d61f64df66e69de347ffe01984d9958b3388109d7e89f839205913432d7d68a7fedda743d4de52d63b1d95fc54ff77a8b80501d7e668 SHA512 274ad790ad9e8bc1d424ce45ff426ebdadf868bd48c065a21a8be014cabc889927974de5eb56ef909317bcecf4a0ca9e98af8ba3ade08c903fa286c93e05f695
EBUILD cinnamon-translations-2.8.3.ebuild 1332 BLAKE2B b43c026ba0fdceb789f88acc3d7168786bca3890800d149fedb649541e66223c58001a05be03ca309285d3ef62e484916ce2d12700332bdca15ac85ed3ec8cbd SHA512 c67ca8b9b34a5325bc3270e63361a6d88abeb9bbf74e221864a5c5a78498dc65d8c59263ba349b2bd112d375cec0164c2fc9c511f32bf671e44fa644c9e3df90
EBUILD cinnamon-translations-3.0.3.ebuild 1309 BLAKE2B a97b741cada86a5c09c99d1db2001ec18ba44ebdfd5836c4c4130342c73feca67e38ecc73bf21baf6934b130acfdd021b2a9d1e04b35bf5a95191f434288bc8a SHA512 ba36f43ca6821aec047aefd7f974ead3691aac0f9c2cee1c38bab8b0ebc9ee9dff2d023f2c9e6358ab5138279900711ae0d80993630f82b5907ddd1fc55d91c8
EBUILD cinnamon-translations-3.2.0.ebuild 1311 BLAKE2B 0780f240e548eb7fc86d4b7dfa715aa8d0e14b715f4b99b76accf6f01a7071a0fa473c8ff6eb6b25725183332e0c590091c2b4ff4134aff4263d83eb344c3cf3 SHA512 b30dae34a0203b22459f57a58dd0a97ec0b69ce64ef1447a2d5db1cc7cbe314a4e2da1570989ffb73cc495b647818f87d244a0f0e009b4243d2bb562b86bc908
-MISC metadata.xml 360 BLAKE2B f510bda8ff259a431d4d43b1f6f240fe1eea90847c1d5ae67b76d2c423dc746b30b7110a542cf473a6a99739a80e73f01e080fdea3cdba2f888fbc8911d7f9c2 SHA512 67ed344e9ed1fa6fe0aa85938b73ee6e7f831d260b3de3c23f7a06d1fc30cdb7a2770e40ea083d187794af7c08adbafee3679c7731bfc29a0e5995586f1817bc
+EBUILD cinnamon-translations-3.6.3.ebuild 1311 BLAKE2B 47adf6112af4f2714bb642578da9a472e61d8f30e7de32221238afffd303b17e28121e2f61067bd83c2cbaf356c98113e81bb9093b670f011f61ec8c988a23ee SHA512 f0ea9dc68aa34ccd97a99691057a7ba0524a4c07b8bb8a5cf73ac6f203738b5fbe92f07e8faf4adaebd2c4f8c3975394c129abb8a17d0b97c0051e3df5dac9da
+MISC metadata.xml 348 BLAKE2B 22e9f760365b2c7e8aee07556c723590b93f615fcab90c687dbaa55f4a32262ef29b1d576f68830caf6c21a315e87009c0101b98fac856c70d88269a12bdc251 SHA512 357310d45466db6b2f600aacce60220f88810d91ff228bdfb874c3f3c7148c6ad599c11d87c63e1b2650361361e6a3accce18700aa15046322514f5065cd0777
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
new file mode 100644
index 000000000000..832916ae5f4b
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
+
+inherit l10n
+
+DESCRIPTION="Translation data for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="test" # tests are for upstream translators and need network access
+
+src_configure() { :; }
+
+src_install() {
+ # Cannot run before since locales are not in the expected place for this to work
+ l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
+
+ install_locale() {
+ dodir /usr/share/locale
+ insinto /usr/share/locale
+ doins -r usr/share/locale/${1}
+ }
+ l10n_for_each_locale_do install_locale
+}
diff --git a/gnome-extra/cinnamon-translations/metadata.xml b/gnome-extra/cinnamon-translations/metadata.xml
index 6f03e8fdd7ef..d5f1fb8d01fc 100644
--- a/gnome-extra/cinnamon-translations/metadata.xml
+++ b/gnome-extra/cinnamon-translations/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>
<upstream>
<remote-id type="github">linuxmint/cinnamon-translations</remote-id>
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index f6a1424afe58..0fcf3165db44 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -2,17 +2,20 @@ AUX cinnamon-2.2.6-automagic-gnome-bluetooth.patch 1715 BLAKE2B acee6063acb4c0c8
AUX cinnamon-2.6.7-optional-networkmanager.patch 3508 BLAKE2B a05bd853166e8e6b2f7598c7f3de6ad817d4603a3b14f64b10e966846ae4f3894de52b80126d0969e549e19262870c56410851cc61faedd90bbfb71b946b5480 SHA512 3798c0e616297390db3a5006ca7616546979796b0665496536c58745c97b05bed6fb363e73c0ac0ef83d024cd8d5f3faa309df1c5acc8f5efd481b8bc9b43a5c
AUX cinnamon-2.8.0-background.patch 1106 BLAKE2B c3f42ba7e5f298b4345701536d7045cb4b224f4c22645135083ebccf5211bf33eaf61f95c639737561208e7dc10cacc54e900f93a18d73d0aaf90967192dd3ae SHA512 2affc6ab9b9b1f444fb5fec752e4d90cd7716986e5c48087c6e2bc9820792547fc1f6aca66d096ec056aaa0010c023fca2c88f6828320fb575a0fa2e56b22995
AUX cinnamon-2.8.3-set-wheel.patch 2637 BLAKE2B 63f9b73909ec386337e85889b52fe570ff0a1e8bda28f68b989c1b07956396224d9425357c263f16186da69253623cd776c89251a424308bbf8b936a7be62bf0 SHA512 cff8fb42a81d71b929327df5d56a68b68a96e79d4b85125ea7de0ed2dca53c6b45d08deccafa4453a7471f52aa6bf7d39ed979d2a085906997969a63e7dd7a8c
+AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2c887cba6c085d8e8f299810aa83fc83f3e72f8855c40e74637a0453f0fc6b47d972d1a54280ea2eb5538dbe08e7dccd49 SHA512 e59432ca4463652eb5f47075898b78b9025c3a83ca4a305a2c545b9791f8e715cb96c54c550175277dab53cac0f5a6c9fbf78352a09ac977a192e75e800ddb74
AUX polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01d0286e000997e91cea344a4d4ac8d2073d4f268e2e58791d675e3e3f869dc792572c743ff01bf0e92ff87b85686e5a63f0db646b2bf8fbc SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db
DIST cinnamon-3.0.7.tar.gz 3065791 SHA256 0aa0ce174a4638f54ddb2f0dc1f93a847678fa225c7a4fae718ffd14f1c8694f SHA512 db3f2532525c71b0841ce22245518502f8e905fd353c22e41dc57551cf68422ab6b53a57e4089664e8db9035a7723214756de78d2b5d5a92e11515216b15afbf WHIRLPOOL 7f7e0f3841d8790f332342e9d0696c8f70e81657ea02e1374871505be1c5ecdb7e9d4fc4fd0d600bf69fcd856123a58d5b272b4de03f9dd7d4c7d3d8278154b0
DIST cinnamon-3.2.0.tar.gz 2216495 SHA256 c1473aabb01329c07bf1e28148cb410255700f4dd237195b7790e9bcdb69b89d SHA512 340530d77e68a5680cfa44afa3efc157552a7319f9badb251456d43e4e0a4e8c7cecf8e273c6cedec05e8248d68bbbdca2f8bb9d1766c418a6bc10d386e38302 WHIRLPOOL 58c749c9679f582a7ef088f4a8026d7027c84368be5d2c07ba9dd29c9a0781ad962fdbb4342538bb3b801f2fce60c483a0b806008e6fecb2698b367969aefc52
DIST cinnamon-3.2.6.tar.gz 2225445 SHA256 ab2e5681e4780e065ebf4aebf4b909e9b723a69d7d437ea490c7a9a39ffce8a5 SHA512 b21f762341c523a0292de27e37b664e758adafeeb658bb056a08f5aa3ec6c29709cf9db78ab48a9ab21982b7e1bfc0674f79395995348ff0b877c2c04e7038fb WHIRLPOOL 2d1c8c7662a3e76dae733300a86057962a159ad4fd7946f73b84bfdf624d6c6fb23b863847786879233d7dd2f3a8bc037c64fb065977732259f0c3b60857039f
DIST cinnamon-3.2.7.tar.gz 2226152 SHA256 69ab4510e4239f577a7acc7ea987d0522caa9796bfaa4a062a5009009ebc5a80 SHA512 0da8ddb6e894b5ceda0cb92dc54e6b42618425f3b993b551b49aafbd4b9db95a6023083151fae75b9e60413484ff5235ed5058e9b2178c65dd108f806defe4df WHIRLPOOL fd3a0bbed451ca26844b9063d2a82aef7151a554a33522d5d765c4c871871d7a73ea9f4f5768f6d6135d45fd626fd871dc1cff4bcc5ff2f028694bc792207942
DIST cinnamon-3.4.2.tar.gz 2213346 SHA256 182ed619f92831b83e9bfd89803bbd750c6cb0ee9d097120cdd40eb19d41e302 SHA512 dee9027788a2e8c9b6d536d27f4afcf28434ab7e52bcd0d26a6426f010f64ac6d3c29e7f225dae794e8215972d744d2eebb7fb9c102451269498a663e4c5dfb7 WHIRLPOOL 27a508e693d32c1c297df545028ca3737a15e91de197f52fbb41854b3b1f7aa813e20d6062fb1ece432166004651c4cf17d38551a1e79bc2ea1c1f652d96b76f
-DIST cinnamon-3.4.6.tar.gz 2217209 SHA256 857cd68ca4744332e9b20456ae3a0d63ee8a3eacd108ec82dd26b124765a45b4 SHA512 b5fa337dc236204a09a3650ca40d2c2a996c9d1ff6f789834e757d50d68939914bf56d2d623ee5b6e57a180c02b803dbae6349ce1a9dd969b7a4c8bad1b9d8bd WHIRLPOOL fcc2d2ea60099e021e6a761d7a519bc773430d128506d38f0d7653d586d79c3019af8c739b2b013dc3faadfbecae8643f5aa87c4137e9da5098e337623620f4f
+DIST cinnamon-3.4.6.tar.gz 2217209 BLAKE2B 87a01ffe8806fd7d252035533be25bd197e06f29f02644197132a9d5fa3eb766760fb0df5fc00c61e5f35b3d45b8464824def510e233fa93c84038c28aea5ccc SHA512 b5fa337dc236204a09a3650ca40d2c2a996c9d1ff6f789834e757d50d68939914bf56d2d623ee5b6e57a180c02b803dbae6349ce1a9dd969b7a4c8bad1b9d8bd
+DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642
EBUILD cinnamon-3.0.7-r2.ebuild 7951 BLAKE2B 3614bf01d70a45130805ce0065d2e82e6a91295dd7d5b0439b1c4763957ca08aa3a95ad0decad80ec5e62e8055d28685a23dca3e012f6dcbbe73243f480915af SHA512 3a838d7a9ba30a4d6bd55be5be0ef1ac86f25607ac13c274eccd7154fb5a87feb0526c4d9ab5b306db404181dfb4414211b30ca9bc6a07d5a63c43317ef95c4b
EBUILD cinnamon-3.2.0-r2.ebuild 7913 BLAKE2B 60f0cf065601cf95b9b870b6a6771d0cb69c6f4a91ce3bd52033fbc1102f6655004c647e7079d6cc7038357ce2ea5c8647ebe5a68abd2e5596c0fe80260ae4c6 SHA512 8f2f6b7bb9de2e6ae58f2f3135f26e75768463497faa0f8623bd807d0a25a8ce29d216e27db6ff9b71b7f17b2c0c64b7ccdd71e19ef78dba9c265be2a37238f6
EBUILD cinnamon-3.2.6-r1.ebuild 7914 BLAKE2B 39a36d52cabb14fd6189cfa135af8bcedf21797d0cefff2d8c91fefc0d687d8fa341524c23e0bf6411210bf05c9ff7632677ddb3d7d410360c63a8735419ef76 SHA512 48b49241719827b0e283d65d9164a1e4f780de70ebb3f8d82dc3e74b9572552506c1e5f6df43553bc446f33d45802889b1f8828f753ddd19955d99cfdb1bf3a0
EBUILD cinnamon-3.2.7-r1.ebuild 7914 BLAKE2B 39a36d52cabb14fd6189cfa135af8bcedf21797d0cefff2d8c91fefc0d687d8fa341524c23e0bf6411210bf05c9ff7632677ddb3d7d410360c63a8735419ef76 SHA512 48b49241719827b0e283d65d9164a1e4f780de70ebb3f8d82dc3e74b9572552506c1e5f6df43553bc446f33d45802889b1f8828f753ddd19955d99cfdb1bf3a0
EBUILD cinnamon-3.4.2-r1.ebuild 7784 BLAKE2B 2f0cb390f83b94c46b0bd34544a90f12342445ed4dd0cf0b8f90b170aa2a81cb29d596a0d17ffffd983032f422bca2d8cf19286f55770f1b410a246cafdaac1b SHA512 1aea09dced11566564f1ed15b450f320bda11dcd3673530989b242093e08a8e1d42cba47fafe3e226240d0173b2a725fe2ae8e1a4826a5b5c772a7f302241c45
EBUILD cinnamon-3.4.6.ebuild 7784 BLAKE2B 2f0cb390f83b94c46b0bd34544a90f12342445ed4dd0cf0b8f90b170aa2a81cb29d596a0d17ffffd983032f422bca2d8cf19286f55770f1b410a246cafdaac1b SHA512 1aea09dced11566564f1ed15b450f320bda11dcd3673530989b242093e08a8e1d42cba47fafe3e226240d0173b2a725fe2ae8e1a4826a5b5c772a7f302241c45
+EBUILD cinnamon-3.6.6-r2.ebuild 7644 BLAKE2B 637db1083bfc8644e853da4884c8a13a672326bd05f545f109d461c35d84a368f974895b781ba40373a0f4e22d5e1c9647536dc4427b7f95db8afbde8cef7282 SHA512 871c8a6a231ff26911a32434c7cec629a900c030f638a2aa4f31b818994556b79dfaaca87931118ca444c40c3c11b79a2afb5c434ed36aa63899884464243d69
MISC metadata.xml 335 BLAKE2B cb8a6325c1c826a1e7024b00fab8c93eefc54517d38b642b9df3041efbe37864a53ae0258d5a374aeaf83afe3e5a9b442359e1058765aa74ffb042b0306f50dd SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb
diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
new file mode 100644
index 000000000000..25619ca438c4
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://developer.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# bluetooth support dropped due to bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.x and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( $(python_gen_useflags 'python2*') )
+ || ( $(python_gen_useflags 'python3*') )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-accessibility/at-spi2-atk:2
+ app-misc/ca-certificates
+ dev-libs/dbus-glib
+ >=dev-libs/glib-2.35.0:2[dbus]
+ >=dev-libs/gobject-introspection-0.10.1:=
+ >=dev-libs/json-glib-0.13.2
+ >=dev-libs/libcroco-0.6.2:0.6
+ dev-libs/libxml2:2
+ gnome-base/gconf:2[introspection]
+ gnome-base/librsvg
+ >=gnome-extra/cinnamon-desktop-3.6:0=[introspection]
+ >=gnome-extra/cinnamon-menus-3.6[introspection]
+ >=gnome-extra/cjs-3.6.0
+ >=media-libs/clutter-1.10:1.0[introspection]
+ media-libs/cogl:1.0=[introspection]
+ >=gnome-base/gsettings-desktop-schemas-2.91.91
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ net-libs/libsoup:2.4[introspection]
+ >=sys-auth/polkit-0.100[introspection]
+ x11-libs/gdk-pixbuf:2[introspection]
+ >=x11-libs/gtk+-3.9.12:3[introspection]
+ x11-libs/pango[introspection]
+ >=x11-libs/startup-notification-0.11
+ x11-libs/libX11
+ >=x11-libs/libXfixes-5.0
+ >=x11-wm/muffin-3.6.0[introspection]
+ networkmanager? (
+ gnome-base/libgnome-keyring
+ >=net-misc/networkmanager-0.8.999:=[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
+
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+# user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+ >=gnome-base/dconf-0.4.1
+ >=gnome-base/libgnomekbd-2.91.4[introspection]
+ || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+ >=gnome-extra/cinnamon-session-3.6
+ >=gnome-extra/cinnamon-settings-daemon-3.6
+
+ >=app-accessibility/caribou-0.3
+
+ x11-misc/xdg-utils
+ x11-libs/xapps[introspection]
+
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
+ $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
+ $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
+ $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
+ $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
+ $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
+
+ x11-themes/gnome-themes-standard
+ x11-themes/adwaita-icon-theme
+
+ >=gnome-extra/nemo-3.6
+ >=gnome-extra/cinnamon-control-center-3.6
+ >=gnome-extra/cinnamon-screensaver-3.6
+
+ gnome-extra/polkit-gnome
+
+ networkmanager? (
+ gnome-extra/nm-applet
+ net-misc/mobile-broadband-provider-info
+ sys-libs/timezone-data )
+ nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+ $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
+ dev-util/gtk-doc
+ >=dev-util/intltool-0.4
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ gnome-base/gnome-common
+ !!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+ python_setup
+}
+
+src_prepare() {
+ # Fix backgrounds path as cinnamon doesn't provide them
+ # https://github.com/linuxmint/Cinnamon/issues/3575
+ eapply "${FILESDIR}"/${PN}-2.8.0-background.patch
+
+ # Fix automagic gnome-bluetooth dep, bug #398145
+ eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+ # Use wheel group instead of sudo (from Fedora/Arch)
+ # https://github.com/linuxmint/Cinnamon/issues/3576
+ eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+
+ # Use pkexec instead of gksu (from Arch)
+ # https://github.com/linuxmint/Cinnamon/issues/3565
+ sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+ # Add polkit agent to required components (from Fedora/Arch), bug #523958
+ # https://github.com/linuxmint/Cinnamon/issues/3579
+ sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+ files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+ if ! use networkmanager; then
+ rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+ fi
+
+ # python 2-and-3 shebang fixing craziness
+ local p
+ python_setup 'python3*'
+ for p in $(grep -rl '#!.*python3'); do
+ python_fix_shebang "${p}"
+ done
+
+ python_setup 'python2*'
+ for p in $(grep -rl '#!.*python[^3]'); do
+ python_fix_shebang "${p}"
+ done
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --disable-jhbuild-wrapper-script \
+ $(use_enable networkmanager) \
+ --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+ BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+ --without-bluetooth
+}
+
+src_install() {
+ gnome2_src_install
+ python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+ # Required for gnome-shell on hardened/PaX, bug #398941
+ pax-mark mr "${ED}usr/bin/cinnamon"
+
+ # Doesn't exist on Gentoo, causing this to be a dead symlink
+ rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+ # Ensure authentication-agent is started, bug #523958
+ # https://github.com/linuxmint/Cinnamon/issues/3579
+ insinto /etc/xdg/autostart/
+ doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+ ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+ ewarn "To make use of Cinnamon's built-in screen recording utility,"
+ ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+ ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+ ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+ fi
+
+ if ! has_version ">=x11-base/xorg-server-1.11"; then
+ ewarn "If you use multiple screens, it is highly recommended that you"
+ ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+ ewarn "pointer barriers which will make it easier to use hot corners."
+ fi
+
+ if has_version "<x11-drivers/ati-drivers-12"; then
+ ewarn "Cinnamon has been reported to show graphical corruption under"
+ ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+ ewarn "open-source drivers."
+ fi
+}
diff --git a/gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch b/gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch
new file mode 100644
index 000000000000..50512c3ab371
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch
@@ -0,0 +1,19 @@
+diff --git a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+index 8028727..85497c8 100755
+--- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
++++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+@@ -839,11 +839,11 @@ class Module:
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
+ description = "<b>%s</b>\n%s" % (fullname, username)
+ piter = self.users.append(None, [new_user, pixbuf, description])
+- # Add the user to his/her own group and sudo if Administrator was selected
++ # Add the user to his/her own group and wheel if Administrator was selected
+ if dialog.account_type_combo.get_active() == 1:
+- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
++ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username])
+ else:
+- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
++ subprocess.call(["usermod", username, "-G", "%s" % username])
+ self.load_groups()
+ dialog.destroy()
+
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index c7cc62998f24..45bff6eb8227 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -3,8 +3,10 @@ AUX cjs-2.4.0-disable-unittest-2.patch 2128 BLAKE2B f5e162bbeda9bdbcddbdccd5bb81
AUX cjs-2.4.0-disable-unittest-3.patch 1119 BLAKE2B ce37d0d0d9d223411de31c21be827f14b0158e07fc75b26639b3662b2e50a7b6d593d3897f4129340ea23b49fb99e7fb8f340fac3760db925762cc697dbd4151 SHA512 c94e7248c5d9623a15fa8ff4c629029a2ca976300381ae03462ae53ce9c55dcb7ec2ce9b669dfc3ab9ccc03a56f58114c9eb43cbfb22fb40b937a4e08b3569a0
DIST cjs-3.0.1.tar.gz 325349 SHA256 cafda5a8a21421e93720732debeea08c59e63c058d240ab0f7b3a6969654864f SHA512 3980e60ca005e616be264ec5bf6cb920452eec538da266dc0645ec1c340506b864886007b371b96830efa379e8ed9dd9127dc205b45e004705fd5c181d82e538 WHIRLPOOL 9368a53f9284d0f234d6e816f27dd6893338b4c6807f7fa0f44403ec0fbcaea3cc6908f86ad1e528f12351e008e93942f0769779f3c271e46e994d6ea7139b5f
DIST cjs-3.4.1.tar.gz 425003 SHA256 83254b01984452cc234891768e746f688924fe2904b6c1c76e214528ff44c060 SHA512 aab752aa03862979374bfe883d62968efab6b9137914b7ab9fcca2025bab6a6ae536db59aaee6deeeba06d2ff8c433d7f769ae0a4c0e2542e7c9a58f723d8690 WHIRLPOOL f6206a56b6e5b5984c567e3b8c4f48d3e0305c76da5c4d4320757248566975bddbf4b376118246beb6c447485e03b8a1a836598d215d6ba13a468ae91d6c7901
-DIST cjs-3.4.4.tar.gz 426665 SHA256 e2497bb3eb53a919776a2f4b869dcc2ba3deb09e955433272a8905e7f6ef9bee SHA512 318a1beef6f6a827266170f0c5c1cfaa8bf48908f96e0ce625aee20ddcd648ea967f09f465ed504f21f923830017d3c4a01f62bab26a1cb84181a96131058d33 WHIRLPOOL 8e774188cf6722075e019c8cac255fcae55ba6fc67c24a974ba033002d6faa8f12aad70c789666d14ed3bdcd63965bf60fe5782fa5b537f2b5e16e482f24664a
+DIST cjs-3.4.4.tar.gz 426665 BLAKE2B 18e232b446945ae296d1dcf4b4624ff10b733f023da99315ba9aeee72228e115a634eb7a31a7c6192c3d1bfb8af1cd89488a9e7fe81edfa3a729bd62061e3581 SHA512 318a1beef6f6a827266170f0c5c1cfaa8bf48908f96e0ce625aee20ddcd648ea967f09f465ed504f21f923830017d3c4a01f62bab26a1cb84181a96131058d33
+DIST cjs-3.6.1.tar.gz 426279 BLAKE2B b9d99e06b580b81178d0b4e2e3d854769357f28277500aed9f5bc2672f26ec72f584576c53d7aa6069737ae81bd0b1bf05d56d39c947de1206c506d72c8da075 SHA512 648997c76acb11885a53a73aa456989784fe5f5a12e0f349bce658c1eb3e3ce2b5c576ace488962c9b012fc85c2c3dd828f61f857cc9da7b60ee5fcdd7d25155
EBUILD cjs-3.0.1.ebuild 1664 BLAKE2B ee654aebaec13f1e43f5ca10e493b18af368ce6f67cb7b20bcf59c0da29aef93d3e6c8752f34f708cff632e6a0d4b167e2eafb6729656406bb6daaa659a45349 SHA512 59de06e7315032403e0a831168ae45e5cd0da3026bd8ff583dc48d325ee4faa47951f30aa18eeb15cbcae501ab51faa7b4df81f263ad2fbb3f44ac159418fa7c
EBUILD cjs-3.4.1.ebuild 1511 BLAKE2B 49b7799669495fae66139a2e2de3a246ff5705e7cdb0ef95302331b17494f40b4f4ee5a86d6b21391cc2a6f16ae278f6074d05ef918371aec9f2d01f8f24c620 SHA512 864f3058675865af299fc7cb57d562d3c20e13f5afd3c4b807cbd579c960c2192ee96b3dc60917be4f9aa12c2690098c16481e4dd14bdb48674325ceb6f1455e
EBUILD cjs-3.4.4.ebuild 1511 BLAKE2B 49b7799669495fae66139a2e2de3a246ff5705e7cdb0ef95302331b17494f40b4f4ee5a86d6b21391cc2a6f16ae278f6074d05ef918371aec9f2d01f8f24c620 SHA512 864f3058675865af299fc7cb57d562d3c20e13f5afd3c4b807cbd579c960c2192ee96b3dc60917be4f9aa12c2690098c16481e4dd14bdb48674325ceb6f1455e
-MISC metadata.xml 342 BLAKE2B 559c826257e59332135737c4f5934e3c1682422691674d4340205065f9daa056e95cc52f8cd479b7f9d75b8ee74473ed8525f293fbf82e20249c7214a853bb33 SHA512 0f3a872b9a8255f708e81aad825a17dfe580ef7a5613b408406e3751f0aea0ca6e952b015451b1681efdc5b88cd1874d8d116481a128dd05a42cf21c7d168bce
+EBUILD cjs-3.6.1.ebuild 1511 BLAKE2B 49b7799669495fae66139a2e2de3a246ff5705e7cdb0ef95302331b17494f40b4f4ee5a86d6b21391cc2a6f16ae278f6074d05ef918371aec9f2d01f8f24c620 SHA512 864f3058675865af299fc7cb57d562d3c20e13f5afd3c4b807cbd579c960c2192ee96b3dc60917be4f9aa12c2690098c16481e4dd14bdb48674325ceb6f1455e
+MISC metadata.xml 330 BLAKE2B 9fd63621288d25f6643471279d5f5be01cc61d40ad7de618ba140add34415ecacceed969c7f57f70b55b20646947b658f4451f0427aa38a82ec0c36f7ceff2d2 SHA512 04f852b262c14801c718e80553018fbb5a48725200eb3bc502f0feb552881d0d75b9aca97bc6cd4247ce753b3b6cf95c8e6a8d9214059aeed4da39a6b12e6158
diff --git a/gnome-extra/cjs/cjs-3.6.1.ebuild b/gnome-extra/cjs/cjs-3.6.1.ebuild
new file mode 100644
index 000000000000..23afc9055f7d
--- /dev/null
+++ b/gnome-extra/cjs/cjs-3.6.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2 pax-utils virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/spidermonkey:38
+ >=dev-libs/glib-2.37.3:2
+ >=dev-libs/gobject-introspection-1.38:=
+ sys-libs/readline:0
+ virtual/libffi
+ cairo? ( x11-libs/cairo[X,glib] )
+ gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+ gnome-base/gnome-common
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? ( sys-apps/dbus )
+ sys-devel/autoconf-archive
+"
+# Cinnamon 2.2 does not work with this release.
+RDEPEND="${RDEPEND}
+ !<gnome-extra/cinnamon-2.4
+"
+
+src_prepare() {
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # FIXME: add systemtap/dtrace support, like in glib:2
+ # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+ gnome2_src_configure \
+ --disable-systemtap \
+ --disable-dtrace \
+ $(use_with cairo) \
+ $(use_with gtk)
+}
+
+src_test() {
+ virtx emake check
+}
+
+src_install() {
+ # installation sometimes fails in parallel
+ gnome2_src_install -j1
+
+ if use examples; then
+ insinto /usr/share/doc/"${PF}"/examples
+ doins "${S}"/examples/*
+ fi
+
+ # Required for cjs-console to run correctly on PaX systems
+ pax-mark mr "${ED}/usr/bin/cjs-console"
+}
diff --git a/gnome-extra/cjs/metadata.xml b/gnome-extra/cjs/metadata.xml
index 1f87fb620863..9e988588122b 100644
--- a/gnome-extra/cjs/metadata.xml
+++ b/gnome-extra/cjs/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>
<upstream>
<remote-id type="github">linuxmint/cjs</remote-id>
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index b6452157449a..ea40b54150f8 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -5,4 +5,4 @@ AUX libgda-5.2.4-jre18.patch 450 BLAKE2B 1ce265d157bab47f94cc4ffcc620813efd0683a
AUX libgda-5.2.4-vala-check.patch 920 BLAKE2B 97ec35e7f3bceaa05ffb31dbb1bc8952409bd5b5b695f77fbc99b7a6b4980154bafccaece3a8eec8008f07a973c937918864c60ecc215bf2db2a6a1c5fda8419 SHA512 dba082bdae037d4b9e021085166c4b5e8791c461cfbd9b0668731651b07f931bae8405b8b7d3c7f0cf51ddbfa23b03a265abd8ab3603e90933e0c99a299b53a0
DIST libgda-5.2.4.tar.xz 12320228 SHA256 2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e SHA512 90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc WHIRLPOOL fee9884ed9edb48603f0ce924316f00d2f38d490147d8c48e512cfd8f1282bd555f1767a56160afc2781b84c1a33466f42a12d4c5115e70af481c54c037bf519
EBUILD libgda-5.2.4-r2.ebuild 4925 BLAKE2B 6d78da6d22688f9c8d3b71425b5828e83d91f36c33e5f9215d3953a4746b4f46f1577396bbac18d1e881ab0184634622bbb9bbc76ab5d65aecced3795be02251 SHA512 c03a97df0b0aeeeba44410c367e5bff172ac3b66c7baf1ca030d96243fcf7ef3a538c16c9cb60a20b136bb81e2a9d907b539fb72778833e83af6d4811fd23487
-MISC metadata.xml 782 BLAKE2B 04f340f7fabe53be3f7575408d73c0c21470e6b8648e2d53943ede5d7d3aa42081c3c450c21e834456e523cd057a80c806a2ea2bd686d6579529381c5e99645b SHA512 4878da46ea580bdc1063c6937a5b5e437bf29bd6132cb6867c103253ef96b20a80f46dab6b8016cea3bfefc186d8e36d4a400980fe5da47ce5f7e877944a4ecb
+MISC metadata.xml 759 BLAKE2B ce4b021f5697460110c6d976231579b4299875991f28fad526ce29b83da1db248d0be46eb83e1f2704c3aa997b1a7f4546f901410ee1751dbd2d03718fc2e935 SHA512 aa0bce4d0262948dc57ce220d453a92dd957db925dc381a362055e5a5d09479cf3954e1bc19966cca21ab0e4d9e41f8611242bcf9f3fe1051388c5a8094c851e
diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
index aae12a8f52cf..c72a40986ea2 100644
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.xml
@@ -1,17 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag>
- <flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
- <flag name="json">Enable support for JSON format</flag>
- <flag name="mdb">Enable support for Microsoft Access database using
- <pkg>app-office/mdbtools</pkg></flag>
- <flag name="reports">Install tools for generating graphical reports</flag>
- <flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
- </use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag>
+ <flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
+ <flag name="json">Enable support for JSON format</flag>
+ <flag name="mdb">Enable support for Microsoft Access database using <pkg>app-office/mdbtools</pkg></flag>
+ <flag name="reports">Install tools for generating graphical reports</flag>
+ <flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
+ </use>
</pkgmetadata>
diff --git a/gnome-extra/mousetweaks/Manifest b/gnome-extra/mousetweaks/Manifest
index f2eec6e7ce63..6cc53cf6aeaf 100644
--- a/gnome-extra/mousetweaks/Manifest
+++ b/gnome-extra/mousetweaks/Manifest
@@ -1,3 +1,3 @@
DIST mousetweaks-3.12.0.tar.xz 287236 SHA256 c0db478ccb390665e3201e9d1ce08b1c6573a697b797c9e828debb94b1ae3b97 SHA512 9e2180ad6ba1abec34a4e2846c31d9195c835a60657be146f2d9526a9c08b1fa4d5b42003203d7c94ec38066a99f10bcd37057d113c4c57f3e401199138de1c0 WHIRLPOOL 7bc760d7e851ec95038ccb303c694b710fa920a9ed85fca68b5df25daf80fc5f45cf7f2694cef3fcac65b28e2e973a7e638403e9151e6548550353bb5b59dedf
EBUILD mousetweaks-3.12.0.ebuild 613 BLAKE2B 76029c315fd57279884b55c9314bbaf63919a18026d6090d0b05ad548ef28b00d9d083dab77723f76d40b526db0dab25a29f8859262cef7dbe799c133c5b91e9 SHA512 eecf107a61829cec3dce73c205b6c143137f86226b139f1b8db85285a7b147ff576a69b800ba5b31038cbd4cd77e466a981f81b38334ce05fe395a789ec04ffd
-MISC metadata.xml 978 BLAKE2B 6614883781fcf499e77f72eef59b397fc02dc3872727e682568df5734543eb82e4525e21d2a34793c68c6913bcd165bf30476f8ea2960014d4f272eee08a7f66 SHA512 558452bca815b89fb3dacc7afb8a4964eb4091bfa0df57d56053ce19a5125a61300de8dc762056abdc093f761c472f3f4ba9e898327d490284036586b9146fdf
+MISC metadata.xml 992 BLAKE2B 4949c671cddff34432cb834515eb2a320e229b92d7d7978195497a027984e8d26545f12b2287a3655dcadd2fcf6f7d0a77a5b1d037af58a5d242b031203f27a0 SHA512 81582de18c045117b2b854561e628cc80ee942179a187787dbaefe835d0498139b05fe5486cbabdb1fbfe0c399be230c5c3cc2a7c18c5de8cf465642873b8f27
diff --git a/gnome-extra/mousetweaks/metadata.xml b/gnome-extra/mousetweaks/metadata.xml
index 6e38a49d0b0e..9c5233005cb2 100644
--- a/gnome-extra/mousetweaks/metadata.xml
+++ b/gnome-extra/mousetweaks/metadata.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription lang="en">
-Mousetweaks is an Accessibility Software whose developement started as a GSoC
-2007 project under Ubuntu. It brings additional fonctionalities to the pointer
-that allow a user to:
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <longdescription lang="en">
+ Mousetweaks is an Accessibility Software whose developement started as a GSoC
+ 2007 project under Ubuntu. It brings additional fonctionalities to the pointer
+ that allow a user to:
- * open the contextual menu by clicking and holding the left button; it is
- * for example useful for users that can manipulate only one button
- * perform the 4 click types (left click, double click, drag click and
- * right click) by software; it is for example useful for users that are
- * not able to manipulate any button
- * to lock the pointer temporarily into an area on the screen; it is
- * for example useful for people that have to use their pointing
- * hardware not only for the computer
-</longdescription>
+ * open the contextual menu by clicking and holding the left button; it is
+ * for example useful for users that can manipulate only one button
+ * perform the 4 click types (left click, double click, drag click and
+ * right click) by software; it is for example useful for users that are
+ * not able to manipulate any button
+ * to lock the pointer temporarily into an area on the screen; it is
+ * for example useful for people that have to use their pointing
+ * hardware not only for the computer
+ </longdescription>
</pkgmetadata>
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 2c6ddc9247d4..51274cc1e9f2 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -2,10 +2,12 @@ DIST nemo-2.8.7.tar.gz 1413445 SHA256 79ca0e28b43ebb701a6449424be1be4224e9014bf1
DIST nemo-3.0.6.tar.gz 1363302 SHA256 3a2704e110a30625f9e807d21df44a577606d383c1eaf1ef4dae0e4dd321cdec SHA512 a2741b13dd258c843a2b9096f6b3aca3cb22647e2d5e6b18013857bbbb4e9aceccbc80713365aff0d25faa31727ff86ec4a86dac2dd8a556cb0a6dc3346f7be2 WHIRLPOOL 9044e85af7e9fadb9ce56f33d0ba63c5f39cbcf8dce2df4850474f03fde440c8ed1e52bc50e92804f4269e2d3c4563760512a23323e1120db3b7ea39d37ed211
DIST nemo-3.2.0.tar.gz 1365508 SHA256 84c5b0a1999c1b2ab08bd6933aa7c5bc18bb2805e52f2d7fdf2af644cd7cc8ac SHA512 0f238dca5849c9ad333592772588fd7ef5b572056f74794940c2ed6cd099f98587edea364221d5c5281918df21622780567993c051fc4f6adaf8e09ed63356b9 WHIRLPOOL 798856f8d014f1dfacd833a68f465795e33a48ebbabe9cc8ec9ff7c8851bc62576f28a75cbda8460002d01d115cc765ea40a4260a8274c7d3eee3f7d8ed3d0a2
DIST nemo-3.4.4.tar.gz 1417650 SHA256 1ed1c4263c6c436bacbf70e2093c66f27c5ea9338d1b793df4dacd84993a9742 SHA512 f2056653a2ac1e26cd8da2226acbc05046988f2f051b72ed267f572ad010a6bd4d7d1ef39ee732cebb7a05dd3d88053bfe2cdc3aee31c20eac29a8f659bcd67b WHIRLPOOL 563a8b81b742b44e39d30dd642f0c428167c13aa2b78fa3e1f73663276ae3be60178a8ac7a5308206bacb797419970187447ddc33dfcbd26d80fc4b20c2ddc22
-DIST nemo-3.4.7.tar.gz 1422209 SHA256 73ca1cd22eaa229bcd87a74fdcf32ba58f1eb1e0376f12775870b6d1260550a1 SHA512 75f84e4c4f60c01a003ec413493107fa0ff02d3dcdb5772dd31b726905de1d49679b294e4760e5806b982c8a9e3fcd6411dc7deb3091545d74b688afaae39bbe WHIRLPOOL 923d52c297ebd870f334eae52a8913ff8f4c923bb320103e43e3ff75f6713074b18022d85eb3a9ab5b73459a9f8bba801f5a8a390b97d95e217b17c5437fc9bd
+DIST nemo-3.4.7.tar.gz 1422209 BLAKE2B 5ac6bdda0822850a61b61649258af793f514d6a5fb90143c58c52370210f65bdda53d40b911fafc369123739f3bab6b4a3be32efeb58c6f48fa8eb4e3a8b1731 SHA512 75f84e4c4f60c01a003ec413493107fa0ff02d3dcdb5772dd31b726905de1d49679b294e4760e5806b982c8a9e3fcd6411dc7deb3091545d74b688afaae39bbe
+DIST nemo-3.6.4.tar.gz 1433265 BLAKE2B 0640ad5e803d955072d0773ef3ea20739d6189720defbf3db6fc48da503b7cb72f8c33302542799933499f2f5c0e28c8e706da77f9943362e7db23eb9c4d6a21 SHA512 a8541e8944ce44b3f62ad0211c550509704f3210ce4aaaebcaefcb50a358f018eb01fba26d18ea8edbd662dab2b915fb7c4f4704e8468f6b9b3f4b636bf0d87e
EBUILD nemo-2.8.7.ebuild 2057 BLAKE2B 7307d19383728b51d7f5811f46fab197b9dbaa048b85201374e3e8ab9594d3d2b6d1b9f72db577944a4be3bb7c136b0a1d77bb7dae4e849b55770b85c21cef4f SHA512 9c2925464ee3029a9422df959736ddcf59164445805fabdeb46b03cdb65f42dc54feb893a8121b80e0c81335b86d89297a1c9e18cca24eb761ac46d411f571c7
EBUILD nemo-3.0.6.ebuild 2057 BLAKE2B 7307d19383728b51d7f5811f46fab197b9dbaa048b85201374e3e8ab9594d3d2b6d1b9f72db577944a4be3bb7c136b0a1d77bb7dae4e849b55770b85c21cef4f SHA512 9c2925464ee3029a9422df959736ddcf59164445805fabdeb46b03cdb65f42dc54feb893a8121b80e0c81335b86d89297a1c9e18cca24eb761ac46d411f571c7
EBUILD nemo-3.2.0.ebuild 2037 BLAKE2B 48d59e3b2531dd65e19d51b7539cef48dfb625974b1ef306e804929b53ebae572819fa74e97bdd8498d8f7cb0065fc8c490b22f817d517b4f4e0f743f5f4f375 SHA512 192ccd9436b6e402d0631b32e35955f371136204e46357108805f4c14a455d2a6389beb553cd07b35de28e6c34c42434b1b1a6776d46af75622dcd167d335a30
EBUILD nemo-3.4.4.ebuild 2058 BLAKE2B 1b9d3ee099f93d059a92c787dcfe96967be9338c4950fe4bfca96518b82852af10451e737f6bc140f9ea4295ac85ed75e430cab251f772d464c818979437ed0c SHA512 9708445f2223b2d856636fded2268a1da8fc0cf040b2e18380facceb8f74e44703da7cf2069ed8685d014ae5b39dd181e88f601f83db3c0ba98f26edc55fe179
EBUILD nemo-3.4.7.ebuild 2058 BLAKE2B 1b9d3ee099f93d059a92c787dcfe96967be9338c4950fe4bfca96518b82852af10451e737f6bc140f9ea4295ac85ed75e430cab251f772d464c818979437ed0c SHA512 9708445f2223b2d856636fded2268a1da8fc0cf040b2e18380facceb8f74e44703da7cf2069ed8685d014ae5b39dd181e88f601f83db3c0ba98f26edc55fe179
-MISC metadata.xml 539 BLAKE2B a34c3b6535ba1ee3280e19e1f60bd85d607b2751797cc15d6f36f25beb4570be2a5edbcb73884d5f5b658f54e957ab1f0a902e3b670eb6c495091e4d80490746 SHA512 289c4ce4c117298edbfb90af9f468e1e944b2992a50aa8fd937fa3db9cdca2958f99105a481a0ffced036e94fd626faabbe3b487b42ebc278abd7350284f6832
+EBUILD nemo-3.6.4.ebuild 2082 BLAKE2B 2cf8e115cb8253135ed6cdbcb3054356aa0bec3c249c4f00b192cd0c27a40839d8ae8136d66b955091b0b60b857777d6073569f8b1f5eea18392cc7ab1c98490 SHA512 7a9cf5538d331b7e210540b4c7b8a4fae39fdb8cbd1fff42f9f8e88bb56959ffc00bf00bbb9e9a12ab1392d706d780cafc0cf2301470174390c02a85e9d03c7a
+MISC metadata.xml 525 BLAKE2B 62bd5c4d9f4c8dfc2d82f2d24f7f9a3281f18fe10be1538edf6d91ab0760fd01f6dcb7d3b71bb3a65c923b904f91559db8e3622ab9af76f6778e213b2c60e640 SHA512 9c60022c7a5054ee0271b3b412aa6fcc8271247756438a5323bd5acb4a5a0b5d781dc256de6b68a51e276d0ca1dccc434cd718fa51682d8fa6a8cf5ae26350a9
diff --git a/gnome-extra/nemo/metadata.xml b/gnome-extra/nemo/metadata.xml
index d6f98f80633e..b3526b807770 100644
--- a/gnome-extra/nemo/metadata.xml
+++ b/gnome-extra/nemo/metadata.xml
@@ -2,12 +2,11 @@
<!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="packagekit">Use packagekit to search for programs to open
- unknown file types</flag>
+ <flag name="packagekit">Use packagekit to search for programs to open unknown file types</flag>
<flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> search</flag>
</use>
<upstream>
diff --git a/gnome-extra/nemo/nemo-3.6.4.ebuild b/gnome-extra/nemo/nemo-3.6.4.ebuild
new file mode 100644
index 000000000000..6332a6dd879f
--- /dev/null
+++ b/gnome-extra/nemo/nemo-3.6.4.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"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools eutils gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif +introspection +nls packagekit tracker xmp"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.3:2[dbus]
+ >=gnome-extra/cinnamon-desktop-2.6.1:0=
+ >=x11-libs/pango-1.28.3
+ >=x11-libs/gtk+-3.9.10:3[introspection?]
+ >=dev-libs/libxml2-2.7.8:2
+
+ gnome-base/dconf:0=
+ gnome-base/gsettings-desktop-schemas
+ >=x11-libs/libnotify-0.7:=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrender
+ >=x11-libs/xapps-1.0.4
+
+ exif? ( >=media-libs/libexif-0.6.20:= )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+ tracker? ( >=app-misc/tracker-0.12:= )
+ xmp? ( >=media-libs/exempi-2.2.0:= )
+ sys-libs/libselinux
+"
+RDEPEND="${COMMON_DEPEND}
+ x11-themes/adwaita-icon-theme
+ nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+"
+
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/polib[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ ')
+ >=dev-lang/perl-5
+ >=dev-util/gdbus-codegen-2.31.0
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.40.1
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-proto/xproto
+
+ dev-util/gtk-doc
+ gnome-base/gnome-common
+"
+# For eautoreconf
+# gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
+
+src_prepare() {
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable exif libexif) \
+ $(use_enable introspection) \
+ $(use_enable tracker) \
+ $(use_enable xmp)
+}
+
+src_test() {
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
+
+ cd src # we don't care about translation tests
+ GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" virtx emake check
+}
diff --git a/gnome-extra/office-runner/Manifest b/gnome-extra/office-runner/Manifest
index f30e7f5208e7..7b9ed2ffd7c3 100644
--- a/gnome-extra/office-runner/Manifest
+++ b/gnome-extra/office-runner/Manifest
@@ -1,3 +1,3 @@
DIST office-runner-1.0.2.tar.xz 562660 SHA256 ea42d84960773bd3ec7bb412df61cbfb617a42f69db09ed337eef91ff94a8a97 SHA512 a840af75f014147d30e950a4bc8628c97a79c8161eab3d0f658f5e4f5200df5baaa761d4ea27dc1bc70c6a467fc2536ac0aa473c338ffcbfc48689ba1ec13177 WHIRLPOOL e0b1594da951646917fc15610b9c1bb9361301d86e0c073c74deeef66189845ca90db2aac910d9f96f70720ebc262c66259950a55ff2cefbf3369eac0d3284c3
EBUILD office-runner-1.0.2.ebuild 878 BLAKE2B dd7e6c8471381566e6cb3edbc3b4457e8e79dd8a1b78ecc008d567f2b0e94b79de164f537469a2f9f6279e0b20b8582535c7b15c6e6142a3648d77b36933a849 SHA512 920d5eae8032228f0cb2c8661d2f2f14e9e5b087272a4e3508f714062a183eb7a2157f0110c07597ef04253ddb1c4e24ef3d40946a5da7195cf7b2e9a7a27572
-MISC metadata.xml 511 BLAKE2B 5b56e3e5d278a1ae0cf6247bb472547ff93458ce71cf02bcfea26b16345cbc452e945faf3ff7658b84019c2340a040a9e4621ab00f2a9512910b152c726a41c7 SHA512 533588530a9d364711e14cbb38e5e7ded118441129fb02cd7efa08c3f2cb1d7e241726446c08f6e46eb671e948bbc199c8e07eac013229bae976b31a221c0ed2
+MISC metadata.xml 520 BLAKE2B 7a1706f5380983f935e4feb3f00224194024beeea99aed500f2550780049354bab448ce6b507e9cfad63b0d16d08d1d5bc7880aff36be791a5888a8c813a2181 SHA512 54abe575b83b5b14c227e8e4b87f7bb00503afd69cce7d5a05124b4d67a0385ff21fcf4618f41668c3fedbd27c918753b4bdc0dcef296a63fcd774c608fbcc80
diff --git a/gnome-extra/office-runner/metadata.xml b/gnome-extra/office-runner/metadata.xml
index 11ae369033d5..77410621ce8c 100644
--- a/gnome-extra/office-runner/metadata.xml
+++ b/gnome-extra/office-runner/metadata.xml
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription lang="en">A tool in the form of a lighthearted game that
- temporarily inhibits GNOME's default suspend on lid close behavior,
- allowing the user to move his laptop with the lid closed without dropping
- network connections.
-</longdescription>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <longdescription lang="en">
+ A tool in the form of a lighthearted game that
+ temporarily inhibits GNOME's default suspend on lid close behavior,
+ allowing the user to move his laptop with the lid closed without dropping
+ network connections.
+ </longdescription>
</pkgmetadata>