gentoo resync : 08.09.2019

19 files changed, 637 insertions, 3 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 4e303196e787..9688147113ef 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index ec34399e9bce..dd16e902042a 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,5 +1,9 @@
 AUX 3.30.5-collection-auth.patch 1519 BLAKE2B a0196ede2680939d8b1d945cb18c0446247bc9183d7c5f6d924601a95a8d296e4168693537c53945c12f88da02ae41f8b641d3a78f417d999dc0cc7dec435633 SHA512 7499b7ca85137da41232f597bfe25f022b05993aebb91d026016b5e23939880593ed11680be2a78eb9b7af78edc1bc3a50bde9275036ee72b532c3b5eb233a81
+AUX 3.32.4-gtk-doc-fix1.patch 4057 BLAKE2B 7ca0773467fa13e540e18b18f7c5ee883c1d163fb0b1a814408f23a6aee24a644672d999912ec44065e331a1b2f1327f0607dbbc3ca99ae6a925b8dc90f2527d SHA512 230d6ab323ce1599f16f95b7297bbad4e46507398ffae72d785ed095d213026cd98ab9e485fbd8f5a59246352d08fe54213cca4131739e79b72081e1e2c5cdaa
+AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c99265fe59a4b99dd873875aa93933fac513d4ed2717665a53d747578d94f475b58bb7f61351f637515d9e86249b SHA512 c77607534d7b262044658ccaf88a6281c294561ec9e84a78c6dc79385bd14fb7beda33a175fadb8804be3eadf3ddb3e72055728b6e978f68a5e6ce05643379bd
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.30.5.tar.xz 4582264 BLAKE2B 96303da0fcd285dffc2a56bab0828b2011238a0970dc50df005f690a76c432abad27afd74569b1cc6ff2ddc56f1dbde003241d53609b0222a474941724e46910 SHA512 b841b23343745afdc59f42ee384911ae24be6b1518095d52099ce5b657def17e5b4e1fe1e61fc1e03e4856b0d26c6a1abac3d9ee5530da84c645d07c69b8d859
+DIST evolution-data-server-3.32.4.tar.xz 4585396 BLAKE2B d89b71beaf24deb89e510e318050a8a3146b8a6804c148c62d4cb2c0cfb3b50a3767cfc213db05b44c6b5b99e578a24d3c272daccadb4e950b2d103639ce9797 SHA512 fccbad5989e6366840c50dacf2e81510f65c8640c9309ca0446c1b236df99f43a310fcadd377e205d0a94f0e3f9b53b83c41c042c3244e05bfda0d6df090d0c7
 EBUILD evolution-data-server-3.30.5-r1.ebuild 4385 BLAKE2B 610d2c44be8516e9fc04cc02e2af61fb01f04322a00ee686c5db8cc2309835b0f0af372a877632ca59911aba3ef368c271eb620f5b85c6b8983451695cee5699 SHA512 4f206a3d9ba9e8c2acca10c4b4bda1a7e5fee8b1beb977d2894998d2a0d3a7620c45ed7c2df219e734ee0e8edba22a6f26432d9b7a91aad39b00b09db726e1a5
