gentoo resync : 07.10.2018

5 files changed, 1 insertions, 218 deletions

diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 5ee422c4b483..c05888158a7b 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,10 +1,3 @@
-DIST mozo-1.12.0-gtk3.patch.bz2 6562 BLAKE2B 1b594ad4f3fbab0534ee90be8b10aa219b836d349031175237863db8f32394f4e387f5114c5fa29c26c1c13d77dd8bc2b8ffa425e6f4e55b49c184cd5a3689d4 SHA512 9f86a77f29fb359fb59092d819634d2223b74c5eb149917b1442589306d989cfb87df2cc8c4f1e36fd086ba57a75274feccb4978cc0156e20cfd73712ea2a48b
-DIST mozo-1.12.0.tar.xz 163820 BLAKE2B 337bf187e9d14fb61750a306314eb5d4a57f4dd187cb7d0fed953fb91907e71a3afa57625cf68d96605dcaf63689305b07de94327e39b38012d9d64835217ec4 SHA512 93e760b791a74b6a6ca0377d5aaa060c8bf339dcfde91fcb146ef1e37cc25912b3c93fa2b4d612c0abf2bbd00597c80b58769bc88b57925ec4c465967f32c05b
-DIST mozo-1.14.1.tar.xz 171576 BLAKE2B b4ca3588e57cadd1ee814045b59b464487265a0eb391288d936d8c2290be2e28ed24e541eabe6a912fe54a238569e0832a62a911d52dc0758db3b7aee3ac3822 SHA512 62269ed358807d7ebcf04e6bcbfd3689f019396ebd43a8634bca752f13d6609e94b97688b5fdfa83b1168f0e1cdf284275dc08054e27ab507ce40c2de881bc76
-DIST mozo-1.16.0.tar.xz 172312 BLAKE2B d1fd10aa32b7619238584ab33637b7bbc6404f5741445f1c09fed2132c69eeb4f2727a43c0cd3d7673bf689e15750739d04dd84c39d5c611016a0401fd48415e SHA512 507a35bbdad944ec55ce81e5193af9e5697747c2fc55817b3e3913aca68f1d99caa75df1d79f3b7abc1ba354a5c4f34c868e054e20cb86e5d0a7d65b463af57a
 DIST mozo-1.18.0.tar.xz 173432 BLAKE2B 46c791b056c3fb8bb768599f4b474cd9434d6918d9deb740e2d65bef5853199822818e02a7cf9b653d3ef49453aff413b09ad92cda218f70db950b19b5f74363 SHA512 e333c572e5bc1d0905daed17eacd3dda10df5f80ed5b5b01ca3478d345a8c724e0161ccf51914f4982f16df71f252a3b08b194bec18e6aee05eb7af021369a12
-EBUILD mozo-1.12.0-r1.ebuild 1585 BLAKE2B 9a8efa5e5e5b8a3607b038b97a0fbc06e12a873c20afe7c795e91480aaa2606b420772e3692eb31169847ff47afb88680460eb3f538c508821a6a19937a4ace0 SHA512 d78543192113d0ee62d7b9942580a6bc9aab9b38fa4b822ed40b037062ed459c675ec3d2d222c2c8455b43bdec5404e192a5a72d5eb7d039d2d2b7dad4de7778
-EBUILD mozo-1.14.1.ebuild 1269 BLAKE2B 7b27dbfef7ba6f4cb6a5f5f22b6a5d962c502203dd69bf413a6db6f22c9fd4df5b78259c00006a805d8c197130dd7b4e6126521c54d5ad7d35e0be0f1223cc9b SHA512 82ca5080f8c219fc826cf2d54fb7563d9755d7a4a50ee1de370dd235c7b9a06e1d830749e177b40189a5d099572c9b7487e1d0724940644ef7ae47d06d2c4bee
-EBUILD mozo-1.16.0-r1.ebuild 1276 BLAKE2B f83da25567034b28429ad8d524d2bc1b8321de0b9e281a7cc9b2964507b68bc71d1a623159b92e7cd199c88faeaf5b17e4d64fa401d3c75ac5aed0dfef021881 SHA512 acbc78914cdb301b86b8cc002c5dee690c8ef24af612356e832e7fef98c69f9f4b41bda83f8d021bc35b13fa68b8e6dab2d300007533c6531973116ac1ce8ffa
 EBUILD mozo-1.18.0.ebuild 1244 BLAKE2B 905b4b829c793d2f92e1dbce3789899dfb453723b40d8583bc1a3d4436c8ca670c70ed477ac6ba239f0116291a2496860215ec3b5e8c6926b4f2cf6e252f3044 SHA512 89c75d5549f13452ca1e642f46aa6011e055fd82a435e9ee027a6a3cad5caba90589dac45e6dddb8e299eea3cd5516aeef4caab3a655c72330dd9f2e234132a6
-MISC metadata.xml 409 BLAKE2B 6f681539e5a6893c65760326ee1f6eecb3b3526da969e9398d36ec5e8bfe5ff540dd700be6b2b491bc8014ef1ba532ed2b0f3924efd80e7f2cbb656938779a95 SHA512 a99cda7183e71decfb25316fc3466140b701878a053a9375213760f0c1b6497b4d772731d60242b421e3283913884939911c561eb9116bb6972e7abcfeb2f1a8
+MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/metadata.xml b/x11-misc/mozo/metadata.xml
index 6931d558370c..dae74193c803 100644
--- a/x11-misc/mozo/metadata.xml
+++ b/x11-misc/mozo/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/mozo</remote-id>
 	</upstream>
diff --git a/x11-misc/mozo/mozo-1.12.0-r1.ebuild b/x11-misc/mozo/mozo-1.12.0-r1.ebuild
deleted file mode 100644
index 9cf53b815bbd..000000000000
--- a/x11-misc/mozo/mozo-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 mate
-
-SRC_URI="${SRC_URI} gtk3? ( https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${P}-gtk3.patch.bz2 )"
-KEYWORDS="amd64 ~arm x86"
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gtk3"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=mate-base/mate-menus-1.6[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	virtual/libintl:0
-	!!x11-misc/mate-menu-editor
-	!gtk3? (
-		>=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
-		>=mate-base/mate-menus-1.6[python]
-		x11-libs/gtk+:2[introspection]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	if use gtk3; then
-		eapply "${WORKDIR}/${P}-gtk3.patch"
-		MATE_FORCE_AUTORECONF=true
-	fi
-	mate_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir mate_src_configure \
-		--disable-icon-update
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
-	installing() {
-		mate_src_install
-
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
-			-i mozo || die
-
-		python_doscript mozo
-	}
-
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/x11-misc/mozo/mozo-1.14.1.ebuild b/x11-misc/mozo/mozo-1.14.1.ebuild
deleted file mode 100644
index 7d024452e8bb..000000000000
--- a/x11-misc/mozo/mozo-1.14.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-	>=mate-base/mate-menus-1.6[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	virtual/libintl:0
-	!!x11-misc/mate-menu-editor"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir mate_src_configure \
-		--disable-icon-update
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
-	installing() {
-		mate_src_install
-
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
-			-i mozo || die
-
-		python_doscript mozo
-	}
-
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/x11-misc/mozo/mozo-1.16.0-r1.ebuild b/x11-misc/mozo/mozo-1.16.0-r1.ebuild
deleted file mode 100644
index 8f48007b8fc7..000000000000
--- a/x11-misc/mozo/mozo-1.16.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-	>=mate-base/mate-menus-1.6[introspection,python]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	virtual/libintl:0
-	!!x11-misc/mate-menu-editor"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir mate_src_configure \
-		--disable-icon-update
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
-	installing() {
-		mate_src_install
-
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
-			-i mozo || die
-
-		python_doscript mozo
-	}
-
-	python_foreach_impl run_in_build_dir installing
-}