Fix dependencies and example install. Do not explicitly call wrapped nosetests. Bug #484412.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 28 insertions, 14 deletions

diff --git a/dev-python/root_numpy/ChangeLog b/dev-python/root_numpy/ChangeLog
index cbaa38c83e74..8be173eb14c3 100644
--- a/dev-python/root_numpy/ChangeLog
+++ b/dev-python/root_numpy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/root_numpy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/root_numpy/ChangeLog,v 1.1 2013/08/12 17:12:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/root_numpy/ChangeLog,v 1.2 2013/09/17 07:33:45 mgorny Exp $
+
+  17 Sep 2013; Michał Górny <mgorny@gentoo.org> root_numpy-2.1.0.ebuild:
+  Fix dependencies and example install. Do not explicitly call wrapped
+  nosetests. Bug #484412.
 
 *root_numpy-2.1.0 (12 Aug 2013)
 
diff --git a/dev-python/root_numpy/Manifest b/dev-python/root_numpy/Manifest
index d383c9df327c..24f1543b3ff7 100644
--- a/dev-python/root_numpy/Manifest
+++ b/dev-python/root_numpy/Manifest
@@ -2,13 +2,25 @@
 Hash: SHA256
 
 DIST root_numpy-2.1.0.tar.gz 196652 SHA256 532cb7ea3856160eea1d2c4607bfec6452c8d988e7c1f68ba1b740ac7672ed56 SHA512 081bf0a8fb2fe097f2f4789a6e6005208551dfa72e29e9e3fa17a43ed658865013edcf6931ddefba40ce2ac162db007f65277427e62a1ac04bcb4483f2794695 WHIRLPOOL 6e08f54fddea725252c923edeca5218e8ac8b046a24eb31017777e53b7a412118338e03f76749cd84217a468e8912421f5d805c1be754f79c033fe26c1c53bcd
