gentoo resync : 15.06.2021

3 files changed, 2 insertions, 85 deletions

diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index b91cd18b817b..a4c95c82692c 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,5 +1,3 @@
-DIST pluma-1.24.0.tar.xz 3717544 BLAKE2B fd9375fd05566c11c24d5bdf55ab0d4619143127a5e48c4e91d18421f50340775d58c3e2264382aa3bbd8aad0569c559e87381a9ece07ce1592d1bc1a5315db1 SHA512 390bf2949549baa0e3dc706526217fbc1513e2f9778917710da806e58cdfb0b7a36e95ed2186442490996cf76783acd4e0f4b8f1fedacee9ba356c0d466510be
 DIST pluma-1.24.1.tar.xz 3679636 BLAKE2B e792433b93862c8b0c47145255311c3a3386c1b99ec1ac87ed91608d839ece4430205f83fcc3c0f5145f986105d4c5d8803393035fcaaea08155197bbcf15d03 SHA512 0cfd6a035fc95993dce3e556c49641e799888f20159b29f2c0712c54ee772aa6df1ce755f329414c94efdb2cb3819ce633b92e6559b0c8cb064dab3c74729ab3
-EBUILD pluma-1.24.0.ebuild 1779 BLAKE2B b424d05f19cc53b723f74e2c0d10a013373df3110274292f644e3c57788f8d72942ecdfb44cbff27e3bff891c29766b4493ee55d0cc3c72f5683837b0c25be40 SHA512 16e7809f6b6467b8af68f3d85329920c793328bcfaddda90ca46489f79373339ebdff4c08c387433c2bbe065c4fe8530793dddc38b3939f19f350129ed2c91a3
-EBUILD pluma-1.24.1.ebuild 1789 BLAKE2B bb4279cea3ae284bea9882781855a997ba68dfa8879bccaf1520fc105b5cb1124abe54b719f741eb6173a11cfb66702f4b3633fa51254a79b2fc00190442d175 SHA512 d481ade08caba6522b9e3bae42028423d60d92e738d39e1d5093d5840abd0591fa5e8d0ed2706e8cbe407f7b2638411d674fb7390a7785eaf1b2e6bf6e08bee2
+EBUILD pluma-1.24.1.ebuild 1794 BLAKE2B 5bc6c48c82c0f2305597a7cbb3c494757fb489988c6bade269f5d8daf3b5da52b108f705be83a7616daecc143fa5b305334990e16dc6825ea30c7cbbeaafd959 SHA512 8415629459f251aeb93ebb511415160f2126212768aca7d506da193e6fffda0690b9e0cd75268e6147295a73a1575a3167d792e5c4f0d3e2a8ff820346f8a914
 MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca
diff --git a/app-editors/pluma/pluma-1.24.0.ebuild b/app-editors/pluma/pluma-1.24.0.ebuild
deleted file mode 100644
index 66163bb8d8a0..000000000000
--- a/app-editors/pluma/pluma-1.24.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit mate python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
-SLOT="0"
-
-IUSE="+introspection spell test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-COMMON_DEPEND="dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libpeas-1.2.0[gtk]
-	>=dev-libs/libxml2-2.5:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=x11-libs/gtksourceview-3.0.0:3.0
-	x11-libs/libICE
-	x11-libs/libX11
-	>=x11-libs/libSM-1.0
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	spell? (
-		>=app-text/enchant-1.6:=
-		>=app-text/iso-codes-0.35
-	)
-	!!app-editors/mate-text-editor
-"
-
-RDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}
-	>=mate-base/mate-desktop-1.9[introspection?]
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/libtool-2.2.6:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable introspection) \
-		$(use_enable spell) \
-		$(use_enable test tests)
-}
-
-src_test() {
-	# FIXME: This should be handled at eclass level.
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}
diff --git a/app-editors/pluma/pluma-1.24.1.ebuild b/app-editors/pluma/pluma-1.24.1.ebuild
index 9add36a506c2..a325cf16ed24 100644
--- a/app-editors/pluma/pluma-1.24.1.ebuild
+++ b/app-editors/pluma/pluma-1.24.1.ebuild
@@ -73,7 +73,7 @@ src_configure() {
 
 src_test() {
 	# FIXME: This should be handled at eclass level.
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	"${EPREFIX%/}/${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
 
 	unset DBUS_SESSION_BUS_ADDRESS