update xrayutilties ebuild to EAPI6+version bump

4 files changed, 27 insertions, 30 deletions

diff --git a/sci-physics/xrayutilities/Manifest b/sci-physics/xrayutilities/Manifest
index 749fac6..cb54f3e 100644
--- a/sci-physics/xrayutilities/Manifest
+++ b/sci-physics/xrayutilities/Manifest
@@ -1,4 +1,4 @@
-DIST xrayutilities-1.2.0.tar.gz 11522441 SHA256 b2ae3f653c5f82233d5012828d9f34872e294b0ce5d3d59dd6fe02aa28dec5ee SHA512 4e82f028acdc03e14992c901c1fe009871ae12289eacf3323dbf5c8dbfd9f63b1e2a45c5b71b2cb270850eb1e80958af9d039458e307bdd621a44fe812826e44 WHIRLPOOL 7c6933dc9886118d080d9a115e26e9ddf5440ee60fc270458d1ac5162447c031da3743518783ccf46455394cd944b0902b667def28319e84022f4852a8c58816
-EBUILD xrayutilities-1.2.0.ebuild 793 SHA256 4e30c37ab279630834c455412619672ac250956f20973cae248905589a338511 SHA512 83b2da516b14b52a65504869a0cb0cc095bac849d599f502049e406b03d885569df37a378d26eb70bcb33e6632362365ba97fe552ea18f13d1476bdd01840bd6 WHIRLPOOL 5d69918e398aac0cf41393a5b315b6fb860ede92e61bc3e355264acdf28a1fa34db27dab6ea4eec5c21d31fc51418c371a7e9baa5f0bcf7e5e58234d54418674
-EBUILD xrayutilities-9999.ebuild 870 SHA256 2c5a3f79afe2958acbe63849ef338f4f4532cfdbdbac87102483f10f93a9bf6f SHA512 0ec5ebabf048cfc0ef729dedf860f8827659281bafaa33e5baa20dc978a8650fa31ef9d047da991e137b45ffaffc67ddd2a46278ed47037cefb193d836a797aa WHIRLPOOL 0b6bbd195a990d760d87eda963f4316f83ae9b980890a6288a54af0dc187dab167b6ff76fd707921644decbf57f1a1462cce887dcfb1861943f3c853e89acc0f
-MISC metadata.xml 482 SHA256 f940902fa0beaac5c87eff05802c4b480ac6c854a8c8d15372e05695218b3afb SHA512 fed1eb362030ba39e5ec9b8bc0cfc8a4d4de1b3a92817a8de311e9de0db20fe5e7f53adb8860a7e82e06a6676134327849a75f318bb9e5f5640f28dd623190da WHIRLPOOL bee4fd34d8179e705ffbf87319b57feb8005756835b78684d3c7aaad448c82120e913a43ddb5237e8d5d209fde484c82d330a193b1d9f5378cc40abf013d8a8f
+DIST xrayutilities-1.3.3.tar.gz 12247827 SHA256 ec5288ac3dfcd48a71c851ddb81673b097ab345532873f6fc029eb6fa8aa38ce SHA512 8bfe67b91ee18b3c6358a6b7533bf1ecd97876a119f65ef8590cddb0d919de4b394214e7248137bc7f59c87b22ad84b3c20b4badf6054d170075191a66dbea02 WHIRLPOOL 623b1e25e7152ed624d79ed1cd162e1dd649a83b7b20914e9ce20615c1b2283aa1ec802096628fcb71e8137276e0676a3239202eac0abcfd82445d854c6a1ad5
+EBUILD xrayutilities-1.3.3.ebuild 737 SHA256 60759f86dd4af80f8046e17f503a27ab2ae60e4cef951dffd825163f5ea18336 SHA512 f1be5db31fd01bed9dc04cc1db2e6056b920ba474a2b92b3507856a606caebbedabb98bbf3a8495dbb82d4b98a9451e6590c15cd2154130ee78d0e5a65870d01 WHIRLPOOL dc0a1bd52928e699cd3a9f271d85465903329192a3a984ee52b5f1491795f8d098185e8dcd950577f1a44f3d8c56dbbd3095ed34bdecd877a6af7aa56ecd6f3b
+EBUILD xrayutilities-9999.ebuild 865 SHA256 5d4367ccea31b9abb1606c7a5ec1e33e7126cc3a823f69675db2c759ffe648c9 SHA512 8d5a237e999856359274414cd7bbc2f75d21ee7e814cfb50e870943dba224b07d822a7429c78b0f5a12001e42179fba3d85ce0b4d030906831432fd08030acab WHIRLPOOL ae76e18b37d94ba4ede2be47b96ca584b09addc81cbfcaee5c2a60f94da30f60a74657905e22dfb5509a2b14b4047af28f114a5b17612315b2b3edad44f18dab
+MISC metadata.xml 496 SHA256 00948beac1f90fb715f4865c2c2e53dedda95baed5606b3787be433887718ea6 SHA512 01c875a0780910eba92adce72a1008971abb14964a4cfacaff8c1cea176574deef4ed83733ece2bdfa4fca07b805810f3bc7799280ad239b8498412fba9ad9d4 WHIRLPOOL 7a074c091968853c14a9e32193858f62ecc1118bd75d2c15c13d762134f42cb2f2b56c5144a659093c443fe1887daf2ad2fae31a505527fd3207a02952636783
diff --git a/sci-physics/xrayutilities/metadata.xml b/sci-physics/xrayutilities/metadata.xml
index cf4299b..2ea0ec3 100644
--- a/sci-physics/xrayutilities/metadata.xml
+++ b/sci-physics/xrayutilities/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>dominik.kriegner@gmail.com</email>
     <name>Dominik Kriegner</name>
   </maintainer>
