gentoo resync : 15.12.2019

3 files changed, 30 insertions, 13 deletions

diff --git a/media-sound/wavbreaker/Manifest b/media-sound/wavbreaker/Manifest
index 4725ab4749df..97e3626bb40c 100644
--- a/media-sound/wavbreaker/Manifest
+++ b/media-sound/wavbreaker/Manifest
@@ -1,4 +1,5 @@
 AUX wavbreaker-0.10-pkgconfig.patch 350 BLAKE2B 85657b02fcb5b6f7c9be8e81217bc02c816732f57cf51e3cde17179dd71d62df46f05d378910e06702419a822a050a4840b6c5433628e6f56dcc791f9d5e67c6 SHA512 a8f75bc1592b4aab528175a055936fc23d50a266b8aaee317fa6039c5ccebed2e02db0454b2b4d6494fc8705ecd39bf04dfa485de6921961e53347dead9d0d45
+AUX wavbreaker-0.11-QA-desktop-file.patch 211 BLAKE2B 64b1f3198a0cafb45b1d81978e1b61e06140f97aa4f01145513d8f2e8361b90d918fb299fa5318031b902d0c89695a93cf882794d8a35ea2b177197649636cb0 SHA512 375cb7f844726439ea06feee9360029d59de86ca1eeef8bf9b312e1a4b2207841ca6a6fa6dd8f947481fc74c45f44587adc1dc1f01d3e0485f783cdf872cc548
 DIST wavbreaker-0.11.tar.gz 496733 BLAKE2B 2ecdad2f19071d672eea4960883af3f1e5b034d43307896cbd9caed9fb087579124851cab6fbfbc54276945c6b229f2ac6f2e7b9b839d02487569b08d65b0210 SHA512 3dee23ef7c0db651cd1ebae78db3f950b5b22ae4f0a323f66e1243a88c0e41390f9f4abde663ef7a1d1c841e0cbb779612d6078cd327a0f1d48e6a812c8ce4e1
-EBUILD wavbreaker-0.11.ebuild 843 BLAKE2B 4c9937d592fac1be8ce8fe0c079b7ec631282f60ad1954cf098383c40535388442defb61aab8efc9e2fa694d0db37bec47b007187523d64c771c58b7394db54e SHA512 3f7ca2662350449372db81125d22646f4bb4a8fa1dc70d5194b4202a3ab196bea349ff25e2705ad1c6db81558002b98aef6e1cfda288cfced6455f396712f1a6
+EBUILD wavbreaker-0.11.ebuild 884 BLAKE2B 90309d5788813766429b9c383c60d49e62ce5533b06270418963f7dd79144aa4030e7bc9b12d1f52b976f2612f8001489b88d83f7270902e7215db984b5d0f82 SHA512 44b2de9b8409befd228aea6c7e2759461062ed3a2abca139a9696d066dc6d2993f7b355575c922f024ab0be60dec506d5c21f6fb451b5fc4faf5d2be6b635b08
 MISC metadata.xml 333 BLAKE2B db08ea8f604d1e01bd8da72c1a8a907a8fc528d3384fd5a33d9584c6aace01ec7d972fa37c9f75d3898ee5d064adae7ce5d01eeb48bb85486afaf5330418860f SHA512 d96b3c68abb0afe8c0821d0c9d5b48089e201dcdffffedcc41ee93d44fa3cc11b22eb782b13ded1fde4bfe2187aa2b371a2167d7305ade2bfeff0d201657ac98
diff --git a/media-sound/wavbreaker/files/wavbreaker-0.11-QA-desktop-file.patch b/media-sound/wavbreaker/files/wavbreaker-0.11-QA-desktop-file.patch
new file mode 100644
index 000000000000..c382e5e5dd19
--- /dev/null
+++ b/media-sound/wavbreaker/files/wavbreaker-0.11-QA-desktop-file.patch
@@ -0,0 +1,9 @@
+--- a/wavbreaker.desktop
++++ b/wavbreaker.desktop
+@@ -9,5 +9,5 @@
+ Icon=wavbreaker
+ Terminal=false
+ Type=Application
+-Categories=Application;AudioVideo;Audio;
++Categories=AudioVideo;Audio;
+ MimeType=audio/x-wav
diff --git a/media-sound/wavbreaker/wavbreaker-0.11.ebuild b/media-sound/wavbreaker/wavbreaker-0.11.ebuild
index 482c8096fc2d..6ab4036ae813 100644
--- a/media-sound/wavbreaker/wavbreaker-0.11.ebuild
+++ b/media-sound/wavbreaker/wavbreaker-0.11.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="wavbreaker/wavmerge GTK+ utility to break or merge WAV files"
 HOMEPAGE="http://wavbreaker.sourceforge.net"
@@ -13,18 +14,24 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="alsa nls oss pulseaudio"
 
-RDEPEND="dev-libs/libxml2
-	>=x11-libs/gtk+-2:2
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
+RDEPEND="
+	dev-libs/libxml2:=
+	x11-libs/gtk+:2
+	alsa? ( media-libs/alsa-lib:= )
+	pulseaudio? ( media-sound/pulseaudio:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
 
-DOCS="AUTHORS ChangeLog CONTRIBUTORS NEWS README* TODO"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10-pkgconfig.patch
+	"${FILESDIR}"/${PN}-0.11-QA-desktop-file.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.10-pkgconfig.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }