app-cdr/cuecue: Fix build issues.

Package-Manager: portage-2.3.0

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 (file)
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 8a0252180d24ab2d19faf97d9e84e111c4fcd3c1..ddf10dcd11bb3d183f3bc0936912a78c0b55a29f 100644 (file)
--- 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 (file)
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 @@
+ \r
+ \r
+ #define LINE_MAX 1024\r
++#ifndef FILENAME_MAX\r
+ #define FILENAME_MAX 1024\r
++#endif\r
+ \r
+ FUNC_DECODER decoders[]=\r
+ {\r

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 (file)
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];\r
+       char *ext;\r
+       int i;\r
+-      int found=0;\r
+-\r
+-      ext = strrchr(filename,'.');\r
+ \r
+       for(i=0; i<DECODER_MAX; i++) {\r
+-              char *ext;\r
+ \r
+               strcpy(str,filename);\r
+               ext = strrchr(str,'.');\r
+@@ -176,7 +172,6 @@
+                       strcpy(ext,Extensions[i]);\r
+                       if (FileExists(str)) {\r
+                               strcpy(cuefile,str);\r
+-                              found=1;\r
+                               return 1;\r
+                       }\r
+               }\r