gentoo resync : 03.12.2017

2 files changed, 18 insertions, 14 deletions

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
 }