Added upstream remote-id, removed old

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

5 files changed, 15 insertions, 167 deletions

diff --git a/sci-libs/scikits_learn/ChangeLog b/sci-libs/scikits_learn/ChangeLog
index 9c20b52502e8..606910f058a7 100644
--- a/sci-libs/scikits_learn/ChangeLog
+++ b/sci-libs/scikits_learn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/scikits_learn
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.17 2013/02/08 09:16:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.18 2013/02/21 00:42:49 bicatali Exp $
+
+  21 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  -scikits_learn-0.12.1.ebuild, -scikits_learn-0.13.ebuild, metadata.xml:
+  Added upstream remote-id, removed old
 
 *scikits_learn-0.13-r1 (08 Feb 2013)
 
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index 7ee9118fecf4..c2108f262ce3 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -3,17 +3,14 @@ Hash: SHA256
 
 AUX 0.10-atlas.patch 2524 SHA256 25f0d89b50c36931ccb52be02676bb2c7f78a0f4f270f01319eea287af132e94 SHA512 733628a21213cafefa0849da3ba99892e7c690b4ca1d5917bdef4a0b4623b686532cbf789f9303264342fe7b0e073ff420ede73ee6acc8d7adc56340425d04a8 WHIRLPOOL 8110029e9e58524a739d9130675ef2b0a23c1bc90e73fe9cbb44713452a38f636dfb6fd1030ef360434acadc94b11e13fe391f49875765087043e4222f9bdac6
 AUX 0.12.1-linalg.patch 1310 SHA256 347bb5f43138f9f1ba57f14b4b9ef4d3ade3fb4dbadc22d827c11445621814f3 SHA512 6c974d8853c15f85221f1c611ad6987287dac4117ce136bbd3380b3fc2040e3bcbc4e42be6b9be0e14d41cf6fc900b050fa441a1f27acf6a933f9524e8512549 WHIRLPOOL c28726d7d975cf493724519f987f6183b92af73e35ab8c98857db400523d46d884903d69db1fb3ab8d3b0a07d0d178d33f39266c8f2b17eea53fc789a318bb56
-DIST scikit-learn-0.12.1.tar.gz 2964072 SHA256 f542e58a15c93e118036801b55441470e9fc668e8811c39cc0f935a800ff8eaf SHA512 d9d65c36fb8314b9a7e749718d53491661d6007968b59bfa47e84e724c5a44fac8ae7d06150b04a33916542749bf8cfc240fcedb6b0ab02cce0e1ffa23115df2 WHIRLPOOL 53089e2ec6eee5d31b39087187dcc13a11fa9307bcbfdf404c1a9b0580dbaecee742bc7dfd14216b6d80c43484a32a5c3d62704c06488760a6d2bf4bc8560c0a
 DIST scikit-learn-0.13.tar.gz 3464031 SHA256 f89e716fcee123e621ded23d5e1cb25105e48ef17e1fc73b3f439bc745bc913a SHA512 d889cce2dfa46746c9735fa9b7dc44032748895bc39cd734c03804e0a4fda3c95b76114b191130122e9049873519984702283c0a831b0c24ba81d2a5fc8e20fc WHIRLPOOL 4d9891e8c18efa0faad0e452263d7a5ca970d3e593e6be1f32a82c71bb98d728feb3ed24c6b5cf85846f0f5c435173c93427bbd29fb04af8f85ae0ba3222a4d5
