update xrayutilities ebuild

5 files changed, 15 insertions, 16 deletions

diff --git a/app-text/referencer/Manifest b/app-text/referencer/Manifest
index 53ff401..9b7e8c0 100644
--- a/app-text/referencer/Manifest
+++ b/app-text/referencer/Manifest
@@ -1,3 +1,3 @@
 DIST referencer-1.2.1.tar.gz 678290 SHA256 449c7ccd6c07770b9a1ff3db4d34eb0ec5a47f6790a80ad1f0f66ea55e5cb4f3 SHA512 16a0af053c7a494f954da373397bf9a5736e1d6c79d041bfeab8f3f2a69952f13fcccd1fcbf49d83afa1521d4f245ee4ac55a1249d6fd7a21394f4926a3bd06e WHIRLPOOL 96975c37a7dc0ae558bfc3954ced2f29e08793259d6443b701af95ba0d58ad58da22e8a81bf90671bcf40ce78dc2fee764095cd4bdde34ad3ea3489b89765409
 EBUILD referencer-1.2.1.ebuild 1176 SHA256 6929b4266e26367a4c46b25f0ca8325945d663704e404c49cdd47baf8356544e SHA512 cb248a8999c50c9b08b86ddb12fadb90c402d230c1e88c1778a8e26442d017ba23548082a64fa60ecc93f32533e41af0176aaa519231d9634e93f90fde7bfe24 WHIRLPOOL 05a5bcaffe58a999e9b1badf15293e36cd943b55464c527c9e47825c4fe682d29189ba61e78ddde13d2bec97b7f1dcd19a81b4ee8b7af3a315bcdec1f491fc9d
-EBUILD referencer-9999.ebuild 1136 SHA256 b72015001d2f423979e6589dae8557b504c7b29fc756c5923c7e23f94dc66c4d SHA512 06881c4168de3988ea6c85254b459d9466b954b9074434f56698d73637e3ac81bc955cb3b855749d5909f0c4c9927ed3f5aac47cce9e9491dfaba4eccae1021b WHIRLPOOL e42e41fb8feac8f8f05ee7abf9fd63963fa8cb32646e6756f39e1f824cbea80b8a2871ad715493dd558225b784def909d68d8e12c00c0bfaf2c029ccbcc9f784
+EBUILD referencer-9999.ebuild 1083 SHA256 f6f654bac6f7057692819e6b04854f29ada3384318cc635371c4c2fa1c42edf2 SHA512 d454b1055a0549c2bcf2d60067d7be7a7914646c58f7300f670a5dbc5cecaef0c60c53163359f1c31b271ed1d6e706e65de9661921922ea1c68a73803e66e703 WHIRLPOOL 00b69770aa1526ea742b803e0fefb801e54af4239b411c4329c4f5c406ac1dd9caf7f4d185af878fbd00c03a0fb5944d3779f18f5368106af31ea0f55d7818be
diff --git a/app-text/referencer/referencer-9999.ebuild b/app-text/referencer/referencer-9999.ebuild
index 792bb4f..e2bf280 100644
--- a/app-text/referencer/referencer-9999.ebuild
+++ b/app-text/referencer/referencer-9999.ebuild
@@ -4,9 +4,9 @@
 
 EAPI="5"
 
-PYTHON_DEPEND="2:2.7"
+PYTHON_COMPAT=( python2_7 )
 
-inherit fdo-mime bzr eutils python
+inherit fdo-mime bzr eutils python-single-r1
 
 DESCRIPTION="Gnome application to organise documents or references, and to generate BibTeX bibliography files"
 HOMEPAGE="http://icculus.org/referencer/"
@@ -37,11 +37,6 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	app-text/rarian"
 