+EBUILD evolution-data-server-3.32.4.ebuild 4373 BLAKE2B e2d77c69deb70f630759ee9e9f15a625fea3d99bbc0b5e35aa2c7a8b69b3ac6d9bac4f45da94d73e4fc3ad0be450749980130e8d989d39787d984af584ab0db4 SHA512 da3d9eae10aa82c4cab9bc75a2e181ee6474255c0b7460ee542d87ec5249bf14655e0a4ca7973b0a5345929a51b0bf493036e23ba4521df6ba7d9cb98cdae802
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild
new file mode 100644
index 000000000000..f2100b28c065
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/62-24" # subslot = libcamel-1.2/libedataserver-1.2 soname version
+
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
+# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
+# >=libical-3.0.2 present at build-time ensures less memory usage by calendar backend
+gdata_depend=">=dev-libs/libgdata-0.17.7:="
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/libical-3.0.2:=
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=net-libs/libsoup-2.42:2.4
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.10:3
+		>=media-libs/libcanberra-0.25[gtk3]
+	)
+	oauth? (
+		>=dev-libs/json-glib-1.0.4
+		>=net-libs/webkit-gtk-2.11.91:4
+		${gdata_depend}
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.8:=
+		${gdata_depend} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gperf
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+# Some tests fail due to missing locales.
+# Also, dbus tests are flaky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test !test? ( test )"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+	eapply "${FILESDIR}"/${PV}-gtk-doc-fix{1,2}.patch
+	use vala && vala_src_prepare
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+
+	# Make CMakeLists versioned vala enabled
+	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+		-i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	local google_enable
+	if use oauth || use gnome-online-accounts; then
+		google_enable="ON"
+	else
+		google_enable="OFF"
+	fi
+
+	# phonenumber does not exist in tree
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DWITH_KRB5=$(usex kerberos)
+		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PHONENUMBER=OFF
+		-DENABLE_SMIME=ON
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_CANBERRA=$(usex gtk)
+		-DENABLE_OAUTH2=$(usex oauth)
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_GOA=$(usex gnome-online-accounts)
+		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+		# ENABLE_BACKTRACES requires libdwarf ?
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_GOOGLE=${google_enable}
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_VALA_BINDINGS=$(usex vala)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	virtx cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix1.patch b/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix1.patch
new file mode 100644
index 000000000000..54a5fc714def
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix1.patch
@@ -0,0 +1,88 @@
+From 925070132ca90787ccfe9a993c3eb7e0feb74fa7 Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan <lantw@src.gnome.org>
+Date: Mon, 22 Jul 2019 16:06:21 +0800
+Subject: [PATCH] M!28 - Include LDFLAGS in gtkdoc-scangobj command line
+
+When a library provides no way to find linker flags for linking with it,
+the build system usually depends on the user to necessary put -L flags
+in LDFLAGS environment variable in order to find it. However, GtkDoc
+module constructs the command line by itself, and it forgets to add
+LDFLAGS to the command line of gtkdoc-scangobj.
+
+It is especially important to include LDFLAGS on non-GNU systems. For
+example, FreeBSD libc doesn't include a gettext implementation. GLib
+requires gettext, and it pulls in an external gettext runtime for it.
+However, gettext-runtime doesn't include a .pc file, so LDFLAGS is
+required if gettext-runtime isn't installed in the same prefix as GLib.
+Failing to include LDFLAGS in --ldflags passed to gtkdoc-scangobj can
+result in a linking error because -lintl cannot be found.
+
+In evolution-data-server we are lucky most of the time because it
+depends on a lot of external libraries. These external libraries are
+likely to be installed in the same prefix as gettext-runtime, so not
+using LDFLAGS doesn't cause linking failure because required flags are
+already pulled in by other libraries. In fact, this problem was found
+when building libical, which uses a similar GtkDoc.cmake file.
+
+In addition to the change to include LDFLAGS, this commit also changes
+the following things:
+
+ - Instead of constructing _scangobj_ldflags in reverse order, do it in
+   normal order. Appending is easier to understand than prepending, and
+   the linker also interprets -L and -l flags in normal order.
+
+ - Move -L${LIB_INSTALL_DIR} to the bottom. This is what the comment
+   says, and it is expected to work because we no longer constructs
+   _scangobj_ldflags in reverse order.
+
+Closes https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28
+---
+ cmake/modules/GtkDoc.cmake | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake
+index cc6cc007a..0ba1a7a78 100644
+--- a/cmake/modules/GtkDoc.cmake
++++ b/cmake/modules/GtkDoc.cmake
+@@ -96,9 +96,8 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
+ 		list(APPEND _scangobj_deps ${opt})
+ 	endforeach(opt)
+ 
+-	# Add them as the last, thus in-tree headers/libs have precedence
++	# Add it as the last, thus in-tree headers have precedence
+ 	list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR})
+-	list(APPEND _scangobj_ldflags -L${LIB_INSTALL_DIR})
+ 
+ 	if(_scangobj_deps)
+ 		list(REMOVE_DUPLICATES _scangobj_deps)
+@@ -122,7 +121,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
+ 				if(NOT _output_name)
+ 					set(_output_name ${opt})
+ 				endif(NOT _output_name)
+-				set(_scangobj_ldflags "-L$<TARGET_FILE_DIR:${opt}> -l${_output_name} ${_scangobj_ldflags}")
++				set(_scangobj_ldflags "${_scangobj_ldflags} -L$<TARGET_FILE_DIR:${opt}> -l${_output_name}")
+ 
+ 				if(_target_type STREQUAL "SHARED_LIBRARY" OR (_target_type STREQUAL "MODULE_LIBRARY"))
+ 					set(_scangobj_ld_lib_dirs "${_scangobj_ld_lib_dirs}:$<TARGET_FILE_DIR:${opt}>")
+@@ -133,12 +132,18 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
+ 		endif(TARGET ${opt})
+ 	endforeach(opt)
+ 
++	# Add extra flags from LDFLAGS environment variable
++	set(_scangobj_ldflags "${_scangobj_ldflags} ${CMAKE_SHARED_LINKER_FLAGS}")
++
+ 	foreach(opt IN LISTS _scangobj_deps)
+ 		if(NOT TARGET ${opt})
+ 			set(_scangobj_ldflags "${_scangobj_ldflags} ${opt}")
+ 		endif(NOT TARGET ${opt})
+ 	endforeach(opt)
+ 
++	# Add it as the last, thus in-tree libs have precedence
++	set(_scangobj_ldflags "${_scangobj_ldflags} -L${LIB_INSTALL_DIR}")
++
+ 	set(_scangobj_prefix ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH="${_scangobj_ld_lib_dirs}:${LIB_INSTALL_DIR}:$ENV{LD_LIBRARY_PATH}")
+ 
+ 	if(NOT (_scangobj_cflags STREQUAL ""))
+-- 
+2.20.1
+
diff --git a/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix2.patch b/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix2.patch
new file mode 100644
index 000000000000..56e66eae8938
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix2.patch
@@ -0,0 +1,29 @@
+From 78dc64008f1312a97eaa56b5c12f93a2bfa3b096 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 5 Aug 2019 12:55:23 +0200
+Subject: [PATCH] Include also CFLAGS in gtkdoc-scangobj command line
+
+The LDFLAGS could imply certain compile options being used (like -fPIC),
+but these CFLAGS were not passed to gtkdoc-scangobj, thus the compilation
+could fail.
+
+Related to https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28
+---
+ cmake/modules/GtkDoc.cmake | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake
+index 0ba1a7a78..2dfc4d691 100644
+--- a/cmake/modules/GtkDoc.cmake
++++ b/cmake/modules/GtkDoc.cmake
+@@ -98,6 +98,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
+ 
+ 	# Add it as the last, thus in-tree headers have precedence
+ 	list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR})
++	list(APPEND _scangobj_cflags_list ${CMAKE_C_FLAGS})
+ 
+ 	if(_scangobj_deps)
+ 		list(REMOVE_DUPLICATES _scangobj_deps)
+-- 
+2.20.1
+
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 1bc8d46d7f87..c2c502cbbd0d 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,4 +1,6 @@
 DIST evolution-ews-3.30.5-certificate-validation.patch.xz 6928 BLAKE2B eb1f070797231f14cc71cce2f19a0dc925edc0f67eca9267568c835e878d9f1567aaad7dd8a14c88abb047af8db8220239c78d62387329c9d38e5c5eda21822b SHA512 2d4fa5f9c24bf92ab4e5105cc5d265907e8af760d7c969ffdf74d090795948e1f9e0e84f5d051c2a6c4324ed49cc2c23f23ebdccf67fa8baab965c612ad807e6
 DIST evolution-ews-3.30.5.tar.xz 525252 BLAKE2B 510666cdf6bdb95e73799256daa9b4c753ed70de71798d3acb73eb55c30158a7b6b56fe7617150ec0a1f5ce20676da8a3ab4608fca06f009ea16fbc234770736 SHA512 6b17fd73b461e0ddd725ee87c854fca45fbc14f10922a60aff5a9a25b56728f1f16a0d3196b4bc3cba83e75655c15244c3bf2442fa17449c7466ab95371e93d7
