Version bump

Package-Manager: portage-2.1.10.37/cvs/Linux x86_64

5 files changed, 77 insertions, 80 deletions

diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index ea5ee5796440..8d636b26684f 100644
--- a/sci-libs/scikits_image/ChangeLog
+++ b/sci-libs/scikits_image/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/scikits_image
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/ChangeLog,v 1.1 2011/01/08 19:22:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/ChangeLog,v 1.2 2011/11/25 22:14:08 bicatali Exp $
+
+*scikits_image-0.3.1 (25 Nov 2011)
+
+  25 Nov 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  +scikits_image-0.3.1.ebuild:
+  Version bump
 
   08 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org>
   +scikits_image-0.2.2.ebuild, +metadata.xml:
diff --git a/sci-libs/scikits_image/scikits_image-0.3.1.ebuild b/sci-libs/scikits_image/scikits_image-0.3.1.ebuild
new file mode 100644
index 000000000000..bfc1a9490fe1
--- /dev/null
+++ b/sci-libs/scikits_image/scikits_image-0.3.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/scikits_image-0.3.1.ebuild,v 1.1 2011/11/25 22:14:08 bicatali Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+MY_P="${P/scikits_/scikits.}"
+
+DESCRIPTION="Image processing routines for SciPy"
+HOMEPAGE="http://scikits-image.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/scikits.image/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/numpy
+	sci-libs/scikits"
+DEPEND="${RDEPEND}
+	dev-python/setuptools
+	doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		"$(PYTHON -f)" setup.py build_sphinx || die "Generation of documentation failed"
+	fi
+}
+
+src_test() {
+	testing() {
+		PYTHONPATH="$(dir -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	remove_scikits() {
+		rm -f "${ED}"$(python_get_sitedir)/scikits/__init__.py || die
+	}
+	python_execute_function -q remove_scikits
+	dodoc *.txt || die
+	insinto /usr/share/doc/${PF}
+	if use doc; then
+		doins -r build/sphinx/html || die
+	fi
+}
diff --git a/sci-libs/scikits_learn/ChangeLog b/sci-libs/scikits_learn/ChangeLog
index 0997d7bbe68a..91a71140226a 100644
--- a/sci-libs/scikits_learn/ChangeLog
+++ b/sci-libs/scikits_learn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/scikits_learn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.5 2011/07/26 17:50:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.6 2011/11/25 22:13:57 bicatali Exp $
+
+*scikits_learn-0.9 (25 Nov 2011)
+
+  25 Nov 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  -scikits_learn-0.7.1.ebuild, -scikits_learn-0.8.ebuild,
+  +scikits_learn-0.9.ebuild:
+  Version bump
 
 *scikits_learn-0.8.1 (26 Jul 2011)
 
diff --git a/sci-libs/scikits_learn/scikits_learn-0.7.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.7.1.ebuild
deleted file mode 100644
index 6d6049d2bc25..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.7.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/scikits_learn-0.7.1.ebuild,v 1.1 2011/03/30 19:11:22 bicatali Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-MY_P="${P/scikits_/scikits.}"
-
-DESCRIPTION="A set of python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.sourceforge.net/"
-SRC_URI="mirror://sourceforge/scikit-learn/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-CDEPEND="sci-libs/scipy
-	>=sci-libs/libsvm-2.91"
-RDEPEND="${CDEPEND}
-	sci-libs/scikits
-	dev-python/matplotlib"
-DEPEND="${CDEPEND}
-	dev-python/cython
-	dev-python/setuptools
-	doc? ( dev-python/sphinx dev-python/matplotlib )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# use stock libsvm
-	cat <<-EOF >> site.cfg
-		[libsvm]
-		libraries=svm
-		library_dirs=${EPREFIX}/usr/$(get_libdir)
-		include_dirs=${EPREFIX}/usr/include/
-	EOF
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		cd "${S}/doc"
-		export VARTEXFONTS="${T}"/fonts
-		MPLCONFIGDIR="${S}/build-$(PYTHON -f --ABI)" \
-			PYTHONPATH=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*) \
-			emake html latex || die
-	fi
-}
-
-src_install() {
-	find "${S}" -name \*LICENSE.txt -delete
-	distutils_src_install
-	remove_scikits() {
-		rm -f "${ED}"$(python_get_sitedir)/scikits/__init__.py || die
-	}
-	python_execute_function -q remove_scikits
-	insinto /usr/share/doc/${PF}
-	if use doc; then
-		doins "${DISTDIR}"/scikits.learn.pdf || die
-		doins -r build/sphinx/html || die
-	fi
-	if use examples; then
-		doins -r examples || die
-	fi
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.8.ebuild b/sci-libs/scikits_learn/scikits_learn-0.9.ebuild
index 00ad125cb5b3..141c7637ee30 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.8.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/scikits_learn-0.8.ebuild,v 1.1 2011/06/09 14:17:02 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/scikits_learn-0.9.ebuild,v 1.1 2011/11/25 22:13:57 bicatali Exp $
 
 EAPI="3"
 
@@ -11,11 +11,11 @@ DISTUTILS_SRC_TEST="setup.py"
 
 inherit distutils
 
-MY_P="${P/scikits_/scikits.}"
+MYPN="${PN/scikits_/scikit-}"
 
 DESCRIPTION="A set of python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.sourceforge.net/"
-SRC_URI="mirror://sourceforge/scikit-learn/${MY_P}.tar.gz"
+HOMEPAGE="http://scikit-learn.org"
+SRC_URI="mirror://sourceforge/${MYPN}/${MYPN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -32,7 +32,7 @@ DEPEND="${CDEPEND}
 	dev-python/setuptools
 	doc? ( dev-python/sphinx dev-python/matplotlib )"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${MYPN}-${PV}"
 
 src_prepare() {
 	# use stock libsvm