[gentoo-commits] repo/gentoo:master commit in: sci-biology/plink/

[gentoo-commits] repo/gentoo:master commit in: sci-biology/plink/

[David Seifert]

commit:     946948c8d23cfdc67d6f877730a5a6986fdf94c7
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Aug 22 19:37:17 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 22 19:37:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=946948c8

sci-biology/plink: Port to EAPI 8

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

 sci-biology/plink/plink-1.90_pre140514.ebuild | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/sci-biology/plink/plink-1.90_pre140514.ebuild b/sci-biology/plink/plink-1.90_pre140514.ebuild
index 578881ac0f5..2595c3ab798 100644
--- a/sci-biology/plink/plink-1.90_pre140514.ebuild
+++ b/sci-biology/plink/plink-1.90_pre140514.ebuild
@@ -1,36 +1,36 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Whole genome association analysis toolset"
 HOMEPAGE="http://pngu.mgh.harvard.edu/~purcell/plink/"
 SRC_URI="http://pngu.mgh.harvard.edu/~purcell/static/bin/plink140514/plink_src.zip -> ${P}.zip"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	sys-libs/zlib
 	virtual/cblas
 	virtual/lapack
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/unzip
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/"
-
 # Package collides with net-misc/putty. Renamed to p-link following discussion with Debian.
 # Package contains bytecode-only jar gPLINK.jar. Ignored, notified upstream.
 
 src_prepare() {
+	default
+
 	sed \
 		-e 's:zlib-1.2.8/zlib.h:zlib.h:g' \
 		-i *.{c,h} || die
@@ -47,6 +47,7 @@ src_compile() {
 	emake \
 		CXX=$(tc-getCXX) \
 		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
 		ZLIB="$($(tc-getPKG_CONFIG) --libs zlib)" \
 		BLASFLAGS="$($(tc-getPKG_CONFIG) --libs lapack cblas)"
 }

[gentoo-commits] repo/gentoo:master commit in: sci-biology/plink/

[Sam James]

commit:     d781456f57fcaeec251e9adfc5b3bbce087f6410
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 18:49:41 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 18:50:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d781456f

sci-biology/plink: [QA] fix tc-get* quoting

This can cause build problems for e.g. 32-bit (gcc -m32 ...)

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

 sci-biology/plink/plink-1.90_pre140514.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-biology/plink/plink-1.90_pre140514.ebuild b/sci-biology/plink/plink-1.90_pre140514.ebuild
index 2595c3ab7983..6361d78a734e 100644
--- a/sci-biology/plink/plink-1.90_pre140514.ebuild
+++ b/sci-biology/plink/plink-1.90_pre140514.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,7 +45,7 @@ src_prepare() {
 
 src_compile() {
 	emake \
-		CXX=$(tc-getCXX) \
+		CXX="$(tc-getCXX)" \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		ZLIB="$($(tc-getPKG_CONFIG) --libs zlib)" \