commit: d571c5ec3dfe993c302483ee03b9276a6da8a9a4 Author: Jiajie Chen <noc <AT> jiegec <DOT> ac <DOT> cn> AuthorDate: Fri Mar 20 01:56:27 2020 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Fri Mar 20 05:14:49 2020 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d571c5ec
sci-libs/lib2bit: fix testing and qa warnings Closes: https://github.com/gentoo/sci/pull/949 Package-Manager: Portage-2.3.88, Repoman-2.3.18 Signed-off-by: Jiajie Chen <noc <AT> jiegec.ac.cn> Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> .../files/lib2bit-0.2.1_respect_LDFLAGS.patch | 11 +++++++++++ .../files/lib2bit-0.2.1_test_support_python3.patch | 11 +++++++++++ sci-libs/lib2bit/lib2bit-0.2.1.ebuild | 23 +++++++++++----------- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/sci-libs/lib2bit/files/lib2bit-0.2.1_respect_LDFLAGS.patch b/sci-libs/lib2bit/files/lib2bit-0.2.1_respect_LDFLAGS.patch new file mode 100644 index 000000000..92a5b5d43 --- /dev/null +++ b/sci-libs/lib2bit/files/lib2bit-0.2.1_respect_LDFLAGS.patch @@ -0,0 +1,11 @@ +--- lib2bit-0.2.1/Makefile.ori 2020-03-19 11:41:21.896527937 +0000 ++++ lib2bit-0.2.1/Makefile 2020-03-19 11:41:00.339977405 +0000 +@@ -4,7 +4,7 @@ + CFLAGS ?= -g -Wall -O3 + LIBS = + EXTRA_CFLAGS_PIC = -fpic +-LDFLAGS = ++LDFLAGS ?= + LDLIBS = + INCLUDES = + diff --git a/sci-libs/lib2bit/files/lib2bit-0.2.1_test_support_python3.patch b/sci-libs/lib2bit/files/lib2bit-0.2.1_test_support_python3.patch new file mode 100644 index 000000000..2cee88ada --- /dev/null +++ b/sci-libs/lib2bit/files/lib2bit-0.2.1_test_support_python3.patch @@ -0,0 +1,11 @@ +--- lib2bit-0.2.1/test/test.py.ori 2020-03-19 11:28:53.301344896 +0000 ++++ lib2bit-0.2.1/test/test.py 2020-03-19 11:28:11.968283978 +0000 +@@ -14,7 +14,7 @@ + p2 = Popen(["md5sum"], stdin=p1.stdout, stdout=PIPE) + except: + p2 = Popen(["md5"], stdin=p1.stdout, stdout=PIPE) +-md5sum = p2.communicate()[0].strip().split()[0] ++md5sum = p2.communicate()[0].strip().split()[0].decode('utf-8') + assert(md5sum == "0274c32c7f3dd75e8991f6107dca6a5f") + + print("Passed!") diff --git a/sci-libs/lib2bit/lib2bit-0.2.1.ebuild b/sci-libs/lib2bit/lib2bit-0.2.1.ebuild index c547dcca9..808c97b21 100644 --- a/sci-libs/lib2bit/lib2bit-0.2.1.ebuild +++ b/sci-libs/lib2bit/lib2bit-0.2.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit eutils DESCRIPTION="C library for accessing 2bit files" HOMEPAGE="https://github.com/dpryan79/lib2bit"; -SRC_URI="https://github.com/dpryan79/lib2bit/archive/0.2.1.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/dpryan79/lib2bit/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" @@ -17,15 +17,16 @@ IUSE="static" DEPEND="" RDEPEND="${DEPEND}" -src_prepare(){ - default - epatch "${FILESDIR}"/${P}_respect_DESTDIR.patch - sed -e 's#/usr/local#/usr#' -i Makefile || die -} +PATCHES=( + "${FILESDIR}"/${P}_respect_LDFLAGS.patch + "${FILESDIR}"/${P}_test_support_python3.patch +) src_install(){ - emake DESTDIR="${ED}" install - if not use static; then - rm "${ED}"/usr/lib/lib2bit.a || die + dodoc README.md + dolib.so lib2bit.so + doheader 2bit.h + if use static; then + dolib.a lib2bit.a fi }
