Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

1 files changed, 22 insertions, 37 deletions

diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
index 0b1b04b727cc..bf501b22bd38 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-9999.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-inherit bash-completion-r1
+inherit bash-completion-r1 multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/cmus/cmus.git"
@@ -13,33 +12,28 @@ else
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 
-DESCRIPTION="Ncurses based music player with plugin support for many formats"
+DESCRIPTION="A ncurses based music player with plugin support for many formats"
 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
-	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
+IUSE="aac alsa ao cue cdio cddb discid debug examples ffmpeg +flac jack libsamplerate
+	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor +unicode
 	+vorbis wavpack"
 
-REQUIRED_USE="?? ( elogind systemd )"
+S="${WORKDIR}/${P/_/-}"
 
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	sys-libs/ncurses:0=[unicode?]
+CDEPEND="sys-libs/ncurses:0=[unicode?]
 	aac? ( media-libs/faad2 )
 	alsa? ( >=media-libs/alsa-lib-1.0.11 )
 	ao? ( media-libs/libao )
-	cddb? ( media-libs/libcddb )
-	cdio? ( dev-libs/libcdio-paranoia )
 	cue? ( media-libs/libcue )
+	cdio? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
 	discid? ( media-libs/libdiscid )
-	elogind? ( sys-auth/elogind )
 	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac )
-	jack? ( virtual/jack )
+	jack? ( media-sound/jack-audio-connection-kit )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( >=media-libs/libmad-0.14 )
 	mikmod? ( media-libs/libmikmod:0 )
@@ -48,25 +42,19 @@ DEPEND="
 	musepack? ( >=media-sound/musepack-tools-444 )
 	opus? ( media-libs/opusfile )
 	pulseaudio? ( media-sound/pulseaudio )
-	systemd? ( sys-apps/systemd )
 	tremor? ( media-libs/tremor )
 	!tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) )
-	wavpack? ( media-sound/wavpack )
-"
-RDEPEND="${DEPEND}
-	pidgin? (
-		dev-python/dbus-python
-		net-im/pidgin
-	)
-"
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	pidgin? ( net-im/pidgin dev-python/dbus-python )"
 
 # Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
 REQUIRED_USE="tremor? ( vorbis )
 	mp4? ( aac )" # enabling mp4 adds -lfaad
 
-DOCS=( AUTHORS README.md )
-
-S="${WORKDIR}/${P/_/-}"
+DOCS="AUTHORS README.md"
 
 my_config() {
 	local value
@@ -102,12 +90,6 @@ src_configure() {
 	my_config ao CONFIG_AO
 	my_config oss CONFIG_OSS
 
-	if use elogind || use systemd; then
-		myconf="${myconf} CONFIG_MPRIS=a"
-	else
-		myconf="${myconf} CONFIG_MPRIS=n"
-	fi
-
 	./configure prefix="${EPREFIX}"/usr ${myconf} \
 		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
 		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
@@ -124,9 +106,7 @@ src_compile() {
 src_install() {
 	default
 
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
+	use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
 
 	insinto /usr/share/zsh/site-functions
 	doins contrib/_cmus
@@ -137,3 +117,8 @@ src_install() {
 		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
 	fi
 }
+
+pkg_postinst() {
+	einfo "USE flag 'wma' was replaced by 'ffmpeg'"
+	einfo "Details here - https://bugs.gentoo.org/show_bug.cgi?id=553834"
+}