gentoo resync : 30.05.2020

8 files changed, 71 insertions, 5 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 4e720556ce63..dee08b6b7568 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 11e72fced3ad..b3923d2f84fb 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,5 +1,5 @@
 AUX cdrtools-fix-clone-uclibc.patch 2582 BLAKE2B dfa564f67e15dfcdab9e654572c95f89787fded558e88edecde89237ea5097b6a6cc0233b5950f0df460490af415255a56130d27b7198b3c1fee279e288835f9 SHA512 23031747c1d7bc0292beb754f059381df1f1ac7851c9fdb7f296c933f3a9d7c4e52848f90ab50c459432628d74a7546752b299d74199259d84eb89ce92ae0077
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
-EBUILD cdrtools-3.02_alpha09-r2.ebuild 8315 BLAKE2B 0c6772e9eb7217aa5e2f103de670ff089a473c7bde41eb5877996a4d0897b23ecbba5874d33ff6599503c776c657e18754d43a3d7adbcb1b91f30bb3565b2b1b SHA512 6c58a4243a73f8de285488bb3b01509d3d261ae38b67433f41f4b5cff173067ef036a4b0ed7667b5a95da1269e74f2b6c6f49042cc948d33b808950cf6e0601b
+EBUILD cdrtools-3.02_alpha09-r2.ebuild 8308 BLAKE2B deb5469cd79d539703609068c95d41d2b1178f9f1b3985d2179a60cde90f116db510e52bb8d5fde6a0371f21b64bdadc12dae2fbe29125655236cfc1acc0ba21 SHA512 e95af68eec20cd28b3bdf24489cce215873bd6f8af75d2d8e2aa6de6a4e34997b26c2d72b2d887bee08950d6e53e9ece57334e226026dcc3b4e513a81275994f
 EBUILD cdrtools-3.02_alpha09.ebuild 8238 BLAKE2B 7bb73807895571dee4c7322a86ded1540ed2446f9be36fe72039a259b88c048a7f03725aa146c7977c69dd132aa143fb30cb9ef92e185e1bb475b902e6c14af3 SHA512 2547caf73df8bfa14b25e144d49208e53c771acbb0a23ce87e8d1c249e16a3cb2fd73babedcf4c3cfd5f0a8f180343de22fb6ac71780dee9f1040e0c6ca607e6
 MISC metadata.xml 533 BLAKE2B 13eeaf0e3fd17234f44138fc6b6fe1b0ef5e369b823a1adb9063743702b9afe86f1d939bb451df1cc6337c2e3790e38b1f890e68c46eeed9210ccc6d96e0944e SHA512 ddf004043b6d96ef6ec697f2452df1df68b234e4b899c047743a8cdd971167607f91c05435bc0a7978f65e13895fecec31a20a2b2f659a696fa3e4e704e18818
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
index 282f987416e4..81cea1746aaf 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="
diff --git a/app-cdr/cuecue/Manifest b/app-cdr/cuecue/Manifest
index 4d90953846c9..8e80a91e7d84 100644
--- a/app-cdr/cuecue/Manifest
+++ b/app-cdr/cuecue/Manifest
@@ -1,6 +1,8 @@
 AUX cuecue-0.2.2-flac113.diff 3528 BLAKE2B ea1daa82d58df58fbfc4ee9b95980f93c1a06090da5765c4f8e2fb09feea9af1b626a51ef06edac24ec1eaf0ebfc93b0d2419ad0240125e41870d894b2a57b90 SHA512 af0bcc1ca7208b9713763b823792becb8785d442cc8f51240c470096b3d90eb21bc36230ec422b42401fa0cfa335aedb578507174083de1b2ffdb01d5f5e3fb6
+AUX cuecue-0.2.2-fno-common.patch 366 BLAKE2B a4218bf38d1165ca644894a199a882e0b9ebdc56830171aa8efe085b2d678175bb5ef0c2a2bd3004cb6ce24d08d74cfec8391d7f39fba808277276c06aa2b118 SHA512 800c3d2214491ce96aed222659f45e57eb2734bfeedcdcb677bd9b5f18ec29143d17acc2a7ab032a94f249cbb65e1bf299c16cefca0ddfd0fbd7f05af879ca4a
 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
