gentoo Easter resync : 12.04.2020

3 files changed, 70 insertions, 44 deletions

diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index ec7978e3cc07..9dfb8d4b48e4 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -7,7 +7,8 @@ AUX xmms2-0.8_p20161122-gcc-10.patch 222 BLAKE2B a198b2e69081253f299ff1c7f94f0a2
 AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af18269b784360bbbcaef33b1db4b880704f88e8dad06168e3737a43fcdb71ba722da1ffb5ba77f3f61ecf07674e1ad0988f5a SHA512 d2fe5f9a0c59205c787386e7b219c3fa9a334c30787b9a343214cc1c4dbf9f5d47f5dad9b2efd7deac1e96a227c827cc66198215a89b0e788c9d856cff51b16b
 AUX xmms2-0.8_p20161122-perl-no-local.patch 697 BLAKE2B 86ab6bb3594fd45e9a9bdbd07d85d3740ed206eea24652161c7fbbdf620c98a6b002b646aba65a3f017e263bb82d6dc7b933fb53540012c2005d65dd2e667b06 SHA512 eb5afb39409c7c199a844d9452ab829a653d2a1ce8f5d9f1361fa995e851914d5a962d25d8116947a265fabc649f8560aa1947a24cf45d954da7743954fc3cd7
 AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
+DIST waf-2.0.19.tar.bz2 682213 BLAKE2B 0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2 SHA512 ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
-EBUILD xmms2-0.8_p20161122-r4.ebuild 7589 BLAKE2B 2519dd96fdbfafdca73f9e7a9c9b8befc3a26fa0b0f99c2a9763ae3b2c749e7df8c8ba0bb87390bf68cc3aecc6df3ddfff05ac021655c077c010067800b768c2 SHA512 e45aa4972e11ee81c14186b095e4c6a8320ff206308d30afa8f5c2833090ae1be2f26cc7a8c11d888695e4540d4b7a3e1c06eafbb96133cf626c2c59bc1d05f1
-EBUILD xmms2-0.8_p20161122-r5.ebuild 7810 BLAKE2B 3c65e59f07517fae732e97af49682393870278d13eee8b94f6d5fad11f892f0f0b8994c52785f238e49d5b4bce99bf17fead5045bea2b7dcee8282cdfc25e63a SHA512 f1bd45e6e44bf0f3971bc724737962f9bff9aab19b459abff072e7fc172eb8fdf4e39959b12a9e7705604c320a5ce34c1f827f0d11d712ca2b32fcb690efbd55
+EBUILD xmms2-0.8_p20161122-r5.ebuild 7807 BLAKE2B 7226cdca97888fc127daa09523d28254f891ca164d3a536121f1ff03b5cfd5eb1413e7a6c32d6c8c3b57431aff3c6b9ae8ed0251f9a9271086d17f133cf330a9 SHA512 2ac2878fac8d408723a932370fbad67fb80e52e24377da52ebd419a2bcf2ff198661745baa8a973a28dc36f2b58eea90c0802bc8ffe047833abdabc13e307bcb
+EBUILD xmms2-0.8_p20161122-r6.ebuild 8100 BLAKE2B 598bacb75a8b87239b3d18b82373d31e5cc480caec47737bb3f1414c8922156b66ce6cbdf0b11f6b3e9bd422d2d28f0fbe91bae2a6b83a7b5e4940f62709767f SHA512 9229b5c821fce1f0add8fc5f455c94f83aed2749817c78c11e50f521c7dc32e2cd8bb8fc0929e6f288e36e571df299607330447455fd2cced5bacc3f86e928ba
 MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
index 22fe230ca3b7..02abc016bbf9 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc x86"
 
 IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices
 jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r6.ebuild
index 8fe00838c3d6..691654060525 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r6.ebuild
@@ -1,24 +1,26 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 USE_RUBY="ruby23 ruby24 ruby25"
 
-inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
+inherit eutils multiprocessing perl-functions python-single-r1 ruby-single toolchain-funcs
 
 # generated as 'python2 ./utils/gen-tarball.py' from clean git tree
 MY_P="${P%_p*}DrO_o-949-gca15e830"
+WAF_VER="2.0.19"
 
 DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
 HOMEPAGE="https://xmms2.org/wiki/Main_Page"
 #SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2
+	https://waf.io/waf-${WAF_VER}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
 
 IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices
 jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
@@ -79,8 +81,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	perl? ( dev-perl/Module-Build
 		virtual/perl-Module-Metadata )
-	python? ( >=dev-python/cython-0.15.1
-		dev-python/pyrex )
+	python? ( >=dev-python/cython-0.15.1 )
 	test? ( dev-util/cunit
 		valgrind? ( dev-util/valgrind ) )
 "
