gentoo resync : 14.07.2018

6 files changed, 228 insertions, 0 deletions

diff --git a/app-cdr/cuecue/Manifest b/app-cdr/cuecue/Manifest
new file mode 100644
index 000000000000..4d90953846c9
--- /dev/null
+++ b/app-cdr/cuecue/Manifest
@@ -0,0 +1,6 @@
+AUX cuecue-0.2.2-flac113.diff 3528 BLAKE2B ea1daa82d58df58fbfc4ee9b95980f93c1a06090da5765c4f8e2fb09feea9af1b626a51ef06edac24ec1eaf0ebfc93b0d2419ad0240125e41870d894b2a57b90 SHA512 af0bcc1ca7208b9713763b823792becb8785d442cc8f51240c470096b3d90eb21bc36230ec422b42401fa0cfa335aedb578507174083de1b2ffdb01d5f5e3fb6
+AUX cuecue-0.2.2-namespace.patch 200 BLAKE2B 20a1471d2c7bb4ce08335bda46f1cf8c1e7656aebd9364e26b9847e21edf87f2cdbc20eac3b8cf2921c4e427053535865efec1e622af17723443c597f7c91a3d SHA512 8b0ee39e60e913347f7aac6517e3a150e829099cf5ada6e76e3e4fd2673692c83061b8903676902a1cf6d7f3101ef6cf0a10858f36c44995a207b30ca39d826c
+AUX cuecue-0.2.2-unused.patch 448 BLAKE2B 6ee232d07362cd285e6a7712473f7e99f6d487f08b13f8dc1f7b2e8f145f91aa39c34f3f15399057abf7eabd4fda00495fd546ec7df9503b1295a945cd23bc0a SHA512 d3cf53c0aa25cc8d3a88852564d9bc6eb6a6fd51eff4fc8348a0601ffb268d4d2078fbca6d719b3783587eec97f78fcccd76431e68307b655bcdfe09be6d17b2
+DIST cuecue-0.2.2.tar.gz 97927 BLAKE2B f3577ca59fc277ecd1c6bf68a5ccfa127ae92a00c52a4da00f2be90b87df0522407b7cca616dd44d5d9af44790ca6db146224decfd632d26893d14db9fba3c28 SHA512 586ff819910532f19bf5c0b9ca61b3efe89a4699b05dba2ca6f4a9b78a1716264238e874405486f6b006cf84ed19a1cc96af510f815af9cdb0b76be3e1011595
+EBUILD cuecue-0.2.2-r2.ebuild 1007 BLAKE2B af2f6f7d5fbf3488eb684112510d414db7125b785c06665dfd7a8fde2ec319c90dc3607d6bcbf9c88a1f677cc3e4cb6e1ba7854db189c57e2ceb4b7c9c2318f2 SHA512 97e4a50751e12c7ff3ce776be466684b4ea6d16ab5c97a2985ff27f09c2f38ade1b44d82dd8f3352bcd552cc1f3d9b86c821aeba3c6a0248d1bc3448992b37bf
+MISC metadata.xml 379 BLAKE2B 10642874a33da77fd2f8c3aa6ddd983ec157e50eb79aa4d4bec9ad9c538b36f54cd36b4ea98b7295fa8e486bd46d14a40ed161c56be87dc3eac1bd687f9e0c58 SHA512 b66aca65ce1c6beecb9c4c3cb65153dcb32aa70de53ecccf9171e2a0163af4f213d5fe753949a3bfb49a476a82856f977972bbe535034533544066b672a79b6c
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 000000000000..a8418f36b021
--- /dev/null
+++ b/app-cdr/cuecue/cuecue-0.2.2-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="Cuecue converts .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+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
+)
+
+src_configure() {
+	econf \
+		$(use_enable flac) \
+		$(use_enable mp3) \
+		$(use_enable vorbis ogg) \
+		--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
new file mode 100644
index 000000000000..ddf10dcd11bb
--- /dev/null
+++ b/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff
@@ -0,0 +1,129 @@
+--- a/src/libcuecue/flac.c
++++ b/src/libcuecue/flac.c
+@@ -27,6 +27,12 @@
+ #include "cuecue.h"
+ #include "cuecue_internal.h"
+ 
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ typedef struct Internal
+ {
+ 	FILE *dst;
+@@ -38,7 +44,11 @@
+ } Internal;
+ 
+ 
++#ifdef LEGACY_FLAC
+ void error(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
++#else
++void error(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
++#endif
+ {
+ 	Internal *internal = client_data;
+ 	switch (status) {
+@@ -52,11 +62,21 @@
+ 			strcpy(cuecue_error,"CRC Mismatch: FLAC file corrupted");
+ 			internal->error=1;
+ 			break;
++#ifndef LEGACY_FLAC
++		case FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM:
++			strcpy(cuecue_error,"Unparseable stream");
++			internal->error=1;
++			break;
++#endif
+ 	}
+ }
+ 
+ 
++#ifdef LEGACY_FLAC
+ void metadata(const FLAC__FileDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
++#else
++void metadata(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
++#endif
+ {
+ 	if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
+ 		/* get size of the file, for progress callback */
+@@ -66,7 +86,11 @@
+ }
+ 
+ 
++#ifdef LEGACY_FLAC
+ FLAC__StreamDecoderWriteStatus write(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
++#else
++FLAC__StreamDecoderWriteStatus write(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
++#endif
+ {
+ 	Internal *internal = client_data;
+ 	unsigned int samples = frame->header.blocksize;
+@@ -126,7 +150,11 @@
+ {
+ 	FILE *dst;
+ 	Internal internal;
++#ifdef LEGACY_FLAC
+ 	FLAC__FileDecoder *decoder;
++#else
++	FLAC__StreamDecoder *decoder;
++#endif
+ 
+ 	dst = fopen(file_destination, "wb");
+ 
+@@ -141,7 +169,11 @@
+ 	internal.error=0;
+ 	internal.dst=dst;
+ 
++#ifdef LEGACY_FLAC
+ 	decoder = FLAC__file_decoder_new();
++#else
++	decoder = FLAC__stream_decoder_new();
++#endif
+ 
+ 	if (decoder==NULL) {
+ 		snprintf(cuecue_error,CUECUE_ERROR_LENGTH,"Cannot create FLAC decoder! memory error ?");
+@@ -150,6 +182,7 @@
+ 
+ 	internal.buffer = malloc(BUFFER_SIZE);
+ 
++#ifdef LEGACY_FLAC
+ 	FLAC__file_decoder_set_md5_checking(decoder, true);
+ 	FLAC__file_decoder_set_filename(decoder, file_source);
+ 
+@@ -162,8 +195,20 @@
+ 		snprintf(cuecue_error,1024,"Cannot open '%s'",file_source);
+ 		internal.error=1;
+ 	}
++#else
++	FLAC__stream_decoder_set_md5_checking(decoder, true);
++	if(FLAC__stream_decoder_init_file(decoder, file_source, write, metadata, error, &internal) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
++		snprintf(cuecue_error,1024,"Cannot open '%s'",file_source);
++		internal.error=1;
++	}
++#endif
+ 
+-	if(!FLAC__file_decoder_process_until_end_of_file(decoder)) {
++#ifdef LEGACY_FLAC
++	if(!FLAC__file_decoder_process_until_end_of_file(decoder))
++#else
++	if(!FLAC__stream_decoder_process_until_end_of_stream(decoder))
++#endif
++	{
+ 		if (!internal.error) {
+ 			/* early error, not even the time to decode metadata :) */
+ 			snprintf(cuecue_error,CUECUE_ERROR_LENGTH,"Cannot open '%s'",file_source);
+@@ -171,8 +216,13 @@
+ 		internal.error=1;
+ 	}
+ 
++#ifdef LEGACY_FLAC
+ 	FLAC__file_decoder_finish(decoder);
+ 	FLAC__file_decoder_delete(decoder);
++#else
++	FLAC__stream_decoder_finish(decoder);
++	FLAC__stream_decoder_delete(decoder);
++#endif
+ 
+ 	fclose(dst);
+ 	free(internal.buffer);
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 000000000000..42ebf42d4061
--- /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 000000000000..86874a2698e9
--- /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;

+ 			}

+ 		}

diff --git a/app-cdr/cuecue/metadata.xml b/app-cdr/cuecue/metadata.xml
new file mode 100644
index 000000000000..74eb34bd0058
--- /dev/null
+++ b/app-cdr/cuecue/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		cuecue is a command line program to convert .cue + [.ogg|.flac|.wav|.mp3] to
+		.cue + .bin, in order to make them easier to burn with standard burning software.
+	</longdescription>
+</pkgmetadata>