+EBUILD cuecue-0.2.2-r3.ebuild 1084 BLAKE2B a32df4d3ad7b7521eeee1bcb353108f469af2ad2d2e70c72f886f63d2d7555df915bc48b54c1ab091302a2149ae92bcb66870d36e5d5009f8e2e1e9c8c388dd6 SHA512 f61f13c7b4de5e377ed764ba0d29ece66c87d74ec3aeb5f699fa5d5a5b8f0f04eb64f82060311ae5001084e6a815784aa2a0394edf637822ca512b39daaa34ad
 MISC metadata.xml 379 BLAKE2B 10642874a33da77fd2f8c3aa6ddd983ec157e50eb79aa4d4bec9ad9c538b36f54cd36b4ea98b7295fa8e486bd46d14a40ed161c56be87dc3eac1bd687f9e0c58 SHA512 b66aca65ce1c6beecb9c4c3cb65153dcb32aa70de53ecccf9171e2a0163af4f213d5fe753949a3bfb49a476a82856f977972bbe535034533544066b672a79b6c
diff --git a/app-cdr/cuecue/cuecue-0.2.2-r3.ebuild b/app-cdr/cuecue/cuecue-0.2.2-r3.ebuild
new file mode 100644
index 000000000000..03166b162e34
--- /dev/null
+++ b/app-cdr/cuecue/cuecue-0.2.2-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+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 )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flac113.diff # bug 157706
+	"${FILESDIR}"/${P}-namespace.patch
+	"${FILESDIR}"/${P}-unused.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable flac) \
+		$(use_enable mp3) \
+		$(use_enable vorbis ogg) \
+		--disable-libFLACtest \
+		--disable-oggtest \
+		--disable-vorbistest
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	default
+
+	insinto /usr/include
+	doins src/libcuecue/cuecue.h
+}
diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-fno-common.patch b/app-cdr/cuecue/files/cuecue-0.2.2-fno-common.patch
new file mode 100644
index 000000000000..9eb8b18e8386
--- /dev/null
+++ b/app-cdr/cuecue/files/cuecue-0.2.2-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/libcuecue/cuecue_internal.h
++++ b/src/libcuecue/cuecue_internal.h
+@@ -57,7 +57,7 @@
+ typedef int (*FUNC_DECODER)(char* file_source, char* file_destination, PROGRESS_CALLBACK callback);

+ 

+ #define CUECUE_ERROR_LENGTH 1024

+-char cuecue_error[CUECUE_ERROR_LENGTH];

++extern char cuecue_error[CUECUE_ERROR_LENGTH];

+ 

+ #endif /* __CUECUE_INTERNAL__ */

+ 

diff --git a/app-cdr/geteltorito/Manifest b/app-cdr/geteltorito/Manifest
index ceee644ad59d..7e9a78b426f2 100644
--- a/app-cdr/geteltorito/Manifest
+++ b/app-cdr/geteltorito/Manifest
@@ -1,3 +1,3 @@
 DIST geteltorito-0.6.tar.gz 11971 BLAKE2B 8d02c48477a7a37287028c68a3a647bb19b07b299818bf589d40537d0af0d044c85d421a149ce9f8a2fc5bb4d6f4db20b90da29fae35267eaf9d58b73c6f4159 SHA512 c9823b8dffaf98d08383606aa21971605a001880bf7abfe614be4380963237ab55f0fcaeb6be393a3902b5d1dc43ce283ca16ef40ea142b2b2d825d3467e31e9
-EBUILD geteltorito-0.6.ebuild 437 BLAKE2B d663da41be67e92050458fc93c9552d65bbe3bf2df422475b141d7cb49b93de090b69ca6d31368c7a0b930893d2c1e6c70d2355b1294cb160d93ed9a27d1ea26 SHA512 a9de3d7fc88364bedf2e3713af2e213d6a4134faa326096701c36f871e3627a4f663b598ff3b46a2a61ee59f8131acab2d2b8ad06bfd1bbdb7417fea56802741
+EBUILD geteltorito-0.6.ebuild 440 BLAKE2B cd4e1d0ac36f214d4f8ab77f8e6323a88ef53cefc4003738aa252825d7f09eb5ca2f178c12fd408f6d2e1823d78dc9029e0c8d2d153785f5efd354ff118f8383 SHA512 cbbd0a43c97aab62d70e34d16890587eaef0555bd6d73f504dd1b4890b9e87370154a21bf76541ca4fbd521ae991af9829d652993ce2c1456abba7e6d2652760
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/app-cdr/geteltorito/geteltorito-0.6.ebuild b/app-cdr/geteltorito/geteltorito-0.6.ebuild
index 60d7f6b4809a..5f7f7fc9cdeb 100644
--- a/app-cdr/geteltorito/geteltorito-0.6.ebuild
+++ b/app-cdr/geteltorito/geteltorito-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://userpages.uni-koblenz.de/~krienke/ftp/noarch/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-lang/perl"