gentoo resync : 10.02.2020

4 files changed, 43 insertions, 32 deletions

diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 6719fdbb4346..e75ff452b53e 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -2,6 +2,6 @@ AUX cmus-2.8.0-elogind.patch 581 BLAKE2B 109426191591ce4df2b512d74d4e16d7e96d78e
 AUX cmus-2.8.0-ffmpeg-deprecations.patch 3913 BLAKE2B 71065d6db1682955e96aa70bfd46f63175dab467743f3977a4a3b5ee90c4f595ed935ab341b6a80d0da5febf093e948dd143c36c6c4513b8f97d2abbe759daa4 SHA512 b76aa27fefe0b7c0e0d18c7aaacd19183619376c8609b777cef6b30892045aa052d9a829f7d511799998907fbabe10272a02215490025f4d1d376e18f219adc4
 AUX cmus-2.8.0-opus.patch 774 BLAKE2B 3ac353e658ec4bd87e7cf6156d76760fb84ca03b78126403ccc577c169001f468d763341da5df8a63cff2a94f3e732b4ed94384bc94da414c229793c89595497 SHA512 a1f22b620232700a30249a61ee13559bea75cf82cdac9c29ee5ccafb45c689e4c0d487523d613e37cf9c3e8764c9a4170c612721fbf1a56b04ddac63ddfe6801
 DIST cmus-2.8.0.tar.gz 317243 BLAKE2B b24c3dd74797ef26b42c2c303191dd751af7bb3b5c4c6f05bfef393eda9a35371eba4658321d473f9af210321132cfba5eab4037d257dd71c38ea3e24f78067f SHA512 cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc
-EBUILD cmus-2.8.0.ebuild 3815 BLAKE2B 37cd0d5f1a15e6a33d1f6d968593ef25fcbe85516bbb7c8409257b65ef51d18a4a9d3e753f5e48bada15803dc9a802132f70b6e3c2afc4c7a6dbe9b34ce14296 SHA512 956ba9f8bde61420dfc444af9206f345ed535d2a6dc2bb8d5d1a3109fc29fd5be845c4f3361ce637b0d128c25fafe5ffd3a992fbf02dd3fa52ebfd55ef0ccb55
-EBUILD cmus-9999.ebuild 3695 BLAKE2B ff63e104338789551fa0ebc6b03673561332cc645499447c2fb11a4db4c0c25c515a541cd845a6c1d76502f8c3c0f7ef6cba4129f7f4158463aa46f7b5df6757 SHA512 5e1e14bee56ef47c960c29957d9ab00ef245541dc62acac2bf20096caa6132061b770a65bf9e72c66250c6990c60f8529f0c9036668a2de18ad9e05bf1ebdf62
-MISC metadata.xml 935 BLAKE2B 6623b356fec8c0bb8ea7b30ff8b767ba108afdd0f02e4881b2afd7229b4b912f781ec89daf1078a057d6f10638e361889ecb9535b3cd81822a6a88c17972ae58 SHA512 f17d07ee3d1bb7e7a813c12d994005c6603f2c381680d4b79c07504556d7de4a84f3720916f39325eacf846000af39500259e4d2446ca6b302d61c59a1535710
+EBUILD cmus-2.8.0.ebuild 3782 BLAKE2B 6dbc0885dd410fd688cac99bef92f95cb3e80ab9981c88a5a151dd63c6dc2a65be1ea370570a9508df6baaa77272d0c42a86cb3b0d4a2c4eabd42ad1d4dc4bbb SHA512 d19e8f76896ab24eaf56546254e48b1f3d8b9990dc7d1a02667e68fa48972786d238746f8137fcd0f47a6bc2ee8b39dd231129f4c08c1029eec1720949f3e148
+EBUILD cmus-9999.ebuild 3662 BLAKE2B 6f64710e100429e7fa05a4e72af3f1bd4c862ab158eb4ff06acd09ecce472db67c5bcaa9f6c30b0026aeda0d5b89d48210e4293c40c39620df0d494d35852640 SHA512 0c4f08bce224656eaa2c7b76094a47f00db7a89f187568174df9b4c2e75ea9f52d8fa954c9dd1b76177d5ead2c07c3ce2f63d1fcbdc0a5f5c9ba0ddafd3d0482
+MISC metadata.xml 884 BLAKE2B f545c30b4f5c1f497b616e0a14bb26e760d528a36153de4fa8d74a745e2c6ea1207c1a3e4625fb8411261dede9d51239a1ade9b258fa1e95c93c4446548f824f SHA512 5976190ba4ffaa3ba0f9b6774ecfe1922ea4a998759bebcb5d8ae1697b09cc54833b352e171b9f3770800ab0145a0f072e576f25d4799d0a94253c211dcf8962
diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild
index 83c05f7dc5eb..e4cfd45303e4 100644
--- a/media-sound/cmus/cmus-2.8.0.ebuild
+++ b/media-sound/cmus/cmus-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://cmus.github.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate
+IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
 	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
 	+vorbis wavpack"
 