-EBUILD scikits_learn-0.12.1.ebuild 2006 SHA256 9cade9db8f220a7747a1b5be1d50d9ff724114c1686bbaa70c3c12b1d7f05570 SHA512 5f93b62402b1edc0afc0742921f9e96acad9f27a2c167b6c250184fe95d001cc55552244eee008302099c0aeb6232649b970af7910565d509ef584513c04df50 WHIRLPOOL f47def6873ecd2af85d429ca21af4efed56b54454f12c17edbb00a4bbf5128b47823ed499074d86de3debc44a836dd3c40f3fde293f4c9a08f11f9b127a725a7
 EBUILD scikits_learn-0.13-r1.ebuild 2137 SHA256 92f38c405c548ebcf6ec459d448a3cb49cb74843c663b8823f7069a10b336e6b SHA512 59e272846c80e621c9dd1cde711e95e82dd68b9b00d48faf3266d571bbb218e3d13300d0361bb76af406ddfb29ddf5d66e6eabcbcb6bdad032c72c0e867dd4db WHIRLPOOL 962682a25b9c6ca60aefdeea66ec888636830e13d2255c433baf5a66926a0bf2a56d9093906ec3eb72958c1114615d2431675c4c8b088191bbc6326c7e0985c4
-EBUILD scikits_learn-0.13.ebuild 1961 SHA256 fca4a9076f9e3decdd7419bcfd59896ecef6e19f64abaafc79ba54654ec6f560 SHA512 0fa8646ed12712d928cc52996be31b7f05e1af4f917928c6087da173fed467df98850395b8b2935146dfd7b8206bf10bfd2321d27985a03666834b9539abfb79 WHIRLPOOL 98bd45369006d4aa847b98cbfcca4a5ea63808c0728094bfc84ded897b0d958d52e362ce28152d4d12e360abbd5c73f82b3cd088a8e2665db235add94015e924
-MISC ChangeLog 3730 SHA256 2f86f170d53829331c7e45d88c5d169d0418d52976e5ff8bca89d0d829708702 SHA512 d391a1d8b94d1cac07d3c1528efd9b5defff823bf68ef483a8eae929a80034c161d674b0466c7d7974a33e1b577a02e7ad34a7a9f84ff8879afffc584b15de47 WHIRLPOOL a832e7ab80da0c8cdadee4bc5fe896113e835b029160638be6968b37f42392045a902ade04756682aa8939cad2f3a5e7a8103d10b669184291dabfce8c80423f
-MISC metadata.xml 364 SHA256 5661b4410c5e23e2959db982b06beb48fb72d60ad102ad32dfe89145bbceeb43 SHA512 b35d9af77e8fa3ac7d4de84268298af840696b9928770490f333aded00fb23f4e1bfcd242f64c852b9973ab776c7b344738464b11c5f8065ad94f4696d259955 WHIRLPOOL e65b3744cdd35e8e13695f1d80d49511f2ccccf229d2e71379a17f419ff394be8b5e8ade81acb62138a8bbd6e0017bf7f0cf33c454b2efb6f45121b3a8859801
+MISC ChangeLog 3904 SHA256 de652c0245f1f6fc85c81b4bb8fd3797a7df44404625b59dc32461b65949b041 SHA512 f815cd2d88645abde276189a925695b190358a65f8890cfe928d32f82b1dfa6c58871c8c6bc1395fc66fe53548f2fb056fe83ab3a11663a45f45421a5c41720a WHIRLPOOL 071287a601b158a2c4e00acfa12f0e0b0c8f649033fa716ca7ee1ed32eccacfbe3d7d9f272da414a00ffa99d5246d5b04ed7df9fd3ca4ab2d472705b2f89219a
+MISC metadata.xml 433 SHA256 af5e810788b4d38b99c4429e04eb2177133e9fe1258133a0528dc0ad3f02dd45 SHA512 f7e2daaa7f35b698a34409f072532c01b2a3c9d8ec00a504a0cc3ed4c35d2bd76b1775265ec2adbb31dc80d82022fabf49905dff798e3af9537621644dc44c2c WHIRLPOOL ed4bb1fdf942a1a31d874585fe0a3752875ae38fb7c4bca25845851f7316d5374f73f82f751589edf6a992e2ffd7a98e8fbd4e83297a36a7cb2d4427d3ed4cba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEUwoIACgkQgAnW8HDreRaZGQCgyxV5XxpLMJyTHX2x5oAgXAHD
-cAYAn16dY0nZqhDiTdoP+LnpOmJOaysp
-=nvIV
+iEYEAREIAAYFAlElbYoACgkQ1ycZbhPLE2Bh/gCgoX6WCwdRbYLCM0uKJPmB5cm2
+7vUAnRN3CWoSc1+KEpRZUOMZRBAcet2J
+=SPul
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scikits_learn/metadata.xml b/sci-libs/scikits_learn/metadata.xml
index 0d35104aa69d..64fe2c7def04 100644
--- a/sci-libs/scikits_learn/metadata.xml
+++ b/sci-libs/scikits_learn/metadata.xml
@@ -1,10 +1,13 @@
 <?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.
 </longdescription>
