gentoo resync : 07.10.2018

5 files changed, 1 insertions, 287 deletions

diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 4c4a31f09aeb..07a2d21776c1 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,9 +1,3 @@
-DIST pluma-1.12.2.tar.xz 3397280 BLAKE2B 23af095549ff944b0936889deda6576717a6376aa2f2be8ed9b7d8ad70f8bb0524aff7314f9c335a42d80951c047c8008278144f45c2c5edb09a259b298c0024 SHA512 db2878161903868703514531ba214fc34dad1789885f18756e9192d6ba17950c8be03141ada72f8c386b515d8b0f9d58a0ee94a33fe3ffe00f360ea667c2b275
-DIST pluma-1.14.1.tar.xz 3415364 BLAKE2B 9449fc6b5e98d8ecb25f70df6c114c13cc32a8c0348ed2047eb874e85c7d448d3d7f0b4d7dd6e2fada3de847ded425651dc6d0ca92ce3c784fd32948735f3b25 SHA512 5d04e053ab2eb0f90e34d9af541004867c7317fd9386229c4e702e95a80420df16b20e4ae4c30bbee79fe904282f6134f7c361971be07cd6952612d975c88d11
-DIST pluma-1.16.2.tar.xz 3428472 BLAKE2B c3b543fb11678269fbbc2d049686b2a553aa1fede4ef1bab8abbc7fed316f27ba67cbb366908966b6c844f8ad0c4899499e52b4720378364555ef9156c80ae95 SHA512 bf91a7e4e1cfb92f9fd9a1d5b4ac9f0fd2704785b2da5d7a3aa360b4c217a57653d6f7bf509c156b8711bc5164e022c685331c93a139f55ea41431bc72e848fe
 DIST pluma-1.18.3.tar.xz 3355188 BLAKE2B d53f381aa9c74cad0df82ccc73aaab9f87347cb8e3886471a2531bdd4d49a84ee97a50f2333b2e375f9bc2a634c25dc69b36659dcb589ace716e523a9d0b4544 SHA512 62ad57a8d7626e34c15610e121869ee9b06a2498acb40ec0a60839ca0273d146bd59682d352c3e98d892460c444c5442d32673c2f63897bb8c3e9e595e771dc1
-EBUILD pluma-1.12.2-r1.ebuild 1957 BLAKE2B 439ee1e569e161b2227abc7dffcb3815582f4f2a597b4d1769f1d0d1d2308361156cbaba558bd8e760499f129dade20a987e66dc94a7caf3cf530f3ead64a997 SHA512 fc460f11527c2a5cdced694b8c59ede5931f2ecf452e7a862791fe93fa18b2c260a51d8f6fca17c58445a59357efe48a6431d5824c8c045fd719ebaca5730860
-EBUILD pluma-1.14.1.ebuild 1999 BLAKE2B 179b831656292280771e6d4244ff24f8a4cf3285e82ba021ec73a32e6047cc9db2ce3ee9da226fb70d674e9b183c07ed55fe6cdb151b891b9b00a4199e4c4ac9 SHA512 095ec46f710d2ad58819291e28a560a4fadcab2790142604d025c69bfd1842ae78f7dca3ff5098062b2bf63f2448b5e96d66a64504edee21e9ba43a84a4e4c7e
-EBUILD pluma-1.16.2.ebuild 1999 BLAKE2B e301396e062768616a2c775d8fe644340eaaa4b085f2e8faf697f0aade4494b86cb4d5b3ad7218caec0677458f43ff27d80aa1f64cc5c40b07296127f8479ca9 SHA512 3394730f3248e8eaae6703aa472a4916e68e3aa96cc01dbe77df11786a48b95ba8a6936948fd3e2d6b921d8465f3ad05e98226802bdc8a198fee1a9aa66b31b6
 EBUILD pluma-1.18.3.ebuild 1762 BLAKE2B 5308bc86e3b681a3dd36fff0205dc4f45e4bbb1a490d135e975b38e1a66c400da7d3ee7014e34586d10ee5942e9366402a440d9cda2599e2dcbf256b524c1158 SHA512 8446e2f3c119ea9c1ed81b85265fc012c6d1990c5b12b56c9d3086e683c3b16b91e6e631c00f664b9027d60dfff1953b444e8135c9dc2af0da98eba6f0452b69
