media-gfx/pydot: move to dev-python/pydot

8 files changed, 107 insertions, 2 deletions

diff --git a/dev-python/networkx/networkx-1.10-r1.ebuild b/dev-python/networkx/networkx-1.10-r1.ebuild
index c9c0842fe440..4e2807d4e82f 100644
--- a/dev-python/networkx/networkx-1.10-r1.ebuild
+++ b/dev-python/networkx/networkx-1.10-r1.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 	test? (
 		${COMMON_DEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'media-gfx/pydot[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/pydot[${PYTHON_USEDEP}]' python2_7)
 	)"
 RDEPEND="
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild
index 67992b0d9466..fa141b8ee7b3 100644
--- a/dev-python/networkx/networkx-1.11.ebuild
+++ b/dev-python/networkx/networkx-1.11.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 	test? (
 		${COMMON_DEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'media-gfx/pydot[${PYTHON_USEDEP}]' -2)
+		$(python_gen_cond_dep 'dev-python/pydot[${PYTHON_USEDEP}]' -2)
 	)"
 RDEPEND="
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
new file mode 100644
index 000000000000..b184542a4b5e
--- /dev/null
+++ b/dev-python/pydot/Manifest
@@ -0,0 +1,2 @@
+DIST pydot-1.0.28.tar.gz 19711 SHA256 1eeaff7b104fb8f305a98318dafde0b2d15f1efcdf8b16206465551cd46ed9df SHA512 54b4d7bfb01bbcae9a4832d1c3321d4f453a93f062ee55b35e3d59bee3f8989f4a544afb56c3d16b22bca8e6ef24b6286ac2688c9045b16906ef625999b35055 WHIRLPOOL eb06c22418638351def215e8127af1b3afbd193484dec9a3114e4377f8afcccb25cb7f40e9f29121d086723ddb94dd2fd9ac473f3583a9b782940cce9e208318
+DIST pydot-1.2.3.tar.gz 262660 SHA256 5e63808fd1945ac6600e80518f72d6ecc367273bb7bd1054dceb863a90e7b84b SHA512 0527279174bd9d5703131ab6c16365d66e392e27597b5d2d536d43f783a59139913a6dbfa1cc022993f842843f5d79e4e0b2a1435ce3427ebc534ef7b1ef2e9b WHIRLPOOL 3e328560cb4a42e8ff9484aafb6b28250d3913ed79afb17b2385ee8e05226075040e9488f038144bb5f768ef508b7437dbe5ce0567b3e202838157ebaa6bc2c4
diff --git a/dev-python/pydot/files/pydot-1.0.23-setup.patch b/dev-python/pydot/files/pydot-1.0.23-setup.patch
new file mode 100644
index 000000000000..c87cc32b30d1
--- /dev/null
+++ b/dev-python/pydot/files/pydot-1.0.23-setup.patch
@@ -0,0 +1,21 @@
+--- setup.py
++++ setup.py
+@@ -1,9 +1,9 @@
+ #!/usr/bin/env python
+ 
+ try:
+-    from distutils.core import setup
+-except ImportError, excp:
+     from setuptools import setup
++except ImportError, excp:
++    from distutils.core import setup
+     
+ import pydot
+ import os
+@@ -31,5 +31,4 @@
+         'Topic :: Software Development :: Libraries :: Python Modules'],
+     long_description = "\n".join(pydot.__doc__.split('\n')),
+     py_modules = ['pydot', 'dot_parser'],
+-    install_requires = ['pyparsing', 'setuptools'],
+-    data_files = [('.', ['LICENSE', 'README'])] )
++    install_requires = ['pyparsing', 'setuptools'] )
diff --git a/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch b/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch
new file mode 100644
index 000000000000..12a01091223c
--- /dev/null
+++ b/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch
@@ -0,0 +1,14 @@
+diff -up pydot-1.0.28/dot_parser.py.pyparsing2fix pydot-1.0.28/dot_parser.py
+--- pydot-1.0.28/dot_parser.py.pyparsing2fix	2013-12-09 08:59:24.660145534 -0500
++++ pydot-1.0.28/dot_parser.py	2013-12-09 09:00:10.021222397 -0500
+@@ -25,8 +25,9 @@ from pyparsing import __version__ as pyp
+ from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word, Upcase, OneOrMore, ZeroOrMore,
+     Forward, NotAny, delimitedList, oneOf, Group, Optional, Combine, alphas, nums,
+     restOfLine, cStyleComment, nums, alphanums, printables, empty, quotedString,
+-    ParseException, ParseResults, CharsNotIn, _noncomma, dblQuotedString, QuotedString, ParserElement )
++    ParseException, ParseResults, CharsNotIn, dblQuotedString, QuotedString, ParserElement )
+ 
++_noncomma = "".join( [ c for c in printables if c != "," ] )
+ 
+ class P_AttrList:
+ 
diff --git a/dev-python/pydot/metadata.xml b/dev-python/pydot/metadata.xml
new file mode 100644
index 000000000000..a44c00e7d6b3
--- /dev/null
+++ b/dev-python/pydot/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pydot</remote-id>
+    <remote-id type="github">erocarrera/pydot</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pydot/pydot-1.0.28-r2.ebuild b/dev-python/pydot/pydot-1.0.28-r2.ebuild
new file mode 100644
index 000000000000..3958643fd37b
--- /dev/null
+++ b/dev-python/pydot/pydot-1.0.28-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to Graphviz's Dot language"
+HOMEPAGE="https://pypi.python.org/pypi/pydot"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	media-gfx/graphviz"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.23-setup.patch
+	"${FILESDIR}"/${P}-pyparsing2fix.patch )
diff --git a/dev-python/pydot/pydot-1.2.3.ebuild b/dev-python/pydot/pydot-1.2.3.ebuild
new file mode 100644
index 000000000000..0a313e45f150
--- /dev/null
+++ b/dev-python/pydot/pydot-1.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to Graphviz's Dot language"
+HOMEPAGE="https://github.com/erocarrera/pydot https://pypi.python.org/pypi/pydot"
+# pypi releases don't include tests
+SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	media-gfx/graphviz"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
+
+python_test() {
+	cd test || die
+	"${PYTHON}" pydot_unittest.py || die "Test failed with ${EPYTHON}"
+}