@@ -91,6 +92,30 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	# needs port
+	#epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
+
+	"${FILESDIR}/${PN}"-0.8-ffmpeg2.patch #536232
+
+	"${FILESDIR}/${PN}"-0.8-rtvg.patch #424377
+
+	# required to build tarball from git tree
+	"${FILESDIR}/${P}"-tarball.patch
+
+	# fix hash to be the same on LE/BE platforms
+	"${FILESDIR}/${P}"-be-hash.patch
+
+	# handle mac-3 -> -4 API change
+	"${FILESDIR}/${P}"-mac-4.patch
+
+	# C++ client dangling reference: https://github.com/xmms2/xmms2-devel/pull/5
+	"${FILESDIR}/${P}"-cpp-client.patch
+
+	# gcc-10 stopped putting globals into common section
+	"${FILESDIR}/${P}"-gcc-10.patch
+)
+
 pkg_setup() {
 	# used both for building xmms2 and
 	# optionally linking client library
@@ -120,44 +145,27 @@ xmms2_flag() {
 }
 
 src_prepare() {
-	./waf # inflate waf
-	cd .waf* || die
-	# needs port
-	#epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
-	eapply "${FILESDIR}/${PN}"-0.8_p20161122-perl-no-local.patch
-	cd "${S}"
-
-	eapply "${FILESDIR}/${PN}"-0.8-ffmpeg2.patch #536232
-
-	eapply "${FILESDIR}/${PN}"-0.8-rtvg.patch #424377
-
-	# required to build tarball from git tree
-	eapply "${FILESDIR}/${P}"-tarball.patch
-
-	# fix hash to be the same on LE/BE platforms
-	eapply "${FILESDIR}/${P}"-be-hash.patch
-
-	# handle mac-3 -> -4 API change
-	eapply "${FILESDIR}/${P}"-mac-4.patch
-
-	eapply_user
+	mv "${WORKDIR}/waf-${WAF_VER}"/{waf,waflib/} . || die
+	default
 }
 
 src_configure() {
 	# ./configure alike options.
-	local waf_params="--prefix=/usr \
-			--libdir=/usr/$(get_libdir) \
-			--with-target-platform=${CHOST} \
-			--mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--datadir=/usr/share \
-			--sysconfdir=/etc \
-			--localstatedir=/var/lib"
+	local waf_params=(
+		--prefix=/usr
+		--libdir=/usr/$(get_libdir)
+		--with-target-platform="${CHOST}"
+		--mandir=/usr/share/man
+		--infodir=/usr/share/info
+		--datadir=/usr/share
+		--sysconfdir=/etc
+		--localstatedir=/var/lib
+	)
 
 	local optionals=""
 	local plugins=""
 	if ! use server ; then
-		waf_params+=" --without-xmms2d"
+		waf_params+=( --without-xmms2d )
 	else
 		# some fun static mappings:
 		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
@@ -254,19 +262,26 @@ src_configure() {
 		for plugin in "${plugin_map[@]}"; do
 			plugins+=$(xmms2_flag $plugin)
 		done
+
+		if use perl; then
+			perl_set_version
+			waf_params+=( --with-perl-archdir="${ARCH_LIB}" )
+		fi
 	fi # ! server
 
 	# pass them explicitely even if empty as we try to avoid magic deps
-	waf_params+=" --with-optionals=${optionals:1}" # skip first ',' if yet
-	waf_params+=" --with-plugins=${plugins:1}"
-	waf_params+=" $(use_with valgrind)"
+	waf_params+=(
+		--with-optionals="${optionals:1}" # skip first ',' if yet
+		--with-plugins="${plugins:1}"
+		$(use_with valgrind)
+	)
 
 	CC="$(tc-getCC)"         \
 	CPP="$(tc-getCPP)"       \
 	AR="$(tc-getAR)"         \
 	RANLIB="$(tc-getRANLIB)" \
 	CXX="$(tc-getCXX)"       \
-	    ./waf configure ${waf_params} || die "'waf configure' failed"
+	    ./waf configure "${waf_params[@]}" || die "'waf configure' failed"
 }
 
 src_compile() {
@@ -283,6 +298,16 @@ src_test() {
 src_install() {
 	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
 	dodoc AUTHORS TODO
+
+	python_optimize
+
+	# waftools/man.py always compresses man pages with gzip.
+	# to avoid code changed let's just un-gzip manpages
+	local m
+	for m in "${ED}"/usr/share/man/man1/*.gz; do
+		einfo "Uncompressing '${m#${ED}}' back."
+		gzip -d "${m}" || die
+	done
 }
 
 pkg_postinst() {