From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5CA79139694 for ; Wed, 8 Mar 2017 22:17:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3F0BE0D05; Wed, 8 Mar 2017 22:17:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80BFDE0D00 for ; Wed, 8 Mar 2017 22:17:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96AA33416B8 for ; Wed, 8 Mar 2017 22:16:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B82A96187 for ; Wed, 8 Mar 2017 22:16:56 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1489011400.38b011b475486566ee6ffc203fdc0c17b2cf577c.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/piler/, sci-biology/piler/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-biology/piler/files/piler-1.0-fix-build-system.patch sci-biology/piler/piler-1.0-r1.ebuild sci-biology/piler/piler-1.0.ebuild X-VCS-Directories: sci-biology/piler/files/ sci-biology/piler/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 38b011b475486566ee6ffc203fdc0c17b2cf577c X-VCS-Branch: master Date: Wed, 8 Mar 2017 22:16:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b8800d51-97c6-4ca8-8b5c-2f016883cb44 X-Archives-Hash: 55561269ddfe324bcb0ba0cc5a4ac26f commit: 38b011b475486566ee6ffc203fdc0c17b2cf577c Author: David Seifert gentoo org> AuthorDate: Wed Mar 8 21:35:40 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Mar 8 22:16:40 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38b011b4 sci-biology/piler: Modernise to EAPI 6 Package-Manager: Portage-2.3.4, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4165 .../piler/files/piler-1.0-fix-build-system.patch | 34 +++++++++++++++++++ sci-biology/piler/piler-1.0-r1.ebuild | 38 ++++++++++++++++++++++ sci-biology/piler/piler-1.0.ebuild | 35 -------------------- 3 files changed, 72 insertions(+), 35 deletions(-) diff --git a/sci-biology/piler/files/piler-1.0-fix-build-system.patch b/sci-biology/piler/files/piler-1.0-fix-build-system.patch new file mode 100644 index 00000000000..78a72f1b485 --- /dev/null +++ b/sci-biology/piler/files/piler-1.0-fix-build-system.patch @@ -0,0 +1,34 @@ +Make build system honour user variables + +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,4 @@ +-CFLAGS = -O3 -march=pentiumpro -mcpu=pentiumpro -funroll-loops -Winline -DNDEBUG=1 +-LDLIBS = -lm -static +-# LDLIBS = -lm ++LDLIBS = -lm + + OBJ = .o + EXE = +@@ -8,18 +6,13 @@ + RM = rm -f + CP = cp + +-GPP = g++ +-LD = $(GPP) $(CFLAGS) +-CPP = $(GPP) -c $(CFLAGS) +-CC = gcc -c $(CFLAGS) +- + all: piler + + CPPSRC = $(sort $(wildcard *.cpp)) + CPPOBJ = $(subst .cpp,.o,$(CPPSRC)) + +-$(CPPOBJ): %.o: %.cpp +- $(CPP) $< -o $@ ++%.o: %.cpp ++ $(CXX) $(CXXFLAGS) -DNDEBUG $(CPPFLAGS) -c $< -o $@ + + piler: $(CPPOBJ) +- $(LD) -o piler $(CPPOBJ) $(LDLIBS) ++ $(CXX) $(LDFLAGS) $(CXXFLAGS) -o piler $(CPPOBJ) $(LDLIBS) diff --git a/sci-biology/piler/piler-1.0-r1.ebuild b/sci-biology/piler/piler-1.0-r1.ebuild new file mode 100644 index 00000000000..276ee9bc873 --- /dev/null +++ b/sci-biology/piler/piler-1.0-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="Analysis of repetitive DNA found in genome sequences" +HOMEPAGE="http://www.drive5.com/piler/" +SRC_URI="http://www.drive5.com/piler/piler_source.tar.gz -> ${P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=" + || ( + sci-biology/muscle + sci-libs/libmuscle + ) + sci-biology/pals" + +S=${WORKDIR} + +PATCHES=( + "${FILESDIR}"/${PN}-1.0-fix-build-system.patch + "${FILESDIR}"/${PN}-1.0-glibc-2.10.patch +) + +src_configure() { + tc-export CXX +} + +src_install() { + dobin piler +} diff --git a/sci-biology/piler/piler-1.0.ebuild b/sci-biology/piler/piler-1.0.ebuild deleted file mode 100644 index 99894726d3d..00000000000 --- a/sci-biology/piler/piler-1.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -inherit eutils toolchain-funcs - -DESCRIPTION="Analysis of repetitive DNA found in genome sequences" -HOMEPAGE="http://www.drive5.com/piler/" -#SRC_URI="http://www.drive5.com/piler/piler_source.tar.gz" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="" -RDEPEND="|| ( sci-biology/muscle - sci-libs/libmuscle ) - sci-biology/pals" - -S=${WORKDIR} - -src_prepare() { - epatch "${FILESDIR}"/${P}-glibc-2.10.patch -} - -src_compile() { - emake GPP="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" || die -} - -src_install() { - dobin piler -}