Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Kriegner <dominik.kriegner@aol.at>2013-10-25 01:24:24 +0200
committerDominik Kriegner <dominik.kriegner@aol.at>2013-10-25 01:24:24 +0200
commit3075cb87864ad4e95ef86884f95f040cfca7e67b (patch)
tree9671e81e27e8ea0fe0fb02d842c1816a4ca32580
parentxrayutilities version bump + python3 (diff)
downloadanaximander-3075cb87864ad4e95ef86884f95f040cfca7e67b.tar.gz
anaximander-3075cb87864ad4e95ef86884f95f040cfca7e67b.tar.bz2
anaximander-3075cb87864ad4e95ef86884f95f040cfca7e67b.zip
bump xrayutilities to 1.0.3
Diffstat
-rw-r--r--sci-physics/xrayutilities/Manifest10
-rw-r--r--sci-physics/xrayutilities/files/xrayutilities-1.0.3-python3.patch (renamed from sci-physics/xrayutilities/files/xrayutilities-1.0.2-python3.patch)20
-rw-r--r--sci-physics/xrayutilities/files/xrayutilities-9999-python3.patch20
-rw-r--r--sci-physics/xrayutilities/xrayutilities-1.0.3.ebuild (renamed from sci-physics/xrayutilities/xrayutilities-1.0.2.ebuild)5
-rw-r--r--sci-physics/xrayutilities/xrayutilities-9999.ebuild6
5 files changed, 25 insertions, 36 deletions
diff --git a/sci-physics/xrayutilities/Manifest b/sci-physics/xrayutilities/Manifest
index cabdff3..1d9ba8f 100644
--- a/sci-physics/xrayutilities/Manifest
+++ b/sci-physics/xrayutilities/Manifest
@@ -1,5 +1,5 @@
-AUX xrayutilities-1.0.2-python3.patch 17984 SHA256 834a4191eb63173d6386652a6e7cbcedc21ec5b56a77a118aedd880ae5574059 SHA512 0e298455ad9babbed5769995081662826cc24d80bcffec89fc07484ad4ba0d656eda0a021996c9f7b1f2b294bdf2519544900faf5afc76982ec2b6d99924cbb4 WHIRLPOOL ca57893ed368d9e8f0a219e50f3d05969ff60b97a57186cdf2b7a16867c46995b41740dcbb0cf23583f96d3f96272ab2971bd25d59031b2ed4c799c04f1478f9
-AUX xrayutilities-9999-python3.patch 17984 SHA256 834a4191eb63173d6386652a6e7cbcedc21ec5b56a77a118aedd880ae5574059 SHA512 0e298455ad9babbed5769995081662826cc24d80bcffec89fc07484ad4ba0d656eda0a021996c9f7b1f2b294bdf2519544900faf5afc76982ec2b6d99924cbb4 WHIRLPOOL ca57893ed368d9e8f0a219e50f3d05969ff60b97a57186cdf2b7a16867c46995b41740dcbb0cf23583f96d3f96272ab2971bd25d59031b2ed4c799c04f1478f9
-DIST xrayutilities-1.0.2.tar.gz 9528563 SHA256 12a7517741980412c8ee13a35aa6d911f46bcc0786767127cb934365a1fa71b8 SHA512 4d664c7bf4c9721e5c42fd29af3e51b133ba75e987f5e2f9cede6d6649193d457cf33e2beac27d6a97b66860d8520102e49e202bc280a08d3cb0e3e5dedff910 WHIRLPOOL 61cf2555126f9738c0641e190bdfc370c6c2dc8c826481e264ccbdbdefe5ef310e2bab2df21e88daf8eaf8a7e3ff6d1a2ee779ac96b0cdea0620b6e2cf1df16b
-EBUILD xrayutilities-1.0.2.ebuild 1048 SHA256 9866b4e24bdc63ae6b26b3f46d3bdba49e19395a03e73aaba08de99ac84d0a94 SHA512 79a1c4f12e63cfe43b837e8d95e518a7b8f416e4d0831c266e6e6da63b9e30c7e49b1c8d1c7f6cfa700f10918aa3062208b7fa96abba4eb65f6801a09e14553f WHIRLPOOL ecad9e32f4d5e9123d31e60c31139fc41744d35070e7f14e1f672239a422679607aed54aaf29a7ad3e7e511425b1c542d3322bb36d3fb18b0c9e2ad80490053c
-EBUILD xrayutilities-9999.ebuild 1104 SHA256 856e632bb8f12d9ddd8d484f20d58f6f9395f66c5fe0dc5f020fa4ee85b8ff8b SHA512 ef38e2ed886bc5769a029d418fc24d9a7110a9f7e448179aaedcb5149529304a0bc8391ec69fe574ef05f0d6247142b6f8f40fd591c4f3df1fdb8886739c6052 WHIRLPOOL e8af2bc65127310bd337c83813021178b8b9a1dc07da6fd443b4ba86a7ef92f8dac6d6aa12ef7f3edf362a03dbef405413af8b4195754dac3114985eed07578f
+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
diff --git a/sci-physics/xrayutilities/files/xrayutilities-1.0.2-python3.patch b/sci-physics/xrayutilities/files/xrayutilities-1.0.3-python3.patch
index 9e2068c..f0e3326 100644
--- a/sci-physics/xrayutilities/files/xrayutilities-1.0.2-python3.patch
+++ b/sci-physics/xrayutilities/files/xrayutilities-1.0.3-python3.patch
@@ -63,7 +63,7 @@
if k not in ['wl','deg','UB','delta']:
raise Exception("unknown keyword argument given: allowed are 'delta': angle offsets, 'wl': x-ray wavelength, 'UB': orientation/orthonormalization matrix, 'deg': flag to tell if angles are in degrees")
-@@ -475,12 +475,12 @@
+@@ -478,12 +478,12 @@
roi: region of interest for the detector pixels; e.g. [100,900]
"""
@@ -78,7 +78,7 @@
raise InputError("QConversion: incorrect detector direction type or syntax (%s)" %repr(detectorDir))
if not circleSyntax.search(detectorDir):
raise InputError("QConversion: incorrect detector direction syntax (%s)" %detectorDir)
-@@ -554,7 +554,7 @@
+@@ -557,7 +557,7 @@
if not self._linear_init:
raise Exception("QConversion: linear detector not initialized -> call Ang2Q.init_linear(...)")
@@ -87,7 +87,7 @@
if k not in ['wl','deg','UB','delta','Nav','roi']:
raise Exception("unknown keyword argument given: allowed are 'delta': angle offsets, 'wl': x-ray wavelength, 'UB': orientation/orthonormalization matrix, 'deg': flag to tell if angles are in degrees, 'Nav': number of channels for block-averaging, 'roi': region of interest")
-@@ -699,17 +699,17 @@
+@@ -702,17 +702,17 @@
roi: region of interest for the detector pixels; e.g. [100,900,200,800]
"""
@@ -108,7 +108,7 @@
raise InputError("QConversion: incorrect detector direction2 type or syntax (%s)" %repr(detectorDir2))
if not circleSyntax.search(detectorDir2):
raise InputError("QConversion: incorrect detector direction2 syntax (%s)" %detectorDir2)
-@@ -801,7 +801,7 @@
+@@ -804,7 +804,7 @@
if not self._area_init:
raise Exception("QConversion: area detector not initialized -> call Ang2Q.init_area(...)")
@@ -117,7 +117,7 @@
if k not in ['wl','deg','UB','delta','Nav','roi']:
raise Exception("unknown keyword argument given: allowed are 'delta': angle offsets, 'wl': x-ray wavelength, 'UB': orientation/orthonormalization matrix, 'deg': flag to tell if angles are in degrees, 'Nav': number of channels for block-averaging, 'roi': region of interest")
-@@ -953,7 +953,7 @@
+@@ -956,7 +956,7 @@
the en keyword overrulls the wl keyword
"""
@@ -126,7 +126,7 @@
if k not in ['qconv','wl','en']:
raise Exception("unknown keyword argument given: allowed are 'en': for x-ray energy, 'wl': x-ray wavelength, 'qconv': reciprocal space conversion.")
-@@ -1118,7 +1118,7 @@
+@@ -1121,7 +1121,7 @@
"""
@@ -135,7 +135,7 @@
if k not in ['U','B','mat','dettype']:
raise Exception("unknown keyword argument given: allowed are 'B': orthonormalization matrix, 'U': orientation matrix, 'mat': material object, 'dettype': string with detector type")
-@@ -1325,7 +1325,7 @@
+@@ -1328,7 +1328,7 @@
pdi_d: offset ot the diffracted beam from the scattering plane due to refraction
"""
@@ -144,7 +144,7 @@
if k not in ['trans','deg','geometry','refrac','mat','fi','fd','full_output']:
raise Exception("unknown keyword argument given: see documentation for details")
-@@ -1586,7 +1586,7 @@
+@@ -1589,7 +1589,7 @@
twotheta: scattering angle (detector)
"""
@@ -153,7 +153,7 @@
if k not in ['trans','deg']:
raise Exception("unknown keyword argument given: allowed are 'trans': coordinate transformation flag, 'deg': degree-flag")
-@@ -1730,7 +1730,7 @@
+@@ -1733,7 +1733,7 @@
beta: exit angle from surface (at the moment always 0)
"""
@@ -162,7 +162,7 @@
if k not in ['trans','deg']:
raise Exception("unknown keyword argument given: allowed are 'trans': coordinate transformation flag, 'deg': degree-flag")
-@@ -1891,7 +1891,7 @@
+@@ -1894,7 +1894,7 @@
gamma: scattering angle
"""
diff --git a/sci-physics/xrayutilities/files/xrayutilities-9999-python3.patch b/sci-physics/xrayutilities/files/xrayutilities-9999-python3.patch
index 9e2068c..f0e3326 100644
--- a/sci-physics/xrayutilities/files/xrayutilities-9999-python3.patch
+++ b/sci-physics/xrayutilities/files/xrayutilities-9999-python3.patch
@@ -63,7 +63,7 @@
if k not in ['wl','deg','UB','delta']:
raise Exception("unknown keyword argument given: allowed are 'delta': angle offsets, 'wl': x-ray wavelength, 'UB': orientation/orthonormalization matrix, 'deg': flag to tell if angles are in degrees")
-@@ -475,12 +475,12 @@
+@@ -478,12 +478,12 @@
roi: region of interest for the detector pixels; e.g. [100,900]
"""
@@ -78,7 +78,7 @@
raise InputError("QConversion: incorrect detector direction type or syntax (%s)" %repr(detectorDir))
if not circleSyntax.search(detectorDir):
raise InputError("QConversion: incorrect detector direction syntax (%s)" %detectorDir)
-@@ -554,7 +554,7 @@
+@@ -557,7 +557,7 @@
if not self._linear_init:
raise Exception("QConversion: linear detector not initialized -> call Ang2Q.init_linear(...)")
@@ -87,7 +87,7 @@
if k not in ['wl','deg','UB','delta','Nav','roi']:
raise Exception("unknown keyword argument given: allowed are 'delta': angle offsets, 'wl': x-ray wavelength, 'UB': orientation/orthonormalization matrix, 'deg': flag to tell if angles are in degrees, 'Nav': number of channels for block-averaging, 'roi': region of interest")
-@@ -699,17 +699,17 @@
+@@ -702,17 +702,17 @@
roi: region of interest for the detector pixels; e.g. [100,900,200,800]
"""
@@ -108,7 +108,7 @@
raise InputError("QConversion: incorrect detector direction2 type or syntax (%s)" %repr(detectorDir2))
if not circleSyntax.search(detectorDir2):
raise InputError("QConversion: incorrect detector direction2 syntax (%s)" %detectorDir2)
-@@ -801,7 +801,7 @@
+@@ -804,7 +804,7 @@
if not self._area_init:
raise Exception("QConversion: area detector not initialized -> call Ang2Q.init_area(...)")
@@ -117,7 +117,7 @@
if k not in ['wl','deg','UB','delta','Nav','roi']:
raise Exception("unknown keyword argument given: allowed are 'delta': angle offsets, 'wl': x-ray wavelength, 'UB': orientation/orthonormalization matrix, 'deg': flag to tell if angles are in degrees, 'Nav': number of channels for block-averaging, 'roi': region of interest")
-@@ -953,7 +953,7 @@
+@@ -956,7 +956,7 @@
the en keyword overrulls the wl keyword
"""
@@ -126,7 +126,7 @@
if k not in ['qconv','wl','en']:
raise Exception("unknown keyword argument given: allowed are 'en': for x-ray energy, 'wl': x-ray wavelength, 'qconv': reciprocal space conversion.")
-@@ -1118,7 +1118,7 @@
+@@ -1121,7 +1121,7 @@
"""
@@ -135,7 +135,7 @@
if k not in ['U','B','mat','dettype']:
raise Exception("unknown keyword argument given: allowed are 'B': orthonormalization matrix, 'U': orientation matrix, 'mat': material object, 'dettype': string with detector type")
-@@ -1325,7 +1325,7 @@
+@@ -1328,7 +1328,7 @@
pdi_d: offset ot the diffracted beam from the scattering plane due to refraction
"""
@@ -144,7 +144,7 @@
if k not in ['trans','deg','geometry','refrac','mat','fi','fd','full_output']:
raise Exception("unknown keyword argument given: see documentation for details")
-@@ -1586,7 +1586,7 @@
+@@ -1589,7 +1589,7 @@
twotheta: scattering angle (detector)
"""
@@ -153,7 +153,7 @@
if k not in ['trans','deg']:
raise Exception("unknown keyword argument given: allowed are 'trans': coordinate transformation flag, 'deg': degree-flag")
-@@ -1730,7 +1730,7 @@
+@@ -1733,7 +1733,7 @@
beta: exit angle from surface (at the moment always 0)
"""
@@ -162,7 +162,7 @@
if k not in ['trans','deg']:
raise Exception("unknown keyword argument given: allowed are 'trans': coordinate transformation flag, 'deg': degree-flag")
-@@ -1891,7 +1891,7 @@
+@@ -1894,7 +1894,7 @@
gamma: scattering angle
"""
diff --git a/sci-physics/xrayutilities/xrayutilities-1.0.2.ebuild b/sci-physics/xrayutilities/xrayutilities-1.0.3.ebuild
index 209c669..82d3933 100644
--- a/sci-physics/xrayutilities/xrayutilities-1.0.2.ebuild
+++ b/sci-physics/xrayutilities/xrayutilities-1.0.3.ebuild
@@ -43,8 +43,3 @@ python_test() {
cd xrayutilities/tests
$PYTHON -m unittest discover || die
}
-
-src_install() {
- distutils-r1_src_install
- doinfo doc/xrayutilities.info
-}
diff --git a/sci-physics/xrayutilities/xrayutilities-9999.ebuild b/sci-physics/xrayutilities/xrayutilities-9999.ebuild
index 04745ce..f2300be 100644
--- a/sci-physics/xrayutilities/xrayutilities-9999.ebuild
+++ b/sci-physics/xrayutilities/xrayutilities-9999.ebuild
@@ -44,9 +44,3 @@ python_test() {
cd xrayutilities/tests
$PYTHON -m unittest discover || die
}
-
-src_install() {
- distutils-r1_src_install
- doinfo doc/xrayutilities.info
-}
-