commit: 8fbc78adda521381c3f87d7da4c9d4dc7a674647 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Wed Mar 8 21:35:40 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Wed Mar 8 22:16:45 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fbc78ad
sci-biology/pilercr: Modernise to EAPI 6 Package-Manager: Portage-2.3.4, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4165 .../files/pilercr-1.0-fix-build-system.patch | 34 ++++++++++++++++++++++ sci-biology/pilercr/pilercr-1.0-r1.ebuild | 30 +++++++++++++++++++ sci-biology/pilercr/pilercr-1.0.ebuild | 30 ------------------- 3 files changed, 64 insertions(+), 30 deletions(-) diff --git a/sci-biology/pilercr/files/pilercr-1.0-fix-build-system.patch b/sci-biology/pilercr/files/pilercr-1.0-fix-build-system.patch new file mode 100644 index 00000000000..3754f80a934 --- /dev/null +++ b/sci-biology/pilercr/files/pilercr-1.0-fix-build-system.patch @@ -0,0 +1,34 @@ +Make build system honour user variables + +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,4 @@ +-CFLAGS = -O3 -funroll-loops -Winline -DNDEBUG=1 +-#CFLAGS = -O3 -funroll-loops -Winline +-LDLIBS = -lm -static +-# LDLIBS = -lm ++LDLIBS = -lm + + OBJ = .o + EXE = +@@ -9,17 +6,13 @@ + RM = rm -f + CP = cp + +-GPP = g++ +-LD = $(GPP) $(CFLAGS) +-CPP = $(GPP) -c $(CFLAGS) +- + all: pilercr + + CPPSRC = $(sort $(wildcard *.cpp)) + CPPOBJ = $(subst .cpp,.o,$(CPPSRC)) + +-$(CPPOBJ): %.o: %.cpp +- $(CPP) $< -o $@ ++%.o: %.cpp ++ $(CXX) $(CXXFLAGS) -DNDEBUG $(CPPFLAGS) -c $< -o $@ + + pilercr: $(CPPOBJ) +- $(LD) -o pilercr $(CPPOBJ) $(LDLIBS) ++ $(CXX) $(LDFLAGS) $(CXXFLAGS) -o pilercr $(CPPOBJ) $(LDLIBS) diff --git a/sci-biology/pilercr/pilercr-1.0-r1.ebuild b/sci-biology/pilercr/pilercr-1.0-r1.ebuild new file mode 100644 index 00000000000..8b1abd5de7d --- /dev/null +++ b/sci-biology/pilercr/pilercr-1.0-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="Analysis of Clustered Regularly Interspaced Short Palindromic Repeats (CRISPRs)" +HOMEPAGE="http://www.drive5.com/pilercr/"; +SRC_URI="http://www.drive5.com/pilercr/pilercr1.06.tar.gz -> ${P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +S=${WORKDIR} + +PATCHES=( + "${FILESDIR}"/${PN}-1.0-fix-build-system.patch + "${FILESDIR}"/${PN}-1.0-gcc43.patch +) + +src_configure() { + tc-export CXX +} + +src_install() { + dobin ${PN} +} diff --git a/sci-biology/pilercr/pilercr-1.0.ebuild b/sci-biology/pilercr/pilercr-1.0.ebuild deleted file mode 100644 index ae34e105c64..00000000000 --- a/sci-biology/pilercr/pilercr-1.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils toolchain-funcs - -DESCRIPTION="Analysis of Clustered Regularly Interspaced Short Palindromic Repeats (CRISPRs)" -HOMEPAGE="http://www.drive5.com/pilercr/"; -#SRC_URI="http://www.drive5.com/pilercr/pilercr.tar.gz"; -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -S="${WORKDIR}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc43.patch -} - -src_compile() { - emake GPP="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" -} - -src_install() { - dobin ${PN} -}
