gentoo resync : 28.04.2019

5 files changed, 52 insertions, 78 deletions

diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 2c149f94fafe..5f40d562b512 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,15 +1,14 @@
-AUX libcdio-1.0.0-cddb.patch 1245 BLAKE2B e1b677c2cca08d30edd07caf9a0f55c0997497801ad47db3c88f8759bc8fb74b538bf6e611fdd7273ba5ecd257dacb4f0d26a83529780c65c234ef874becb85e SHA512 17ba1c822d0c6377b0714ac7652b4234bef7a0e8935f4345fcbfee788ed7eb668c14b7f59556d82ed10be61e82c007886a3b47cbc6a86f057deab3028f599638
-AUX libcdio-1.0.0-version.patch 589 BLAKE2B de6870005d782de2cdfd36b0777bace3fa8459745bb907b73a05c4b54bc2419cc8793eb0a9499dab3d60f9599211a518078e78b30935a79e7a36623732ba3a44 SHA512 aa1a647f669f6559af9002ef2173500b8684f51c7b752606bd27fde0bf2931a0922f215d6bb766f3801c593fd83869c9a0618a107d8f1a9d44511301b30da337
 AUX libcdio-2.0.0-iso-ioleak.patch 1093 BLAKE2B bd30e99cd35d2cb09dbbc7dd91133f1649a8761e7f23b1544a65477a77466f6b72bb99eb3ac21980b1cca54590fd5852dc1b9f7fde28a50bc5e101320576bdf5 SHA512 851fb3610ab801a5c62075426b9b51d42c60d35aaf4d247a825f8323d41bce692f48632604b7e6bc03ef83974f077ced371812ce50397dc054d16e353074f625
+AUX libcdio-2.1.0-ncurses_pkgconfig.patch 923 BLAKE2B 848a76241ca173c452cf7b04142c249ca6c33b7d0514f03353bb7b1f43635d1bec36cf9f3e3ce61ab51d6cb42ab123f620fe6fe1706b71148ec2ab9592c0bc02 SHA512 98c16eebd1cd6bf57e85dd3abafba22a4a1f2f88e0d5f1c9ee98d7409c360c6e3dda43233823de97429a54be66969cec1eb8df4bbb7d0341a54c6a1ae475dd7b
 DIST libcdio-0.93.tar.gz 2723371 BLAKE2B 3dc361f48c0ccc22c76ad691f856512a87906ddccdbf05a22d4c8f7f28221d201480e015532be382d576550ecabae40df9e325043fa6cff89b39d77e30b6509b SHA512 a2ea7a1f219e1abdbbb42633003e10ff77b6a879133c96a0c8e7a80fe205c08a48bade1d9941c6493f24d6eb2ed410469b57e19d9740a4400266a6f3f9d3da91
 DIST libcdio-0.94.tar.gz 2355452 BLAKE2B c6a720fb714e6aa0d4425ccf92e4c08172d26d77a94e8a6897ffee197a740de78da8d480ec9af2dcfd59c3f96fb2a823a4e39259389dd82ece4108c6a05a4646 SHA512 e1d3c96c4acc7be923c97109c3f76223adc00b293278daef7d5008b1e5d67f33402f9f224f05120e9e1e8b3a8d1fa1b0bd5069dc6dd309741e3590e2c19e0e66
-DIST libcdio-1.0.0.tar.gz 2343992 BLAKE2B d187a0aba99efa1172cab302fcd020dc2a581633368230a6ba00db6250c8e7d5e66111fba1804ecb0ba5416c876f88f1d07549118bb003d4631c14d0f3e85ba6 SHA512 2beb5c9cf455c5b56f0a8ba641b8fe322c487256b017108fadbdf288e92787fa0b956d2291aa877df5a9b4494f8425de58c0f71d587ef5f9346987733f66e5dc
 DIST libcdio-1.1.0.tar.gz 2348106 BLAKE2B c63959d6cd92288b2d098f19b28a61fc5a7005390186045c6f72392becf9eb5808da7a8b952de166c5b263b9c10e594031a3fb908331eda040c210b984b3e11e SHA512 fe5a0d726974c8678b59de74ce043a5ed464f6ab595bf938e90bc5a348e9e882755e75aa3eecce50ce910b28e2498b5a892402fc0ea8728d382d1af36db71985
 DIST libcdio-2.0.0.tar.gz 2354813 BLAKE2B d3ebf9a20004cc8c75d1e6f97a2cea68f490517e34a4cf84f343d717e49cbb9cd612a3c6911894501f16373e3222e7fc6d175fd6d93d1c967cd21502716b22f8 SHA512 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f
+DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
 EBUILD libcdio-0.93.ebuild 1757 BLAKE2B 1149aead21159668e3f89c703b67e0e21520d75e01c61db4e7ee2c161dd50821de024cd75337583c2d8038baed1eeea267f18a9379b437be9ebf8c6d3f0198a1 SHA512 1f952e8cb5a7490d67a7ac20e4c2eb0e35fb981fd523223548f33d77a5d2185766973933e864342c87baa2c1f29755229f5b643955c0527f3c958425e6244704
 EBUILD libcdio-0.94-r1.ebuild 1766 BLAKE2B a04ab2d78db793aff7738da80db945b159e367c47ddd88b3d1bcd3d8ef108d79074952d58f90a737589a246b55d03c8c57b1d77a2f9b25cbacdbdb7c9e460411 SHA512 0baafcfb707d39df24a23da80356415aa450637c0a70751c08ce7ce1eae2180bbd39e6cfe58c28359cee86c0ed54fa132f0a84efaafbe8130696b5aff5494bf3
-EBUILD libcdio-1.0.0-r1.ebuild 1867 BLAKE2B 6c5c7e85d381822cb8ab25d4e0c69b59160588d98e68e038e09816b686c7d57766d9bc9ed4697400f1fd8c06ddfcd3a2515e8896d4d5f09d251b354a34b87dea SHA512 af06569b609761255605ddc89fae69fe1e9a4e831023f8e5219de2ee19c6247d53e468e79d530f7935661fccf51cea1fac2f70d7b814abfaa396327248a15f0b
 EBUILD libcdio-1.1.0.ebuild 1790 BLAKE2B 1a0ddc06dff2c7a3f42f07f6877b0a76fd4ee4e6c32297c7d606afee07a3e78bdd77886c4ff07a783fadbcbc805427cff41d47211195b353212b6f3f0341dff9 SHA512 20f6efba15c4b0b9b86b54bd720e69cc25a9e87e54963f6c431b25634fd1624ea5277797fa5a2080341b55fea6de4cd0fc15c3e412e1ac70e1f6b8adf7af8456
 EBUILD libcdio-2.0.0-r1.ebuild 1838 BLAKE2B 7c0f3100156395d729a2e0f045c1c5d2d49509257c94c640b9ab2db3f887445548229d83552bf814f1a94eed4828dca959670e0a2e5125dcce859277dd5eecc0 SHA512 c4a412398d1c8c604e8b1a74a2baf6caf3146f9279d7d361338a4b342793afcd4a999a6b1840663db76f6591f4928178a2f51821f31435c6b8ecb288d762bbca
 EBUILD libcdio-2.0.0.ebuild 1789 BLAKE2B bd3747ef0f97375640f5a81ab756492564687a97292d74c75946b4f08ef22ab1e1f590f9db7d89ef4a98f4c4ca49afa1a306a1919da593b33f3e97ad0bd17037 SHA512 20bee0c8ef079f8597b7aa9a1b8dab14e5ca03423e5990fe89abbd7a9e0dd09d6d377e72158031df890ce9361e8067337e82db74d6459be1d7d9b1be86cdc611
+EBUILD libcdio-2.1.0-r1.ebuild 1814 BLAKE2B b70de7253568d6ee62bf0976c3719b5f6a3432240051ae81ed304203907d01433afb0ce767a413b4ea12ce63564d4ae704feaa0de464ab6ca00fd2e014ca90cf SHA512 98fa94ae717eb1792d919011bbbfae049b92a82bf965c88dc95280d919423fae4e405c4e67ecb073f9d5d68c8e87677cffa6a67bfe962b9685d94aea3dd64261
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch b/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch
deleted file mode 100644
index b3781d2a7e51..000000000000
--- a/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4305bc1e093e4341aeddb857bd1e6203228000cb Mon Sep 17 00:00:00 2001
-From: "R. Bernstein" <rocky@gnu.org>
-Date: Sat, 25 Nov 2017 14:03:37 -0500
-Subject: Fix breakage caused by unshadowing i_first_track
-
-Reported and patch by KO Myung-Hun
----
- src/cdda-player.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/cdda-player.c b/src/cdda-player.c
-index efeee19..333e1f5 100644
---- a/src/cdda-player.c
-+++ b/src/cdda-player.c
-@@ -531,8 +531,8 @@ static void
- get_cddb_disc_info(CdIo_t *p_cdio)
- {
- #ifdef HAVE_CDDB
--  b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track,
--                   i_tracks, &i_cddb_matches);
-+  b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track_global,
-+                   i_tracks_global, &i_cddb_matches);
-   if (b_db) {
-     int i_year;
-     i_year = atoi(year);
-@@ -831,7 +831,7 @@ get_cddb_track_info(track_t i_track)
- {
- #ifdef HAVE_CDDB
-   cddb_track_t *t = cddb_disc_get_track(p_cddb_disc,
--                                        i_track - i_first_track);
-+                                        i_track - i_first_track_global);
-   if (t) {
-     cddb_track_set_title(t, title);
-     cddb_track_set_artist(t, artist);
--- 
-cgit v1.0-41-gc330
-
diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
deleted file mode 100644
index bdde131ffc8e..000000000000
--- a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,12 @@
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
-          [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
- 
--LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
-+# Broken by design. See also
-+# https://savannah.gnu.org/bugs/?52491
-+# and
-+# http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=2d22ae18571caf29460a456340ff0603f04af6b4
-+#LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
-+LIBCDIO_VERSION_NUM=10000
- AC_SUBST(LIBCDIO_VERSION_NUM)
- 
- AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
diff --git a/dev-libs/libcdio/files/libcdio-2.1.0-ncurses_pkgconfig.patch b/dev-libs/libcdio/files/libcdio-2.1.0-ncurses_pkgconfig.patch
new file mode 100644
index 000000000000..b5ed62cc0722
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-2.1.0-ncurses_pkgconfig.patch
@@ -0,0 +1,30 @@
+From 04f7da2f190ddc636a5c268f2428f36517f92e25 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 19 Apr 2019 02:24:04 +0200
+Subject: [PATCH] configure.ac: Search for pkg-config with its
+ PKG_PROG_PKG_CONFIG macro
+
+Otherwise the pkg-config command might not be found and thus some of the
+required packages (like ncurses) as well.
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 5f9f9e78..711cb5df 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,6 +27,8 @@ AC_CANONICAL_HOST
+ AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ 
++PKG_PROG_PKG_CONFIG
++
+ # Enable silent build rules by default (Automake v1.11 or later).
+ # Disable by either passing --disable-silent-rules to configure or passing V=1 to make
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
+-- 
+2.21.0
+
diff --git a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
index 039608e47da5..a61b22b9d612 100644
--- a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
@@ -1,16 +1,16 @@
-# 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
 
 inherit autotools libtool multilib-minimal
 
 DESCRIPTION="A library to encapsulate CD-ROM reading and control"
 HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
-SLOT="0/17" # subslot is based on SONAME
+SLOT="0/19" # subslot is based on SONAME
 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="cddb +cxx minimal static-libs test"
 
@@ -21,14 +21,15 @@ RDEPEND="
 	)
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-apps/sed
 	sys-devel/gettext
 	virtual/pkgconfig
 	test? ( dev-lang/perl )
 "
 
-DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
+DOCS=( AUTHORS ChangeLog NEWS.md README{,.libcdio} THANKS TODO )
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/cdio/cdio_config.h
@@ -36,8 +37,7 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 PATCHES=(
-	"${FILESDIR}/${P}-version.patch"
-	"${FILESDIR}/${P}-cddb.patch"
+	"${FILESDIR}/${PN}-2.1.0-ncurses_pkgconfig.patch"
 )
 
 src_prepare() {
@@ -45,10 +45,6 @@ src_prepare() {
 
 	eautoreconf
 
-	sed \
-		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-		-i configure || die
-
 	elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510
 }
 
@@ -60,16 +56,18 @@ multilib_src_configure() {
 		util_switch="--with"
 	fi
 
-	# Tests fail if ECONF_SOURCE is not relative
-	ECONF_SOURCE="../${P}" econf \
-		--disable-maintainer-mode \
-		$(use_enable cxx) \
-		--disable-cpp-progs \
-		--disable-example-progs \
-		$(use_enable static-libs static) \
-		$(use_enable cddb) \
-		--disable-vcd-info \
+	local myeconfargs=(
+		--disable-maintainer-mode
+		$(use_enable cxx)
+		--disable-cpp-progs
+		--disable-example-progs
+		$(use_enable static-libs static)
+		$(use_enable cddb)
+		--disable-vcd-info
 		${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
+	)
+	# Tests fail if ECONF_SOURCE is not relative
+	ECONF_SOURCE="../${P}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {