[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     e153914b3212d9bcf02500bbbab0746cbc4834d1
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Mon Dec  2 22:27:59 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e153914b

Added myeconfargs so the USE flags actually affect the compilation

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index e699dff..889f1bf 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tschoonj/xraylib/archive/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cxx examples fortran java lua perl python"
+IUSE="cxx examples fortran java lua perl php python ruby"
 
 DEPEND="fortran? ( virtual/fortran )
 	java? ( virtual/jdk )
@@ -23,3 +23,21 @@ DEPEND="fortran? ( virtual/fortran )
 	${PYTHON_DEPS}"
 
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-idl
+		$(use-enable fortran fortran2003)
+		$(use-enable java)
+		$(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 ruby)
+		$(use-enable ruby ruby-integration)
+	)
+	autotools-utils_src_configure
+}

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     898ce1132382259cfc257a5dbc5d84c8d862e168
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Mon Dec  2 22:11:07 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=898ce113

New ebuild for xraylib

---
 sci-libs/xraylib/metadata.xml          | 38 ++++++++++++++++++++++++++++++++++
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 25 ++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/sci-libs/xraylib/metadata.xml b/sci-libs/xraylib/metadata.xml
new file mode 100644
index 0000000..a592314
--- /dev/null
+++ b/sci-libs/xraylib/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <maintainer>
+    <email>cjk34@cam.ac.uk</email>
+  </maintainer>
+  <longdescription lang="en">
+  Quantitative estimate of elemental composition by spectroscopic and imaging
+  techniques using X-ray fluorescence requires the availability of accurate data
+  of X-ray interaction with matter. Although a wide number of computer codes
+  and data sets are reported in literature, none of them is presented in the
+  form of freely available library functions which can be easily included in
+  software applications for X-ray fluorescence. This work presents a compilation
+  of data sets from different published works and an xraylib interface in the
+  form of callable functions. Although the target applications are on X-ray
+  fluorescence, cross sections of interactions like photoionization, coherent
+  scattering and Compton scattering, as well as form factors and anomalous
+  scattering functions, are also available.
+
+  xraylib provides access to some of the most respected databases of physical
+  data in the field of x-rays. The core of xraylib is a library, written in ANSI
+  C, containing over 40 functions to be used to retrieve data from these
+  databases. This C library can be directly linked with any program written in
+  C, C++ or Objective-C. Furthermore, the xraylib package contains bindings to
+  several popular programming languages: Fortran 2003, Perl, Python, Java, IDL,
+  Lua and .NET, as well as a command-line utility which can be used as a
+  pocket-calculator. Although not officially supported, xraylib has been
+  reported to be useable from within Matlab and LabView.
+  
+  Reference: T. Schoonjans, A. Brunetti, B. Golosio, M. Sanchez del Rio, 
+  V. A. Solé, C. Ferrero and L. Vincze, "The xraylib library for X-ray--matter 
+  interactions. Recent developments", Spectrochimica Acta B 66 (2011) 776-784 
+  ( doi: http://dx.doi.org/10.1016/j.sab.2011.09.011 )
+  </longdescription>
+  <use>
+  </use>
+</pkgmetadata>

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
new file mode 100644
index 0000000..e699dff
--- /dev/null
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_6 python2_7 python3_1 python3_2 python3_3 )
+inherit eutils autotools-utils python-r1
+
+DESCRIPTION="A library for X-ray matter interaction cross sections for X-ray fluorescence applications"
+HOMEPAGE="https://github.com/tschoonj/xraylib"
+SRC_URI="https://github.com/tschoonj/xraylib/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cxx examples fortran java lua perl python"
+
+DEPEND="fortran? ( virtual/fortran )
+	java? ( virtual/jdk )
+	lua? ( dev-lang/lua )
+	perl? ( dev-lang/perl )
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}"

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     038439e78456261f1091c96634a71f6bc4edbef0
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Mon Dec  2 22:45:31 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=038439e7

