From dfc7858565f956fe9802397a23e2d783edf063fb Mon Sep 17 00:00:00 2001 From: Dominik Kriegner Date: Thu, 16 Apr 2015 01:14:25 +0200 Subject: update xrayutilities version bump and repoman fixes --- sci-physics/xrayutilities/Manifest | 6 +-- .../xrayutilities/xrayutilities-1.0.3.ebuild | 45 ---------------------- .../xrayutilities/xrayutilities-1.1.1.ebuild | 38 ++++++++++++++++++ .../xrayutilities/xrayutilities-9999.ebuild | 17 +++----- 4 files changed, 46 insertions(+), 60 deletions(-) delete mode 100644 sci-physics/xrayutilities/xrayutilities-1.0.3.ebuild create mode 100644 sci-physics/xrayutilities/xrayutilities-1.1.1.ebuild diff --git a/sci-physics/xrayutilities/Manifest b/sci-physics/xrayutilities/Manifest index 1d9ba8f..083b9b6 100644 --- a/sci-physics/xrayutilities/Manifest +++ b/sci-physics/xrayutilities/Manifest @@ -1,5 +1,5 @@ AUX xrayutilities-1.0.3-python3.patch 17984 SHA256 fd3fde5d21669cd4d56b0b451fddc750f1eea5e409300450f75079d4594b6c91 SHA512 3a5055d14e4c69a2a867bf6a23daddfca0d3c5fb0934d67b84d442d6ea53852b700cf9e57e71b5d3a31b2353777e822d735d53aa1fe05ae5abc95cefce8a861b WHIRLPOOL 87cf4ae234e54dc9f37f46e2bc25ca570af377b25dc729eae1eaa9ab708fe440f0ee351936ca9675ed3228beee9e928207961a1c5e84f7c7eae27b57d343eb19 AUX xrayutilities-9999-python3.patch 17984 SHA256 fd3fde5d21669cd4d56b0b451fddc750f1eea5e409300450f75079d4594b6c91 SHA512 3a5055d14e4c69a2a867bf6a23daddfca0d3c5fb0934d67b84d442d6ea53852b700cf9e57e71b5d3a31b2353777e822d735d53aa1fe05ae5abc95cefce8a861b WHIRLPOOL 87cf4ae234e54dc9f37f46e2bc25ca570af377b25dc729eae1eaa9ab708fe440f0ee351936ca9675ed3228beee9e928207961a1c5e84f7c7eae27b57d343eb19 -DIST xrayutilities-1.0.3.tar.gz 9428583 SHA256 a31599b41e03a5f15fa30d00ec466731e4e894573d1d47ee405192f5967ec24b SHA512 32bdd93a254862a3d7ac59fe6ab1966600da25338f5880b24e90a7b2159ff0ab4abce7f1b1e7a61fa9682234b824f109448792c25e94c2bf2a9c10729c0870a8 WHIRLPOOL 637f86fdad2ae083aa33b826370bb21d5ce91c439c92df14decc4ddd4d695c006e0ac6d4aa5f2d09ea24dacc0f10f32e41d149ed140982fcee42d0bde1a80f82 -EBUILD xrayutilities-1.0.3.ebuild 971 SHA256 67b4ac23440be1d3d0bfb0e54bcaee50e1ccfcbe84e9887f66ec6d3cd4963493 SHA512 41fd070fae73c2a3082f4e461ac0b136005d6a78ea842bed5690a3207d68c8a063da5af9b9bc89a58219adbdf0fb807b98cde158326611b7f6715313eba0d232 WHIRLPOOL 44499b3fde15ada9983ff305c4869f16ff72f5fc9c3238a29be47b0d53c4abc34ce3749a835c3253a320cf56e0de9561294cc7370f9e72d7ac24b083270ae82f -EBUILD xrayutilities-9999.ebuild 1026 SHA256 026665448f74bff5aecc8886fcd33ad59f329df295a36712146ffdbaeeb48c0e SHA512 885697ea0f986055ed7e1bdc823498b9476352e5b05d96f1f06069e90ecba125f4dacd252861eca6709242d2695d2ea9203766789ef7b93957c4105b167561d9 WHIRLPOOL 8665fde286b22ddc8e196b879534a274963aee61fb5211d13dd4e8c30976a7eefcc9fb5edb34da19c8bee731986ea7c89eec888089e841e1a30a5704b0aa8c9a +DIST xrayutilities-1.1.1.tar.gz 11556155 SHA256 b4150e94c5644647be979b2526d085fb5b4c27377bc0be7c84a15634375bc1db SHA512 827e8ca73b6c3183b5ae8dd801a21cc7e48e1918ccf47f69728eb2b44eda978c2f3f9aaaadc6e7e061cbd91eb821f1d1122e399b2a89a0ee724a95dba305dcf2 WHIRLPOOL 95ed892939da7a4c4570c1ddd0cde36216a649c7e9ef4064b82f5523ce67c85d05cc51a11812d480c4662c0a070545808f554cf1aeefaa4e4b71234fd737b9eb +EBUILD xrayutilities-1.1.1.ebuild 795 SHA256 f0362aa677f8e022462b6c0011b9489b17be37fdfea61fd96cda27a80558614f SHA512 ac37539766b5c635f4e6703dc4718b33e7ab13cfcaacbce998ece91acad48c27054c72df19e74078dee489de9b41c2fa0d70bb8fbfd71e4982a4bf17e8ba59c7 WHIRLPOOL 837432839bb6b915d3f9fca09d6b60c8a000446f5d34fc13f4b82c0352bff38064f3763c544d5a536991a2c87f03dc9d20f111603af40daf812c792d4776f215 +EBUILD xrayutilities-9999.ebuild 874 SHA256 8c633ad27bf57f4fcf973794395c75449e5034dad68c9e89bcef963d18f0aa60 SHA512 12a808ddf6a7351d4ff743f2c537335195b7b16b3610ec702a3ecfacd88aa30c610f43e692305800948a14d24570bccacea8dac30229cbe784f6e2c8c05576c9 WHIRLPOOL 5981ae8add4b7aaaec1033c64b1ba924d1388f7f8386226cac48cd23793e296b0daa684620c9807a9ded5a1c0bb78a0d4ed29710243c1bb1fca56985e4d86b89 diff --git a/sci-physics/xrayutilities/xrayutilities-1.0.3.ebuild b/sci-physics/xrayutilities/xrayutilities-1.0.3.ebuild deleted file mode 100644 index 82d3933..0000000 --- a/sci-physics/xrayutilities/xrayutilities-1.0.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_2 ) - -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 test" - -DEPEND="dev-python/numpy - sci-libs/scipy - dev-python/pytables - >sys-devel/gcc-4.2[openmp?]" -RDEPEND="${DEPEND}" - -DOCS=(README.txt CHANGES.txt xrayutilities.pdf) -EXAMPLES=( examples/. ) - -python_prepare() { - distutils-r1_python_prepare - if [[ ${EPYTHON} == python3* ]]; then - epatch "${FILESDIR}/${P}-python3.patch" - fi -} - -python_configure_all() { - if ! use openmp; then - mydistutilsargs=( --without-openmp ) - fi -} - -python_test() { - cd xrayutilities/tests - $PYTHON -m unittest discover || die -} diff --git a/sci-physics/xrayutilities/xrayutilities-1.1.1.ebuild b/sci-physics/xrayutilities/xrayutilities-1.1.1.ebuild new file mode 100644 index 0000000..c44dbd3 --- /dev/null +++ b/sci-physics/xrayutilities/xrayutilities-1.1.1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +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" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="openmp test" + +DEPEND="dev-python/numpy + sci-libs/scipy + dev-python/pytables + >sys-devel/gcc-4.2:*[openmp?]" +RDEPEND="${DEPEND}" + +DOCS=(README.txt CHANGES.txt xrayutilities.pdf) +EXAMPLES=( examples/. ) + +python_configure_all() { + if ! use openmp; then + 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 f2300be..1fe8913 100644 --- a/sci-physics/xrayutilities/xrayutilities-9999.ebuild +++ b/sci-physics/xrayutilities/xrayutilities-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_2 ) +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) EGIT_REPO_URI="git://git.code.sf.net/p/xrayutilities/code" inherit distutils-r1 git-2 eutils @@ -19,21 +19,14 @@ KEYWORDS="" IUSE="openmp test" DEPEND="dev-python/numpy - sci-libs/scipy - dev-python/pytables - >sys-devel/gcc-4.2[openmp?]" + sci-libs/scipy + dev-python/pytables + >sys-devel/gcc-4.2:*[openmp?]" RDEPEND="${DEPEND}" DOCS=( README.txt CHANGES.txt xrayutilities.pdf ) EXAMPLES=( examples/. ) -python_prepare() { - distutils-r1_python_prepare - if [[ ${EPYTHON} == python3* ]]; then - epatch "${FILESDIR}/${P}-python3.patch" - fi -} - python_configure_all() { if ! use openmp; then mydistutilsargs=( --without-openmp ) -- cgit v1.2.3-65-gdbad