Move to distutils-r1

Package-Manager: portage-2.2.01.22124-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

6 files changed, 73 insertions, 128 deletions

diff --git a/dev-python/pywavelets/ChangeLog b/dev-python/pywavelets/ChangeLog
index ef6605bd57f0..6f4a56349333 100644
--- a/dev-python/pywavelets/ChangeLog
+++ b/dev-python/pywavelets/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pywavelets
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pywavelets/ChangeLog,v 1.12 2013/01/16 19:55:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pywavelets/ChangeLog,v 1.13 2013/08/12 18:31:13 bicatali Exp $
+
+*pywavelets-0.2.2-r1 (12 Aug 2013)
+
+  12 Aug 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +pywavelets-0.2.2-r1.ebuild, -pywavelets-0.2.0.ebuild,
+  -pywavelets-0.2.2.ebuild, metadata.xml:
+  Move to distutils-r1
 
   16 Jan 2013; Justin Lecher <jlec@gentoo.org> pywavelets-0.2.2.ebuild,
   metadata.xml:
diff --git a/dev-python/pywavelets/Manifest b/dev-python/pywavelets/Manifest
index e70db9cf70f9..8a47ff379c86 100644
--- a/dev-python/pywavelets/Manifest
+++ b/dev-python/pywavelets/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST PyWavelets-0.2.0.tar.bz2 527115 SHA256 1f7904ffc8b51ef68760997133c4838e3cf535c4a977df985a66b2e05a61167e SHA512 de06ef1107c9bafafc980c06d9d7f85b3eaa7c46948e19dec34a75539d226c1de91db692cda36861972dc9ca1828144a9c78f6f346b87871a9a167691b9c7825 WHIRLPOOL 760425ff4b5dbd0562531412c8b9710e358817ada39b3d03f9771a9095ee9d08a3d4b2e8f30a3e7830ace5f4cfcf3d5119898657101fbd08968b3a83201c1f1e
 DIST PyWavelets-0.2.2.zip 528210 SHA256 04b53436f5f2a9b895a1f56e86e16b94632a5d6bcfc076be1110e41cf3071278 SHA512 2cfd2b0e8f90750cc15ca60400101836f97661e52041abd4c032232eba6843b104c01ef2a50f4384afc5b11dd022add03101ef9b8c1b582ca64e84919f609a5b WHIRLPOOL 07dbec72901deb262a5f52954becee8ff4c9749fa311c206351db86c7612513dec329c6bcbad8e4ab6f1f1043ebfd08cfd8af762df95388789da13dfe6747e2a