-pkg_setup() {
-	    python_set_active_version 2
-		python_pkg_setup
-}
-
 src_prepare () {
 	bzr_bootstrap
 	python_convert_shebangs -r 2.7 plugins
diff --git a/sci-physics/xrayutilities/Manifest b/sci-physics/xrayutilities/Manifest
index 1f1e3fc..f20987b 100644
--- a/sci-physics/xrayutilities/Manifest
+++ b/sci-physics/xrayutilities/Manifest
@@ -1,3 +1,2 @@
-DIST xrayutilities-0.99.1.tar.gz 9354933 SHA256 ab73ac1ae07e8e924f1b0932ddfc2e64ddaec8ce8ff5d9797c5513aeca75972d SHA512 4bd5e368312b821a2b03ed6a8579d56ea4af1e867520f29dde6d8e1e1fefeb61cc4c3d5f0c4a602450be51600645a3b57901244e6a71e11bb5fdae34e6638578 WHIRLPOOL b0bef57e6ca23ba653581e4bb2c2420337dc245261bc4333d5e8d5f56389f4c921b7b3fd426f6cc67c7d32f1ca7807ec331de32d48dfd0a9677cc298e7ce11a2
-EBUILD xrayutilities-0.99.1.ebuild 696 SHA256 c9ac870f160bb4100eeef341ac2f5d9109785ba9862d983d3d0f455e8e317291 SHA512 67a2fa7da7da25e6a7a39e3fa7883f7267d63bd94efd4c8fff9761d9f821d76a03f8111e3b443b2960cf34c7d55ba9d769ee4a438e1e23c457d2653e51962edb WHIRLPOOL f30505465e4ce42179e448cdff928570a55f6b0b3d02220834095d5f1b51425c7d3d6c8f910ee4dfa01274b05af469c98295d10b3fa812df4dada6396bafc642
-EBUILD xrayutilities-9999.ebuild 791 SHA256 68ec0078cb464be68c409d8fbabac38496a0acacfa3563ed6bf7ea16f9366185 SHA512 b3761c805d1f3a0c929dce7f8a5c6bc41934b89f05b4747f9c239368add321b1b9e5b6fcc50990912f66dd10ab6707a19feb1753faadb4a20bc10bb179ccb04f WHIRLPOOL 509b760f82a88623d19cb56ed8c123c11271d1ecebbb8f6ea576c72bae9139a51bc292d7485f3b42f66b6086c1474a8b0e0fecb6e8634823e2268649afca5b62
+EBUILD xrayutilities-1.0.ebuild 720 SHA256 44c9bc1ac59c7634b7d89f072eb999ebac190988c834f72e6061b18a508a1243 SHA512 48d3ead895088bdea932bdaa5723d44530bb60a163321f0d0698c9b6f775e1a6a724277903a9c3bcdfbf0bbfcf8da39357b6ce68099169dfdce56e40b714a084 WHIRLPOOL b8245b8abc74d2b69a3b60e9e481f2f93a4eace46d3f8321fcd7527b7c7c532ca3fbb8ffaee93518ccb580f3150ed89663a3c8b02893f1c0dce73eeef8193058
+EBUILD xrayutilities-9999.ebuild 844 SHA256 08c0dffd0f7de46d7d0fd76177626981e5f63cfc9eba6cfad86f29d311809d28 SHA512 69298fbd9884ee73bee60c8dd6d8ab1c28ddbeec3ab58eaa7ff3c52f78686542700fc209078a60c5034ff794fae7389ebc3a5a4c2b7cd5bae2b44a21ddeb0cc5 WHIRLPOOL 0e1c0c8590138e32e23e8438c4ef793e4ffd2631bde1fc7e5869e973826d6b0aa6bdf75871aca436110aba9b043389abec83fe52c8ab175cfd0f3f132628b45d
diff --git a/sci-physics/xrayutilities/xrayutilities-0.99.1.ebuild b/sci-physics/xrayutilities/xrayutilities-1.0.ebuild
index b2e747d..f7d6156 100644
--- a/sci-physics/xrayutilities/xrayutilities-0.99.1.ebuild
+++ b/sci-physics/xrayutilities/xrayutilities-1.0.ebuild
@@ -4,18 +4,17 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
 DESCRIPTION="package with useful scripts for X-ray diffraction physicists"
 HOMEPAGE="http://sourceforge.net/projects/xrayutilities"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="openmp"
+KEYWORDS=""
+IUSE="openmp test"
 
 DEPEND="dev-python/numpy
         sci-libs/scipy
@@ -30,3 +29,8 @@ python_configure_all() {
 		mydistutilsargs=( --without-openmp )
 	fi
 }
+
+python_test() {
+	cd xrayutilities/tests
+	$PYTHON -m unittest discover || die
+}
diff --git a/sci-physics/xrayutilities/xrayutilities-9999.ebuild b/sci-physics/xrayutilities/xrayutilities-9999.ebuild
index be9b532..56b30f9 100644
--- a/sci-physics/xrayutilities/xrayutilities-9999.ebuild
+++ b/sci-physics/xrayutilities/xrayutilities-9999.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_COMPAT=( python2_7 )
+EGIT_REPO_URI="git://git.code.sf.net/p/xrayutilities/code"
 
 inherit distutils-r1 git-2