+DIST evolution-ews-3.32.2.tar.xz 534056 BLAKE2B 2f935910cba44d69b2d8bcc3021709502c1a129ef29d18a847bccd14837d0c18c9700a97f978decb36f9c28242df81a9021dfc536e31f3d8f7793a0dc4c6b680 SHA512 5696ea660d0b52c0083664ad203eaed372fb9653399152ccbca0f6360a3e0c4503b5dacf4f9bf5650b1b64696c0fe06e2383bb408bed604ea0312660b4639388
 EBUILD evolution-ews-3.30.5-r1.ebuild 1499 BLAKE2B 5164332cda7bf860bb5abc8299c55dea3d1c8dc1d46d2ebd8d4f007f1aa068dcf2d42f46080062c599fa019078882094d8edad35e4ea83deb7eb0d77675dc9b7 SHA512 cc9331a17d6efaedea8a14e6f00c0438a27f45d40a3c42f5ff06eafd941ce70972ee94755134aa06c7beee9ff0efb3aacc350f8e5b0fceb536821fc7842227d1
+EBUILD evolution-ews-3.32.2.ebuild 1318 BLAKE2B 36f7fbee2b2e16457de035c104d83e7f86412018ed528def4face1962a8c7f24339f87ae9a549b2569ab75cbe34a6c1e1d994d95ac7316479cef8e33a4e43548 SHA512 42ead93114a58792efcd9d0d84e084a340f61e167f53f3f8a9c8956d5507a2718c8b3d943b6616e911d7232cbaf81b5f31a4ed201c9d9bcb781d374f92275920
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.32.2.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.32.2.ebuild
new file mode 100644
index 000000000000..403bd52ea196
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.32.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.46:2
+	dev-libs/libical:0=
+	>=dev-libs/libmspack-0.4
+	dev-libs/libxml2:2
+	>=gnome-extra/evolution-data-server-${PV}-r1:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-2.58:2.4
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	test? ( net-libs/uhttpmock )
+"
+
+# Unittests fail to find libevolution-ews.so
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake-utils_src_prepare call, if that works
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MSPACK=ON
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index f4048641e68d..8afef5410394 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-calendar-3.30.1.tar.xz 2443936 BLAKE2B 1826488ee03742a9350e589954723264318450d50fa7175955deee8fb3b3bbf2a29fbc6106644bccc062dd45bd9a16e7f40e2928c488bc333ba35d00f2411f25 SHA512 acb428f123fe716b41c4e828213b1106296731b5aa99607838219b8e6c802b22d3481eaa91429cfb34bc3d098344f406ea86c5e2f794f26414ba05bf0189fe29
-EBUILD gnome-calendar-3.30.1.ebuild 1292 BLAKE2B 26dd6f233c0d06f559a87f060dee49644a9db8af841c9382a5286cf9006a83dfa06c048c463bdda88fcbc380dd260afe69d7875900b5b7afcb1cf6de54a7bed3 SHA512 7f61cba2224cb08afb78deb9dd37bfd5fd375ceae77cbb7de55e95994f5f20411056341a09757de7b7f5f48a79a3a27bdf1751ccaadedc1cc9d35dac5e38b1af
+DIST gnome-calendar-3.32.2.tar.xz 695416 BLAKE2B bf5b2b5bd8ea5934075d00614a3888208a06926b8587fc39724850c0fccb7e34920bb650f45a241074f5ea383acb80edf91884936c7b432e0a7f9e672e457b8a SHA512 6a1ee1b41080d7814e9a49b3a95689fb01325c9ac5eb1314b11e7097c3b8b120c7ca45b05c806c3dbac284a70474beaf419773ab185a7cdde96303fcc7cd3915
+EBUILD gnome-calendar-3.30.1.ebuild 1333 BLAKE2B 576f0f14631bbb97c73c0668b85cfbc3296263c327bde1d08b6ee70bf13614ddb3791f7c5bf8cb8ab9b95c44b359cca2dfdf1ab34bad26661c8787f5911336ac SHA512 939fcb630d626d937102e24579edecd89585c86b1bd166af3ed02487d388ae8c18d048fb0ec06b5e2e51b6cc5ffc84bba514821abfd78107ebf916aa95d4b610
+EBUILD gnome-calendar-3.32.2.ebuild 1304 BLAKE2B 6c799ecdecf4c6a476c4e1f02571897c72dc45ec2e42df4c6281f96f21f7afcadb749a50dc94edac2323e86b09f2f3f12f2b2d73a4f4e4654bfc9e885706a13a SHA512 563fdc4a5f00eab3d77f5d63c406196efbe2b87f024b7250be2b619eb9536cf93458e30738af0b8f51143dda96dd6b3bb63a8bfc8507aabc69e731c47631cf83
 MISC metadata.xml 522 BLAKE2B 24cb41757041daedf83e72cd8620bef49d2bced678ede42c1a071c3cf99f2f157b086acc393953b42a612dd5c4d622b0a869934f89661c28be742370cd4688c2 SHA512 f595d013522df745a86b01e6696ea5fe6dafa55d55e3fe22adf469fef56507846194f24c2ec5cd13382c69a494ca530438d12c69a6bec41247da1783fc78eef8
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.30.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.30.1.ebuild
index e2e4c225a987..b9984a75d073 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.30.1.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.30.1.ebuild
@@ -17,6 +17,7 @@ RDEPEND="
 	>=dev-libs/libical-1.0.1:0=
 	>=gnome-base/gsettings-desktop-schemas-3.21.2
 	>=gnome-extra/evolution-data-server-3.17.1:=
