gentoo resync : 28.04.2019

4 files changed, 25 insertions, 24 deletions

diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index cbc2c67ff449..c93e6c185bf6 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -2,11 +2,11 @@ AUX libcdio-paranoia-0.90-mkdir_p.patch 635 BLAKE2B ed82c6ad81e3fc9540f9dade8e7b
 AUX libcdio-paranoia-0.90-oos-tests.patch 1401 BLAKE2B 0b4ba222d667325b2413519e1cc16065c756c17c5739e6edf3ade9dc6e0156b5a769f0f608d75624047ae47ed2187f4c80e182e58cb51bf7433a433e6673a695 SHA512 b8f556f39daa9746a87804d2c35d0458f133a21a026c8e5fb7739826d86972b7ed85255e5c3e6e739da40d56a9b8166f9b096308c844a471d4e152b7d39a7b1a
 DIST libcdio-paranoia-10.2+0.90+1.tar.gz 634050 BLAKE2B 10a7f8b2a45e5605afa6961132f0bf949ba51222a6c23b7a933032e3e430e60104eae8f7d49fc6ec18894fe0e826e9387f67f186af0ba277a9e7341484aa8ac3 SHA512 c3d00b57f22deb19be929ba87f41bbd83fc51ca66e8ccc1da7acb4131d85449fdd38161cc3ec0f1714fc0571e219d72029b5a72f853c139aa479695df783aad6
 DIST libcdio-paranoia-10.2+0.93+1.tar.gz 686055 BLAKE2B 5b4c30687c907cc8dd0917263c20e3d55e425cb7fb2a935a79ec6c5cc82c6165a5504fe71b77e314bd4a828b0c652f948cce62fecf94341d20c920c66450d97a SHA512 2bb418c99ef037aeb90ba3db841ea9182c5bc401e74c6f4b552730e6c8561552f7d3e27be71ef4fbb07b4fcd9db418a4fe330d5278e8f41cdd99c757aa4b8bc6
-DIST libcdio-paranoia-10.2+0.94+1.tar.gz 703424 BLAKE2B 592ac7704f60e7701cff4edb7e4dc532cb35603ef47c159c84c6aa8bfa69bdc41e435ac566fd0483cee2a2fd1d03a31202382fc1ccaf179c9183f324d5605d80 SHA512 9b2381491271090bac08594cb1d84de98e9f0a5afc6a2c98e9ffcf4b95addc3adcd0f0b9adeb928dfbf8178356ad6a7ccfeb048685c823d138b2af232f0b4c93
 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.90_p1-r1.ebuild 1574 BLAKE2B dbc8b3712c4e67372d2d5329130fc7bdee625ae7306ad8a61b357ac80446ccac85841f1431ab873d0ff7ad5bf443ce6fa56fb66803261dc469e5b61a32ab6acc SHA512 7aa1a3fb8258978074a86f04ec5bb78253505152a13aea868182b46daa2f7ff4ce97adc130e53a0a7f7a2fa2ab7a9959d3fbd71824eb11f42dfc7ff797af266c
-EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1762 BLAKE2B c43f64a13e6aec5229d0d774478e4c29719b6a9055aa314a56d11b7b3b00161674b85ceef8693f713f11436ce19c730ce502a4e2c5274d2c5d015790f7c3dc6a SHA512 a243098fd587b73e37cd71794618dd56a4351fb2391a63b5f2a7c817f4636c091abce590d6fdef8bb575bb275e06142202d22c93b3ca837a9972d27a6659640e
 EBUILD libcdio-paranoia-0.93_p1.ebuild 1754 BLAKE2B 5f61c570e2dc7e958893cfaa5ef3617c597de277e81fbd2c084efeaee47f0876f2657d4a0b298c201e9e66bf0fef16a86b5f6f82b87f25445c4257bc7e5e6bf5 SHA512 1243a48a69fea0103a7782c741148f7a5901541976907eb8ce948374cf691110be9a94c685bd7a7ec80fb297250f5f1d600db2a8bd851ce2317078308a54e39a