diff --git a/sci-physics/xrayutilities/xrayutilities-1.2.0.ebuild b/sci-physics/xrayutilities/xrayutilities-1.3.3.ebuild
index 879eae7..1496152 100644
--- a/sci-physics/xrayutilities/xrayutilities-1.2.0.ebuild
+++ b/sci-physics/xrayutilities/xrayutilities-1.3.3.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=(python{2_7,3_3,3_4} )
 
 inherit distutils-r1
 
 DESCRIPTION="package with useful scripts for X-ray diffraction physicists"
-HOMEPAGE="http://sourceforge.net/projects/xrayutilities"
+HOMEPAGE="http://xrayutilities.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -17,14 +17,13 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="openmp test"
 
-DEPEND="dev-python/numpy
-	sci-libs/scipy
+DEPEND=">=dev-python/numpy-1.8
+	>=sci-libs/scipy-0.13.0
 	dev-python/h5py
 	>sys-devel/gcc-4.2:*[openmp?]"
 RDEPEND="${DEPEND}"
 
-DOCS=( README.txt CHANGES.txt xrayutilities.pdf )
-EXAMPLES=( examples/. )
+DOCS=( README.md CHANGES.txt xrayutilities.pdf )
 
 python_configure_all() {
 	if ! use openmp; then
@@ -33,6 +32,5 @@ python_configure_all() {
 }
 
 python_test() {
-	cd xrayutilities/tests
-	$PYTHON -m unittest discover || die
+	$PYTHON setup.py test || die
 }
diff --git a/sci-physics/xrayutilities/xrayutilities-9999.ebuild b/sci-physics/xrayutilities/xrayutilities-9999.ebuild
index cf28a33..70b102b 100644
--- a/sci-physics/xrayutilities/xrayutilities-9999.ebuild
+++ b/sci-physics/xrayutilities/xrayutilities-9999.ebuild
@@ -1,31 +1,31 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 EGIT_REPO_URI="git://git.code.sf.net/p/xrayutilities/code"
 
-inherit distutils-r1 git-2 eutils
+inherit distutils-r1 git-r3 eutils
 
 DESCRIPTION="package with useful scripts for X-ray diffraction physicists"
-HOMEPAGE="http://sourceforge.net/projects/xrayutilities"
-EGIT_REPO_URI="git://git.code.sf.net/p/xrayutilities/code"
+HOMEPAGE="http://xrayutilities.sourceforce.org"
+EGIT_REPO_URI="https://github.com/dkriegner/xrayutilities.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="openmp test"
 
-DEPEND="dev-python/numpy
-	sci-libs/scipy
-	dev-python/h5py
+RDEPEND=">=dev-python/numpy-1.8
+	>=sci-libs/scipy-0.13.0
+	dev-python/h5py"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	>sys-devel/gcc-4.2:*[openmp?]"
-RDEPEND="${DEPEND}"
 
-DOCS=( README.txt CHANGES.txt xrayutilities.pdf )
-EXAMPLES=( examples/. )
+DOCS=( README.md CHANGES.txt xrayutilities.pdf )
 
 python_configure_all() {
 	if ! use openmp; then
@@ -34,6 +34,5 @@ python_configure_all() {
 }
 
 python_test() {
-	cd xrayutilities/tests
-	$PYTHON -m unittest discover || die
+	$PYTHON setup.py test || die
 }