gentoo resync : 31.05.2021

4 files changed, 2 insertions, 208 deletions

diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 16640e3dde94..dc7194a64ef3 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,10 +1,6 @@
 AUX 3.38-make-gspell-optional.patch 1896 BLAKE2B 51c05e9a45aeb7586ba37cc0a3c01baebedf4cf1bbd7971b89e4b14c55941fdeb824405f6ab6c9035b9b9d6fcac7ab8cf80270bd7d52f880b3f628140f74b0e4 SHA512 857955914028623ccb3f41b91e3a1d895901e7810764085fdd7daa40f455582dbf999cffede29519ba8097f09bbb02999a969bbff406d2822fcb4fd2feb82275
 AUX 3.38-make-python-optional.patch 2255 BLAKE2B 25b50cfab045ab54c3d9e0ba5043ec6b839cffc31df3ebfd43dd438880c45d2d6eac0bea583209960d946591d3348070ec99e0b0056a5807a47eb84ddfec6363 SHA512 ad39c6f6ce36b19760bf726aedca158866158a4f2bb2479f752eab0eb2af7e4e425797bb20e301dbfdd58ac83bd824335499f99a6b4091c0835091848cc5de50
 AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac333b772c415c49bbca472d60a87852473e4c73d5de327d83dc1756f188458564f5529555c69843b79274db83209faa4611e SHA512 37a6e3be8e62ede716ac3666f4ad5f2f12e2a49c5d4d15db91b2b3aaa27217b04e50bc80ed128da1b9f64d56a240c0d916d5b8335f1fec4db296f038951cca1e
-DIST gedit-3.38.1.tar.xz 6861368 BLAKE2B 3b202dbb7df8e91b58bd345fcaa309546af07bce60dc4638a3c344996d6c04ef7fe8a4824360c0f55970b759f9d7e2929c207992a9c80ad686d39e94ff741b7a SHA512 cd52cbcece3b007692294ab01b95fae7deb744b08a44da2d3cafa82a86d94c104abcdd4dcbe10630e0d633c8cc3c75f5e5dc6c8452a8c4bc2e6bb3c0de7d5547
-DIST gedit-40.0.tar.xz 6852672 BLAKE2B 80af344cb6e848338f0c5921ff15e1d3e8566967756fbb832767c5d39914915f1c746c78c45e22d534dd8fc02c7e214e793b5a315ce2357e2afb3ca97312e45e SHA512 b1f6fc4f4894c3ada8e85b81df2fca6870acf725074b56b2c85b1c8f04e004f193e8fad3ac0c641bd0df6a704604ec054e130c60f0480c1abf62a91cb181429e
 DIST gedit-40.1.tar.xz 6850264 BLAKE2B 2baabac1254d56bf4c6a663012f88505c8f3cfcdd8fd8e020e05d807f727f71cf9088c398702f559e40ba7db31d3a9d135c1148f8a8b178c9107aa2675265910 SHA512 ac4cd2864af63625dbdb5c55fcc5e7ea403d84d7cc25d9f1c121f544ef1cf686ab9b7c0d50ef73b4bf24e573cdf528622a49d82f675b0c1673c46f691b79ac09
