gentoo resync : 03.12.2017

10 files changed, 41 insertions, 42 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bdf4a85c4c8e..b539c5fccd8f 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index e0430c99904e..d1e6df3de4ae 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,3 +1,3 @@
-DIST alsaplayer-0.99.81.tar.bz2 806906 SHA256 187897e5ad5a94ea819e42092cc35d53463e5fa43a3a5a78cb76ffd0d5ddee11 SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650 WHIRLPOOL 2f4849f5643768db14a7542c65504e937023585aaa7025a1d66e7f87568dfb25a981b304684a0fa242c0a4d9200c4111368669b8c6cd897cfdcfd1a43cee66f5
-EBUILD alsaplayer-0.99.81.ebuild 2018 BLAKE2B 2950abaac4fc297fefc7413c475652860d010bfa295e14f0080c324c21f34a706dbf9861ce88d2015bdfca015da1b4863f40dcd97e8f5bac1b847939761361af SHA512 18dff9b822e0f612dfbd9cf62aff510167e773fb0d7aaaef984bcba971c3d531937e703d42dc002e9a667289e443b9b21e72c8182c9b0eff141d695ec124b154
+DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
+EBUILD alsaplayer-0.99.81.ebuild 1953 BLAKE2B 9b474fb6a2b00fa7510d105f3c7d42d807e34ce5f547795607dedd2b0a35d345c11ef9431a280bf5713d475b0b3950cd50327d4283a78ceb6e4a7580707772c0 SHA512 2916eb5516a8caa4bc173a0c579b76824f3b3625303f56ef3ce507f46a4e19ed5a1abf74b1851b57b1d8c1cc729ce0c4f00488aee03410fa12e9367cbbf98994
 MISC metadata.xml 337 BLAKE2B 1f60abc42f95db4e9876c4894ddc16175f17d35b53c7d9fcd425e0124d3fdf08978b349cf2364cfc32555408d1e5ec011fc6367ac9d3e4b7260cf0d2d665522e SHA512 eb9f49ef0aaa5f6ec8c8a29f0459cde3fbbcce419217ae9c22ed6f50dea1893e02037b556daa4276de62aa18fd3193d8c213c6b819d701689fea845d64f97f61
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
index e5ada6c7bf4f..bc24c59aa7a3 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils
+EAPI=6
+
+inherit autotools desktop
 
 DESCRIPTION="A heavily multi-threaded pluggable audio player"
 HOMEPAGE="http://www.alsaplayer.org/"
@@ -13,8 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 ~mips ~ppc ~sparc x86"
 IUSE="+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd"
 
-RDEPEND="media-libs/libsndfile
-	sys-libs/zlib
+RDEPEND="
+	media-libs/libsndfile:=
+	sys-libs/zlib:=
 	alsa? ( media-libs/alsa-lib )
 	audiofile? ( media-libs/audiofile )
 	flac? ( media-libs/flac )
@@ -36,6 +38,8 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="|| ( alsa jack nas oss )"
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e 's:AM_CFLAGS = $(AM_CXXFLAGS)::' \
 		output/jack/Makefile.am || die
