[gentoo-commits] repo/gentoo:master commit in: app-cdr/cuecue/files/, app-cdr/cuecue/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     8ef6aaf69ff1bc21e8b0335cfe9baa312ca95bc9
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 06:37:43 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 06:38:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef6aaf6

app-cdr/cuecue: Fix build issues.

Package-Manager: portage-2.3.0

 app-cdr/cuecue/cuecue-0.2.2-r2.ebuild             | 53 +++++++++++++++++++++++
 app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff    |  5 +--
 app-cdr/cuecue/files/cuecue-0.2.2-namespace.patch | 12 +++++
 app-cdr/cuecue/files/cuecue-0.2.2-unused.patch    | 23 ++++++++++
 4 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/app-cdr/cuecue/cuecue-0.2.2-r2.ebuild b/app-cdr/cuecue/cuecue-0.2.2-r2.ebuild
new file mode 100644
index 0000000..9cf7789
--- /dev/null
+++ b/app-cdr/cuecue/cuecue-0.2.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="Cuecue converts .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin"
+HOMEPAGE="http://cuecue.berlios.de/"
+#SRC_URI="mirror://berlios/cuecue/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Enable one use flag by default, bug 254745"
+IUSE="flac mp3 +vorbis"
+REQUIRED_USE="|| ( flac mp3 vorbis )"
+
+DEPEND="
+	flac? ( media-libs/flac )
+	mp3? ( media-libs/libmad )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flac113.diff # bug 157706
+	"${FILESDIR}"/${P}-namespace.patch
+	"${FILESDIR}"/${P}-unused.patch
+)
+DOCS="CHANGES README TODO"
+
+src_configure() {
+	econf \
+		$(use_enable flac) \
+		$(use_enable mp3) \
+		$(use_enable vorbis ogg) \
+		--disable-dependency-tracking \
+		--disable-libFLACtest \
+		--disable-oggtest \
+		--disable-vorbistest
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	default
+
+	insinto /usr/include
+	doins src/libcuecue/cuecue.h
+}

diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff b/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff
index 8a02521..ddf10dc 100644
--- a/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff
+++ b/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff
@@ -1,6 +1,5 @@
-diff -Naur src.orig/libcuecue/flac.c src/libcuecue/flac.c
---- src.orig/libcuecue/flac.c	2004-09-22 04:28:21.000000000 +0200
-+++ src/libcuecue/flac.c	2007-02-27 23:25:36.000000000 +0100
+--- a/src/libcuecue/flac.c
++++ b/src/libcuecue/flac.c
 @@ -27,6 +27,12 @@
  #include "cuecue.h"
  #include "cuecue_internal.h"

diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-namespace.patch b/app-cdr/cuecue/files/cuecue-0.2.2-namespace.patch
new file mode 100644
index 0000000..42ebf42
--- /dev/null
+++ b/app-cdr/cuecue/files/cuecue-0.2.2-namespace.patch
@@ -0,0 +1,12 @@
+--- a/src/libcuecue/cuecue.c
++++ b/src/libcuecue/cuecue.c
+@@ -24,7 +24,9 @@
+ 
+ 
+ #define LINE_MAX 1024
++#ifndef FILENAME_MAX
+ #define FILENAME_MAX 1024
++#endif
+ 
+ FUNC_DECODER decoders[]=
+ {

diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-unused.patch b/app-cdr/cuecue/files/cuecue-0.2.2-unused.patch
new file mode 100644
index 0000000..86874a2
--- /dev/null
+++ b/app-cdr/cuecue/files/cuecue-0.2.2-unused.patch
@@ -0,0 +1,23 @@
+--- a/src/libcuecue/cuecue.c
++++ b/src/libcuecue/cuecue.c
+@@ -163,12 +163,8 @@
+ 	char str[CUECUE_FILENAME_MAX];
+ 	char *ext;
+ 	int i;
+-	int found=0;
+-
+-	ext = strrchr(filename,'.');
+ 
+ 	for(i=0; i<DECODER_MAX; i++) {
+-		char *ext;
+ 
+ 		strcpy(str,filename);
+ 		ext = strrchr(str,'.');
+@@ -176,7 +172,6 @@
+ 			strcpy(ext,Extensions[i]);
+ 			if (FileExists(str)) {
+ 				strcpy(cuefile,str);
+-				found=1;
+ 				return 1;
+ 			}
+ 		}