[gentoo-commits] repo/gentoo:master commit in: sci-biology/muscle/files/, sci-biology/muscle/

[gentoo-commits] repo/gentoo:master commit in: sci-biology/muscle/files/, sci-biology/muscle/

[David Seifert]

commit:     45c64c3c183dc177c982882b9177abeb0df467dd
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 21:40:04 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 21:40:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c64c3c

sci-biology/muscle: Port to EAPI 7

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-biology/muscle/files/3.8.31-make.patch |  6 ++----
 sci-biology/muscle/muscle-3.8.31.ebuild    | 15 +++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/sci-biology/muscle/files/3.8.31-make.patch b/sci-biology/muscle/files/3.8.31-make.patch
index 7c0e7308df5..fa3f5c3a014 100644
--- a/sci-biology/muscle/files/3.8.31-make.patch
+++ b/sci-biology/muscle/files/3.8.31-make.patch
@@ -1,7 +1,5 @@
-diff --git a/src/mk b/src/mk
-index 475d25a..d4b7e83 100755
---- a/src/mk
-+++ b/src/mk
+--- a/mk
++++ b/mk
 @@ -5,17 +5,14 @@ ObjNames='aligngivenpath.o aligngivenpathsw.o aligntwomsas.o aligntwoprofs.o aln
  rm -f *.o muscle.make.stdout.txt muscle.make.stderr.txt
  for CPPName in $CPPNames

diff --git a/sci-biology/muscle/muscle-3.8.31.ebuild b/sci-biology/muscle/muscle-3.8.31.ebuild
index 1e62a9d28ee..72c9a2c7e17 100644
--- a/sci-biology/muscle/muscle-3.8.31.ebuild
+++ b/sci-biology/muscle/muscle-3.8.31.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="${PN}${PV}_src"
 
@@ -14,19 +14,18 @@ SRC_URI="http://www.drive5.com/muscle/downloads${PV}/${MY_P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 RDEPEND="!sci-libs/libmuscle"
-DEPEND=""
 
 S="${WORKDIR}"/${PN}${PV}/src
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-make.patch
+PATCHES=( "${FILESDIR}"/${PV}-make.patch )
+
+src_configure() {
 	tc-export CXX
 }
 
 src_install() {
-	dobin "${PN}"
+	dobin muscle
 	dodoc *.txt
 }

[gentoo-commits] repo/gentoo:master commit in: sci-biology/muscle/files/, sci-biology/muscle/

[Sam James]

commit:     676077c732029914876df94a29591ae5ed6b4ba2
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Wed Mar 20 03:59:32 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 06:17:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=676077c7

sci-biology/muscle: add 5.1.0

Major new release, major new build system that is majorly broken. <3
scientific code.

This package has not been updated since before the import of gentoo into
git, so I shall simply assume this major version is safe. From the
homepage, it is a "major rewrite", "based on new algorithms", which is
"much more accurate, is often faster, and scales to much larger datasets".

I think that's another way of saying "same old program but with fixes".

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-biology/muscle/Manifest                        |  1 +
 ...x-horribleness-so-that-it-respects-build-.patch | 49 ++++++++++++++++++++++
 sci-biology/muscle/muscle-5.1.0.ebuild             | 33 +++++++++++++++
 3 files changed, 83 insertions(+)

diff --git a/sci-biology/muscle/Manifest b/sci-biology/muscle/Manifest
index f1ec094f5a69..0741cc695e2f 100644
--- a/sci-biology/muscle/Manifest
+++ b/sci-biology/muscle/Manifest
@@ -1 +1,2 @@
+DIST muscle-5.1.0.tar.gz 185437 BLAKE2B b3742c37179fc8c36fb6160be4c3a8b4afa2f686bc018ec8e97a10834c1f1901b54b489faa9c365aa65c8514f378b7b5518d91a4e2fb067492e32202a06c4f64 SHA512 0cafc7ce07e5d0c261811e085e0fec8e44318a3d2604ad530ad95b370d6386143a4eeb59012e17cfc703f54bde5ee0752c3ce7fc8bb489748dbe89b2229dd6eb
 DIST muscle3.8.31_src.tar.gz 515267 BLAKE2B 79a8517f7a14d8ee907104e9035e1284fcabec556544508fd9b712789759448969ce39ecbefcedac62c435dc91e109b3b5b7027120691310ffebda80ca80dd9e SHA512 2baf2aae354ae1e3f529e627be2ace86e89dd15567e1f642a625b63f08ebe3d4bd7315080c7d786d95e3eda8703545ec74af9fe83ad1523d55d00137fb7274ce

