gentoo resync : 30.12.2017

3 files changed, 43 insertions, 25 deletions

diff --git a/app-accessibility/sphinx2/Manifest b/app-accessibility/sphinx2/Manifest
index 8879fec205e3..6c77f2309440 100644
--- a/app-accessibility/sphinx2/Manifest
+++ b/app-accessibility/sphinx2/Manifest
@@ -1,4 +1,4 @@
-AUX sphinx2-0.6-as-needed.patch 725 BLAKE2B 1bff69e68dd484fb5d6df14508f16321706bdedf402a525ac8904efce9366dfff22c7b6420e826affd509e93f3e626f9630713a113db3fb7b0c283b2bf0d0690 SHA512 88053a09965a40cbe6e089b35a96c562c115fe73a571391e0258b036363f6ec863d31fff93f8dc817a5afa84b407623d14efdc846a2835fda5a9385ce4023527
+AUX sphinx2-0.6-as-needed.patch 776 BLAKE2B 831ae9cc8e1ed018eecb03f29c6dbe349b09d2ecaa6cdcd879613d372f437629d8e352b140c934a9f42c0192f34d29ebb81a2d74eb9b61948f926d510c9410f0 SHA512 2e4e48041e7eb79acd84a384943ebfbb0be17faab404b7d05b09d95ee5313730e6bd3026443ebe01bb79edb0c3bbcee3ec0b207978a1f0a30df4e0af54c11187
 DIST sphinx2-0.6.tar.gz 6883359 BLAKE2B 7e5da2f05d2ff92fd2c21a64c76954ff00104adcb81548ccfc19da4fc4995c59a494461f4343ae3b6799526d3f3f3a3c0051a6030af4cc9873d5cd5258fe30a6 SHA512 98e66cedf8a147aee7871df85ee45f58ab76637d26163cbb30ee9554638b503f52c9b14f4f3b64bbb49bb84282e399451a0f9a8622b6e7e545889773d72ba5d4
-EBUILD sphinx2-0.6.ebuild 714 BLAKE2B d80b7c52218849df64220500e7a586221beb89cffdcdc132908e1414f8c594644f6049feb493fcb4bfdbe3c914bd12bf84d8ac04bffed8c36a50e5fedab135eb SHA512 2bc62da98a691c4c40eec0b1d60b0a64ca850122dc133b8509e0df4537d7862453fe612ae1a60c471917e0bc6d2490800a7308e662916f79de6afdbe7ed176db
+EBUILD sphinx2-0.6.ebuild 785 BLAKE2B f5213991ef42065c6b763e1564d5f385a7adcff2588e80c98eb1f231af322fa87cccaab7e30ddf2283b0564094055b34f6a62f1de68b6c814a533ef4d10f1070 SHA512 9ebb298a554ea320369044ae3ea8c74e7cdb3838a9e3efd5eb9ced157c8976f9d5ef326296f9a9334ca2caa0c32a598280c8052813068696fe523b28ab20d62c
 MISC metadata.xml 462 BLAKE2B 2eae170bbccdd12a464c1bfef24e390e894f5449f09d70d69df8c221a55242b99863db56d7db2226d1af531be975f218b69c788c4aae348a00544b8f32836d3c SHA512 3159e075a7d959d2a6a75305692f706690f3ae54f6f114a131a4750c0ae020d4721d4a33434d3d98088f9fb3e1315ea8a25e54542752605bfb7a5600203bbe25
diff --git a/app-accessibility/sphinx2/files/sphinx2-0.6-as-needed.patch b/app-accessibility/sphinx2/files/sphinx2-0.6-as-needed.patch
index 0520d4d987e4..f647ab35142c 100644
--- a/app-accessibility/sphinx2/files/sphinx2-0.6-as-needed.patch
+++ b/app-accessibility/sphinx2/files/sphinx2-0.6-as-needed.patch
@@ -1,20 +1,17 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 05a4f8a..23d0309 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,5 @@
--SUBDIRS = libsphinx2 \
--	libsphinx2fe \
-+SUBDIRS = libsphinx2fe \
- 	libsphinx2ad \
-+	libsphinx2 \
- 	examples
+--- a/configure.in
++++ b/configure.in
+@@ -1,7 +1,7 @@
+ dnl Welcome to the Sphinx-2 automated build system.
+ dnl try not to hurt yourself ;)
+ 
+-AC_INIT(configure.in)
++AC_INIT(configure.ac)
+ AM_INIT_AUTOMAKE(sphinx2,0.6)
  
-diff --git a/src/libsphinx2/Makefile.am b/src/libsphinx2/Makefile.am
-index 66f0ac3..537381c 100644
+ CFLAGS=${CFLAGS:--g -O2 -Wall}
 --- a/src/libsphinx2/Makefile.am
 +++ b/src/libsphinx2/Makefile.am
-@@ -88,7 +88,7 @@ libsphinx2_la_SOURCES = \
+@@ -88,7 +88,7 @@
  	word_fsg.c
  
  
@@ -23,3 +20,13 @@ index 66f0ac3..537381c 100644
  
  # hjf@cs.brown.edu - Added for Solaris build
  # LDADD = -L/usr/demo/SOUND/lib/ -laudio
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,5 +1,5 @@
+-SUBDIRS = libsphinx2 \
+-	libsphinx2fe \
++SUBDIRS = libsphinx2fe \
+ 	libsphinx2ad \
++	libsphinx2 \
+ 	examples
+ 
diff --git a/app-accessibility/sphinx2/sphinx2-0.6.ebuild b/app-accessibility/sphinx2/sphinx2-0.6.ebuild
index d2fda0b62aef..0ca32c0a2170 100644
--- a/app-accessibility/sphinx2/sphinx2-0.6.ebuild
+++ b/app-accessibility/sphinx2/sphinx2-0.6.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="CMU Speech Recognition-engine"
 HOMEPAGE="http://fife.speech.cs.cmu.edu/sphinx/"
@@ -15,15 +14,27 @@ SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
+IUSE="static-libs"
+
+S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${P}-as-needed.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README doc/README.bin doc/README.lib doc/SCHMM_format doc/filler.dict doc/phoneset doc/phoneset-old
-	dohtml doc/phoneset_s2.html doc/sphinx2.html
+	HTML_DOCS=( doc/{phoneset_s2,sphinx2}.html )
+	default
+	dodoc doc/{README.{bin,lib},SCHMM_format,filler.dict,phoneset{,-old}}
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
 }