-MISC metadata.xml 410 BLAKE2B b9e15ebb574ba3482e7317f89fd1bd599a0ba5d42a27e0c0da34f86ed64830819f23fca50865cdba6081daea8313b82a58cf98fa46e3ccc61eb389222cd1bfd4 SHA512 0e79ae54838d841d9e4d65b82af5042223e07585808bcdbf9c26ae7b59cfc7b66d1bb24b39e1835ca75dd724d34854fd12d881b7edb20850fa434cf1db2b2e14
+MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca
diff --git a/app-editors/pluma/metadata.xml b/app-editors/pluma/metadata.xml
index e740906c492d..3daddb1815dc 100644
--- a/app-editors/pluma/metadata.xml
+++ b/app-editors/pluma/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/pluma</remote-id>
 	</upstream>
diff --git a/app-editors/pluma/pluma-1.12.2-r1.ebuild b/app-editors/pluma/pluma-1.12.2-r1.ebuild
deleted file mode 100644
index a9646a9a642b..000000000000
--- a/app-editors/pluma/pluma-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 python spell"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${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"
-
-RDEPEND="app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libX11:0
-	>=x11-libs/libSM-1.0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/gtksourceview-2.9.7:2.0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/gtksourceview-2.9.7:3.0
-	)
-	spell? (
-		>=app-text/enchant-1.2:0
-		>=app-text/iso-codes-0.35:0
-	)
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.9.2:2
-	)
-	!!app-editors/mate-text-editor"
-
-DEPEND="${RDEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	>=sys-devel/libtool-2.2.6:2
-	>=sys-devel/gettext-0.17:*
-	virtual/pkgconfig:*"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python) \
-		$(use_enable spell)
-}
-
-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" Xemake check
-}
diff --git a/app-editors/pluma/pluma-1.14.1.ebuild b/app-editors/pluma/pluma-1.14.1.ebuild
deleted file mode 100644
index a1c96eaebad6..000000000000
--- a/app-editors/pluma/pluma-1.14.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 python spell"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${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:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libX11:0
-	>=x11-libs/libSM-1.0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/gtksourceview-2.9.7:2.0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/gtksourceview-2.9.7:3.0
-	)
-	spell? (
-		>=app-text/enchant-1.2:0
-		>=app-text/iso-codes-0.35:0
-	)
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.9.2:2
-	)
-	!!app-editors/mate-text-editor"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	>=sys-devel/libtool-2.2.6:2
-	>=sys-devel/gettext-0.17:*
-	virtual/pkgconfig:*"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python) \
-		$(use_enable spell)
-}
-
-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" Xemake check
-}
diff --git a/app-editors/pluma/pluma-1.16.2.ebuild b/app-editors/pluma/pluma-1.16.2.ebuild
deleted file mode 100644
index 801ac0a47337..000000000000
--- a/app-editors/pluma/pluma-1.16.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 python spell"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${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:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libX11:0
-	>=x11-libs/libSM-1.0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/gtksourceview-2.9.7:2.0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/gtksourceview-2.9.7:3.0
-	)
-	spell? (
-		>=app-text/enchant-1.2:0
-		>=app-text/iso-codes-0.35:0
-	)
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.9.2:2
-	)
-	!!app-editors/mate-text-editor"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]"
-
-DEPEND="${COMMON_DEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	>=sys-devel/libtool-2.2.6:2
-	>=sys-devel/gettext-0.17:*
-	virtual/pkgconfig:*"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python) \
-		$(use_enable spell)
-}
-
-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" Xemake check
-}