From: Sebastien Fabbro <bicatali@gentoo.org>
Date: Tue, 20 Dec 2011 06:37:48 +0000 (+0000)
Subject: Version bump
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2da4ca756f8e0bcf39492e63f4642b79ab7168ef;p=gentoo.git

Version bump

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

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 1ff2ed5a1d9f..fc73af9ddf14 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/armadillo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.6 2011/11/27 06:09:39 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.7 2011/12/20 06:37:48 bicatali Exp $
+
+*armadillo-2.4.2 (20 Dec 2011)
+
+  20 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-2.4.2.ebuild:
+  Version bump
 
 *armadillo-2.2.5 (27 Nov 2011)
 
diff --git a/sci-libs/armadillo/armadillo-2.4.2.ebuild b/sci-libs/armadillo/armadillo-2.4.2.ebuild
new file mode 100644
index 000000000000..7db27599b9cf
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-2.4.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-2.4.2.ebuild,v 1.1 2011/12/20 06:37:48 bicatali Exp $
+
+EAPI=4
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake-utils
+
+DESCRIPTION="Streamlined C++ linear algebra library"
+HOMEPAGE="http://arma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="atlas blas doc lapack"
+
+RDEPEND="
+	>=dev-libs/boost-1.34
+	atlas? ( sci-libs/lapack-atlas )
+	blas? ( virtual/blas )
+	lapack? ( virtual/lapack )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=()
+	if use blas; then
+		mycmakeargs+=(
+			-DBLAS_FOUND=ON
+			-DBLAS_LIBRARIES="$(pkg-config --libs blas)"
+		)
+	fi
+	if use lapack; then
+		mycmakeargs+=(
+			-DLAPACK_FOUND=ON
+			-DLAPACK_LIBRARIES="$(pkg-config --libs lapack)"
+		)
+	fi
+	if use atlas; then
+		mycmakeargs=(
+			-DCBLAS_FOUND=ON
+			-DCLAPACK_FOUND=ON
+			-DATLAS_INCLUDE_DIR="${EPREFIX}/usr/include/atlas/"
+			-DCBLAS_LIBRARIES="$(pkg-config --libs cblas)"
+			-DCLAPACK_LIBRARIES="-L${EPREFIX}/usr/lib64/lapack/atlas -llapack"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc docs/*pdf
+}
diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index 8d636b26684f..8073ac374232 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.2 2011/11/25 22:14:08 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/ChangeLog,v 1.3 2011/12/20 06:34:06 bicatali Exp $
+
+*scikits_image-0.4.2 (20 Dec 2011)
+
+  20 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  -scikits_image-0.2.2.ebuild, +scikits_image-0.4.2.ebuild:
+  Version bump
 
 *scikits_image-0.3.1 (25 Nov 2011)
 
diff --git a/sci-libs/scikits_image/scikits_image-0.2.2.ebuild b/sci-libs/scikits_image/scikits_image-0.4.2.ebuild
similarity index 70%
rename from sci-libs/scikits_image/scikits_image-0.2.2.ebuild
rename to sci-libs/scikits_image/scikits_image-0.4.2.ebuild
index 649f0b2d1c70..856e4642b673 100644
--- a/sci-libs/scikits_image/scikits_image-0.2.2.ebuild
+++ b/sci-libs/scikits_image/scikits_image-0.4.2.ebuild
@@ -1,8 +1,8 @@
 # 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.2.2.ebuild,v 1.2 2011/01/08 19:32:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/scikits_image-0.4.2.ebuild,v 1.1 2011/12/20 06:34:06 bicatali Exp $
 
-EAPI="2"
+EAPI="3"
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -10,24 +10,28 @@ RESTRICT_PYTHON_ABIS="3.*"
 
 inherit distutils
 
-MY_P="${P/scikits_/scikits.}"
+MYPN="${PN/scikits_/scikits-}"
 
 DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="http://stefanv.github.com/scikits.image"
-SRC_URI="mirror://pypi/${PN:0:1}/scikits.image/${MY_P}.tar.gz"
+HOMEPAGE="http://scikits-image.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYPN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/numpy
-	sci-libs/scikits"
-DEPEND="${RDEPEND}
+IUSE="doc gtk qt4"
+
+RDEPEND="sci-libs/scipy
+	sci-libs/scikits
+	gtk? ( dev-python/pygtk )
+	qt4? ( dev-python/PyQt4 )"
+DEPEND="dev-python/numpy
+	dev-python/cython
 	dev-python/setuptools
 	doc? ( dev-python/sphinx )"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${MYPN}-${PV}"
+PYTHON_MODNAME="skimage"
 
 src_compile() {
 	distutils_src_compile