Using eautoreconf in src_prepare

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 3d4c7da..34691dd 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -30,6 +30,10 @@ S="${WORKDIR}/${PN}-${P}"
 
 DOCS=(AUTHORS BUGS ChangeLog README TODO)
 
+src_prepare() {
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		--disable-idl

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     14ec5bcdca47efb18487ba99ba427314d3440b98
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Mon Dec  2 22:32:26 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=14ec5bcd

The tag name is xraylib-${PV}, so the overall name is xraylib-xraylib-${PV}.

Changing ${S} accordingly

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 889f1bf..685aacb 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -24,6 +24,8 @@ DEPEND="fortran? ( virtual/fortran )
 
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}/${PN}-${P}"
+
 src_configure() {
 	local myeconfargs=(
 		--disable-idl

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     e1d708ba721473368c0782d8bda4b57d71a19596
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Mon Dec  2 22:40:30 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e1d708ba

Ideas from autotools-utils.eclass manpage

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 685aacb..d613a2d 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -24,8 +24,12 @@ DEPEND="fortran? ( virtual/fortran )
 
 RDEPEND="${DEPEND}"
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
 S="${WORKDIR}/${PN}-${P}"
 
+DOCS=(AUTHORS BUGS ChangeLog README TODO)
+
 src_configure() {
 	local myeconfargs=(
 		--disable-idl

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     7220114c23b782e1e84bf354da35945729ad0c80
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Mon Dec  2 22:41:11 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7220114c

Add java-pkg-opt-2 inherit: repoman is now happy

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index d613a2d..3d4c7da 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_6 python2_7 python3_1 python3_2 python3_3 )
-inherit eutils autotools-utils python-r1
+inherit eutils autotools-utils python-r1 java-pkg-opt-2
 
 DESCRIPTION="A library for X-ray matter interaction cross sections for X-ray fluorescence applications"
 HOMEPAGE="https://github.com/tschoonj/xraylib"

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     fd9d29dc521a2b6b29e56b8c7146fb31800aacd1
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Mon Dec  2 23:49:06 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fd9d29dc

Apparently php and ruby bindings are only in master, not in 2.16.0

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index c87f7c2..73e76bd 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/tschoonj/xraylib/archive/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cxx examples fortran java lua perl php python ruby"
+IUSE="cxx examples fortran java lua perl python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -43,13 +43,8 @@ src_configure() {
 		$(use_enable java)
 		$(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 ruby)
-		$(use_enable ruby ruby-integration)
 	)
 	autotools-utils_src_configure
 }

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     09afb7a67f56eddda5a35e26437ca378c2393d09
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Mon Dec  2 23:37:40 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=09afb7a6

Workaround for parallel compilation bug with fortran

Also Doh! on use_enable not use-enable!

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 113a283..c87f7c2 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -39,17 +39,26 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--disable-idl
-		$(use-enable fortran fortran2003)
-		$(use-enable java)
-		$(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 ruby)
-		$(use-enable ruby ruby-integration)
+		$(use_enable fortran fortran2003)
+		$(use_enable java)
+		$(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 ruby)
+		$(use_enable ruby ruby-integration)
 	)
 	autotools-utils_src_configure
 }
+
+src_compile() {
+	if use fortran
+	then # see https://github.com/tschoonj/xraylib/issues/11
+		emake -j1
+	else
+		emake
+	fi
+}
\ No newline at end of file

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     088baee8f29631c6160e7a309b1f1dae844e5fda
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Mon Dec  2 22:55:12 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=088baee8

Added fortran-2 eclass, tweaked python stuff

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 34691dd..113a283 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -4,8 +4,9 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_6 python2_7 python3_1 python3_2 python3_3 )
-inherit eutils autotools-utils python-r1 java-pkg-opt-2
+FORTRAN_NEEDED=fortran
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+inherit eutils autotools-utils python-r1 java-pkg-opt-2 fortran-2
 
 DESCRIPTION="A library for X-ray matter interaction cross sections for X-ray fluorescence applications"
 HOMEPAGE="https://github.com/tschoonj/xraylib"
