gentoo resync : 16.11.2017

3 files changed, 2 insertions, 94 deletions

diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 55d18ec51fe3..faf3463b5af5 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,11 +1,9 @@
 DIST alsa-lib-1.1.2.tar.bz2 947423 SHA256 d38dacd9892b06b8bff04923c380b38fb2e379ee5538935ff37e45b395d861d6 SHA512 a6c6675b1fd86955ef5072b9e6090795fc6b0b16f32481bece049e5f100e689be48b6416ff7cf36abfc67e0b94f420e08c15ff13a9701987d6bb69a8fa567e8a WHIRLPOOL 7aa68f305cb5ad58e9bdaeb3eee5fa7a37e9f606640789a9c778ff1bfd9b458d80e6ccfa9f73f9ad5b3a229ea988fa9b6d64b929c87f64ea9376a778f30eed0d
-DIST alsa-lib-1.1.3.tar.bz2 962001 SHA256 71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c SHA512 f5dbe2375a8c66af14378314a5238284d4ed63dfc86a750c0c6e8f6cdb6b1ea2d8ef26f870b5d152dc0b77d9b40821cab523f6734902b91583beb08e28c66850 WHIRLPOOL f33871789a7cc06a9db83fd659abdfeb7940d61a24ad7c71866f843d8c0c29eaf0e0770a2034dee2526c96835935b88c2fe882184c86528c98e7d4901f94b27d
 DIST alsa-lib-1.1.4.1.tar.bz2 974584 SHA256 91bb870c14d1c7c269213285eeed874fa3d28112077db061a3af8010d0885b76 SHA512 7b548c4ee29c4a1230a0edcd5d19219831290f96a214180a6530628acc05278d1348376195287d188f4f44d6be1914391c63994f1b50985c3eee74352da26b0b WHIRLPOOL 2fc84b8a3c6023dac7953f1d2960a8eb5279f58cf2e59b8f5d04293df7595b9f0ebca5738bf4a333f8b20586c7fd579b9e7bdeeffd64518649be3a8c5d588fd8
-DIST alsa-lib-1.1.4.tar.bz2 973825 SHA256 82f50a09487079755d93e4c9384912196995bade6280bce9bfdcabf094bfb515 SHA512 8dfc5cc8872138b9e7e234934e317d797e100ac99dac86a2a2e4bdcc0d49e8a05b4089b98341051b407750bed93c2713fae5218318e5ce6cc7db2801165a1c10 WHIRLPOOL 74eb6742d93b6f2988ea9f583623edd985897db278e5dcac6916b3e9b772f16db326feb37b81a191405cc43ec2a55d313e74293ccbb43281b15f3056bd8f623f
+DIST alsa-lib-1.1.5.tar.bz2 979225 SHA256 f4f68ad3c6da36b0b5241ac3c798a7a71e0e97d51f972e9f723b3f20a9650ae6 SHA512 c79ceaa1ebfeda2caf41a0495ea31dd2748a11795989aebc341ae13a5c96d21495e4542571d5590e68b2575ceddd6e84059a950ddb78e6c0b9d94861faee4f58 WHIRLPOOL 7b327499e8576c07e4ed7fe293f788283e158f08efd10ad5b7ca9f980cbe5dcd9fcc290a9880726a971bd180f5a0c57215d5f337e5294ace25fe5923ea6fbcbd
 EBUILD alsa-lib-1.1.2.ebuild 2240 SHA256 fd3cf2d8cd41c74d1aa70ab67600714e15cf2c1504f894e19fd9b7195323c68b SHA512 8eb8b12203b1beba164b31aac0ccbaada30349c60f8b671529c6df128279012d93db06c315baf8126100bb264159d144a8555c0dd5e5915b84110c9e22a7fb71 WHIRLPOOL 9845dbe1e9301e46bcac58e289b0d1935fafeaa788546cf9e511b2b8377e7f1a6c7cfdf72cfa69ef3a7f1f4a3a409aa5da8e84ef42399d94c1cce79e74bd9141
