gentoo resync : 01.01.2018

5 files changed, 82 insertions, 7 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 78c358e3ac80..7e97a4cf902c 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index c386dec0745b..a97dabe66095 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -4,8 +4,10 @@ DIST libcdio-0.93.tar.gz 2723371 BLAKE2B 3dc361f48c0ccc22c76ad691f856512a87906dd
 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
 EBUILD libcdio-0.93.ebuild 1870 BLAKE2B 30953f0973dc5656e26312606ad557ced8aa9a7a0672bee7e9fead2c002360c5ac233dbabc64c2232043c201ea41d9626ac86feaf8af743ed7267d4fa75a8edc SHA512 eaa3d8d99c5fe412afecb7890ce68c9b0ebdcc063fa457afc4074e4ecb2a12af3293913d4d13691e9e218f51f251f51d5537cc4c2fe6fe48d4b7e2c6e3367945
 EBUILD libcdio-0.94-r1.ebuild 1888 BLAKE2B 20ef4b8bdc055c406864b2bd91022a5938f469b20be26c48e888d8d1b58886296989fcb784a07898c1f663d3cbc7fb89bb097c2885983a59f8327a28fe03d529 SHA512 2bcb9d699852d5781ada3d4b5b0d3b80af32571f27041a8ba316da408c0b1188d2b5fca64c238e850ff40a91cba97dc65a157e6633cb1beb76f7edef3122056a
 EBUILD libcdio-1.0.0-r1.ebuild 1866 BLAKE2B 602b38ccbbd247f100bbc28eb0bece2132d280b9c6723f9f296e2e9906d441435c0c2f82ab0603fd8b80d47ce8f8bc28539377fa88c2a4aa950678aa65ccae41 SHA512 25b0989c158e152eddb589941dd16b9aee4b3e2783f2ddefd0939d9245a904829ec348c5337c84ddeafb7dfd4eef9b7298976fec3bc665fb8abbd87774dd6514
 EBUILD libcdio-1.1.0.ebuild 1788 BLAKE2B f3d6344d71d636aa3adb6e602fe43b8780125ea034c2509eb9482b71c76957f9671c977aba92f54130f770a3b9c2d8d452bc2fa473378348436fcfb10f01dc00 SHA512 532216f99f928150d76cda3be770a2565c2bb08533dfa809c7979052701098e70ea36db1d4db494ed567a433e5466b692b00f9d95436a93e24abd68e3aadfb94
+EBUILD libcdio-2.0.0.ebuild 1788 BLAKE2B 0f786de8168c8e703fec35636f4cbfd62a06c5e6fc78676d2070c650519fc744e46a53ea18208c40ffb9a449a894e9a962f4759b6a242c9bae9a389a78767e22 SHA512 aff73b81eb022c1971c58412eb5724e28440be857d42f11109e45bef25518697a770c0cd80ca704d5ff82496f8842a4d429c6797062e149607b8cbc21c6223ba
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
diff --git a/dev-libs/libcdio/libcdio-2.0.0.ebuild b/dev-libs/libcdio/libcdio-2.0.0.ebuild
new file mode 100644
index 000000000000..8e37d8d2b7a8
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-2.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool ltprune 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 ~sparc-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* THANKS TODO"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/cdio/cdio_config.h
+	/usr/include/cdio/version.h
+)
+
+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
+	prune_libtool_files
+}
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 4a61e240f1cd..c2105666632c 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,4 +1,4 @@
-AUX mpc-1.0.3-mpfr-4.0.0.patch 4125 BLAKE2B e0fba3c28da8e0f1ac4766836cb1e8b09a3413510aa82d01694a7e907871b122fa338c352abf4dd7a9c0b67b7973a91775a9455c3a4dc9fe718430456b3d4214 SHA512 69a29a1c70fe2515852a5802ad6a425dc58796d839f9caa596e33f0745af4ef8df4ab61993cb0204b00fa4395561422274cd2e8ce5728d94ef8219711e2e7c8f
+AUX mpc-1.0.3-mpfr-4.0.0.patch 3748 BLAKE2B 906ee3ff90ab1d9aad58caae7b1185d99d6e09f30f9fe80e9673c0ef499b4fff349b61c6de77502e2e3eecc68ecab6d00453cf1525cb8b404a6f7be9b90ec3b5 SHA512 7ecdc20adce8d71c268e7b090a484441f2b807c19caef637de0bd97cdc12534d7b24f6d7cae80e3c1ecbf7c6445f81cb63b219869797e69de3dbae0e268d9caa
 AUX mpc-1.0.3-no-ulp.patch 904 BLAKE2B 33f96aa9ce60823ac9b84a604ac84c87fd0d4d8eec9b08880f70920aad24775a00cfadf0e76f08274d829f3a7ef03f22d8f440f0207ccaa7f98f1c4911d0beb1 SHA512 22bf9f04ba745d66469a23366d405b7b32bd7454e2240d01995b0dd04e156f23fa1bd842b520799af899ff96650bd050f4675d7a9cba6ebd68ba8fb5d658a0a6
 DIST mpc-1.0.1.tar.gz 624125 BLAKE2B ba5c63f5e0cdcff2cfd5b93d152f70422232bca472b5153209b525794e338f11bdd0e371a055535aa31bb3b8991a5f6ef645b1bf2393027803bf84c0d4346991 SHA512 fa381e75999bba626ba08d73225285b03c6d2f6cca87881b28829925d1624eaed1c9b544f75e7281cf5d8dcdd7831025a4eafc05f88f13375f9e08239a8a9303
 DIST mpc-1.0.2.tar.gz 633173 BLAKE2B 9d58d8a41bf4a2d7a82842dc1e76f7fc1376dac950919ae72d1cb04fe70132747a22dcbec91391e1f5aa857c96de553aa21548f20f139742ae4b2463df473d63 SHA512 0e94ba9a20c7374839d2a53a9ed8cce647cc74142b464634fdb9cbaf96e91e43ea13f0b4dab5c06c247e6719de0c0ae03fdcba0c7c4518ee504c545c96da70d0
diff --git a/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch b/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch
index 72d6f2217caf..3a62d9bd20a3 100644
--- a/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch
+++ b/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch
@@ -41,9 +41,9 @@ diff --git a/src/mul.c b/src/mul.c
 index 3c9c0a7..8c4afe4 100644
 --- a/src/mul.c
 +++ b/src/mul.c
-@@ -175,8 +175,9 @@ mul_imag (mpc_ptr z, mpc_srcptr x, mpc_srcptr y, mpc_rnd_t rnd)
- #define MPFR_EXP(x)       ((x)->_mpfr_exp)
- #define MPFR_LIMB_SIZE(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS + 1)
+@@ -171,8 +171,9 @@
+ }
+ 
  
 +#if HAVE_MPFR_FMMA == 0
  static int
@@ -52,15 +52,15 @@ index 3c9c0a7..8c4afe4 100644
             mpfr_srcptr d, int sign, mpfr_rnd_t rnd)
  {
     /* Computes z = ab+cd if sign >= 0, or z = ab-cd if sign < 0.
-@@ -359,6 +360,7 @@ mpfr_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c,
+@@ -319,6 +320,7 @@
+ 
     return inex;
  }
 +#endif
  
  
  int
- mpc_mul_naive (mpc_ptr z, mpc_srcptr x, mpc_srcptr y, mpc_rnd_t rnd)
-@@ -375,10 +377,17 @@ mpc_mul_naive (mpc_ptr z, mpc_srcptr x, mpc_srcptr y, mpc_rnd_t rnd)
+@@ -337,10 +339,17 @@
     else
        rop [0] = z [0];