@@ -34,7 +34,6 @@ DEPEND="
 	ao? ( media-libs/libao )
 	cddb? ( media-libs/libcddb )
 	cdio? ( dev-libs/libcdio-paranoia )
-	cue? ( media-libs/libcue )
 	discid? ( media-libs/libdiscid )
 	elogind? ( sys-auth/elogind )
 	ffmpeg? ( media-video/ffmpeg:= )
@@ -74,16 +73,24 @@ PATCHES=(
 
 S="${WORKDIR}/${P/_/-}"
 
-my_config() {
-	local value
-	use ${1} && value=a || value=n
-	myconf="${myconf} ${2}=${value}"
-}
-
 src_configure() {
-	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n"
+	my_config() {
+		local value
+		use ${1} && value=a || value=n
+		myconf+=( ${2}=${value} )
+	}
 
+	local debuglevel=1
 	use debug && debuglevel=2
+	local myconf=(
+		CONFIG_CUE=y
+		CONFIG_ARTS=n
+		CONFIG_SUN=n
+		CONFIG_SNDIO=n
+		CONFIG_WAVEOUT=n
+		CONFIG_VTX=n
+		CONFIG_ROAR=n
+	)
 
 	my_config cddb CONFIG_CDDB
 	my_config cdio CONFIG_CDIO
@@ -100,7 +107,6 @@ src_configure() {
 	my_config mp4 CONFIG_MP4
 	my_config aac CONFIG_AAC
 	my_config ffmpeg CONFIG_FFMPEG
-	my_config cue CONFIG_CUE
 	my_config pulseaudio CONFIG_PULSE
 	my_config alsa CONFIG_ALSA
 	my_config jack CONFIG_JACK
@@ -109,12 +115,12 @@ src_configure() {
 	my_config oss CONFIG_OSS
 
 	if use elogind || use systemd; then
-		myconf="${myconf} CONFIG_MPRIS=a"
+		myconf+=( CONFIG_MPRIS=a )
 	else
-		myconf="${myconf} CONFIG_MPRIS=n"
+		myconf+=( CONFIG_MPRIS=n )
 	fi
 
-	./configure prefix="${EPREFIX}"/usr ${myconf} \
+	./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \
 		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
 		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
 }
diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
index 6ae109af57a9..283dda195198 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://cmus.github.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate
+IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
 	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
 	+vorbis wavpack"
 
@@ -34,7 +34,6 @@ DEPEND="
 	ao? ( media-libs/libao )
 	cddb? ( media-libs/libcddb )
 	cdio? ( dev-libs/libcdio-paranoia )
-	cue? ( media-libs/libcue )
 	discid? ( media-libs/libdiscid )
 	elogind? ( sys-auth/elogind )
 	ffmpeg? ( media-video/ffmpeg:= )
@@ -68,16 +67,24 @@ DOCS=( AUTHORS README.md )
 
 S="${WORKDIR}/${P/_/-}"
 
-my_config() {
-	local value
-	use ${1} && value=a || value=n
-	myconf="${myconf} ${2}=${value}"
-}
-
 src_configure() {
-	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n"
+	my_config() {
+		local value
+		use ${1} && value=a || value=n
+		myconf+=( ${2}=${value} )
+	}
 
+	local debuglevel=1
 	use debug && debuglevel=2
+	local myconf=(
+		CONFIG_CUE=y
+		CONFIG_ARTS=n
+		CONFIG_SUN=n
+		CONFIG_SNDIO=n
+		CONFIG_WAVEOUT=n
+		CONFIG_VTX=n
+		CONFIG_ROAR=n
+	)
 
 	my_config cddb CONFIG_CDDB
 	my_config cdio CONFIG_CDIO
@@ -94,7 +101,6 @@ src_configure() {
 	my_config mp4 CONFIG_MP4
 	my_config aac CONFIG_AAC
 	my_config ffmpeg CONFIG_FFMPEG
-	my_config cue CONFIG_CUE
 	my_config pulseaudio CONFIG_PULSE
 	my_config alsa CONFIG_ALSA
 	my_config jack CONFIG_JACK
@@ -103,12 +109,12 @@ src_configure() {
 	my_config oss CONFIG_OSS
 
 	if use elogind || use systemd; then
-		myconf="${myconf} CONFIG_MPRIS=a"
+		myconf+=( CONFIG_MPRIS=a )
 	else
-		myconf="${myconf} CONFIG_MPRIS=n"
+		myconf+=( CONFIG_MPRIS=n )
 	fi
 
-	./configure prefix="${EPREFIX}"/usr ${myconf} \
+	./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \
 		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
 		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
 }
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
index f19bd0670b18..671a05ce3c84 100644
--- a/media-sound/cmus/metadata.xml
+++ b/media-sound/cmus/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="cdio">Use libcdio for CD support </flag>
-		<flag name="cue">Enable CUE sheet parsing</flag>
 		<flag name="discid">Enable reading the ID of the inserted CD</flag>
 		<flag name="elogind">Enable MPRIS support via <pkg>sys-auth/elogind</pkg></flag>
 		<flag name="pidgin">Install support script for <pkg>net-im/pidgin</pkg></flag>