-EBUILD gedit-3.38.1.ebuild 2270 BLAKE2B 69d117a04236aa8643c992c683412290991609ebf9131035fdbb2c2c84a8e4157d868e47243794cebe91513051638fe04b76c741de8acbfbfe9196c7ce379a8e SHA512 5fa553b145169481336968982b42cc3b51ca703aef3de7e833ff8f31d9255ed049d8975ba888a4b3ee21fd72114d3309a230436b89206fb32a270b06c0c18d18
-EBUILD gedit-40.0.ebuild 2272 BLAKE2B 5f3998439f2d0badfc1a65a65e3162869e17ddd17046fe43100931cf6eb4ba06139c44693f607c3569033c256d80bfccb46efce3cbb7fbe28351df112a578401 SHA512 f4acbc22dbf93d5b9f27acbc4365861805fae54339029b7b05a6917191526671e501a2ff9512db384156b15d614aba5ec69693a46a59b3976783e5b64a8f024c
-EBUILD gedit-40.1.ebuild 2272 BLAKE2B 5f3998439f2d0badfc1a65a65e3162869e17ddd17046fe43100931cf6eb4ba06139c44693f607c3569033c256d80bfccb46efce3cbb7fbe28351df112a578401 SHA512 f4acbc22dbf93d5b9f27acbc4365861805fae54339029b7b05a6917191526671e501a2ff9512db384156b15d614aba5ec69693a46a59b3976783e5b64a8f024c
+EBUILD gedit-40.1.ebuild 2270 BLAKE2B bf7a66b16e75dd44165ddd9c11be3621f7f8533d005ff73c5027267b56a4bb52c664d13e11f7b594bc1c59be045016019307dd78f59b7bbaee9e10d830d30a2e SHA512 dcd72286738424b24da6721a55f875131f343674ae2c306460352da986521079d9ef3e8245c4a8cb22e365b0ecf2d6ad841aa61f41e4ff037a8390747e56b5c9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/gedit-3.38.1.ebuild b/app-editors/gedit/gedit-3.38.1.ebuild
deleted file mode 100644
index 570c7cf25780..000000000000
--- a/app-editors/gedit/gedit-3.38.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+python gtk-doc spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-DEPEND="
-	>=dev-libs/glib-2.64:2
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.22.0:3[introspection]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection]
-	gui-libs/tepl:5
-
-	spell? ( >=app-text/gspell-0.2.5:0= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pycairo[${PYTHON_USEDEP}]
-			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	x11-themes/adwaita-icon-theme
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-"
-BDEPEND="
-	$(vala_depend)
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-PATCHES=(
-	# Don't force off overlay scrollbars for dubious reasons that GNOME designers heavily
-	# disagree with; those wanting them off in general would set that globally for gtk
-	"${FILESDIR}"/restore-overlay-scrollbars.patch
-	# Make gspell and python optional
-	"${FILESDIR}"/3.38-make-gspell-optional.patch
-	"${FILESDIR}"/3.38-make-python-optional.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use python)
-		$(meson_use gtk-doc gtk_doc)
-		-Duser_documentation=true
-		$(meson_feature spell)
-	)
-	meson_src_configure
-}
-
-# Only appdata and desktop file validation in v3.32.2
-src_test() { :; }
-
-src_install() {
-	meson_src_install
-	if use python; then
-		python_optimize
-		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/gedit/gedit-40.0.ebuild b/app-editors/gedit/gedit-40.0.ebuild
deleted file mode 100644
index 8a7d0429c49e..000000000000
--- a/app-editors/gedit/gedit-40.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+python gtk-doc spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.64:2
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.22.0:3[introspection]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection]
-	gui-libs/tepl:6
-
-	spell? ( >=app-text/gspell-0.2.5:0= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pycairo[${PYTHON_USEDEP}]
-			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	x11-themes/adwaita-icon-theme
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-"
-BDEPEND="
-	$(vala_depend)
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-PATCHES=(
-	# Don't force off overlay scrollbars for dubious reasons that GNOME designers heavily
-	# disagree with; those wanting them off in general would set that globally for gtk
-	"${FILESDIR}"/restore-overlay-scrollbars.patch
-	# Make gspell and python optional
-	"${FILESDIR}"/3.38-make-gspell-optional.patch
-	"${FILESDIR}"/3.38-make-python-optional.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use python)
-		$(meson_use gtk-doc gtk_doc)
-		-Duser_documentation=true
-		$(meson_feature spell)
-	)
-	meson_src_configure
-}
-
-# Only appdata and desktop file validation in v3.32.2
-src_test() { :; }
-
-src_install() {
-	meson_src_install
-	if use python; then
-		python_optimize
-		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/gedit/gedit-40.1.ebuild b/app-editors/gedit/gedit-40.1.ebuild
index 8a7d0429c49e..415abe4e1829 100644
--- a/app-editors/gedit/gedit-40.1.ebuild
+++ b/app-editors/gedit/gedit-40.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+python gtk-doc spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.64:2