[gentoo-commits] repo/gentoo:master commit in: media-sound/cmus/

[Andreas Sturmlechner]

commit:     35234db8289d78b11c008bb5af653a909f28a8d0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 11:21:15 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 12:29:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35234db8

media-sound/cmus: Finish EAPI-7 porting, sort IUSE and DEPENDs

Drop obsolete pkg_postinst.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/cmus/cmus-9999.ebuild | 47 ++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/media-sound/cmus/cmus-9999.ebuild 
b/media-sound/cmus/cmus-9999.ebuild
index bf501b22bd3..ebe5aebf54a 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit bash-completion-r1 multilib
+
+inherit bash-completion-r1
 
 if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="https://github.com/cmus/cmus.git";
@@ -12,24 +13,26 @@ else
        KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux 
~x86-linux ~x86-solaris"
 fi
 
-DESCRIPTION="A ncurses based music player with plugin support for many formats"
+DESCRIPTION="Ncurses based music player with plugin support for many formats"
 HOMEPAGE="https://cmus.github.io/";
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac alsa ao cue cdio cddb discid debug examples ffmpeg +flac jack 
libsamplerate
+IUSE="aac alsa ao cddb cdio cue debug discid examples ffmpeg +flac jack 
libsamplerate
        +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor 
+unicode
        +vorbis wavpack"
 
-S="${WORKDIR}/${P/_/-}"
-
-CDEPEND="sys-libs/ncurses:0=[unicode?]
+BDEPEND="
+       virtual/pkgconfig
+"
+DEPEND="
+       sys-libs/ncurses:0=[unicode?]
        aac? ( media-libs/faad2 )
        alsa? ( >=media-libs/alsa-lib-1.0.11 )
        ao? ( media-libs/libao )
-       cue? ( media-libs/libcue )
-       cdio? ( dev-libs/libcdio-paranoia )
        cddb? ( media-libs/libcddb )
+       cdio? ( dev-libs/libcdio-paranoia )
+       cue? ( media-libs/libcue )
        discid? ( media-libs/libdiscid )
        ffmpeg? ( media-video/ffmpeg:= )
        flac? ( media-libs/flac )
@@ -44,17 +47,22 @@ CDEPEND="sys-libs/ncurses:0=[unicode?]
        pulseaudio? ( media-sound/pulseaudio )
        tremor? ( media-libs/tremor )
        !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) )
-       wavpack? ( media-sound/wavpack )"
-DEPEND="${CDEPEND}
-       virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-       pidgin? ( net-im/pidgin dev-python/dbus-python )"
+       wavpack? ( media-sound/wavpack )
+"
+RDEPEND="${DEPEND}
+       pidgin? (
+               dev-python/dbus-python
+               net-im/pidgin
+       )
+"
 
 # 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"
+DOCS=( AUTHORS README.md )
+
+S="${WORKDIR}/${P/_/-}"
 
 my_config() {
        local value
@@ -106,7 +114,9 @@ src_compile() {
 src_install() {
        default
 
-       use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
+       if ! use examples; then
+               rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+       fi
 
        insinto /usr/share/zsh/site-functions
        doins contrib/_cmus
@@ -117,8 +127,3 @@ 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";
-}