Version bump.

Package-Manager: portage-2.2_rc83_p1/cvs/Linux x86_64

4 files changed, 91 insertions, 7 deletions

diff --git a/dev-python/pygraphviz/ChangeLog b/dev-python/pygraphviz/ChangeLog
index b85baddf3894..dd4f1e413e7d 100644
--- a/dev-python/pygraphviz/ChangeLog
+++ b/dev-python/pygraphviz/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for dev-python/pygraphviz
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/ChangeLog,v 1.5 2010/09/15 19:49:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/ChangeLog,v 1.6 2010/09/15 19:51:05 arfrever Exp $
+
+*pygraphviz-1.0 (15 Sep 2010)
 
   15 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  -pygraphviz-0.99.1.ebuild, -files/pygraphviz-0.99.1-setup.py.patch:
-  Delete.
+  -pygraphviz-0.99.1.ebuild, -files/pygraphviz-0.99.1-setup.py.patch,
+  +pygraphviz-1.0.ebuild, +files/pygraphviz-1.0-setup.py.patch:
+  Version bump.
 
   30 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pygraphviz-0.99.1.ebuild:
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 2ff27530b2d3..6401b02ec3ac 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,5 +1,5 @@
-AUX pygraphviz-0.99.1-setup.py.patch 1365 RMD160 21c99573bdd8110fe6d7e510b289b3c826f3fa85 SHA1 1fdb8a16e40a6d901ac2b5531b87dab124e492ae SHA256 26d133aa57857662d14fb418ca79eba45ae29727a883cbeec5d968c701e134f9
-DIST pygraphviz-0.99.1.tar.gz 85092 RMD160 90872f9daf9721bbd7dc6cbe6ecb7bfec0679171 SHA1 01634b1921f4a127ca091387f4e18c64c096229e SHA256 7fa6fcde271584d0732532bc72108e720098198c9455d682d2246422f0e423ef
-EBUILD pygraphviz-0.99.1.ebuild 1091 RMD160 ca9b8bd070df36409c11288195e9b25604300956 SHA1 ad4420411031cbe33e6cd266002f1d8246444f81 SHA256 841663e692255e727c18104d0c0992601e25e4bfaa49a76d9e97d8995913b782
-MISC ChangeLog 794 RMD160 0199347818ccab822e9e167fb8b95532a3b7d3ff SHA1 0d0a414bb5073311c912db2169466b7157d1672e SHA256 eb73313827c3d3f1ca0b29265aa8428b7257f0dbb191f579a0f4511c051119c5
+AUX pygraphviz-1.0-setup.py.patch 1215 RMD160 c356d6acda1130e21b5048e984de59bcf68de904 SHA1 bf46119d7537555d2acf8ae66bd8e08a1c6b2c8d SHA256 d9b33fb2c9e7a29664f735d050a2f3a4ace7322a0260b6b4a14dc859fb259d25
+DIST pygraphviz-1.0.tar.gz 87236 RMD160 c2651201f841a5a04c3b0ff13d437576d44dc28a SHA1 093d16ce9c9f2591788fe990631f866ee207c6bd SHA256 f5c9b81993bbbcb3f6c5d172c035cde65298dccc7c377f34b0f524efaa12ba80
+EBUILD pygraphviz-1.0.ebuild 1191 RMD160 cc37a33f0895f76fdab4218d820066a8ccd79dac SHA1 9efade3d305e561764545725162108c6d5d5434f SHA256 a3740de938f7d1296a614662e333f3cdf104c95b2486745b16462b530849368f
+MISC ChangeLog 1049 RMD160 8e09bbf64126006ad2eafbef04cbbb9855d4f9a4 SHA1 6a92fb6e07b3a2b6deb25ffe9d69a2a798c67d69 SHA256 dffb75b4f58bfe306fa333c925d011daf2d1567fcfa9bb555dacb6e95e7120f1
 MISC metadata.xml 450 RMD160 0b1ad4d0244f4488b611020cb62da7e53950cc0f SHA1 12b513b5f8214e531054b1a3124d255a2d709a42 SHA256 d557a44d61bc5f7b285ce29d9ab787670018d052ac525f03e13e878e83dd6b06
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.0-setup.py.patch b/dev-python/pygraphviz/files/pygraphviz-1.0-setup.py.patch
new file mode 100644
index 000000000000..13eb0f213ce1
--- /dev/null
+++ b/dev-python/pygraphviz/files/pygraphviz-1.0-setup.py.patch
@@ -0,0 +1,33 @@
+--- setup_egg.py
++++ setup_egg.py
+@@ -46,7 +46,6 @@
+         download_url     = release.download_url,
+         classifiers      = release.classifiers,
+         packages         = packages,
+-        data_files       = data,
+         ext_modules      = extension,
+         package_data     = package_data,
+         install_requires=['setuptools'],
+--- setup.py
++++ setup.py
+@@ -98,12 +98,6 @@
+ sys.path.pop(0)
+ 
+ packages = ["pygraphviz","pygraphviz.tests"]
+-docdirbase  = 'share/doc/pygraphviz-%s' % release.version
+-data = [(docdirbase, glob("*.txt")),
+-        (os.path.join(docdirbase, 'examples'),glob("examples/*.py")),
+-        (os.path.join(docdirbase, 'examples'),glob("examples/*.dat")),
+-        (os.path.join(docdirbase, 'examples'),glob("examples/*.dat.gz")),
+-        ]
+ extension = [Extension("pygraphviz._graphviz",
+                       ["pygraphviz/graphviz_wrap.c"],
+                       include_dirs=include_dirs,
+@@ -130,7 +124,6 @@
+         download_url     = release.download_url,
+         classifiers      = release.classifiers,
+         packages         = packages,
+-        data_files       = data,
+         ext_modules      = extension,
+         package_data     = package_data
+       )
diff --git a/dev-python/pygraphviz/pygraphviz-1.0.ebuild b/dev-python/pygraphviz/pygraphviz-1.0.ebuild
new file mode 100644
index 000000000000..3a526dd66ef3
--- /dev/null
+++ b/dev-python/pygraphviz/pygraphviz-1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/pygraphviz-1.0.ebuild,v 1.1 2010/09/15 19:51:05 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils
+
+DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
+HOMEPAGE="http://networkx.lanl.gov/pygraphviz/ http://pypi.python.org/pypi/pygraphviz"
+SRC_URI="http://networkx.lanl.gov/download/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples"
+
+RDEPEND=">=media-gfx/graphviz-2.12"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-setup.py.patch"
+}
+
+src_test() {
+	testing() {
+		"$(PYTHON)" -c "import sys; sys.path.insert(0, '$(ls -d build-${PYTHON_ABI}/lib.*)'); import pygraphviz; pygraphviz.test()"
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die
+	fi
+
+	delete_tests() {
+		rm -fr "${ED}$(python_get_sitedir)/${PN}/tests"
+	}
+	python_execute_function -q delete_tests
+}