update xrayutilities ebuild

4 files changed, 47 insertions, 39 deletions

diff --git a/sci-physics/xrayutilities/Manifest b/sci-physics/xrayutilities/Manifest
index 6c13a1f..d51615d 100644
--- a/sci-physics/xrayutilities/Manifest
+++ b/sci-physics/xrayutilities/Manifest
@@ -1,2 +1,3 @@
-AUX remove_python_package_install_from_scons.patch 896 SHA256 2efa6ac77fc14d1b12d05e564e947da672f49e28c1d9e2d28a83bdb8f312bf79 SHA512 ffb335ebe1d618ed8959b73cd188154974c46e11ea12ca793aefe833de65b4288a82b5d1f9d11e75aef2db1b0a009f7b74b14c6fe18c4da9af7721de78bf8764 WHIRLPOOL 1e77e74b33030f371dceb91d21bbc88f2484290a532fd3af5f6763c98909245b19a77a3252a43de690782daf304ee3d120d2735b7f70719927f5348457e9fd86
-EBUILD xrayutilities-9999.ebuild 951 SHA256 3a964863e63f386d22647d3fc52810ab32b84892cac12262124f0e4282819a12 SHA512 8e88a61341f4fb93751b41a1fc281d4ca0918eaa35e8f4ea804002959a13e1fe21c9734de51bd70191c18ff60eeedbed3fd6f4df1d2fdd8e2067a2585fc7a529 WHIRLPOOL 01b060d6cf1ccfba2d98e06c52d590fbd886e2500afb88a07ff0178d6c3462fdfbd779fef75715976e203c988e4b1c15ed7e3b82cfef38f419ba4694d8e4c33a
+DIST xrayutilities-0.99.tar.gz 9342137 SHA256 bbe6bcb6bcf630c3482f617381f1424595752c76bc36b8d712d38519f6d12c7a SHA512 d901b4e301b62239bfbed5f290cafd15e486a298dc7a305fc3d7cfaa3751f8a090585aa23c838cc74523e8927802e64c1347c51f1a5713515d54f5b548bc763b WHIRLPOOL 9b4ed71f9b4a6176bbacc32df196026957559d09c0f429d4e3ec150d7c3466efc65184013cd36b2d8ac40a53697464724352a4f090ff7c25c13e0033a2b59f06
+EBUILD xrayutilities-0.99.ebuild 703 SHA256 70906ac68841dce1958e76cfd2a5a96a86a19e98472cf05916ba7478c3600ea4 SHA512 dfdd5fa3ce3e9d50b83c267efb196507bec57facfcafacf9aa372c555369b5dbd9f8af7e2653175ba6fbf95c39a6f74c3c82c2d46aa28f39999bd84a5e08b8d8 WHIRLPOOL 887907588fd9d4da60fe7bb98ff171ea556d74df2b7d0f67e2c5287f2a8face349697a4e36da4fec5de36df43e22efb98c605e252e0dc535f24880acda4ff807
+EBUILD xrayutilities-9999.ebuild 713 SHA256 dcf3e704c3685e74a1c7143562ba0cd06e18371aedc06dc5d876b053b6ed7030 SHA512 69d450f6aede37bda6af906abbb8224031ce6f90932f7690d14be6a6b80ecffea4ec70b3cc90de579863b61ead80356c3dfde22dfea29eca24717a36c9b8ad44 WHIRLPOOL 4cee1af87cf96e2c89cb001ddf7a8bb3c38561b65bd3eb6b0f4e6c11adc524f1f9f202da2e876511623d23edc8d6d9447d4bfb2f395666744595d21f82c45403
diff --git a/sci-physics/xrayutilities/files/remove_python_package_install_from_scons.patch b/sci-physics/xrayutilities/files/remove_python_package_install_from_scons.patch
deleted file mode 100644
index 2552b19..0000000
--- a/sci-physics/xrayutilities/files/remove_python_package_install_from_scons.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- SConstruct.orig	2012-03-21 16:56:45.496562596 +0100
-+++ SConstruct	2012-03-21 16:57:03.643331454 +0100
-@@ -81,13 +81,6 @@
-     fid.close()
-     print("create clib_path.conf file (libfile: %s)"%(libpath))
-     #run python installer
--    if platform.linux_distribution(full_distribution_name=0)[0] in ["Ubuntu","debian"]:
--        python_installer = subprocess.Popen("python setup.py install --prefix=%s --install-layout=deb" %(env['PREFIX']),shell=True)
--    elif "win" in os.sys.platform or env['DESTDIR'] == "" or env['DESTDIR'] == "${DESTDIR}":
--        python_installer = subprocess.Popen("python setup.py install --prefix=%s"%(env['PREFIX']),shell=True)
--    else:
--        python_installer = subprocess.Popen("python setup.py install --root=%s --prefix=%s" %(env['DESTDIR'],env['PREFIX']),shell=True)
--    python_installer.wait()
- 
- ############################
- #    config like things
diff --git a/sci-physics/xrayutilities/xrayutilities-0.99.ebuild b/sci-physics/xrayutilities/xrayutilities-0.99.ebuild
new file mode 100644
index 0000000..e2cf910
--- /dev/null
+++ b/sci-physics/xrayutilities/xrayutilities-0.99.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+
+inherit eutils 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"
+
+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)
+
+python_configure_all() {
+	if ! use openmp; then
+		mydistutilsargs=( --without-openmp )
+	fi
+}
diff --git a/sci-physics/xrayutilities/xrayutilities-9999.ebuild b/sci-physics/xrayutilities/xrayutilities-9999.ebuild
index 241afd1..84e8a48 100644
--- a/sci-physics/xrayutilities/xrayutilities-9999.ebuild
+++ b/sci-physics/xrayutilities/xrayutilities-9999.ebuild
@@ -2,10 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
-SUPPORT_PYTHON_ABIS="1"
+EAPI=5
 
-inherit eutils scons-utils distutils git-2
+PYTHON_COMPAT=( python{2_7,3_3} )
+
+inherit eutils distutils-r1 git-2
 
 DESCRIPTION="package with useful scripts for X-ray diffraction physicists"
 HOMEPAGE="http://sourceforge.net/projects/xrayutilities"
@@ -13,29 +14,19 @@ EGIT_REPO_URI="git://git.code.sf.net/p/xrayutilities/code"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
+KEYWORDS=""
+IUSE="openmp"
 
 DEPEND="dev-python/numpy
         sci-libs/scipy
         dev-python/pytables
-		app-text/texlive
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-mathextra
-		dev-texlive/texlive-science"
+		>sys-devel/gcc-4.2[openmp?]"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-    epatch "${FILESDIR}"/remove_python_package_install_from_scons.patch
-}
-
-src_compile() {
-    escons
-}
+DOCS=(README.txt CHANGES.txt xrayutilities.pdf)
 
-src_install() {
-    # install c-library using patched SConstruct
-    escons DESTDIR="${D}" install
-	# install python package to system python folder
-    distutils_src_install
+python_configure_all() {
+	if ! use openmp; then
+		mydistutilsargs=( --without-openmp )
+	fi
 }