-EBUILD pywavelets-0.2.0.ebuild 1386 SHA256 9c30783c95643c866d5c82768726cb794fa2e15af3fa8e3920908b84b92645d1 SHA512 74a405f23a564982acd6dfc3ade7612a952ffc19a01454f21057924c93fc730cb1e824655f5b818a720c7c70f02339b398acd60522094dce911c939e7947504b WHIRLPOOL ef610670264a09e45ba2209f7f5485e17c22e26f59ad48ef9acc90035be80a069c06e2680b0320cc04096f68a8f1f78aa4d96e6e61a90f808c4e74cec27148f6
-EBUILD pywavelets-0.2.2.ebuild 1347 SHA256 33f731c2664134e029e16be48f08f5e968240ed3efe84df728628cd38cf52666 SHA512 6bc9ba5ce7ec78dfb4230ce8a162dcaca1600e2b6d77b395224bc07f3f630f31b65c78207ba8ceb3ce7459c40e9ad1a682d484a1aab6cd1cb8b19aa98e7fd6cb WHIRLPOOL 63e40270968350dfdc3da6ded31f091ac04dc49428a137b5fe5f1ba233506cf48568510629d82f085498e0cf68f671490d1fd4bdec5410ec98ff7f0e6dcdb174
-MISC ChangeLog 1891 SHA256 92274c829c40cd7e7bb89b5e1c9d340af668425ddda5d2a66263fbba37d8f457 SHA512 a87a0df094e814a060b72af61ba3c7ed433030c33192f0aea6642e882150c688fd464fee0227a09a78a08fef90da08f2ba2b6a4e60ec665dfad5319c3d470af7 WHIRLPOOL 6f61d38c533dff3c82d1eed4bf5b2bb122a5876b00cecaee4e521a22859e058603170367856a56e7e043372f42c02091eaddf79549025ec5c7dec83bdcfcc900
-MISC metadata.xml 565 SHA256 06694c7d679ebce4ad350f3baa57c18aef2f9984a0f5ca43836770a37ed831ce SHA512 a5f6ec6c77915f7671c985e692f5bc12135c2e38999555ef1c577d4f5a5ec3bd2813e2f145b4e3f0189b235a991fc6419817d50d2bb44714dfca4aaac1b54112 WHIRLPOOL 47bd0416061f6cede82d31346ea1564c8254d67dbe491c4a89974711b1bfacbb18118052c79ca88a8c56e58709dc3748eba3a441e9a64e5b70305520668ae22a
+EBUILD pywavelets-0.2.2-r1.ebuild 1209 SHA256 98fa1caea695cac731bed5821bf4e936a8c6830219f0670906cd1a65b13f43ae SHA512 e946cdb7a292b7a94ed63db9f72d9ad7dc11c069d01887f6804aedcfbd9e49153e8cd45c4f986fa6bd2883144106764c14f92448065b3445ee5899c912ce8592 WHIRLPOOL f79c2c21b35973b09689bcd62aef1d7937479a2768d9bc957e089db12d95249bb9b9b601ce44ed6de1d239abf45926ceff53d41b268b38f05ee26b6482624a58
+MISC ChangeLog 2109 SHA256 79ff7464730d8f2b34b840010b099e1fb92bb6215e1be2e33d8c2e7b75fa6493 SHA512 a55fd6fec43f03742c4c4d1aba2d922a2cd1ee12e04ff6faec5a8b43ee7d7038efa8d0298140c99215e333121566ef2a85ebebcd5be6162464fb2acc5588783e WHIRLPOOL 38ee2c685d58bc4a9367b6dea36ac8defc895375e2d3e7e2dbe37e3e7a7223a1428e1bac29d8b510fdfe72a0dae2225cec2bb280cd64b62c2ffe876d6f17ac03
+MISC metadata.xml 555 SHA256 8b81e506ff67b43e7443c08683263eb0979e3ca1716e55f13d0f09e077f4d96c SHA512 c36ea6462f3dbc11c80ec03e12404c4cb6a8c85ef3cc0255108c032b60c59c43aca2323a26dc5d71fe6bb17973c4ba43949aec0dfe0b2daea682c639d79aea2d WHIRLPOOL aac43d0767835b1dd41919c25560eb417351024d48af4fe08eea348e2e1fdbd42bba85de05b0cfc4fd266d0c200c93f8ef9816f8e9b6d498748ddcda8b8643ce
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlD3BacACgkQgAnW8HDreRbHoQCdEPwEef9KkyKlb1CjvWVsYn4z
-hYkAoI9qvvB501WcNqXy9Oqdzsn6kijl
-=FoVW
+iEYEAREIAAYFAlIJKfIACgkQ1ycZbhPLE2D9EwCeKqaQ0bSIXVErqif3UUIiJzrt
+7C0AnA2Npwl/7klVoW2oQ5n1rdIp44Uw
+=cWyP
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pywavelets/metadata.xml b/dev-python/pywavelets/metadata.xml
index ffc0dd2090be..610e1b9f018f 100644
--- a/dev-python/pywavelets/metadata.xml
+++ b/dev-python/pywavelets/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
-  <herd>python</herd>
-  <longdescription lang="en">
-PyWavelets is a Python wavelet transforms module that can perform:
+<herd>sci-mathematics</herd>
+<herd>python</herd>
+<longdescription lang="en">
+  PyWavelets is a Python wavelet transforms module that can perform:
   * Discrete Wavelet Transform (1D and 2D)
   * Inverse Discrete Wavelet Transform (1D and 2D)
   * Stationary Wavelet Transform
   * Wavelet Packets decomposition and reconstruction
 </longdescription>
