gentoo auto-resync : 22:03:2024 - 13:00:51

5 files changed, 142 insertions, 1 deletions

diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index ca357d460b60..1530474c3960 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/mothur/Manifest b/sci-biology/mothur/Manifest
index 28a0c3b5a9b6..99b3c7c8c11b 100644
--- a/sci-biology/mothur/Manifest
+++ b/sci-biology/mothur/Manifest
@@ -1,5 +1,8 @@
 AUX mothur-1.27.0-makefile.patch 1196 BLAKE2B dbe053a5f5629eadae57bd09545ef46106741204050d0c888532388fe0b7f8f2fe4d5f311163e95812d0d828aae2228a2f72b7f0c861f5a3d42a41e17b6ba4f3 SHA512 8a78ddbc926d4e116deed440fda8431ccbca3299ac182fc84850259187dc130cc43fb6f23845d055d998293fa43f94cbe35930242c5f6aa049f8275ad3e42adf
 AUX mothur-1.27.0-overflows.patch 4894 BLAKE2B a9de0276a9ccbb5e86d6cf208f86414ea8c0befdf80807e05b40bee0c6f685cb40a608005e69eb3f77b85990424a36cde14971044cb6a1136a50d85078eb9f1f SHA512 aa392b2060cecc38006a7ac50aaa8e4249a020029234ac2abdc33441b12a09faabb0335144ff4d888e55a1da1838a45347981f49f6658f3546a54a30b5e2133a
+AUX mothur-1.48.0-build.patch 2837 BLAKE2B f19587aa3859f4eb364ef98579181a2bc1931ee5c17019971fa295ecff38912fa0bf6290f3ccbad404c81e9eba39aa2632ace134db2de314520b326dbce4b6c1 SHA512 2ce51e3ccb2b7fe9ce39399196817ffe6bb0819bdfa6cb421d1f0b514f563479854c0f1741f856e961b26d3487214b450f0788ad9a3fd97a6c25ab47ef9e001f
 DIST mothur-1.27.0.zip 7095054 BLAKE2B 96a6410d36f64ff50591955aa22bfddf6217c7568022c8c7f70ab70c65d57af2217477de56b6f9ceaf11237cdc5380bd354cf6564002357546539585d0f58221 SHA512 81821ca95d4ce3f0d1e6aa920c4fe3fddd70f716157312ed0590c1c4ad728e6786bfe79f6badddcfb060ed5d1996cc1b5062c320a59209fef35f68e687ba3dd5
+DIST mothur-1.48.0.tar.gz 1652711 BLAKE2B 39e1d2a32a63d441267b4e0e739505bdcb3ab392c169c96d60e816dbd9fab6b92745e8a9eaae31062711f2de0130dae540bba34c6bd97e76a921711f58c11f65 SHA512 a43ef6a223238d40e51c15043360ba9cae86347affea2f1a4e365635fb0949981ad32001b88d4061a033b2a002e944df16923a0622a40bf061791f06143467e1
 EBUILD mothur-1.27.0-r1.ebuild 846 BLAKE2B 7e8af4ea878dc3ba7a9361780a36cbb5a9fedd2b6c91a0cf1c7bb641a740e744aebfa9e7680d93627fb01ae2c01605c360eed12458bd1582f183d45a8e6fdc1d SHA512 4f7c99493fdecf9e27b5804252377a24ebb8e7d5f23e6a73e41082aad6dfbc5004e40cfe2c97145da23344d73ed0af09c5fc8a51027b31191ac78d869c354906
