From 997d6f178125c40168cc5c93e6750f8085e9301b Mon Sep 17 00:00:00 2001
From: Gerhard Bräunlich <wippbox@gmx.net>
Date: Sat, 14 Jan 2017 17:24:25 +0100
Subject: sci-visualization/spectromatic: EAPI bump 4 -> 6

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3478
---
 .../files/spectromatic-1.0-makefile.patch          |  4 +--
 .../files/spectromatic-1.0-stringliteral.patch     |  4 +--
 .../spectromatic-1.0-waveheaderstruct-amd64.patch  | 12 ++++----
 .../spectromatic/spectromatic-1.0-r3.ebuild        | 35 ++++++++++++++++++++++
 4 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild

(limited to 'sci-visualization')

diff --git a/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch b/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch
index 48f9d9023358..619aaecf7a89 100644
--- a/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch
+++ b/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch
@@ -1,8 +1,8 @@
 Respect LDFLAGS, CFLAGS, CC  #334715
 Fix install paths
 
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -1,33 +1,29 @@
  # Makefile for spectromatic
  
diff --git a/sci-visualization/spectromatic/files/spectromatic-1.0-stringliteral.patch b/sci-visualization/spectromatic/files/spectromatic-1.0-stringliteral.patch
index 2d18f01b216a..d7233c1aab81 100644
--- a/sci-visualization/spectromatic/files/spectromatic-1.0-stringliteral.patch
+++ b/sci-visualization/spectromatic/files/spectromatic-1.0-stringliteral.patch
@@ -1,6 +1,6 @@
 diff -ru spectromatic-1.0/spectromatic.c spectromatic-1.0-new/spectromatic.c
---- spectromatic-1.0/spectromatic.c	2002-03-30 06:17:34.000000000 +0100
-+++ spectromatic-1.0-new/spectromatic.c	2004-07-02 21:25:49.485524639 +0200
+--- a/spectromatic.c
++++ b/spectromatic.c
 @@ -21,6 +21,7 @@
   ****************************************************************************/
  
diff --git a/sci-visualization/spectromatic/files/spectromatic-1.0-waveheaderstruct-amd64.patch b/sci-visualization/spectromatic/files/spectromatic-1.0-waveheaderstruct-amd64.patch
index edfb7af8c4b3..0c4253e7e765 100644
--- a/sci-visualization/spectromatic/files/spectromatic-1.0-waveheaderstruct-amd64.patch
+++ b/sci-visualization/spectromatic/files/spectromatic-1.0-waveheaderstruct-amd64.patch
@@ -1,5 +1,5 @@
---- wave.c.orig	2012-08-06 18:54:21.829756875 -0700
-+++ wave.c	2012-08-06 19:04:35.818049655 -0700
+--- a/wave.c
++++ b/wave.c
 @@ -1,11 +1,26 @@
  #include <stdio.h>
  #include <string.h>
@@ -46,8 +46,8 @@
 -	printf ("Data Length: %lu\n", header.data_length);
 +	printf ("Data Length: %lu\n", (unsigned long)header.data_length);
  }
---- wave.h.orig	2012-08-06 18:55:38.009165756 -0700
-+++ wave.h	2012-08-06 18:55:50.377232324 -0700
+--- a/wave.h
++++ b/wave.h
 @@ -22,24 +22,25 @@
  #ifndef WAVE_H
  #define WAVE_H
@@ -90,8 +90,8 @@
  
  int read_header (FILE *f, waveheaderstruct *header);
  int read_frames (FILE *f, int start, int length, char *data);
---- spectromatic.c.orig	2012-08-06 18:54:05.260668605 -0700
-+++ spectromatic.c	2012-08-06 19:28:18.637679446 -0700
+--- a/spectromatic.c
++++ b/spectromatic.c
 @@ -217,7 +217,7 @@
  		if (header.modus == 2)
  			ch2 = (double*) malloc (window_size * sizeof (double));
diff --git a/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild b/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild
new file mode 100644
index 000000000000..10d366ad3c77
--- /dev/null
+++ b/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P=${PN}_${PV}-1
+
+DESCRIPTION="Generates time-frequency analysis images from wav files"
+HOMEPAGE="http://ieee.uow.edu.au/~daniel/software/spectromatic/"
+SRC_URI="http://ieee.uow.edu.au/~daniel/software/spectromatic/dist/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	media-libs/libpng:0=
+	sci-libs/gsl:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-stringliteral.patch
+	"${FILESDIR}"/${P}-waveheaderstruct-amd64.patch
+)
+
+src_configure() {
+	tc-export CC
+	export TOPLEVEL_HOME="${EPREFIX}/usr"
+}
-- 
cgit v1.2.3-18-g5258