+	<gnome-extra/evolution-data-server-3.31
 	net-libs/libsoup:2.4
 	>=dev-libs/libdazzle-3.26.1
 	>=dev-libs/glib-2.58.0:2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.32.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.32.2.ebuild
new file mode 100644
index 000000000000..65754ebcf00c
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.32.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="gtk-doc"
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+DEPEND="
+	>=dev-libs/libical-1.0.1:0=
+	>=gnome-base/gsettings-desktop-schemas-3.21.2
+	>=gnome-extra/evolution-data-server-3.17.1:=
+	net-libs/libsoup:2.4
+	>=dev-libs/libdazzle-3.26.1
+	>=dev-libs/glib-2.58.0:2
+	>=x11-libs/gtk+-3.22.0:3
+	>=net-libs/gnome-online-accounts-3.2.0:=
+	>=dev-libs/libgweather-3.27.2:=
+	>=app-misc/geoclue-2.4:2.0
+	>=sci-geosciences/geocode-glib-3.23
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	meson_src_configure \
+		$(meson_use gtk-doc documentation)
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 4cae19166fd1..6b3d0abb54b5 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-contacts-3.30.2.tar.xz 368476 BLAKE2B 502170e327eb63a6d026af94a09949f6b973dba0c59079a23c7f37dfde2a391ffa13d905452741c403ada8e6f1101f7a5620ad9b59eb4c5341e96d357d8fe99b SHA512 cf6ab33ef6147bceb5a4681b83830828fd4caa47d83fa9f71e01db3caf710f7f09fe60d2956565a2b9bd124356e100b31d6372ac4d4d231718230915a135e79d
+DIST gnome-contacts-3.32.1.tar.xz 358800 BLAKE2B a3cdc58948b994868a18e74dd2ab1a1ffea04b84da95347f19b79b49a7eb9363589e08e11e8fa2f588c5833592be3149ea435b6036a376d4c9e1477d0d308e96 SHA512 25fc4835c61bd5f195512fd304955058e1178cbafaff09a6bbfffc58840876f514ebc3119247925266a9c10f8fc452511a055d84aa1e815571188aba7212fe71
 EBUILD gnome-contacts-3.30.2.ebuild 1531 BLAKE2B d7292f1a9c28b0bae5ec2ce9b723d421575e404f3a8528fa4307f999bb7f2e5de4f5fc10ea9d216d25760beb8ef43c05b3e814ad7fbee0090d92e5e4d7c84b44 SHA512 fb7a9b669763c52643b0f6bdc0552d075d7b3cb4b592cbbb7c8af2031fcd16b9df834d6e27edb08fbf8add24b79d1c6496889b41c2bd6bb665a7172fd1e1474f
+EBUILD gnome-contacts-3.32.1.ebuild 1569 BLAKE2B bbd7a1428827f4d60eba9743315d4c0cc3aa17d7bd82bd73c609d34460110e931e9f26dc569af7ec3621fc734ba788f62e797b318a059b3c0c1531b055d05099 SHA512 6e7d7fab96a02ef5711c5c33d67cc17bd5932b69169f24f502604bb5ade659b65a02cdc01bd17a77ad8c9a2223d11c017528a0f704e27bfd4660a9db3396ca4d
 MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
new file mode 100644
index 000000000000..297ca6283098
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="GNOME contact management application"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="telepathy v4l"
+KEYWORDS="~amd64 ~arm64"
+
+VALA_DEPEND="
+	$(vala_depend)
+	>=dev-libs/gobject-introspection-1.54
+	dev-libs/folks[vala(+)]
+	net-libs/gnome-online-accounts[vala]
+	gnome-extra/evolution-data-server[vala]
+	telepathy? ( net-libs/telepathy-glib[vala] )
+	gui-libs/libhandy:0.0[vala]
+"
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
+RDEPEND="
+	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
+	>=dev-libs/folks-0.11.4:=[eds,telepathy?]
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libgee-0.10:0.8
+	>=gnome-base/gnome-desktop-3.0:3=
+	net-libs/gnome-online-accounts:=
+	>=x11-libs/gtk+-3.23.1:3
+	v4l? ( >=media-video/cheese-3.5.91:= )
+	telepathy? ( >=net-libs/telepathy-glib-0.22 )
+	>=gui-libs/libhandy-0.0.9:0.0=
+"
+DEPEND="${RDEPEND}
+	${VALA_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use v4l cheese)
+		$(meson_use telepathy)
+		-Dmanpage=true
+		-Ddocs=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 6edb788c4edd..daab0f685708 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,3 +1,6 @@
+AUX 3.32.1-leak-fix.patch 1262 BLAKE2B f50fa74524b820416135f9037046006aadb262edc3b13e3a1c48b1e3bbca385046a44e1a4449d85c8f9af6a7bf66e739f26c95391f8504cd6db703850bc9945e SHA512 ca04b666548233c879cfb992e45f62a97916a12a9959aa240b5c53415839ce1c972f0b56f528419891889049cb365e91311ae762241e333c3d3d78e2def57250
 DIST gnome-shell-extensions-3.30.1.tar.xz 198652 BLAKE2B d65ae90f6acf607aa1fe2eacfdcd22800b2dfcfee71240b600dd8a2e9e0320ed972a434a68a7020eafcfa6a0eec84572dc9f80258dc96fc205978882fe0c85c8 SHA512 492d99bac6345cc0c9e1a8a067859d2ff6d7b1b620277cac43429573e2e952af1a2ad3d94cc2fb5db3978fd15226c7f2231eb4d11fbcf1da39fe07afd58ee7b3
