gentoo resync : 18.08.2019

3 files changed, 2 insertions, 40 deletions

diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index ad953ff182f2..1f2ea7ab6dd8 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,6 +1,4 @@
-DIST xdot-1.0.tar.gz 131868 BLAKE2B 433d81913d19ae341c7168d9e22a2c8a54f49b0ad6b0da744cc3152766b333252b9ad7ba3831bdb17fc29a2408f8bdf3d929a438e89a78945f8edd7a8cd123b9 SHA512 52330380973ee122ac5d93f1be5b8f21b5719f537c93dd6f356a116207e366d16cf3cefcb9ec59b21b7170dc94e1f413307c3980e9ba2eaef5ce45340b50b311
 DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55
-EBUILD xdot-1.0.ebuild 899 BLAKE2B 5e4d6f4a69ad7a4abd6dd94b34fbbd1b1e06fbdd09818a7917e2f660d1dbb201b769fc8a366a30ed09d8f714bcd7433685b58c3133fd3019f98ca30174dac2f0 SHA512 2a7cc518a904f6d145c0377a9534a6134742e71d25699bb0ad623b9facf5bc21662b26da7f51971a5232f2a6960a96ec98e2b22ee8041b4dd85dfcaa5d0cd698
-EBUILD xdot-1.1.ebuild 1104 BLAKE2B e3e4fc6bfc97f72f48901173e8a8b477414afa78f619b36c3f1e6b418abe2af54534df4305a6e92db6fb18829ee53a94ed93826eaa031906fbde6d6c73c72133 SHA512 dca13c44f96d1e9ac3823b8583faa5ac56a3d69804410c282a612a6f0043d4b6e8019921225e0a3a90a94bcaea1391b7a5a2603aa003fb05e54cffeaf64a4b15
+EBUILD xdot-1.1.ebuild 1102 BLAKE2B b134331aa6c28073ed7c0f5b0cdeb4871623622ff8fb9d5b0cecf3e30c2e71f7a001f993c3c5a65a66c9d5feeb1afeca4c502f143ee5921c1e13b2fae7725cec SHA512 95130c58d8241786ac3e07f293829b20d0c1e0e979ede8dc095c2b5cf5881797d8919fe79a4bbd50814eebda34703797281f49f71a037d2b76429daf02cb77e7
 EBUILD xdot-9999.ebuild 1104 BLAKE2B e3e4fc6bfc97f72f48901173e8a8b477414afa78f619b36c3f1e6b418abe2af54534df4305a6e92db6fb18829ee53a94ed93826eaa031906fbde6d6c73c72133 SHA512 dca13c44f96d1e9ac3823b8583faa5ac56a3d69804410c282a612a6f0043d4b6e8019921225e0a3a90a94bcaea1391b7a5a2603aa003fb05e54cffeaf64a4b15
 MISC metadata.xml 483 BLAKE2B 50b03bb7d189da9bd6ca793f30c1ba3d13d12151533b42c99321a849515d7664398ec1b10720596c0453c48d35e2a6083b0559eb127199e1d6f4fc2a93aa04c4 SHA512 7e734dd60daa1e74b28f0932f508787e8deebc75a8f46c41f77007b6c8f96751cd6b07f6638cb89b38eb81d4fd2c6f7ba9f6d449f24f17ad25fb001d7f4f5ff7
diff --git a/media-gfx/xdot/xdot-1.0.ebuild b/media-gfx/xdot/xdot-1.0.ebuild
deleted file mode 100644
index ae5b3769694f..000000000000
--- a/media-gfx/xdot/xdot-1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_5 python3_6 )
-
-inherit distutils-r1
-
-MY_PN=xdot.py
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Interactive viewer for Graphviz dot files"
-HOMEPAGE="https://github.com/jrfonseca/xdot.py"
-SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-gfx/graphviz
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply_user
-
-	# Don't require graphviz python(2) supprt, which xdot doesn't use. This allows xdot to support python3.
-	# For more info, see https://bugs.gentoo.org/643126
-	sed -i "/install_requires=\['graphviz'\],/d" setup.py || die
-}
diff --git a/media-gfx/xdot/xdot-1.1.ebuild b/media-gfx/xdot/xdot-1.1.ebuild
index 8842ac3a99a5..b184e548ad6a 100644
--- a/media-gfx/xdot/xdot-1.1.ebuild
+++ b/media-gfx/xdot/xdot-1.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"