@@ -16,13 +17,14 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="cxx examples fortran java lua perl php python ruby"
 
-DEPEND="fortran? ( virtual/fortran )
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
 	java? ( virtual/jdk )
 	lua? ( dev-lang/lua )
-	perl? ( dev-lang/perl )
-	${PYTHON_DEPS}"
+	perl? ( dev-lang/perl )"
 
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
 

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     5fd3b61149c21d0e89d121ee7bf74bdcf2d96031
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Dec  3 16:11:45 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5fd3b611

Using AUTOTOOLS_AUTORECONF=true instead of src_prepare

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 1308f53..ec931f1 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -27,15 +27,12 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}"
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=true
 
 S="${WORKDIR}/${PN}-${P}"
 
 DOCS=(AUTHORS BUGS Changelog README TODO)
 
-src_prepare() {
-	eautoreconf
-}
-
 src_configure() {
 	local myeconfargs=(
 		--disable-idl

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     bba8703338f78804a2d9ded048b8a82c36b445e0
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Dec  3 16:12:38 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bba87033

Specifying FORTRAN_STANDARD=2003

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index ec931f1..0090399 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=2003
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
 inherit eutils autotools-utils python-r1 java-pkg-opt-2 fortran-2
 

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     9c6cb35aee6abe44c3ef3ce0fa716dec46d6d87e
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Mon Dec  2 23:49:30 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9c6cb35a

Change log is called Changelog not ChangeLog

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 73e76bd..1308f53 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -30,7 +30,7 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 
 S="${WORKDIR}/${PN}-${P}"
 
-DOCS=(AUTHORS BUGS ChangeLog README TODO)
+DOCS=(AUTHORS BUGS Changelog README TODO)
 
 src_prepare() {
 	eautoreconf

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     d8cffa00b6cfdf63dbd585210478b2119fa7ce4f
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Dec  3 16:24:45 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d8cffa00

Added support for installing examples

Removed cxx USE flag because I don't think C++ is optional

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 0090399..12a0837 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/tschoonj/xraylib/archive/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cxx examples fortran java lua perl python"
+IUSE="examples fortran java lua perl python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -54,4 +54,18 @@ src_compile() {
 	else
 		emake
 	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ${DOCS}
+
+	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
+	fi
 }
\ No newline at end of file

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     7856e7f3b9b08cc755e5fb5c8d44ead45067939a
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Dec  3 16:43:26 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7856e7f3

Adding src_prepare again

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 1a035e1..ac9b6ff 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -33,6 +33,10 @@ S="${WORKDIR}/${PN}-${P}"
 
 DOCS=(AUTHORS BUGS Changelog README TODO)
 
+src_prepare() {
+	autotools-utils_src_prepare
+}
+
 src_configure() {
 	local myeconfargs=(
 		--disable-idl

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     b1892c10477736a3ab846b3dc93fa41af112b162
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Dec  3 16:51:03 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b1892c10

Don't compress examples

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index ac9b6ff..02105db 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -70,5 +70,6 @@ src_install() {
 		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
 }
\ No newline at end of file

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     f1759d42c902a1f6c19134d5040bafe05de2ed2e
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Dec  3 16:29:25 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f1759d42

Moved AUTOTOOLS_* to before inherit statement

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 12a0837..1a035e1 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=true
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD=2003
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
@@ -27,9 +29,6 @@ RDEPEND="${PYTHON_DEPS}
 
 DEPEND="${RDEPEND}"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=true
-
 S="${WORKDIR}/${PN}-${P}"
 
 DOCS=(AUTHORS BUGS Changelog README TODO)

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     95f0ca033868b8873cff8cdabbe2709434a1861e
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Dec  3 17:10:24 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=95f0ca03

Switched to python-single-r1

It seems that support for python 3 has only been added since the 2.16.0 release

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 02105db..7b6f89f 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -8,8 +8,8 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 AUTOTOOLS_AUTORECONF=true
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD=2003
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
-inherit eutils autotools-utils python-r1 java-pkg-opt-2 fortran-2
+PYTHON_COMPAT=( python{2_6,2_7} ) # python 3 supported by github master
+inherit eutils autotools-utils python-single-r1 java-pkg-opt-2 fortran-2
 
 DESCRIPTION="A library for X-ray matter interaction cross sections for X-ray fluorescence applications"
 HOMEPAGE="https://github.com/tschoonj/xraylib"

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     1b9fd6d09c0e539959483acd8ea4cb245871539b
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Dec  3 21:21:44 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1b9fd6d0

Apparently also java has parallel build issues

See https://github.com/tschoonj/xraylib/issues/11

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 90f3da6..905b73a 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -58,7 +58,7 @@ src_configure() {
 }
 
 src_compile() {
-	if use fortran
+	if use fortran || use java
 	then # see https://github.com/tschoonj/xraylib/issues/11
 		emake -j1
 	else

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     d748dcb0369b8551d9b5e9f75c03c2147188568b
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Dec  3 17:25:18 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d748dcb0

Explicitly calling relevant pkg_* functions from other eclasses

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index ba4bf29..90f3da6 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -34,11 +34,14 @@ S="${WORKDIR}/${PN}-${P}"
 DOCS=(AUTHORS BUGS Changelog README TODO)
 
 pkg_setup() {
+	fortran-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
 	python-single-r1_pkg_setup
 }
 
 src_prepare() {
 	autotools-utils_src_prepare
+	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {
@@ -64,8 +67,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ${DOCS}
+	autotools-utils_src_install
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     e935f2bbdee65b6f06dd0120431d10a1276f1357
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Dec  3 17:17:46 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e935f2bb

Explicitly calling python-single pkg_setup

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 7b6f89f..ba4bf29 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -33,6 +33,10 @@ S="${WORKDIR}/${PN}-${P}"
 
 DOCS=(AUTHORS BUGS Changelog README TODO)
 
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	autotools-utils_src_prepare
 }

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     936c416d780683bc1cd401d9348f637629c329d8
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Dec  3 21:55:34 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=936c416d

Use java-pkg_regso to register the xraylib.so library

Not sure why it is installed in /usr/share/ - perhaps it's a Java thing?

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 338eddc..b54c66f 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -79,4 +79,6 @@ src_install() {
 		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
 }
\ No newline at end of file

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     65612af58882422ded6d33d10d350d227a80ab13
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  8 17:38:55 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:38:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=65612af5

sci-libs/xraylib: Make python stuff optional under USE=python

Package-Manager: portage-2.2.7

---
 sci-libs/xraylib/ChangeLog             |  7 +++++++
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/sci-libs/xraylib/ChangeLog b/sci-libs/xraylib/ChangeLog
new file mode 100644
index 0000000..0698f69
--- /dev/null
+++ b/sci-libs/xraylib/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for sci-libs/xraylib
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  08 Dec 2013; Justin Lecher <jlec@gentoo.org> xraylib-2.16.0.ebuild:
+  Make python stuff optional under USE=python
+

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 3d27552..4db465b 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -8,6 +8,7 @@ AUTOTOOLS_AUTORECONF=true
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD=2003
 PYTHON_COMPAT=( python{2_6,2_7} ) # python 3 supported by github master
+
 inherit eutils autotools-utils python-single-r1 java-pkg-opt-2 fortran-2
 
 DESCRIPTION="A library for X-ray matter interaction cross sections for X-ray fluorescence applications"
@@ -21,10 +22,11 @@ IUSE="examples fortran java lua perl python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
 	java? ( >=virtual/jre-1.4 )
 	lua? ( dev-lang/lua )
-	perl? ( dev-lang/perl )"
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )"
 
 DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.4 )"
@@ -36,7 +38,7 @@ DOCS=(AUTHORS BUGS Changelog README TODO)
 pkg_setup() {
 	fortran-2_pkg_setup
 	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -79,4 +81,4 @@ src_install() {
 	fi
 
 	use java && java-pkg_regso /usr/share/xraylib/java/libxraylib.so
-}
\ No newline at end of file
+}

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     ef4c2a7b0a01d629cbbdb82451945ec3f86e4ee6
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Dec  3 21:41:11 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ef4c2a7b

Added a version to the Java dependency (apparently required for java-pkg-opt to work)

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 905b73a..338eddc 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -23,11 +23,12 @@ IUSE="examples fortran java lua perl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
-	java? ( virtual/jdk )
+	java? ( >=virtual/jre-1.4 )
 	lua? ( dev-lang/lua )
 	perl? ( dev-lang/perl )"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.4 )"
 
 S="${WORKDIR}/${PN}-${P}"
 

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     010921609748a8198bde3be0061201c125613937
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Wed Dec  4 08:33:59 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=01092160

Changes suggested by @jlec

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index b54c66f..c5cd4c6 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=5
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
 AUTOTOOLS_AUTORECONF=true
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD=2003
@@ -41,8 +40,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	autotools-utils_src_prepare
 	java-pkg-opt-2_src_prepare
+	autotools-utils_src_prepare
 }
 
 src_configure() {
@@ -59,12 +58,11 @@ src_configure() {
 }
 
 src_compile() {
-	if use fortran || use java
-	then # see https://github.com/tschoonj/xraylib/issues/11
-		emake -j1
-	else
-		emake
+	# see https://github.com/tschoonj/xraylib/issues/11
+	if use fortran || use java; then
+		MAKEOPTS+="-j1"
 	fi
+	autotools-utils_src_compile
 }
 
 src_install() {

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     d3315b518f0743ff950eaa60608f1bd1d3a9afc2
Author:     Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Wed Dec  4 08:40:54 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 17:36:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d3315b51

MAKEOPTS needs a space otherwise the "-j1" will merge with the previous argument

---
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index c5cd4c6..3d27552 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -60,7 +60,7 @@ src_configure() {
 src_compile() {
 	# see https://github.com/tschoonj/xraylib/issues/11
 	if use fortran || use java; then
-		MAKEOPTS+="-j1"
+		MAKEOPTS+=" -j1"
 	fi
 	autotools-utils_src_compile
 }

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Guillaume Horel]

commit:     21eb13f57a09f44f4dba44aae4c495e850bd0b31
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Fri Apr  3 09:35:10 2015 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Apr  3 09:35:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=21eb13f5

sci-libs/xraylib: Version bump, fixes Bug 538232

Package-Manager: portage-2.2.14

 sci-libs/xraylib/ChangeLog            |  8 +++-
 sci-libs/xraylib/xraylib-3.1.0.ebuild | 84 +++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/sci-libs/xraylib/ChangeLog b/sci-libs/xraylib/ChangeLog
index 0698f69..d29b543 100644
--- a/sci-libs/xraylib/ChangeLog
+++ b/sci-libs/xraylib/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/xraylib
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*xraylib-3.1.0 (03 Apr 2015)
+
+  03 Apr 2015; Marius Brehler <marbre@linux.sungazer.de> +xraylib-3.1.0.ebuild:
+  Version bump, fixes Bug 538232
+
   08 Dec 2013; Justin Lecher <jlec@gentoo.org> xraylib-2.16.0.ebuild:
   Make python stuff optional under USE=python
-

diff --git a/sci-libs/xraylib/xraylib-3.1.0.ebuild b/sci-libs/xraylib/xraylib-3.1.0.ebuild
new file mode 100644
index 0000000..e899018
--- /dev/null
+++ b/sci-libs/xraylib/xraylib-3.1.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=2003
+PYTHON_COMPAT=( python{2_6,2_7} ) # python 3 supported by github master
+
+inherit eutils autotools-utils python-single-r1 java-pkg-opt-2 fortran-2
+
+DESCRIPTION="A library for X-ray matter interaction cross sections for X-ray fluorescence applications"
+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 )
+	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
+}

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     c3c99767a32f9b79bbc96e3bb8dc301d8299e4a6
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  5 11:19:00 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 11:19:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c3c99767

sci-libs/xraylib: Add github to remote-id in metadata.xml

Package-Manager: portage-2.2.20

 sci-libs/xraylib/ChangeLog    | 3 +++
 sci-libs/xraylib/metadata.xml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sci-libs/xraylib/ChangeLog b/sci-libs/xraylib/ChangeLog
index d29b543..3085dea 100644
--- a/sci-libs/xraylib/ChangeLog
+++ b/sci-libs/xraylib/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  sci-libs/xraylib: Add github to remote-id in metadata.xml
+
 *xraylib-3.1.0 (03 Apr 2015)
 
   03 Apr 2015; Marius Brehler <marbre@linux.sungazer.de> +xraylib-3.1.0.ebuild:

diff --git a/sci-libs/xraylib/metadata.xml b/sci-libs/xraylib/metadata.xml
index a592314..16a3a58 100644
--- a/sci-libs/xraylib/metadata.xml
+++ b/sci-libs/xraylib/metadata.xml
@@ -35,4 +35,7 @@
   </longdescription>
   <use>
   </use>
+  <upstream>
+    <remote-id type="github">tschoonj/xraylib</remote-id>
+  </upstream>
 </pkgmetadata>

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     b0b03dd3f63e3d15992fd8bbf98bbaedad962b5c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  5 11:19:17 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 11:19:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b0b03dd3

sci-libs/xraylib: Add slot operators

Package-Manager: portage-2.2.20

 sci-libs/xraylib/ChangeLog             | 4 ++++
 sci-libs/xraylib/xraylib-2.16.0.ebuild | 8 ++++----
 sci-libs/xraylib/xraylib-3.1.0.ebuild  | 6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sci-libs/xraylib/ChangeLog b/sci-libs/xraylib/ChangeLog
index 3085dea..38be18a 100644
--- a/sci-libs/xraylib/ChangeLog
+++ b/sci-libs/xraylib/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Jun 2015; Justin Lecher <jlec@gentoo.org> xraylib-2.16.0.ebuild,
+  xraylib-3.1.0.ebuild:
+  sci-libs/xraylib: Add slot operators
+
   05 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   sci-libs/xraylib: Add github to remote-id in metadata.xml
 

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 6917f65..5d9e764 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -23,13 +23,13 @@ IUSE="examples fortran java lua perl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
-	java? ( >=virtual/jre-1.4 )
-	lua? ( dev-lang/lua )
+	java? ( >=virtual/jre-1.4:* )
+	lua? ( dev-lang/lua:0 )
 	perl? ( dev-lang/perl )
 	python? ( ${PYTHON_DEPS} )"
 
 DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.4 )"
+	java? ( >=virtual/jdk-1.4:* )"
 
 S="${WORKDIR}/${PN}-${P}"
 

diff --git a/sci-libs/xraylib/xraylib-3.1.0.ebuild b/sci-libs/xraylib/xraylib-3.1.0.ebuild
index 3f9991e..5d9e764 100644
--- a/sci-libs/xraylib/xraylib-3.1.0.ebuild
+++ b/sci-libs/xraylib/xraylib-3.1.0.ebuild
@@ -23,13 +23,13 @@ IUSE="examples fortran java lua perl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
-	java? ( >=virtual/jre-1.4 )
-	lua? ( dev-lang/lua )
+	java? ( >=virtual/jre-1.4:* )
+	lua? ( dev-lang/lua:0 )
 	perl? ( dev-lang/perl )
 	python? ( ${PYTHON_DEPS} )"
 
 DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.4 )"
+	java? ( >=virtual/jdk-1.4:* )"
 
 S="${WORKDIR}/${PN}-${P}"
 

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Justin Lecher]

