gentoo resync : 25.08.2020

5 files changed, 3 insertions, 43 deletions

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index d2d61c26b9e5..8e2d73c024e7 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,10 +1,9 @@
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
-AUX mixxx-2.2.0-lilv_include_fix.patch 1006 BLAKE2B 1541ecc32cb20d02d71577615b96605938a2d38e40e04fc43e864c8a85722475b795c807ccda1df0ff86c6268d1d1425934e3b413fdedc2effcbd6a2ab584ad6 SHA512 e15980f9861a61bf965636182fe3f0d41d25d569d2d4b43e167e53e33fe7e8f533878e93db237e90551ac409811de497e3313e32fc62462bf963b7f1f29c4a11
 AUX mixxx-2.2.3-qt-5.14.patch 17550 BLAKE2B 3f5c16106bbda8e45f1180ef6f2323a3786ddb11f9a355fac57c545d71a1f5080ef39665011d41b4500643a4e33340851bb3d849d381874e4abf9ac42a18e85f SHA512 677d8e832aab28f21c2641b1a94fce6fa43d652ba76b580a8a7cb7911dc5e5fb788cdcf7825906e7894d90198433f96e421531af4e65bd7d16a8b16fcb68fb54
 AUX mixxx-2.2.4-metadata.patch 848 BLAKE2B c5acec33886b585572426da7dd56c147c64683ab5f30b5f8023836330b365bbd17cd490cc70ae383c2159b18fcf9b582f6020b04df20dc18c49c0489c59c6f90 SHA512 d09fbb8171e84b0a0fb23249efb9485140e080e3abaa06c4c59ce1b1110d84f6d6e8c421207ffb214738ddf3e23739db04257bef212728631f9a740693b5c8f8
 DIST mixxx-2.2.3.tar.gz 35060366 BLAKE2B eb21f86f5330749add8a80328985d385a0a6f49f35f8be2a34e006e8c05f306aa1463be839208fe9c86396ea8b598002bd042fdb09ca93e2378e97c834a50d35 SHA512 dfa4f9ccb7d8aa486167a01e54ee5ebeb3655a4f63c7c163b66f0dd25a21f309eae3a213d253cc37ef501777961028932a9d4ac71f5befd54daca2bd2326b395
 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
-EBUILD mixxx-2.2.3-r2.ebuild 3202 BLAKE2B 5e21aa4910d3e136b6123ddb231a7a536db9239b7297d77e929a20bc7ace77de4c8da7809e41c94507b3f663d78a64b0cf4f0fa0717fd3d02539865c1b3fdc96 SHA512 e085cf38879c384701e37cd8ea73e63396a00bbfde371b7eaf326623b09e54078337ba5ead1ad3db1e7c850c2c5353f2262ce277d0b8b9aef29175a8dd356125
-EBUILD mixxx-2.2.4.ebuild 3253 BLAKE2B c691c61b4d483cc60aa6d94e880ba22962fbdc94eba912aa4df1c0fc9b50930ac03b1d161a4d9ad55420066097dca0c85b0e469831c6cb8dfad0a65aac9e7b81 SHA512 af092c60b7453807dd8125d9a16e3fb0e48d5dde5112026ac867a377fc8ed2c5a71243d5ece8e322ad8d4e7c5fe69da75f88fa585c5092ad7a316e978aabe364
-EBUILD mixxx-9999.ebuild 3167 BLAKE2B a043a02cd144dd31758d1dfdbf81f4aff60b1ede13f1e28bb95dac7a392dd9e6307e120cd1924d78a2116996e95a2b03fe24f4fc539da2cd22e609dfc2528f1c SHA512 92daebabad0d42cf176244f2a863f4a32724d8f62b5c6cb8a17a6304231dee27db576dedff3b1f0cb8c0ac5f9d393bd7c61d75f83f052c70500c4202b32c4027
+EBUILD mixxx-2.2.3-r2.ebuild 3152 BLAKE2B 48a5c3b9d7513a6ae4c47c6f67d0f7577234ae92ba9bbc8d6792ac4f5a62898d77e175d372ee0362e07b347ad6215433e2c857b829d47cead9d5cc677dc7c9d6 SHA512 b84b0fe2b0d40c4a17b2df624e856b36b8fd3dc899fa6b9f2f0cb834db607aa4da2bd024a5eeb75b0a3dbba8241a73ad19a545289e30da0dba17e7cbed4e67b7
+EBUILD mixxx-2.2.4.ebuild 3203 BLAKE2B 14f1574307c91b3e074aa9b223e28569ffd45f5a0dd80a9e91868b9ab04fe0963e8b2ff23b305e3d2e88814a381f434477b61eacb376d41b5eecf0d249bcaa1f SHA512 582cd886f335c7985909455db11a844ce1b7c15ec418049586bacacb46ec62ee2ee5fd4ccb1fdd050e76f2080bce39ed506e51fd361695a29ab0d3ebb815b133
+EBUILD mixxx-9999.ebuild 3104 BLAKE2B cb83684c0b11f73ee9fcfdae56f6201ed53593c26325f251784b69a2fdffe1ed14025016d67dcc3c62a1e5e23993f77c55057162d4e52e73ecea680d93aba085 SHA512 1c4074ef483feac78a36575b1dee2c6a7dc6e01429bbee5877706996712f14ac8c3bf2326b9e765f1c3ca559943ff0dd5184694889bd723efc31f39e909bf0f7
 MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f
