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 03739138334 for ; 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 0017CE0900; Mon, 19 Nov 2018 21:53:00 +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 CBFF4E0903 for ; Mon, 19 Nov 2018 21:53:00 +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 9D12F335CB7 for ; Mon, 19 Nov 2018 21:52:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8B2043A for ; Mon, 19 Nov 2018 21:52:56 +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: <1542664361.b6e9568e7b9ab7f19fe69371cec68dd8e6453b01.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/audacious/audacious-9999.ebuild X-VCS-Directories: media-sound/audacious/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b6e9568e7b9ab7f19fe69371cec68dd8e6453b01 X-VCS-Branch: master Date: Mon, 19 Nov 2018 21:52:56 +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-Archives-Salt: b274b715-6e5e-4770-b57a-ef8cc7190fbf X-Archives-Hash: a7d5050a3fde362e1e1102f6e2f9c7e1 commit: b6e9568e7b9ab7f19fe69371cec68dd8e6453b01 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 19 21:31:05 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 19 21:52:41 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e9568e media-sound/audacious: 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 gentoo.org> media-sound/audacious/audacious-9999.ebuild | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild index 47a2fb25528..bbfcac0816d 100644 --- a/media-sound/audacious/audacious-9999.ebuild +++ b/media-sound/audacious/audacious-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,9 +15,7 @@ if [[ ${PV} == *9999 ]]; then inherit autotools git-r3 EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.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 @@ -25,8 +23,8 @@ SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2" LICENSE="BSD-2" SLOT="0" -IUSE="gtk gtk3 nls qt5" -REQUIRED_USE="^^ ( gtk gtk3 qt5 )" +IUSE="gtk nls qt5" +REQUIRED_USE="^^ ( gtk qt5 )" RDEPEND=" >=dev-libs/dbus-glib-0.60 @@ -35,25 +33,18 @@ RDEPEND=" >=x11-libs/pango-1.8.0 virtual/freedesktop-icon-theme gtk? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - )" + ) +" DEPEND="${RDEPEND} virtual/pkgconfig - nls? ( dev-util/intltool )" + nls? ( dev-util/intltool ) +" PDEPEND="~media-plugins/audacious-plugins-${PV}" -src_unpack() { - default - if use gtk3; then - mv "${MY_P}"{-gtk3,} || die - fi - [[ ${PV} == *9999 ]] && git-r3_src_unpack -} - src_prepare() { default [[ ${PV} == *9999 ]] && eautoreconf @@ -68,7 +59,7 @@ src_configure() { econf \ --disable-valgrind \ --enable-dbus \ - $(use_enable $(usex gtk gtk gtk3) gtk) \ + $(use_enable gtk) \ $(use_enable nls) \ $(use_enable qt5 qt) }