commit:     2697c266d807fadd9b27d4530d1f9093c3cbd794
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 10:05:24 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 10:05:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=2697c266

sci-libs/xraylib: Chop DESCRIPTION to 80 chars

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/xraylib/xraylib-2.16.0.ebuild | 2 +-
 sci-libs/xraylib/xraylib-3.1.0.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/xraylib/xraylib-2.16.0.ebuild b/sci-libs/xraylib/xraylib-2.16.0.ebuild
index 866edeb..2a45ba5 100644
--- a/sci-libs/xraylib/xraylib-2.16.0.ebuild
+++ b/sci-libs/xraylib/xraylib-2.16.0.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 ) # python 3 supported by github master
 
 inherit eutils autotools-utils python-single-r1 java-pkg-opt-2 fortran-2
 
-DESCRIPTION="A library for X-ray matter interaction cross sections for X-ray fluorescence applications"
+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"
 

diff --git a/sci-libs/xraylib/xraylib-3.1.0.ebuild b/sci-libs/xraylib/xraylib-3.1.0.ebuild
index 866edeb..2a45ba5 100644
--- a/sci-libs/xraylib/xraylib-3.1.0.ebuild
+++ b/sci-libs/xraylib/xraylib-3.1.0.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 ) # python 3 supported by github master
 
 inherit eutils autotools-utils python-single-r1 java-pkg-opt-2 fortran-2
 
