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

2020-12-25 Thread Horea Christian 
commit: 793dd58bb193e275f9a72f152372fbada2a0988e
Author: Horea Christian  chymera  eu>
AuthorDate: Fri Dec 25 10:25:18 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Fri Dec 25 10:25:18 2020 +
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  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..0
--- a/sci-misc/kaldi/files/Makefile.0d5e4b1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
 src/Makefile.orig  2017-03-03 01:33:22.0 +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..0
--- a/sci-misc/kaldi/files/Makefile.patch
+++ /dev/null
@@ -1,60 +0,0 @@
 src/Makefile.orig  2015-11-06 18:43:31.0 -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,

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

2017-04-25 Thread Christoph Junghans 
commit: 884605a42b33aeec4a6f05f8f0ac3dc8a60f325d
Author: Pavel Denisov  gmail  com>
AuthorDate: Sun Apr 23 11:35:22 2017 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Sun Apr 23 11:35:22 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=884605a4

sci-misc/kaldi: Version bump (#747)

Adopt the version scheme introduced by upstream
Add double-precision USE flag

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 sci-misc/kaldi/files/Makefile.0d5e4b1.patch|  45 +++
 .../kaldi/files/default_rules.mk.96eec2b.patch |  30 +
 sci-misc/kaldi/kaldi-0_p20151106.ebuild| 124 -
 sci-misc/kaldi/kaldi-5.1.65.ebuild | 146 +
 sci-misc/kaldi/metadata.xml|   3 +
 5 files changed, 224 insertions(+), 124 deletions(-)

diff --git a/sci-misc/kaldi/files/Makefile.0d5e4b1.patch 
b/sci-misc/kaldi/files/Makefile.0d5e4b1.patch
new file mode 100644
index 0..80b9862c6
--- /dev/null
+++ b/sci-misc/kaldi/files/Makefile.0d5e4b1.patch
@@ -0,0 +1,45 @@
+--- src/Makefile.orig  2017-03-03 01:33:22.0 +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/default_rules.mk.96eec2b.patch 
b/sci-misc/kaldi/files/default_rules.mk.96eec2b.patch
new file mode 100644
index 0..89a3103ba
--- /dev/null
+++ b/sci-misc/kaldi/files/default_rules.mk.96eec2b.patch
@@ -0,0 +1,30 @@
+--- src/makefiles/default_rules.mk.orig2017-03-03 01:33:22.0 
+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/kaldi-0_p20151106.ebuild 
b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
deleted file mode 100644
index 7dbc93ee8..0
--- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs cuda flag-o-matic
-
-DESCRIPTION="A toolkit for speech recognition"
-HOMEPAGE="http://kaldi-asr.org/;
-SRC_URI="http://gentoo.akreal.net/distfiles/${P}.tar.xz;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test cuda"
-KEYWORDS="~amd64"
-
-RDEPEND="
-   media-libs/speex
-   virtual/cblas
-   virtual/lapack
-   virtual/lapacke
-   >=sci-misc/openfst-1.4.1
-   cuda? ( dev-util/nvidia-cuda-toolkit )"
-DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen )"
-
-# We need write acccess /dev/nvidiactl,

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

2016-07-20 Thread Christoph Junghans 
commit: 4bb0a5fafca7f6562b2b47c4c62bb54680237c99
Author: Pavel Denisov  gmail  com>
AuthorDate: Wed Jul 20 04:54:46 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Wed Jul 20 04:54:46 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4bb0a5fa

sci-misc/kaldi: version bump; add speex USE flag

Package-Manager: portage-2.3.0

 sci-misc/kaldi/files/Makefile.patch|   4 +-
 sci-misc/kaldi/files/configure.patch   |  93 --
 .../kaldi/files/default_rules.mk.a7d9824.patch |   4 +-
 sci-misc/kaldi/files/default_rules.mk.patch|  47 ---
 sci-misc/kaldi/kaldi-0_p20150709.ebuild|  58 -
 sci-misc/kaldi/kaldi-0_p20160628.ebuild| 136 +
 6 files changed, 140 insertions(+), 202 deletions(-)

diff --git a/sci-misc/kaldi/files/Makefile.patch 
b/sci-misc/kaldi/files/Makefile.patch
index 9fa1841..0556e25 100644
--- a/sci-misc/kaldi/files/Makefile.patch
+++ b/sci-misc/kaldi/files/Makefile.patch
@@ -1,5 +1,5 @@
 Makefile.orig  2015-11-06 18:43:31.0 -0400
-+++ Makefile   2015-11-17 20:15:14.452502675 -0400
+--- src/Makefile.orig  2015-11-06 18:43:31.0 -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

diff --git a/sci-misc/kaldi/files/configure.patch 
b/sci-misc/kaldi/files/configure.patch
deleted file mode 100644
index f6086fc..000
--- a/sci-misc/kaldi/files/configure.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-*** configure.orig 2015-02-28 16:31:35.568045409 -0400
 configure  2015-02-28 17:21:58.477634475 -0400
-***
-*** 46,60 
-fi
-  }
-  
-- 
-- 
-- ##   First do some checks.  These verify that all the things are
-- ##   here that should be here.
-- if [ "`basename $PWD`" != "src" ]; then
--   echo 'You must run "configure" from the src/ directory.'
--   exit 1
-- fi
-- 
-  ## Default locations for FST and linear algebra libraries.
-  MATHLIB='ATLAS'
-  ATLASROOT=`rel2abs ../tools/ATLAS/`
 46,51 
-***
-*** 522,527 
 513,535 
-exit_success;
-  }
-  
-+ function linux_configure_gentoo {
-+   m=$1  # 64 or empty.
-+   ATLASLIBS="/usr/lib$m/libatlas.so.3 /usr/lib$m/libf77blas.so.3 
/usr/lib$m/libatlcblas.so.3 /usr/lib$m/libatlclapack.so.3"
-+   for f in $ATLASLIBS; do 
-+ [ ! -f $f ] && return 1;
-+   done
-+   libdir=$(dirname $(echo $ATLASLIBS | awk '{print $1}'))
-+   [ -z "$libdir" ] && echo "Error getting libdir in linux_configure_gentoo" 
&& exit 1;
-+   echo ATLASINC = $ATLASROOT >> kaldi.mk
-+   echo ATLASLIBS = $ATLASLIBS -Wl,-rpath=$libdir >> kaldi.mk
-+   echo 
-+   cat makefiles/linux_atlas.mk >> kaldi.mk
-+   fix_cxx_flag
-+   echo "Successfully configured for gentoo [dynamic libraries] with 
ATLASLIBS =$ATLASLIBS"
-+   $use_cuda && linux_configure_cuda
-+   exit_success;
-+ }
-  
-  function linux_configure_static {
-if $threaded_atlas; then pt=pt; else pt=""; fi
-***
-*** 682,688 
-  echo "FSTROOT = $FSTROOT" >> kaldi.mk
-  
-  # Check installed OpenFst version and add C++11 flags if OpenFst >= 1.4
-! OPENFST_VER=`grep 'PACKAGE_VERSION' $FSTROOT/Makefile | sed -e 's:.*= ::'`
-  echo "OPENFST_VER = $OPENFST_VER" >> kaldi.mk
-  OPENFST_VER_NUM=`echo $OPENFST_VER | sed 's/\./ /g' | xargs printf 
"%d%02d%02d"`
-  if [ $OPENFST_VER_NUM -ge 10400 ]; then
 690,696 
-  echo "FSTROOT = $FSTROOT" >> kaldi.mk
-  
-  # Check installed OpenFst version and add C++11 flags if OpenFst >= 1.4
-! OPENFST_VER="1.4.1"
-  echo "OPENFST_VER = $OPENFST_VER" >> kaldi.mk
-  OPENFST_VER_NUM=`echo $OPENFST_VER | sed 's/\./ /g' | xargs printf 
"%d%02d%02d"`
-  if [ $OPENFST_VER_NUM -ge 10400 ]; then
-***
-*** 765,772 
-  
-echo "On Linux: Checking for linear algebra header files ..."
-if [ "$MATHLIB" == "ATLAS" ]; then
-! if [ ! -f $ATLASROOT/include/cblas.h ] || [ ! -f 
$ATLASROOT/include/clapack.h ] ; then
-!   failure "Could not find required header files cblas.h or clapack.h in 
ATLAS dir '$ATLASROOT/include'"
-  fi
-  echo "Using ATLAS as the linear algebra library."
-  
 773,780 
-  
-echo "On Linux: Checking for linear algebra header files ..."
-if [ "$MATHLIB" == "ATLAS" ]; then
-! if  ( [ ! -f $ATLASROOT/include/cblas.h ] || [ ! -f 
$ATLASROOT/include/clapack.h ] ) && ( [ ! -f $ATLASROOT/cblas.h ] || [ ! -f 
$ATLASROOT/clapack.h ] ) ; then
-!   failure "Could not find required header files cblas.h or clapack.h in 
ATLAS dirs '$ATLASROOT/include' or '$ATLASROOT'"
-  fi
-  echo "Using ATLAS as the linear algebra library."
-  
-***
-*** 797,802 
 805,812 
-  else
-# Prefer dynamic to static math.
-linux_configure_debian_ubuntu3 || \
-+ linux_configure_gentoo 64 || \
-+ linux_configure_gentoo || \
-

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

2015-11-20 Thread Justin Lecher 
commit: 889fa1375816b99303707b0da7e06d9e6cffddd2
Author: Pavel Denisov  gmail  com>
AuthorDate: Tue Nov 10 00:02:11 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Nov 19 01:20:29 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=889fa137

sci-misc/kaldi: Create unified diff for default_rules.mk patch

Package-Manager: portage-2.2.24

 .../kaldi/files/default_rules.mk.a7d9824.patch | 78 +-
 1 file changed, 30 insertions(+), 48 deletions(-)

diff --git a/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch 
b/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch
index 458d453..7e60268 100644
--- a/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch
+++ b/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch
@@ -1,48 +1,30 @@
-*** makefiles/default_rules.mk.orig2015-10-28 22:11:07.903182744 -0400
 makefiles/default_rules.mk 2015-10-29 20:43:41.081851545 -0400
-***
-*** 14,20 
-  LIBFILE = lib$(LIBNAME).so
-  #LDLIBS  += -l$(LIBNAME)
-endif
-!   LDFLAGS += -Wl,-rpath=$(shell readlink -f $(KALDILIBDIR)) -L.
-LDFLAGS += $(foreach dep,$(ADDLIBS), -L$(dir $(dep)) )
-XDEPENDS = $(foreach dep,$(ADDLIBS), $(dir $(dep))/lib$(notdir 
$(basename $(dep))).so )
-  else  # Platform not supported
 14,20 
-  LIBFILE = lib$(LIBNAME).so
-  #LDLIBS  += -l$(LIBNAME)
-endif
-!   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,81 
-   @{ result=0;\
-   for x in $(TESTFILES); do   \
- printf "Running $$x ..."; \
-!./$$x >$$x.testlog 2>&1;  \
- if [ $$? -ne 0 ]; then\
-   echo "... FAIL $$x";\
-   result=1;   \
 75,81 
-   @{ result=0;\
-   for x in $(TESTFILES); do   \
- printf "Running $$x ..."; \
-!LD_LIBRARY_PATH=$(KALDILIBDIR):${LD_LIBRARY_PATH} ./$$x >$$x.testlog 
2>&1;\
- if [ $$? -ne 0 ]; then\
-   echo "... FAIL $$x";\
-   result=1;   \
-***
-*** 99,101 
 99,107 
-  # 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)))
+--- makefiles/default_rules.mk.orig2015-11-06 18:43:31.0 -0400
 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)))

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