-EBUILD gnome-shell-extensions-3.30.1.ebuild 2124 BLAKE2B a4f1d64076d6ba3ea0724b37c1846167e03daab3ecc56f961d9f88460d033e37e60b585009ede44fdd0054d9604be241026828f708a0b211c2291e5418fd7f2f SHA512 4f3df90320b8712d8097d185dbb03dda40b37b3d73cc8b3bc6787cc1024883541f1383990f3b64b3e4882a7ec6ad62b676a4a8acc35e56eb465e07df3d8f4aae
+DIST gnome-shell-extensions-3.32.1.tar.xz 198320 BLAKE2B 416f77ea37431f8b806b8373f9a18091374f4b40b734375edfff2f673af50c073c3e3091e2b9b4be4241ebfa647b7f44b0f0f6e69460876feb7f90901e499a29 SHA512 e587a17eace87e05211bd4a0b8101a731054c99ba708051f6549c5e19974ccfeff75b0802d190d327f5ee8b4595c20e747d492f82c86aa76e0fc1cf3d20f0e4e
+EBUILD gnome-shell-extensions-3.30.1.ebuild 2154 BLAKE2B d2bc2cd3cdac6db0d492fc47b6b6a26f351da43dd690f704ed46183fb91826c44c1b96da5f7e67f19d60631b4541163cde0caaa493f8ac8a9a10c2fde182b947 SHA512 3459288c9daf2e860f2cd3e129e1987d2fb77b052c68e965c117665877b2f7c45c9e6eabfd60e4485b60fefbeb20351c140ae3092b26948881e16d9a7c6bb59e
+EBUILD gnome-shell-extensions-3.32.1.ebuild 1962 BLAKE2B 8b3436a998db01410263e2ae80b34d817ae7513e73fb60e262ba6942b4c1ebd32a038bfdf1f254ba6039e6f627a5f4720a6bb47f2382f9907198061ffddbc223 SHA512 78812f74746404e1057b77131ee3a6896b3bf758818a6cc009a66cbf5fdb79150c6c46ea974f5afa69ad4f6064b3fbc12aa8ee9ef66fbacef32815b0fd2e6b1f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/files/3.32.1-leak-fix.patch b/gnome-extra/gnome-shell-extensions/files/3.32.1-leak-fix.patch
new file mode 100644
index 000000000000..6166b67acd62
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/3.32.1-leak-fix.patch
@@ -0,0 +1,36 @@
+From 13372e7e121209aa329b9784432dff8673b01d3f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Thu, 27 Jun 2019 01:57:53 +0000
+Subject: [PATCH] apps-menu: Add missing chain-up
+
+PanelMenu.Button is a bit weird in that it also "contains" its parent
+actor. That container is supposed to be destroyed with the button, but
+as we currently don't chain up to the parent class' _onDestroy(), we
+leave behind an empty container every time the extension is disabled.
+
+Fix this by adding the missing chain-up.
+
+https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/75
+
+
+(cherry picked from commit dfeb99fc0a37051c33980b97a86c16f2ccdfa2bc)
+---
+ extensions/apps-menu/extension.js | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
+index d7ba570..c657a7e 100644
+--- a/extensions/apps-menu/extension.js
++++ b/extensions/apps-menu/extension.js
+@@ -459,6 +459,8 @@ class ApplicationsButton extends PanelMenu.Button {
+     }
+ 
+     _onDestroy() {
++        super._onDestroy();
++
+         Main.overview.disconnect(this._showingId);
+         Main.overview.disconnect(this._hidingId);
+         appSys.disconnect(this._installedChangedId);
+-- 
+2.20.1
+
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.30.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.30.1.ebuild
index a38f87a90862..b920b4ed30be 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.30.1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.30.1.ebuild
@@ -23,6 +23,7 @@ RDEPEND="${COMMON_DEPEND}
 	dev-libs/atk[introspection]
 	gnome-base/gnome-menus:3[introspection]
 	>=gnome-base/gnome-shell-3.30
+	<gnome-base/gnome-shell-3.31
 	media-libs/clutter:1.0[introspection]
 	net-libs/telepathy-glib[introspection]
 	x11-libs/gdk-pixbuf:2[introspection]
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild
new file mode 100644
index 000000000000..876b7d4873df
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org readme.gentoo-r1 meson xdg
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	>=gnome-base/libgtop-2.28.3[introspection]
+	>=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	dev-libs/atk[introspection]
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.32
+	media-libs/clutter:1.0[introspection]
+	net-libs/telepathy-glib[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/adwaita-icon-theme
+	>=x11-wm/mutter-3.32[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-lang/sassc
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( dev-lang/spidermonkey:60 )
+"
+
+RESTRICT="!test? ( test )"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the https://extensions.gnome.org/ web interface, the
+gnome-extra/gnome-tweaks GUI, or modify the org.gnome.shell
+enabled-extensions gsettings key from the command line or a script."
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-leak-fix.patch # tiny leak fix on extension disable from origin/gnome-3-32
+)
+
+src_configure() {
+	meson_src_configure \
+		-Dextension_set=all \
+		-Dclassic_mode=true
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index b8dba40e56dc..8f6f7f5ce061 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-frippery-3.30.2.tgz 87885 BLAKE2B d79d27c1b9faa5c5f6351fee1f9ee7afe5c7eeaaaab5de94988aee0fdbe283d74eb4175606f70668b4297b295c325f569cb3bc02d26728985ca3d3075eb0c5cf SHA512 a33bc69ddc9ee16b944e456ca537b07b30cab3f010910b0b32a4a5b7ce64d0e766438587f2949a43bd9829ed36ebcdb3f236ea40ec3596a539e06d3fc1f9e6f5
-EBUILD gnome-shell-frippery-3.30.2.ebuild 911 BLAKE2B 6aa4a0144b654a84a71b0c4722f704e3739cd53b341b8739662dae17d1a72d0e697ddaa08befa2d5065d828e90ebe0ca47b0067c175fbbadeadb6793f0bc5426 SHA512 a9b7cfa6c6e66a0647de23c597b3bffbbb76c280bc7daf0eaeba5edf395d944a00921c0c66d740a8a4381a65c2a9541da83a2b8b6d5c1ae79409d5fa2fffaf4d
+DIST gnome-shell-frippery-3.32.1.tgz 87307 BLAKE2B 06226a084be2587db1114d69d5f5c04a28682d3bb98e72c4d6d9ab34e8c4173c0e57c8cfc6a8b204b6d53a8ba3b5dccc9ff2db8681012176364eb20f2c6851fa SHA512 56604c7b47778454e61839e4c81445232357c5f6243974643cfc5f0524eecf8109dfba7af425ec0430aeb4c2845f58bcc9c0710087e6032b0b438e7db8be87aa
+EBUILD gnome-shell-frippery-3.30.2.ebuild 941 BLAKE2B a68eaeb55200fa34466e88edf3bcc5bedcd791eaa3e1b1a5bab912e38bf02518fbca47c9043e9d96f838a17989c8253537c7d1edb2848302edbf1ea2668a9142 SHA512 de23072cb8a342b98312859ed0bc3bb4c98e2ab8ee000d217a81af0c823ddfdab325748ed3937048e4d4210a691b1290f060714a98373590af266173f4d42116
+EBUILD gnome-shell-frippery-3.32.1.ebuild 913 BLAKE2B 9cad84c757d0db40d78c1015b6569e75e1ca9f2c25ee98c2784c056840f9e840a3b9523b25b57d8edb22ee2cb16273582ccf3587446b59376332c4acb6382ea2 SHA512 14da336819bc0053667ebd4acbc27f432d854b36478f5b2eab51ea5d0c3e6a11c1f191db6089e34060cb70410c4d1cc6948229e16387d1f2fe849b48ebbfa0e5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.30.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.30.2.ebuild
index 6128d8dd5bdc..2bd0d45c7cf7 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.30.2.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.30.2.ebuild
@@ -18,6 +18,7 @@ RDEPEND="
 	dev-libs/gobject-introspection:=
 	gnome-base/gnome-menus:3[introspection]
 	>=gnome-base/gnome-shell-3.30
+	<gnome-base/gnome-shell-3.31
 	media-libs/clutter:1.0[introspection]
 	x11-libs/pango[introspection]
 "
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.32.1.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.32.1.ebuild
new file mode 100644
index 000000000000..0b26bdbc79d9
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.32.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
+HOMEPAGE="http://frippery.org/extensions/index.html"
+SRC_URI="http://frippery.org/extensions/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.32
+	media-libs/clutter:1.0[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND=""
+
+S="${WORKDIR}/.local/share/gnome-shell"
+
+src_install() {
+	insinto /usr/share/gnome-shell/extensions
+	doins -r extensions/*@*
+	dodoc gnome-shell-frippery/{CHANGELOG,README}
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}