[gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/, profiles/, sci-misc/kaldi/files/

[Horea Christian]

commit:     793dd58bb193e275f9a72f152372fbada2a0988e
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Fri Dec 25 10:25:18 2020 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Fri Dec 25 10:25:18 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=793dd58b

sci-misc/kaldi: dropped broken and deprecated package

https://github.com/gentoo/sci/issues/817

Signed-off-by: Horea Christian <chr <AT> chymera.eu>

 profiles/package.mask                              |   1 -
 sci-misc/kaldi/files/Makefile.0d5e4b1.patch        |  45 -------
 sci-misc/kaldi/files/Makefile.patch                |  60 ---------
 .../kaldi/files/default_rules.mk.96eec2b.patch     |  30 -----
 .../kaldi/files/default_rules.mk.a7d9824.patch     |  30 -----
 sci-misc/kaldi/kaldi-0_p20160628.ebuild            | 135 -------------------
 sci-misc/kaldi/kaldi-5.1.65.ebuild                 | 146 ---------------------
 sci-misc/kaldi/metadata.xml                        |  24 ----
 8 files changed, 471 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index af612da87..988e25f2d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -151,7 +151,6 @@ sci-mathematics/freefem++
 sci-mathematics/lattE-macchiato
 sci-mathematics/Macaulay2
 sci-mathematics/pff
-sci-misc/kaldi
 sci-misc/kotus-sanalista
 sci-physics/fullprof-bin
 sci-physics/openmx

diff --git a/sci-misc/kaldi/files/Makefile.0d5e4b1.patch b/sci-misc/kaldi/files/Makefile.0d5e4b1.patch
deleted file mode 100644
index 80b9862c6..000000000
--- a/sci-misc/kaldi/files/Makefile.0d5e4b1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/Makefile.orig	2017-03-03 01:33:22.000000000 +0100
-+++ src/Makefile	2017-03-03 18:06:59.912864196 +0100
-@@ -32,7 +32,6 @@
- # Reset the default goal, so that the all target will become default
- .DEFAULT_GOAL :=
- all: 
--	$(MAKE) checkversion 
- 	$(MAKE) kaldi.mk 
- 	$(MAKE) mklibdir
- 	$(MAKE) subdirs
-@@ -52,18 +51,6 @@
- 	@true
- endif
- 
--.PHONY: checkversion
--checkversion:
--ifeq ($(shell ./configure --version),$(CONFIGURE_VERSION))
--	@echo "The version of configure script matches kaldi.mk version. Good."
--else
--	@echo ""
--	@echo "The kaldi.mk file was generated using a different version of configure script. Please rerun the configure again"
--	@test -f ./kaldi.mk && echo  "Hint: Previous configure command line: " && head -n 2 ./kaldi.mk | grep configure | sed 's/^# *//g'
--	@echo ""
--	@false
--endif
--
- biglib: $(SUBDIRS_LIB)
- ifeq ($(KALDI_FLAVOR), dynamic)
- ifeq ($(shell uname), Darwin)
-@@ -136,6 +123,15 @@
- ext_depend: check_portaudio
- 	-for x in $(EXT_SUBDIRS); do $(MAKE) -C $$x depend; done
- 
-+print-binfiles: $(addsuffix /print-binfiles, $(SUBDIRS))
-+
-+%/print-binfiles:
-+	@$(MAKE) --no-print-directory -C $(dir $@) print-binfiles
-+
-+print-libfiles: $(addsuffix /print-libfiles, $(SUBDIRS))
-+
-+%/print-libfiles:
-+	@$(MAKE) --no-print-directory -C $(dir $@) print-libfiles
- 
- .PHONY: $(SUBDIRS)
- $(SUBDIRS) : mklibdir

diff --git a/sci-misc/kaldi/files/Makefile.patch b/sci-misc/kaldi/files/Makefile.patch
deleted file mode 100644
index 0556e2531..000000000
--- a/sci-misc/kaldi/files/Makefile.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/Makefile.orig	2015-11-06 18:43:31.000000000 -0400
-+++ src/Makefile	2015-11-17 20:15:14.452502675 -0400
-@@ -30,7 +30,7 @@
- 
- # Reset the default goal, so that the all target will become default
- .DEFAULT_GOAL :=
--all: checkversion test_dependencies kaldi.mk mklibdir $(SUBDIRS)
-+all: kaldi.mk mklibdir $(SUBDIRS)
- 	-echo Done
- 
- mklibdir:
-@@ -45,14 +45,6 @@
- 	@true
- endif
- 
--.PHONY: checkversion
--checkversion:
--ifeq ($(shell ./configure --version),$(CONFIGURE_VERSION))
--	@echo "The version of configure script matches kaldi.mk version. Good."
--else
--	$(error The kaldi.mk file was generated using a different version of configure script. Run the configure script again.)
--endif
--
- biglib: $(SUBDIRS_LIB)
- ifeq ($(KALDI_FLAVOR), dynamic)
- ifeq ($(shell uname), Darwin)
-@@ -88,16 +80,6 @@
- ext: test_dependencies ext_depend $(SUBDIRS) $(EXT_SUBDIRS)
- 	-echo Done
- 
--ifndef OPENFST_VER
--$(error Please rerun configure: OPENFST_VER is not defined, likely kaldi.mk was produced by older configure script.)
--endif
--# Note: OPENFST_VER is determined by configure and added to kaldi.mk
--OPENFST_VER_NUM := $(shell echo $(OPENFST_VER) | sed 's/\./ /g' | xargs printf "%d%02d%02d")
--test_dependencies:
--ifeq ("$(shell expr $(OPENFST_VER_NUM) \< 10302)","1")
--	$(error OpenFst $(OPENFST_VER) is not supported. You now need OpenFst >= 1.3.2.)
--endif
--
- check_portaudio:
- 	@[ -d ../tools/portaudio ] || ( cd ../tools;  ./install_portaudio.sh )
- 
-@@ -131,6 +113,16 @@
- ext_depend: check_portaudio
- 	-for x in $(EXT_SUBDIRS); do $(MAKE) -C $$x depend; done
- 
-+print-binfiles: $(addsuffix /print-binfiles, $(SUBDIRS))
-+
-+%/print-binfiles:
-+	@$(MAKE) --no-print-directory -C $(dir $@) print-binfiles
-+
-+print-libfiles: $(addsuffix /print-libfiles, $(SUBDIRS))
-+
-+%/print-libfiles:
-+	@$(MAKE) --no-print-directory -C $(dir $@) print-libfiles
-+
- 
- .PHONY: $(SUBDIRS)
- $(SUBDIRS) : mklibdir

diff --git a/sci-misc/kaldi/files/default_rules.mk.96eec2b.patch b/sci-misc/kaldi/files/default_rules.mk.96eec2b.patch
deleted file mode 100644
index 89a3103ba..000000000
--- a/sci-misc/kaldi/files/default_rules.mk.96eec2b.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/makefiles/default_rules.mk.orig	2017-03-03 01:33:22.000000000 +0100
-+++ src/makefiles/default_rules.mk	2017-03-03 18:24:54.159740235 +0100
-@@ -12,7 +12,7 @@
-     ifdef LIBNAME
-       LIBFILE = lib$(LIBNAME).so
-     endif
--    LDFLAGS += -Wl,-rpath=$(shell readlink -f $(KALDILIBDIR))
-+    LDFLAGS += -L. $(foreach dep,$(ADDLIBS), -L$(dir $(dep)))
-     EXTRA_LDLIBS += $(foreach dep,$(ADDLIBS), $(dir $(dep))lib$(notdir $(basename $(dep))).so)
-   else  # Platform not supported
-     $(error Dynamic libraries not supported on this platform. Run configure with --static flag.)
-@@ -82,7 +82,7 @@
- 	for x in $(TESTFILES); do	\
- 	  printf "Running $$x ...";	\
-       timestamp1=$$(date +"%s"); \
--	  ./$$x >$$x.testlog 2>&1;	\
-+	  LD_LIBRARY_PATH=$(KALDILIBDIR):${LD_LIBRARY_PATH} ./$$x >$$x.testlog 2>&1;	\
-       ret=$$? \
-       timestamp2=$$(date +"%s"); \
-       time_taken=$$[timestamp2-timestamp1]; \
-@@ -121,3 +121,9 @@
- # removing automatic making of "depend" as it's quite slow.
- #.depend.mk: depend
- -include .depend.mk
-+
-+print-binfiles:
-+	@echo $(addprefix $(shell pwd)/, $(BINFILES))
-+
-+print-libfiles:
-+	@echo $(addsuffix .so, $(addprefix $(shell pwd)/lib, $(LIBNAME)))

diff --git a/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch b/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch
deleted file mode 100644
index a51fd2035..000000000
--- a/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/makefiles/default_rules.mk.orig	2015-11-06 18:43:31.000000000 -0400
-+++ src/makefiles/default_rules.mk	2015-11-09 18:42:33.609774157 -0400
-@@ -14,7 +14,7 @@
-         LIBFILE = lib$(LIBNAME).so
-         #LDLIBS  += -l$(LIBNAME)
-       endif
--      LDFLAGS += -Wl,-rpath=$(shell readlink -f $(KALDILIBDIR)) -L.
-+      LDFLAGS += -L.
-       LDFLAGS += $(foreach dep,$(ADDLIBS), -L$(dir $(dep)) )
-       XDEPENDS = $(foreach dep,$(ADDLIBS), $(dir $(dep))/lib$(notdir $(basename $(dep))).so )
-     else  # Platform not supported
-@@ -75,7 +75,7 @@
- 	@{ result=0;			\
- 	for x in $(TESTFILES); do	\
- 	  printf "Running $$x ...";	\
--	  ./$$x >$$x.testlog 2>&1;	\
-+	  LD_LIBRARY_PATH=$(KALDILIBDIR):${LD_LIBRARY_PATH} ./$$x >$$x.testlog 2>&1;	\
- 	  if [ $$? -ne 0 ]; then	\
- 	    echo "... FAIL $$x";	\
- 	    result=1;			\
-@@ -99,3 +99,9 @@
- # removing automatic making of "depend" as it's quite slow.
- #.depend.mk: depend
- -include .depend.mk
-+
-+print-binfiles:
-+	@echo $(addprefix $(shell pwd)/, $(BINFILES))
-+
-+print-libfiles:
-+	@echo $(addsuffix .so, $(addprefix $(shell pwd)/lib, $(LIBNAME)))

diff --git a/sci-misc/kaldi/kaldi-0_p20160628.ebuild b/sci-misc/kaldi/kaldi-0_p20160628.ebuild
deleted file mode 100644
index 520d7cfa4..000000000
--- a/sci-misc/kaldi/kaldi-0_p20160628.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs cuda flag-o-matic
-
-COMMIT_ID="16e69f1aacce8ad0665d2b6666c053b1421a9e91"
-DESCRIPTION="A toolkit for speech recognition"
-HOMEPAGE="http://kaldi-asr.org/"
-SRC_URI="https://github.com/kaldi-asr/kaldi/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-S=${WORKDIR}/${PN}-${COMMIT_ID}/src
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cuda doc speex test"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	speex? ( media-libs/speex )
-	virtual/cblas
-	virtual/lapack
-	virtual/lapacke
-	<sci-misc/openfst-1.5.0
-	cuda? ( dev-util/nvidia-cuda-toolkit )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
-# user is (usually) not in the video group
-RESTRICT="cuda? ( userpriv )"
-
-pkg_pretend() {
-	local cblas_provider=$(eselect cblas show)
-
-	if [[ ! ${cblas_provider} =~ (atlas|mkl|openblas) ]]; then
-		die "Build with '${cblas_provider}' CBLAS is not supported"
-	fi
-}
-
-src_prepare() {
-	eapply \
-		"${FILESDIR}"/Makefile.patch \
-		"${FILESDIR}"/default_rules.mk.a7d9824.patch
-	eapply_user
-
-	use cuda && cuda_src_prepare
-}
-
-src_configure() {
-	append-cxxflags \
-		-DHAVE_EXECINFO_H=1 \
-		-DHAVE_CXXABI_H \
-		-DHAVE_OPENFST_GE_10400 \
-		-std=c++11 \
-		-Wall \
-		-I.. \
-		-pthread \
-		-Wno-sign-compare \
-		-Wno-unused-local-typedefs \
-		-Winit-self \
-		-rdynamic \
-		-fPIC \
-		$($(tc-getPKG_CONFIG) --cflags cblas) \
-		$($(tc-getPKG_CONFIG) --cflags lapack)
-
-	append-libs \
-		-lfst \
-		-lm \
-		-lpthread \
-		-ldl \
-		$($(tc-getPKG_CONFIG) --libs cblas) \
-		$($(tc-getPKG_CONFIG) --libs lapack)
-
-	local cblas_provider=$(eselect cblas show)
-
-	if [[ ${cblas_provider} =~ atlas ]]; then
-		append-cxxflags -DHAVE_ATLAS
-	elif [[ ${cblas_provider} =~ mkl ]]; then
-		append-cxxflags -DHAVE_MKL
-	elif [[ ${cblas_provider} =~ openblas ]]; then
-		append-cxxflags -DHAVE_OPENBLAS $($(tc-getPKG_CONFIG) --cflags lapacke)
-	fi
-
-	use test || append-cxxflags -DNDEBUG
-
-	if use speex; then
-		append-cxxflags -DHAVE_SPEEX
-		append-libs -lspeex
-	fi
-
-	cat <<-EOF > kaldi.mk
-		KALDI_FLAVOR := dynamic
-		KALDILIBDIR := "${S}"/lib
-		CC = $(tc-getCXX)
-		RANLIB = $(tc-getRANLIB)
-		LDLIBS = ${LIBS}
-		DOUBLE_PRECISION = 0
-	EOF
-
-	if use cuda; then
-		cat <<-EOF >> kaldi.mk
-			CUDA = true
-			CUDATKDIR = "${EPREFIX}"/opt/cuda
-			CUDA_ARCH :=
-			CUDA_ARCH +=
-		EOF
-		cat makefiles/cuda_64bit.mk >> kaldi.mk
-		sed -i \
-			-e "s:CUDA_FLAGS = -g:CUDA_FLAGS = ${NVCCFLAGS}:" \
-			kaldi.mk || die "sed unix/kaldi.mk failed"
-	fi
-}
-
-src_compile() {
-	default
-	use doc && doxygen
-}
-
-src_test() {
-	if use cuda; then
-		addwrite /dev/nvidiactl
-		addwrite /dev/nvidia0
-		addwrite /dev/nvidia-uvm
-	fi
-	default
-}
-
-src_install() {
-	dolib.so $(make print-libfiles)
-	dobin $(make print-binfiles)
-	use doc && dodoc -r html
-}

diff --git a/sci-misc/kaldi/kaldi-5.1.65.ebuild b/sci-misc/kaldi/kaldi-5.1.65.ebuild
deleted file mode 100644
index 4304f695c..000000000
--- a/sci-misc/kaldi/kaldi-5.1.65.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs cuda flag-o-matic
-
-COMMIT_ID="9e06caa1fb0306898632c6fa3ad67571c4d06cf5"
-DESCRIPTION="A toolkit for speech recognition"
-HOMEPAGE="http://kaldi-asr.org/"
-SRC_URI="https://github.com/kaldi-asr/kaldi/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda doc double-precision speex test"
-REQUIRED_USE="double-precision? ( !speex )"
-
-RDEPEND="
-	>=sci-misc/openfst-1.6.0
-	virtual/cblas
-	virtual/lapack
-	virtual/lapacke
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${PN}-${COMMIT_ID}/src
-
-PATCHES=(
-	"${FILESDIR}"/Makefile.0d5e4b1.patch
-	"${FILESDIR}"/default_rules.mk.96eec2b.patch
-)
-
-# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
-# user is (usually) not in the video group
-RESTRICT="cuda? ( userpriv )"
-
-pkg_pretend() {
-	local cblas_provider=$(eselect cblas show)
-
-	if [[ ! ${cblas_provider} =~ (atlas|openblas) ]]; then
-		die "Build with '${cblas_provider}' CBLAS is not supported"
-	fi
-}
-
-src_prepare() {
-	default
-	use cuda && cuda_src_prepare
-}
-
-src_configure() {
-	cat <<-EOF > base/version.h
-		#define KALDI_VERSION "${PV}-${COMMIT_ID:0:5}"
-		#define KALDI_GIT_HEAD "${COMMIT_ID}"
-	EOF
-
-	echo "true" > base/get_version.sh
-
-	append-cxxflags \
-		$($(tc-getPKG_CONFIG) --cflags cblas) \
-		$($(tc-getPKG_CONFIG) --cflags lapack)
-
-	append-libs \
-		$($(tc-getPKG_CONFIG) --libs cblas) \
-		$($(tc-getPKG_CONFIG) --libs lapack)
-
-	use test || append-cppflags -DNDEBUG
-
-	if use speex; then
-		append-cppflags -DHAVE_SPEEX
-		append-libs -lspeex
-	fi
-
-	cat <<-EOF > kaldi.mk
-		KALDI_FLAVOR := dynamic
-		KALDILIBDIR := "${S}"/lib
-		CXX = $(tc-getCXX)
-		AR = $(tc-getAR)
-		AS = $(tc-getAS)
-		RANLIB = $(tc-getRANLIB)
-		DOUBLE_PRECISION = $(usex double-precision 1 0)
-		OPENFSTINC = "."
-		OPENFSTLIBS = -lfst
-	EOF
-
-	local cblas_provider=$(eselect cblas show)
-
-	if [[ ${cblas_provider} =~ atlas ]]; then
-		cat <<-EOF >> kaldi.mk
-			ATLASINC = "."
-			ATLASLIBS = -L.
-		EOF
-
-		cat makefiles/linux_atlas.mk >> kaldi.mk
-	elif [[ ${cblas_provider} =~ openblas ]]; then
-		append-cxxflags $($(tc-getPKG_CONFIG) --cflags lapacke)
-
-		cat <<-EOF >> kaldi.mk
-			OPENBLASINC = "."
-			OPENBLASLIBS = -L.
-		EOF
-
-		cat makefiles/linux_openblas.mk >> kaldi.mk
-	fi
-
-	cat <<-EOF >> kaldi.mk
-		CXXFLAGS += ${CXXFLAGS}
-		LDLIBS += ${LIBS}
-	EOF
-
-	if use cuda; then
-		cat <<-EOF >> kaldi.mk
-			CUDA = true
-			CUDATKDIR = "${EPREFIX}"/opt/cuda
-			CUDA_ARCH :=
-			CUDA_ARCH +=
-		EOF
-		cat makefiles/cuda_64bit.mk >> kaldi.mk
-		sed -i \
-			-e "s:CUDA_FLAGS = -g:CUDA_FLAGS = ${NVCCFLAGS}:" \
-			kaldi.mk || die "sed unix/kaldi.mk failed"
-	fi
-}
-
-src_compile() {
-	default
-	use doc && doxygen
-}
-
-src_test() {
-	if use cuda; then
-		addwrite /dev/nvidiactl
-		addwrite /dev/nvidia0
-		addwrite /dev/nvidia-uvm
-	fi
-	default
-}
-
-src_install() {
-	dolib.so $(make print-libfiles)
-	dobin $(make print-binfiles)
-	use doc && dodoc -r html
-}

diff --git a/sci-misc/kaldi/metadata.xml b/sci-misc/kaldi/metadata.xml
deleted file mode 100644
index df4524e1f..000000000
--- a/sci-misc/kaldi/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pavel.a.denisov@×××××.com</email>
-		<name>Pavel Denisov</name>
-	</maintainer>
-	<longdescription lang="en">
-Kaldi is a toolkit for speech recognition written
-in C++ and licensed under the Apache License v2.0.
-Kaldi is intended for use by speech recognition researchers.
-</longdescription>
-	<upstream>
-		<remote-id type="github">kaldi-asr/kaldi</remote-id>
-	</upstream>
-	<use>
-		<flag name="cuda">
-Build with CUDA support.
-</flag>
-		<flag name="double-precision">
-Build in double precision mode.
-</flag>
-	</use>
-</pkgmetadata>