diff --git a/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch b/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch
deleted file mode 100644
index 4addc98b1e1b..000000000000
--- a/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- mixxx-release-2.2.0/src/effects/lv2/lv2backend.h
-+++ mixxx-release-2.2.0/src/effects/lv2/lv2backend.h
-@@ -5,7 +5,7 @@
- #include "effects/effectsbackend.h"
- #include "effects/lv2/lv2manifest.h"
- #include "preferences/usersettings.h"
--#include <lilv-0/lilv/lilv.h>
-+#include <lilv/lilv.h>
- 
- class LV2Backend : public EffectsBackend {
-     Q_OBJECT
---- mixxx-release-2.2.0/src/effects/lv2/lv2effectprocessor.h
-+++ mixxx-release-2.2.0/src/effects/lv2/lv2effectprocessor.h
-@@ -4,7 +4,7 @@
- #include "effects/effectprocessor.h"
- #include "effects/effectmanifest.h"
- #include "engine/effects/engineeffectparameter.h"
--#include <lilv-0/lilv/lilv.h>
-+#include <lilv/lilv.h>
- #include "effects/defs.h"
- #include "engine/engine.h"
- 
---- mixxx-release-2.2.0/src/effects/lv2/lv2manifest.h
-+++ mixxx-release-2.2.0/src/effects/lv2/lv2manifest.h
-@@ -3,7 +3,7 @@
- 
- #include "effects/effectmanifest.h"
- #include "effects/defs.h"
--#include <lilv-0/lilv/lilv.h>
-+#include <lilv/lilv.h>
- 
- class LV2Manifest {
-   public:
diff --git a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
index a985c3d324ae..a0feed265b7d 100644
--- a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild
@@ -79,7 +79,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.0-docs.patch
-	"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
 	"${FILESDIR}"/${P}-qt-5.14.patch
 )
 
diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild b/media-sound/mixxx/mixxx-2.2.4.ebuild
index f0d8272d43a6..070c9470c18f 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -79,7 +79,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.0-docs.patch
-	"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
 	"${FILESDIR}"/${PN}-2.2.3-qt-5.14.patch
 	"${FILESDIR}"/${PN}-2.2.4-metadata.patch
 )
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 3c4c7d006b0d..cac6bd5d4fe2 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -77,10 +77,6 @@ DEPEND="${RDEPEND}
 	dev-qt/qtxmlpatterns:5
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
-)
-
 src_prepare() {
 	# use multilib compatible directory for plugins
 	sed -i -e "/env.Alias('install', docs)/d;"'/unix_lib_path =/!b;n;'"s/'lib'/'$(get_libdir)'/" SConscript || die