gentoo resync : 15.12.2019

6 files changed, 55 insertions, 57 deletions

diff --git a/media-sound/jack-rack/Manifest b/media-sound/jack-rack/Manifest
index 57e94a346384..e7213981531b 100644
--- a/media-sound/jack-rack/Manifest
+++ b/media-sound/jack-rack/Manifest
@@ -1,9 +1,9 @@
-AUX jack-rack-1.4.5-asneeded.patch 355 BLAKE2B 5845d402169f07f5be8c9d52ab2e354b8a39fef64d5c653b4ab5ac19ff2a0bd50b51124b5be1d9a8f31f9284666adc2ab18ea6696319dba186114e3f83286394 SHA512 96b0122e47e87926f1193c803465d3941ae257cd348c3f816807dfdefd98310347185fb659207b98ecb9d36ae05c0bc75db7158f9769d8760caba2251b8193e4
 AUX jack-rack-1.4.6-noalsa.patch 580 BLAKE2B c7ec6d1273e5b37761ba44f773a48a15d948e2e0df9013a4d5ed5e74ae6d219cbbb5dd9e6b60accb6b700381da2189107975600a5832655966f84a642ee68d6d SHA512 5b066700ef863abfc3a308b6a784beedebf85f0fa9327e2c6515a82982ef8806bcbffb765a03c52bc779fa80ee5e7ac7fd276aa89743c235fff016270b775eb8
-AUX jack-rack-1.4.7-disable_deprecated.patch 432 BLAKE2B 8cb95e17b2f31c6c861526eaf34833cdc62971776230e6ea3fd2e1241880dad98e5e6951a5988b9ed706a68e32fa32c4c174171a84ef44d38c82bcf558181535 SHA512 ce4f145a6589cf5a3fd5369f662ea56e2b53e2a77ceba6c91166b952c4fe5690207ea4394da3c6bf54ce52324cef9ee2e7b3258741ce3d4f58f97af7f8d55855
+AUX jack-rack-1.4.7-disable_deprecated.patch 415 BLAKE2B cd383c948cd470efdf850a417f2043fdb4302f410284b8c8fbbbb141021ce2015c871f2dd8f496a6a690995be9c27284126b2f8b7f35f013aaece9d71cdce320 SHA512 21ac1e848c64194f560eda4e57176d4deb0c307604c8d6ca758e922d68cc3cee206a4276fc97c9716460fe0c559bddb3ef443db7b7e1a2fbde4de1f1a2e8856a
+AUX jack-rack-1.4.8_rc1-QA-fix-desktop-file.patch 322 BLAKE2B 75222724383cc41f6746004c6479236c2e24f3302b9b4c119d5a31765e21f2a46dc7f7a65d3d659337421afbc59af93c427b7338aa19fcc58ebc651fe9043789 SHA512 d3d6146bb9ab8d742ca580aa07a6b7c44baaf851465d3bf589cdf8229fdf3a1b7938beb12b35bfbddd0a0dbe4f044389886adf54ee55489c4c9683223e1be9a2
 AUX jack-rack-1.4.8_rc1-noxml.patch 492 BLAKE2B bfb74018767f8e08dd27b93531e848d5fbb0a552c296ce1463d67f0dc83ec1b37b19e0ef17ad15020a797f1fd6d9fb0d65872fb7a9353ce2b57c811334e4e8b5 SHA512 79f1406003006ef0956ae08a53d9aefbeeb9ba97308217bd3c6610a854e4e905cd972e1431ea21dc3f938efd21120bf45b7dfc55993858d7c3e2304ffde3909d
-AUX jack-rack-1.4.8_rc1-underlinking.patch 288 BLAKE2B 6ed7445017cf15064aae5b4a0db63be74f338d448b474e28424df3b4a461b0557659894cfb051b90bce5169c41187ceb19143d22f52ebf9429084dbb1f3a83f3 SHA512 90c7c91c681ca6037aa4a9ae7d9491fbdd7d5a8404e580ed6cd2d1d4d1101c7dd8cea005231c63ec5384d301dbe56f966607fb714c5fecb4e2258502fbba1b10
+AUX jack-rack-1.4.8_rc1-underlinking.patch 315 BLAKE2B 656898ba9367cd0eeecc1f4183c852676cff35de4350e42db75c8dbede502511b94fa34813e8fd5b5281e04d1d9df684a2c1e5c4bc61e92147c478f3910f3203 SHA512 db0353aab452a5f59b411085740f8fd2a115afb690c481eb2dd2ea6609887ad36114bea9148c73ff1bfea2cd04a34f01d2c5b16a4f8a411f854d53431df31163
 DIST jack-rack_1.4.8~rc1-1.debian.tar.gz 6742 BLAKE2B 51d5336878b7a6957822395dd282872c1681dfce9c54af569d311c40f612240f0db90812fc6dc2364c0a259f6c1ed8623e9fe5be6dd21fc4574674048d6b13f6 SHA512 4e0503a0b1fa080bed0f9730929d820d173d886f4d4801016419d33729ec453f1f4e0f96fe102d83731169b91c54939663e9529516fdc09bca5d347be3e18715
 DIST jack-rack_1.4.8~rc1.orig.tar.gz 122400 BLAKE2B 93367eb01c5079a855a55f976205901b0f9536929424e04b1c4a7c6d620d2d7e93c3475cd46cd6bd17995d2c2b77ca5b1b342166c7098b817a3a53843b48a51a SHA512 8c7be402b6c8ad02a6ad7379d98c49a00bf5a3c70e5e5c174d786e77bf72592cf2eec6b346ce77d1dabb3787a6d028f4d02a1dd18daa5bf3daa297ac7bd7ad38
-EBUILD jack-rack-1.4.8_rc1.ebuild 1645 BLAKE2B a4fc62f44dccc46bd35e684e31a0396dc8f10b56f8cb4d582742990371eea4d07affd5703c06ae1158104ffe819790400a5284f761e5fc3944326d9fcbcf82c7 SHA512 84aa31b81be7f79fcf49db72d774c136794b0769ed44a261198e8f7a067df38db781dee0bb1968502172068eaef41b77cb740d088e977058985d6575dd809a29
+EBUILD jack-rack-1.4.8_rc1.ebuild 1583 BLAKE2B 082d8840b6f5bddb4575efe246e0e8eb98b0872f1cd2c9caf6029cca24949f447a9b83dad0ae6b854e7d47e94da303a622bd3ff4079fe939dcc5cdb2738450f2 SHA512 dcd83c9992147ac9e72cd7796c1ff90df12bb8c9c9870856ed62e2d96b6f241d1ed91055083dee6601d730950b4d88d342b0564ed5a7813caf6ce8fe9bce0906
 MISC metadata.xml 338 BLAKE2B 0f7169d20fe0dd2ebd07b886c6f3973283e61e0ccfcfba61a9065209666d3ec1e0b14f3367f283d57d320f4006ae8b9ffc454390e2d5f5df494b691b74eaa23a SHA512 5274213ba5e9a2710d7e0d1e11150e45d902e2ac263ef21359046afc774d7fc4b7aea86705a49a0ae39b9adfd6c4103d450ccb737defe2eee1078bf3d3819c51
diff --git a/media-sound/jack-rack/files/jack-rack-1.4.5-asneeded.patch b/media-sound/jack-rack/files/jack-rack-1.4.5-asneeded.patch
deleted file mode 100644
index 4a07049f0603..000000000000
--- a/media-sound/jack-rack/files/jack-rack-1.4.5-asneeded.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: jack-rack-1.4.5/src/Makefile.am
-===================================================================
---- jack-rack-1.4.5.orig/src/Makefile.am
-+++ jack-rack-1.4.5/src/Makefile.am
-@@ -60,7 +60,7 @@ jack_rack_CFLAGS = \
- 	-DGNOME_DISABLE_DEPRECATED=1
- 
- 
--jack_rack_LDFLAGS = \
-+jack_rack_LDADD = \
- 	$(JACK_LIBS) \
- 	$(GTK_LIBS) \
- 	$(GNOMEUI_LIBS) \
diff --git a/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch b/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch
index 1ddd318235ef..fa5e1b646f77 100644
--- a/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch
+++ b/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/376899
 