diff --git a/sci-biology/muscle/files/0001-Makefile-fix-horribleness-so-that-it-respects-build-.patch b/sci-biology/muscle/files/0001-Makefile-fix-horribleness-so-that-it-respects-build-.patch
new file mode 100644
index 000000000000..a8604239105b
--- /dev/null
+++ b/sci-biology/muscle/files/0001-Makefile-fix-horribleness-so-that-it-respects-build-.patch
@@ -0,0 +1,49 @@
+From 9ef231e4612263524a4c41ecb841cdcf0e17d011 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Tue, 19 Mar 2024 23:44:43 -0400
+Subject: [PATCH] Makefile: fix horribleness so that it respects build system
+ environment
+
+Do not strip, that is portage's job. Respect $CXX, don't override use
+-O.
+---
+ Makefile | 15 ++++-----------
+ 1 file changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index df16673..086aba3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,14 +19,10 @@ OS := $(shell uname)
+ 
+ CPPFLAGS := $(CPPFLAGS) -DNDEBUG -pthread
+ 
+-CXX := g++
+-ifeq ($(OS),Darwin)
+-	CXX := g++-11
+-endif
++CXX ?= g++
++CXXFLAGS := $(CXXFLAGS) -fopenmp -ffast-math
+ 
+-CXXFLAGS := $(CXXFLAGS) -O3 -fopenmp -ffast-math
+-
+-LDFLAGS := $(LDFLAGS) -O3 -fopenmp -pthread -lpthread ${LDFLAGS2}
++LDFLAGS := $(LDFLAGS) -fopenmp -pthread -lpthread ${LDFLAGS2}
+ 
+ HDRS := $(shell echo *.h)
+ OBJS := $(shell echo *.cpp | sed "-es/^/$(OS)\//" | sed "-es/ / $(OS)\//g" | sed "-es/\.cpp/.o/g")
+@@ -35,10 +31,7 @@ SRCS := $(shell ls *.cpp *.h)
+ .PHONY: clean
+ 
+ $(OS)/muscle : gitver.txt $(OS)/ $(OBJS)
+-	$(CXX) $(LDFLAGS) $(OBJS) -o $@
+-
+-	# Warning: do not add -d option to strip, this is not portable
+-	strip $(OS)/muscle
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -o $@
+ 
+ gitver.txt : $(SRCS)
+ 	bash ./gitver.bash
+-- 
+2.43.2
+

diff --git a/sci-biology/muscle/muscle-5.1.0.ebuild b/sci-biology/muscle/muscle-5.1.0.ebuild
new file mode 100644
index 000000000000..033c35b8ee1a
--- /dev/null
+++ b/sci-biology/muscle/muscle-5.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Multiple sequence comparison by log-expectation"
+HOMEPAGE="https://www.drive5.com/muscle/"
+SRC_URI="https://github.com/rcedgar/muscle/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="!sci-libs/libmuscle"
+
+S="${WORKDIR}"/${P}/src
+
+PATCHES=(
+	"${FILESDIR}"/0001-Makefile-fix-horribleness-so-that-it-respects-build-.patch
+)
+
+src_configure() {
+	tc-export CXX
+	printf '"%s"\n' "${PV}" > gitver.txt
+}
+
+src_install() {
+	local OS=$(uname) || die
+	dobin ${OS}/muscle
+	dodoc *.txt
+}