-EBUILD libcdio-paranoia-0.94_p1-r1.ebuild 1996 BLAKE2B cdcc9c4af325236f037f8746b30accb3ac3ba9b243db868d43aa80657a09bf23b3d6fbe83fe355b77fd572dda0d638df8781b4c1354cb12ba225940d1159ed84 SHA512 2da677ab4afc41ec79202dccb1482758da48d34e496b4b82010d0b3248e52794667841cba837ee639ed8debff363c30b67861ad9a9ff67744072bf99d5765daa
-EBUILD libcdio-paranoia-0.94_p2.ebuild 1983 BLAKE2B f52c30321180172fdba8646e329f565ca58153dd6a58efe66e1a4e33c7bf18a6ffc60754cc4da39d6295577162d513a4b33e893743378cf6aa2056b6ae0452f0 SHA512 902bc4b48df3f4948708871b6272a1ee6494aabb43ef2264ebec0e841ee52a4ff70ad1ee69ba1650cc31a5eb553d8e3baec6bda922b0377bd50e9ff5cd80b4f6
+EBUILD libcdio-paranoia-0.94_p2-r1.ebuild 2009 BLAKE2B cff2adbdac88fcf8cee94c35cb1c3f9cefea244a5d51f210ab6c3b19932f7096745a810b83be6a06f5bbe8265f316d36c97e28feb67138c93e1c0ec41b6af482 SHA512 89fb173584c80a3a5aff705e7909f271419b429c3c2f825b87a3b74000b52bc2a12df4444d2fce3a77ff137ed6cc54df0b609e7a4246d1b7c9eb8194b848fdf0
+EBUILD libcdio-paranoia-0.94_p2.ebuild 1982 BLAKE2B fb1b4690d302164cbe4f2f9e6d86fb5349b94916acea665c21a2e917257f4c44cfe702a62e60f3b4931ec7b331d2b7541e11801cd599c6708eb76121b124ca95 SHA512 4760f18a0ee97186eac7be774249f3151d1a96779a0f570368fe426696a5888dddabebd25b8711ed3b8b2cdbcc33267b293052ec0d95767797f0649da46b5c8e
+EBUILD libcdio-paranoia-2.0.0.ebuild 1743 BLAKE2B 7cce094a1f6ce6164989ff2ff540524ab03f17b603e53e72828835adabe356b866e70cdafd89bfd268365b865f88735f1e69a768a26b3750d7334d2503053dca SHA512 e7ebba79695fe2f2c6224168f4c10d34f0a08c20567cc68266bf80483683f3d47dcbb5cf2a63ff598e3350c3b9c322c141b8eb51c60589a905426048cb0fd7af
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r1.ebuild
index 0fe60647a429..85b83bfa513c 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p1-r1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_P=${PN}-10.2+${PV/_p/+}
 
-inherit eutils autotools multilib-minimal flag-o-matic
+inherit autotools multilib-minimal flag-o-matic
 
 DESCRIPTION="an advanced CDDA reader with error correction"
 HOMEPAGE="https://www.gnu.org/software/libcdio/"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # 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"
+SLOT="0/2" # soname version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
@@ -33,7 +33,9 @@ S="${WORKDIR}/${MY_P}"
 
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
 
-PATCHES=("${FILESDIR}"/${PN}-0.90-oos-tests.patch)
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
+)
 
 src_prepare() {
 	default
@@ -59,7 +61,7 @@ multilib_src_configure() {
 	# Darwin linker doesn't get this
 	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
 	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
+		econf "${myeconfargs[@]}"
 }
 
 pkg_postinst() {
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
index 3f1da82d0927..8ff3a41accbc 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0.ebuild
index 4e154159b78b..b65c5ca8d3de 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_P=${PN}-10.2+${PV/_p/+}
 
@@ -9,35 +9,34 @@ 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.gz"
+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"
+SLOT="0/2" # soname version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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.93:0=[${MULTILIB_USEDEP}]
+	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 "
 
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
 S="${WORKDIR}/${MY_P}"
 
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-PATCHES=("${FILESDIR}"/${PN}-0.90-oos-tests.patch)
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
 
 src_prepare() {
 	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
+	#sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
 	eautoreconf
 
 	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
@@ -45,16 +44,16 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
-		--disable-maintainer-mode
+		#--disable-maintainer-mode
 		--disable-example-progs
 		$(use_enable cxx)
 		--disable-cpp-progs
 		--with-cd-paranoia-name=libcdio-paranoia
 	)
 	# Darwin linker doesn't get this
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --without-versioned-libs )
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
+	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 pkg_postinst() {