gentoo resync : 14.05.2020

4 files changed, 29 insertions, 62 deletions

diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index 195090a84251..0ceeed1418ff 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,6 +1,5 @@
+AUX cdparanoia-missing-sys_types_h.patch 876 BLAKE2B 4624baa06a6d9c4d233104267b35e90431c56405398f985292980dd416809fc8f015e7bd8b3575bb4fd4fe0fa03c1167e0c849a9d30523e1fc1b6e8c31b0993b SHA512 a124c74e7ecfc0238d7e5581063d51fd7aa18df6dae5709fe38662c33f0c9dd0706cbd834681d09f84f2ee2aa0914662740754d181f448b593288382eab68627
 DIST cdparanoia-3.10.2-patches.tar.xz 12228 BLAKE2B 0a78bf713807ed738110543c0e4a8fb5af8add5c77b93b3cf219b1dd19d1317d0bf0197c9bf1cc2217b37c08ab1ff576982a0408d2c0adf6be79f25e35e0b36c SHA512 48ef57334f48d8b7449ea5ca361666d1a618529bf2e78182026fa09a94cd55865d18f4925369bf9de2c251d9420c0edfae17eb8726c157bb6eafd8b4fd410a5a
-DIST cdparanoia-III-10.2-patches-2.tbz2 6242 BLAKE2B 6eb0f3c3a331421497e406df969de61d42590f4e8ffff13ffc212ec4a03170b1e02e00322c5c4f2042e5cc4be2cffff58ec8b9b57d851d5df8bebc3fb88ac913 SHA512 523a9ef9f3de263236aad6da102b807a6620cde8767e297e54dcd552f59077d959a89187bc82ad71c577fa66c4862d7c651e922b8b8b8369dd63685cbda9cb74
 DIST cdparanoia-III-10.2.src.tgz 183236 BLAKE2B 295065388e45371329ea7b04bac03c90fd854478d34eb46fa95db03054a1a21effe7863e5065a9148e558796c352d5087b6ef1c3c4c20342e66abd7d2c9eef85 SHA512 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
-EBUILD cdparanoia-3.10.2-r6.ebuild 1323 BLAKE2B 7039ec3499379d3fd07b16e7be2b458ba26490fcf7ffb0ecdb5343fa950f9d7b3453badfc8d3d44c9e325d277078b0fbda92624d09e77f29f9cbfa5c51e1f54e SHA512 c517ae7d58d9002a7555683e5e542cb789dda97b5f87a9f1b5fc5ed46455674e2a0f38623cdfc99382275d5e829f43e88a81c08259e7254832383f64dee25523
-EBUILD cdparanoia-3.10.2-r7.ebuild 1376 BLAKE2B 7cf085efd9bce55b06494d855ccd80716b5d65b14eb072ee36227c83208ed3cb9883591fa95a7165d03657bf3d55c006be1198c6055d86f8b950949422261d2f SHA512 6e2a6819c01365537e908f879bbaefd298efc7a81afa543d2ba59b3543cf21a8660710b2a255ff5a1cec94ab8739a351bcda00ef8f51401501552a9356f4c118
+EBUILD cdparanoia-3.10.2-r7.ebuild 1439 BLAKE2B f381f68873658497ec66917e288b906094f393f8b9a868c781d92e7b193f847195e67c7a16c3bdedbb72ba4cdf7321e19538905d5b6df31b91e8bfb1ce714fcf SHA512 57b0c6e44eb66ade975a7d027e0017a303a24de702ef1ebe0682f59f895a9d87475963010ba86667b8196f8f660a5db8d67a12cdba7bbf3b8d351161cea9715b
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
deleted file mode 100644
index a4aec2530532..000000000000
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils libtool toolchain-funcs versionator multilib-minimal
-
-MY_P=${PN}-III-$(get_version_component_range 2-3)
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.xiph.org/paranoia"
-SRC_URI="https://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
-	https://dev.gentoo.org/~ssuominen/${MY_P}-patches-2.tbz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="app-eselect/eselect-cdparanoia"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
-
-	mv configure.guess config.guess
-	mv configure.sub config.sub
-
-	sed -i -e '/configure.\(guess\|sub\)/d' configure.in || die
-
-	eautoconf
-	elibtoolize
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	tc-export AR CC RANLIB
-	econf
-}
-
-multilib_src_compile() {
-	emake OPT="${CFLAGS} -I${S}/interface"
-	use static-libs && emake lib OPT="${CFLAGS} -I${S}/interface"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/${PN}{,-paranoia}
-}
-
-pkg_postinst() {
-	eselect ${PN} update ifunset
-}
-
-pkg_postrm() {
-	eselect ${PN} update ifunset
-}
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
index 38d07ee8cf0f..afbbe92e3f8d 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,6 +27,8 @@ src_prepare() {
 	# Patches from previus patchset + Fedora + Debian
 	eapply "${WORKDIR}"/patches/*.patch
 
+	eapply "${FILESDIR}"/${PN}-missing-sys_types_h.patch #713740
+
 	mv configure.guess config.guess
 	mv configure.sub config.sub
 
diff --git a/media-sound/cdparanoia/files/cdparanoia-missing-sys_types_h.patch b/media-sound/cdparanoia/files/cdparanoia-missing-sys_types_h.patch
new file mode 100644
index 000000000000..010ed4a844cc
--- /dev/null
+++ b/media-sound/cdparanoia/files/cdparanoia-missing-sys_types_h.patch
@@ -0,0 +1,24 @@
+diff -Naur cdparanoia-III-10.2.orig/interface/utils.h cdparanoia-III-10.2/interface/utils.h
+--- cdparanoia-III-10.2.orig/interface/utils.h	2008-08-14 06:56:20.000000000 -0700
++++ cdparanoia-III-10.2/interface/utils.h	2016-05-30 14:35:57.071615252 -0700
+@@ -3,6 +3,8 @@
+ #include <errno.h>
+ #include <string.h>
+ 
++#include <sys/types.h>
++
+ /* I wonder how many alignment issues this is gonna trip in the
+    future...  it shouldn't trip any...  I guess we'll find out :) */
+ 
+diff -Naur cdparanoia-III-10.2.orig/utils.h cdparanoia-III-10.2/utils.h
+--- cdparanoia-III-10.2.orig/utils.h	2008-08-22 02:39:06.000000000 -0700
++++ cdparanoia-III-10.2/utils.h	2016-05-30 14:35:33.101409747 -0700
+@@ -4,6 +4,8 @@
+ #include <errno.h>
+ #include <string.h>
+ 
++#include <sys/types.h>
++
+ extern long buffering_write(int outf, char *buffer, long num);
+ extern int buffering_close(int fd);
+