commit:     5f30376c31a4e93fa6a839d51ca832b6f113bc7a
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Jan 29 21:41:10 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jan 29 21:41:10 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5f30376c

sci-libs/xraylib: version bump, EAPI bump, add ruby and lua targets

drop java support, uses gradle now which is not supported
by portage at the moment

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-libs/xraylib/xraylib-2.16.0.ebuild | 83 ------------------------------
 sci-libs/xraylib/xraylib-3.1.0.ebuild  | 83 ------------------------------
 sci-libs/xraylib/xraylib-4.0.0.ebuild  | 94 ++++++++++++++++++++++++++++++++++
 3 files changed, 94 insertions(+), 166 deletions(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild 
b/sci-libs/xraylib/xraylib-2.16.0.ebuild
deleted file mode 100644
index 97905e356..000000000
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=2003
-PYTHON_COMPAT=( python2_7 ) # python 3 supported by github master
-
-inherit eutils autotools-utils python-single-r1 java-pkg-opt-2 fortran-2
-
-DESCRIPTION="X-ray matter interaction cross sections for X-ray fluorescence 
library"
-HOMEPAGE="https://github.com/tschoonj/xraylib";
-SRC_URI="https://github.com/tschoonj/xraylib/archive/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples fortran java lua perl python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-       java? ( >=virtual/jre-1.4:* )
-       lua? ( dev-lang/lua:0 )
-       perl? ( dev-lang/perl )
-       python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
-       java? ( >=virtual/jdk-1.4:* )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-DOCS=(AUTHORS BUGS Changelog README TODO)
-
-pkg_setup() {
-       fortran-2_pkg_setup
-       java-pkg-opt-2_pkg_setup
-       use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       java-pkg-opt-2_src_prepare
-       autotools-utils_src_prepare
-}
-
-src_configure() {
-       local myeconfargs=(
-               --disable-idl
-               $(use_enable fortran fortran2003)
-               $(use_enable java)
-               $(use_enable lua)
-               $(use_enable perl)
-               $(use_enable python)
-               $(use_enable python python-integration)
-       )
-       autotools-utils_src_configure
-}
-
-src_compile() {
-       # see https://github.com/tschoonj/xraylib/issues/11
-       if use fortran || use java; then
-               MAKEOPTS+=" -j1"
-       fi
-       autotools-utils_src_compile
-}
-
-src_install() {
-       autotools-utils_src_install
-
-       if use examples; then
-               insinto /usr/share/doc/${PF}/examples
-               doins example/*.c example/*.cpp
-               use java && doins example/*.java
-               use lua && doins example/*.lua
-               use perl && doins example/*.pl
-               use python && doins example/*.py
-               docompress -x /usr/share/doc/${PF}/examples # Don't compress 
examples
-       fi
-
-       use java && java-pkg_regso /usr/share/xraylib/java/libxraylib.so
-}

diff --git a/sci-libs/xraylib/xraylib-3.1.0.ebuild 
b/sci-libs/xraylib/xraylib-3.1.0.ebuild
deleted file mode 100644
index 97905e356..000000000
--- a/sci-libs/xraylib/xraylib-3.1.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=2003
-PYTHON_COMPAT=( python2_7 ) # python 3 supported by github master
-
-inherit eutils autotools-utils python-single-r1 java-pkg-opt-2 fortran-2
-
-DESCRIPTION="X-ray matter interaction cross sections for X-ray fluorescence 
library"
-HOMEPAGE="https://github.com/tschoonj/xraylib";
-SRC_URI="https://github.com/tschoonj/xraylib/archive/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples fortran java lua perl python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-       java? ( >=virtual/jre-1.4:* )
-       lua? ( dev-lang/lua:0 )
-       perl? ( dev-lang/perl )
-       python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
-       java? ( >=virtual/jdk-1.4:* )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-DOCS=(AUTHORS BUGS Changelog README TODO)
-
-pkg_setup() {
-       fortran-2_pkg_setup
-       java-pkg-opt-2_pkg_setup
-       use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       java-pkg-opt-2_src_prepare
-       autotools-utils_src_prepare
-}
-
-src_configure() {
-       local myeconfargs=(
-               --disable-idl
-               $(use_enable fortran fortran2003)
-               $(use_enable java)
-               $(use_enable lua)
-               $(use_enable perl)
-               $(use_enable python)
-               $(use_enable python python-integration)
-       )
-       autotools-utils_src_configure
-}
-
-src_compile() {
-       # see https://github.com/tschoonj/xraylib/issues/11
-       if use fortran || use java; then
-               MAKEOPTS+=" -j1"
-       fi
-       autotools-utils_src_compile
-}
-
-src_install() {
-       autotools-utils_src_install
-
-       if use examples; then
-               insinto /usr/share/doc/${PF}/examples
-               doins example/*.c example/*.cpp
-               use java && doins example/*.java
-               use lua && doins example/*.lua
-               use perl && doins example/*.pl
-               use python && doins example/*.py
-               docompress -x /usr/share/doc/${PF}/examples # Don't compress 
examples
-       fi
-
-       use java && java-pkg_regso /usr/share/xraylib/java/libxraylib.so
-}

diff --git a/sci-libs/xraylib/xraylib-4.0.0.ebuild 
b/sci-libs/xraylib/xraylib-4.0.0.ebuild
new file mode 100644
index 000000000..e89a19dde
--- /dev/null
+++ b/sci-libs/xraylib/xraylib-4.0.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+AUTOTOOLS_AUTORECONF=true
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=2003
+PYTHON_COMPAT=( python3_{7,8,9} ) # python 3 supported by github master
+LUA_COMPAT=( lua5-{1..3} )
+USE_RUBY="ruby27 ruby30"
+
+inherit python-single-r1 lua-single ruby-single java-pkg-opt-2 fortran-2
+
+DESCRIPTION="X-ray matter interaction cross sections for X-ray fluorescence 
library"
+HOMEPAGE="https://github.com/tschoonj/xraylib";
+SRC_URI="http://lvserver.ugent.be/xraylib/${P}.tar.gz";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+#IUSE="examples fortran java lua perl python"
+# jave now uses the gradle build system which is not supported by portage
+IUSE="examples fortran lua perl php python ruby"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+       lua? ( ${LUA_DEPS} )
+       perl? ( dev-lang/perl )
+       php? ( <dev-lang/php-8:* )
+       python? (
+               ${PYTHON_DEPS}
+               $(python_gen_cond_dep \
+                       'dev-python/numpy[${PYTHON_USEDEP}]'
+               )
+       )
+       ruby? ( ${RUBY_DEPS} )
+" # java? ( >=virtual/jre-1.7:* )
+
+DEPEND="${RDEPEND}"
+# java? ( >=virtual/jdk-1.7:* )
+
+DOCS=( AUTHORS Changelog README TODO )
+
+pkg_setup() {
+       fortran-2_pkg_setup
+       java-pkg-opt-2_pkg_setup
+       use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+       econf \
+               --disable-idl \
+               $(use_enable fortran fortran2003) \
+               $(use_enable lua) \
+               $(use_enable perl) \
+               $(use_enable perl perl-integration) \
+               $(use_enable php) \
+               $(use_enable php php-integration) \
+               $(use_enable python) \
+               $(use_enable python python-integration) \
+               $(use_enable python python-numpy) \
+               $(use_enable ruby) \
+               $(use_enable ruby ruby-integration) \
+               # $(use_enable java)
+}
+
+src_test() {
+       # see https://github.com/tschoonj/xraylib/issues/11
+       emake -j1 check
+}
+
+src_install() {
+       default
+       use python && python_optimize
+
+       if use examples; then
+               insinto /usr/share/doc/${PF}/examples
+               doins example/*.c example/*.cpp
+               use fortran && doins example/*.f90
+               use lua && doins example/*.lua
+               use perl && doins example/*.pl
+               use php && doins example/*.php
+               use python && doins example/*.py
+               use ruby && doins example/*.rb
+               # use java && doins example/*.java
+               docompress -x /usr/share/doc/${PF}/examples # Don't compress 
examples
+       fi
+
+       # use java && java-pkg_regso /usr/share/xraylib/java/libxraylib.so
+}

Reply via email to