[gentoo-commits] repo/gentoo:master commit in: media-libs/libofa/, media-libs/libofa/files/

[Andreas Sturmlechner]

commit:     3d108507cfc195c2033dc6afc7488976d8a8d184
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 25 21:18:37 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 21:48:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d108507

media-libs/libofa: EAPI-7 bump, drop unused deps/eutils

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/libofa/files/libofa-0.9.3-gcc-4.3.patch | 20 +++++-----
 media-libs/libofa/files/libofa-0.9.3-gcc-4.4.patch |  4 +-
 media-libs/libofa/files/libofa-0.9.3-gcc-4.7.patch | 12 +++---
 media-libs/libofa/files/libofa-0.9.3-gcc-4.patch   |  4 +-
 media-libs/libofa/libofa-0.9.3-r2.ebuild           | 43 ++++++++++++++++++++++
 5 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/media-libs/libofa/files/libofa-0.9.3-gcc-4.3.patch b/media-libs/libofa/files/libofa-0.9.3-gcc-4.3.patch
index f68f42bfb12..e8e87ff8b73 100644
--- a/media-libs/libofa/files/libofa-0.9.3-gcc-4.3.patch
+++ b/media-libs/libofa/files/libofa-0.9.3-gcc-4.3.patch
@@ -1,6 +1,6 @@
-diff -ur libofa-0.9.3.orig/examples/example.cpp libofa-0.9.3/examples/example.cpp
---- libofa-0.9.3.orig/examples/example.cpp	2006-05-10 21:05:37.000000000 +0300
-+++ libofa-0.9.3/examples/example.cpp	2008-04-16 15:51:49.000000000 +0300
+diff -ur a/examples/example.cpp b/examples/example.cpp
+--- a/examples/example.cpp	2006-05-10 21:05:37.000000000 +0300
++++ b/examples/example.cpp	2008-04-16 15:51:49.000000000 +0300
 @@ -9,6 +9,8 @@
  
  #include "protocol.h"
@@ -10,10 +10,10 @@ diff -ur libofa-0.9.3.orig/examples/example.cpp libofa-0.9.3/examples/example.cp
  AudioData* loadWaveFile(char *file);
  AudioData* loadDataUsingLAME(char *file);
  
-Vain hakemistossa libofa-0.9.3/examples: example.cpp.orig
-diff -ur libofa-0.9.3.orig/examples/protocol.cpp libofa-0.9.3/examples/protocol.cpp
---- libofa-0.9.3.orig/examples/protocol.cpp	2006-05-10 21:05:42.000000000 +0300
-+++ libofa-0.9.3/examples/protocol.cpp	2008-04-16 15:51:49.000000000 +0300
+Vain hakemistossa b/examples: example.cpp.orig
+diff -ur a/examples/protocol.cpp b/examples/protocol.cpp
+--- a/examples/protocol.cpp	2006-05-10 21:05:42.000000000 +0300
++++ b/examples/protocol.cpp	2008-04-16 15:51:49.000000000 +0300
 @@ -8,6 +8,7 @@
  -------------------------------------------------------------------*/
  #include <stdio.h>
@@ -22,9 +22,9 @@ diff -ur libofa-0.9.3.orig/examples/protocol.cpp libofa-0.9.3/examples/protocol.
  #include <string>
  #include <map>
  #include <expat.h>
-diff -ur libofa-0.9.3.orig/lib/signal_op.cpp libofa-0.9.3/lib/signal_op.cpp
---- libofa-0.9.3.orig/lib/signal_op.cpp	2006-05-10 21:01:12.000000000 +0300
-+++ libofa-0.9.3/lib/signal_op.cpp	2008-04-16 15:51:49.000000000 +0300
+diff -ur a/lib/signal_op.cpp b/lib/signal_op.cpp
+--- a/lib/signal_op.cpp	2006-05-10 21:01:12.000000000 +0300
++++ b/lib/signal_op.cpp	2008-04-16 15:51:49.000000000 +0300
 @@ -12,6 +12,7 @@
  // DATE CREATED: 1/12/06
  

diff --git a/media-libs/libofa/files/libofa-0.9.3-gcc-4.4.patch b/media-libs/libofa/files/libofa-0.9.3-gcc-4.4.patch
index 25cab143d23..c730c8ca583 100644
--- a/media-libs/libofa/files/libofa-0.9.3-gcc-4.4.patch
+++ b/media-libs/libofa/files/libofa-0.9.3-gcc-4.4.patch
@@ -1,5 +1,5 @@
---- orig-libofa-0.9.3/examples/example.cpp      2009-04-11 12:22:55.397455430 +0200
-+++ libofa-0.9.3/examples/example.cpp   2009-04-11 12:25:21.466456955 +0200
+--- a/examples/example.cpp   2009-04-11 12:22:55.397455430 +0200
++++ b/examples/example.cpp   2009-04-11 12:25:21.466456955 +0200
 @@ -9,6 +9,7 @@
 
  #include "protocol.h"