-MISC metadata.xml 340 BLAKE2B cbec7e93cd78a2aa9652b6aa68d8f1c4838fff7c44db75c3bf4f08aaf24d0ff91d3a20a73143263d079a8658b526ad58714df48306fb7a3f5d79b9e65fb543f4 SHA512 325f529a1181d96fe70899f2e91ed7eb9e175d2421e50947e1fe3424abf4075dd8b96e07711e28a5a3de51885efc80c26de2ecc81e62b3a4a690e02f924e87c9
+EBUILD mothur-1.48.0.ebuild 1383 BLAKE2B 4226ac7c0b207b1047559d82dff828bb9a1304e3d262421663088c7ac0373d365d76ce26ca28c4711664f537444d4f84b1a27ba236a9b59a985122b93b3ce449 SHA512 6bb207b84b2ac57562fb767b3709e0c6d0e15b420dac3debeac4d2feb88223db0045e7ca2f0e0e06d2c59044545132e2d08d175c81024d3ae49ac63aa4b95b89
+MISC metadata.xml 681 BLAKE2B c6772d8e4d8db5e3fe259981d73b1428232e0196c8cf4455bd1f5717d7abe1aeb05f214aa303b85d029921823ea3408ac20405639d21076c82dcdc45c1e574b2 SHA512 557f3b858e116e178267f2a0752bcc71c6ccd02c24d98e0668951b2ccd319fce1766c46814a1c42be3e831bbea8153572e4085c533f334acc5f76b5e68d0ae3e
diff --git a/sci-biology/mothur/files/mothur-1.48.0-build.patch b/sci-biology/mothur/files/mothur-1.48.0-build.patch
new file mode 100644
index 000000000000..da9784e20dd8
--- /dev/null
+++ b/sci-biology/mothur/files/mothur-1.48.0-build.patch
@@ -0,0 +1,79 @@
+Fix building and don't use bundled uchime.
+--- a/Makefile
++++ b/Makefile
+@@ -104,12 +104,19 @@ endif
+ # INCLUDE directories for mothur
+ #
+ #
+-	VPATH=source/calculators:source/chimera:source/classifier:source/clearcut:source/commands:source/communitytype:source/datastructures:source/engines:source/metastats:source/read:source/svm:source/
++	VPATH=source:source/calculators:source/chimera:source/classifier:source/clearcut:source/commands:source/communitytype:source/datastructures:source/engines:source/metastats:source/read:source/svm:source/
++    source := source
+     skipUchime := source/uchime_src/
++    skipTestMothur := source/TestMothur/
++    skipSeqnoise := seqnoise.cpp
+     subdirs :=  $(sort $(dir $(filter-out  $(skipUchime), $(wildcard source/*/))))
++    subdirs :=  $(filter-out  $(skipTestMothur), $(subdirs))
+     subDirIncludes = $(patsubst %, -I %, $(subdirs))
++    subDirIncludes += $(patsubst %, -I %, $(source))
+     subDirLinking =  $(patsubst %, -L%, $(subdirs))
+-    CXXFLAGS += -I. $(subDirIncludes)
++    subDirLinking +=  $(patsubst %, -L%, $(source))
++    subdirs :=  $(dir source) $(sort $(dir $(filter-out  $(skipUchime), $(wildcard source/*/))))
++    CXXFLAGS += -Isource -I. $(subDirIncludes)
+     LDFLAGS += $(subDirLinking)
+ 
+ 
+@@ -118,15 +125,14 @@ endif
+ #
+     OBJECTS=$(patsubst %.cpp,%.o,$(wildcard $(addsuffix *.cpp,$(subdirs))))
+     OBJECTS+=$(patsubst %.c,%.o,$(wildcard $(addsuffix *.c,$(subdirs))))
++    OBJECTS+=$(patsubst %.cpp,%.o,$(filter-out $(skipSeqnoise), $(wildcard source/*.cpp)))
++    OBJECTS+=$(patsubst %.cpp,%.o,$(filter-out $(skipSeqnoise), $(wildcard source/*.c)))
+     OBJECTS+=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
+     OBJECTS+=$(patsubst %.c,%.o,$(wildcard *.c))
+ 
+-mothur : $(OBJECTS) uchime
++mothur : $(OBJECTS)
+ 	$(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)
+ 
+-uchime :
+-	cd source/uchime_src && export CXX=$(CXX) && make clean && make && mv uchime ../../ && cd ..
+-
+ install : mothur
+ 
+ ifeq  ($(strip $(INSTALL_DIR)),"\"Enter_your_mothur_install_path_here\"")
+--- a/makefile-internal
++++ b/makefile-internal
+@@ -115,7 +115,6 @@ endif
+ 
+ mothur : $(OBJECTS)
+     $(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)
+-    strip mothur
+ 
+ %.o : %.c %.h
+     $(COMPILE.c) $(OUTPUT_OPTION) $<
+--- a/source/uchime_src/makefile
++++ b/source/uchime_src/makefile
+@@ -1,4 +1,4 @@
+-CXXFLAGS = -O3 -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 -DUCHIMES=1
++CXXFLAGS = -std=c++11 -O3 -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 -DUCHIMES=1
+ LDFLAGS = -g
+ 
+ #
+@@ -26,4 +26,4 @@ install : uchime
+ 
+ clean :
+ 	@rm -f $(OBJECTS)
+-	
+\ No newline at end of file
++	
+--- a/source/writer.h
++++ b/source/writer.h
+@@ -9,6 +9,7 @@
+ #ifndef writer_h
+ #define writer_h
+ 
++#include <memory>
+ #include "sharedwriter.hpp"
+ 
+ /***********************************************************************/
diff --git a/sci-biology/mothur/metadata.xml b/sci-biology/mothur/metadata.xml
index fc926cc4aa42..15fc0072ba17 100644
--- a/sci-biology/mothur/metadata.xml
+++ b/sci-biology/mothur/metadata.xml
@@ -5,6 +5,11 @@
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>
+	<use>
+		<flag name="boost">Depend on <pkg>dev-libs/boost</pkg> for make.contigs to read .gz compressed files.</flag>
+		<flag name="gsl">Use <pkg>sci-libs/gsl</pkg> to support diversity estimates for estimiator.single.</flag>
+		<flag name="hdf5">Support Biom format 2.0 for the biom.info command via <pkg>sci-libs/hdf5</pkg>.</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">mothur/mothur</remote-id>
 	</upstream>
diff --git a/sci-biology/mothur/mothur-1.48.0.ebuild b/sci-biology/mothur/mothur-1.48.0.ebuild
new file mode 100644
index 000000000000..7d54bf273ac0
--- /dev/null
+++ b/sci-biology/mothur/mothur-1.48.0.ebuild
@@ -0,0 +1,54 @@
+# 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="A suite of algorithms for ecological bioinformatics"
+HOMEPAGE="https://mothur.org/"
+SRC_URI="https://github.com/mothur/mothur/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost gsl hdf5 mpi +readline"
+
+RDEPEND="
+	sci-biology/uchime
+	boost? ( dev-libs/boost:=[zlib] )
+	gsl? ( sci-libs/gsl:= )
+	hdf5? ( sci-libs/hdf5:=[cxx] )
+	mpi? ( virtual/mpi )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.48.0-build.patch
+)
+
+src_configure() {
+	use mpi && export CXX=mpicxx || tc-export CXX
+	use amd64 && append-cppflags -DBIT_VERSION
+}
+
+src_compile() {
+	# bug #862273
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	# USEBOOST - link with boost libraries. Must install boost. Allows the make.contigs command to read .gz files.
+	# USEHDF5 - link with HDF5cpp libraries. Must install HDF5. Allows the biom.info command to read Biom format 2.0.
+	# USEGSL - link with GNU Scientific libraries. Must install GSL. Allows the estimiator.single command to find diversity estimates.
+	emake \
+		USEBOOST=$(usex boost) \
+		USEHDF5=$(usex hdf5) \
+		USEGSL=$(usex gsl) \
+		USEMPI=$(usex mpi) \
+		USEREADLINE=$(usex readline) \
+		OPTIMIZE=no
+}
+
+src_install() {
+	dobin mothur
+}