@@ -48,11 +52,11 @@ src_prepare() {
 }
 
 src_configure() {
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-	use xosd || export ac_cv_lib_xosd_xosd_create=no
+	export ac_cv_prog_HAVE_DOXYGEN=$(usex doc true false)
+	export ac_cv_lib_xosd_xosd_create=$(usex xosd)
 
 	econf \
-		--docdir=/usr/share/doc/${PF} \
+		--disable-esd \
 		$(use_enable nls) \
 		$(use_enable opengl) \
 		$(use_enable mikmod) \
@@ -64,16 +68,16 @@ src_configure() {
 		$(use_enable gtk systray) \
 		$(use_enable jack) \
 		$(use_enable alsa) \
-		--disable-esd \
 		$(use_enable oss) \
 		$(use_enable gtk gtk2) \
 		$(use_enable nas)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README TODO docs/*.txt
+	default
+	dodoc docs/*.txt
+
 	newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-sound/cmix/Manifest b/media-sound/cmix/Manifest
index fa9d68833d4b..52a1abb0ba27 100644
--- a/media-sound/cmix/Manifest
+++ b/media-sound/cmix/Manifest
@@ -1,4 +1,4 @@
-AUX cmix-1.6-ldflags.patch 296 BLAKE2B 25f1e30e58580754fafd1005fb9517293a1256e681fbe97eb36de02062b75d17b18c4984613a42472d9c089518cd1b5900047045d17bef90ec5e74e5cf2c7201 SHA512 39808ce3fa29b13dac4a80a4406fb30d852983a64012c3c27a8d91a5274d86cac0175c0d1395e8a7095477947989d8fa825a79541866a23c63dbe904bd3d8700
-DIST cmix-1.6.tbz2 12880 SHA256 3c63e687c0afac50f5218f2ee0f594132f1656073d5a9cf3f7f0da525b4e8afe SHA512 5d8409872bbea0575a1cb7d15d1f1469571860d06f4f71bf78b685077d0ff394323ef12498d3f8424e00b31a7c7430115ee7a810b7bbf291bb586a3d95f19a38 WHIRLPOOL 08d496d71d2d016679df5c99056d625f097aef7c334a38bbff448145a11cec931c0bb5557a33872459781202c12a46e3cd97b98a32db0f6dc39458eaa8303612
-EBUILD cmix-1.6.ebuild 646 BLAKE2B f5bfe8752a3ed7928618bc99b71ca8956aa7e386a6367498147490b74d23dfbaca866e3f3f857142bf5c65c63f7a5547f130bec4623cabf56cfed3b1be906485 SHA512 e3261da204c80c995b35f3bacf3f2c0bf456c19f210233da1690a2481ecec3f62bebefc20ca582adc10a403d8e74a18bc3def759fd7ac161b0700187912eb4ac
+AUX cmix-1.6-ldflags.patch 224 BLAKE2B 1775b4d0ffe31f25796e56a926b71f55b0e64401754838e290779597ed8eb59b7e9550242fcf78d8d9a07351d438bb63f48da7ad30f0b93209506f03eafbffc8 SHA512 455ad21708986a8279da22f4c1008796e95c96a850e4138c352f965a730ff1bdd73e4a4396d7678574492727e5e4dcc1ecb445c8618ef2aab3d089c593170862
+DIST cmix-1.6.tbz2 12880 BLAKE2B 1d024279a30439099dbc1f7a4c7a98f96143b716f032f57bb662d901e3fb92977333cc6ca1743727128c08ec92f3ef01c57b37e7bf803f8525c05910eed9da0c SHA512 5d8409872bbea0575a1cb7d15d1f1469571860d06f4f71bf78b685077d0ff394323ef12498d3f8424e00b31a7c7430115ee7a810b7bbf291bb586a3d95f19a38
+EBUILD cmix-1.6.ebuild 547 BLAKE2B ab4e1d8d89902a2e5d14c027a6b8ed3c37daad4827f04a020305797f9e236cc4cc482d0ad74202957853f8ecd2123e9b811ed546a5ca5a69907697e4f98b9b59 SHA512 8efe5eeb83a3f6a309765c39c6ed809170c1a55d44367d74e2aa707ab91634499032789efcdaa58872d42a89c8d0f2c4bc3543f837e5c1f3f57f2aa1ef96c07a
 MISC metadata.xml 327 BLAKE2B c8fb97c7a0d6b26224b307580e4c5066593b4e25c1782bef25f36138d37997e81c8fbd731ea258041d0419d41761467492e417229b8f6ffe166b4dbe21b04afd SHA512 d962a2ab67c8dec05a40fd6b52625d9d260861386e62d851ba72551afec5dcd68b4454c3057921d66bddad3c8ac5c137e7d16a6eb84850b0d7d9a763eeec424b
diff --git a/media-sound/cmix/cmix-1.6.ebuild b/media-sound/cmix/cmix-1.6.ebuild
index 933e6189f5a0..1dc7e4ab02a2 100644
--- a/media-sound/cmix/cmix-1.6.ebuild
+++ b/media-sound/cmix/cmix-1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils toolchain-funcs
+EAPI=6
 
-IUSE=""
+inherit toolchain-funcs
 
 DESCRIPTION="command line audio mixer"
 HOMEPAGE="http://cmix.sourceforge.net/"
@@ -14,18 +14,13 @@ SLOT="0"
 #-amd64: 1.6: 'cmix list' gives: MIXER_READ(SOUND_MIXER_OUTSRC): Input/output error
 KEYWORDS="-amd64 ~ppc sparc x86"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-}
+PATCHES=( "${FILESDIR}/${P}-ldflags.patch" )
 
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	einstall || die
 	dobin cmix
-	dodoc README || die
+	einstalldocs
 }
diff --git a/media-sound/cmix/files/cmix-1.6-ldflags.patch b/media-sound/cmix/files/cmix-1.6-ldflags.patch
index ba8dacb2567b..0ddf7e085844 100644
--- a/media-sound/cmix/files/cmix-1.6-ldflags.patch
+++ b/media-sound/cmix/files/cmix-1.6-ldflags.patch
@@ -1,14 +1,14 @@
-Index: cmix-1.6/Makefile
-===================================================================
---- cmix-1.6.orig/Makefile
-+++ cmix-1.6/Makefile
-@@ -3,8 +3,7 @@ CC=gcc
- #CFLAGS=-Wall -O2
- 
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,5 @@
+-CC=gcc
+-#CFLAGS=-Wall -g
+-#CFLAGS=-Wall -O2
+-
  cmix: mix.c
 -	$(CC) $(CFLAGS) mix.c -o $@
 -	strip $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) mix.c -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) mix.c -o $@ $(LIBS)
  
  install: 
  
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 98593dae4bed..385a678e9ed4 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,7 @@
-DIST mpg123-1.25.2.tar.bz2 918024 SHA256 5314b0fb8ad291bfc79ff4c5c321b971916819a65233ec065434358fcf8aee38 SHA512 1b063a7a497d6f643b43a0e0db0e1a8951bf110cabf8f3dc63d7ed1b8e47ef4a42649622a5e4efb582479beacd7d3872b4f061716a5f6970b3f5bed7ef4f3fe9 WHIRLPOOL e8d6e74b857cac86e77651339d3491088ac5024aae149bbcc691a28bb8cda46395ab8f4505d2ff7eb6ba3311c97db1baa64c686ed508adb0ba3c91cd2faf1e32
 DIST mpg123-1.25.6.tar.bz2 919169 SHA256 0f0458c9b87799bc2c9bf9455279cc4d305e245db43b51a39ef27afe025c5a8e SHA512 0b129c38c19462f7fbe3f56ea2b856222f8a1a3ba76ef8109ca759c9a9c668432cc0ec76059f9a7a3c37228ce615e4c628c7de3b1663073302cc7c8fc93f249c WHIRLPOOL 413c69c90de4387ee0def0cc7be394f4d01025b0d06c76d5802b3f8c87ea063ddda8ad8d620d84becc7eed98157df8e4e36c9b6d1bce4320715f66e5c4d52db5
 DIST mpg123-1.25.7.tar.bz2 920705 SHA256 31b15ebcf26111b874732e07c8e60de5053ee555eea15fb70c657a4f9f0344f3 SHA512 4e0972149ce4f792cc361d96d638551eb5184942465e69713202d0830a0a54b33e3effe2e460683b996024772edba5e0be341048b9d0c73dace557c640d4414e WHIRLPOOL b5c95cf1da06e06c3059282e79a57cf9e07137862a01348b11a719f42dcd77533c45237a1ed641f6417b29ae2b852655d1d23f2373220b5ef99aed6fa57e2941
-EBUILD mpg123-1.25.2.ebuild 3030 BLAKE2B 186e3eacfe1aa802b5a63f823fe5d68a2306cafa6574a8f0314ad01cc10912460a3cd94d0dbf023a2f17b3c26cff8f527889621f1ddea6bc36b20078c8a54acf SHA512 ff19843589d37864e210114b1d69a5246bd62222e3572f07853bf356c6932898a6a9afea2ce88121261d4c2b641f67fe7225a6715d65733a07031e0915f7218c
+DIST mpg123-1.25.8.tar.bz2 920677 BLAKE2B bbffa9fa36c40557abb6c70af942b63a43739462c86a22839363b36a39e1a2f16ce3f4e5462f9be9cea2addda1b46af6fdd58b24b5a0b31949efc604ef475c19 SHA512 f226317dddb07841a13753603fa13c0a867605a5a051626cb30d45cfba266d3d4296f5b8254f65b403bb5eef6addce1784ae8829b671a746854785cda1bad203
 EBUILD mpg123-1.25.6.ebuild 3030 BLAKE2B 186e3eacfe1aa802b5a63f823fe5d68a2306cafa6574a8f0314ad01cc10912460a3cd94d0dbf023a2f17b3c26cff8f527889621f1ddea6bc36b20078c8a54acf SHA512 ff19843589d37864e210114b1d69a5246bd62222e3572f07853bf356c6932898a6a9afea2ce88121261d4c2b641f67fe7225a6715d65733a07031e0915f7218c
 EBUILD mpg123-1.25.7.ebuild 3038 BLAKE2B 45530f1d7820be57fd588ae39f4348d97c9c925975603adc7ccc98b109e3e885c42b021118cc4f4bc2e1bc6ebeed430b7f58d3e996be3ea81679b1b5aa2cd796 SHA512 b3ad391ea62ffed0fe08538b9631d3a927d3c028dd4d9ce41e20c3ee1d09e9b204225fcb1dc1e66d8b4fadbac8b9f0433c8a17b5ebcf27285f271750b4496441
+EBUILD mpg123-1.25.8.ebuild 3038 BLAKE2B 45530f1d7820be57fd588ae39f4348d97c9c925975603adc7ccc98b109e3e885c42b021118cc4f4bc2e1bc6ebeed430b7f58d3e996be3ea81679b1b5aa2cd796 SHA512 b3ad391ea62ffed0fe08538b9631d3a927d3c028dd4d9ce41e20c3ee1d09e9b204225fcb1dc1e66d8b4fadbac8b9f0433c8a17b5ebcf27285f271750b4496441
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.2.ebuild b/media-sound/mpg123/mpg123-1.25.8.ebuild
index 30e10ca885c7..34770e816b60 100644
--- a/media-sound/mpg123/mpg123-1.25.2.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index ca277f0d23cf..d97ebda57f75 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -9,5 +9,5 @@ DIST pulseaudio-11.1.tar.xz 1648924 SHA256 f2521c525a77166189e3cb9169f75c2ee2b82
 EBUILD pulseaudio-10.0.ebuild 10963 BLAKE2B 90aa6d753f7e66b34318a0493a81a448168d9513142f4108ab8aea1a71b59ba564122ffa02d76237af87671ec24fadeb8b7d580e9107fc663285d8f033f9b20b SHA512 0f4eeac1aa1d2446db522259bd669c67ad06f717964b6272f3ad733a01feecdc00bfd4fd886636a284522a7e766a090fcaba60251a8e65486ec518677425825f
 EBUILD pulseaudio-10.99.1.ebuild 10972 BLAKE2B b2d8a567ebf1f1e5a39f63ecd0fa402374d2d8bd5ae1cbddc070170e567a16af956351815c3fc708e27d47bece7d7c701df4882b4510d3a58982b8de155903b0 SHA512 9140a7bacc08ed57975a5016d7ccca54c585a3c58cc0605f29ace3b2a9c4f7e5af817cd9be75034fa6b8769ae9b314cb2b56d53675308d8fef95edda5079e764
 EBUILD pulseaudio-11.0.ebuild 10960 BLAKE2B b8497dc4d9c738d8668c6956ea5632a82b8f90efb1c5e11be7a115f1aba09b3bcead69fc7f878700ecfcafc9e2fb148aeb2a211c5ca086e7c6255eae8c50da89 SHA512 5857ec66ea36197411d0e42b2234683686f3a6982a5b5168b23f69dec72e4827155d664b6e4164f578758290362d885d7370f068a32c0c37d77d7806895cdb67
-EBUILD pulseaudio-11.1.ebuild 10955 BLAKE2B 368fc7dc181a060d3d954b795b0f35608ddf22064f692f17fff2165779381bbad5b3435bae6c8e1ceb99abd51c62e424ade8c1a6f288734b8504550820749375 SHA512 c73a35318034afb7d24c6fec99caa6f847833c63642013dc6938175950253016d5ab0968976bd0bec5bae730b22df6618ad33684d8053de941e5eb7a6171f1c3
+EBUILD pulseaudio-11.1.ebuild 10954 BLAKE2B 5d0910fd3558b88fb335605e1c603bcc51a51b3e4cca945edcecabdb250088e8bba9b698bede72864e05827a6239fc7d66c0d267ca27650fcb1c68d2458267ad SHA512 f6dfd5185e3e9483227dfb100eb85a0e228f7ebe3f5896c001fa437ba0f2dfdd8e7c34c2b68f9bd928210f930a8fbdb299431f6b15b2d22a855f0ecb06e329aa
 MISC metadata.xml 3415 BLAKE2B cb46d59d9af2a364730ebe48d9ee009659ba8c9b51c8da97c341151784dcb595cc7d6469dae20f5a5da2382d762a984e038077ce95840fcb8e4205b1f0fab06f SHA512 1c7e7a12eeafc6abd5d9bd315e4b512a7b479ae933ee3865b9fc37d994f123beea8208dfe742334d12dd4b20c7eb8077bb37fcd1a862dcf1f5874a0fa8777896
diff --git a/media-sound/pulseaudio/pulseaudio-11.1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1.ebuild
index 6891133b530e..cb559d066005 100644
--- a/media-sound/pulseaudio/pulseaudio-11.1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-11.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
 
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib