gentoo resync : 10.04.2018

3 files changed, 114 insertions, 0 deletions

diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 57b9ea4dddcf..79a059a7f490 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,5 +1,6 @@
 AUX libcdio-1.0.0-cddb.patch 1245 BLAKE2B e1b677c2cca08d30edd07caf9a0f55c0997497801ad47db3c88f8759bc8fb74b538bf6e611fdd7273ba5ecd257dacb4f0d26a83529780c65c234ef874becb85e SHA512 17ba1c822d0c6377b0714ac7652b4234bef7a0e8935f4345fcbfee788ed7eb668c14b7f59556d82ed10be61e82c007886a3b47cbc6a86f057deab3028f599638
 AUX libcdio-1.0.0-version.patch 613 BLAKE2B e0332426f7ca2d4cfe1335e70bada237f536ef2e198681540eb01d01bc23ba2566521b15713cacea20299235658d984acbaf872d75367442621241146da20972 SHA512 6dc238f442fad3f0b35350fd11aa75bcdbc364cbc3616b4d61e9d53ff9b36b0293ce7e9e2118e07045399cd4a06fa5474870794326f11df98f3e218b74cef822
+AUX libcdio-2.0.0-iso-ioleak.patch 1093 BLAKE2B bd30e99cd35d2cb09dbbc7dd91133f1649a8761e7f23b1544a65477a77466f6b72bb99eb3ac21980b1cca54590fd5852dc1b9f7fde28a50bc5e101320576bdf5 SHA512 851fb3610ab801a5c62075426b9b51d42c60d35aaf4d247a825f8323d41bce692f48632604b7e6bc03ef83974f077ced371812ce50397dc054d16e353074f625
 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
@@ -9,5 +10,6 @@ EBUILD libcdio-0.93.ebuild 1858 BLAKE2B 522e84217ec320417221586649a82881d7a3d6f9
 EBUILD libcdio-0.94-r1.ebuild 1876 BLAKE2B a673433cb8f17b5d1a0a3f7c3aef86d8826aa6821b377f235f49598a6ace1e1224aada8883c1bbba344bb1e4453a575e5f64ca403357f9ede2462e8f76a62c68 SHA512 aa070eaaa077d75007f63d187fc6e433f6129fd29d91e4dfaa9cc7c73cb5d731f249cbac418e1829e2ad7ba00bf8d01fce1213d7b84e857e42508ef45a9dd887
 EBUILD libcdio-1.0.0-r1.ebuild 1854 BLAKE2B 73212575a6b33ea13958f38cec55f360dc6a4d4f8e289dfe7ce8d1e250c0a70cce9a9671c43828f6bd8064c01b7c483864a75d4b96c9e0c2c649635f772d4cfc SHA512 d36d0f899bdde4f5e962ce8ddcd56aab60ea8b67dad068910e2947f93eedc04c8ca0376a7850db6fa7c909b1391c02787e92504169959140c1298ae5f1c2eea6
 EBUILD libcdio-1.1.0.ebuild 1776 BLAKE2B f3474ac6bb1f240f2460ded72f713a7c3a30068a9019103f375051d46c83fa2d6700914f410e62cfa80d4730ef790cc22e0ef58934df112ce33ed2ee8b31176a SHA512 41d22cbadf18cea8719118fa1b96b59ce7084a69bb7a66d137b0cd1ef739f9c43a4ff34b45b0157614aad675fad92004da6107f9f7314932f78c262a9f8f1360
+EBUILD libcdio-2.0.0-r1.ebuild 1850 BLAKE2B 8bb98ff3b62086dfebf8144b3fd142916dffae14cfef11dce3d0a7c7080073342455f4fa9b1d6f175275fb2dfbd3a151490073f03e7d3e0be331382d5acb3f28 SHA512 bd55f79e107c712b76f8713e9b4bd30654160a001b0f139b1e50e1686ff6c77f1f4e2a84b0f6e2d09715e6ff9d9728af91bf59cb85dddd793b911a5fbf07a20e
 EBUILD libcdio-2.0.0.ebuild 1776 BLAKE2B f4deb1500127ab04377bc36e3be4c1377e3952cbe2f72d108e412ee275729eba3b8fee209aae64050c6e2c41df591ff0d50aed615b6a2c062862f19699baa6ce SHA512 1f2ef514ecdfe39541a9d691d05f4788070400bc7fe6e173a4f434e60677f50430fdebdb4a946afb143395d7281b6feaac0ac9edd3f318d19217bebff10c51bf
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
diff --git a/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch b/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch
new file mode 100644
index 000000000000..17732104c3d1
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch
@@ -0,0 +1,37 @@
+From 8c0de2d3f0324ecf3fd135589589dcd783c15556 Mon Sep 17 00:00:00 2001
+From: rocky <rocky@gnu.org>
+Date: Fri, 16 Feb 2018 09:14:17 -0500
+Subject: Fix small I/O leak when we can't read ISO file
+
+See Savannah bug #53170. Thanks to David Binderman.
+---
+ src/iso-read.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/iso-read.c b/src/iso-read.c
+index 0541e27..8647485 100644
+--- a/src/iso-read.c
++++ b/src/iso-read.c
+@@ -1,5 +1,6 @@
+ /*
+-  Copyright (C) 2004-2006, 2008, 2012-2013, 2017 Rocky Bernstein <rocky@gnu.org>
++  Copyright (C) 2004-2006, 2008, 2012-2013, 2017-2018 Rocky Bernstein
++  <rocky@gnu.org>
+ 
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+@@ -364,7 +365,10 @@ main(int argc, char *argv[])
+       ret = read_iso_file (opts.iso9660_image, opts.file_name,
+                            outfd, &bytes_written);
+   }
+-  if (ret != 0) return ret;
++  if (ret != 0) {
++    fclose (outfd);
++    return ret;
++  }
+ 
+   fflush (outfd);
+ 
+-- 
+cgit v1.0-41-gc330
+
diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..62bcbab5b554
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+LICENSE="GPL-3"
+SLOT="0/18" # 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"
+
+RDEPEND="
+	!minimal? (
+		>=sys-libs/ncurses-5.7-r7:0=
+		cddb? ( >=media-libs/libcddb-1.3.2 )
+	)
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-lang/perl )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README{,.libcdio} THANKS TODO )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/cdio/cdio_config.h
+	/usr/include/cdio/version.h
+)
+
+PATCHES=( "${FILESDIR}/${P}-iso-ioleak.patch" )
+
+src_prepare() {
+	default
+
+	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
+}
+
+multilib_src_configure() {
+	local util_switch
+	if ! multilib_is_native_abi || use minimal ; then
+		util_switch="--without"
+	else
+		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 \
+		${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}