gentoo resync : 31.05.2021

4 files changed, 2 insertions, 151 deletions

diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 9254153c1ef1..0141d912c696 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,8 +1,4 @@
 AUX gnote-3.38.1-cstddef.patch 988 BLAKE2B 8281bd3b515d642b57e49e365b76b134a3ccc9021b4b95b46934d4713f39cb107a644db948cac73175fa6dcdbdf566639894521b1415957af2dc8b661aca08e1 SHA512 3f4cdb300299fc224f3c5fd2cc8a4f8d47a7eb41af47eb233555f714879cdf1d0e294c5045a4fb89b4b721b6029f5c38dac7fee5d6c1c11461efe0523a3edefe
-DIST gnote-3.38.1.tar.xz 3530348 BLAKE2B d3312162ffdf505dea31f8e8848bd755d6fc54a5f95250ce6b90a28e04801fb86a8c4e239471442a4501068a841e38e4764da8f16528849fdec57a88bd271891 SHA512 ccfe35ff3dc8e90fa96307565875401540c9e03a18ffd5b2c25fdb053927c4bb2b6b5515456f5260c053948b1a63bf6959a73e1ab09feefce61ed2adc257734f
-DIST gnote-40.0.tar.xz 3418516 BLAKE2B 93834a3d9cdae89604be01b96c5293741263a1812ed23cc51a151c250f42c33c560456ac78a5a97f713dffc095b6f53ffe465da89867df89497239443939f3c4 SHA512 098273ee2de15152e7da739b857a8f7c43561e51013d1f42a631b0a9f52edebcd089817a9009556697e4c4b43506834919cd0f8cae7b3d899517f4b6d42eeb31
 DIST gnote-40.1.tar.xz 3420216 BLAKE2B a84604b25301fb0332da161a7f1f258542f1dfa16a02f34e700280e87393a3eb6d9005a5ed18204b91d0fccea2f6e44738789ab57dae543707650bfce55165c8 SHA512 6f4286fef18b060bb46c1c9f43772df7d9d913d6d1e3e3801e38e277fa660aa213e46f4a825788795f153821f705bbea22df7d1ff90ee949752497274455ad37
-EBUILD gnote-3.38.1.ebuild 1604 BLAKE2B 3de1688743a57faa5d11f39adeb2fcbd337a58ed4e7e9b2784cf79916fe54248d19cba834890336ea22c7cc71bc6b481a44634e34485da1890f0368bce43d3b5 SHA512 ee634cbf38dbc32bc1c5804fe5bfb58a4f405ad1c3032a204041192c2ac54321027c3b0ebe41f0c1df984912a366de178adf671345cde65bbea5d4be41fc4a5d
-EBUILD gnote-40.0.ebuild 1563 BLAKE2B e9112a82cb20c0bfa6cb0d19c2cbc811fbc42251e76f84026cb5e849d728f7042315e4d7d3cafca19dd948b043d5054da938ff87312ed3ae20e09965a991d139 SHA512 070dee31791766de946e674387c3a65e57c5385d58571b07a45d86caa4b251d892064a38d20e94aaa1ebb03c828fe363b66f562af4deb7b7dd31eba5a237ed04
-EBUILD gnote-40.1.ebuild 1563 BLAKE2B e9112a82cb20c0bfa6cb0d19c2cbc811fbc42251e76f84026cb5e849d728f7042315e4d7d3cafca19dd948b043d5054da938ff87312ed3ae20e09965a991d139 SHA512 070dee31791766de946e674387c3a65e57c5385d58571b07a45d86caa4b251d892064a38d20e94aaa1ebb03c828fe363b66f562af4deb7b7dd31eba5a237ed04
+EBUILD gnote-40.1.ebuild 1561 BLAKE2B d408ae3b6729f5b9bf8e780898224abfbbe4057caa5c50d739c9fbff644f4071ccffa8017a83ced5cd2ef6dbb8aa82ec9fa2116e84b41a1fad30626f0ae772ea SHA512 11d3a079ee001ab75c7df3c382e5dc58de58db141eb5010f694f86c203f6ce4eb2ae96001738a497bc36572d83e04cf4e03e11c58a0cc07efbcc4694c694831b
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-3.38.1.ebuild b/app-misc/gnote/gnote-3.38.1.ebuild
deleted file mode 100644
index 6f20625b348c..000000000000
--- a/app-misc/gnote/gnote-3.38.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-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 x86"
-IUSE="debug"
-
-# Automagic:
-# glib-2.32 dep
-# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
-COMMON_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="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${DEPEND}
-	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-40.0.ebuild b/app-misc/gnote/gnote-40.0.ebuild
deleted file mode 100644
index d59f76c84cde..000000000000
--- a/app-misc/gnote/gnote-40.0.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 ~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-40.1.ebuild b/app-misc/gnote/gnote-40.1.ebuild
index d59f76c84cde..e4f9ebcf3a3d 100644
--- a/app-misc/gnote/gnote-40.1.ebuild
+++ b/app-misc/gnote/gnote-40.1.ebuild
@@ -10,7 +10,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: