gentoo resync : 25.08.2020

3 files changed, 50 insertions, 67 deletions

diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest
index 73369056820a..a4f60b1bdb28 100644
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@@ -1,3 +1,3 @@
-DIST accerciser-3.22.0.tar.xz 3060756 BLAKE2B a648c764c5f101f323458c692cb4171704b7b710558f4103b57d87ca58c2d0d9c03cad72de1d3be9483d317ad94c95e43bb2437515093d6ffd93089a58e5fab1 SHA512 980db5dcd0bdc78314ab87cce95cfcfa018bf302acc66ea2dd1bddfb61de5bfe2e64344cff63740c38be33124ff49c75699aa6867d5e85b25d422b5af1b025c1
-EBUILD accerciser-3.22.0.ebuild 1431 BLAKE2B ff37785fb67fb66c82d04b93d6c08953cabdd67d84e86a36ec69b30a99a1d6aa6a62812deb1a6d020b1e87ed31d818fe051e313684ed2b22c52a32f4e9d08384 SHA512 96f8f708ec564fef31f3ef0c0234cf94d1883a38c8327795fd534df5738b3135fbab2a70e1f15c4c43575ee689b39dfb16f468859ac19daa8fedb756da47db1f
+DIST accerciser-3.36.2.tar.xz 1995756 BLAKE2B 14d569f159cda685bb5217cb650d64c473c296e6c0e74bf2d6290908ea4aef06fd736aa8bdb7782a7bbd5231895a53e85fa362382fd15cf0554721fe46c8cbe9 SHA512 fb2ecb35826f1a868a8badcefcb4941258273bfc639996b8d4cecbd5d9700cb48e102891105842fcf3b0cb5f7a53df28de3283a80130d83695528db06ff0f268
+EBUILD accerciser-3.36.2.ebuild 1144 BLAKE2B d54d49f4837aa5bb830cedb649e9007904cf8b510bdab8bd8c617e5297b68ca3a2fc3421fd8ea52c6043a4ead7311a72177d16e05081f8fecc569ac20338621b SHA512 c8ace1376b7f20148a22b2c2d10bc32d306b18def85366bb0a6e9f4d34851850b8190f465d375969ae7799d97f44099ef8c809e3039ed181b82716db944a00c3
 MISC metadata.xml 738 BLAKE2B 916b10f5cb4aba612767ff5a617c091a36573681418c15973fbbff3328e00311306b162f504e9a12e17f04dc582f72bae21508847fec79a8d8cad4f3e18c9cb5 SHA512 78780d3254a608f95d3532de8a7438e891bd2e194ac8a255f2d224e8f4b41c2928b2efe04ae16050d0092f9e25f77800728f0be9b7cb3bcb955455532d4154e6
diff --git a/app-accessibility/accerciser/accerciser-3.22.0.ebuild b/app-accessibility/accerciser/accerciser-3.22.0.ebuild
deleted file mode 100644
index 9acb9c3494a6..000000000000
--- a/app-accessibility/accerciser/accerciser-3.22.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Interactive Python accessibility explorer"
-HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser"
-
-LICENSE="BSD CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.5.2:2
-	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3.1.13:3[introspection]
-
-	dev-libs/atk[introspection]
-	>=dev-libs/glib-2.28:2
-	dev-libs/gobject-introspection:=
-	>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
-	>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Leave shebang alone
-	sed 's:@PYTHON@:/usr/bin/python:' -i src/accerciser.in || die
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	installing() {
-		gnome2_src_install
-		python_doscript src/accerciser
-	}
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/app-accessibility/accerciser/accerciser-3.36.2.ebuild b/app-accessibility/accerciser/accerciser-3.36.2.ebuild
new file mode 100644
index 000000000000..b0b41bfafe3e
--- /dev/null
+++ b/app-accessibility/accerciser/accerciser-3.36.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Interactive Python accessibility explorer"
+HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser"
+
+LICENSE="BSD CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.5.2:2
+	>=x11-libs/gtk+-3.1.13:3[introspection]
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+		>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
+		>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/python-xlib[${PYTHON_USEDEP}]
+	')
+
+	dev-libs/atk[introspection]
+	>=dev-libs/glib-2.28:2
+	dev-libs/gobject-introspection:=
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+	gnome-base/librsvg[introspection]
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_install() {
+	gnome2_src_install
+	python_optimize
+}