gentoo resync : 15.12.2019

4 files changed, 30 insertions, 63 deletions

diff --git a/media-sound/mhwaveedit/Manifest b/media-sound/mhwaveedit/Manifest
index b860853a5ed1..652cd9defa0b 100644
--- a/media-sound/mhwaveedit/Manifest
+++ b/media-sound/mhwaveedit/Manifest
@@ -1,5 +1,4 @@
-DIST mhwaveedit-1.4.22.tar.bz2 640430 BLAKE2B 58d642264756c5120832ce73aaac1ec0459270429e19861297719bc7782e50068e8326c053b91b538f349d2c2cc820a2e355db677f4632350823ade38ab0a154 SHA512 c44428dd4f848fda08aaff351380163697504d0ac133ab78d34817d974111719d724e985539d85c5bda23eda2fdb4fce3c1c680b5a8fa673f8d37a9d4fbcf590
+AUX mhwaveedit-1.4.23-missing-include.patch 205 BLAKE2B 1178613dd16aab62a4ada0937666671ff3275063a47f1e21662cc9ff10e3a6b2119bafa0e82b15e0c989b8d2294ae003f503e5c47b16c9bdcdcadcb62c7d4933 SHA512 b38349cca41b0ba97358c3b580ea904615e2a415d7f7efe08c3fc8bd1769dfed3945b1e321f5595afd47f292dcecd2a779a66bcb385a85b0f828c1bb137be1bb
 DIST mhwaveedit-1.4.23.tar.bz2 642042 BLAKE2B 9d2d4ae201034df09f46a85c0b3d42978a294e888e175c18aeb02433d6f22246602cd7aaae004cdd13d24bc6e21fcb2cc2cb739bb0509476f8510603bfd42517 SHA512 c8b3f1ca2c573e03bbe8e2c61c80d8bae0f9b9ec99fff0110119698f95328d1ab86eb4641d582865cd091f2955388343cbd912fd5f0b15f2a937b88cc01b974f
-EBUILD mhwaveedit-1.4.22.ebuild 1166 BLAKE2B be40609c7bdfa8c837be54d546b3f3bfc8389d77af402c2226180b0f6af56f632a722600aea6d91b8650bb573558970724fee68398e6be10eaf04d29114b4e40 SHA512 0897bb4641e765a513497a5b66a88cff6708e7251ddf55cf7ae044e9921a0a88b3f843470612c52afe1d3134b4124880e39fc502791ff82bb2d350375783ee46
-EBUILD mhwaveedit-1.4.23.ebuild 1168 BLAKE2B 842f1f3af0922a5dc467a1aa489ad8dd1aa3a104df1d709124a76d56db4e9e1b60f758fea0adf30606bfb541b99a1bfd2ec8cb17aa51c0f1f40e733162d88b3b SHA512 9b839f5a1c919a5302bb8b9740c68495f9d20bba7aecdca6a9380803b4d78023f92a15511f05cf9a60fbb0ea599a6fbb865b1b2fb3fac2670f5b93f67bb77bc2
+EBUILD mhwaveedit-1.4.23.ebuild 1151 BLAKE2B 050f03f07d951a0a6af17e5b58f8d63ca8663d0fecbd81b6526758442349c240c35a9827b02235ac92351e22bb15f4217b09379ef2ff9a35f7422955842156e5 SHA512 7a61a4b7c9e4bbb2068aca4a727ba5c02725b917f93926561e3a785e877a4bceb09be1152038c410978ef4309c6764f4a372f47a4a2f852e662f22424308c5d7
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mhwaveedit/files/mhwaveedit-1.4.23-missing-include.patch b/media-sound/mhwaveedit/files/mhwaveedit-1.4.23-missing-include.patch
new file mode 100644
index 000000000000..6da9db146330
--- /dev/null
+++ b/media-sound/mhwaveedit/files/mhwaveedit-1.4.23-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/sound-pulse.c
++++ b/src/sound-pulse.c
+@@ -21,6 +21,7 @@
+ 
+ #include <poll.h>
+ #include <pulse/pulseaudio.h>
++#include "int_box.h"
+ 
+ #ifndef PA_CHECK_VERSION
+ #define PA_CHECK_VERSION(a,b,c) (0)
diff --git a/media-sound/mhwaveedit/mhwaveedit-1.4.22.ebuild b/media-sound/mhwaveedit/mhwaveedit-1.4.22.ebuild
deleted file mode 100644
index 6b195a79c274..000000000000
--- a/media-sound/mhwaveedit/mhwaveedit-1.4.22.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="GTK+ Sound file editor (wav, and a few others.)"
-HOMEPAGE="https://gna.org/projects/mhwaveedit"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa jack ladspa libsamplerate nls oss pulseaudio sdl sndfile sox"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/pango
-	sndfile? ( >=media-libs/libsndfile-1.0.10 )
-	sdl? ( >=media-libs/libsdl-1.2.3 )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
-	libsamplerate? ( media-libs/libsamplerate )
-	ladspa? ( media-libs/ladspa-sdk )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.10 )
-	sox? ( media-sound/sox )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-
-src_configure() {
-	econf \
-		--without-arts \
-		--without-portaudio \
-		$(use_enable nls) \
-		$(use_with sndfile libsndfile) \
-		$(use_with libsamplerate) \
-		$(use_with sdl) \
-		$(use_with alsa alsalib) \
-		$(use_with oss) \
-		$(use_with jack) \
-		$(use_with pulseaudio pulse) \
-		--without-esound
-}
diff --git a/media-sound/mhwaveedit/mhwaveedit-1.4.23.ebuild b/media-sound/mhwaveedit/mhwaveedit-1.4.23.ebuild
index 4ed52f0b3b53..c6117c93bd72 100644
--- a/media-sound/mhwaveedit/mhwaveedit-1.4.23.ebuild
+++ b/media-sound/mhwaveedit/mhwaveedit-1.4.23.ebuild
@@ -1,35 +1,37 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="GTK+ Sound file editor (wav, and a few others.)"
-HOMEPAGE="https://gna.org/projects/mhwaveedit"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/magnush/mhwaveedit/"
+SRC_URI="https://github.com/magnush/mhwaveedit/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="alsa jack ladspa libsamplerate nls oss pulseaudio sdl sndfile sox"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gtk+:2
 	x11-libs/pango
-	sndfile? ( >=media-libs/libsndfile-1.0.10 )
-	sdl? ( >=media-libs/libsdl-1.2.3 )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
-	libsamplerate? ( media-libs/libsamplerate )
+	sndfile? ( media-libs/libsndfile:= )
+	sdl? ( media-libs/libsdl:= )
+	alsa? ( media-libs/alsa-lib:= )
+	jack? ( virtual/jack )
+	libsamplerate? ( media-libs/libsamplerate:= )
 	ladspa? ( media-libs/ladspa-sdk )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.10 )
-	sox? ( media-sound/sox )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	pulseaudio? ( media-sound/pulseaudio )
+	sox? ( media-sound/sox:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
+PATCHES=( "${FILESDIR}"/${PN}-1.4.23-missing-include.patch )
 
 src_configure() {
 	econf \
 		--without-arts \
+		--without-esound \
 		--without-portaudio \
 		$(use_enable nls) \
 		$(use_with sndfile libsndfile) \
@@ -38,6 +40,5 @@ src_configure() {
 		$(use_with alsa alsalib) \
 		$(use_with oss) \
 		$(use_with jack) \
-		$(use_with pulseaudio pulse) \
-		--without-esound
+		$(use_with pulseaudio pulse)
 }