-DESCRIPTION="A library for X-ray matter interaction cross sections for X-ray fluorescence applications"
+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"
 

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Andrew Ammerlaan]

commit:     5449f91c090b134eedac6edf42f6568b280a4aea
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan 19 16:53:18 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan 19 16:53:18 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5449f91c

sci-libs/xraylib: cleanup metadata

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

 sci-libs/xraylib/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sci-libs/xraylib/metadata.xml b/sci-libs/xraylib/metadata.xml
index e924a8916..a7d2f91fb 100644
--- a/sci-libs/xraylib/metadata.xml
+++ b/sci-libs/xraylib/metadata.xml
@@ -36,8 +36,6 @@ V. A. Solé, C. Ferrero and L. Vincze, "The xraylib library for X-ray--matter
 interactions. Recent developments", Spectrochimica Acta B 66 (2011) 776-784 
 ( doi: http://dx.doi.org/10.1016/j.sab.2011.09.011 )
 </longdescription>
-	<use>
-</use>
 	<upstream>
 		<remote-id type="github">tschoonj/xraylib</remote-id>
 	</upstream>

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Andrew Ammerlaan]

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
+}

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Andrew Ammerlaan]

commit:     3161cd9dc753b29a6f78567c6cf4a46b20e5d638
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Jan 29 21:48:51 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jan 29 21:48:51 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=3161cd9d