-EBUILD alsa-lib-1.1.3.ebuild 2249 SHA256 4e5f437d9ae3b871e0f0c4463dc11d14267a56bf092e82b65f93b97fa37bca75 SHA512 aebd81ed437999ea5a4677d6b09b4e89754d05ee14fda9ce8fa1bbd84e61512239dabe36f01cc9e38dfca8147aad9a3242f645884f0ca9c2875c798e2361f66d WHIRLPOOL a2f5653714022b48650ac7bb485bb4b9990c1544a040a9a06be84a2197ea488d37173310989f84348d1de1cb81de7239170b53dce7ff833ce5dd062b48ae9762
 EBUILD alsa-lib-1.1.4.1.ebuild 2249 SHA256 597b21303334bfea1b0b3eada0dbe6dfe3021c2e5eb0fe34c19374fe59c0a388 SHA512 0e5b538df68ffe6bff1b36514d3d3d817393038a4f5b9aa29edede2feb632f16b0a4b1712b116bab99b52a6ae325151f4eba364cdbd8ff2dab171433b92f6b32 WHIRLPOOL 962e97c233f64b038b7754a143bf00f4db8aa72326e45b19eac3034ed43d22e16f7d69c622d83f249e9a43698c74f6fc4df74bcd9141899ebdfbc87ae74d30ed
-EBUILD alsa-lib-1.1.4.ebuild 2249 SHA256 597b21303334bfea1b0b3eada0dbe6dfe3021c2e5eb0fe34c19374fe59c0a388 SHA512 0e5b538df68ffe6bff1b36514d3d3d817393038a4f5b9aa29edede2feb632f16b0a4b1712b116bab99b52a6ae325151f4eba364cdbd8ff2dab171433b92f6b32 WHIRLPOOL 962e97c233f64b038b7754a143bf00f4db8aa72326e45b19eac3034ed43d22e16f7d69c622d83f249e9a43698c74f6fc4df74bcd9141899ebdfbc87ae74d30ed
+EBUILD alsa-lib-1.1.5.ebuild 2249 SHA256 597b21303334bfea1b0b3eada0dbe6dfe3021c2e5eb0fe34c19374fe59c0a388 SHA512 0e5b538df68ffe6bff1b36514d3d3d817393038a4f5b9aa29edede2feb632f16b0a4b1712b116bab99b52a6ae325151f4eba364cdbd8ff2dab171433b92f6b32 WHIRLPOOL 962e97c233f64b038b7754a143bf00f4db8aa72326e45b19eac3034ed43d22e16f7d69c622d83f249e9a43698c74f6fc4df74bcd9141899ebdfbc87ae74d30ed
 MISC ChangeLog 5810 SHA256 2d8471b3d60bd8276b5f80ba6307e4edc69fa19ce45eb0671ae71dd4ab138253 SHA512 f140da83d97a70dad0a8176363f042319b1b16298b40d73e72b978c0d3802f6e22d87c20e63678dd51b61761663e91fd7c547b441c576e75516af959834531f6 WHIRLPOOL e240e50a423c1cfe3839b3033ea6e9eb6bd9212285d28731432c95f0079b67eec1850c86843718cc879b08c7778103c5c4e7f385b9edf0b078d986941dc76129
 MISC ChangeLog-2015 60317 SHA256 25f9cc154c0ac0b4d7792522669c7a3ac036802f4a8cf63df95ffa7ea8ce0afa SHA512 8dadb84122834d5238a20c14f0c6e307f2dfb61de9fa7a2378ff734ffdcf3456fda2eabd3d170d841a5382d809fa550e6b8147e04773406bc5bee9522007bd1c WHIRLPOOL 40a8aae15326b96962543db5bfea67109b6a07107917d8f36b45748e23fcf09fb7313f34b8ddafa8ce01185d8b6d312a1faed760240dd49886e65ff7a7ebb307
 MISC metadata.xml 438 SHA256 f2bec88238bb4a607fc2bb215e5967996ddb2f4bbcfa4692934c387db292db92 SHA512 1e3a7f5a2f9ea84793ec938eb657fcbd6d5748f1cb055d085c638e30d1b5c1154a9dc0026d6e3592de074125c17926a4429757844f7d02b960f4a9a8d94a0433 WHIRLPOOL e1c1cdc7aa789e26c847575bf1d5b64c62ca652254cd54068cf1b2e5580d5512ec31157ccd9c524dcbf654f401779a93dde9f9ca7481b69083db41c70fe247e7
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.3.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.3.ebuild
deleted file mode 100644
index 40040f0f0615..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.1.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# no support for python3_2 or above yet wrt #471326
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.2.6 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/509886
-	use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
-	# https://bugs.gentoo.org/545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-	# enable Python only on final ABI
-	if multilib_is_native_abi; then
-		myconf="$(use_enable python)"
-	else
-		myconf="--disable-python"
-	fi
-	use elibc_uclibc && myconf+=" --without-versioned"
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--enable-shared \
-		--disable-resmgr \
-		--enable-rawmidi \
-		--enable-seq \
-		--enable-aload \
-		$(use_with debug) \
-		$(use_enable alisp) \
-		${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		fgrep -Zrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::"
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
-	docinto ""
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild
index afb615a588b1..afb615a588b1 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.4.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild