gentoo resync : 21.09.2018

4 files changed, 14 insertions, 66 deletions

diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index da3c5b448238..9298c66c1b4d 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,10 +1,6 @@
-DIST xdot-0.5.tar.gz 24555 BLAKE2B 81621369e3e2604d5f86da8edee1af440b3bf6811ad9aad67334f8a61a0100cae0da223d7f8b3def29c2fc9a647f9ac6b55f8ccfdcedae5cd431c143c21938f3 SHA512 f466ee0af2270c66218b67bf371c972d0ffefe977059eeeeb3c4a2ca29807c3ca419020286ed9c031853f79afb55222884c942bd14d8365b64ce2a0ed5f6d1d0
-DIST xdot-0.6.tar.gz 27710 BLAKE2B 414a6fd422a2d4e08d20c28841cb91215f16a89ba6dd03406219bd2dc9f63fb5250f19f3e48a3535cd2a5daa08aa2b3c702b06ef17e252e34c24c40459e29566 SHA512 25dcb35aacdd58fb13519346d1d8cf500eeeeb3cc40dee85e967d23c52c0c37ba092a023aec6cd72a35b74e3ea6a2168e1691ad218e4a6af17ea6d56d824f05b
-DIST xdot-0.7.tar.gz 126406 BLAKE2B 4451992c0bc3808fe9de64601baea7af8f08fc10475bcf266f6ffc2d70b96566b77d1ae03f9dd57a42ae54f23d2e7f8b2e258239a891818a404fc2b2cd5e5df9 SHA512 793be28fbd0ee6c2b9dd97532ef8742d598f84055ef67e688593d7c1f689f04593dd89a490f4f48866b18ac595252d03b9cc6d8d8e2d6c0ac1ef1ad28789c512
 DIST xdot-0.8.tar.gz 131659 BLAKE2B e8bfa034cd106054ef070b5c1cfe641b7fb3ce37f60c747c5ccb339f2b4bbbeb58b54f6f1f9cf57544c53a81d0bf61e4e787a6a78c18b6db90b5cceee3720e70 SHA512 76eea4054ed5b9b3fa25c53dcbceed6671ee622ed6d841ee30cb1005beaf35a74c4e36e4b577b69ef12e39f6e8fcb8f38d1bb024bb9abe92df8c672f0c114ab3
-EBUILD xdot-0.5.ebuild 660 BLAKE2B b8c58cec2463254447e58c0282517e06b52d54e51b49d940747008e4de0adf55675b43690c04591b71d91598828d7f0c22cec81dc52cf8e13df1f8d6d1703fc6 SHA512 2752cc87cd87c1c4f5b7e5d4be3859cf3e8f2121aaa4310036eadce9c0cf428d9ada1180b784ccfcba302a4c6ab6a58d70f36db5d2db9190696be51c45d0cc6f
-EBUILD xdot-0.6.ebuild 660 BLAKE2B b8c58cec2463254447e58c0282517e06b52d54e51b49d940747008e4de0adf55675b43690c04591b71d91598828d7f0c22cec81dc52cf8e13df1f8d6d1703fc6 SHA512 2752cc87cd87c1c4f5b7e5d4be3859cf3e8f2121aaa4310036eadce9c0cf428d9ada1180b784ccfcba302a4c6ab6a58d70f36db5d2db9190696be51c45d0cc6f
-EBUILD xdot-0.7.ebuild 660 BLAKE2B b8c58cec2463254447e58c0282517e06b52d54e51b49d940747008e4de0adf55675b43690c04591b71d91598828d7f0c22cec81dc52cf8e13df1f8d6d1703fc6 SHA512 2752cc87cd87c1c4f5b7e5d4be3859cf3e8f2121aaa4310036eadce9c0cf428d9ada1180b784ccfcba302a4c6ab6a58d70f36db5d2db9190696be51c45d0cc6f
+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
diff --git a/media-gfx/xdot/xdot-0.6.ebuild b/media-gfx/xdot/xdot-0.6.ebuild
deleted file mode 100644
index e67ac5185ee1..000000000000
--- a/media-gfx/xdot/xdot-0.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-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/pygtk-2.10:2[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-gfx/graphviz[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/xdot/xdot-0.7.ebuild b/media-gfx/xdot/xdot-0.7.ebuild
deleted file mode 100644
index e67ac5185ee1..000000000000
--- a/media-gfx/xdot/xdot-0.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-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/pygtk-2.10:2[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-gfx/graphviz[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/xdot/xdot-0.5.ebuild b/media-gfx/xdot/xdot-1.0.ebuild
index e67ac5185ee1..e8716f71acdb 100644
--- a/media-gfx/xdot/xdot-0.5.ebuild
+++ b/media-gfx/xdot/xdot-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
 
 inherit distutils-r1
 
@@ -19,10 +19,18 @@ KEYWORDS="~amd64 ~x86"
 
 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}"
 
 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
+}