gentoo resync : 29.12.2022

4 files changed, 2 insertions, 112 deletions

diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 77069fe1aecb..554ecd6b025b 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,6 +1,3 @@
-AUX gnote-3.38.1-cstddef.patch 988 BLAKE2B 8281bd3b515d642b57e49e365b76b134a3ccc9021b4b95b46934d4713f39cb107a644db948cac73175fa6dcdbdf566639894521b1415957af2dc8b661aca08e1 SHA512 3f4cdb300299fc224f3c5fd2cc8a4f8d47a7eb41af47eb233555f714879cdf1d0e294c5045a4fb89b4b721b6029f5c38dac7fee5d6c1c11461efe0523a3edefe
-DIST gnote-40.2.tar.xz 3422560 BLAKE2B d7d7fa862e02c1d889c736ae733db503a06db93cfc79c12bd1efa89acbe4a5825d0cf0cab00cfa916566002c1b838d118b37f5b0204f20ac9fcab2f892cccf52 SHA512 e1dc3ed4fb7b7c4f346a4a1e63a2e357b197375caf5d1d2026c159cfda012ace76ad598ecaf8e7d7649fb80abedc0cd4febd369160ddaf4510cfcc6b41185aed
 DIST gnote-42.0.tar.xz 3330504 BLAKE2B 847c1c66b86902c13a7e9cd349e0b1e565f046ba81809dca002bfdc07d1e3dc4e12797da90e7689d8fde886ced580da9b744ca736697d1fd933a93cc344304bd SHA512 fcdd653a29ae957faf177bacbe1bbdced186416c04a8f45f194a055914544b0679019935f482834e515a20865f358dfdfc32aa846c0fd24596cf5e569e21b997
-EBUILD gnote-40.2.ebuild 1575 BLAKE2B 5c081c144d811da893477c18e077637cbfd870d67462262c4ed4f361a67aba1148c4e8799129cb1e35598a93b51a210df5541072190e4e88b32321535e8ab77d SHA512 38ee320d652fd6268b36639481570ff61e3171fd839f3c10870b4b6b04dd4a3dfc342ef270fb3665c7286eb647d1974603797ffc1c8af91ee37d4d4abc80a1f8
-EBUILD gnote-42.0.ebuild 1531 BLAKE2B 701bbd0c3c162abb1e5dd6df41fe3f35b065e502934096853272238761ed9bf0590c2533550452790acafd4bd01d7300df81cc0ab759fc08dd508664c50419e7 SHA512 1199fc10659751737c226278e3ffad458c3ddb4a8ff4e57c63c807f72d82c7eb6895798e9db823c6b60500264bbc42d2d2e17196b30a4335517f3a8f02b4c9a9
+EBUILD gnote-42.0.ebuild 1529 BLAKE2B 25b2bbbc16b22e051f3bf98dbded4ae9151b64330003b84b8b529c428fcb076d4c40f493f66a02d9138f415d7819a1dd64701785e80e3e3b961f8d501461a234 SHA512 c0e89681d3b0acb65c66d0050cedc52cdaa63c094721d57589abab87f8c7de1095d91cbfdbb0d92867d8f45eecc68e6d8f3a903001267a92d1d6caca5a0ca54f
 MISC metadata.xml 343 BLAKE2B 7ee97c51a3909fa5375a7ad9ee680ef0e52cbf09098f385eb3a11441af6a31b76e8c7674a0b57d7adc8a07546b9b5c31f8eb4007e58e030cf348fc5ca2499718 SHA512 d304542c83029fc3ff18100e14539f9b9a01474b5847e1495d4f01ee48d8b16f06a7efeb3919a9f3f1686770f23b30185441cfacd4c081eab4a34c21b3307a50
diff --git a/app-misc/gnote/files/gnote-3.38.1-cstddef.patch b/app-misc/gnote/files/gnote-3.38.1-cstddef.patch
deleted file mode 100644
index 0ea65b9bbd26..000000000000
--- a/app-misc/gnote/files/gnote-3.38.1-cstddef.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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-40.2.ebuild b/app-misc/gnote/gnote-40.2.ebuild
deleted file mode 100644
index 8544513de26d..000000000000
--- a/app-misc/gnote/gnote-40.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
-
-LICENSE="GPL-3+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="debug"
-
-# Automagic:
-# glib-2.32 dep
-# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
-DEPEND="
-	>=app-crypt/libsecret-0.8
-	>=app-text/gspell-1.6.0:=
-	>=dev-cpp/glibmm-2.62.0:2
-	>=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.22.20:3
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-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
-
-	gnome2_src_prepare
-
-	if has_version net-fs/wdfs; then
-		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
-		synchronize notes."
-	else
-		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
-		If you want to use that functionality just emerge net-fs/wdfs.
-		Gnote will automatically detect that you did and let you use it."
-	fi
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-misc/gnote/gnote-42.0.ebuild b/app-misc/gnote/gnote-42.0.ebuild
index ffd488033aaf..a448ad104dbf 100644
--- a/app-misc/gnote/gnote-42.0.ebuild
+++ b/app-misc/gnote/gnote-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"