sci-libs/xraylib: use docinto/dodoc instead of insinto

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

 sci-libs/xraylib/xraylib-4.0.0.ebuild | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sci-libs/xraylib/xraylib-4.0.0.ebuild b/sci-libs/xraylib/xraylib-4.0.0.ebuild
index e89a19dde..dc6acdd27 100644
--- a/sci-libs/xraylib/xraylib-4.0.0.ebuild
+++ b/sci-libs/xraylib/xraylib-4.0.0.ebuild
@@ -78,15 +78,15 @@ src_install() {
 	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
+		docinto /usr/share/doc/${PF}/examples
+		dodoc example/*.c example/*.cpp
+		use fortran && dodoc example/*.f90
+		use lua && dodoc example/*.lua
+		use perl && dodoc example/*.pl
+		use php && dodoc example/*.php
+		use python && dodoc example/*.py
+		use ruby && dodoc example/*.rb
+		# use java && dodoc example/*.java
 		docompress -x /usr/share/doc/${PF}/examples # Don't compress examples
 	fi
 

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Andrew Ammerlaan]

commit:     ea2907109c70ee0c10c04498e210a591045da952
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Jan 29 21:51:12 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jan 29 21:51:12 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ea290710

sci-libs/xraylib: do REQUIRED_USE correctly

oops, clearly it's time to go to bed now

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

 sci-libs/xraylib/xraylib-4.0.0.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-libs/xraylib/xraylib-4.0.0.ebuild b/sci-libs/xraylib/xraylib-4.0.0.ebuild
index dc6acdd27..6dfde6dae 100644
--- a/sci-libs/xraylib/xraylib-4.0.0.ebuild
+++ b/sci-libs/xraylib/xraylib-4.0.0.ebuild
@@ -24,8 +24,10 @@ KEYWORDS="~amd64"
 # 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} )"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	lua? ( ${LUA_REQUIRED_USE} )
+"
 
 RDEPEND="
 	lua? ( ${LUA_DEPS} )

[gentoo-commits] proj/sci:master commit in: sci-libs/xraylib/

[Andrew Ammerlaan]

commit:     9ad770ea7b691cdf9d1f2338d807c564fdbc085b
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 12:13:58 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue May  2 12:15:28 2023 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=9ad770ea

sci-libs/xraylib: treeclean

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/xraylib/metadata.xml         | 42 ---------------
 sci-libs/xraylib/xraylib-4.0.0.ebuild | 96 -----------------------------------
 2 files changed, 138 deletions(-)

diff --git a/sci-libs/xraylib/metadata.xml b/sci-libs/xraylib/metadata.xml
deleted file mode 100644
index a7d2f91fb..000000000
--- a/sci-libs/xraylib/metadata.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>cjk34@cam.ac.uk</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-Quantitative estimate of elemental composition by spectroscopic and imaging
-techniques using X-ray fluorescence requires the availability of accurate data
-of X-ray interaction with matter. Although a wide number of computer codes
-and data sets are reported in literature, none of them is presented in the
-form of freely available library functions which can be easily included in
-software applications for X-ray fluorescence. This work presents a compilation
-of data sets from different published works and an xraylib interface in the
-form of callable functions. Although the target applications are on X-ray
-fluorescence, cross sections of interactions like photoionization, coherent
-scattering and Compton scattering, as well as form factors and anomalous
-scattering functions, are also available.
-
-xraylib provides access to some of the most respected databases of physical
-data in the field of x-rays. The core of xraylib is a library, written in ANSI
-C, containing over 40 functions to be used to retrieve data from these
-databases. This C library can be directly linked with any program written in
-C, C++ or Objective-C. Furthermore, the xraylib package contains bindings to
-several popular programming languages: Fortran 2003, Perl, Python, Java, IDL,
-Lua and .NET, as well as a command-line utility which can be used as a
-pocket-calculator. Although not officially supported, xraylib has been
-reported to be useable from within Matlab and LabView.
-
-Reference: T. Schoonjans, A. Brunetti, B. Golosio, M. Sanchez del Rio, 
-V. A. Solé, C. Ferrero and L. Vincze, "The xraylib library for X-ray--matter 
-interactions. Recent developments", Spectrochimica Acta B 66 (2011) 776-784 
-( doi: http://dx.doi.org/10.1016/j.sab.2011.09.011 )
-</longdescription>
-	<upstream>
-		<remote-id type="github">tschoonj/xraylib</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/sci-libs/xraylib/xraylib-4.0.0.ebuild b/sci-libs/xraylib/xraylib-4.0.0.ebuild
deleted file mode 100644
index 6dfde6dae..000000000
--- a/sci-libs/xraylib/xraylib-4.0.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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} )
-	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
-		docinto /usr/share/doc/${PF}/examples
-		dodoc example/*.c example/*.cpp
-		use fortran && dodoc example/*.f90
-		use lua && dodoc example/*.lua
-		use perl && dodoc example/*.pl
-		use php && dodoc example/*.php
-		use python && dodoc example/*.py
-		use ruby && dodoc example/*.rb
-		# use java && dodoc 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
-}