public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/files/, media-plugins/audacious-plugins/
@ 2017-05-13  9:41 Jeroen Roovers
  0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2017-05-13  9:41 UTC (permalink / raw
  To: gentoo-commits

commit:     da167f397f3ac47fd95d7149d1024c4aa43dbe8a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 09:34:05 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat May 13 09:41:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da167f39

media-plugins/audacious-plugins: Old.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-plugins/audacious-plugins/Manifest           |  11 +-
 .../audacious-plugins-2.5.4.ebuild                 | 122 ---------------------
 .../audacious-plugins-3.1.1.ebuild                 | 113 -------------------
 .../audacious-plugins/audacious-plugins-3.1.ebuild | 114 -------------------
 .../audacious-plugins-3.2.2-r1.ebuild              | 116 --------------------
 .../audacious-plugins-3.2.3.ebuild                 | 102 -----------------
 .../audacious-plugins-3.2.4.ebuild                 | 102 -----------------
 .../audacious-plugins-3.3.3.ebuild                 | 114 -------------------
 .../audacious-plugins-3.3.4.ebuild                 | 113 -------------------
 .../audacious-plugins-3.5.1.ebuild                 | 120 --------------------
 ...ous-plugins-2.x-fix-skins-build-glib-2.32.patch |  13 ---
 ...audacious-plugins-3.2.2-fix-build-gmodule.patch |  31 ------
 .../audacious-plugins-3.2.2-fix-build-sdl.patch    |  19 ----
 .../files/audacious-plugins-3.3.3-libcdio.patch    | 111 -------------------
 .../files/audacious-plugins_ldflags.patch          |  11 --
 15 files changed, 1 insertion(+), 1211 deletions(-)

diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index a1173460ed3..c25d94e065d 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,14 +1,5 @@
-DIST audacious-plugins-2.5.4.tar.gz 3500309 SHA256 149fd27f476670d8ab3b8e9beaad9ab9de5955c8cbec70bf27e26446168148d8 SHA512 43eedbb4d599cc0437f5870cf0501222e107667a76873aa26786086b0ca29a5fb074f7715e7aeff504560e033dd482b98d9d771964d981afcd3b29a46f410bcc WHIRLPOOL e131fb818e90eaa7e98b06b903d6192d4b0fcac4f6af771ea75ce4323033d56ced9fd1b05f7534e390162378c7de8dd384ac9946e0df3cb99cf8cd00d170252c
-DIST audacious-plugins-3.1.1.tar.bz2 2167856 SHA256 dd85e982a49a2794041a391aba3d12a12505338b2c9623b60f16842ae89215ad SHA512 f6c89a38385d9fed72e18e54cac5a4a5a126802b5dc0e71a868b92aec2d37b484b9c95e983aade2bdf3d8cf38af8f79aa2f67bc75ef292a3c8448f6029ea91fb WHIRLPOOL 79067763e94cd14191c6636e45ce2ca5778b5e28a6683d4fa69ffbe9c084e5830a3a56c9afeaf7f29b2df70db8582d7ab3fe9bcead8bbf0b910cd431dff35e53
-DIST audacious-plugins-3.1.tar.bz2 2156993 SHA256 2d1e9b229b83e4ab2a2065e7116d0d36e774d73146d2cb63162ca880770d7ca8 SHA512 b8aa443d407dab8c5f55c9593e0306d2b2498018dd7787ab32275490d9b2cd76ee0e8c906a98fdf2ae70040f73399718c1eff9a6f8447b7327938a35b5de42d5 WHIRLPOOL 1a3c2efd8e2518011eceffd4104fbd2dcc9c9ac3038493a8a1d6e4ec8d7376311423319f8648f524be13b0332ed305a91c5810243e69ca7a3f816f65cead2911
-DIST audacious-plugins-3.2.2.tar.bz2 1898457 SHA256 c637e6770ed41ec0e885f210944234326090d9cecf0547e2545fff09bc25b7fc SHA512 22f7af18ce7e128a73c21942a73ea3ed6b9f022efec64c091dfa38abd6bba02f9260db93645f83e3d54c32b3c24573f2417fb24c51f1a00a4e9759f9198e96b5 WHIRLPOOL 2e840350767852cc9b8899a76fc18d892382639add7bce127212f1386675c29ef3e135e2fd3f9564c3f2431568aa7df6dc6c1e43cec3ee9491468674c85a3ad1
-DIST audacious-plugins-3.2.3.tar.bz2 1921236 SHA256 bba70fbbb4fa7d1f40de4d96265069b6faf23233cbf544cb2882f7c709c9d2da SHA512 d4a78bab856450213dbb35d4c899134360ff20b907fea81a532c9b1176f348e191be64ca1f51b575d76b9f6df44c124259e3a92f00f4eebe723f51b0e14b0698 WHIRLPOOL 73f8ba2cb7e6ffb15253d7bf25e545e4f8be71b18652ef2a18569ece526514e01750b2b21204a48ceb5114990ea3ad4b1bcb8860a74a4835bc0b4141449111f5
-DIST audacious-plugins-3.2.4.tar.bz2 1921658 SHA256 0f03556de593d85d4aba0895c4586643026d15f5c1243e7353a4636e84b31882 SHA512 3eb887559983b35c33c5f91550262fb7473c6c968f152c8605332fcd62674ddbb6250c2eb952b73f99aaefbcedc47fc74d1c2bf5116f9bd919faf76ffa483085 WHIRLPOOL 9b8ed381a3eab08dc83ba3507f74d35a5ef7a769c6ec1968b88bbcaa866b196fd6997e79fd51eab54055d99f8166c374f099f8e17393a2bce63745672b4b58e5
-DIST audacious-plugins-3.3.3.tar.bz2 1740185 SHA256 3906a70090edb09b94504fa37c823635b752b408e129fc0156286d409d350f8f SHA512 0f9d07f3290dd25efd4360f064abce4ddfa21aa84d42b1eefb3308715fb7013b1db4958e620b1cd293a5487973b4e7d0e7313922a576c182cde458dbaaad0a00 WHIRLPOOL 3730c16f21c7cc4dd2f51a4c51033d6733f434b75a7076c081970feb8863a4f701aa98a19289e169a142717d557c9d217fc559cc71d033e25eb1987000187ae0
-DIST audacious-plugins-3.3.4.tar.bz2 1756149 SHA256 b66dd84ab092d9fb64182599706ed60a3c382c904a77e23285e1e271f007afd0 SHA512 4e3ba9adc4f44c3f02934a98d5c3225ae560e062b1e1f93e478770c8ea7f6e741a9cf83ae2ec34a05ac4c40dd08d0cf732e41029fa88bc37014bb8bbe1c1a681 WHIRLPOOL a96db513d671f656a5c8747cf1e8c300a6043e4decf3b3b939e07ec7b49b583289793da2d7ac9b52f4ceedae14ed3fa3d076831ec0fd38300f28b7c99663e605
 DIST audacious-plugins-3.4.1.tar.bz2 1765085 SHA256 ad86b31a69bd3305aa4e65bb9daea7429b51674b6ecd9b7ead36816074cf3b0a SHA512 7919a87a7aac9cfa0820a96e2eb937c70ee4d7f1091cdb3c1097b9849551cadea820e5e51877092590a8d49534be83fbc5b3147c3a2a482d4d47a2d3fd079dd6 WHIRLPOOL 5e46099b7970d64042e0bdf928c5bd658b0c065e4ea06b53f7d67db0332b554a0417b1efaad73e66df7816596e2c1735d22c06025e56634efe215fd27a94c301
-DIST audacious-plugins-3.5.1.tar.bz2 1714137 SHA256 e6da3346df520f3c6cee3c3706eb09290840ea12dfff28d6bec32e5842dc9e26 SHA512 6359edd6c89220f110dc20cf52418b741cfbbce4618f6ba4e4c97d6656216575aba1dfa8e7de4f11a24a28a27cc008e2f7e551759185972a17748f7e043b8823 WHIRLPOOL e4885108904f0badf81411040e1a5098190ab4dd4b53b14ddb5c39148dc01f982a95d1143ff2d8dd9e9cfbad75fa40654791dcf2a7e21d95e80c3ec0d484d218
 DIST audacious-plugins-3.6.2-gtk3.tar.bz2 1788886 SHA256 943d94c1ea09817caba627b6abbf0de301c3cd19f2c8c0afae1ebc4dbe31fc95 SHA512 1745c48ec5a71ed92d938fc56d0ae06fbbd43b2ef62652dd06178a3c739e2f8c701ee55249db135ee8afca663151482bb9a2b8c83f1d5bbfcd0408b0594d5847 WHIRLPOOL 2ff212a964c959d1acaf4c9d35e3ce0e3ef7261054ccef3f8174e6188d1bfb9215b780bd17df9e4c6848d4e3fd2e29d8847d3cf37e4203430a87b9fd439080a3
 DIST audacious-plugins-3.6.2.tar.bz2 1786338 SHA256 e7798936249e1601177503d148a3dd59edd289579f3f1667351eb0ba463642e8 SHA512 d0715bdc819b115e55daafc6715a770a9e2d8d61d19b9a9485195774e8ace672144dc7852f71bd0b796d26bfcb82766252f65d58a2a061e7a0228a1dda3148c5 WHIRLPOOL 055be62da6c7f8ddacf2c3ef18194ba09bf63dc3699919f6e5068740c0fc6db2b370da999ffe8724e62c60363928ae87ca86d526458fa93b9a3cce37799b12af
 DIST audacious-plugins-3.7.1-gtk3.tar.bz2 1838067 SHA256 75469b52694fcfce237a937c6c64c0d355aefa6a7b6c2504ab447d901afc073f SHA512 77b0e3c167d430ed97dfb2bd344d856de9a384a4667f7759ad59f47706de12d7b5b849455c381c27a58f82d3b423d08e922ac81f5e1bb0dd763b9a09bc3e53c6 WHIRLPOOL fbbc8e4a512b681ff2a87ea7c971b3496ff007dab5fdb534457e5608724ba43fc71642384a417190ded19d900b6e1dc20c1369f59882d91791bbcc637402c4a3
-DIST audacious-plugins-3.7.1.tar.bz2 1838045 SHA256 228a384f26afb000099166776d3454539956aa00fde90dcb4612ce8910ed4116 SHA512 2d22131babba572af235ec5f27135061a1602be55a2f709e327b7cd4052f7c11bc31398d01574a6f07197daa6b79cb42d5fa7b26f75764680420a46aede5cd9a WHIRLPOOL 026c355c6323aa6b56b09c119d9320ec5a7306f11b90504631f8a25c05b4f9bd1641ff223e0122a7b5be48f341a3820b759d1829ca60274285cfe19897c9edae
\ No newline at end of file
+DIST audacious-plugins-3.7.1.tar.bz2 1838045 SHA256 228a384f26afb000099166776d3454539956aa00fde90dcb4612ce8910ed4116 SHA512 2d22131babba572af235ec5f27135061a1602be55a2f709e327b7cd4052f7c11bc31398d01574a6f07197daa6b79cb42d5fa7b26f75764680420a46aede5cd9a WHIRLPOOL 026c355c6323aa6b56b09c119d9320ec5a7306f11b90504631f8a25c05b4f9bd1641ff223e0122a7b5be48f341a3820b759d1829ca60274285cfe19897c9edae

diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.5.4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.5.4.ebuild
deleted file mode 100644
index 0c1b5c2cbb8..00000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-2.5.4.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame libnotify libsamplerate lirc midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile cpu_flags_x86_sse2 vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	~media-sound/audacious-2.5.4
-	>=net-libs/neon-0.26.4
-	>=x11-libs/gtk+-2.14:2
-	aac? ( >=media-libs/faad2-2.7 )
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( virtual/ffmpeg )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
-	lirc? ( app-misc/lirc )
-	mms? ( >=media-libs/libmms-0.3 )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? (  >=media-libs/libsdl-1.2.5 )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	virtual/pkgconfig"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.x-fix-skins-build-glib-2.32.patch
-}
-
-src_configure() {
-	mp3_warning
-
-	econf \
-		--enable-chardet \
-		--enable-modplug \
-		--enable-neon \
-		--disable-projectm-1.0 \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa bluetooth) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable aqua coreaudio) \
-		$(use_enable aqua dockalbumart) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable lirc) \
-		$(use_enable mms) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sdl paranormal) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack)
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild
deleted file mode 100644
index 2f6544097d7..00000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sid sndfile vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	media-libs/libmodplug
-	~media-sound/audacious-3.1.1
-	>=net-libs/neon-0.26.4
-	x11-libs/gtk+:3
-	aac? ( >=media-libs/faad2-2.7 )
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
-	mms? ( >=media-libs/libmms-0.3 )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	virtual/pkgconfig"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_configure() {
-	mp3_warning
-	# Turn "-z defs" into "-Wl,-z,defs" because some versions of gcc don't like
-	# it (bug 395213)
-	epatch "${FILESDIR}/audacious-plugins_ldflags.patch"
-	econf \
-		--enable-modplug \
-		--enable-neon \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable aqua coreaudio) \
-		$(use_enable aqua dockalbumart) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable mms) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack)
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild
deleted file mode 100644
index 3be044b7fda..00000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sid sndfile vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	media-libs/libmodplug
-	~media-sound/audacious-3.1
-	>=net-libs/neon-0.26.4
-	x11-libs/gtk+:3
-	aac? ( >=media-libs/faad2-2.7 )
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
-	mms? ( >=media-libs/libmms-0.3 )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	virtual/pkgconfig"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_configure() {
-	mp3_warning
-	# Turn "-z defs" into "-Wl,-z,defs" because some versions of gcc don't like
-	# it (bug 395213)
-	epatch "${FILESDIR}/audacious-plugins_ldflags.patch"
-
-	econf \
-		--enable-modplug \
-		--enable-neon \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable aqua coreaudio) \
-		$(use_enable aqua dockalbumart) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable mms) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack)
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild
deleted file mode 100644
index 37a6f5275c6..00000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools flag-o-matic
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome +gtk gtk3 ipv6 jack
-lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	media-libs/libmodplug
-	~media-sound/audacious-3.2.2
-	>=net-libs/neon-0.26.4
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	aac? ( >=media-libs/faad2-2.7 )
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
-	mms? ( >=media-libs/libmms-0.3 )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl[sound] )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	virtual/pkgconfig"
-
-REQUIRED_USE="^^ ( gtk gtk3 )"
-
-DOCS="AUTHORS"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_prepare() {
-	epatch "$FILESDIR"/${P}-fix-build-gmodule.patch
-	epatch "$FILESDIR"/${P}-fix-build-sdl.patch
-	eaclocal -I m4
-	eautoheader
-	eautoconf
-}
-
-src_configure() {
-	mp3_warning
-
-	econf \
-		--enable-modplug \
-		--enable-neon \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable gtk3) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable mms) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sdl sdlout) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack)
-}

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild
deleted file mode 100644
index 6d30c1db873..00000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	media-libs/libmodplug
-	~media-sound/audacious-3.2.3
-	>=net-libs/neon-0.26.4
-	x11-libs/gtk+:2
-	aac? ( >=media-libs/faad2-2.7 )
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
-	mms? ( >=media-libs/libmms-0.3 )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl[sound] )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	virtual/pkgconfig"
-
-DOCS="AUTHORS"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_configure() {
-	mp3_warning
-
-	econf \
-		--enable-modplug \
-		--enable-neon \
-		--disable-gtk3 \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable mms) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sdl sdlout) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable vorbis) \
-		$(use_enable wavpack)
-}

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.2.4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.2.4.ebuild
deleted file mode 100644
index f9b9c0aaf2d..00000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.2.4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	media-libs/libmodplug
-	~media-sound/audacious-3.2.4
-	>=net-libs/neon-0.26.4
-	x11-libs/gtk+:2
-	aac? ( >=media-libs/faad2-2.7 )
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
-	mms? ( >=media-libs/libmms-0.3 )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl[sound] )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	virtual/pkgconfig"
-
-DOCS="AUTHORS"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_configure() {
-	mp3_warning
-
-	econf \
-		--enable-modplug \
-		--enable-neon \
-		--disable-gtk3 \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable mms) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sdl sdlout) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable vorbis) \
-		$(use_enable wavpack)
-}

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.3.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.3.3.ebuild
deleted file mode 100644
index 6c5e0fb5f76..00000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.3.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame libnotify libsamplerate lirc midi mms mp3 nls pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	media-libs/libmodplug
-	~media-sound/audacious-3.3.3
-	>=net-libs/neon-0.26.4
-	x11-libs/gtk+:3
-	( || ( >=dev-libs/glib-2.32.2 dev-util/gdbus-codegen ) )
-	aac? ( >=media-libs/faad2-2.7 )
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		dev-libs/libcdio-paranoia )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
-	lirc? ( app-misc/lirc )
-	mms? ( >=media-libs/libmms-0.3 )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl[sound] )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	virtual/pkgconfig"
-
-DOCS="AUTHORS"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_prepare() {
-	has_version "<dev-libs/glib-2.32" && \
-		cd "${S}"/src/mpris2 && \
-		gdbus-codegen --interface-prefix org.mpris. \
-			--c-namespace Mpris --generate-c-code object-core mpris2.xml && \
-		gdbus-codegen --interface-prefix org.mpris. \
-			--c-namespace Mpris \
-			--generate-c-code object-player mpris2-player.xml && \
-		cd "${S}"
-		epatch "${FILESDIR}"/${P}-libcdio.patch
-}
-
-src_configure() {
-	mp3_warning
-
-	econf \
-		--enable-modplug \
-		--enable-neon \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable lirc) \
-		$(use_enable mms) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable nls) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sdl sdlout) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable vorbis) \
-		$(use_enable wavpack)
-}

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.3.4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.3.4.ebuild
deleted file mode 100644
index 2f1d58308b1..00000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.3.4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame libnotify libsamplerate lirc midi mms mp3 nls pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	media-libs/libmodplug
-	~media-sound/audacious-3.3.4
-	>=net-libs/neon-0.26.4
-	x11-libs/gtk+:3
-	( || ( >=dev-libs/glib-2.32.2 dev-util/gdbus-codegen ) )
-	aac? ( >=media-libs/faad2-2.7 )
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		dev-libs/libcdio-paranoia )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
-	lirc? ( app-misc/lirc )
-	mms? ( >=media-libs/libmms-0.3 )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl[sound] )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	virtual/pkgconfig"
-
-DOCS="AUTHORS"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_prepare() {
-	has_version "<dev-libs/glib-2.32" && \
-		cd "${S}"/src/mpris2 && \
-		gdbus-codegen --interface-prefix org.mpris. \
-			--c-namespace Mpris --generate-c-code object-core mpris2.xml && \
-		gdbus-codegen --interface-prefix org.mpris. \
-			--c-namespace Mpris \
-			--generate-c-code object-player mpris2-player.xml && \
-		cd "${S}"
-}
-
-src_configure() {
-	mp3_warning
-
-	econf \
-		--enable-modplug \
-		--enable-neon \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable lirc) \
-		$(use_enable mms) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable nls) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sdl sdlout) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable vorbis) \
-		$(use_enable wavpack)
-}

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.5.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.5.1.ebuild
deleted file mode 100644
index 94c973d63b3..00000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.5.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome jack
-lame libnotify libsamplerate lirc midi mms mp3 nls pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	media-libs/libmodplug
-	~media-sound/audacious-3.5.1
-	>=net-libs/neon-0.26.4
-	x11-libs/gtk+:3
-	( || ( >=dev-libs/glib-2.32.2[utils] dev-util/gdbus-codegen ) )
-	aac? ( >=media-libs/faad2-2.7 )
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		dev-libs/libcdio-paranoia )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
-	lirc? ( app-misc/lirc )
-	mms? ( >=media-libs/libmms-0.3 )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl[sound] )
-	sid? ( >=media-libs/libsidplayfp-1.0.0 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	virtual/pkgconfig"
-
-DOCS="AUTHORS"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_prepare() {
-	has_version "<dev-libs/glib-2.32" && \
-		cd "${S}"/src/mpris2 && \
-		gdbus-codegen --interface-prefix org.mpris. \
-			--c-namespace Mpris --generate-c-code object-core mpris2.xml && \
-		gdbus-codegen --interface-prefix org.mpris. \
-			--c-namespace Mpris \
-			--generate-c-code object-player mpris2-player.xml && \
-		cd "${S}"
-}
-
-src_configure() {
-	mp3_warning
-
-	if use ffmpeg && has_version media-video/ffmpeg ; then
-		ffmpeg="--with-ffmpeg=ffmpeg"
-	elif use ffmpeg && has_version media-video/libav ; then
-		ffmpeg="--with-ffmpeg=libav"
-	else
-		ffmpeg="--with-ffmpeg=none"
-	fi
-
-	econf \
-		${ffmpeg} \
-		--enable-modplug \
-		--disable-soxr \
-		--enable-neon \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable lirc) \
-		$(use_enable mms) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable nls) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler scrobbler2) \
-		$(use_enable sdl sdlout) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable vorbis) \
-		$(use_enable wavpack)
-}

diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-2.x-fix-skins-build-glib-2.32.patch b/media-plugins/audacious-plugins/files/audacious-plugins-2.x-fix-skins-build-glib-2.32.patch
deleted file mode 100644
index f5fb42cf53d..00000000000
--- a/media-plugins/audacious-plugins/files/audacious-plugins-2.x-fix-skins-build-glib-2.32.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/skins/ui_skinned_window.c b/src/skins/ui_skinned_window.c
-index 9b178a2..b90e943 100644
---- a/src/skins/ui_skinned_window.c
-+++ b/src/skins/ui_skinned_window.c
-@@ -20,7 +20,7 @@
- 
- #include <gtk/gtkmain.h>
- #include <glib-object.h>
--#include <glib/gmacros.h>
-+#include <glib.h>
- #include <gtk/gtkmarshal.h>
- #include <gtk/gtkwindow.h>
- #include <string.h>

diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.2.2-fix-build-gmodule.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.2.2-fix-build-gmodule.patch
deleted file mode 100644
index 2f06396e8d1..00000000000
--- a/media-plugins/audacious-plugins/files/audacious-plugins-3.2.2-fix-build-gmodule.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit a29df1ab4ba9f3964ca475c0c727136357ddfb86
-Author: John Lindgren <john.lindgren@aol.com>
-Date:   Mon Apr 2 02:10:32 2012 -0400
-
-    Make check for GMODULE_{CFLAGS,LIBS} unconditional; LADSPA plugin needs it also.
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 6f6f293..5acb6b7 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -194,6 +194,7 @@ AC_PATH_PROG([WINDRES], [windres])
- dnl Check for Gtk+/GLib and pals
- dnl ============================
- AUD_CHECK_MODULE([GLIB], [glib-2.0], [>= 2.16], [Glib2])
-+AUD_CHECK_MODULE([GMODULE], [gmodule-2.0], [>= 2.16], [GModule])
- AUD_CHECK_MODULE([GTHREAD], [gthread-2.0], [>= 2.16], [GThread])
- AUD_CHECK_MODULE([PANGO], [pango], [>= 1.20], [Pango])
- AUD_CHECK_MODULE([CAIRO], [cairo], [>= 1.6], [Cairo])
-diff --git a/configure.ac b/configure.ac
-index d976576..358f841 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -757,8 +757,6 @@ fi
- 
- if test "x$enable_amidiplug" = "xyes"; then
-   INPUT_PLUGINS="$INPUT_PLUGINS amidi-plug"
--  PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0],,)
--  PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.6.0],,)
-   AMIDIPLUG_BACKEND_DIR=amidi-plug
-   AC_SUBST(AMIDIPLUG_BACKEND_DIR)
-   if test "x$enable_amidiplug_alsa" = "xauto" -o "x$enable_amidiplug_alsa" = "xyes"; then

diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.2.2-fix-build-sdl.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.2.2-fix-build-sdl.patch
deleted file mode 100644
index 8f6fda0ba1b..00000000000
--- a/media-plugins/audacious-plugins/files/audacious-plugins-3.2.2-fix-build-sdl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit b6df18997dabe37f4357d977d2dfae07899be5e7
-Author: Michał Lipski <tallica@o2.pl>
-Date:   Mon May 7 12:48:23 2012 +0200
-
-    Use pkg-config for libsdl detection. (Gentoo #414999)
-
-diff --git a/configure.ac b/configure.ac
-index 358f841..cbba0ce 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -693,7 +693,7 @@ AC_ARG_ENABLE(sdlout,
-  [enable_sdlout=$enableval], [enable_sdlout=yes])
- 
- if test $enable_sdlout = yes ; then
--    AM_PATH_SDL(1.2.5, [enable_sdlout=yes], [enable_sdlout=no])
-+    PKG_CHECK_MODULES([SDL], [sdl >= 1.2.11], [enable_sdlout=yes], [enable_sdlout=no])
- fi
- 
- if test $enable_sdlout = yes ; then

diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.3.3-libcdio.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.3.3-libcdio.patch
deleted file mode 100644
index e0943e6471f..00000000000
--- a/media-plugins/audacious-plugins/files/audacious-plugins-3.3.3-libcdio.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff --git a/src/cdaudio-ng/cdaudio-ng.c b/src/cdaudio-ng/cdaudio-ng.c
-index 925b847..e986839 100644
---- a/src/cdaudio-ng/cdaudio-ng.c
-+++ b/src/cdaudio-ng/cdaudio-ng.c
-@@ -26,11 +26,16 @@
- #include <cdio/cdio.h>
- #include <cdio/cdtext.h>
- #include <cdio/track.h>
--#include <cdio/cdda.h>
- #include <cdio/audio.h>
- #include <cdio/sector.h>
- #include <cdio/cd_types.h>
-
-+#if LIBCDIO_VERSION_NUM >= 90
-+#include <cdio/paranoia/cdda.h>
-+#else
-+#include <cdio/cdda.h>
-+#endif
-+
- /* libcdio's header files #define these */
- #undef PACKAGE
- #undef PACKAGE_BUGREPORT
-@@ -269,9 +274,9 @@ static void cdaudio_set_strinfo (trackinfo_t * t,
-                                  const char * performer, const char * name,
-                                  const char * genre)
- {
--    g_strlcpy (t->performer, performer, DEF_STRING_LEN);
--    g_strlcpy (t->name, name, DEF_STRING_LEN);
--    g_strlcpy (t->genre, genre, DEF_STRING_LEN);
-+    g_strlcpy (t->performer, performer ? performer : "", DEF_STRING_LEN);
-+    g_strlcpy (t->name, name ? name : "", DEF_STRING_LEN);
-+    g_strlcpy (t->genre, genre ? genre : "", DEF_STRING_LEN);
- }
-
- /* thread safe (mutex may be locked) */
-@@ -622,23 +627,32 @@ static void scan_cd (void)
-     }
-
-     /* get trackinfo[0] cdtext information (the disc) */
-+    cdtext_t *pcdtext = NULL;
-     if (aud_get_bool ("CDDA", "use_cdtext"))
-     {
-         AUDDBG ("getting cd-text information for disc\n");
--        cdtext_t *pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, 0);
-+#if LIBCDIO_VERSION_NUM >= 90
-+        pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio);
-+        if (pcdtext == NULL)
-+#else
-+        pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, 0);
-         if (pcdtext == NULL || pcdtext->field[CDTEXT_TITLE] == NULL)
-+#endif
-         {
-             AUDDBG ("no cd-text available for disc\n");
-         }
-         else
-         {
-             cdaudio_set_strinfo (&trackinfo[0],
--                                 pcdtext->field[CDTEXT_PERFORMER] ? pcdtext->
--                                 field[CDTEXT_PERFORMER] : "",
--                                 pcdtext->field[CDTEXT_TITLE] ? pcdtext->
--                                 field[CDTEXT_TITLE] : "",
--                                 pcdtext->field[CDTEXT_GENRE] ? pcdtext->
--                                 field[CDTEXT_GENRE] : "");
-+#if LIBCDIO_VERSION_NUM >= 90
-+                                 cdtext_get(pcdtext, CDTEXT_FIELD_PERFORMER, 0),
-+                                 cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, 0),
-+                                 cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, 0));
-+#else
-+                                 pcdtext->field[CDTEXT_PERFORMER],
-+                                 pcdtext->field[CDTEXT_TITLE],
-+                                 pcdtext->field[CDTEXT_GENRE]);
-+#endif
-         }
-     }
-
-@@ -646,7 +660,7 @@ static void scan_cd (void)
-     bool_t cdtext_was_available = FALSE;
-     for (trackno = firsttrackno; trackno <= lasttrackno; trackno++)
-     {
--        cdtext_t *pcdtext = NULL;
-+#if LIBCDIO_VERSION_NUM < 90
-         if (aud_get_bool ("CDDA", "use_cdtext"))
-         {
-             AUDDBG ("getting cd-text information for track %d\n", trackno);
-@@ -657,16 +671,20 @@ static void scan_cd (void)
-                 pcdtext = NULL;
-             }
-         }
-+#endif
-
-         if (pcdtext != NULL)
-         {
-             cdaudio_set_strinfo (&trackinfo[trackno],
--                                 pcdtext->field[CDTEXT_PERFORMER] ? pcdtext->
--                                 field[CDTEXT_PERFORMER] : "",
--                                 pcdtext->field[CDTEXT_TITLE] ? pcdtext->
--                                 field[CDTEXT_TITLE] : "",
--                                 pcdtext->field[CDTEXT_GENRE] ? pcdtext->
--                                 field[CDTEXT_GENRE] : "");
-+#if LIBCDIO_VERSION_NUM >= 90
-+                                 cdtext_get(pcdtext, CDTEXT_FIELD_PERFORMER, trackno),
-+                                 cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, trackno),
-+                                 cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, trackno));
-+#else
-+                                 pcdtext->field[CDTEXT_PERFORMER],
-+                                 pcdtext->field[CDTEXT_TITLE],
-+                                 pcdtext->field[CDTEXT_GENRE]);
-+#endif
-             cdtext_was_available = TRUE;
-         }
-         else

