Version bump

(Portage version: 2.1.10.41/cvs/Linux x86_64)

3 files changed, 26 insertions, 19 deletions

diff --git a/sci-libs/scikits_learn/ChangeLog b/sci-libs/scikits_learn/ChangeLog
index 73ae0990249a..df09002cd294 100644
--- a/sci-libs/scikits_learn/ChangeLog
+++ b/sci-libs/scikits_learn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/scikits_learn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.8 2012/01/24 10:28:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.9 2012/02/05 00:41:35 bicatali Exp $
+
+*scikits_learn-0.10 (05 Feb 2012)
+
+  05 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -scikits_learn-0.8.1.ebuild, +scikits_learn-0.10.ebuild, metadata.xml:
+  Version bump
 
   24 Jan 2012; Justin Lecher <jlec@gentoo.org> scikits_learn-0.9.ebuild,
   metadata.xml:
diff --git a/sci-libs/scikits_learn/metadata.xml b/sci-libs/scikits_learn/metadata.xml
index cebad66c1679..087bbc4a99a7 100644
--- a/sci-libs/scikits_learn/metadata.xml
+++ b/sci-libs/scikits_learn/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
   scikits.learn is a python library for machine learning. It aims to
   implement classic machine learning algorithms while remaining simple
   and efficient.
diff --git a/sci-libs/scikits_learn/scikits_learn-0.8.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.10.ebuild
index 2a89d5fd1533..cbed6dffba86 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.8.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.10.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.1.ebuild,v 1.1 2011/07/26 17:50:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/scikits_learn-0.10.ebuild,v 1.1 2012/02/05 00:41:35 bicatali Exp $
 
-EAPI="3"
+EAPI=4
+inherit flag-o-matic
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -11,15 +12,15 @@ 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"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 CDEPEND="sci-libs/scipy
@@ -32,7 +33,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
@@ -42,6 +43,10 @@ src_prepare() {
 		library_dirs=${EPREFIX}/usr/$(get_libdir)
 		include_dirs=${EPREFIX}/usr/include/
 	EOF
+	# bug #397605
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
 }
 
 src_compile() {
@@ -51,7 +56,7 @@ src_compile() {
 		export VARTEXFONTS="${T}"/fonts
 		MPLCONFIGDIR="${S}/build-$(PYTHON -f --ABI)" \
 			PYTHONPATH=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*) \
-			emake html latex || die
+			emake html latex
 	fi
 }
 
@@ -63,11 +68,7 @@ src_install() {
 	}
 	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
+	use doc && doins "${DISTDIR}"/scikits.learn.pdf && \
+		doins -r build/sphinx/html
+	use examples && doins -r examples
 }