2015-11-20 Thread Justin Lecher 
commit: 9d956a08c867d1771a7a619dfb71d5d8274b8c93
Author: Pavel Denisov  gmail  com>
AuthorDate: Thu Nov 19 01:15:59 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Nov 19 01:45:39 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9d956a08

sci-misc/kaldi: Switch to user-selected BLAS/LAPACK

Package-Manager: portage-2.2.24

 sci-misc/kaldi/kaldi-0_p20151106.ebuild | 88 ++---
 sci-misc/kaldi/metadata.xml |  3 --
 2 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild 
b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
index 64fea67..e2e0bb6 100644
--- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="A toolkit for speech recognition"
 HOMEPAGE="http://kaldi-asr.org/;
@@ -12,62 +12,90 @@ SRC_URI="http://gentoo.akreal.net/distfiles/${P}.tar.xz;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc test threads -atlas cuda"
+IUSE="doc test cuda"
 KEYWORDS="~amd64"
 
 RDEPEND="
media-libs/speex
+   virtual/cblas
virtual/lapack
virtual/lapacke
>=sci-misc/openfst-1.4.1
-   atlas? ( sci-libs/atlas[threads=] )
-   !atlas? ( sci-libs/openblas[-openmp,-threads] sci-libs/lapack-reference 
)
cuda? ( dev-util/nvidia-cuda-toolkit )"
 DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
 
-REQUIRED_USE="!atlas? ( !threads )"
-
 # We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and 
the portage
 # user is (usually) not in the video group
 RESTRICT="test? ( cuda? ( userpriv ) )"
 
 src_prepare() {
epatch \
-   "${FILESDIR}"/configure.patch \
"${FILESDIR}"/Makefile.patch \
"${FILESDIR}"/default_rules.mk.a7d9824.patch
 }
 
 src_configure() {
-   if use atlas; then
-   myconf+=( --atlas-root="${EPREFIX}/usr/include/atlas" )
-   if use threads; then
-   myconf+=( --threaded-atlas=yes )
-   fi
+   append-cxxflags \
+   -DKALDI_DOUBLEPRECISION=0 \
+   -DHAVE_POSIX_MEMALIGN \
+   -DHAVE_EXECINFO_H=1 \
+   -DHAVE_CXXABI_H \
+   -DHAVE_SPEEX \
+   -DHAVE_OPENFST_GE_10400 \
+   -std=c++0x \
+   -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 \
+   -lspeex \
+   -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)
else
-   myconf+=( --openblas-root="${EPREFIX}/usr" )
-   append-cxxflags "-I${EPREFIX}/usr/include/openblas"
-   append-libs -lreflapack
+   die "Build with ${cblas_provider} CBLAS is not supported"
fi
 
