public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/theseus/
@ 2021-04-13  0:26 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-04-13  0:26 UTC (permalink / raw
  To: gentoo-commits

commit:     bc946107aa2710707b59bffe15caee3694961db4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  7 05:14:02 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 00:26:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc946107

sci-chemistry/theseus: call pkg-config via toolchain-funcs.eclass helper

This ensures we call the correct pkg-config in e.g. cross.

Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-chemistry/theseus/theseus-3.3.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/theseus/theseus-3.3.0.ebuild b/sci-chemistry/theseus/theseus-3.3.0.ebuild
index 583bdf1e28c..dd9c0b802ed 100644
--- a/sci-chemistry/theseus/theseus-3.3.0.ebuild
+++ b/sci-chemistry/theseus/theseus-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ src_prepare() {
 	ARCHFLAGS = -rvs
 	RANLIB = $(tc-getRANLIB)
 	LOCALLIBDIR = "${EPREFIX}/usr/$(get_libdir)
-	SYSLIBS = $(pkg-config --libs gsl) -lpthread
+	SYSLIBS = $($(tc-getPKG_CONFIG) --libs gsl) -lpthread
 	LIBS = -ldistfit -lmsa -ldssplite -ldltmath -lDLTutils -ltheseus
 	LIBDIR = -L./lib
 	INSTALLDIR = "${ED}"/usr/bin


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/theseus/
@ 2021-06-02 22:36 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-06-02 22:36 UTC (permalink / raw
  To: gentoo-commits

commit:     c31072d740c84f3ef8c94ad4eec14079f1ae53e1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  2 21:26:32 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  2 21:50:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c31072d7

sci-chemistry/theseus: subscribe to sci-libs/gsl subslot

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-chemistry/theseus/{theseus-3.3.0.ebuild => theseus-3.3.0-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/theseus/theseus-3.3.0.ebuild b/sci-chemistry/theseus/theseus-3.3.0-r1.ebuild
similarity index 98%
rename from sci-chemistry/theseus/theseus-3.3.0.ebuild
rename to sci-chemistry/theseus/theseus-3.3.0-r1.ebuild
index dd9c0b802ed..f9e62b3916d 100644
--- a/sci-chemistry/theseus/theseus-3.3.0.ebuild
+++ b/sci-chemistry/theseus/theseus-3.3.0-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
-	sci-libs/gsl
+	sci-libs/gsl:=
 	|| (
 		sci-biology/muscle
 		sci-biology/probcons


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/theseus/
@ 2021-08-14 10:13 David Seifert
  0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2021-08-14 10:13 UTC (permalink / raw
  To: gentoo-commits

commit:     a4bb54a899bf76f3982e846772579e1820e8d305
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Aug 14 10:13:18 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Aug 14 10:13:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4bb54a8

sci-chemistry/theseus: Port to EAPI 8

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-chemistry/theseus/theseus-3.3.0-r1.ebuild | 28 ++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/sci-chemistry/theseus/theseus-3.3.0-r1.ebuild b/sci-chemistry/theseus/theseus-3.3.0-r1.ebuild
index f9e62b3916d..fe012719670 100644
--- a/sci-chemistry/theseus/theseus-3.3.0-r1.ebuild
+++ b/sci-chemistry/theseus/theseus-3.3.0-r1.ebuild
@@ -1,40 +1,42 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Maximum likelihood superpositioning and analysis of macromolecular structures"
 HOMEPAGE="http://www.theseus3d.org/"
 SRC_URI="http://www.theseus3d.org/src/${PN}_${PV}.tar.gz"
+S="${WORKDIR}"/${PN}_src
 
-SLOT="0"
 LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
 	sci-libs/gsl:=
 	|| (
+		sci-biology/clustalw:2
+		sci-biology/kalign
+		sci-biology/mafft
 		sci-biology/muscle
 		sci-biology/probcons
-		sci-biology/mafft
 		sci-biology/t-coffee
-		sci-biology/kalign
-		sci-biology/clustalw:2
-		)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${PN}_src/
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	cat >> make.inc <<- EOF
+	default
+
+	cat >> make.inc <<- EOF || die
 	ARCH = $(tc-getAR)
 	ARCHFLAGS = -rvs
 	RANLIB = $(tc-getRANLIB)
-	LOCALLIBDIR = "${EPREFIX}/usr/$(get_libdir)
+	LOCALLIBDIR = "${EPREFIX}"/usr/$(get_libdir)
 	SYSLIBS = $($(tc-getPKG_CONFIG) --libs gsl) -lpthread
 	LIBS = -ldistfit -lmsa -ldssplite -ldltmath -lDLTutils -ltheseus
 	LIBDIR = -L./lib


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-08-14 10:13 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-02 22:36 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/theseus/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2021-08-14 10:13 David Seifert
2021-04-13  0:26 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox