gentoo resync : 28.04.2021

4 files changed, 52 insertions, 13 deletions

diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index b67c62bb1d3d..0cf3fae4c54d 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,5 +1,6 @@
-DIST gnote-3.36.2.tar.xz 3511244 BLAKE2B d7b8859ec47f8da2d37f285141d4c7fc0f591751a1ebea70339d6cdb727c74a6ca711515f8169130e1b46c1653c0c98da3bc4bce691b8d7a7f2794745e8db2a7 SHA512 6d2e32954836b4ac2800071385eedd6ad391936ee52626b7d51b077e4b4a3e071149804281e645b0fd88dc18e9f3c0f8d53e0994d33875ce5375d6b50b14d5e1
+AUX gnote-3.38.1-cstddef.patch 988 BLAKE2B 8281bd3b515d642b57e49e365b76b134a3ccc9021b4b95b46934d4713f39cb107a644db948cac73175fa6dcdbdf566639894521b1415957af2dc8b661aca08e1 SHA512 3f4cdb300299fc224f3c5fd2cc8a4f8d47a7eb41af47eb233555f714879cdf1d0e294c5045a4fb89b4b721b6029f5c38dac7fee5d6c1c11461efe0523a3edefe
 DIST gnote-3.38.1.tar.xz 3530348 BLAKE2B d3312162ffdf505dea31f8e8848bd755d6fc54a5f95250ce6b90a28e04801fb86a8c4e239471442a4501068a841e38e4764da8f16528849fdec57a88bd271891 SHA512 ccfe35ff3dc8e90fa96307565875401540c9e03a18ffd5b2c25fdb053927c4bb2b6b5515456f5260c053948b1a63bf6959a73e1ab09feefce61ed2adc257734f