-   # Upstream's configure script is "hand-generated" and not autotools 
compatible,
-   # for this reason econf can not be used
-   ./configure \
-   --shared \
-   --fst-root="${EPREFIX}/usr" \
-   $(use cuda && echo "--use-cuda=yes 
--cudatk-dir=${EPREFIX}/opt/cuda" \
-   || echo --use-cuda=no) \
-   "${myconf[@]}" || die "failed to run configure"
-
use test || append-cxxflags -DNDEBUG
-   append-libs -lspeex
 
-   sed -i \
-   -e "s:-g # -O0 -DKALDI_PARANOID:-DHAVE_SPEEX ${CXXFLAGS} :" \
-   -e "s:-lm -lpthread -ldl:-lm -lpthread -ldl ${LIBS} 
${LDFLAGS}:" \
-   -e "s:CUDA_FLAGS = -g:CUDA_FLAGS = -O2:" \
-   kaldi.mk || die "sed unix/kaldi.mk failed"
+   cat <<-EOF > kaldi.mk
+   KALDI_FLAVOR := dynamic
+   KALDILIBDIR := "${S}"/lib
+   CC = $(tc-getCXX)
+   RANLIB = $(tc-getRANLIB)
+   LDLIBS = ${LIBS}
+   EOF
+
+   if use cuda; then
+   cat <<-EOF >> kaldi.mk
+   CUDA = true
+   CUDATKDIR = "${EPREFIX}"/opt/cuda
+   EOF
+   cat makefiles/linux_x86_64_cuda.mk >> kaldi.mk

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

2015-11-20 Thread Justin Lecher 
commit: 7fc25873fec545a84886b8520fad8a6d1e13e4f1
Author: Pavel Denisov  gmail  com>
AuthorDate: Thu Nov 19 23:22:59 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Nov 19 23:22:59 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7fc25873

sci-misc/kaldi: Add pkg_pretend() to check for suitable CBLAS provider

Package-Manager: portage-2.2.24

 sci-misc/kaldi/kaldi-0_p20151106.ebuild | 16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild 
b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
index e2e0bb6..9657cef 100644
--- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
@@ -29,6 +29,14 @@ DEPEND="${RDEPEND}
 # user is (usually) not in the video group
 RESTRICT="test? ( 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() {
epatch \
"${FILESDIR}"/Makefile.patch \
@@ -66,14 +74,12 @@ src_configure() {
 
local cblas_provider=$(eselect cblas show)
 
-   if [[ ${cblas_provider} =~ "atlas" ]]; then
+   if [[ ${cblas_provider} =~ atlas ]]; then
append-cxxflags -DHAVE_ATLAS
-   elif [[ ${cblas_provider} =~ "mkl" ]]; then
+   elif [[ ${cblas_provider} =~ mkl ]]; then
append-cxxflags -DHAVE_MKL
-   elif [[ ${cblas_provider} =~ "openblas" ]]; then
+   elif [[ ${cblas_provider} =~ openblas ]]; then
append-cxxflags -DHAVE_OPENBLAS $($(tc-getPKG_CONFIG) --cflags 
lapacke)
-   else
-   die "Build with ${cblas_provider} CBLAS is not supported"
fi
 
use test || append-cxxflags -DNDEBUG

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

2015-11-20 Thread Justin Lecher 
commit: 24648b1c7fc42093d530c9937ea94be381e302ac
Author: Pavel Denisov  gmail  com>
AuthorDate: Mon Nov  9 23:58:05 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Nov 19 01:20:29 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=24648b1c

sci-misc/kaldi: Change dohtml to dodoc

Package-Manager: portage-2.2.24

 sci-misc/kaldi/kaldi-0_p20151106.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild 
b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
index a72c370..64fea67 100644
--- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
@@ -87,5 +87,5 @@ src_test() {
 src_install() {
dolib.so $(make print-libfiles)
dobin $(make print-binfiles)
-   use doc && dohtml -r html/*
+   use doc && dodoc -r html
 }

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

2015-11-20 Thread Justin Lecher 
commit: c55b36e1b4aa36eb54f33d89aa5c18e2a740b98c
Author: Pavel Denisov  gmail  com>
AuthorDate: Sun Nov  8 20:28:04 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Nov 19 01:20:29 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c55b36e1

sci-misc/kaldi: Version bump, switch to OpenBLAS math library by default, add 
CUDA support

Package-Manager: portage-2.2.24

 sci-misc/kaldi/ChangeLog   |  8 ++
 .../kaldi/files/default_rules.mk.a7d9824.patch | 48 
 sci-misc/kaldi/kaldi-0_p20151106.ebuild| 91 ++
 sci-misc/kaldi/metadata.xml| 11 ++-
 4 files changed, 157 insertions(+), 1 deletion(-)

diff --git a/sci-misc/kaldi/ChangeLog b/sci-misc/kaldi/ChangeLog
index fe47981..b40d171 100644
--- a/sci-misc/kaldi/ChangeLog
+++ b/sci-misc/kaldi/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*kaldi-0_p20151106 (08 Nov 2015)
+
+  08 Nov 2015; Pavel Denisov 
+  +files/default_rules.mk.a7d9824.patch, +kaldi-0_p20151106.ebuild,
+  metadata.xml:
+  sci-misc/kaldi: Version bump, switch to OpenBLAS math library by default, add
+  CUDA support
+
 *kaldi-0_p20150709 (18 Jul 2015)
 
   18 Jul 2015; Pavel Denisov 

diff --git a/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch 
b/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch
new file mode 100644
index 000..458d453
--- /dev/null
+++ b/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch
@@ -0,0 +1,48 @@
+*** makefiles/default_rules.mk.orig2015-10-28 22:11:07.903182744 -0400
+--- makefiles/default_rules.mk 2015-10-29 20:43:41.081851545 -0400
+***
+*** 14,20 
+  LIBFILE = lib$(LIBNAME).so
+  #LDLIBS  += -l$(LIBNAME)
+endif
+!   LDFLAGS += -Wl,-rpath=$(shell readlink -f $(KALDILIBDIR)) -L.
+LDFLAGS += $(foreach dep,$(ADDLIBS), -L$(dir $(dep)) )
+XDEPENDS = $(foreach dep,$(ADDLIBS), $(dir $(dep))/lib$(notdir 
$(basename $(dep))).so )
+  else  # Platform not supported
+--- 14,20 
+  LIBFILE = lib$(LIBNAME).so
+  #LDLIBS  += -l$(LIBNAME)
+endif
+!   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,81 
+   @{ result=0;\
+   for x in $(TESTFILES); do   \
+ printf "Running $$x ..."; \
+!./$$x >$$x.testlog 2>&1;  \
+ if [ $$? -ne 0 ]; then\
+   echo "... FAIL $$x";\
+   result=1;   \
+--- 75,81 
+   @{ result=0;\
+   for x in $(TESTFILES); do   \
+ printf "Running $$x ..."; \
+!LD_LIBRARY_PATH=$(KALDILIBDIR):${LD_LIBRARY_PATH} ./$$x >$$x.testlog 
2>&1;\
+ if [ $$? -ne 0 ]; then\
+   echo "... FAIL $$x";\
+   result=1;   \
+***
+*** 99,101 
+--- 99,107 
+  # 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_p20151106.ebuild 
b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
new file mode 100644
index 000..128c268
--- /dev/null
+++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A toolkit for speech recognition"
+HOMEPAGE="http://kaldi-asr.org/;
+SRC_URI="http://gentoo.akreal.net/distfiles/${P}.tar.xz;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test threads atlas cuda"
+KEYWORDS="~amd64"
+
+RDEPEND="
+   media-libs/speex
+   virtual/lapack
+   virtual/lapacke
+   >=sci-misc/openfst-1.4.1
+   atlas? ( sci-libs/atlas[threads=] )
+   !atlas? ( sci-libs/openblas[-openmp,-threads] sci-libs/lapack-reference 
)
+   cuda? ( dev-util/nvidia-cuda-toolkit )"
+DEPEND="${RDEPEND}
+   doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="!atlas? ( !threads )"
+
+# 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 )"
+
+src_prepare() {
+   epatch \
+   "${FILESDIR}"/configure.patch \
+   "${FILESDIR}"/Makefile.patch \
+   "${FILESDIR}"/default_rules.mk.a7d9824.patch
+}
+
+src_configure() {
+   if use atlas; then
+   myconf+=( --atlas-root="${EPREFIX}/usr/include/atlas" )
+

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

2015-11-20 Thread Justin Lecher 
commit: 92caf979dce6cfc34b8a57e03e394b14b40d833a
Author: Pavel Denisov  gmail  com>
AuthorDate: Mon Nov  9 23:41:45 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Nov 19 01:20:29 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=92caf979

sci-misc/kaldi: Fix IUSE

Package-Manager: portage-2.2.24

 sci-misc/kaldi/kaldi-0_p20151106.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild 
b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
index 128c268..63543d5 100644
--- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://gentoo.akreal.net/distfiles/${P}.tar.xz;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc test threads atlas cuda"
+IUSE="doc test threads -atlas cuda"
 KEYWORDS="~amd64"
 
 RDEPEND="

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

2015-11-20 Thread Justin Lecher 
commit: 6d0c42fa63e22a8d44d8b45b243da36ad11ee57e
Author: Pavel Denisov  gmail  com>
AuthorDate: Mon Nov  9 23:55:51 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Nov 19 01:20:29 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6d0c42fa

sci-misc/kaldi: Fix RESTRICT conditions

Package-Manager: portage-2.2.24

 sci-misc/kaldi/kaldi-0_p20151106.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild 
b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
index 63543d5..a72c370 100644
--- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="!atlas? ( !threads )"
 
 # 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 )"
+RESTRICT="test? ( cuda? ( userpriv ) )"
 
 src_prepare() {
epatch \

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

2015-11-20 Thread Justin Lecher 
commit: a1da40b60fe840950f023512d099ffb4078c11fa
Author: Pavel Denisov  gmail  com>
AuthorDate: Thu Nov 19 01:00:40 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Nov 19 01:20:29 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a1da40b6

sci-misc/kaldi: Create unified diff for Makefile patch

Package-Manager: portage-2.2.24

 sci-misc/kaldi/files/Makefile.patch | 117 ++--
 1 file changed, 60 insertions(+), 57 deletions(-)

diff --git a/sci-misc/kaldi/files/Makefile.patch 
b/sci-misc/kaldi/files/Makefile.patch
index ef1a606..9fa1841 100644
--- a/sci-misc/kaldi/files/Makefile.patch
+++ b/sci-misc/kaldi/files/Makefile.patch
@@ -1,57 +1,60 @@
-*** Makefile.orig  2015-02-28 16:31:57.377401743 -0400
 Makefile   2015-02-28 16:48:58.153175376 -0400
-***
-*** 30,36 
-  
-  # Reset the default goal, so that the all target will become default
-  .DEFAULT_GOAL :=
-! all: checkversion test_dependencies kaldi.mk mklibdir $(SUBDIRS)
-   -echo Done
-  
-  mklibdir:
 30,36 
-  
-  # Reset the default goal, so that the all target will become default
-  .DEFAULT_GOAL :=
-! all: checkversion kaldi.mk mklibdir $(SUBDIRS)
-   -echo Done
-  
-  mklibdir:
-***
-*** 88,103 
-  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 )
-  
 88,93 
-***
-*** 131,136 
 121,136 
-  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
+--- Makefile.orig  2015-11-06 18:43:31.0 -0400
 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

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

2015-11-20 Thread Justin Lecher 
commit: f31b3eeaa38fdc2b33709436644c109e5ac6b5c7
Author: Pavel Denisov  gmail  com>
AuthorDate: Fri Nov 20 00:16:01 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Nov 20 00:16:01 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f31b3eea

sci-misc/kaldi: Use cuda eclass

Package-Manager: portage-2.2.24

 sci-misc/kaldi/kaldi-0_p20151106.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild 
b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
index 9657cef..9a86cf6 100644
--- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils toolchain-funcs cuda flag-o-matic
 
 DESCRIPTION="A toolkit for speech recognition"
 HOMEPAGE="http://kaldi-asr.org/;
@@ -99,7 +99,7 @@ src_configure() {
EOF
cat makefiles/linux_x86_64_cuda.mk >> kaldi.mk
sed -i \
-   -e "s:CUDA_FLAGS = -g:CUDA_FLAGS = -O2:" \
+   -e "s:CUDA_FLAGS = -g:CUDA_FLAGS = ${NVCCFLAGS}:" \
kaldi.mk || die "sed unix/kaldi.mk failed"
fi
 }

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

2015-07-23 Thread Jauhien Piatlicki 
commit: 874fab10d1c447305b0d9909d13e1fd9baddc442
Author: Pavel Denisov pavel.a.denisov AT gmail DOT com
AuthorDate: Sat Jul 18 00:18:57 2015 +
Commit: Jauhien Piatlicki jauhien AT gentoo DOT org
CommitDate: Sat Jul 18 00:18:57 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=874fab10

sci-misc/kaldi: version bump, switch to snapshots of the source

Package-Manager: portage-2.2.20

 sci-misc/kaldi/ChangeLog| 6 ++
 .../kaldi/{kaldi-0_p20150301.ebuild = kaldi-0_p20150709.ebuild}| 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sci-misc/kaldi/ChangeLog b/sci-misc/kaldi/ChangeLog
index 6639e7e..0fb8dc1 100644
--- a/sci-misc/kaldi/ChangeLog
+++ b/sci-misc/kaldi/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*kaldi-0_p20150709 (18 Jul 2015)
+
+  18 Jul 2015; Pavel Denisov pavel.a.deni...@gmail.com
+  -kaldi-0_p20150301.ebuild, +kaldi-0_p20150709.ebuild:
+  Version bump, switch to snapshots of the source.
+
 *kaldi-0_p20150301 (01 Mar 2015)
 
   01 Mar 2015; Pavel Denisov pavel.a.deni...@gmail.com

diff --git a/sci-misc/kaldi/kaldi-0_p20150301.ebuild 
b/sci-misc/kaldi/kaldi-0_p20150709.ebuild
similarity index 91%
rename from sci-misc/kaldi/kaldi-0_p20150301.ebuild
rename to sci-misc/kaldi/kaldi-0_p20150709.ebuild
index 8ba100d..8ebf50a 100644
--- a/sci-misc/kaldi/kaldi-0_p20150301.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20150709.ebuild
@@ -4,16 +4,16 @@
 
 EAPI=5
 
-inherit eutils flag-o-matic subversion
+inherit eutils flag-o-matic
 
 DESCRIPTION=A toolkit for speech recognition
 HOMEPAGE=http://kaldi.sourceforge.net/;
-ESVN_REPO_URI=https://svn.code.sf.net/p/kaldi/code/trunk/src@4927;
+SRC_URI=http://gentoo.akreal.net/distfiles/${P}.tar.xz;
 
 LICENSE=Apache-2.0
 SLOT=0
 IUSE=doc test threads
-KEYWORDS=
+KEYWORDS=~amd64
 
 RDEPEND=
media-libs/speex

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

2015-03-01 Thread Andrew Savchenko 
commit: 0063c7b7e3dfa20520464d865025a83531eb6b1d
Author: Pavel Denisov pavel.a.denisov AT gmail DOT com
AuthorDate: Sun Mar  1 02:40:03 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Sun Mar  1 02:40:47 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0063c7b7

sci-misc/kaldi: version bump

Package-Manager: portage-2.2.17

---
 sci-misc/kaldi/ChangeLog   |   7 +
 sci-misc/kaldi/files/Makefile.patch|  76 +++---
 sci-misc/kaldi/files/configure.patch   | 164 -
 sci-misc/kaldi/files/default_rules.mk.patch|  67 ++---
 ...0_p20150101.ebuild = kaldi-0_p20150301.ebuild} |   5 +-
 5 files changed, 206 insertions(+), 113 deletions(-)

diff --git a/sci-misc/kaldi/ChangeLog b/sci-misc/kaldi/ChangeLog
index f7406fa..6639e7e 100644
--- a/sci-misc/kaldi/ChangeLog
+++ b/sci-misc/kaldi/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*kaldi-0_p20150301 (01 Mar 2015)
+
+  01 Mar 2015; Pavel Denisov pavel.a.deni...@gmail.com
+  -kaldi-0_p20150101.ebuild, +kaldi-0_p20150301.ebuild, files/Makefile.patch,
+  files/configure.patch, files/default_rules.mk.patch:
+  Version bump.
+
 *kaldi-0_p20150101 (11 Jan 2015)
 
   11 Jan 2015; Pavel Denisov pavel.a.deni...@gmail.com +files/Makefile.patch,

diff --git a/sci-misc/kaldi/files/Makefile.patch 
b/sci-misc/kaldi/files/Makefile.patch
index 07302d6..ef1a606 100644
--- a/sci-misc/kaldi/files/Makefile.patch
+++ b/sci-misc/kaldi/files/Makefile.patch
@@ -1,19 +1,57 @@
 Makefile.orig  2015-01-01 21:51:30.999356027 -0400
-+++ Makefile   2015-01-04 16:54:02.527824499 -0400
-@@ -131,6 +131,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
+*** Makefile.orig  2015-02-28 16:31:57.377401743 -0400
+--- Makefile   2015-02-28 16:48:58.153175376 -0400
+***
+*** 30,36 
+  
+  # Reset the default goal, so that the all target will become default
+  .DEFAULT_GOAL :=
+! all: checkversion test_dependencies kaldi.mk mklibdir $(SUBDIRS)
+   -echo Done
+  
+  mklibdir:
+--- 30,36 
+  
+  # Reset the default goal, so that the all target will become default
+  .DEFAULT_GOAL :=
+! all: checkversion kaldi.mk mklibdir $(SUBDIRS)
+   -echo Done
+  
+  mklibdir:
+***
+*** 88,103 
+  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 )
+  
+--- 88,93 
+***
+*** 131,136 
+--- 121,136 
+  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/configure.patch 
b/sci-misc/kaldi/files/configure.patch
index 07d663e..f6086fc 100644
--- a/sci-misc/kaldi/files/configure.patch
+++ b/sci-misc/kaldi/files/configure.patch
@@ -1,71 +1,93 @@
 configure.orig 2015-01-01 21:51:05.611960184 -0400
-+++ configure  2015-01-01 22:06:11.027064734 -0400
-@@ -45,15 +45,6 @@
-   fi
- }
- 
--
--
--##   First do some checks.  These verify that all the things are
--##   here that should be here.
--if [ `basename $PWD` != src ]; then
--  echo 'You must run configure from the src/ directory.'
--  exit 1
--fi
--
- ## Default locations for FST and linear algebra libraries.
- MATHLIB='ATLAS'
- ATLASROOT=`rel2abs ../tools/ATLAS/`
-@@ -473,6 +464,23 @@
-   exit_success;
- }
- 
-+function linux_configure_gentoo {
-+  m=$1  # 64 or empty.
-+  ATLASLIBS=/usr/lib$m/libatlas.so.3 /usr/lib$m/libf77blas.so.3 
/usr/lib$m/libatlcblas.so.3 /usr/lib$m/libatlclapack.so.3
-+  for f in $ATLASLIBS; do 
-+[ ! -f $f

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

2015-01-14 Thread Justin Lecher 
commit: d38cf774193acd09273a2253b23b9508e984e178
Author: Pavel Denisov pavel.a.denisov AT gmail DOT com
AuthorDate: Mon Jan 12 11:38:23 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Thu Jan 15 06:52:56 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d38cf774

sci-misc/kaldi: Live ebuild don't has keywords

Package-Manager: portage-2.2.15

---
 sci-misc/kaldi/kaldi-0_p20150101.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/kaldi/kaldi-0_p20150101.ebuild 
b/sci-misc/kaldi/kaldi-0_p20150101.ebuild
index 6403bd8..78a5ab8 100644
--- a/sci-misc/kaldi/kaldi-0_p20150101.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20150101.ebuild
@@ -13,7 +13,7 @@ 
ESVN_REPO_URI=https://svn.code.sf.net/p/kaldi/code/trunk/src@4735;
 LICENSE=Apache-2.0
 SLOT=0
 IUSE=doc test threads
-KEYWORDS=~amd64
+KEYWORDS=
 
 RDEPEND=
media-libs/speex

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

2015-01-14 Thread Justin Lecher 
commit: 37fed9bcfb03ea5915e20dc5af15c74fbf3622bc
Author: Pavel Denisov pavel.a.denisov AT gmail DOT com
AuthorDate: Sun Jan 11 20:33:12 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Thu Jan 15 06:52:56 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=37fed9bc

sci-misc/kaldi: New package

Package-Manager: portage-2.2.15

---
 sci-misc/kaldi/ChangeLog| 10 
 sci-misc/kaldi/files/Makefile.patch | 19 
 sci-misc/kaldi/files/configure.patch| 71 +
 sci-misc/kaldi/files/default_rules.mk.patch | 20 
 sci-misc/kaldi/kaldi-0_p20150101.ebuild | 57 +++
 sci-misc/kaldi/metadata.xml | 12 +
 6 files changed, 189 insertions(+)

diff --git a/sci-misc/kaldi/ChangeLog b/sci-misc/kaldi/ChangeLog
new file mode 100644
index 000..f7406fa
--- /dev/null
+++ b/sci-misc/kaldi/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sci-misc/kaldi
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*kaldi-0_p20150101 (11 Jan 2015)
+
+  11 Jan 2015; Pavel Denisov pavel.a.deni...@gmail.com +files/Makefile.patch,
+  +files/configure.patch, +files/default_rules.mk.patch,
+  +kaldi-0_p20150101.ebuild, +metadata.xml:
+  sci-misc/kaldi: New package

diff --git a/sci-misc/kaldi/files/Makefile.patch 
b/sci-misc/kaldi/files/Makefile.patch
new file mode 100644
index 000..07302d6
--- /dev/null
+++ b/sci-misc/kaldi/files/Makefile.patch
@@ -0,0 +1,19 @@
+--- Makefile.orig  2015-01-01 21:51:30.999356027 -0400
 Makefile   2015-01-04 16:54:02.527824499 -0400
+@@ -131,6 +131,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/configure.patch 
b/sci-misc/kaldi/files/configure.patch
new file mode 100644
index 000..07d663e
--- /dev/null
+++ b/sci-misc/kaldi/files/configure.patch
@@ -0,0 +1,71 @@
+--- configure.orig 2015-01-01 21:51:05.611960184 -0400
 configure  2015-01-01 22:06:11.027064734 -0400
+@@ -45,15 +45,6 @@
+   fi
+ }
+ 
+-
+-
+-##   First do some checks.  These verify that all the things are
+-##   here that should be here.
+-if [ `basename $PWD` != src ]; then
+-  echo 'You must run configure from the src/ directory.'
+-  exit 1
+-fi
+-
+ ## Default locations for FST and linear algebra libraries.
+ MATHLIB='ATLAS'
+ ATLASROOT=`rel2abs ../tools/ATLAS/`
+@@ -473,6 +464,23 @@
+   exit_success;
+ }
+ 
++function linux_configure_gentoo {
++  m=$1  # 64 or empty.
++  ATLASLIBS=/usr/lib$m/libatlas.so.3 /usr/lib$m/libf77blas.so.3 
/usr/lib$m/libatlcblas.so.3 /usr/lib$m/libatlclapack.so.3
++  for f in $ATLASLIBS; do 
++[ ! -f $f ]  return 1;
++  done
++  libdir=$(dirname $(echo $ATLASLIBS | awk '{print $1}'))
++  [ -z $libdir ]  echo Error getting libdir in linux_configure_gentoo 
 exit 1;
++  echo ATLASINC = $ATLASROOT  kaldi.mk
++  echo ATLASLIBS = $ATLASLIBS -Wl,-rpath=$libdir  kaldi.mk
++  echo 
++  cat makefiles/linux_atlas.mk  kaldi.mk
++  fix_cxx_flag
++  echo Successfully configured for gentoo [dynamic libraries] with ATLASLIBS 
=$ATLASLIBS
++  $use_cuda  linux_configure_cuda
++  exit_success;
++}
+ 
+ function linux_configure_static {
+   if $threaded_atlas; then pt=pt; else pt=; fi
+@@ -716,8 +724,8 @@
+ 
+   echo On Linux: Checking for linear algebra header files ...
+   if [ $MATHLIB == ATLAS ]; then
+-if [ ! -f $ATLASROOT/include/cblas.h ] || [ ! -f 
$ATLASROOT/include/clapack.h ] ; then
+-  failure Could not find required header files cblas.h or clapack.h in 
ATLAS dir '$ATLASROOT/include'
++if  ( [ ! -f $ATLASROOT/include/cblas.h ] || [ ! -f 
$ATLASROOT/include/clapack.h ] )  ( [ ! -f $ATLASROOT/cblas.h ] || [ ! -f 
$ATLASROOT/clapack.h ] ) ; then
++  failure Could not find required header files cblas.h or clapack.h in 
ATLAS dirs '$ATLASROOT/include' or '$ATLASROOT'
+ fi
+ echo Using ATLAS as the linear algebra library.
+ 
+@@ -741,6 +749,8 @@
+ linux_configure_debian7 || \
+ linux_configure_redhat 64 || \
+ linux_configure_redhat || \
++linux_configure_gentoo 64 || \
++linux_configure_gentoo || \
+ linux_atlas_failure Failed to configure ATLAS lbiraries;
+ else
+   # Prefer dynamic to static math.
+@@ -751,6 +761,8 @@
+ linux_configure_debian7 || \
+ linux_configure_redhat 64 || \
+ linux_configure_redhat || \
++linux_configure_gentoo 64 || \
++linux_configure_gentoo || \
+ linux_atlas_failure Failed to configure ATLAS lbiraries;

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

2015-01-14 Thread Justin Lecher 
commit: d2b558b44bce35c0d29a40b16f4a2d07e072
Author: Pavel Denisov pavel.a.denisov AT gmail DOT com
AuthorDate: Tue Jan 13 23:43:24 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Thu Jan 15 06:52:56 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d2b558b4

sci-misc/kaldi: Comment about special case with upstream configure script

Package-Manager: portage-2.2.15

---
 sci-misc/kaldi/kaldi-0_p20150101.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-misc/kaldi/kaldi-0_p20150101.ebuild 
b/sci-misc/kaldi/kaldi-0_p20150101.ebuild
index 78a5ab8..9ef5703 100644
--- a/sci-misc/kaldi/kaldi-0_p20150101.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20150101.ebuild
@@ -30,6 +30,8 @@ src_prepare() {
 }
 
 src_configure() {
+   # Upstream's configure script is hand-generated and not autotools 
compatible,
+   # for this reason econf can not be used
./configure \
--shared \
--fst-root=${EPREFIX}/usr \