gentoo resync : 15.12.2019

5 files changed, 84 insertions, 3 deletions

diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index b5d0ae80dfd6..42b2e209ee2a 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -2,7 +2,9 @@ AUX libcdio-paranoia-0.90-oos-tests.patch 1401 BLAKE2B 0b4ba222d667325b2413519e1
 DIST libcdio-paranoia-10.2+0.93+1.tar.gz 686055 BLAKE2B 5b4c30687c907cc8dd0917263c20e3d55e425cb7fb2a935a79ec6c5cc82c6165a5504fe71b77e314bd4a828b0c652f948cce62fecf94341d20c920c66450d97a SHA512 2bb418c99ef037aeb90ba3db841ea9182c5bc401e74c6f4b552730e6c8561552f7d3e27be71ef4fbb07b4fcd9db418a4fe330d5278e8f41cdd99c757aa4b8bc6
 DIST libcdio-paranoia-10.2+0.94+2.tar.gz 704560 BLAKE2B babb912a7252b25b1d32f7d3cc80d73235383170b16118c4f6fcddd58ded534b2e5a8bb61aa8ca784270fc4631ea3e53cdc88d03b0a7686f74ab1cef7ca35980 SHA512 0e4ed5cc52d0758e945ac7f956c1ca870068f6444df912e2ba5f597947962c471d1c526b5cdab4e092fecb924ecb317667df454497b2e515a4e985693cd86f47
 DIST libcdio-paranoia-10.2+2.0.0.tar.bz2 588472 BLAKE2B 5593c967cc91e7db922c30a0e4fd6a71c81625527b3e3cd19494328c545237c64c6332969e6964ae27cce70b0a7ed9678c2dcf0cf675ea6ea81602071b5a9e1b SHA512 0398617f9af63632d74c5a93c4efae1bc69d339fb7ab2e36dbfa6d19c0940f3bf27ea3ed482698d2842838d2034df3e40304774f1648db8c274d441130ef40a2
-EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1859 BLAKE2B 69b0aa0dc11c3dbb49de2b7a706fe457f0131aa40a8b45955eb7bc1ada381dde2bd0aa30e09a0c3f02732e343518108fa93c39592237d09541b019a361445bbe SHA512 767a3106e1569c6bc015c1164f0de88d62366c8f59e6bebe786304a7b64f3e211b0ded49e2af363512c8ef69d68e1157c656cc8c504ce8337530c7cc555eaaf6
-EBUILD libcdio-paranoia-0.94_p2-r2.ebuild 2090 BLAKE2B cce8da2a95f0cbd4a290f88ff604310644502ff6886734faa14c1baf947924ec93247d489f55fd8505d24b9eb8b7f74ecef9d4b7c399c530666dc094002df6f9 SHA512 0d56e9e20a495ce72b2cd9dae528cfd5e4b5e31f410861aafefe8416c6c34d06110603c3847c772bc0fae50e6cfbce72850ed4724b6bfc9d37e01a90dcb859fd
-EBUILD libcdio-paranoia-2.0.0-r1.ebuild 1850 BLAKE2B 1b71fe902a9a3c83242a18a1d153e4f31f04529d236bebc651953c63f5186dfe6fc2087d1510428aba37d25e1e3e09b2da55a72836ec6d3d47c010e075ded3ae SHA512 4966449cb55b045c7bdc2349b1bd5ddae5841bebae1b0c85df88b475d10082f875879b240f2f4d6790a7479950bef9cea63f81dc569bbc2d27a66a90a91e5fa9
+DIST libcdio-paranoia-10.2+2.0.1.tar.bz2 589075 BLAKE2B 9d2a2d288ccd13ca4ce38a894740085ef099f3e63e68e568d58e9a0609ace21002375431dde862f86352b6aec0c5374f65e64aeb4e39c3d59b406ae14bdee7a9 SHA512 c4a768d11e9f62038ca8081316596c89c7fee6a314229fb42e3999757fae172a5dc167175f60d555c2442266d34fce6ce627f4124e9f3a93d0456adb09ca91f0
+EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1887 BLAKE2B 486d8344291c932d8ab5ad1df3670e132a0aae21b222f16e2442c7b2f6d371a6f3f4d3bba2c7d17f8f8b20d94054ac7a7eec80dfb440c59e1d1effc58577f1aa SHA512 493c9f9034cf251a52d5deed1d7df08fcd85d55735dc369f60c3e7feccb0e5fa4ef629f7e977a97c2c2b943b4a364ba4610c2139f323389b723b79b9e7babf19
+EBUILD libcdio-paranoia-0.94_p2-r2.ebuild 2118 BLAKE2B 992c2a1a7c2a63a0c09cec05de2a407853df4c3f5764d41fb447e7c299f4c4a1a6ec8944195cebd10edf31538122068e864e5c9786b7531b9637e89358fadd70 SHA512 19073d3edca42a41edcdabadf7076756b5ab3d64f351a1aacaede11fc84f129e701c6389afaa4476559f5ad33259fca13a770289ff39965d7c4777ebb9a75bd9
+EBUILD libcdio-paranoia-2.0.0-r1.ebuild 1878 BLAKE2B 1d5f8f1475d6ceee850b85048fc6849e6fae4df9ca8d81b73919971fe3e6cef93c3ce300f9488a590b89642c9a9aa88746d5d0f5cda46d666ff7fb4e8bb9ca81 SHA512 19db40a115b9b5826b2ef0f5b01c4c94b06bf2d561ce3750b8384e2d54a9afa131bef37520f0dce7d0437d68bc5e2c348967ec16fc1e706b2737a766f709358c
+EBUILD libcdio-paranoia-2.0.1.ebuild 1883 BLAKE2B d488c569f2b62d9dfb906ebbd4c0f64816f58c14656d51f07886eef623d5e5999b46200dc80c08884ac96306e70aa76397c9004b592ea92c5de59bf316faf74f SHA512 639a972e99cdaf48cdfc21c672abc424b472402af4d0883ea2a2d489fddfca7ce033e4da5d6c9d7e60573763280f38d7857103bbfb68e240cd36e034130b7621
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
index 3f740f79869e..28a0a70e8c06 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
index 26538d0a0fc3..b9ff91670f15 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
index 222ea87fb769..9b8b8529a07d 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
@@ -30,6 +30,8 @@ BDEPEND="
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
new file mode 100644
index 000000000000..8fad81617381
--- /dev/null
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-10.2+${PV/_p/+}
+
+inherit autotools multilib-minimal flag-o-matic
+
+DESCRIPTION="an advanced CDDA reader with error correction"
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
+
+# COPYING-GPL from cdparanoia says "2 or later"
+# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
+# clause "or later" so we use LGPL-2.1 without +
+LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
+SLOT="0/2" # soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+cxx static-libs test"
+
+RDEPEND="app-eselect/eselect-cdparanoia
+	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS.md README.md THANKS )
+
+src_prepare() {
+	default
+	#sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
+	eautoreconf
+
+	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		#--disable-maintainer-mode
+		--disable-example-progs
+		$(use_enable cxx)
+		--disable-cpp-progs
+		--with-cd-paranoia-name=libcdio-paranoia
+		$(use_enable static-libs static)
+	)
+	# Darwin linker doesn't get this
+	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect cdparanoia update ifunset
+}
+
+pkg_postrm() {
+	eselect cdparanoia update ifunset
+}