gentoo resync : 28.04.2019

5 files changed, 62 insertions, 26 deletions

diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index 9298c66c1b4d..ad953ff182f2 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,6 +1,6 @@
-DIST xdot-0.8.tar.gz 131659 BLAKE2B e8bfa034cd106054ef070b5c1cfe641b7fb3ce37f60c747c5ccb339f2b4bbbeb58b54f6f1f9cf57544c53a81d0bf61e4e787a6a78c18b6db90b5cceee3720e70 SHA512 76eea4054ed5b9b3fa25c53dcbceed6671ee622ed6d841ee30cb1005beaf35a74c4e36e4b577b69ef12e39f6e8fcb8f38d1bb024bb9abe92df8c672f0c114ab3
 DIST xdot-1.0.tar.gz 131868 BLAKE2B 433d81913d19ae341c7168d9e22a2c8a54f49b0ad6b0da744cc3152766b333252b9ad7ba3831bdb17fc29a2408f8bdf3d929a438e89a78945f8edd7a8cd123b9 SHA512 52330380973ee122ac5d93f1be5b8f21b5719f537c93dd6f356a116207e366d16cf3cefcb9ec59b21b7170dc94e1f413307c3980e9ba2eaef5ce45340b50b311
-EBUILD xdot-0.8.ebuild 912 BLAKE2B bcef6b54fa4ce563e10a87be6bd484b3436b7e5709953f1ae22b9dd243766b2d0bc05641e313988811209f79eff6d86cbbaecd91a2ad45bd19330108c0a3252b SHA512 8618c4ff7bd02870f569fcd7c24baf46caaa858cbc7c68be1fd6ec7a72945510950aceb409d7a5ed486eca663506721ce77d99553fbbefda93c8b93f08ffc375
-EBUILD xdot-1.0.ebuild 912 BLAKE2B bcef6b54fa4ce563e10a87be6bd484b3436b7e5709953f1ae22b9dd243766b2d0bc05641e313988811209f79eff6d86cbbaecd91a2ad45bd19330108c0a3252b SHA512 8618c4ff7bd02870f569fcd7c24baf46caaa858cbc7c68be1fd6ec7a72945510950aceb409d7a5ed486eca663506721ce77d99553fbbefda93c8b93f08ffc375
-EBUILD xdot-9999.ebuild 568 BLAKE2B 70f735fac2a628414c77a347307260fa439d106b07ebd0338118b0db16d4a883ab3d641abc570676d40a45a09f9ab09ab365faea80acaf355d20675669e3c041 SHA512 5b82f55937820a526ae13e93be38aff2f631e912efa6cf860724ac963b7c62412ade25f732db4d20dd5512804c9e49e18323fa0bc8f5310c090bd72cbc0b431e
-MISC metadata.xml 428 BLAKE2B f4638a5657c09d221d2139a8600502f51d02fc7f4bdf302706cfb75c1bff8980882bfd01a0dfb716bceb624dc0fa32f5f5adb6f259e5a657bd6b579b1612513e SHA512 5a6cf462a35470509a7b38baea1b95220527d20652e185cc280f3e85be2043c502089c012abdcd841c4cd9114b8058d7afd2874ff5b9e3f17eb218c914d09501
+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-9999.ebuild 1104 BLAKE2B e3e4fc6bfc97f72f48901173e8a8b477414afa78f619b36c3f1e6b418abe2af54534df4305a6e92db6fb18829ee53a94ed93826eaa031906fbde6d6c73c72133 SHA512 dca13c44f96d1e9ac3823b8583faa5ac56a3d69804410c282a612a6f0043d4b6e8019921225e0a3a90a94bcaea1391b7a5a2603aa003fb05e54cffeaf64a4b15
+MISC metadata.xml 483 BLAKE2B 50b03bb7d189da9bd6ca793f30c1ba3d13d12151533b42c99321a849515d7664398ec1b10720596c0453c48d35e2a6083b0559eb127199e1d6f4fc2a93aa04c4 SHA512 7e734dd60daa1e74b28f0932f508787e8deebc75a8f46c41f77007b6c8f96751cd6b07f6638cb89b38eb81d4fd2c6f7ba9f6d449f24f17ad25fb001d7f4f5ff7
diff --git a/media-gfx/xdot/metadata.xml b/media-gfx/xdot/metadata.xml
index 947bc75e20be..fed3a8992570 100644
--- a/media-gfx/xdot/metadata.xml
+++ b/media-gfx/xdot/metadata.xml
@@ -2,13 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>wizardedit@gentoo.org</email>
-    <name>Austin English</name>
+    <email>mattst88@gentoo.org</email>
+    <name>Matt Turner</name>
   </maintainer>
   <longdescription>
   Interactive viewer for Graphviz dot files
   </longdescription>
   <upstream>
     <remote-id type="github">jrfonseca/xdot.py</remote-id>
+    <bugs-to>https://github.com/jrfonseca/xdot.py</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/media-gfx/xdot/xdot-1.0.ebuild b/media-gfx/xdot/xdot-1.0.ebuild
index e8716f71acdb..ae5b3769694f 100644
--- a/media-gfx/xdot/xdot-1.0.ebuild
+++ b/media-gfx/xdot/xdot-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_5 python3_6 )
 
 inherit distutils-r1
 
diff --git a/media-gfx/xdot/xdot-0.8.ebuild b/media-gfx/xdot/xdot-1.1.ebuild
index e8716f71acdb..8842ac3a99a5 100644
--- a/media-gfx/xdot/xdot-0.8.ebuild
+++ b/media-gfx/xdot/xdot-1.1.ebuild
@@ -1,21 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit distutils-r1
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 MY_PN=xdot.py
-MY_P="${MY_PN}-${PV}"
+EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	SRC_URI=""
+else
+	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"
+fi
+
+inherit ${GIT_ECLASS} distutils-r1
 
 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}]
@@ -25,7 +33,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
 
 src_prepare() {
 	eapply_user
diff --git a/media-gfx/xdot/xdot-9999.ebuild b/media-gfx/xdot/xdot-9999.ebuild
index 6b682956a737..8842ac3a99a5 100644
--- a/media-gfx/xdot/xdot-9999.ebuild
+++ b/media-gfx/xdot/xdot-9999.ebuild
@@ -1,23 +1,47 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit distutils-r1 git-r3
+MY_PN=xdot.py
+EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	SRC_URI=""
+else
+	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"
+fi
+
+inherit ${GIT_ECLASS} distutils-r1
 
 DESCRIPTION="Interactive viewer for Graphviz dot files"
 HOMEPAGE="https://github.com/jrfonseca/xdot.py"
-EGIT_REPO_URI="https://github.com/jrfonseca/xdot.py.git"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS=""
 
 DEPEND="
 	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-gfx/graphviz[${PYTHON_USEDEP}]
+	media-gfx/graphviz
 "
 RDEPEND="${DEPEND}"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+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
+}