[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/numbat/

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/numbat/

[Sam James]

commit:     68a82908d3282885a11131b8609a7f7ac2438bc2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 28 00:38:17 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 28 01:13:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a82908

sci-chemistry/numbat: port to EAPI 7

* Port to EAPI 7
* Drop autotools-utils.eclass

Still doesn't seem to build with newer gsl(?)
but this unblocks autotools-utils removal anyway.

Bug: https://bugs.gentoo.org/583038
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-chemistry/numbat/numbat-0.999-r1.ebuild | 42 ++++++++++++++++-------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/sci-chemistry/numbat/numbat-0.999-r1.ebuild b/sci-chemistry/numbat/numbat-0.999-r1.ebuild
index 66f5b2ae065..766c64b1b9c 100644
--- a/sci-chemistry/numbat/numbat-0.999-r1.ebuild
+++ b/sci-chemistry/numbat/numbat-0.999-r1.ebuild
@@ -1,52 +1,56 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
+inherit autotools
 
 MY_PN="Numbat"
 MY_P="${MY_PN}-${PV}"
 
-DESCRIPTION="new user-friendly method built for automatic dX-tensor determination"
+DESCRIPTION="New user-friendly method built for automatic dX-tensor determination"
 HOMEPAGE="http://www.nmr.chem.uu.nl/~christophe/numbat.html"
 SRC_URI="http://comp-bio.anu.edu.au/private/downloads/Numbat/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 SLOT="0"
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-CDEPEND="
+DEPEND="
 	gnome-base/libglade:2.0
 	sci-libs/gsl
-	x11-libs/gtk+:2"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
+	x11-libs/gtk+:2
+"
+RDEPEND="
+	${DEPEND}
 	sci-chemistry/molmol
 	sci-chemistry/pymol
-	sci-visualization/gnuplot"
-
-S="${WORKDIR}"/${MY_P}
+	sci-visualization/gnuplot
+"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 #	"${FILESDIR}"/${P}-glade.patch
-	"${FILESDIR}"/${P}-gnuplot.patch )
+	"${FILESDIR}"/${P}-gnuplot.patch
+)
 
 src_prepare() {
+	default
+
 	sed \
 		-e '/COPYING/d' \
 		-e "s:doc/numbat:share/doc/${PF}:g" \
 		-i Makefile.am src/common.h || die
-	rm missing
+
+	rm missing || die
+
 	emake distclean
-	autotools-utils_src_prepare
+	eautoreconf
 }
 
 src_install() {
 	docompress -x /usr/share/doc/${PF}
-	autotools-utils_src_install
+
+	default
 }

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/numbat/

[Sam James]

commit:     35d733102ad34e14a41ab0d995d67db4288a1860
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  2 21:26:01 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=35d73310

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

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

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

diff --git a/sci-chemistry/numbat/numbat-0.999-r1.ebuild b/sci-chemistry/numbat/numbat-0.999-r2.ebuild
similarity index 98%
rename from sci-chemistry/numbat/numbat-0.999-r1.ebuild
rename to sci-chemistry/numbat/numbat-0.999-r2.ebuild
index 766c64b1b9c..ddfec41ed12 100644
--- a/sci-chemistry/numbat/numbat-0.999-r1.ebuild
+++ b/sci-chemistry/numbat/numbat-0.999-r2.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	gnome-base/libglade:2.0
-	sci-libs/gsl
+	sci-libs/gsl:=
 	x11-libs/gtk+:2
 "
 RDEPEND="