diff --git a/media-libs/libofa/files/libofa-0.9.3-gcc-4.7.patch b/media-libs/libofa/files/libofa-0.9.3-gcc-4.7.patch
index c5ab098767d..6d97d7724df 100644
--- a/media-libs/libofa/files/libofa-0.9.3-gcc-4.7.patch
+++ b/media-libs/libofa/files/libofa-0.9.3-gcc-4.7.patch
@@ -1,6 +1,6 @@
-diff -up libofa-0.9.3/examples/uselame.cpp.gcc47 libofa-0.9.3/examples/uselame.cpp
---- libofa-0.9.3/examples/uselame.cpp.gcc47	2012-01-14 09:35:24.343146853 -0600
-+++ libofa-0.9.3/examples/uselame.cpp	2012-01-14 09:35:49.956826634 -0600
+diff -up a/examples/uselame.cpp b/examples/uselame.cpp
+--- a/examples/uselame.cpp	2012-01-14 09:35:24.343146853 -0600
++++ b/examples/uselame.cpp	2012-01-14 09:35:49.956826634 -0600
 @@ -12,6 +12,7 @@
  #else
  #include <sys/wait.h>
@@ -9,9 +9,9 @@ diff -up libofa-0.9.3/examples/uselame.cpp.gcc47 libofa-0.9.3/examples/uselame.c
  
  AudioData *loadWaveFile(char *file);
  
-diff -up libofa-0.9.3/examples/wavefile.cpp.gcc47 libofa-0.9.3/examples/wavefile.cpp
---- libofa-0.9.3/examples/wavefile.cpp.gcc47	2012-01-14 09:35:24.344146841 -0600
-+++ libofa-0.9.3/examples/wavefile.cpp	2012-01-14 16:00:54.414981160 -0600
+diff -up a/examples/wavefile.cpp b/examples/wavefile.cpp
+--- a/examples/wavefile.cpp	2012-01-14 09:35:24.344146841 -0600
++++ b/examples/wavefile.cpp	2012-01-14 16:00:54.414981160 -0600
 @@ -11,6 +11,7 @@
  #include "io.h"
  #endif

diff --git a/media-libs/libofa/files/libofa-0.9.3-gcc-4.patch b/media-libs/libofa/files/libofa-0.9.3-gcc-4.patch
index d1059bafa55..920c383c657 100644
--- a/media-libs/libofa/files/libofa-0.9.3-gcc-4.patch
+++ b/media-libs/libofa/files/libofa-0.9.3-gcc-4.patch
@@ -1,5 +1,5 @@
---- lib/JAMA/tnt_math_utils.h.orig	2006-06-17 01:46:22.000000000 +0300
-+++ lib/JAMA/tnt_math_utils.h	2006-06-17 01:47:02.000000000 +0300
+--- a/lib/JAMA/tnt_math_utils.h	2006-06-17 01:46:22.000000000 +0300
++++ b/lib/JAMA/tnt_math_utils.h	2006-06-17 01:47:02.000000000 +0300
 @@ -20,11 +20,20 @@
  namespace TNT
  {

diff --git a/media-libs/libofa/libofa-0.9.3-r2.ebuild b/media-libs/libofa/libofa-0.9.3-r2.ebuild
new file mode 100644
index 00000000000..1e7197c4975
--- /dev/null
+++ b/media-libs/libofa/libofa-0.9.3-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Open Fingerprint Architecture"
+HOMEPAGE="https://code.google.com/p/musicip-libofa/"
+SRC_URI="https://musicip-libofa.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="|| ( APL-1.0 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+DEPEND=">=sci-libs/fftw-3.3.3-r2[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc-4{,.3,.4,.7}.patch )
+
+src_prepare() {
+	default
+
+	# disable building non-installed examples
+	sed -i -e '/SUBDIRS/s:examples::' Makefile.{am,in} || die
+
+	is-flag -ffast-math && append-flags -fno-fast-math
+}
+
+multilib_src_configure() {
+	# disable dependencies that were used for the noinst_ example only
+	ECONF_SOURCE=${S} \
+	econf \
+		ac_cv_lib_expat_XML_ExpatVersion=yes \
+		ac_cv_lib_curl_curl_global_init=yes
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -type f -delete || die
+}