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 67F5E138334 for ; Sat, 17 Aug 2019 11:19:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6FD97E0916; Sat, 17 Aug 2019 11:19:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4280AE090E for ; Sat, 17 Aug 2019 11:19:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 244FE349CB5 for ; Sat, 17 Aug 2019 11:19:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CAA3765 for ; Sat, 17 Aug 2019 11:19:40 +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: <1566040759.bcc75ebcff4cfb8a99a5a5f418f3b73174da7e11.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/stride/files/, sci-biology/stride/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-biology/stride/files/stride-20011129-fix-buildsystem.patch sci-biology/stride/files/stride-LDFLAGS.patch sci-biology/stride/stride-20011129-r1.ebuild X-VCS-Directories: sci-biology/stride/ sci-biology/stride/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: bcc75ebcff4cfb8a99a5a5f418f3b73174da7e11 X-VCS-Branch: master Date: Sat, 17 Aug 2019 11:19:40 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 16f79796-e054-4951-9555-40191121bee2 X-Archives-Hash: 24ee83a4e1d1e959b89baa1995f02e6c commit: bcc75ebcff4cfb8a99a5a5f418f3b73174da7e11 Author: David Seifert gentoo org> AuthorDate: Sat Aug 17 11:19:19 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Aug 17 11:19:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcc75ebc sci-biology/stride: Port to EAPI 7 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: David Seifert gentoo.org> .../files/stride-20011129-fix-buildsystem.patch | 21 +++++++++++++++++++ sci-biology/stride/files/stride-LDFLAGS.patch | 11 ---------- sci-biology/stride/stride-20011129-r1.ebuild | 24 +++++++++------------- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/sci-biology/stride/files/stride-20011129-fix-buildsystem.patch b/sci-biology/stride/files/stride-20011129-fix-buildsystem.patch new file mode 100644 index 00000000000..ec4415ec45d --- /dev/null +++ b/sci-biology/stride/files/stride-20011129-fix-buildsystem.patch @@ -0,0 +1,21 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,3 @@ +-CC = gcc -g + FLAGS = -lm -o + + SOURCE = stride.c splitstr.c rdpdb.c initchn.c geometry.c thr2one.c one2thr.c filename.c tolostr.c strutil.c place_h.c hbenergy.c memory.c helix.c sheet.c rdmap.c phipsi.c command.c molscr.c die.c hydrbond.c mergepat.c fillasn.c escape.c p_jrnl.c p_rem.c p_atom.c p_helix.c p_sheet.c p_turn.c p_ssbond.c p_expdta.c p_model.c p_compnd.c report.c nsc.c area.c ssbond.c chk_res.c chk_atom.c turn.c pdbasn.c dssp.c outseq.c chkchain.c elem.c measure.c asngener.c p_endmdl.c stred.c contact_order.c contact_map.c +@@ -7,12 +6,9 @@ + + BINDIR = . + +-.c.o: +- $(CC) -c $< -o $@ +- + + stride : $(OBJECT) +- $(CC) $(OBJECT) $(FLAGS) $(BINDIR)/stride ++ $(CC) $(LDFLAGS) $(OBJECT) $(FLAGS) $(BINDIR)/stride + + $(OBJECT) : stride.h protot.h + diff --git a/sci-biology/stride/files/stride-LDFLAGS.patch b/sci-biology/stride/files/stride-LDFLAGS.patch deleted file mode 100644 index 1761b12129b..00000000000 --- a/sci-biology/stride/files/stride-LDFLAGS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile 2009-10-27 21:18:45.000000000 +0100 -+++ Makefile.new 2009-10-27 21:19:00.000000000 +0100 -@@ -12,7 +12,7 @@ - - - stride : $(OBJECT) -- $(CC) $(OBJECT) $(FLAGS) $(BINDIR)/stride -+ $(CC) $(LDFLAGS) $(OBJECT) $(FLAGS) $(BINDIR)/stride - - $(OBJECT) : stride.h protot.h - diff --git a/sci-biology/stride/stride-20011129-r1.ebuild b/sci-biology/stride/stride-20011129-r1.ebuild index 77a19f3ea89..678887de925 100644 --- a/sci-biology/stride/stride-20011129-r1.ebuild +++ b/sci-biology/stride/stride-20011129-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Protein secondary structure assignment from atomic coordinates" HOMEPAGE="http://webclu.bio.wzw.tum.de/stride/" @@ -11,25 +11,21 @@ SRC_URI=" ftp://ftp.ebi.ac.uk/pub/software/unix/${PN}/src/${PN}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~jlec/distfiles/${PN}-20060723-update.patch.bz2" -SLOT="0" LICENSE="STRIDE" +SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="" - -S="${WORKDIR}" - RESTRICT="mirror bindist" -src_prepare() { +S="${WORKDIR}" +PATCHES=( # this patch updates the source to the most recent # version which was kindly provided by the author - epatch \ - "${DISTDIR}/${PN}-20060723-update.patch.bz2" \ - "${FILESDIR}"/${PN}-LDFLAGS.patch + "${S}"/${PN}-20060723-update.patch + "${FILESDIR}"/${PN}-20011129-fix-buildsystem.patch +) - # fix makefile - sed -e "/^CC/s|gcc -g|$(tc-getCC) ${CFLAGS}|" -i Makefile || \ - die "Failed to fix Makefile" +src_configure() { + tc-export CC } src_install() {