7 files changed, 2 insertions, 328 deletions
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index 56d350cfd3d7..a595c86ce8d8 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,11 +1,5 @@
-AUX aqualung-1.0-ar.patch 505 BLAKE2B 957845ed9bbe2f9e7ee99209319cf7a438dc693611b37ef8b3447cb5d14636ef52208ddca09d94411071a20191b6177821c1ec6219893ebae7c66f343f1c1e32 SHA512 12a1740a7ebfa2c80d77a61fe23eead25ef3cb882caab9f2a13f56d4c06e6e9651fad8cbf5a6b755a9c0685de1b1f66f74e75458dca45ff61c816d54e90765e6
-AUX aqualung-1.0-ffmpeg3.patch 1148 BLAKE2B 777233c3c3aaa4921a102e480c31db9533d17316de566f7cb6439b4b9980cc4ab6c6992760a6571cede3b0eae0b1afedd38849b708a7c67f590d7bbf04b05d11 SHA512 3c932e86c8fe59951fd2c10b03a253133e79b0637e08653731f0dd12760855678aeb9e6c78dc646af7deb6a0dc61028a330020020d170262d9ab329c824f4985
-AUX aqualung-1.0-gcc10.patch 2199 BLAKE2B da146d5a6e3272ba1aa6a7ab4b77c330a54f7a070946e70d4cdc34bb09b5d41d27b2cca60cf81acdf4d7ca679c8c3d9b6e0ca7589cb47ce14883ebfacbc02e4e SHA512 b1c81ce1b27f4eba729aeae7084bdb2a435b06bacf00a003130682108a6a559129713d526a6eaa7f399b5acc9d8c6bdcde91b105cc924f763743d5a1dc9fa520
 AUX aqualung-1.1-ifp.patch 1445 BLAKE2B 80e4baadf577d17985d657ff3b3a357f30ec027d1c2e81398472226c87f787a37257eecc34ef3c8c435216e8746947d1d87dc9acb62d08d8a1c44f2ba51e8159 SHA512 c20426ff125f9273dc8297a188c768ca64ae57f8a507049ed534b58fb0214ad21477c8375a5c999c5dda5de96dd2f1599fda0c768878441f4ca7190ef75bf90e
 AUX aqualung-1.1-var-collision.patch 1174 BLAKE2B 25ff8f99a38b5d857f3f3175400e535ba9343eec1954b97fc9552101c8581557b9ea3241d3976a6f9dd6d44e41aaaf6e4319469d89d7f68a6bfab5104a63d52c SHA512 d414f1af65466391a4b59e4b2de81b83db9eeddb60fe1b44f9a0fe101aa33453f18ac8c28e5a57ddba8ecb604c4571adfad1f94f12d4b0ef03e4c01c503a2e4d
-DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
 DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece SHA512 77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
-EBUILD aqualung-1.0-r5.ebuild 2510 BLAKE2B 569242aeec1453ccbf040cc826847f27fac5e7e191054057308bf5b912d971a8b008020b7da76faf2bc225b38bae2b1533855bd909843ad2c813819350183f26 SHA512 f6d69930280c3d0068b1a960ccc8e968b2e9d476d4934edb94cc332f10ef805c834a12f062ec8567f839bb8663ce9d563c4deca51cafd800c48ddb7a6569e1c4
-EBUILD aqualung-1.1-r1.ebuild 2418 BLAKE2B ed3f80c963cfb65720f43a0d0f895b6323f3be1a06050bea5b20231c8431fb3c91124f14bdf9295744a7cc605d1f899a52826d4337404364145207af5b2c7d98 SHA512 fba638ffd7590bf25d0072678abbbe33d6c4121f0bd955ef830ad964089b956cb3672cee2e06e04c67bdf6997d67c1c1f815814f455da70ef18d5974d73100bb
 EBUILD aqualung-1.1-r101.ebuild 2498 BLAKE2B 23ecf60db98468881ee9c4d338998a7c988bbd2d0c1e50cdeece3213baa84d210f4daf6d8c55dd8aff6d57fb64b3a9ef6d3b495bb4d512973a2f24209163bcf7 SHA512 cb2b8401f75e1a9be4fc9c30d4ab0559c25b01668da23e6d914d31f45783545bc494298968124a8dff9fe173f1a9d597d3f06e88c846f162fa202c210e75a954
-MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566
+MISC metadata.xml 918 BLAKE2B b095813ec060712043d858b8e1ab6e4b5bcfa9ec2dd8e3b2003310774c4d1bf51d9a97c5335d1403d079e044006c4dd4a70e72258cf21f412bcc54facf57f003 SHA512 734b389036bed628f85a69b992efc5f144121c2edc9cc3f08bf7f00b8cbc73bcdcebc5893f8ceb9188de86a605ad6d4013451f45ba3478baaa5d16dc50643531
diff --git a/media-sound/aqualung/aqualung-1.0-r5.ebuild b/media-sound/aqualung/aqualung-1.0-r5.ebuild
deleted file mode 100644
index 442799d70ce8..000000000000
--- a/media-sound/aqualung/aqualung-1.0-r5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
-SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
-	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
-	vorbis wavpack"
-
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/libxml2
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( dev-libs/libcdio-paranoia )
-	cddb? ( media-libs/libcddb )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
-	ifp? ( media-libs/libifp )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lame? ( media-sound/lame )
-	libsamplerate? ( media-libs/libsamplerate )
-	lua? ( dev-lang/lua:0= )
-	mac? ( media-sound/mac )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( media-libs/libsndfile )
-	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ffmpeg3.patch"
-	"${FILESDIR}/${P}-gcc10.patch"
-	"${FILESDIR}/${P}-ar.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		--enable-loop \
-		--enable-nls \
-		--enable-transcoding \
-		$(use_enable debug) \
-		$(use_enable podcast) \
-		$(use_enable systray) \
-		$(use_enable jack jack-mgmt) \
-		$(use_with alsa) \
-		$(use_with cdda) \
-		$(use_with cddb) \
-		$(use_with ffmpeg lavc) \
-		$(use_with flac) \
-		$(use_with ifp) \
-		$(use_with jack) \
-		$(use_with ladspa) \
-		$(use_with lame) \
-		$(use_with libsamplerate src) \
-		$(use_with lua) \
-		$(use_with mac) \
-		$(use_with modplug mod) \
-		$(use_with mp3 mpeg) \
-		$(use_with musepack mpc) \
-		$(use_with oss) \
-		$(use_with pulseaudio pulse) \
-		$(use_with sndfile) \
-		$(use_with speex) \
-		$(use_with vorbis vorbis) \
-		$(use_with vorbis vorbisenc) \
-		$(use_with wavpack)
-}
-
-src_install() {
-	default
-
-	newicon src/img/icon_64.png aqualung.png
-	make_desktop_entry aqualung Aqualung
-}
diff --git a/media-sound/aqualung/aqualung-1.1-r1.ebuild b/media-sound/aqualung/aqualung-1.1-r1.ebuild
deleted file mode 100644
index 0e4f24b9cf57..000000000000
--- a/media-sound/aqualung/aqualung-1.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
-SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
-	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
-	vorbis wavpack"
-
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/libxml2
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( dev-libs/libcdio-paranoia )
-	cddb? ( media-libs/libcddb )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
-	ifp? ( media-libs/libifp )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lame? ( media-sound/lame )
-	libsamplerate? ( media-libs/libsamplerate )
-	lua? ( dev-lang/lua:0= )
-	mac? ( media-sound/mac )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( media-libs/libsndfile )
-	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ifp.patch"
-	"${FILESDIR}/${P}-var-collision.patch"
-)
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		--enable-loop \
-		--enable-nls \
-		--enable-transcoding \
-		$(use_enable debug) \
-		$(use_enable podcast) \
-		$(use_enable systray) \
-		$(use_enable jack jack-mgmt) \
-		$(use_with alsa) \
-		$(use_with cdda) \
-		$(use_with cddb) \
-		$(use_with ffmpeg lavc) \
-		$(use_with flac) \
-		$(use_with ifp) \
-		$(use_with jack) \
-		$(use_with ladspa) \
-		$(use_with lame) \
-		$(use_with libsamplerate src) \
-		$(use_with lua) \
-		$(use_with mac) \
-		$(use_with modplug mod) \
-		$(use_with mp3 mpeg) \
-		$(use_with musepack mpc) \
-		$(use_with oss) \
-		$(use_with pulseaudio pulse) \
-		$(use_with sndfile) \
-		$(use_with speex) \
-		$(use_with vorbis vorbis) \
-		$(use_with vorbis vorbisenc) \
-		$(use_with wavpack)
-}
-
-src_install() {
-	default
-
-	newicon src/img/icon_64.png aqualung.png
-	make_desktop_entry aqualung Aqualung
-}
diff --git a/media-sound/aqualung/files/aqualung-1.0-ar.patch b/media-sound/aqualung/files/aqualung-1.0-ar.patch
deleted file mode 100644
index 3df4d75eaf1b..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-ar.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur aqualung-1.0_orig/configure.ac aqualung-1.0/configure.ac
---- aqualung-1.0_orig/configure.ac	2020-08-05 20:00:50.758797358 +0200
-+++ aqualung-1.0/configure.ac	2020-08-05 20:01:33.198796503 +0200
-@@ -25,11 +25,12 @@
- 
- 
- # Checks for programs.
-+AC_USE_SYSTEM_EXTENSIONS
- AC_PROG_CC
- AC_PROG_RANLIB
- AC_PROG_CXX
- AM_PROG_CC_C_O
--AC_USE_SYSTEM_EXTENSIONS
-+AM_PROG_AR
- m4_ifndef([AM_GNU_GETTEXT],
-     [m4_fatal([GNU gettext is required to prepare the Aqualung build])])
- AM_GNU_GETTEXT([external])
diff --git a/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch b/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
deleted file mode 100644
index 111ee70c8774..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001
-From: Jamie Heilman <jamie@audible.transient.net>
-Date: Sun, 8 May 2016 19:34:36 +0000
-Subject: [PATCH] ffmpeg/libav: support libavcodec API 55 and later
-
-With FFmpeg 1.0 and libav 10, AVCodecContext.{get,release}_buffer()
-were deprecated; the new default AVCodecContext.get_buffer2()
-implementation works fine for us.
----
- src/decoder/dec_lavc.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/decoder/dec_lavc.c b/src/decoder/dec_lavc.c
-index e2c81c6..5268a64 100644
---- a/src/decoder/dec_lavc.c
-+++ b/src/decoder/dec_lavc.c
-@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char * filename) {
- 		return DECODER_OPEN_BADLIB;
- 
- 	pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- #if LIBAVCODEC_VERSION_MAJOR >= 53
- 	pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
- 	pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
- #endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
-+#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
- 
- 	pd->time_base = pd->avFormatCtx->streams[pd->audioStream]->time_base;
- 
diff --git a/media-sound/aqualung/files/aqualung-1.0-gcc10.patch b/media-sound/aqualung/files/aqualung-1.0-gcc10.patch
deleted file mode 100644
index 620bcb873d95..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-gcc10.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From de448507343a86ee97949eb4be0092d1659092da Mon Sep 17 00:00:00 2001
-From: Adam Sampson <ats@offog.org>
-Date: Sat, 18 Jul 2020 17:02:32 +0100
-Subject: [PATCH 1/2] Remove unused variable.
-
-This causes a duplicate symbol error with GCC 10 (-fno-common by
-default), but it's not used anyway.
----
- src/playlist.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/playlist.c b/src/playlist.c
-index 35483d1..96fac75 100644
---- a/src/playlist.c
-+++ b/src/playlist.c
-@@ -134,8 +134,6 @@ GtkWidget * plist__send_songs_to_iriver;
- GtkWidget * plist__export;
- #endif /* HAVE_TRANSCODING */
- 
--gchar command[RB_CONTROL_SIZE];
--
- GtkTreeIter * fileinfo_iter = NULL;
- 
- int playlist_dirty;
-
-From 7f5d1f266957b3fa73799d3edef6b19ff9716d02 Mon Sep 17 00:00:00 2001
-From: Adam Sampson <ats@offog.org>
-Date: Sat, 18 Jul 2020 17:06:41 +0100
-Subject: [PATCH 2/2] Rename timeout_tag to ports_timeout_tag.
-
-This causes a duplicate symbol error with GCC 10 (-fno-common by
-default), because there's also a global timeout_tag in main.c.
-
-Also correct the type to guint rather than gint.
----
- src/ports.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/ports.c b/src/ports.c
-index f17a5ab..f4de59d 100644
---- a/src/ports.c
-+++ b/src/ports.c
-@@ -63,7 +63,7 @@ GtkTreeViewColumn * column_out_R;
- int n_clients;
- GtkListStore * store_out_nb[MAX_JACK_CLIENTS];
- 
--gint timeout_tag;
-+guint ports_timeout_tag;
- 
- int out_selector = 0;
- 
-@@ -242,7 +242,7 @@ tree_out_L_selection_changed(GtkTreeSelection * selection, gpointer * data) {
- 			fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res);
- 		}
- 		g_free(str);
--		timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1));
-+		ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1));
-         }
- }
- 
-@@ -262,7 +262,7 @@ tree_out_R_selection_changed(GtkTreeSelection *selection, gpointer * data) {
- 			fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res);
- 		}
- 		g_free(str);
--		timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2);
-+		ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2);
-         }
- }
- 
diff --git a/media-sound/aqualung/metadata.xml b/media-sound/aqualung/metadata.xml
index 66cfd45a7245..9977e46bd398 100644
--- a/media-sound/aqualung/metadata.xml
+++ b/media-sound/aqualung/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">