From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 25 Nov 2020 22:39:15 +0000
Subject: gentoo resync : 25.11.2020

---
 media-gfx/xdot/Manifest         |  4 +++-
 media-gfx/xdot/xdot-1.2.ebuild  | 34 ++++++++++++++++++++++++++++++++++
 media-gfx/xdot/xdot-9999.ebuild | 15 +--------------
 3 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 media-gfx/xdot/xdot-1.2.ebuild

(limited to 'media-gfx/xdot')

diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index b4525cb005b7..fd10c5225b1f 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,4 +1,6 @@
 DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55
+DIST xdot-1.2.tar.gz 136057 BLAKE2B 484a3513ec3d67dbc6e167f171e7f70977ba2472766f25aa7cc088235f99470bfac5fac67368ea53b633320752a928634840ff3dcccc6b96795d3b7c203db922 SHA512 b4d3b15114b982c7c38cc71c0602f6d1ba9874c7315c2b8c4a8a48bf7674e9b38bf19a0d4a2d319acc9a29cf8f177a651d4e213761e88b0b3cb26e95e8a92dda
 EBUILD xdot-1.1.ebuild 1131 BLAKE2B 8cbb12c6cf8e7d4d9ae7f21519be9f512257dabb46f7cb18251c7128e318e1a0c3197df884362206a2a3d8c4ca868d46f9d312a74dfebd5d758905425813b48c SHA512 4d25cb15d1c705217272e38f3215a2b25a3610a84f26752cee69568e3dc8d329099d387d769dde6217262c42dc422f7adfa7a164fa9cf3624439e109e7864cec
-EBUILD xdot-9999.ebuild 1136 BLAKE2B 6f437471ef3c8574cf84b2acd7f65c735f7aa06e4566616dc9a7dd1ca1044b5488b42dc50dbdded9ee92be2d96a3c642757e8813cc4fcf1e835c48e2b6d929a6 SHA512 1b0b8322537735e66e72fad2a846e4244ba5b8c79ba2ba67a4667cb07839df67050b8b92b72c56ba115f51a7f1c159e2c7e0b46d1f4d2e3dfbdcf040cc77c320
+EBUILD xdot-1.2.ebuild 808 BLAKE2B e5c0d62e96490d5703e3eb20b7a6beb6afd1948d583daeb716195497f14210e25835e706a84293a600b34f78cd5297af85590afc1ad24a274e96ec750a27ec14 SHA512 784e9fc8f30e5fb769f3eeef850a894c889b5675d7883c9fab2ed21b86f766bf819920e3f28839a36038b135007635be9e65babd9a670ac91f602254b670692b
+EBUILD xdot-9999.ebuild 808 BLAKE2B e5c0d62e96490d5703e3eb20b7a6beb6afd1948d583daeb716195497f14210e25835e706a84293a600b34f78cd5297af85590afc1ad24a274e96ec750a27ec14 SHA512 784e9fc8f30e5fb769f3eeef850a894c889b5675d7883c9fab2ed21b86f766bf819920e3f28839a36038b135007635be9e65babd9a670ac91f602254b670692b
 MISC metadata.xml 398 BLAKE2B 4cfe399944032b70bb0092f9bd2f47b7e1f45cccfa75e2c8eea9dc41ae8456ffb450d5777a77218c22b8f97d57e0bd63956b63c345dba7167b1cfa8cfe3182aa SHA512 7afd30baf3ee9ec5c492659df23168d22c5a07381ed5972c8a02394a57dd332b86b59393b1bd16d2d365d61aa46839aafa78ff0386a92a26563139e31ed01a76
diff --git a/media-gfx/xdot/xdot-1.2.ebuild b/media-gfx/xdot/xdot-1.2.ebuild
new file mode 100644
index 000000000000..0b806d655849
--- /dev/null
+++ b/media-gfx/xdot/xdot-1.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+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 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~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"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+DEPEND="
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	media-gfx/graphviz
+"
+RDEPEND="${DEPEND}"
diff --git a/media-gfx/xdot/xdot-9999.ebuild b/media-gfx/xdot/xdot-9999.ebuild
index 6c4786522753..0b806d655849 100644
--- a/media-gfx/xdot/xdot-9999.ebuild
+++ b/media-gfx/xdot/xdot-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 MY_PN=xdot.py
 EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
@@ -28,20 +29,6 @@ SLOT="0"
 DEPEND="
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setuptools[${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
-}
-- 
cgit v1.2.3