-EBUILD gnote-3.36.2.ebuild 1546 BLAKE2B 4ce85d4d9ff99dd114b5bec5643d9c438ba77a563c8c878aa72d1fe2e789163960d18910d09273f11861561175d215fb128613d3dfceb192aedeaf16f2406fda SHA512 ef696ad04560cb4d27a7446e19f3d04c9fb8877a227e77c1f7dfc3c47aa2f276db6b7b095dbb484f94911a13a379f41bb298f090c7efb65ad400e2eef6895528
-EBUILD gnote-3.38.1.ebuild 1553 BLAKE2B de254f316e6a3db0f38d86aecf155e972beb2cde1d0a8c0cdba09105082af7703bddc8920535f06f897e5395b5a8b5489d7d794b15c2ec5a74f4a712992280e0 SHA512 14aab4d7236bb2e3fb2799b7cce1d246912f7c16ac78ee01e8f516ede5b09d1f0cce1369f90e72236158708fdc4f5ef40dbee3f11e04c5b31d7791f58a9bbc0c
+DIST gnote-40.0.tar.xz 3418516 BLAKE2B 93834a3d9cdae89604be01b96c5293741263a1812ed23cc51a151c250f42c33c560456ac78a5a97f713dffc095b6f53ffe465da89867df89497239443939f3c4 SHA512 098273ee2de15152e7da739b857a8f7c43561e51013d1f42a631b0a9f52edebcd089817a9009556697e4c4b43506834919cd0f8cae7b3d899517f4b6d42eeb31
+EBUILD gnote-3.38.1.ebuild 1604 BLAKE2B 3de1688743a57faa5d11f39adeb2fcbd337a58ed4e7e9b2784cf79916fe54248d19cba834890336ea22c7cc71bc6b481a44634e34485da1890f0368bce43d3b5 SHA512 ee634cbf38dbc32bc1c5804fe5bfb58a4f405ad1c3032a204041192c2ac54321027c3b0ebe41f0c1df984912a366de178adf671345cde65bbea5d4be41fc4a5d
+EBUILD gnote-40.0.ebuild 1563 BLAKE2B e9112a82cb20c0bfa6cb0d19c2cbc811fbc42251e76f84026cb5e849d728f7042315e4d7d3cafca19dd948b043d5054da938ff87312ed3ae20e09965a991d139 SHA512 070dee31791766de946e674387c3a65e57c5385d58571b07a45d86caa4b251d892064a38d20e94aaa1ebb03c828fe363b66f562af4deb7b7dd31eba5a237ed04
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/files/gnote-3.38.1-cstddef.patch b/app-misc/gnote/files/gnote-3.38.1-cstddef.patch
new file mode 100644
index 000000000000..0ea65b9bbd26
--- /dev/null
+++ b/app-misc/gnote/files/gnote-3.38.1-cstddef.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/768198
+
+From 49e652613a1e28f1220f593ba18108839d3d2505 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 22 Mar 2021 15:04:01 +0100
+Subject: [PATCH] Fix AbstractAddin compilation error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+gnote/src/abstractaddin.cpp: In constructor ‘gnote::AbstractAddin::AbstractAddin()’:
+gnote/src/abstractaddin.cpp:29:15: error: ‘NULL’ was not declared in this scope
+   29 |     : m_gnote(NULL)
+      |               ^~~~
+gnote/src/abstractaddin.cpp:25:1: note: ‘NULL’ is defined in header ‘<cstddef>’; did you forget to ‘#include <cstddef>’?
+   24 | #include "abstractaddin.hpp"
+  +++ |+#include <cstddef>
+   25 |
+---
+ src/abstractaddin.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/abstractaddin.cpp
++++ b/src/abstractaddin.cpp
+@@ -22,6 +22,7 @@
+ 
+ 
+ #include "abstractaddin.hpp"
++#include <cstddef>
+ 
+ namespace gnote {
+ 
+-- 
+2.31.1
+
diff --git a/app-misc/gnote/gnote-3.38.1.ebuild b/app-misc/gnote/gnote-3.38.1.ebuild
index ad33ccce7862..6f20625b348c 100644
--- a/app-misc/gnote/gnote-3.38.1.ebuild
+++ b/app-misc/gnote/gnote-3.38.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 # Automagic:
@@ -38,6 +38,8 @@ DEPEND="${DEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=("${FILESDIR}"/${PN}-3.38.1-cstddef.patch)
+
 src_prepare() {
 	# Do not alter CFLAGS
 	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
diff --git a/app-misc/gnote/gnote-3.36.2.ebuild b/app-misc/gnote/gnote-40.0.ebuild
index 0a1202afea6c..d59f76c84cde 100644
--- a/app-misc/gnote/gnote-3.36.2.ebuild
+++ b/app-misc/gnote/gnote-40.0.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
 
 inherit gnome2 readme.gentoo-r1
 
@@ -11,33 +10,35 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 # Automagic:
 # glib-2.32 dep
 # >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
-COMMON_DEPEND="
+DEPEND="
 	>=app-crypt/libsecret-0.8
 	>=app-text/gspell-1.6.0:=
 	>=dev-cpp/glibmm-2.62.0:2
-	>=dev-cpp/gtkmm-3.18:3.0
+	>=dev-cpp/gtkmm-3.22.20:3.0
 	>=dev-libs/glib-2.32:2[dbus]
 	>=dev-libs/libxml2-2:2
 	dev-libs/libxslt
 	>=sys-apps/util-linux-2.16:=
-	>=x11-libs/gtk+-3.20:3
+	>=x11-libs/gtk+-3.22.20:3
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	gnome-base/gsettings-desktop-schemas
 "
-DEPEND="${DEPEND}
+BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
 	>=dev-util/intltool-0.35.0
 	dev-util/itstool
 	virtual/pkgconfig
 "
 
+PATCHES=("${FILESDIR}"/${PN}-3.38.1-cstddef.patch)
+
 src_prepare() {
 	# Do not alter CFLAGS
 	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die