+<upstream>
+  <remote-id type="pypi">scikit-learn</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sci-libs/scikits_learn/scikits_learn-0.12.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.12.1.ebuild
deleted file mode 100644
index 75e1a0f6bf13..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.12.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.12.1.ebuild,v 1.2 2012/12/10 18:32:50 bicatali Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
-
-inherit distutils multilib flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
-SRC_URI="mirror://sourceforge/${MYPN}/${MYPN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	sci-libs/scikits
-	sci-libs/scipy
-	dev-python/matplotlib"
-DEPEND="
-	dev-python/cython
-	dev-python/setuptools
-	sci-libs/scipy
-	doc? ( dev-python/sphinx dev-python/matplotlib )"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/0.12.1-linalg.patch
-
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-}
-
-src_compile() {
-	distutils_src_compile ${SCIPY_FCONFIG}
-	if use doc; then
-		cd "${S}/doc"
-		local d=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*)
-		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${S}/build-$(PYTHON -f --ABI)" \
-			PYTHONPATH="${d}" \
-			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images}
-	fi
-}
-
-src_test() {
-	# doc builds and runs tests
-	use doc && return
-	testing() {
-		"$(PYTHON)" setup.py build_ext --inplace ${SCIPY_FCONFIG} || die
-		PYTHONPATH=. nosetests sklearn --exe || die
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	find "${S}" -name \*LICENSE.txt -delete
-	distutils_src_install ${SCIPY_FCONFIG}
-	insinto /usr/share/doc/${PF}
-	use doc && dohtml -r doc/_build/html
-	use examples && doins -r examples
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.13.ebuild b/sci-libs/scikits_learn/scikits_learn-0.13.ebuild
deleted file mode 100644
index 672b0e26cfc1..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.13.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 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.13.ebuild,v 1.1 2013/01/30 17:42:10 bicatali Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
-
-inherit distutils multilib flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
-SRC_URI="mirror://sourceforge/${MYPN}/${MYPN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	sci-libs/scikits
-	sci-libs/scipy
-	dev-python/matplotlib"
-DEPEND="
-	dev-python/cython
-	dev-python/setuptools
-	sci-libs/scipy
-	doc? ( dev-python/sphinx dev-python/matplotlib )"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-
-src_prepare() {
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-}
-
-src_compile() {
-	distutils_src_compile ${SCIPY_FCONFIG}
-	if use doc; then
-		cd "${S}/doc"
-		local d=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*)
-		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${S}/build-$(PYTHON -f --ABI)" \
-			PYTHONPATH="${d}" \
-			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images}
-	fi
-}
-
-src_test() {
-	# doc builds and runs tests
-	use doc && return
-	testing() {
-		"$(PYTHON)" setup.py build_ext --inplace ${SCIPY_FCONFIG} || die
-		PYTHONPATH=. nosetests sklearn --exe || die
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	find "${S}" -name \*LICENSE.txt -delete
-	distutils_src_install ${SCIPY_FCONFIG}
-	insinto /usr/share/doc/${PF}
-	use doc && dohtml -r doc/_build/html
-	use examples && doins -r examples
-}