-EBUILD root_numpy-2.1.0.ebuild 940 SHA256 51c36dd03205490204146ce66cd32124f0afb4e641423e103ad3215321f12005 SHA512 ba2bca7a3675a0fbac8cd8be0941434f8464b39cf8a92a2ee7c245de7c0cd86fb081b981bcee38fa95f3820d721318fedb85a5a17cb8cd3b98b2e655856850c9 WHIRLPOOL 408931a8bac9f6b69b70fd8635ef179be043d69f5f568ed0792fb870697bff6723321aabb2c07dcb7e63953740aa19c213421e8ee351a13232ccfe83dd5781f5
-MISC ChangeLog 365 SHA256 6b0fdce541055150eec63e658732637fcf2e89639e1d92d033513e06029c2f29 SHA512 3580d51ade9fcbdf71b7959091d70224515083e7701a39b068a1de0e7247d5c308c090d59e80c500e68f04a4cd1fc8d4205571d3661b1747698d3bafd420eb3a WHIRLPOOL 9384119a62aa5c15e1a76b35f5334771e7f1207fe089898e9935e40c759f647299697ebdc251424884ea029a51729102b8bac26d461b4442323f28bc57ff7438
+EBUILD root_numpy-2.1.0.ebuild 916 SHA256 b876f876d0fff488eafbb5cd8d659eadb2c297afc1363baf491457cbe050e36a SHA512 a6df4a2cff1e5cd58bf20d4c38fd2df0a125c7910a73a86946082019dd64d2fd0a3883e32829ab30d29c2832b38cac70d5e237002b580cd3567aceebda65c4d6 WHIRLPOOL d84a7e181504c6f16557c49e663f5628afbfb4fd761529230603d4993569b2fd810bd1262f9282c64eee4eb52eb633a0d79a497f14fe1456ef4d1f2d15c4c16d
+MISC ChangeLog 536 SHA256 74d015bcc935742cdbd54a91db2d4c8b8190573d345ce27c65ca3d6f2f7d4d06 SHA512 4d3cb6dc547a4ced7a8fcac6f24e8f7155cdb9d765c64b401eac1d5bad7de8681f9220be09f3e5332f18c2e6decd55a78b600bd9eee30bdb3152ed0990bcd0a6 WHIRLPOOL b8f85d286da3c0266df04544c3fdc39db16bba20b51d80a0298164052619d94719fdb5eea2a202a9ca8a62e24158817330a924f9cc0a99fa03e6cd946f10561d
 MISC metadata.xml 728 SHA256 6f3969a5bbe69d7e787e22646386d1ca7d486ba0f1802bb30baa861b8744f026 SHA512 09dbd7690d5af27d92da72d14647e7ade9ad1f26dd385226bb8bf7095520f8ff894ef9f6459cadd9b79965d082e1fb95b0673f9220c91769ed475f6a45053e35 WHIRLPOOL 78408eaf76730f754805fc65364b17ca853d0301a265fe098cfa22135586a4a3eac4d3ebc753e2706c102ca87d85d518aabeacabcfac8605dee6bf14888f6640
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlIJF2IACgkQ1ycZbhPLE2AmqQCeMckz1b1PPASNRjXCdgcqEjl5
-YiYAnRZwpgmOskLGW4l4tk5KlXcXWmJt
-=2AGX
+iQJ8BAEBCABmBQJSOAYBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO/2sQAKt/OPf4fAVhKZILdbj5QJt7
+GURM+26XNr9Kj1Iw5UpoljON+OpU9p3UHrNurl7RZUu9TdrHWt7fTetTmU/sSzzc
+h+V9NXU9zQxWOeoca+fVghIIWDKyGTAe+bZjGkzw5as+7WZGnvG0aexWgM/FAWIs
+03OXyfhLtIPeeTycGbg1eaxYQLH6oAW1U0Rp6Z3gpaAm20YwrMGRuh2TRwkLcri+
+AEOStNLqrO5OkcIjP0GwvLCHo6g3LkuCEuiLPHj4oTukEOpVZLTpMfkgp4ysXU/F
+wmPiXv24vwfMlfwAReZOhml0bXvwpBAVS5FCwNHWavFVIL/o5sjiu2642XQNhy61
+EOcWTeEEuyqoYtQwe7nnbQ3WFmZs5BAlFDv43TSH4HVWwA+8yfKW+q4vf2uZAmKq
+HcXiHKnAgQwMCSexgEO8cP6Ju7EFWe4HnwlUBRVJ/uNf3LGHbMfHCGcuXB+9RG2q
+0CJg8x7OtHUXoer1uAnPJVobsMbWLNGKgrKX107XuMVDspjKxSBv+o+wAOUB2XB4
+IWBxuD8TvkoWX/vqpZoTAONOmQeQcVGA58/SWsxg/7HIM3iglBK5yJXy+S3FbXiU
+FDNxek7cpZleLNBhFDpwBTF5VK/ZSUmF+0QR8IWQwEB0TRNQ+C+S2NvK91+hmzyW
++21396NAGLBaEJ7UXhrI
+=fZUg
 -----END PGP SIGNATURE-----
diff --git a/dev-python/root_numpy/root_numpy-2.1.0.ebuild b/dev-python/root_numpy/root_numpy-2.1.0.ebuild
index caa79617e9bc..8c1c9a354951 100644
--- a/dev-python/root_numpy/root_numpy-2.1.0.ebuild
+++ b/dev-python/root_numpy/root_numpy-2.1.0.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/root_numpy/root_numpy-2.1.0.ebuild,v 1.1 2013/08/12 17:12:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/root_numpy/root_numpy-2.1.0.ebuild,v 1.2 2013/09/17 07:33:45 mgorny Exp $
 
 EAPI=5
 
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
@@ -19,20 +20,17 @@ IUSE="examples test"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-physics/root[${PYTHON_USEDEP}]"
+	sci-physics/root[python,${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 python_test() {
 	cd ${BUILD_DIR} || die
-	nosetests-${EPYTHON} -v || die "Testing failed with ${EPYTHON}"
+	nosetests -v || die "Testing failed with ${EPYTHON}"
 }
 
 python_install_all() {
+	use examples && local EXAMPLES=( tutorial/. )
 	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r tutorial/*
-	fi
 }