From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 CED6F138350 for ; Sun, 9 Feb 2020 20:11:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D99FE082D; Sun, 9 Feb 2020 20:11:45 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 EC396E082D for ; Sun, 9 Feb 2020 20:11:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 096D434E8F6 for ; Sun, 9 Feb 2020 20:11:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C6312A for ; Sun, 9 Feb 2020 20:11:40 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1581279087.7677b6cfdbdc981a7e2f0c90df1392b4125fdbd8.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-2.8.0.ebuild media-sound/cmus/cmus-9999.ebuild media-sound/cmus/metadata.xml X-VCS-Directories: media-sound/cmus/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7677b6cfdbdc981a7e2f0c90df1392b4125fdbd8 X-VCS-Branch: master Date: Sun, 9 Feb 2020 20:11:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9f48c530-de39-486a-9bbb-e25ae01b7ae4 X-Archives-Hash: 5e4c84ec5f3778ec67a429106111b5c4 commit: 7677b6cfdbdc981a7e2f0c90df1392b4125fdbd8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 20:08:05 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 20:11:27 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7677b6cf media-sound/cmus: Drop USE cue Closes: https://bugs.gentoo.org/700122 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> media-sound/cmus/cmus-2.8.0.ebuild | 34 ++++++++++++++++++++-------------- media-sound/cmus/cmus-9999.ebuild | 34 ++++++++++++++++++++-------------- media-sound/cmus/metadata.xml | 1 - 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild index 83c05f7dc5e..e4cfd45303e 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 6ae109af57a..283dda19519 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 f19bd0670b1..671a05ce3c8 100644 --- a/media-sound/cmus/metadata.xml +++ b/media-sound/cmus/metadata.xml @@ -7,7 +7,6 @@ Use libcdio for CD support - Enable CUE sheet parsing Enable reading the ID of the inserted CD Enable MPRIS support via sys-auth/elogind Install support script for net-im/pidgin