From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1058082-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 0DB93138335
for <garchives@archives.gentoo.org>; Mon, 19 Nov 2018 21:53:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 09C7EE0903;
Mon, 19 Nov 2018 21:53:01 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 BE804E0900
for <gentoo-commits@lists.gentoo.org>; Mon, 19 Nov 2018 21:53:00 +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 D5FD6335CC8
for <gentoo-commits@lists.gentoo.org>; Mon, 19 Nov 2018 21:52:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DCB7545D
for <gentoo-commits@lists.gentoo.org>; Mon, 19 Nov 2018 21:52:56 +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: <1542664362.bfa66eeea70d54e3d9d29020335d196f7bc9122d.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
X-VCS-Directories: media-plugins/audacious-plugins/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: bfa66eeea70d54e3d9d29020335d196f7bc9122d
X-VCS-Branch: master
Date: Mon, 19 Nov 2018 21:52:56 +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-Archives-Salt: 1d5c2d0e-8bed-48dd-9518-0c4004c309b6
X-Archives-Hash: c8d23fb381877c6b0ad6a6655796c991
commit: bfa66eeea70d54e3d9d29020335d196f7bc9122d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 19 21:40:30 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 21:52:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa66eee
media-plugins/audacious-plugins: Drop USE gtk3 from live ebuild
- git master has no concept of 'Gtk+3'
- USE gtk3 was permanently broken by src_unpack phase anyway
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../audacious-plugins-9999.ebuild | 31 +++++++---------------
1 file changed, 9 insertions(+), 22 deletions(-)
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index 30c931fcafa..5d63400ef48 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -12,18 +12,16 @@ if [[ ${PV} == *9999 ]]; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
else
- SRC_URI="
- !gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
- gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
+ SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme gtk gtk3 jack lame libav
+IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme gtk jack lame libav
libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
REQUIRED_USE="
- ^^ ( gtk gtk3 qt5 )
+ ^^ ( gtk qt5 )
qt5? ( !aosd !hotkeys )
|| ( alsa jack pulseaudio sdl )
ampache? ( qt5 http )"
@@ -50,7 +48,7 @@ RDEPEND="
dev-libs/dbus-glib
dev-libs/glib
dev-libs/libxml2:2
- ~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?]
+ ~media-sound/audacious-${PV}[gtk?,qt5?]
aac? ( >=media-libs/faad2-2.7 )
alsa? ( >=media-libs/alsa-lib-1.0.16 )
ampache? ( =media-libs/ampache_browser-1* )
@@ -73,7 +71,6 @@ RDEPEND="
fluidsynth? ( media-sound/fluidsynth )
http? ( >=net-libs/neon-0.26.4 )
gtk? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3 )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -103,26 +100,16 @@ RDEPEND="
>=media-libs/libogg-1.1.3
>=media-libs/libvorbis-1.2.0
)
- wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
+ wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+"
DEPEND="${RDEPEND}
dev-util/gdbus-codegen
virtual/pkgconfig
- nls? ( dev-util/intltool )"
+ nls? ( dev-util/intltool )
+"
S="${WORKDIR}/${MY_P}"
-src_unpack() {
- if [[ ${PV} == *9999 ]]; then
- git-r3_src_unpack
- else
- default
- if use gtk3; then
- mv "${MY_P}"{-gtk3,} || die
- fi
- fi
-}
-
src_prepare() {
default
[[ ${PV} == *9999 ]] && eautoreconf
@@ -151,7 +138,7 @@ src_configure() {
$(use_enable flac filewriter) \
$(use_enable fluidsynth amidiplug) \
$(use_enable gme console) \
- $(use_enable $(usex gtk gtk gtk3) gtk) \
+ $(use_enable gtk) \
$(use_enable hotkeys hotkey) \
$(use_enable http neon) \
$(use_enable jack) \