---- src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -53,13 +53,7 @@
  	$(XML_CFLAGS) \
  	-DPKGDATADIR=\"$(pkgdatadir)\" \
@@ -15,5 +15,5 @@ http://bugs.gentoo.org/376899
 -
 +	-DDTDDIR=\"$(dtddir)\"
  
- jack_rack_LDFLAGS = \
- 	$(JACK_LIBS) \
+ LIBS = \
+ 	-ldl \
diff --git a/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-QA-fix-desktop-file.patch b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-QA-fix-desktop-file.patch
new file mode 100644
index 000000000000..f5d845b6ffe0
--- /dev/null
+++ b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-QA-fix-desktop-file.patch
@@ -0,0 +1,12 @@
+--- a/jack-rack.desktop
++++ b/jack-rack.desktop
+@@ -3,7 +3,7 @@
+ Comment=Stereo LADSPA effects rack
+ Comment[ru]=Стойка эффектов LADSPA
+ Exec=jack-rack
+-Icon=jack-rack-icon.png
++Icon=jack-rack-icon
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;AudioVideo;
++Categories=GNOME;GTK;AudioVideo;
diff --git a/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch
index 5c96c01bde57..9948df4effbe 100644
--- a/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch
+++ b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch
@@ -1,10 +1,10 @@
 This should be applied after Debian 02-gcc45_binutils_gold.patch which adds -ldl, but
 we need also -lm wrt http://bugs.gentoo.org/463696 for exp(), log() and logf()
 
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -62,6 +62,7 @@
- 
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -56,6 +56,7 @@
+ 	-DDTDDIR=\"$(dtddir)\"
  
  LIBS = \
 +	-lm \
diff --git a/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild b/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild
index 7dc77e26f482..002b6ccc6f6d 100644
--- a/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild
+++ b/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils flag-o-matic toolchain-funcs
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
 
 MY_P=${PN}_${PV/_/\~}
 DEB_URI="mirror://debian/pool/main/j/${PN}"
@@ -16,40 +17,38 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa gnome lash +xml"
 
-RDEPEND=">=x11-libs/gtk+-2.12:2
-	>=media-libs/ladspa-sdk-1.12
-	media-sound/jack-audio-connection-kit
-	alsa? ( media-libs/alsa-lib )
-	lash? ( >=media-sound/lash-0.5 )
-	gnome? ( >=gnome-base/libgnomeui-2 )
+RDEPEND="
+	media-libs/ladspa-sdk
+	virtual/jack
 	virtual/libintl
-	xml? ( dev-libs/libxml2
-		media-libs/liblrdf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
+	x11-libs/gtk+:2
+	alsa? ( media-libs/alsa-lib:= )
+	gnome? ( gnome-base/libgnomeui:= )
+	lash? ( media-sound/lash:= )
+	xml? (
+		dev-libs/libxml2:=
+		media-libs/liblrdf:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
 
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO WISHLIST )
+S="${WORKDIR}/${PN}-f9fb65d"
 
-src_unpack() {
-	unpack ${A}
-	mv ${PN}-* "${S}"
-}
+PATCHES=(
+	"${WORKDIR}"/debian/patches/01-desktop_file.patch
+	"${WORKDIR}"/debian/patches/02-gcc45_binutils_gold.patch
+	"${WORKDIR}"/debian/patches/03-remove_midi_when_replacing_plugin.patch
+	"${FILESDIR}"/${PN}-1.4.6-noalsa.patch
+	"${FILESDIR}"/${PN}-1.4.7-disable_deprecated.patch
+	"${FILESDIR}"/${P}-noxml.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-QA-fix-desktop-file.patch
+)
 
 src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX=patch epatch "${WORKDIR}"/debian/patches
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.4.6-noalsa.patch \
-		"${FILESDIR}"/${PN}-1.4.7-disable_deprecated.patch \
-		"${FILESDIR}"/${P}-noxml.patch \
-		"${FILESDIR}"/${P}-underlinking.patch
-
-	sed -i \
-		-e '/Categories/s:Application:GTK:' \
-		-e '/Icon/s:.png::' \
-		${PN}.desktop || die
-
+	default
 	eautopoint
 	eautoreconf
 }