-  <upstream>
-    <remote-id type="pypi">PyWavelets</remote-id>
-  </upstream>
+<upstream>
+  <remote-id type="pypi">PyWavelets</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-python/pywavelets/pywavelets-0.2.0.ebuild b/dev-python/pywavelets/pywavelets-0.2.0.ebuild
deleted file mode 100644
index b04a818f0235..000000000000
--- a/dev-python/pywavelets/pywavelets-0.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pywavelets/pywavelets-0.2.0.ebuild,v 1.6 2012/08/02 17:57:17 bicatali Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit distutils
-
-MY_PN="${PN/pyw/PyW}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python module for discrete, stationary, and packet wavelet transforms."
-HOMEPAGE="http://www.pybytes.com/pywavelets/ http://pypi.python.org/pypi/PyWavelets"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-DEPEND="dev-python/cython
-	test? ( dev-python/numpy )"
-RDEPEND="dev-python/numpy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="CHANGES.txt THANKS.txt"
-PYTHON_MODNAME="pywt"
-
-src_prepare() {
-	distutils_src_prepare
-	# https://bitbucket.org/nigma/pywt/changeset/784802d4118c
-	sed -e "167s/__new__/__cinit__/" -i src/_pywt.pyx
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" \
-			"$(PYTHON)" tests/test_perfect_reconstruction.py
-	}
-	python_execute_function testing
-}
-
-src_install () {
-	distutils_src_install
-	use doc && dohtml -r doc/build/html/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins demo/* || die "doins failed"
-	fi
-}
diff --git a/dev-python/pywavelets/pywavelets-0.2.2-r1.ebuild b/dev-python/pywavelets/pywavelets-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..bf0763255d29
--- /dev/null
+++ b/dev-python/pywavelets/pywavelets-0.2.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pywavelets/pywavelets-0.2.2-r1.ebuild,v 1.1 2013/08/12 18:31:13 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+MY_PN="${PN/pyw/PyW}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python module for discrete, stationary, and packet wavelet transforms"
+HOMEPAGE="http://www.pybytes.com/pywavelets"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+DEPEND="
+	app-arch/unzip
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx )"
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(CHANGES.txt THANKS.txt)
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" \
+		${EPYTHON} tests/test_perfect_reconstruction.py || die
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use doc && dohtml -r doc/build/html/*
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins demo/*
+	fi
+}
diff --git a/dev-python/pywavelets/pywavelets-0.2.2.ebuild b/dev-python/pywavelets/pywavelets-0.2.2.ebuild
deleted file mode 100644
index e99bba84aca3..000000000000
--- a/dev-python/pywavelets/pywavelets-0.2.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pywavelets/pywavelets-0.2.2.ebuild,v 1.5 2013/01/16 19:55:14 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.* *-jython 2.7-pypy-*"
-
-inherit distutils
-
-MY_PN="${PN/pyw/PyW}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python module for discrete, stationary, and packet wavelet transforms."
-HOMEPAGE="http://www.pybytes.com/pywavelets/ http://pypi.python.org/pypi/PyWavelets"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-DEPEND="app-arch/unzip
-	dev-python/cython
-	test? ( dev-python/numpy )
-	doc? ( dev-python/sphinx )"
-RDEPEND="dev-python/numpy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="CHANGES.txt THANKS.txt"
-PYTHON_MODNAME="pywt"
-
-src_test() {
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" \
-			"$(PYTHON)" tests/test_perfect_reconstruction.py
-	}
-	python_execute_function testing
-}
-
-src_compile() {
-	distutils_src_compile
-	use doc && emake -C doc html
-}
-
-src_install () {
-	distutils_src_install
-	use doc && dohtml -r doc/build/html/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins demo/* || die "doins failed"
-	fi
-}