summaryrefslogtreecommitdiff
path: root/gnome-extra
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/Manifest.gzbin11215 -> 11205 bytes
-rw-r--r--gnome-extra/cinnamon-control-center/Manifest4
-rw-r--r--gnome-extra/cinnamon-control-center/cinnamon-control-center-4.4.0.ebuild87
-rw-r--r--gnome-extra/cinnamon-control-center/metadata.xml12
-rw-r--r--gnome-extra/cinnamon-desktop/Manifest4
-rw-r--r--gnome-extra/cinnamon-desktop/cinnamon-desktop-4.4.1.ebuild49
-rw-r--r--gnome-extra/cinnamon-desktop/metadata.xml8
-rw-r--r--gnome-extra/cinnamon-menus/Manifest4
-rw-r--r--gnome-extra/cinnamon-menus/cinnamon-menus-4.4.0.ebuild36
-rw-r--r--gnome-extra/cinnamon-menus/metadata.xml8
-rw-r--r--gnome-extra/cinnamon-screensaver/Manifest4
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.4.1.ebuild67
-rw-r--r--gnome-extra/cinnamon-screensaver/metadata.xml8
-rw-r--r--gnome-extra/cinnamon-session/Manifest4
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-4.4.1.ebuild72
-rw-r--r--gnome-extra/cinnamon-session/metadata.xml8
-rw-r--r--gnome-extra/cinnamon-settings-daemon/Manifest5
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild92
-rw-r--r--gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch36
-rw-r--r--gnome-extra/cinnamon-settings-daemon/metadata.xml8
-rw-r--r--gnome-extra/cinnamon-translations/Manifest4
-rw-r--r--gnome-extra/cinnamon-translations/cinnamon-translations-4.4.2.ebuild31
-rw-r--r--gnome-extra/cinnamon-translations/metadata.xml8
-rw-r--r--gnome-extra/cinnamon/Manifest4
-rw-r--r--gnome-extra/cinnamon/cinnamon-4.4.8.ebuild176
-rw-r--r--gnome-extra/cinnamon/metadata.xml8
-rw-r--r--gnome-extra/cjs/Manifest4
-rw-r--r--gnome-extra/cjs/cjs-4.4.0.ebuild80
-rw-r--r--gnome-extra/cjs/metadata.xml8
-rw-r--r--gnome-extra/eiciel/Manifest2
-rw-r--r--gnome-extra/eiciel/eiciel-0.9.12.1-r1.ebuild4
-rw-r--r--gnome-extra/gnome-commander/Manifest2
-rw-r--r--gnome-extra/gnome-commander/metadata.xml41
-rw-r--r--gnome-extra/gnome-shell-extension-appindicator/Manifest2
-rw-r--r--gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-33.ebuild2
-rw-r--r--gnome-extra/gnome-shell-extension-gsconnect/Manifest3
-rw-r--r--gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch51
-rw-r--r--gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch34
-rw-r--r--gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild74
-rw-r--r--gnome-extra/libgda/Manifest2
-rw-r--r--gnome-extra/libgda/libgda-5.2.8-r1.ebuild4
-rw-r--r--gnome-extra/nemo/Manifest4
-rw-r--r--gnome-extra/nemo/metadata.xml8
-rw-r--r--gnome-extra/nemo/nemo-4.4.2.ebuild82
-rw-r--r--gnome-extra/nm-applet/Manifest4
-rw-r--r--gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild6
-rw-r--r--gnome-extra/nm-applet/nm-applet-1.8.25.ebuild6
47 files changed, 1119 insertions, 51 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 8b2a52c812bf..4a5eb606e497 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
Binary files differ
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 977b9174e084..52178751ba8f 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,3 +1,5 @@
DIST cinnamon-control-center-4.0.0.tar.gz 3872314 BLAKE2B 85a49a6713347741a4f1bef8bdd339645abfbccbe9621de8621b5898586d93d399312794be42834f3338fd70c7408f5d5f314ce03ef332fc0db19e053be70a69 SHA512 4ec0dab3dfe36a1730577abf1ecddfc96194364a1dfaf9cb939686b1621b96d6cefc60b204dd000b7ab017237c32b138cbe15644da5dea4a2406c2bf1a686638
+DIST cinnamon-control-center-4.4.0.tar.gz 3868474 BLAKE2B 88e22670427416139468c35918105cc664c531aa5084636226498a09b27f56300c8541feff8f93a5ec860372436af01fdeb2ca2c0761b34a6f298439538dfb44 SHA512 3f176c067312bad68ed8ce2461937d8e8cd188839ab3cf786fb76930905691b8f5a91d700f1d88d75448eeecfd23b645b77ee15c0ec02e08718f7c9ac800677f
EBUILD cinnamon-control-center-4.0.0.ebuild 2495 BLAKE2B 9e4915d89c26f351f7ab76a59354a384cef8923ef69352a3a23f0e525c744feb73cb7980a276bcba09bdd5f82d8b6b40d316b9751efddffc22025c44dc21b8b2 SHA512 1ac56ab6046b5d8e095ed72fbcff243671f659e8e7648f5ad8d92abe674a165ed3579c4305bdf3bdc1a04fd2ac618b213dcaecb324b63385558e07ef9def7109
-MISC metadata.xml 350 BLAKE2B 59c80693fba99e8dda0c5724c57b430360acfbf04070c11c0ed88f6af76315da568314131655f8ba21ccc9d7eb8101cec83a257bf552e1fa3c9b6d4b5b991987 SHA512 9ad2cb41870f385fe74589cabea4f708647cc8eaff9d6648dae79eafd28644c6cc7b5911a6b8e7dcefbfa4b3764ae255763fed98111d9975e5b7f960eb2a06ac
+EBUILD cinnamon-control-center-4.4.0.ebuild 2520 BLAKE2B e03b2b5f1c310ebad94a320aad6271dfd06ab1c50ba1b1224af69e311c1b0a37c39bb26d2ac8ea5837db9a0ee2d44eaf752fd0369dfcbcccab6ed4a1fb2ae979 SHA512 f83e1f69368c7465249ddfe34900168b8257130bd8610a69811c099bf947ae8bd9a94937c4319cbf9153c922b78d23adfef607dc2e27f68942d4ef19f4478621
+MISC metadata.xml 721 BLAKE2B 882c45b7d403fe8df36dab29573626a0ebaba81263b475b839be52f7739eab8245f7bcb0cf34e3c2eec7c1671aa3438375e669285c1bb6691d2236cdb2801932 SHA512 8c0729e6b7551d68a85264e9336c2af93a2172d61e54bdc294238ab3c084d241024f9cde5c61e363908e12a22609d8cb90567e8f1e28876d3dc5e9eb6c9ed681
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.4.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.4.0.ebuild
new file mode 100644
index 000000000000..e4af1639f023
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.4.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord debug input_devices_wacom +networkmanager +modemmanager systemd"
+REQUIRED_USE="modemmanager? ( networkmanager )"
+KEYWORDS="~amd64 ~x86"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+COMMON_DEPEND="
+ dev-libs/dbus-glib
+ >=dev-libs/glib-2.31:2
+ dev-libs/libxml2:2
+ >=gnome-base/libgnomekbd-2.91.91:0=
+ >=gnome-extra/cinnamon-desktop-4.4:0=
+ >=gnome-extra/cinnamon-menus-4.4:0=
+ >=gnome-extra/cinnamon-settings-daemon-4.4:0=
+ media-libs/fontconfig
+ networkmanager? (
+ >=net-misc/networkmanager-1.2.0:=[modemmanager?]
+ >=gnome-extra/nm-applet-1.2.0
+ modemmanager? ( >=net-misc/modemmanager-0.7 )
+ )
+ >=sys-auth/polkit-0.103
+ >=x11-libs/gdk-pixbuf-2.23.0:2
+ >=x11-libs/gtk+-3.4.1:3
+ >=x11-libs/libnotify-0.7.3:0=
+ x11-libs/libX11
+ >=x11-libs/libxklavier-5.1
+ colord? ( >=x11-misc/colord-0.1.14:0= )
+ input_devices_wacom? (
+ >=dev-libs/libwacom-0.7
+ >=x11-libs/gtk+-3.8:3
+ >=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+ systemd? ( >=sys-apps/systemd-31 )
+ !systemd? ( app-admin/openrc-settingsd )
+ x11-themes/adwaita-icon-theme
+ colord? ( >=gnome-extra/gnome-color-manager-3 )
+ input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+"
+
+DEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+ dev-util/glib-utils
+ >=dev-util/intltool-0.40.1
+ sys-devel/autoconf-archive
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ x11-base/xorg-proto
+"
+src_prepare() {
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # cups, documentation, and systemd don't do anything
+ # and have been removed in the next release. So
+ # disable them for now.
+ gnome2_src_configure \
+ --disable-static \
+ --disable-onlineaccounts \
+ --disable-cups \
+ --disable-documentation \
+ --disable-systemd \
+ $(use_enable colord color) \
+ $(usex debug --enable-debug=yes ' ') \
+ $(use_enable input_devices_wacom wacom) \
+ $(use_enable networkmanager) \
+ $(use_enable modemmanager)
+}
diff --git a/gnome-extra/cinnamon-control-center/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
index 64ed8e976b58..512549beac5b 100644
--- a/gnome-extra/cinnamon-control-center/metadata.xml
+++ b/gnome-extra/cinnamon-control-center/metadata.xml
@@ -5,7 +5,19 @@
<email>cinnamon@gentoo.org</email>
<name>Cinnamon Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sparky@bluefang-logic.com</email>
+ <name>Matthew Turnbull</name>
+ </maintainer>
<upstream>
<remote-id type="github">linuxmint/cinnamon-control-center</remote-id>
</upstream>
+ <use>
+ <flag name="modemmanager">Enable support for mobile broadband devices
+ using <pkg>net-misc/modemmanager</pkg></flag>
+ </use>
</pkgmetadata>
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index d67f1cc373ec..c508366dd81c 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,4 +1,6 @@
AUX cinnamon-desktop-2.6.4.systemd.gschema.override 127 BLAKE2B 9e92cc304697735f86be4d00b9c3504ba20348a0382a644b313f30ce4c32e833cbcd690a3dd3d1870851a1b17d3174c7ffe9c6f154e456720c4d6d01a0b71382 SHA512 b8d72287707a1caad2dfe90a220973ea70b0c523ac14b79b21c11c87ca9a8e844698e9a33ec6f27f0dcd9c8e88d2117aab8b0064688917d7e1acbdc368e85f2e
DIST cinnamon-desktop-4.0.1.tar.gz 489598 BLAKE2B 3d223faf0d9381bc5bcd4be131f9dbe1bea0f6ec57cc5413e24fac8a1855737ba55f55faff36436c8b8d6266be264d96ce51ec1bd8c1406f5737c9b3ee41c0a9 SHA512 68ce970736eac025c5cf73239dccd010d70197011e75258dc234bdbb52346466f51fc211c58d2ce730e63fb6250fa763ccbdf44cc08df7a028a0bea01826ddb4
+DIST cinnamon-desktop-4.4.1.tar.gz 488102 BLAKE2B 8bf770e1f2af67c32381c5ba23e88f259d9d6c6a0b722e61202922da8c8c5374bd297b3866846f28924d6d527e6122432682df98d4b3979eeaf026674b6e5027 SHA512 3e3a1bb007ed6d921c83e377bf05642f01ae2ae29f4fb63d93e011de44dadc4e79967510079c6175b68207263fd4a589587c2d0904f17639f3fffad81ddbbde9
EBUILD cinnamon-desktop-4.0.1-r1.ebuild 1632 BLAKE2B b657c7b7a8f4cd7ff3662ceadd2c76c9005942b907dc30c585f1d4a4f98184c8c376dc3db250143343050355320f61462b45e59f52dc21ca54ab921e08347f88 SHA512 29e1b11182972589fd035857957f26d605d094eb011b8b232e7b07ae7a7e034674ad0c8ddedd324115dd66905131b35bbdd545bca3c28562bf4a6445506dd9a1
-MISC metadata.xml 343 BLAKE2B ad89f9bce993b3d57620eadf715cff2aec3e4ef058e3edc34f8b02478be2a783f6d3e90c645818ce7a6dea30274fd67ca093f2284123e677fceb0b89da80c95d SHA512 628ef0f1097a5afc62968982247ae10d2db811fd0e82944d64d1b7bb2f6dec888cf16a5bb2ddf5ca1317860abc099cbd63916381a4be69568dd0c21405fe0e18
+EBUILD cinnamon-desktop-4.4.1.ebuild 1214 BLAKE2B 39797307951e573217c0b8c112f58cf99262bf73eea1eeb4a4f8ea7a53361a4b6c199f11fff991bcd89876bd29551fb8c9db5931297adee4fb7db28a9d79c4e5 SHA512 b20b0117c711c67cb27b396249e43701f45cb3bf074db146ac9b9d96220f2d166873dd859feebb23ed55f3409d49e4b4190c65e1ab8fb2cb9a7242e780e3ed24
+MISC metadata.xml 578 BLAKE2B cdbc9f8cbd3fe49bb5409b5889f29c0a6f5894179b8a4493fae635b15fb0a590516b8218820c45fc53d50cb18dc641e33fe1cbb700660c5ea78d5b8f4faea7e1 SHA512 fe4333cd43603125c9dbb6c8b8d2e0c8c02e26f2c14047a02b60dfd5ce93bd43a54ea0a911bf049c07d959ee186277f790f63270a84132d529ba68073fd40fbc
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.4.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.4.1.ebuild
new file mode 100644
index 000000000000..095f38549eec
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.4.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson gnome2-utils python-any-r1 xdg
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+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"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.3:2[dbus]
+ media-sound/pulseaudio[glib]
+ >=x11-libs/gdk-pixbuf-2.22:2[introspection]
+ >=dev-libs/gobject-introspection-0.10.2:=
+ >=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
+ sys-apps/accountsservice
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="${PYTHON_DEPS}
+ dev-util/glib-utils
+ >=dev-util/intltool-0.40.6
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+pkg_postinst() {
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+}
diff --git a/gnome-extra/cinnamon-desktop/metadata.xml b/gnome-extra/cinnamon-desktop/metadata.xml
index 4664002df8ad..7ac86cb8bc1e 100644
--- a/gnome-extra/cinnamon-desktop/metadata.xml
+++ b/gnome-extra/cinnamon-desktop/metadata.xml
@@ -5,6 +5,14 @@
<email>cinnamon@gentoo.org</email>
<name>Cinnamon Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sparky@bluefang-logic.com</email>
+ <name>Matthew Turnbull</name>
+ </maintainer>
<upstream>
<remote-id type="github">linuxmint/cinnamon-desktop</remote-id>
</upstream>
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index 48ae815e53ef..9b20631c98c5 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,3 +1,5 @@
DIST cinnamon-menus-4.0.0.tar.gz 181311 BLAKE2B 6893e9478220dd2b8d5f9e883bb647fcd529744e4bb858f29ff2332f06abe1581b7abc6f19d78543ded8da7061cdf7095e361df2059e806c821e60847059bfe4 SHA512 8ada5b351d7d7b09dbdb8f3d6650c03e9a78a5ee729a2f557bd2f49180fe9272889a39309751548d4680794c606294f997ea20aea7e6f6229fb7fbde4b038852
+DIST cinnamon-menus-4.4.0.tar.gz 96196 BLAKE2B 9bb16c3d4d0f3b92b38ea9e388e0a17ee80d1143ed77daab03fcdc0de63423e77900174c2f4a49b173b0d2f1dddff43d3864b1ce1c940a64740d5c53a7807f41 SHA512 68d63fc9b79ecd979dea39e284e1b3120e3c889f496a418e060e97acea04c92a07a31cb5a0b4f1a62b4af64731de3b8c5524a8613cab61361ff329f68a19cb90
EBUILD cinnamon-menus-4.0.0.ebuild 898 BLAKE2B dd36cda0e840829b9706bdff6af37f04febda56e87d8a74a69d4b806e43577b98d1205ed91403e36b98230a6a179aff6de74695875ecb533d668eff4ffd900ae SHA512 9e1de293c33c4ab046662cf6318f2a1a7cf732928e97e352b556569c6534b97d09cbbb5afe52abca360a74c9531b2d499b9b452f2b040bc070e8dcdd99fb4f65
-MISC metadata.xml 341 BLAKE2B be1e94bc533e24d0daae51089eb50e5e3f30db907094797872e42eefdfe7e8f6abe0f0cb7174bf650e0f20f9a5fc58a4e7243913c29f2cd7e06ca4e46bc4ba63 SHA512 177880a66033caf631d8b8c794da66a122feb891f1208fe6d6f9a3e7675f3cae22d85d0cdd1dd5c17b9098e8e38e823b96385e19f75439ea4d0b32a1f6e81f83
+EBUILD cinnamon-menus-4.4.0.ebuild 811 BLAKE2B 9246302f04dcda455ae12ab315d43dcdaa8ad64620e014f514272f83a42b938ce899aef6b1b175726ef450192832cc844786b0893a4d43da1a80c796c917eef3 SHA512 d59203f4dee454c25bce88e714049a2390abdb6435c31869ad328186dcde7dab3f94381acce06ec48803358bd59cc5b6a8227115598c346e4d6310f79377616e
+MISC metadata.xml 576 BLAKE2B 5fcdfa94ed8af381737e8e264c911ebfcb71c7d5f9b8805d2bd9fa0e36b0a19ef540bb3ccea458acbf3f27e8995a42e2dc560d4eb0823302c080324b8c1e5332 SHA512 330a3cf64995e5b5870b4cb16fb693916fca9e62a0172d3a4053a2c47eacb08b8f7cb4c237d6c685cd8e28630f284c11943b1e9837665713ddb59b861ec6c182
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-4.4.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-4.4.0.ebuild
new file mode 100644
index 000000000000..7b62b345a9cc
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-4.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson xdg
+
+DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+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 gtk-doc"
+
+RDEPEND="
+ >=dev-libs/glib-2.29.15:2
+ >=dev-libs/gobject-introspection-0.9.12:=
+"
+DEPEND="${RDEPEND}
+ dev-libs/gobject-introspection-common
+"
+BDEPEND="
+ >=dev-util/intltool-0.40.6
+ sys-devel/gettext
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use debug enable_debug)
+ $(meson_use gtk-doc enable_docs)
+ )
+ meson_src_configure
+}
diff --git a/gnome-extra/cinnamon-menus/metadata.xml b/gnome-extra/cinnamon-menus/metadata.xml
index 9f2cc8ae0d4c..901cfeb4556e 100644
--- a/gnome-extra/cinnamon-menus/metadata.xml
+++ b/gnome-extra/cinnamon-menus/metadata.xml
@@ -5,6 +5,14 @@
<email>cinnamon@gentoo.org</email>
<name>Cinnamon Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sparky@bluefang-logic.com</email>
+ <name>Matthew Turnbull</name>
+ </maintainer>
<upstream>
<remote-id type="github">linuxmint/cinnamon-menus</remote-id>
</upstream>
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index cc505c38504a..444a26afcec0 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,3 +1,5 @@
DIST cinnamon-screensaver-4.0.1.tar.gz 156640 BLAKE2B e82354ce36fc325f524e60680c51d46ba7924154e2ff64514687498a7ebbf13d626e5441177d0679c763a4bd3c10a2b7e08ed01470358bc4606be90d37867570 SHA512 c1262d6c1e9575da8007f41f637ab9f7ba33ad5a3a909a7b756cef1f4cb0f323ea4d89fd7498d9589975b9fa6e4715d631413eec7fbcb9c3b46d3a42e02ac7bf
+DIST cinnamon-screensaver-4.4.1.tar.gz 160214 BLAKE2B df19a370c76648e0717565a3aab4785c3d8b48b20b9d87cc5426506f196db72872642d0ed1109a40986311c0ad7a5c17fbdcfc69681083afd3884c04822c6afa SHA512 92050febcfd41ad03b277cef60b95080d56b8fd985d064e9420a3357d7d0475355a4ca55965e581ae45410df8f19f3c031f6df0e3eec5b6b78aee7141d0244f7
EBUILD cinnamon-screensaver-4.0.1-r1.ebuild 2072 BLAKE2B 006d373a431c276c83af2c4a2af1b18219ea02c52782af790efc67f46dbb1889f2fe672c7cba2bf35882fa2c20e0ba05cba176b7d4f72f5fb16f348904d0daaa SHA512 15f3fd1f49a4010a782ac1ff251881eaf56b87ff972545ca4feb3280cda820696770b3f6948c2540939350e0b89397138e9f1159ba5ccde33c5cd16dbfc987a0
-MISC metadata.xml 347 BLAKE2B 773184a65ac7d37b4a3d999c2a191c93b5b02fbe7a7649132b67673d6285a7cfdddc699e18d9c30312e776c8a323d773722b45fbd75991fb46fee079b689ccfc SHA512 4467748a71035d2147a185121e657c8fa84f7d62c80c5a5bc2eadea631d1dde6c741e1e33c39f839cca9c9a48dfbad99706633bccc48af4c5009b490f353d4be
+EBUILD cinnamon-screensaver-4.4.1.ebuild 1475 BLAKE2B 586bec8c310ea88e328e1f9b824d90a90c6b28f29319a66ead39e0eab4abcf47ae81f47c7566ee97a224bf8d31e69ecabd0389f438df5c340d910d21c2900a29 SHA512 443077ba13918179062b2ffeb5ff9f69b3656853135d5acdd8285451ceb16fc0767c65b671ef09e4a3ad9c8b4e5ae1ec26fd85e8f945168ff77351d2072f4b62
+MISC metadata.xml 582 BLAKE2B 5854f3cf0322cf123dcd63c5263822d848b2d44adeea994027e3f3b5e0aad61eafd73406c28d60957b8f8774bfb1e0fc758a3d7f717bcb87755a8200c69cc192 SHA512 7d10d765a8de51baa5981d398df539b19a96acc299564e006822b0e500e40e8492f16f214b1c24b9c672f48262282b0e9137b9c3d5922cb8eb0f07f355ba19f0
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.4.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.4.1.ebuild
new file mode 100644
index 000000000000..d5eb0b7997af
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.4.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools gnome2 python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug 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-4.4:0=
+ >=gnome-base/gsettings-desktop-schemas-0.1.7
+ >=dev-libs/dbus-glib-0.78
+
+ sys-apps/dbus
+ sys-libs/pam
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-themes/adwaita-icon-theme
+
+ ${PYTHON_DEPS}
+
+ xinerama? ( x11-libs/libXinerama )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ dev-python/xapp[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ ')
+ systemd? ( >=sys-apps/systemd-31 )
+ !systemd? ( sys-auth/elogind )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-util/gdbus-codegen
+ >=dev-util/intltool-0.40
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-base/xorg-proto
+"
+
+src_prepare() {
+ python_fix_shebang src
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(usex debug --enable-debug ' ') \
+ $(use_enable xinerama)
+}
diff --git a/gnome-extra/cinnamon-screensaver/metadata.xml b/gnome-extra/cinnamon-screensaver/metadata.xml
index 00e290bb5707..7b8be711a699 100644
--- a/gnome-extra/cinnamon-screensaver/metadata.xml
+++ b/gnome-extra/cinnamon-screensaver/metadata.xml
@@ -5,6 +5,14 @@
<email>cinnamon@gentoo.org</email>
<name>Cinnamon Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sparky@bluefang-logic.com</email>
+ <name>Matthew Turnbull</name>
+ </maintainer>
<upstream>
<remote-id type="github">linuxmint/cinnamon-screensaver</remote-id>
</upstream>
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index deab8eae1791..b6b5776e74ea 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,5 +1,7 @@
AUX cinnamon-session-3.8.0-elogind.patch 712 BLAKE2B dd1ce68b30e849a62dd563c3bd640639974763f4aae108ff379adf942289fdbda46367a13a9a640e11750ca978a0f28dc3c6cb17f309c7e7a44bc3b7c8769ea6 SHA512 b0f04b560cf76fa040ce838cd21e811b0e627187e7500e5bf7717f5b1ba242db0485feb986ba0e89e5daa044f0268047c9ff37b9a72c41cbda16975929db7178
AUX cinnamon-session-3.8.0-elogind2.patch 617 BLAKE2B aad4e717fef7289576e81f863e16b2284e0fdd7a89963e1e9275cf635caade162022573e029f3d745bd1511f9a11920304da0a84b54b0bcca211327330d6f244 SHA512 756dc8c0f57187d20c491a27fa130ee56c01c156d8c0881f2a0bac7173dd7f039aea38475fdfba52b8c467ea2258cc0af7ebc7ba2053817df5c9e5f50bcc32f2
DIST cinnamon-session-4.0.0.tar.gz 198396 BLAKE2B 713573d445f09cfa4707c3ccaff04bdcc95ea7b60568fc136359258022af287df66992444da462f0488dc4049036deb190523695e519eb61329e922e05871c39 SHA512 7e91bef4e294175fa3333a96d0cb9d06db36c9b5a86d6e52734447ea62d411535760fc46713961a46299ebeb3767a0abd4768279e9f6c176ae882de9b7aedc5e
+DIST cinnamon-session-4.4.1.tar.gz 198819 BLAKE2B bd39b5a89011942239beb76976b01234eaf839e80f1f54d26e1ee988797596d876d2708bee91d4c016a584d76fd9ba1209b4f8e77da8e9db8d7a8b4e5a43dac1 SHA512 f5caf7a3797ca30c397433ea052b7736308a31da291442f64224f034a6bd50eb45307cc8987efe5148eb816c2c70c3033795290386c93f205684796d03b63c22
EBUILD cinnamon-session-4.0.0-r1.ebuild 1545 BLAKE2B 5f2cef2b7bca1f92fe94d66888d796eee226d89eb2b4510262623752be585e3b63fe0b31cca821585606938e7ff47c0b10168b428a7cd4d346e1965051b25bd2 SHA512 72d9629efdef77c31e563b49873651742cf8b2b53c8773c9baae595607b73ffc571354780151bfe676da54f230a56c4fbd910a86824eaec8aef4c4f7e96d8972
-MISC metadata.xml 451 BLAKE2B ef4fb2792b489e2c45e320fd073b71a3ae1095cd18868fb244fe21bd271dabc683b9a0db617338c15ec35e16124f2d851346da60647676053e80e7e21857dc81 SHA512 a96919c80e1cd5ea2536a928572aeb5315c1df6f3414d901f18410a0e2a4cbac8218a4a52a90159df94b35e8946066952fa625ff44ce55670bed9c140d374c15
+EBUILD cinnamon-session-4.4.1.ebuild 1417 BLAKE2B 15d200dbc0213a6ecc73a257f80823a4088d30e4e4f44f7fed7f8f1d31572764a21e90523ec389c0cf659f28baf10ab623ab3cf55da888afe72826259b0a5f3e SHA512 c4e5f59281b992e9dc3b4d91564a61bf705b646e07edfd956ad44ef3fd13ee01ba1fdac0da25462ed7819d2f9a2e706bdda30772534d3bda5deb694f07e4be78
+MISC metadata.xml 686 BLAKE2B 4334d9c97392973277261e35f0694197add46f50b82b77ef657f3c674d84b07691849c0af2088c7a0be8091c8a5a882942d636c45eb8ff73d72ef3bcf6add655 SHA512 10c39096f75f2e3e5b8bf571ea15cafe925e828ee768e6f738193b0f3f55810d0e45148be30775217d5a106c16074dab269310a50448fc1e5f437c2b19872504
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.4.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.4.1.ebuild
new file mode 100644
index 000000000000..01a4029bbcbd
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.4.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson gnome2-utils xdg
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+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 elogind ipv6 systemd"
+REQUIRED_USE="^^ ( elogind systemd )"
+
+COMMON_DEPEND="
+ >=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]
+ >=x11-libs/xapps-1.0.4
+ virtual/opengl
+ systemd? ( >=sys-apps/systemd-183 )
+ elogind? ( sys-auth/elogind[policykit] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ >=gnome-extra/cinnamon-desktop-4.4
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+ >=dev-util/intltool-0.40.6
+ virtual/pkgconfig
+ doc? (
+ app-text/xmlto
+ dev-libs/libxslt )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.8.0-elogind.patch
+ "${FILESDIR}"/${PN}-3.8.0-elogind2.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ -Dgconf=false
+ $(meson_use doc docbook)
+ $(meson_use ipv6)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-extra/cinnamon-session/metadata.xml b/gnome-extra/cinnamon-session/metadata.xml
index 9739e1997aa1..d285b2fb0987 100644
--- a/gnome-extra/cinnamon-session/metadata.xml
+++ b/gnome-extra/cinnamon-session/metadata.xml
@@ -5,6 +5,14 @@
<email>cinnamon@gentoo.org</email>
<name>Cinnamon Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sparky@bluefang-logic.com</email>
+ <name>Matthew Turnbull</name>
+ </maintainer>
<use>
<flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as runtime logind provider</flag>
</use>
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 8e9f36075a6f..4c67556488a1 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,5 +1,8 @@
AUX cinnamon-settings-daemon-3.0.1-optional.patch 3242 BLAKE2B 6f2b64711df08f037155360728ad3f1da4184e2531e2b516b1e656379a9fc8edc26757a9b758f435c227b68c8a9936654b2147602f41b38e6eb198b4045bd10c SHA512 77d0e4c7f72b43b14e5d3106fde06d119f2e20b372e5cfa3565b67cdba6d1150fc1c59866df7db85307d1b3d8b0b2c90d5e04acbb6429e801a3aedd6135f72e8
AUX cinnamon-settings-daemon-3.8.0-accountservice.patch 2213 BLAKE2B 2e867654ff2cb062434621e3f336aa9b833f31c2e7dfc214dbefc74bc2655b95376b945386e29873c9fc696b6e6c027fd6d2d1296c0002a0322e3a1f921c2d76 SHA512 87a15d3274129ea8fe9195f3abb0cfe1dc6d11337e5f2748197cb8b1ecd062e9da1967fe83f11fa7b98af2d95eef9fa4a3f6c55642be2715bcb76355a30fe8ca
+AUX cinnamon-settings-daemon-4.4.0-systemd.patch 1733 BLAKE2B 950b165f39b6a36cb9ebe47a76791dd4526e8ca4a883bc8f9d0ac93cd8f428ac232c4107d39ee98084292742ef465dab37bbc2059d67b1e2c1cc8cd485e5ac58 SHA512 f52fe67e57eb5213899ec249022b27cdc9ef94bf826604baba8ad6727e30ca0dc6f88a452640ae8536b23f33220d2cadc638b3132360d3d93d289e0ab236556e
DIST cinnamon-settings-daemon-4.0.2.tar.gz 662735 BLAKE2B 158e2ee120e2b359c6d84aa52c6b2c9214148fcf48cdc8ed9c777344f21ce82b5c3e4d0b358046abb1de8fc23a43b7cced02b77b43c1230fc2d97db58423e125 SHA512 3e51628339ae7766c37090c82a7550e2f925843ca62ef9cca606568c9771a8f16035735b3db612aae0938553fd37fb6eaf8d30437baa501160221d1b71d0e94e
+DIST cinnamon-settings-daemon-4.4.0.tar.gz 665615 BLAKE2B ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224 SHA512 dc4b0c570b345577bd20e85b44f4c99c3e3c88a2c2aea7c928e1fae931dc4dc07c6dd64c5917661434d35e3ae606c8189c3f77e0658925b5cc6ba2dc1885cb81
EBUILD cinnamon-settings-daemon-4.0.2.ebuild 2156 BLAKE2B 13e3cf48d890322d391cfd2965e45230933d3e876200f0a47d28c95c84ba261be3077eb7e7aa12b4c91c1fb0ddb5b88104ac7d528482377eb8da2ef5303cb19c SHA512 4828186da8669038e71167651b4ca62a73144bc040e01da2593ae270c47d6195ecac0a5ef80cf1e941072eee81c697d6339fc2006ce78fabe8aa778c28f1202b
-MISC metadata.xml 351 BLAKE2B 7693637c46e37d76b95be989ad884a1792426afe83bf8dd4dfcb3b92bca1d5d8c0cdd5cb8df5e14db699064a172136a45ab0673fc138c170f194a4f79f690e1e SHA512 6939d1b669b5c2cc6cdf0a539a632e5b69546e1ba53d88b61c511eb4b7a7465bcf68dd5f132f55241e7615690184f047df98881605ed2632c43cf2e06848ba33
+EBUILD cinnamon-settings-daemon-4.4.0.ebuild 2284 BLAKE2B e0f0b0400f96b26d38975c0333f5cf879e60888fd376b786d116bc790a0def28a47f6e548dd50f1b2526ab5ae170fe1ccf32733d441aee76ef8dd4701948d270 SHA512 9736bf7482e3ec2b4c8534b84ba095a8862d2d730a92021df8d3ea3235d1f6f49f1cace452568c193fcbaa64b5db2f18a9f470c55d5bd9e86bf34c7f7bbea9fb
+MISC metadata.xml 586 BLAKE2B 0f62c9c3c7905386c186760fff8d551961b3897728f123d4387d884ebb9239bc299dc4b63fb8f89f0647ca1d15720959cb93a5127db04f7ee87860655d4c5f3c SHA512 17fcc914b562a15a2142c55b6908fdd602678b823528d8b148405e197be631cad258addf54d2b61bca7b1455902ed70cf5601e79c48011b0b085961f3b2b628a
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild
new file mode 100644
index 000000000000..674a8d9e5626
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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="https://projects.linuxmint.com/cinnamon/"
+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
+ dev-libs/libgudev:=
+ >=gnome-base/libgnomekbd-3.6
+ >=gnome-extra/cinnamon-desktop-4.4:0=
+ media-libs/fontconfig
+ >=media-libs/lcms-2.2:2
+ media-libs/libcanberra:0=[gtk3]
+ >=sys-apps/dbus-1.1.2
+ >=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-5.0
+ >=sys-power/upower-0.9.11
+
+ colord? ( >=x11-misc/colord-0.1.27:= )
+ cups? (
+ >=net-print/cups-1.4[dbus]
+ app-admin/system-config-printer
+ net-print/cups-pk-helper )
+ input_devices_wacom? (
+ >=dev-libs/libwacom-0.7
+ >=gnome-base/librsvg-2.36.2
+ 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-util/gdbus-codegen
+ dev-libs/libxml2:2
+ >=dev-util/intltool-0.37.1
+ x11-base/xorg-proto
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # make colord and wacom optional
+ eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
+ eapply "${FILESDIR}"/${PN}-3.8.0-accountservice.patch
+ eapply "${FILESDIR}"/${PN}-4.4.0-systemd.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 \
+ --disable-accountservice \
+ $(use_enable colord color) \
+ $(use_enable cups) \
+ $(use_enable smartcard smartcard-support) \
+ $(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+ virtx emake check
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch
new file mode 100644
index 000000000000..90b63731f870
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch
@@ -0,0 +1,36 @@
+From 4c19a41429524a2da202b919a335a646103da0fd Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux@gmail.com>
+Date: Wed, 11 Dec 2019 23:29:08 +0000
+Subject: [PATCH] Restore old check for logind
+
+---
+ cinnamon-settings-daemon/cinnamon-settings-session.c | 2 +-
+ plugins/common/csd-power-helper.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cinnamon-settings-daemon/cinnamon-settings-session.c b/cinnamon-settings-daemon/cinnamon-settings-session.c
+index adbe1e7..4d52b21 100644
+--- a/cinnamon-settings-daemon/cinnamon-settings-session.c
++++ b/cinnamon-settings-daemon/cinnamon-settings-session.c
+@@ -378,7 +378,7 @@ cinnamon_settings_session_init (CinnamonSettingsSession *session)
+ session->priv = CINNAMON_SETTINGS_SESSION_GET_PRIVATE (session);
+
+ #ifdef HAVE_LOGIND
+- if (access("/run/systemd/system/", F_OK) == 0) { // sd_booted ()
++ if (access("/run/systemd/seats/", F_OK) == 0) { // sd_booted ()
+ sd_pid_get_session (getpid(), &session->priv->session_id);
+ session->priv->sd_source = sd_source_new ();
+ g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
+diff --git a/plugins/common/csd-power-helper.c b/plugins/common/csd-power-helper.c
+index 5a83072..82c0b22 100644
+--- a/plugins/common/csd-power-helper.c
++++ b/plugins/common/csd-power-helper.c
+@@ -41,7 +41,7 @@ use_logind (void)
+ static gsize once_init_value = 0;
+
+ if (g_once_init_enter (&once_init_value)) {
+- should_use_logind = access("/run/systemd/system/", F_OK) == 0; // sd_booted ()
++ should_use_logind = access("/run/systemd/seats/", F_OK) == 0; // sd_booted ()
+
+ g_once_init_leave (&once_init_value, 1);
+ }
diff --git a/gnome-extra/cinnamon-settings-daemon/metadata.xml b/gnome-extra/cinnamon-settings-daemon/metadata.xml
index da9442eb0216..966474ecf7be 100644
--- a/gnome-extra/cinnamon-settings-daemon/metadata.xml
+++ b/gnome-extra/cinnamon-settings-daemon/metadata.xml
@@ -5,6 +5,14 @@
<email>cinnamon@gentoo.org</email>
<name>Cinnamon Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sparky@bluefang-logic.com</email>
+ <name>Matthew Turnbull</name>
+ </maintainer>
<upstream>
<remote-id type="github">linuxmint/cinnamon-settings-daemon</remote-id>
</upstream>
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 50a6181185fa..5ecf876af145 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,3 +1,5 @@
DIST cinnamon-translations-4.0.0.tar.gz 9742058 BLAKE2B e55931643378ea43508488f431f95f83efb4de8691303da5fa1e91bdee7486fec9881ac75123a2775e88708d40f148fc3a6b0580e447cb370b364d412a8a571a SHA512 a4ecd3808e28de61556f6995c3f21c7170c2fabb81f8c10e548909eca2dabc0b33d912aaa41f4fdbc5d66f573c2e50c8ea9fed93d2fc6200a1e1662291a75811
+DIST cinnamon-translations-4.4.2.tar.gz 11479907 BLAKE2B b1d38e1bac17e254a55d679f6d057ce24b643f0c17126fadb8581e60c81001c0d1dd357244d1f199661f2bddcdc8fece768f37d53c0bfbc61867a8c7ea3b93e0 SHA512 09700cc7fcd2e9e6599db8de994ec257da2be1931c32254af3042583310eeaf729b4dda0006346099922994f95310b32f99239916b5a35f9194bb4f8f8045eea
EBUILD cinnamon-translations-4.0.0.ebuild 1388 BLAKE2B e291b6e9927210e8b2dcd7957a675df25f0aa00bb0a1985cb9454adcec90041aa305ffc0acba7ca260c201a65f3fbb19a0d3e226e59826346f356662b6c7a2b8 SHA512 571365e9a34c19804a33289cb71bbd1b00bf685e835cfb59561801449c5cbce60eb0432c4c004142d312fdc0043ff67a9755f4cda6f12500e532676fd983baed
-MISC metadata.xml 348 BLAKE2B 22e9f760365b2c7e8aee07556c723590b93f615fcab90c687dbaa55f4a32262ef29b1d576f68830caf6c21a315e87009c0101b98fac856c70d88269a12bdc251 SHA512 357310d45466db6b2f600aacce60220f88810d91ff228bdfb874c3f3c7148c6ad599c11d87c63e1b2650361361e6a3accce18700aa15046322514f5065cd0777
+EBUILD cinnamon-translations-4.4.2.ebuild 1339 BLAKE2B 19ef3977cb2b230160dc854bdda597e46f37e7996ccf50881eda930271a86c738b41404bd5813e311bdcf6cfffa2512bf1e7aaf535ccb37fc6a79e85021c3f03 SHA512 7e03a0f489a8c8d46c21e1a22ffff80de2ed7bedc23c0e075de7714242991f6c5474f98245e5d96b506b2b41dc56ccae387e6b03f3f03bd455da58e30c27bdf2
+MISC metadata.xml 583 BLAKE2B 4588fa3c7c5a769805642f054bd0d1a54e90d78cbe58d4036fc80fab598d9033da7122b51d014d8d850a6611cc06b728511370b56429e3b23fde00b372e5c3ed SHA512 ac44c878836886a1e9224e5b5596be826a0926d1c17ddcec4341cc572d495a4a372f3b0a1b6371f488ebcfe27af576a98035c800a973977539dd5c5cd01806ed
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-4.4.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-4.4.2.ebuild
new file mode 100644
index 000000000000..efabcda6bd6f
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-4.4.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 en_IE en_NZ en_ZA eo es es_AR et eu fa fi fil fo fr fr_CA frp fur fy ga gd gl gu ha he hi hr hu hy ia id ie ig ii is it ja jv ka kab kk km kn ko ksw ku ky la li lo lt lv mai mg mi mk ml mn mr ms my nap nb nds ne nl nn no 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 szl ta te tg th tk tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi yo zh_CN zh_HK zh_TW zu"
+inherit l10n
+
+DESCRIPTION="Translation data for Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">gnome-extra/cinnamon-settings-daemon-3.6"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
+
+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() {
+ 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 d5f1fb8d01fc..8023c9cbef3d 100644
--- a/gnome-extra/cinnamon-translations/metadata.xml
+++ b/gnome-extra/cinnamon-translations/metadata.xml
@@ -5,6 +5,14 @@
<email>cinnamon@gentoo.org</email>
<name>Cinnamon Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sparky@bluefang-logic.com</email>
+ <name>Matthew Turnbull</name>
+ </maintainer>
<upstream>
<remote-id type="github">linuxmint/cinnamon-translations</remote-id>
</upstream>
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index f17757e60c7f..ab1f755b53d2 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -3,5 +3,7 @@ AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03
AUX cinnamon-4.0-fix-pillow-settings.patch 1363 BLAKE2B 6683cdb92c4da3e09b8f6759216676d666ce832f3687f2775914e27a0f0a3d1427be7774aabc6525f601204682471da3479b35c2bcc3dce3e08929b7d4761b48 SHA512 cd86597c4c5009d8227774d96c375d52c8ab42b944e7dea7013f94c2616511be9b5e3b79b812c65714f58bc67c3a32f34ec71ff0afd4f9ea3c5aea6664817946
AUX polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01d0286e000997e91cea344a4d4ac8d2073d4f268e2e58791d675e3e3f869dc792572c743ff01bf0e92ff87b85686e5a63f0db646b2bf8fbc SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db
DIST cinnamon-4.0.3.tar.gz 2325905 BLAKE2B 8ff07f8f76ae0c0e973a9113e258a31948afc68066e27ccd7e9576d6beb5328aa8cf2c5d97e6c564f3eee9a5bf66a23241270de3a82a1fb56fcf79680b219294 SHA512 d29295dc08971ff6dbd71066d700037718fdb1399bbc4f483903be7a10bfa509a904db9de064a263acb6956b4a1623c1e37a0a9f28819074eb3a93d3a5866db1
+DIST cinnamon-4.4.8.tar.gz 2285252 BLAKE2B 8049093582c57d3e60f570561265b4edbc117e749e228b2d9638ec3afb2a33c1675604e4e8283c683a0fb54608f742552e89da8fc57fafd01bb6ba1567dc1fe3 SHA512 aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978
EBUILD cinnamon-4.0.3-r2.ebuild 6935 BLAKE2B 41a1a5c262ce2484e95ada2fc8cbeb583547d5a3b384b11c20747b247c1c9804ca3b6510880aeca1a4d232308105cc0327ea9f70b6f5499844f0a5498c58a54c SHA512 4c47d0f3e807c279abfdc5e57413747d57016fb79cbf4383c1bf18a7a9c3806904ff929f043b87ac50fe4b248afb8a96aa14ef1f78ef4348097d0ce42982c660
-MISC metadata.xml 335 BLAKE2B cb8a6325c1c826a1e7024b00fab8c93eefc54517d38b642b9df3041efbe37864a53ae0258d5a374aeaf83afe3e5a9b442359e1058765aa74ffb042b0306f50dd SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb
+EBUILD cinnamon-4.4.8.ebuild 5622 BLAKE2B 89b253b06f80dc03bac458777059079cf7d331b0ae684917e02944d936ad875c2701fc016e0353cbc804988876e187fdaad8b430ff2018edbb9445f9c143ab38 SHA512 702307caa03256616eb68cec0a6d753c81064c68b5f9d7753154551418379251e43ce00f0d56f04896c9a5cc6d0cb0e506f241c8092f12ed2a99d5f7b4c83202
+MISC metadata.xml 570 BLAKE2B f486a9dc0b459f4c00dce4f43b7ac038f1f186a6a3904928d4110fa26521c5498567951aba2960d1227ef204a4b6dd0572a8d3afc2478a89828a606a815163c7 SHA512 eaa0827c0f6a6642ba1ac353a6a5bfdc83bb8f0a5c689064f2a5481e46b9df781393168f222d4918b6aacda6b04cee21bb23ed3cb33b7f5ffc7f1b350787c49c
diff --git a/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild b/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild
new file mode 100644
index 000000000000..8fb8410e1ee3
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-single-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+
+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"
+
+IUSE="gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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-1.29.15:=
+ >=dev-libs/libcroco-0.6.2:0.6
+ dev-libs/libxml2:2
+ >=gnome-extra/cinnamon-desktop-4.4:0=
+ >=gnome-extra/cinnamon-menus-4.4
+ >=gnome-extra/cjs-4.4.0[cairo]
+ >=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.12.0:3[introspection]
+ x11-libs/pango[introspection]
+ >=x11-libs/startup-notification-0.11
+ x11-libs/libX11
+ >=x11-libs/libXfixes-5.0
+ >=x11-wm/muffin-4.0.3[introspection]
+ dev-libs/keybinder:3[introspection]
+ >=x11-libs/libnotify-0.7.3:0=[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. 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
+ sys-power/upower[introspection]
+
+ >=gnome-extra/cinnamon-session-4.4
+ >=gnome-extra/cinnamon-settings-daemon-4.4
+
+ >=app-accessibility/caribou-0.3
+
+ dev-libs/libtimezonemap
+ x11-misc/xdg-utils
+ x11-libs/xapps[introspection]
+
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ dev-python/pypam[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ dev-python/tinycss[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/xapp[${PYTHON_USEDEP}]
+ ')
+
+ x11-themes/gnome-themes-standard
+ x11-themes/adwaita-icon-theme
+
+ >=gnome-extra/nemo-4.4
+ >=gnome-extra/cinnamon-control-center-4.4[networkmanager=]
+ >=gnome-extra/cinnamon-screensaver-4.4
+
+ gnome-extra/polkit-gnome
+
+ nls? ( >=gnome-extra/cinnamon-translations-4.4 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ !!=dev-lang/spidermonkey-1.8.2*
+ gtk-doc? ( dev-util/gtk-doc )
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+src_prepare() {
+ # Fix backgrounds path as cinnamon doesn't provide them
+ # https://github.com/linuxmint/Cinnamon/issues/3575
+ eapply "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.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
+
+ # 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/cinnamon*.session.in || die
+
+ # shebang fixing craziness
+ local p
+ for p in $(grep -rl '#!.*python3'); do
+ python_fix_shebang "${p}"
+ done
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+ $(use_enable gtk-doc) \
+ $(use_enable networkmanager) \
+ BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+}
+
+src_install() {
+ gnome2_src_install
+ python_optimize "${ED}"usr/share/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
+}
diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
index 216784b94f4d..5070fef67adf 100644
--- a/gnome-extra/cinnamon/metadata.xml
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -5,6 +5,14 @@
<email>cinnamon@gentoo.org</email>
<name>Cinnamon Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sparky@bluefang-logic.com</email>
+ <name>Matthew Turnbull</name>
+ </maintainer>
<upstream>
<remote-id type="github">linuxmint/Cinnamon</remote-id>
</upstream>
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 038fc9a4633f..a6e8eb21680d 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,4 +1,6 @@
AUX cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch 860 BLAKE2B 267f2ade6aeb3178f98f68a7350cfdf3bdb6b421c10f064b4decf63e98c13438d73ea3447bb351b8f4605873c35c7a5612a16898e96e37356dbb7cb1d48fefa4 SHA512 8505482101109f4f7fbc8d81084fda1c22ebaf14036138c3812ce3e7b8434edc8b0b47930652e66f11a2d5fe04f004e62791088871267b7dc43396aa026778b6
DIST cjs-4.0.0.tar.gz 459595 BLAKE2B 63ed660480f87fcd57103965226b3457dc70586019c9ea7f446af86f0b18b493c315566c608f5e999f3b64765d71eb5d463053f3d859f7121c95dcc74d04016d SHA512 86baaba3721b71b266c560180ba20af43eed0d2b8fc37af0d24c7c0c36252e2af85da928b42260074f236f0bc4d4f4f28d20127021e67f23a22b042a09a3baa7
+DIST cjs-4.4.0.tar.gz 463019 BLAKE2B af276cd8f9ef0f66a6f4ab3e0072b485e33015e070bb796818907964df0696240b753f7a271bf45db788eb244e0cd1fb866f3b78798adf3ef8f9e76825fc4d74 SHA512 3b2bdc55ab572713d6b6f92978522b290819656f64fef620659065ff5673a04a0585b83a1a0248116570ac1cfee4f54acc228f355c02aa4e0a2a13b59fbafed2
EBUILD cjs-4.0.0-r1.ebuild 2035 BLAKE2B 98606c8974acd3162c3519d6729ba5f2cd718afaacccedabe70e249ff01d49cd8d0d23783f1b443ef1713c732bd12a9b2478cac48de3fb4ba578c0b38ac3df2d SHA512 14e993aa9c7f57ff34d69e12ac0f9eddf6fe49bddda21cef80125ca5823d44d40ca12d71b635dec5f4c50ada953d3748fe843eb91272c6cb549793513b5021e0
-MISC metadata.xml 330 BLAKE2B 9fd63621288d25f6643471279d5f5be01cc61d40ad7de618ba140add34415ecacceed969c7f57f70b55b20646947b658f4451f0427aa38a82ec0c36f7ceff2d2 SHA512 04f852b262c14801c718e80553018fbb5a48725200eb3bc502f0feb552881d0d75b9aca97bc6cd4247ce753b3b6cf95c8e6a8d9214059aeed4da39a6b12e6158
+EBUILD cjs-4.4.0.ebuild 1844 BLAKE2B bb1da618ac42aeb96813eee02024e9ee190a2eb958c6adf6f06677c61560c4bac81dcd3e418486e700f5eb6acae998ee949b77ee65c1c13f9d6c093723cc61d6 SHA512 c150c1e2fe3b7629cc4e01663967adeca6035a5219326bd7ccb306be2aca20e30cf18ce16420dd093c95c56178b3ddebc7f75319bf723c2821263058a8fa686d
+MISC metadata.xml 565 BLAKE2B f6539f17247ac5dda8a38c3514521a60ef0e4340483fcf124b0f06965d83060543c2b3351c72d50903c6eedc20ea9cd671ab6eb5fb4f20b748b02342d60d8834 SHA512 720cba6409d0c9f3a54e16a48b5409de021ce63be5daddf7e59dc81e91d4b28bdc3e78e541c668b6129c6f9ef4183303abf05b0f0d9a384588ebc23523b3541f
diff --git a/gnome-extra/cjs/cjs-4.4.0.ebuild b/gnome-extra/cjs/cjs-4.4.0.ebuild
new file mode 100644
index 000000000000..4bd638f43d71
--- /dev/null
+++ b/gnome-extra/cjs/cjs-4.4.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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="https://projects.linuxmint.com/cinnamon/"
+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:52
+ >=dev-libs/glib-2.42:2
+ >=dev-libs/gobject-introspection-1.41.4:=
+ sys-libs/readline:0=
+ dev-libs/libffi:0=
+ cairo? ( x11-libs/cairo[X,glib] )
+ gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+ 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
+"
+
+RESTRICT="test"
+
+src_prepare() {
+ eautoreconf
+ gnome2_src_prepare
+
+ # Fixed in 4.6.0
+ sed -ie "s/Gjs-WARNING/Cjs-WARNING/g" \
+ "${S}"/installed-tests/scripts/testCommandLine.sh || die
+
+ # Fixed in 4.6.0
+ sed -ie "s/40000/50000/g" \
+ "${S}"/installed-tests/js/testSystem.js || die
+
+ sed -ie "s/'Gjs'/'Cjs'/g" \
+ "${S}"/installed-tests/js/testExceptions.js \
+ "${S}"/installed-tests/js/testEverythingBasic.js || die
+}
+
+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
+ docinto examples
+ dodoc "${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 9e988588122b..bbfdb56cdcf9 100644
--- a/gnome-extra/cjs/metadata.xml
+++ b/gnome-extra/cjs/metadata.xml
@@ -5,6 +5,14 @@
<email>cinnamon@gentoo.org</email>
<name>Cinnamon Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sparky@bluefang-logic.com</email>
+ <name>Matthew Turnbull</name>
+ </maintainer>
<upstream>
<remote-id type="github">linuxmint/cjs</remote-id>
</upstream>
diff --git a/gnome-extra/eiciel/Manifest b/gnome-extra/eiciel/Manifest
index 32026cfbc283..9f19ea5f07b3 100644
--- a/gnome-extra/eiciel/Manifest
+++ b/gnome-extra/eiciel/Manifest
@@ -1,4 +1,4 @@
AUX eiciel-0.9.12.1-xattr-header.patch 1368 BLAKE2B 6f8e8b2194286f2cf5314dc86c429ab17336a5f95a757c76d4542069c7ebdc840c9866d97dacb3c418578d0c87d0c1127b2e57ea31e059ef9a2c9df8b69d8ea0 SHA512 22286ea3973845ae5b489855ca0df5813ab95b46eed53820d5b472c2baa44327c673d4aa1c4b1d792cfcd59dc2f492612cce7b2e7f648223d6314d44773cc7b5
DIST eiciel-0.9.12.1.tar.bz2 723727 BLAKE2B e32f3af9f4664610169fc718a9d274ae9d91c5d0d56a6be9872da1c105b349584300879742b753a02ad621cdc597591c52f47d705222ad52cb37b0750616a553 SHA512 f54fbb149eed7f8fd534b77ec5e2d0f579c68a39afd7417a2298d75c7e95c459b49fc8ccb66d0188956ffaadf3bcc8a3eb048425cb82fc875573eb131f4b0494
-EBUILD eiciel-0.9.12.1-r1.ebuild 882 BLAKE2B 26d26120e716a010b70e1d0181fcbbad2c17e22ad41f32f2046aefb734c2fd7e4039053457cc9fc8152897cedbec32d813e7b9b92c4a61c5dd28e2ac8325303a SHA512 c2442f2e357bbd52e17f2cc80b226be2c13db7bba602c9dea27563a6387d976fbd6dc095af9e9818c55cae662da3a7eca23558d79bedc1a29a212d9593616269
+EBUILD eiciel-0.9.12.1-r1.ebuild 884 BLAKE2B 3864d3ca1e9c01f10a47c6123ac4874e8356147fc7cd410eea7affe45615a8ba117f98e1514164f0d254eaacf9149cd14a497d70a6aab69f270f08387811bd38 SHA512 0911a36880069cef99e69d5f98038d9c35393c58c5f6f148d3a68b5f967333cce56909e3f5ce4442cc05af35541be9c7609a4b34ce52261235cac17a67ef938f
MISC metadata.xml 328 BLAKE2B 73e7203ec24879a8db2ef2adb8b1b3c51634ef3a6b320a8070c24de0530d4ce755568fc2140e09d0f585043b1753c4c505c5adc6a8abdf9658ceceac7f44bfe9 SHA512 37fa2d1b3f4a4978cbf04345e97c0f02ce610b29f97e69c9384509ec5a96393fe1feeb2a31645361027ceac8d32fddf4b7902f076ed28c83488f59e43269d6f2
diff --git a/gnome-extra/eiciel/eiciel-0.9.12.1-r1.ebuild b/gnome-extra/eiciel/eiciel-0.9.12.1-r1.ebuild
index b0bb7e7c6f00..1ffc189370d6 100644
--- a/gnome-extra/eiciel/eiciel-0.9.12.1-r1.ebuild
+++ b/gnome-extra/eiciel/eiciel-0.9.12.1-r1.ebuild
@@ -8,8 +8,8 @@ GNOME2_LA_PUNT="yes"
inherit gnome2
DESCRIPTION="ACL editor for GNOME, with Nautilus extension"
-HOMEPAGE="http://rofi.roger-ferrer.org/eiciel/"
-SRC_URI="http://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
+HOMEPAGE="https://rofi.roger-ferrer.org/eiciel/"
+SRC_URI="https://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index fe12b533f769..21a09a182560 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -3,4 +3,4 @@ DIST gnome-commander-1.10.0.tar.xz 7421328 BLAKE2B 4cfb6a5d445217de10007d4371cd5
DIST gnome-commander-1.10.1.tar.xz 7424500 BLAKE2B 6abddf8dae4bc0a1d740ffee49ccc7d816d783bdb5c2b90c9d0681c1db5fa3f42700e65a780881400c1af038d7dfe7f458a98cf2f8f1c1b0fc6f93a3d58dc069 SHA512 b5bc548444149e00f29e6e3b7f785c99a08d27a0a2642cf78c203411a8d2937341a76685b09172047162afe3e0fc92ff13c82bdbd8105281d360c1df44b4702d
EBUILD gnome-commander-1.10.0.ebuild 1695 BLAKE2B 7b9ede3cd802a7eb6582c4fd60694fd5fe1941a5a0226a5e936eaa9c5567e02eb52f2b6d81bf9868112712cf8e38fcc8a578fc03e07c7090cad06626ce74cedd SHA512 b67b77112f488e8b2642f908bded2e38f59249203b3c04c571b8dfb936553b741296d514398c648fc46637acc040bcf846da000ed6c53b5050a6b4545ae4c583
EBUILD gnome-commander-1.10.1.ebuild 1715 BLAKE2B 14b9293f21ba40f2c199895b23c7d243f7ff9e64e9b036e920f07a364113c27aaa358832e2da1c1f71ae704a54a80147c665b92e4f90ce13a216d6625db43934 SHA512 c65bcdcf1362acea5903de785f1b48e278005d18386a96229d5e9f5718928a7813890965bdbd1e7238dccbbb785e4f474555270788e1d49f60807673ef04282c
-MISC metadata.xml 1119 BLAKE2B 0b7dcdf724e6f9b2041aea2da4468c081e6d14b2fc698424e7e8c6edd0675eb07f904813a3f07a512beb6cace17977f6d234442c6eb5155d2da4e74cf8eb48f1 SHA512 05354f8bc13305c98d1e7ac7590db2e3ba47fbb9e60d099d989c8790d3807ce5568b080bd6f6d2a582693fd056b2654d7ad7992b4b1961b54d982b761c369fb6
+MISC metadata.xml 947 BLAKE2B 69400223aaa35e6362539930a5f49fda4535c82554e6c9283ef8e4981a1da274d70d25c9464b69b0ca1810b55cfa649dc917f561094c7f0429378330499a49e5 SHA512 8411929f3f62832bfe5e3bf0f54b88450d82bb5b6a6cc33a45ec74e41f31a8a1f5669809a2ae6f3aa6b7bceb559ad18cef064b7fe56e892be87588ca6d82b4ba
diff --git a/gnome-extra/gnome-commander/metadata.xml b/gnome-extra/gnome-commander/metadata.xml
index 61e540ddb048..6e2e86e4f6bd 100644
--- a/gnome-extra/gnome-commander/metadata.xml
+++ b/gnome-extra/gnome-commander/metadata.xml
@@ -1,28 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>u.scholz83@gmx.de</email>
- <name>Uwe Scholz</name>
- </maintainer>
-<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-<upstream>
- <maintainer status="active">
- <email>u.scholz83@gmx.de</email>
- <name>Uwe Scholz</name>
- </maintainer>
- <changelog>https://gitlab.gnome.org/GNOME/gnome-commander/blob/gcmd-1-4/NEWS</changelog>
- <bugs-to>https://gitlab.gnome.org/GNOME/gnome-commander/issues</bugs-to>
- <remote-id type="freecode">gnome-commander</remote-id>
-</upstream>
-<use>
- <flag name="chm">Enable metadata support for Microsoft Compiled HTML Help files</flag>
- <flag name="gsf">Add metadata support for OLE, OLE2 and ODF</flag>
- <flag name="unique">Enable single instance support using dev-libs/libunique</flag>
- <flag name="pdf">Add metadata support for PDF</flag>
- <flag name="taglib">Add metadata support for ID3, Vorbis, FLAC and APE</flag>
-</use>
+ <!--maintainer-needed-->
+ <upstream>
+ <maintainer status="active">
+ <email>u.scholz83@gmx.de</email>
+ <name>Uwe Scholz</name>
+ </maintainer>
+ <changelog>https://gitlab.gnome.org/GNOME/gnome-commander/blob/gcmd-1-4/NEWS</changelog>
+ <bugs-to>https://gitlab.gnome.org/GNOME/gnome-commander/issues</bugs-to>
+ <remote-id type="freecode">gnome-commander</remote-id>
+ </upstream>
+ <use>
+ <flag name="chm">Enable metadata support for Microsoft Compiled HTML Help files</flag>
+ <flag name="gsf">Add metadata support for OLE, OLE2 and ODF</flag>
+ <flag name="unique">Enable single instance support using dev-libs/libunique</flag>
+ <flag name="pdf">Add metadata support for PDF</flag>
+ <flag name="taglib">Add metadata support for ID3, Vorbis, FLAC and APE</flag>
+ </use>
</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-appindicator/Manifest b/gnome-extra/gnome-shell-extension-appindicator/Manifest
index 6008376c1701..eae41b12f701 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/Manifest
+++ b/gnome-extra/gnome-shell-extension-appindicator/Manifest
@@ -1,3 +1,3 @@
DIST gnome-shell-extension-appindicator-33.tar.gz 32600 BLAKE2B d24e18dc3697baf5f6a5466da6ba6bc4e699bb20cabde80dcfb007b339246cfb940af4407bc99d22632a1dfa1fe255a60fcf608ec50af88e3edbb2dcbceddf69 SHA512 ceb79a1fa22440210477e53e1ebca3db3ea81eb8a45613c46d37f44ebb3e063b626a073df519af978becf1c6a83d68c02a26f22bf0a9ed43e2299bbab7acb599
-EBUILD gnome-shell-extension-appindicator-33.ebuild 901 BLAKE2B b896325223cadabc32b8dbe698dedb15a2f54eb34dfd6deedb2dc7abaf951eed167e57905676c69509c5690b6fcd5529a8e54040cb53a1e23f552500dcffa46c SHA512 51d87864fbfc517edf2824f76fbb492ef1fcca2ad39442479989978fd4056bb8ad9e19f280a6778518b68f745409002ca22b63557d4f449c2588dfc708bc50f4
+EBUILD gnome-shell-extension-appindicator-33.ebuild 899 BLAKE2B b21b9cc8e0ff4caba11eaa8a37d0388c850c8da5feec13b6313158d8c1cff079f8f07ff9fbc4c2121bb7024b5f66e4ec23c49437c62da7d3949bb7f3315e47d3 SHA512 231365e25199991cc36994cd6d43524636baca5b97ee826f495ba23f3c69d0b474a8dcad9f9c2fcf3158fea7f25cff517f76999487087492a6476f69cd30bd99
MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-33.ebuild b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-33.ebuild
index 933325eeb279..710cb6b5ffbf 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-33.ebuild
+++ b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-33.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v$
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 0d842a193ea1..98958bb7b3e1 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,8 +1,11 @@
AUX gnome-shell-extension-gsconnect-28-silent-flag.patch 1637 BLAKE2B 9f02424b134f0cd77c00cc9dd9fae774826bcc40750a8fb053edef6b2a75d3dc92c7ef53a89abb3d2db3e6787066c7971198e909cf2d52fccb7388fae4341c2e SHA512 05a23e0aab06108e778a07ab8ed780115a157496c5c08a4676ec4d6a58bb4ecc6860682e3cae37f1b5734a8757f1e7bd3148d246518357ed85295e00a5c0c4d8
+AUX gnome-shell-extension-gsconnect-33-avoid-repetitions.patch 1822 BLAKE2B b8e882b30fe642ac9b4b99dabdbceff3ac45f44ca988f06f42e7509ed150fb304a813b00275cb63f61af78096b8e44e751ccfff201cdb6ed9ca7c10690e4bba1 SHA512 a2be4ed1cebf339b98fbc7c84bb44da20fccac36f7a2ef09a3986baf8a7a177462f544579a1d0b967880915284dbe26d0b108a48e0a4d49fea4de290983642d0
AUX gnome-shell-extension-gsconnect-33-notifications-limit.patch 1506 BLAKE2B 12054a8465dfdef3fdc52f4b20b66e1607c9df0f429636e4e296a7fe473f761abd717c6f7a0be6ea0f29df1a3c66bf4f24b7b0840f1097f2b7ba3885b46559e8 SHA512 d55a3a389da36f65b435287b0571f3ab3ee661ef892c45b27f3f9d30aeec69b01f9fb2c182e8272d62a1db7df5dea46650d3cf2e094d2df0f5f9b480e0ca93ba
+AUX gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch 1317 BLAKE2B 3972f38098ead8409a5a27f2c3a5fee28ed7923d551e16827a5b65bf1b02393179312e5c5494e5d7104ea7fff50aec096e41dd7010197b2e779ff113fb7167f3 SHA512 c6262256c971826e7aa56bbddca72f3a1731a3b70e472b0c64901c834f4787e26c10d2ed177df6f4901e4b5524c1a80494bde0a5bfdc5c94e8ede9ae686037d7
DIST gnome-shell-extension-gsconnect-28.tar.gz 312814 BLAKE2B 217e32e799c6300764f23245c0d474b025918f78808c026175fd3262b4c463b913969290156782151828cdcb15647002e7c7b8bff926337960a78d6d98a16c77 SHA512 a806f6532e68544832dac47da1fdf23edb7625c6cac4ad7f1c1a1b0a5d69af159397bc6f2bb63a74907669db5ea192343b7d2fc8eb2992bcc6a1834cffe1fbba
DIST gnome-shell-extension-gsconnect-33.tar.gz 314704 BLAKE2B fa4f2eb6325356a058b24b92b683ca7331af30112d27060e8ee191c21a3269639da58992d53434c7121ea511ee9e07869b082f908b59e19fc2434f3c07e09624 SHA512 26ef929b9b128db0cb29fba22203a3afd500c5b1c3bac6917926a60350d271e67bb0985866f84877355c079fe4a5656b8ac5e8dae976d17d9a068cc825293bce
EBUILD gnome-shell-extension-gsconnect-28-r1.ebuild 1755 BLAKE2B ccb6adf109422ac08ad98687c0cd2be59867c71da65bd8fced4108183427704ccdcc8f385eb99effd93185a43c9c2bde67f3c7a7793779b6d1ffa73c28e879e5 SHA512 177bc30496d31b870394d8de33ed59dc60944f580ca3060538be71411817cdff6fe873aea396d833b27c36dd40af20203e2f7030252663ff4000cf8e42affce0
EBUILD gnome-shell-extension-gsconnect-33-r1.ebuild 1664 BLAKE2B bddb769e769f33c01755b4eeccf9e7765e525a9467c49b6ea9c14cff293305ab20f342b44acf4a4e1f159e7814d519b7ef522743714b3fa48f5fd556411f8ca4 SHA512 af81ce708d1fe19d409ccf64ef40b6acdcd02c76607565b3bfee7f097480eeedc159c58d10de4b6a8639abfb03ec19bd6ab9ccc91229afadad7f4ad7bd73732e
+EBUILD gnome-shell-extension-gsconnect-33-r2.ebuild 1844 BLAKE2B aaba98359ff79fd1cc1ec936b1cc428d245231458c0dce6bebcfb5e880d30358241d7e750569286c6af70d4d245e66af4afe36da5bc16e25d1a28250420607f5 SHA512 47c0d2c17d96dc6256e633278cfe295cde4c0e65a6940939aeed3a47909f221c00220c3905825e741bdc369cb07d74bdb8082c164837fd844a1d9c5a2eb2df04
EBUILD gnome-shell-extension-gsconnect-33.ebuild 1536 BLAKE2B c00fffeed8cd0ac7444cc1dcb4629742da2327b058c6be3d4c9183793abeccbce7e2a6ea5aeb82053fe65b828ccd32084eb544cc496f723c9145d3c91240391c SHA512 4d9ae97e9949ea93a2fddb48184a3c5d015b3e39076ad2241c196f7f662c2b05de5017ccf761d4fbeb13ebec1b953fb540f35187e874e520cdd44e3970d38376
MISC metadata.xml 321 BLAKE2B daf09efc56bcbf90c8a190e25127a11d12fa7935ee49fbbb5881f1aa3e552485e63ffd9dd8e4099260b504ebdf2a7342a868328cd591b8f4ea1dde173292a882 SHA512 f8b184239c05241cac2b86acfab2f265297cee49a7fe254633181208ec7d29b875582091f34ccc0d8fed2fa41bc4488509a913d96efc9ca8155cbed5f362683f
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch
new file mode 100644
index 000000000000..d7ed8780ee0b
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch
@@ -0,0 +1,51 @@
+--- a/src/shell/notification.js.orig 2020-05-14 13:57:38.781404129 +0200
++++ b/src/shell/notification.js 2020-05-14 13:57:54.335642763 +0200
+@@ -200,20 +200,27 @@
+ this._notificationPending = true;
+ let notification = this._notifications[localId];
+
+- // Check if @notificationParams represents an exact repeat
+- let repeat = (
+- notification &&
+- notification.title === notificationParams.title.unpack() &&
+- notification.bannerBodyText === notificationParams.body.unpack()
+- );
+-
+- // If it's a repeat, we still update the metadata
+- if (repeat) {
+- notification.deviceId = deviceId;
+- notification.remoteId = remoteId;
++ // Check if this is a repeat
++ if (notification) {
+ notification.requestReplyId = requestReplyId;
+
+- // Device Notification
++ // Bail early If @notificationParams represents an exact repeat
++ let title = notificationParams.title.unpack();
++ let body = notificationParams.body ?
++
++ notificationParams.body.unpack() :
++ null;
++
++ if (notification.title === title &&
++ notification.bannerBodyText === body) {
++ this._notificationPending = false;
++ return;
++ }
++
++ notification.title = title;
++ notification.bannerBodyText = body;
++
++ // Device Notification
+ } else if (idMatch) {
+ notification = new NotificationDaemon.GtkNotificationDaemonNotification(this, notificationParams);
+
+@@ -237,7 +244,7 @@
+ this._notifications[localId] = notification;
+ }
+
+- if (showBanner && !repeat)
++ if (showBanner)
+ this.notify(notification);
+ else
+ this.pushNotification(notification);
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch
new file mode 100644
index 000000000000..7301bfe11321
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch
@@ -0,0 +1,34 @@
+From 959799d934360f95a2e49223b64ffc77bba2736e Mon Sep 17 00:00:00 2001
+From: Andy Holmes <andrew.g.r.holmes@gmail.com>
+Date: Fri, 8 May 2020 21:26:19 -0700
+Subject: [PATCH] Shell Notifications: account for apps that insert newlines in
+ IDs
+
+We need to account for the totally reasonable practice of inserting
+literal newline characters in notification IDs, like WhatsApp does.
+
+Not doing so was resulting in such notifications failing to match as
+device notifications, allowing them to be duplicated in the message tray
+
+closes #788
+---
+ src/shell/notification.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shell/notification.js b/src/shell/notification.js
+index e7a5f67ce..eef623a71 100644
+--- a/src/shell/notification.js
++++ b/src/shell/notification.js
+@@ -16,10 +16,10 @@ const APP_PATH = '/org/gnome/Shell/Extensions/GSConnect';
+
+
+ // deviceId Pattern (<device-id>|<remote-id>)
+-const DEVICE_REGEX = /^([^|]+)\|(.+)$/;
++const DEVICE_REGEX = /^([^|]+)\|([\s\S]+)$/;
+
+ // requestReplyId Pattern (<device-id>|<remote-id>)|<reply-id>)
+-const REPLY_REGEX = /^([^|]+)\|(.+)\|([0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})$/i;
++const REPLY_REGEX = /^([^|]+)\|([\s\S]+)\|([0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})$/i;
+
+
+ /**
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild
new file mode 100644
index 000000000000..5b9bc72ccdc8
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils meson readme.gentoo-r1
+
+DESCRIPTION="KDE Connect implementation for Gnome Shell"
+HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
+SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nautilus"
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+ app-eselect/eselect-gnome-shell-extensions
+ >=dev-libs/gjs-1.48
+ =gnome-base/gnome-shell-3.34*
+ gnome-base/gvfs
+ gnome-extra/evolution-data-server
+ || ( media-libs/libcanberra media-libs/gsound )
+ nautilus? (
+ dev-python/nautilus-python
+ gnome-base/nautilus[introspection] )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="For knowing more about how to do the setup, please visit:
+https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
+
+PATCHES=(
+ # From 'master'
+ # Shell Notifications: set a limit of 10 notifications from GSConnect
+ "${FILESDIR}/${P}-notifications-limit.patch"
+
+ # Don't show duplicated WhatsApp notifications and avoid repetitions
+ "${FILESDIR}/${P}-whatsapp-duplicates.patch"
+ "${FILESDIR}/${P}-avoid-repetitions.patch"
+)
+
+src_configure() {
+ # nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
+ # https://bugs.gentoo.org/694388
+ meson_src_configure \
+ -Dnemo=false \
+ $(meson_use nautilus)
+}
+
+src_install() {
+ meson_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+ ebegin "Updating list of installed extensions"
+ eselect gnome-shell-extensions update
+ eend $?
+ readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+}
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index e296d17c3c67..ba9e4ecc6f33 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -3,5 +3,5 @@ AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 BLAKE2B a8dc2b9359aaf3f749
AUX libgda-5.2.4-format-security.patch 1003 BLAKE2B 7b8727e080b0a82645a4f9cdbe718a814b22fd8939d613dc6100b85ce589cf1cd8760a1d515c8ffb7221ff83ce09abbc841ab6a05520c3a804c4eeefe1588359 SHA512 b723fff823b4de0ed79883d8b2c9e44e3ae26bac919992afe2eb055aaac972ee188bc28865497e3b6b0e613e8b7977061151e489fef31c99b5ce783928e9f42f
AUX libgda-5.2.4-jre18.patch 450 BLAKE2B 1ce265d157bab47f94cc4ffcc620813efd0683a78b516e5b8ecb90f0d3d69b6b6daff7b30c2ec24842d6726804787d06e8b5858a75beb7c4b41d6cf4304d0f0f SHA512 4280b18ac16a1831aac433a2dc64f0713f8668b31d18465877861e0c0e2dd5eb2bc2aa70cdf0d742da4b6c48f2b7ec7bd7f109de99436f84c5d155c2dc4fed94
DIST libgda-5.2.8.tar.xz 12506208 BLAKE2B 7174aa862f04ec6c73fe98560914ee307afe75b9713adad70fa7dedf97fd4ddb79c98ad1e9a8919218f7453014d8e71e42730e168fae7c6ca0dc58ae99b0558e SHA512 6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece
-EBUILD libgda-5.2.8-r1.ebuild 5064 BLAKE2B 0f8de10d2ef7186ef095a2bbe961204c495493b93d5f13eefe8bfa3d684beb437b78add7d1f426e91f0d5e72a3574b05cda9e01b925cf97736d7caa114f8929e SHA512 6322757c4e8b8f9d16e54ec57271be8cf5963a57810b9fe0bebecf58f7f3c5a6283bf4030bf0a4751bef87759284ebf10e9de88685256a8d5ac945d811fdfdc0
+EBUILD libgda-5.2.8-r1.ebuild 5065 BLAKE2B 4fefa8955dcc4b8871b4f76785980f02724d5361a7145919b04755322ed3461e3dff07e776764940d567ab59a226ad2a8cfd1206393a4c9ac08cad2c7b31b18a SHA512 71ec8f0466157191404cc17c3dfc90b28910bf0b45c07c64fa7a0d0be011d3af9b75cc535f5155da76da9b85c04011489c426f411ae75904d1ff3377468e8895
MISC metadata.xml 759 BLAKE2B ce4b021f5697460110c6d976231579b4299875991f28fad526ce29b83da1db248d0be46eb83e1f2704c3aa997b1a7f4546f901410ee1751dbd2d03718fc2e935 SHA512 aa0bce4d0262948dc57ce220d453a92dd957db925dc381a362055e5a5d09479cf3954e1bc19966cca21ab0e4d9e41f8611242bcf9f3fe1051388c5a8094c851e
diff --git a/gnome-extra/libgda/libgda-5.2.8-r1.ebuild b/gnome-extra/libgda/libgda-5.2.8-r1.ebuild
index 0b722c5e496f..c6837a81f02e 100644
--- a/gnome-extra/libgda/libgda-5.2.8-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ VALA_USE_DEPEND="vapigen"
inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
DESCRIPTION="GNOME database access library"
-HOMEPAGE="http://www.gnome-db.org/"
+HOMEPAGE="https://www.gnome-db.org/"
LICENSE="GPL-2+ LGPL-2+"
IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 75b914147886..a962e94ab455 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,4 +1,6 @@
AUX tracker-2.patch 821 BLAKE2B 748b88d6487780c35f51fda765fe6539d2ff137123a34f5dc2779332c8d5445a3f7dd40aebbfc0080acf812a766e18b7119b64f283f76552b44c025c9a1370c4 SHA512 0a07de349129f7a81e2e02ec99008d091544b0961efd3188a2309489c3c48385d485194615bbb4d7817c0e651ec6a6a197861cb5f2d5841c990d2d540f58672d
DIST nemo-4.0.6.tar.gz 1449313 BLAKE2B 0d80e23a503c34e52f126635a7b3df54f7f0d336a637f14e11ac8e1d252a4b7bd43173c362ea0f24602fc4eceb71c97d651ddec2f2922d70c32518fbc8d15424 SHA512 87006f345317b37093daed1081880a4c28eb84438b9c43f9b62211824306074969e5e21df57cfc5fa163d66d16bcf7ba6c26674e27353cfd8a91cf2bfe82099f
+DIST nemo-4.4.2.tar.gz 1462269 BLAKE2B 365cd98a05c0c4aa1c86a3e7a565904852bd02d92ace8593043ae8a58f5b9d3eda71e8b0d329a177ed59c0d8f1330ae61f5bcc6671110e82bbd9baad84faa9f0 SHA512 b951c401f93d04061a0ef0accc810ecc7f0487617f089960ab58886a6ca6ecd0af3a98c47e9a620a4d6f8f530a11af9cae20903d089177e69bfa12f9ca31ec5c
EBUILD nemo-4.0.6.ebuild 2021 BLAKE2B b7a9026c2515f7b91eb747249a15b86f6f59102273ec8871463ff99ae1939ae13db957872d9aceabd963deb1033e76433f4ab8618c308e00c319874ee8cb1835 SHA512 eacd7f0ce6a3f4974262bfa35c2acdf9e63165817ee7d94412c486a7c47741975f23e94c8f6ed3094cc260929ca734e54e787a2000e64a5fd39846a26df1ecce
-MISC metadata.xml 525 BLAKE2B 62bd5c4d9f4c8dfc2d82f2d24f7f9a3281f18fe10be1538edf6d91ab0760fd01f6dcb7d3b71bb3a65c923b904f91559db8e3622ab9af76f6778e213b2c60e640 SHA512 9c60022c7a5054ee0271b3b412aa6fcc8271247756438a5323bd5acb4a5a0b5d781dc256de6b68a51e276d0ca1dccc434cd718fa51682d8fa6a8cf5ae26350a9
+EBUILD nemo-4.4.2.ebuild 1809 BLAKE2B 5641d649cca2dcb39fdc2f9c9984455bc7bb3f76e3a1b706c061380a93c0931837f6d67e676b2bf72b557e62fe557086e7239198e4a732c140b189fa558c6e3a SHA512 8cf22e8df511caf4d79817a7af8865d4dceb4c72683b7de7e20627762cf372ddefa64c02ce3835100d1011be464ae7da41e871335214956be2069f1afa29d954
+MISC metadata.xml 760 BLAKE2B 9e5b520914469c8db824cec45e04fc18b80c99138cd0c79f8b40c3e0745bd8424f4a9b49be0d4c34eed51ddfda5389ea2ddfbe70afbd96d426c35b8909f6c173 SHA512 cde8aa9f7c5353a1755d512c6c476e830c6b0eec4beeb6a3d06afc4fe4ba0dd8768e92e4616cec3f9e1e8de0a376d5b813e7dd43744a8bded53e80259f72e6a6
diff --git a/gnome-extra/nemo/metadata.xml b/gnome-extra/nemo/metadata.xml
index b3526b807770..519e96b93408 100644
--- a/gnome-extra/nemo/metadata.xml
+++ b/gnome-extra/nemo/metadata.xml
@@ -5,6 +5,14 @@
<email>cinnamon@gentoo.org</email>
<name>Cinnamon Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sparky@bluefang-logic.com</email>
+ <name>Matthew Turnbull</name>
+ </maintainer>
<use>
<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>
diff --git a/gnome-extra/nemo/nemo-4.4.2.ebuild b/gnome-extra/nemo/nemo-4.4.2.ebuild
new file mode 100644
index 000000000000..ae981c8d835e
--- /dev/null
+++ b/gnome-extra/nemo/nemo-4.4.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson gnome2-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+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="doc exif +nls selinux xmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT=test
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ >=dev-libs/glib-2.37.3:2[dbus]
+ >=dev-libs/gobject-introspection-0.6.4:=
+ >=gnome-extra/cinnamon-desktop-4.4: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=
+ >=x11-libs/libnotify-0.7:=
+ x11-libs/libX11
+ >=x11-libs/xapps-1.4.0
+
+ exif? ( >=media-libs/libexif-0.6.20:= )
+ xmp? ( >=media-libs/exempi-2.2.0:= )
+ selinux? ( sys-libs/libselinux )
+"
+RDEPEND="${COMMON_DEPEND}
+ x11-themes/adwaita-icon-theme
+ nls? ( >=gnome-extra/cinnamon-translations-4.4 )
+ $(python_gen_cond_dep '
+ dev-python/polib[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ ')
+"
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ >=dev-util/gdbus-codegen-2.31.0
+ >=dev-util/intltool-0.40.1
+ sys-devel/gettext
+ virtual/pkgconfig
+ doc? ( dev-util/gtk-doc )
+"
+
+src_prepare() {
+ xdg_environment_reset
+ default
+ python_fix_shebang files/usr/share/nemo/actions
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use exif)
+ $(meson_use xmp)
+ $(meson_use selinux)
+ $(meson_use doc gtk_doc)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index deed4e1e31f4..e826b9cfe4ab 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,6 +1,6 @@
AUX 1.8.24-fix-bashisms.patch 5304 BLAKE2B d564e84e12033826ed4e1663336d20a0591058a0d50201b3d91180f26f9d46380dea35cd95fc2b0e3bb94dbda70d8f55b7885c13c73f14a526a3e6473863d7d6 SHA512 c8acde4a746d83666671aa0bd1c64b24710219dd932d28eae7ddc56de2e430ef745f92953608ef277ff5d4d94270876ca4d1b6c8ac338571a0af6cef6516b804
DIST network-manager-applet-1.8.24.tar.xz 2062132 BLAKE2B fed75ab78e05b59a4f20c7570b84ac6fe3dd2cf6f8ad060f6c65bc9e2a32e29d295fc919de1037ba30c2609d35079dccb3f625ffc019150c9c69cfa94388e2c8 SHA512 76e914ec4f2e6eadd21ccc3e1f613fb97cb72d9551730a1dc09454177365dcaa2cdeea4b855c53732ad6a22cfa5e62e03f09fc8b04a277ce213dcf8c3beaf77c
DIST network-manager-applet-1.8.25-dev.tar.bz2 1795238 BLAKE2B 2cdf81b1395dc69fa35ed19d5410dc94b8a7ea5cf99a3a8b81e7d4f0b0852f883d8a0c4fbe42e0088ba79e5473c6c01e332feb6f78a3526bb21237f6fe17719e SHA512 3441b8c3c195c0ff9528d219d5769bcc56d7fac92030af75ae2d16e3c91accb2350286c18c2c46cc12a20e87099d05183f0510398519c6fcd8520d0ab56850a2
-EBUILD nm-applet-1.8.24-r1.ebuild 1754 BLAKE2B 8b6f8f981ee9254acde3aa739ee51e804ac9e3801a86bbc8744954953dd4ca326075a4e998772c95d02433a00c46dee04830e8ecd620e3cf0254f13634b50703 SHA512 d407c5a3ae53c61e3bfef5fdd0014ee7973d73dd8aa5e4dddac9929891539d148f0a2c0ddcf28f975f7054bfffcd7693de15434bb4e18fcf4ec1dd815c8e63af
-EBUILD nm-applet-1.8.25.ebuild 1719 BLAKE2B 442f4c4c596671cf4be609e14c7fdcaa4f0590c32653415d8d6ec992fbf9f63ae60203dbbcb309c185083a0bbd3678a22d0fd123227de89d1f19864d2856c4a6 SHA512 004873ed7a2d37d6fe8baad21ad14c5415c84670064b8c37d89c3eb961da8df516af67bfbdc3dd63a4dd75899afe184c58a217cf27afd67a2553d0c20923f102
+EBUILD nm-applet-1.8.24-r1.ebuild 1769 BLAKE2B 0b45a7183222fd774830e2ace5d253392d107c35621c83b4195cbbaff7a081a937166b505dbd1a434b3d6fc9c885141fbde7f75e999ea41b8b0bbbfa6b85cc9a SHA512 30956c606f4a35c346ee2260582053bb41137724fc3c7a46d4a3a4d6a8cafe924b27d5f272e6bdcb71e6df9f676fa72d3a38351793c1f2eee8c63248a28e3898
+EBUILD nm-applet-1.8.25.ebuild 1717 BLAKE2B 2be2bc81f05c81e66e0cfcfc1336e20cdb524eba9096578126d04d284a094ddedc16fd6bce4f9b463e33c4b7b120422d30a5f3b264caec6a5dcbd128a1fd3160 SHA512 6be1934aa310f734ff7da25f60d0d0a821d39622e11f362ae2abf8994b781243bf4984ed75824a6deb08a7492f848fb087c5199c08e8ab427d52517a0725ae85
MISC metadata.xml 651 BLAKE2B 71fde7243fa65796946de511bafa6b20510a1c69d47d9ac91f66590fedb7897a85612a1de146bc4b411ca1acea84674d00cee25647b3485120bc87221d00bde6 SHA512 4736c2a5f00d8bc21c63d15454c039a7e74b3b2612bb76ba94451ef54ad27eb4259f382f018cd8aae2d8e3571638eec202226c59bfb35c7e3fcd80e0b3ffd4a0
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild
index d18119056732..b606dc264603 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+"
SLOT="0"
-IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
+IUSE="appindicator +introspection +gcr +modemmanager selinux teamd"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
RDEPEND="
@@ -30,7 +30,7 @@ RDEPEND="
>=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
net-misc/mobile-broadband-provider-info
- ayatana? (
+ appindicator? (
dev-libs/libappindicator:3
>=dev-libs/libdbusmenu-16.04.0 )
introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
@@ -54,7 +54,7 @@ PATCHES=(
src_configure() {
local myconf=(
- --with-appindicator=$(usex ayatana ubuntu no)
+ --with-appindicator=$(usex appindicator ubuntu no)
--without-libnm-gtk
--without-libnma-gtk4
--disable-lto
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild
index 94ff1ec2fb9c..c43ccd0ecaca 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.gnome.org/GNOME/network-manager-applet/-/archive/${PV}-d
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="ayatana doc introspection lto modemmanager selinux teamd test wwan"
+IUSE="appindicator doc introspection lto modemmanager selinux teamd test wwan"
DEPEND="
app-crypt/libsecret
@@ -22,7 +22,7 @@ DEPEND="
net-misc/networkmanager
x11-libs/gtk+:3[introspection?]
x11-libs/libnotify
- ayatana? (
+ appindicator? (
dev-libs/libappindicator:3
dev-libs/libdbusmenu
)
@@ -44,7 +44,7 @@ src_configure() {
local emesonargs=(
-Dlibnm_gtk=false
-Dlibnma_gtk4=false
- -Dappindicator=$(usex ayatana yes no)
+ $(meson_use appindicator)
$(meson_use wwan)
$(meson_use selinux)
$(meson_use teamd team)