[gentoo-commits] proj/sci:master commit in: sci-libs/lwpr/files/, sci-libs/lwpr/

[gentoo-commits] proj/sci:master commit in: sci-libs/lwpr/files/, sci-libs/lwpr/

[Sebastien Fabbro]

commit:     0f20d5e7654aaf756a91703bd6675d533b876606
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 22:15:48 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 22:15:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0f20d5e7

sci-libs/lwpr: Version bump. Removed python flag, should be a split package

Package-Manager: portage-2.2.01.22013-prefix

---
 sci-libs/lwpr/ChangeLog                       |  9 ++-
 sci-libs/lwpr/files/lwpr-1.2.2-setup.py.patch | 12 ----
 sci-libs/lwpr/lwpr-1.2.2.ebuild               | 83 ---------------------------
 sci-libs/lwpr/lwpr-1.2.5.ebuild               | 51 ++++++++++++++++
 sci-libs/lwpr/metadata.xml                    | 10 ++--
 5 files changed, 63 insertions(+), 102 deletions(-)

diff --git a/sci-libs/lwpr/ChangeLog b/sci-libs/lwpr/ChangeLog
index a0cb737..bc8987c 100644
--- a/sci-libs/lwpr/ChangeLog
+++ b/sci-libs/lwpr/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-libs/lwpr
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*lwpr-1.2.5 (25 Jun 2013)
+
+  25 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> +lwpr-1.2.5.ebuild,
+  -files/lwpr-1.2.2-setup.py.patch, -lwpr-1.2.2.ebuild, metadata.xml:
+  sci-libs/lwpr: Version bump. Removed python flag, should be a split package
+
   29 Jun 2010; Justin Lecher <jlec@gentoo.org> lwpr-1.2.2.ebuild:
   Python ABI fixes
 
@@ -11,4 +17,3 @@
   +files/lwpr-1.2.2-setup.py.patch, +metadata.xml:
   Initial import, ebuild based on bug #288032, initially submitted by
   Florent Teichteil
-

diff --git a/sci-libs/lwpr/files/lwpr-1.2.2-setup.py.patch b/sci-libs/lwpr/files/lwpr-1.2.2-setup.py.patch
deleted file mode 100644
index d560d16..0000000
--- a/sci-libs/lwpr/files/lwpr-1.2.2-setup.py.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- python/setup.py.orig	2009-10-09 21:53:17.000000000 +0100
-+++ python/setup.py	2009-10-09 21:53:54.000000000 +0100
-@@ -5,7 +5,8 @@
- module = Extension('lwpr',
-                     include_dirs = ['../include', 
-                        os.path.join(get_python_lib(),'numpy','core','include')],
--                    libraries = ['lwpr'],    
-+                    libraries = ['lwpr'],
-+                   library_dirs=['../src/.libs'],
-                     sources = ['lwprmodule.c'])
- 
- setup (name = 'LWPR Module',

diff --git a/sci-libs/lwpr/lwpr-1.2.2.ebuild b/sci-libs/lwpr/lwpr-1.2.2.ebuild
deleted file mode 100644
index ba4014b..0000000
--- a/sci-libs/lwpr/lwpr-1.2.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="The Locally Weighted Projection Regression Library"
-HOMEPAGE="http://www.ipab.inf.ed.ac.uk/slmc/software/lwpr/"
-SRC_URI="http://www.ipab.inf.ed.ac.uk/slmc/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples octave python"
-
-RDEPEND="octave? ( >=sci-mathematics/octave-3 )
-	python? ( dev-python/numpy )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	if use python; then
-		epatch "${FILESDIR}"/${P}-setup.py.patch
-		use python && distutils_src_prepare
-	fi
-}
-
-src_configure() {
-	econf $(use_with octave octave "$(octave-config -p PREFIX)")
-	# threads buggy
-	#	$(use_enable threads threads X) \
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		doxygen Doxyfile || die "doxygen failed"
-	fi
-	if use python; then
-		cd  python
-		distutils_src_compile
-	fi
-}
-
-src_test() {
-	emake check || die "emake test failed"
-	if use python; then
-		cd python
-		LD_LIBRARY_PATH=../src/.libs \
-			PYTHONPATH=$(dir -d build/lib*) \
-			"$(PYTHON)" test.py || die "python test failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		mexflags="-DMATLAB -I../include -L./.libs -llwproctave" \
-		install || die "emake install failed"
-	dodoc README.TXT || die
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/lwpr_doc.pdf
-		dohtml html/* || die
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins example_c/cross.c example_cpp/cross.cc || die
-	fi
-	if use octave; then
-		insinto /usr/share/octave/packages/${P}
-		doins matlab/*.m || die
-	fi
-	if use python; then
-		cd python
-		distutils_src_install
-	fi
-}

diff --git a/sci-libs/lwpr/lwpr-1.2.5.ebuild b/sci-libs/lwpr/lwpr-1.2.5.ebuild
new file mode 100644
index 0000000..29f2ec6
--- /dev/null
+++ b/sci-libs/lwpr/lwpr-1.2.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils
+
+DESCRIPTION="The Locally Weighted Projection Regression Library"
+HOMEPAGE="http://www.ipab.inf.ed.ac.uk/slmc/software/lwpr/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples octave static-libs"
+
+RDEPEND="
+	octave? ( >=sci-mathematics/octave-3 )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local myeconfargs=(
+		--enable-threads=3
+		$(use_with octave octave "$(octave-config -p PREFIX)")
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	if use doc; then
+		doxygen Doxyfile || die "doxygen failed"
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install \
+		 mexflags="-DMATLAB -I../include -L./.libs -llwproctave"
+	use doc && dodoc doc/lwpr_doc.pdf && dohtml html/*
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins example_c/cross.c example_cpp/cross.cc
+	fi
+	if use octave; then
+		insinto /usr/share/octave/packages/${P}
+		doins matlab/*.m
+	fi
+}

diff --git a/sci-libs/lwpr/metadata.xml b/sci-libs/lwpr/metadata.xml
index dbae229..b9d1fd6 100644
--- a/sci-libs/lwpr/metadata.xml
+++ b/sci-libs/lwpr/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<herd>sci-mathematics</herd>
 <longdescription>
   Locally Weighted Projection Regression (LWPR) is a recent algorithm
   that achieves nonlinear function approximation in high dimensional spaces
   with redundant and irrelevant input dimensions. At its core, it uses
-  locally linear models, spanned by a small number of univariate regressions in
-  selected directions in input space. A locally weighted variant of
-  Partial Least Squares (PLS) is employed for doing the dimensionality
-  reduction. 
+  locally linear models, spanned by a small number of univariate
+  regressions in selected directions in input space. A locally
+  weighted variant of Partial Least Squares (PLS) is employed for
+  doing the dimensionality reduction.
 </longdescription>
 <use>
   <flag name='octave'>Add <pkg>sci-mathematics/octave</pkg> support</flag>