diff --git a/media-plugins/audacious-plugins/files/audacious-plugins_ldflags.patch b/media-plugins/audacious-plugins/files/audacious-plugins_ldflags.patch
deleted file mode 100644
index 359964ecd94..00000000000
--- a/media-plugins/audacious-plugins/files/audacious-plugins_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old	2012-01-17 13:00:17.000000000 +0000
-+++ configure	2012-01-17 13:00:33.000000000 +0000
-@@ -5223,7 +5223,7 @@
-     *linux*)
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
--        LDFLAGS="$LDFLAGS -z defs"
-+        LDFLAGS="$LDFLAGS -Wl,-z,defs"
-         ;;
-     *)
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/files/, media-plugins/audacious-plugins/
@ 2017-05-23 20:47 Richard Farina
  0 siblings, 0 replies; 4+ messages in thread
From: Richard Farina @ 2017-05-23 20:47 UTC (permalink / raw
  To: gentoo-commits

commit:     051191a269cbf08c9ccd62dfc85ea10ff2d7effd
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 20:46:02 2017 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue May 23 20:46:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051191a2

media-plugins/audacious-plugins: bug fix for #596444 and possibly others

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../audacious-plugins-3.7.1-r1.ebuild              |  1 +
 .../audacious-plugins-3.7.1.ebuild                 |  1 +
 .../files/audacious-plugins-3.7.1-gl-jack.patch    | 24 ++++++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.7.1-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.7.1-r1.ebuild
index 03a50543242..8ceb937a5ea 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.7.1-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.7.1-r1.ebuild
@@ -110,6 +110,7 @@ src_prepare() {
 			--c-namespace Mpris \
 			--generate-c-code object-player mpris2-player.xml && \
 		cd "${S}"
+	epatch "${FILESDIR}/${P}-gl-jack.patch"
 }
 
 src_configure() {

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
index 8ea80cdd5fc..9a2b821003b 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
@@ -89,6 +89,7 @@ src_prepare() {
 			--c-namespace Mpris \
 			--generate-c-code object-player mpris2-player.xml && \
 		cd "${S}"
+	epatch "${FILESDIR}/${P}-gl-jack.patch"
 }
 
 src_configure() {

diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.7.1-gl-jack.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.7.1-gl-jack.patch
new file mode 100644
index 00000000000..d91eeac7138
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/audacious-plugins-3.7.1-gl-jack.patch
@@ -0,0 +1,24 @@
+diff -Naur audacious-plugins-3.7.1-orig/work/audacious-plugins-3.7.1/src/gl-spectrum-qt/gl-spectrum.cc audacious-plugins-3.7.1/work/audacious-plugins-3.7.1/src/gl-spectrum-qt/gl-spectrum.cc
+--- audacious-plugins-3.7.1-orig/work/audacious-plugins-3.7.1/src/gl-spectrum-qt/gl-spectrum.cc	2015-12-28 18:29:53.000000000 -0800
++++ audacious-plugins-3.7.1/work/audacious-plugins-3.7.1/src/gl-spectrum-qt/gl-spectrum.cc	2017-04-20 23:26:57.972574128 -0700
+@@ -32,6 +32,9 @@
+ #include <QGLWidget>
+ #include <QGLFunctions>
+ 
++#include <GL/glu.h>
++#include <GL/glut.h>
++
+ #define NUM_BANDS 32
+ #define DB_RANGE 40
+ 
+diff -Naur audacious-plugins-3.7.1-orig/work/audacious-plugins-3.7.1/src/jack-ng/jack-ng.cc audacious-plugins-3.7.1/work/audacious-plugins-3.7.1/src/jack-ng/jack-ng.cc
+--- audacious-plugins-3.7.1-orig/work/audacious-plugins-3.7.1/src/jack-ng/jack-ng.cc	2015-12-28 18:29:53.000000000 -0800
++++ audacious-plugins-3.7.1/work/audacious-plugins-3.7.1/src/jack-ng/jack-ng.cc	2017-04-20 23:28:06.535357794 -0700
+@@ -28,6 +28,7 @@
+ #include <libaudcore/runtime.h>
+ 
+ #include <algorithm>
++#include <iterator>
+ 
+ #include <assert.h>
+ #include <pthread.h>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/files/, media-plugins/audacious-plugins/
@ 2018-04-16 14:23 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-04-16 14:23 UTC (permalink / raw
  To: gentoo-commits

commit:     6ad3911d4fc3e2cade7aad9a4e6495d03c2898ae
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 14:22:51 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 14:23:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ad3911d

media-plugins/audacious-plugins: Fix build with Qt 5.10

Reported-by: josef.95 <josef.95 <AT> freenet.de>
Closes: https://bugs.gentoo.org/643190
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../audacious-plugins-3.9-r1.ebuild                |  2 ++
 .../files/audacious-plugins-3.9-qt-5.10.patch      | 26 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
index adef73f950d..21da7bb77a8 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
@@ -111,6 +111,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.10.patch" )
+
 src_unpack() {
 	if [[ ${PV} == *9999 ]]; then
 		git-r3_src_unpack

diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch
new file mode 100644
index 00000000000..64122bf9198
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch
@@ -0,0 +1,26 @@
+From 971f7ff7c3d8a0b9b420bf4fd19ab97755607637 Mon Sep 17 00:00:00 2001
+From: ilovezfs <ilovezfs@icloud.com>
+Date: Mon, 11 Dec 2017 00:17:26 -0800
+Subject: [PATCH] qtui: fix build with Qt 5.10
+
+Fixes "info_bar.cc:258:21: error: no viable overloaded '='"
+---
+ src/qtui/info_bar.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/qtui/info_bar.cc b/src/qtui/info_bar.cc
+index 2789f93c5..eb29ef78e 100644
+--- a/src/qtui/info_bar.cc
++++ b/src/qtui/info_bar.cc
+@@ -257,8 +257,8 @@ void InfoBar::paintEvent (QPaintEvent *)
+         if (d.title.text ().isNull () && ! d.orig_title.isNull ())
+         {
+             QFontMetrics metrics = p.fontMetrics ();
+-            d.title = metrics.elidedText (d.orig_title, Qt::ElideRight,
+-             width () - ps.VisWidth - ps.Height - ps.Spacing);
++            d.title = QStaticText(metrics.elidedText (d.orig_title, Qt::ElideRight,
++             width () - ps.VisWidth - ps.Height - ps.Spacing));
+         }
+ 
+         p.setPen (QColor (255, 255, 255));
+


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/files/, media-plugins/audacious-plugins/
@ 2021-01-23 14:14 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-01-23 14:14 UTC (permalink / raw
  To: gentoo-commits

commit:     f83775b6765d1850a193db5222b57cd244b5a4c3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 14:12:53 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 14:13:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f83775b6

media-plugins/audacious-plugins: Move from freedb.org to gnudb.gnudb.org

Upstream commit 33edaf1a021bc466aea7c6b0bfdd624b951a15ab

See also: https://redmine.audacious-media-player.org/issues/994

Bug: https://bugs.gentoo.org/766315
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...3.ebuild => audacious-plugins-3.10.1-r4.ebuild} |  4 ++-
 ...dacious-plugins-3.10.1-cddb-use-gnudb.org.patch | 30 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r4.ebuild
similarity index 97%
rename from media-plugins/audacious-plugins/audacious-plugins-3.10.1-r3.ebuild
rename to media-plugins/audacious-plugins/audacious-plugins-3.10.1-r4.ebuild
index 90d1e42911e..5c6bbc225c8 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r3.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -94,6 +94,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-cddb-use-gnudb.org.patch" )
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {

diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.10.1-cddb-use-gnudb.org.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.10.1-cddb-use-gnudb.org.patch
new file mode 100644
index 00000000000..3c1ab7372f5
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/audacious-plugins-3.10.1-cddb-use-gnudb.org.patch
@@ -0,0 +1,30 @@
+From 33edaf1a021bc466aea7c6b0bfdd624b951a15ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Ketelaars?= <bjorn.ketelaars@hydroxide.nl>
+Date: Tue, 30 Jun 2020 07:10:28 +0200
+Subject: [PATCH] Move from freedb.org to gnudb.gnudb.org
+
+The freedb.org database of compact track listings has shut down. Any
+program functionality that tries to fetch from or submit data to
+freedb.org is broken now.
+
+An alternative service is available at gnudb.gnudb.org, see
+https://www.gnudb.org/
+
+Fixes https://redmine.audacious-media-player.org/issues/994
+---
+ src/cdaudio/cdaudio-ng.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cdaudio/cdaudio-ng.cc b/src/cdaudio/cdaudio-ng.cc
+index 6fd02de14..1b9c7bf1e 100644
+--- a/src/cdaudio/cdaudio-ng.cc
++++ b/src/cdaudio/cdaudio-ng.cc
+@@ -126,7 +126,7 @@ const char * const CDAudio::defaults[] = {
+  "use_cdtext", "TRUE",
+  "use_cddb", "TRUE",
+  "cddbhttp", "FALSE",
+- "cddbserver", "freedb.org",
++ "cddbserver", "gnudb.gnudb.org",
+  "cddbport", "8880",
+  nullptr};
+ 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-01-23 14:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-23 20:47 [gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/files/, media-plugins/audacious-plugins/ Richard Farina
  -- strict thread matches above, loose matches on Subject: below --
2021-01-23 14:14 Andreas Sturmlechner
2018-04-16 14:23 Andreas Sturmlechner
2017-05-13  9:41 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox