From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1078440-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 942A5138336 for <garchives@archives.gentoo.org>; Wed, 20 Mar 2019 12:29:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7918E08F0; Wed, 20 Mar 2019 12:29:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 786B8E08F0 for <gentoo-commits@lists.gentoo.org>; Wed, 20 Mar 2019 12:29:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B6A6335D25 for <gentoo-commits@lists.gentoo.org>; Wed, 20 Mar 2019 12:29:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42E0156C for <gentoo-commits@lists.gentoo.org>; Wed, 20 Mar 2019 12:29:52 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org> Message-ID: <1553084972.35234db8289d78b11c008bb5af653a909f28a8d0.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/cmus/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/cmus/cmus-9999.ebuild X-VCS-Directories: media-sound/cmus/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 35234db8289d78b11c008bb5af653a909f28a8d0 X-VCS-Branch: master Date: Wed, 20 Mar 2019 12:29:52 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ae0b369b-37a8-4a93-82f3-8a16567da5f3 X-Archives-Hash: 553e4934ccfff630e7ae7916ba0f9a62 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" -}