gentoo resync : 19.01.2018

3 files changed, 0 insertions, 129 deletions

diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index 8bb650ea28f2..1b4a7fe87e59 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,6 +1,4 @@
 AUX aqualung-1.0-ffmpeg3.patch 1148 BLAKE2B 777233c3c3aaa4921a102e480c31db9533d17316de566f7cb6439b4b9980cc4ab6c6992760a6571cede3b0eae0b1afedd38849b708a7c67f590d7bbf04b05d11 SHA512 3c932e86c8fe59951fd2c10b03a253133e79b0637e08653731f0dd12760855678aeb9e6c78dc646af7deb6a0dc61028a330020020d170262d9ab329c824f4985
-AUX aqualung-1.0-mac.patch 917 BLAKE2B 6653c3d376a64e59bb92fc9abed6fe490f2f9e760754feb036b136675a55d2ba4f85729205124875ae275e4a0e38bb64cf7be7cd3302f4fd773a9d8e5f0b858f SHA512 680acac4c588068baf39aa8f8892a8d4d95e49419d9fea0b3620a7850513be133986315455f293362cf5288f761474e48294607156657b37b0d4f98f003c3c2c
 DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
-EBUILD aqualung-1.0-r1.ebuild 2491 BLAKE2B 4bb1aa38a479ed908cfcebb11d8ae7c3efa5f34ac5f120133e696e4923f45089b499afdb12ea0e43074917ce353e3dee3801e2faba865039c09f7e92024088a9 SHA512 49dbf6a9f53249c2f710f1f02720d35980b54d42d59d4a27a96f10ed157a94b32829c8151d03037ccbf8a8f83ba2c52a9a8627bad288670e1ff58b27005b6b32
 EBUILD aqualung-1.0-r2.ebuild 2474 BLAKE2B f1c14d90aa54b2312d04296666cbc1e319ed39db869af0cf580f41a440dc157fb4413328aafd016bafc6ac954e4c84e0746d34a1eb815ac7502ad8ca47a9a1fc SHA512 b70e2166296131222298abee45a2e4972fe7c8264a8111dbf2a6cfedb7706b0bcc73014c306302d3e9dc8697983b1e2a8fb09631abe576815bf82fb5a36d5aa5
 MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566
diff --git a/media-sound/aqualung/aqualung-1.0-r1.ebuild b/media-sound/aqualung/aqualung-1.0-r1.ebuild
deleted file mode 100644
index 668e4bd19157..000000000000
--- a/media-sound/aqualung/aqualung-1.0-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-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 libav libsamplerate
-	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
-	vorbis wavpack"
-
-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? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( media-libs/flac )
-	ifp? ( media-libs/libifp )
-	jack? ( media-sound/jack-audio-connection-kit )
-	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}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ffmpeg3.patch"
-	"${FILESDIR}/${P}-mac.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-mac.patch b/media-sound/aqualung/files/aqualung-1.0-mac.patch
deleted file mode 100644
index 16689ee0ae75..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-mac.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Revert this patch.
-
-From 12c3a45a6d5b6ef0da70e0cdc424beff993eeef6 Mon Sep 17 00:00:00 2001
-From: Tom Szilagyi <tszilagyi@users.sourceforge.net>
-Date: Mon, 9 Jun 2014 12:54:54 +0000
-Subject: [PATCH] Make the APE decoder compile with current libmac-dev
- (4.11-u4-b5-s7-d)
-
-git-svn-id: https://svn.code.sf.net/p/aqualung/code/trunk@1303 3cd24cdc-1f22-0410-b8b1-dcf80e670293
----
- src/decoder/dec_mac.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/decoder/dec_mac.cpp b/src/decoder/dec_mac.cpp
-index 024c8b9..2e9bc01 100644
---- a/src/decoder/dec_mac.cpp
-+++ b/src/decoder/dec_mac.cpp
-@@ -174,7 +174,7 @@ mac_decoder_open(decoder_t * dec, char * filename) {
- 
- 
- 	int ret = 0;
-+        wchar_t * pUTF16 = GetUTF16FromANSI(filename);
--        wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);
-         pdecompress = CreateIAPEDecompress(pUTF16, &ret);
-         free(pUTF16);
-