gentoo resync : 10.12.2017

17 files changed, 26 insertions, 1323 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index a287b8faeb05..9b1c44f061fe 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 18caba70cf5c..b8773eed10ed 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -6,11 +6,11 @@ DIST audacious-plugins-3.7.1.tar.bz2 1838045 SHA256 228a384f26afb000099166776d34
 DIST audacious-plugins-3.8.2-gtk3.tar.bz2 1821924 SHA256 7849024beae61b8af3874b166cf3977905aec77859e53901158b531b31ef0cef SHA512 a5457cecc72ca4d57a3fad686b5ff42b2110d8ef65203fa49ad063c8944fc41af5d231b0870126e21c4cc8b3152de36c13726813075d26ba86450ef2132a6d33 WHIRLPOOL 0a75dd8a439dd30dce4764385fa60f317c521c3f45b5e4ae6c1d14f6a677774854d4c1650ba59facc7d204cbd53b7a8b3fca8dd94ee1b040fc2c8f444b179e4f
 DIST audacious-plugins-3.8.2.tar.bz2 1821558 SHA256 d7cefca7a0e32bf4e58bb6e84df157268b5e9a6771a0e8c2da98b03f92a5fdd4 SHA512 61be2ee962853ed05366d4089ae1bef96c282ff61a947dc32f06651a9b620035a33cf4d75f4c4d74821099f36f9124f2b2266940f4844d14ca43ef70a81cde08 WHIRLPOOL 9d87947da3a7d90f0e5262d27dcbbbff2cfc833d340e87448a11d7c5fdfd5a64d8e1f49823a50e7f6ff33214a93594051e561e75eab422aa6321402067076e75
 DIST audacious-plugins-3.9-gtk3.tar.bz2 1842950 SHA256 2ad7ec156df316a26d77918b9258133a8c08cb2ae78565336cfddb5bd81993bd SHA512 e2529af761bc97e589cac08689b16db657096b1bbfcc802789726ae1b472746025bec1b492de52eef755d7b50574d09b9250761bf701b1ca37f8a0e8db0f207b WHIRLPOOL 576acdaa673d174e956dd17142e70f867d53aec1974660f62f5cb9edd5cd7def334e163384e549e4e8b2393724b3d0ac7c43c6018e1339764b6823689e12a657
-DIST audacious-plugins-3.9.tar.bz2 1843084 SHA256 8bf7f21089cb3406968cc9c71307774aee7100ec4607f28f63cf5690d5c927b8 SHA512 00c8c53d69995ca1fedb91c7df609cc6c65b13e1af23b98a2fbda143c02ac554cc2c42c01f1c593af252e36bfb85b6324f2daca8632d3b672c69fb4dead2e3fa WHIRLPOOL e0b7cb6a6fb97d7cd69be4d2efc7867bb8510e6ea94af84055e3c61ffb8b06e716f7ac30b961155d560f4e646b82c7df894a7024cfe68c0ee47c64b9e66e9665
-EBUILD audacious-plugins-3.6.2-r1.ebuild 3883 BLAKE2B 50530f6308a792117668941d0bc3aaf2b45ace59bb8bb1d54c998a95e983cd0d2b09180931665283b5c049a50f5a53b01ebecaf9bd6ae9775c2fa7c327a94cc1 SHA512 1ff0fac526e787b28029c711c1fd6739e35af0ee4f727e1757fe1645985f3967430fa5759d0d9880c22b2b6ace1e94edfc7f1cefea8b94b992464b234152839a
-EBUILD audacious-plugins-3.7.1-r1.ebuild 4674 BLAKE2B 713fb3df520acb4d79744d8251c95961f906e1711a610551505090c8f29973680f15b02f2a829523d0f44544bf653f83d749127206e5b8e6f7801561b91b57c6 SHA512 2663757e39584dceef129102de9e0217e2d799ba9546afdb52f2b4cdcaddf7efdc2323d25a5bed99a0bbc016ad5bbe4fabe83f29699de1cb57b11bff7467aab3
-EBUILD audacious-plugins-3.7.1.ebuild 4150 BLAKE2B 448c590493eae73294ff81ac3668a3f56f77c9b576f79f4ef20cf3eab3f719e95bf505e80658f2ee171a9e7b7074719f2f38c0cd73e014f7aa7a739985758e6a SHA512 2f1ddbbffad8c71f1c52d17f2d423c142832ccc921c8337d3b2a4b4ef1f81629de1f22a56803cb950f8b8a15f0f90cdca118c8ce750c6f064d5dcc1de219b877
-EBUILD audacious-plugins-3.8.2.ebuild 4690 BLAKE2B 3af259cb075581b00bc868fb8e32d4b242bb47d2f702f24a3c92fbb48ca10123c68eb9ef9afe341c624d9add03dfab6cea63a94d714bb71d04e901e1d97b7bcd SHA512 ebdb470887627beab02472528f8ac3b2bfe275e4a2699c444fa51b275928d9a24b2724ffc7e75c4aa2e292c40daf19a260a636a91b3e7e003f21b1cef12098de
-EBUILD audacious-plugins-3.9-r1.ebuild 4476 BLAKE2B be8606b399c7cd0c394f7f9b88b2c71e2de369ea0acd2d52b0d02b0461226b12c5548debdc12bb617fc4fce7372239b092c44f9270914a49c5dffb48c7598115 SHA512 21a930cf927e3660ce682d564c46a20dbeddeccb6448e5fd8d8344a9d6983bd0da24f81554286f0cc2af4c4e2e1b968c2466f720ddae7f4d9cb042aa2f3c27f4
-EBUILD audacious-plugins-9999.ebuild 4476 BLAKE2B be8606b399c7cd0c394f7f9b88b2c71e2de369ea0acd2d52b0d02b0461226b12c5548debdc12bb617fc4fce7372239b092c44f9270914a49c5dffb48c7598115 SHA512 21a930cf927e3660ce682d564c46a20dbeddeccb6448e5fd8d8344a9d6983bd0da24f81554286f0cc2af4c4e2e1b968c2466f720ddae7f4d9cb042aa2f3c27f4
+DIST audacious-plugins-3.9.tar.bz2 1843084 BLAKE2B fa3a8433a869a2df0589f59e12513adcc0da0545b53ee441db4b18be7e12334b4125bd60b48902c37041041555859ab19df814c483f7d971214077e9980148b6 SHA512 00c8c53d69995ca1fedb91c7df609cc6c65b13e1af23b98a2fbda143c02ac554cc2c42c01f1c593af252e36bfb85b6324f2daca8632d3b672c69fb4dead2e3fa
+EBUILD audacious-plugins-3.6.2-r1.ebuild 3858 BLAKE2B 928a987d87925c79a2ab0e948b0f9cbb9f21d293dd50fffd64e88f4a4581d7a48b6a3c81e641bdcb53d88a9784bc4760f3697261a1aa7d17495029614cbf4b74 SHA512 647f9cdd86e229cb7bddaa170620dd24ad9e2d446c5577a1c081d71aadf9e7548ca6ba2286b5522d62bcf0d5a5823a57a112c6ee5171728e210026802b2a681e
+EBUILD audacious-plugins-3.7.1-r1.ebuild 4649 BLAKE2B 070e524d61287412d8cd8ba70380faa71a0934418937121ef5044cc0177aa0cf0276356b57b41b72c687b8416d635af6f007c3b2345caf3b8d971823792cef1d SHA512 b7602806e905d3289beb31f5520d71891f38ed9f1f81c9ca835bccbe1916d453736215e33979702c65bcb59ed4a85ac88e32a427d9cc7907a29827ef904e7310
+EBUILD audacious-plugins-3.7.1.ebuild 4125 BLAKE2B 580f975996f14b4f5787fde7121e6152fc9faa0a846a1bbc4cc9518381d3e1671dd762e303e467b5f80922b7994284ea99ff19b7cfc16ea8847c56d036e5db13 SHA512 3dcdd2f22c63d5849979e4e415fd05d9d9a6c58798875543720050557ad21d33ac9906bd395a2fdf74a4444065a7eabe513a344c57135c21ed98a4aad221a345
+EBUILD audacious-plugins-3.8.2.ebuild 4665 BLAKE2B 827f36fed59fc7c9dd2b40daad5df447a0fdd23b33716023bde45ca32f9a6e22ff39e2c0b67fc54282a08fd26513a2609cea966ede2c626aaba9d6496a6bab15 SHA512 48b1ebf7cbaeac6e213ce88901718f7648c0f6992b7a834885238388227d166834a1f5548f841a9101623eaad6840c39a79df2e25af27749453ee7ff6afc596a
+EBUILD audacious-plugins-3.9-r1.ebuild 4451 BLAKE2B 1f5df6f2e4390bb4f16916e6d446f6c1e90a04763ad36c86f43fa94e90ca6ef994131b77460e2eb405f99bdc800aa8e351d5c13a8d47511d19eee363fc7ee1b6 SHA512 29c3f11344d0ffb3b7c4815ed1fd646a3108b29d1cd89a2797b5a5dae0e853eb8be6afbb2b8f629b930659f3cbeeb7ee289d4bd34e9a89eef153fa1f1a198d91
+EBUILD audacious-plugins-9999.ebuild 4451 BLAKE2B 1f5df6f2e4390bb4f16916e6d446f6c1e90a04763ad36c86f43fa94e90ca6ef994131b77460e2eb405f99bdc800aa8e351d5c13a8d47511d19eee363fc7ee1b6 SHA512 29c3f11344d0ffb3b7c4815ed1fd646a3108b29d1cd89a2797b5a5dae0e853eb8be6afbb2b8f629b930659f3cbeeb7ee289d4bd34e9a89eef153fa1f1a198d91
 MISC metadata.xml 1428 BLAKE2B f6f35bd76daa789fe1700ef910aee207bf132d9dee3660796d2d6182e54f839370dcb6f7eedf73cd52d5e3713a8460fed1e9db625e5208c76f3a857cb09da24f SHA512 720a609a086b8477062fa836b1e7ac2dcca5e9a0aaac25848fd6a6c69d48fcc8161885ac9bc3c428d81c3e8e1b2256f0343c799cc07e8ceb7ec4fd2ce3d7680d
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild
index 3e86bc9211ad..1fe0269d3a09 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild
@@ -43,7 +43,7 @@ RDEPEND="app-arch/unzip
 	      dev-qt/qtmultimedia:5
 	      dev-qt/qtwidgets:5 )
 	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
+		virtual/jack )
 	lame? ( media-sound/lame )
 	libnotify? ( x11-libs/libnotify )
 	libsamplerate? ( media-libs/libsamplerate )
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.7.1-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.7.1-r1.ebuild
index 8ceb937a5ea7..c975a6da641c 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.7.1-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.7.1-r1.ebuild
@@ -68,7 +68,7 @@ RDEPEND="app-arch/unzip
 		   media-libs/adplug
 		   ~media-sound/audacious-${PV}[qt5?] )
 	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
+		virtual/jack )
 	lame? ( media-sound/lame )
 	libnotify? ( x11-libs/libnotify )
 	libsamplerate? ( media-libs/libsamplerate )
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
index 9a2b821003b7..1e4ee35fcf07 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="app-arch/unzip
 	      dev-qt/qtwidgets:5
 	      media-libs/adplug )
 	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
+		virtual/jack )
 	lame? ( media-sound/lame )
 	libnotify? ( x11-libs/libnotify )
 	libsamplerate? ( media-libs/libsamplerate )
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.8.2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.8.2.ebuild
index 716ae4cc937c..8bdbcf213002 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.8.2.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.8.2.ebuild
@@ -70,7 +70,7 @@ RDEPEND="app-arch/unzip
 		   media-libs/adplug
 		   ~media-sound/audacious-${PV}[qt5?] )
 	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
+		virtual/jack )
 	lame? ( media-sound/lame )
 	libnotify? ( x11-libs/libnotify )
 	libsamplerate? ( media-libs/libsamplerate )
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
index 4f71f7575bfc..b2c80e303ee6 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
@@ -82,7 +82,7 @@ RDEPEND="
 	)
 	jack? (
 		>=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit
+		virtual/jack
 	)
 	lame? ( media-sound/lame )
 	libnotify? ( x11-libs/libnotify )
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index 4f71f7575bfc..b2c80e303ee6 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -82,7 +82,7 @@ RDEPEND="
 	)
 	jack? (
 		>=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit
+		virtual/jack
 	)
 	lame? ( media-sound/lame )
 	libnotify? ( x11-libs/libnotify )
diff --git a/media-plugins/swh-plugins/Manifest b/media-plugins/swh-plugins/Manifest
index eee14d5f64e2..773ab3c0528a 100644
--- a/media-plugins/swh-plugins/Manifest
+++ b/media-plugins/swh-plugins/Manifest
@@ -1,10 +1,4 @@
-AUX swh-plugins-0.4.15-gettext.patch 346 BLAKE2B 24837406e0d7d3d04854d1f4b4e31ea6fdd571c33d16116d51305d12ebcee7612366063d136dbfc0865917293f3ca93fd178a4a85c26aae90ad0c4a092631e8b SHA512 66012d65930991bcc9ec58918f326bcd5bb66fb49578932ca0b23bceff3058a1310eeafdb5712c7631debf985bd327b7110bb7b7426f198b47eebbdcecc2e410
-AUX swh-plugins-0.4.15-glibc-2.10.patch 27458 BLAKE2B 4e6a59cd98965e0654b4e8eb8db8b8e6e726a04d487ffb725b48a39c2deaf8bb913935d5b52267804cacd04938717f09424f0fc4d263457b827a370804584ef6 SHA512 dc989286b2bc38ca1a369dd590c96d0e08bbb4cfd4d004909f1807889400ab40ed3994307a2e3d4b2710bb8a6dc04d2561206fd95d720cc28267ab26453c31e5
-AUX swh-plugins-0.4.15-pic.patch 5377 BLAKE2B ed7b318c075f2320d828c02c0dddb61072e093512e630a4d4d845935a6c6f4da710aa13da02a98c23ae0d0cb5b7f89381fb3defcbd1eae34b9e0eb52b71c02e9 SHA512 7876bc2653f49286f78fe5ed5cc9d0d945d323174f7c6a81a9734fad3af22498a82532722545169081e1d954424278bbeb4c4ce65ee1161f64043560e7f1f6ae
-AUX swh-plugins-0.4.15-plugindir.patch 647 BLAKE2B 2159880a0e651b18cbcd706004804234f3308a075e858ea1792c07115c92f23c826991773c2949086786378e3ba6c53387e2febb6d71a7545c1deecfb57a1cab SHA512 356dbb9551d6bf718507bcc2549ac8ac29c8d33ebd376c0c31ec83e680d67148c9aa3a67bf86c8086d0fafa19e93f532ee0fb8286a67169cffde6772cabcd5e2
-AUX swh-plugins-0.4.15-riceitdown.patch 1157 BLAKE2B 2e3e6c1aacbf04cf9ff02fa13da5dacb5dce8582b7873dee009617ac4cff17541974c98aef96fbf29fb80463bf78dfd3e02c008d9e3d35d2aa89c59f52733158 SHA512 dc4be44180641875fff8ce0a6cd1dbed2bd56ee8f7fcbc08ab317dd6653e29baf89c586605d565c40487f394d9d2032e1c244d3b7baea778163aecf0ab151590
-AUX swh-plugins-0.4.15-system_gsm.patch 1526 BLAKE2B 48ae76b85f992015729a6c603668c3c368090b20db61f49ddbfa148fcde353a6691a0685c9aadeb4916ad03d6a43e3edf5ea6473761ce7ea52df89281f32b0aa SHA512 10c4250ac82880162cf23c31cc008a4c87e248f6efa8fa9be69d5df6557fc3f1489767873717bd8d956649bb4045564d24a6a1170f0aa5511b2171f558cfa499
-AUX swh-plugins-0.4.15-x86-asm-optional.patch 1444 BLAKE2B 85d74a516eb65f67aa2d1b76be2030aa872fe8e54842bc31d5e7c3714eb9b9f487755f22a394a7d686951fbcd1c7daca762c115f5eae7ff80f68b99feb9209f3 SHA512 d850ca895c1935ee74aef8ab8889792fefd2cfbd10416abe4e6d9b1a6c04405535c7bb0e511752205d67e8549a8a5d07e423af84d53483c49c2c53a4405ea023
-DIST swh-plugins-0.4.15.tar.gz 1051623 SHA256 d05ee8a4f4d92e828412bce3449a034f6ef16bb630eaf60f8fe4e15a89168640 SHA512 b26d11f3887d03d39187b86f8e4061e3808ac03fa49caf24256ae457a0156be5982fe687ed50fa4240ccbb3e6250ed920d1da8c95d57cf4313e127559491eb03 WHIRLPOOL 853af1d3c7f0593be223e722641b797e39c5e55dd09928652834cc5d48f3d1985da645f2e2ae121d9c6669ca709c363936128b5fe062889febf72ee0ed50e4a6
-EBUILD swh-plugins-0.4.15-r3.ebuild 2042 BLAKE2B 6b2508482af5fff520d523780756697bf52223da3605c4a299cce61cfdd72af5ef4dda55dce721deacf934f4f13ceed0c2281aad645bda7d8e1b6696dced39b8 SHA512 2b71fc102b1cc51c2b9917b0398448da61ab6beb05251dfb124edd8124775ffee6a4b73ad2a64152db09c4d5d7353650ad664ce430e4192f8f166b7f49d04141
+DIST swh-plugins-0.4.15-patchset.tar.bz2 5208 BLAKE2B 5ed8f49ddec0a8ed34fab05defc9489c6ae563f824f1514845719ee3716847cbeb023152d3ac1522e28712845ecd14ab62b4e4c466e9385a3df6fa3dc9a970ab SHA512 b2d016c52fa3cb90e255f26f1e9f7410b7a44b50e0ede0acc5a3092abbb65fbb455c3c3eb0059083f40556e00f95262a885c8970a8b25c310f73af6913973fc5
+DIST swh-plugins-0.4.15.tar.gz 1051623 BLAKE2B 8b18cd558160b58ad09662b3aea69ce928daa812bb5aa8089423a504a103fa6e29b4663b9bd827230742b1d7c6570c9b671b4a25cdc54e794b465edb36743a07 SHA512 b26d11f3887d03d39187b86f8e4061e3808ac03fa49caf24256ae457a0156be5982fe687ed50fa4240ccbb3e6250ed920d1da8c95d57cf4313e127559491eb03
+EBUILD swh-plugins-0.4.15-r3.ebuild 2192 BLAKE2B 738d1354b62331299688b0bc46cf228634bd77b9fcc9651598ef92257d556064af6b3b95dceedd63867b098e14297f29dd374c3d7345af1d16b079ed3bca66c9 SHA512 ec6ccabe5f96a4aa9f445954059ac17c22751cdcfa9785bc425b3c95f4b1db5fefefe6184f92bf7840934d658b78efef1f8d2422937af7e6cff310401e6b0cf8
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-gettext.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-gettext.patch
deleted file mode 100644
index 917898356e11..000000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-gettext.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: swh-plugins-0.4.15/configure.in
-===================================================================
---- swh-plugins-0.4.15.orig/configure.in
-+++ swh-plugins-0.4.15/configure.in
-@@ -52,6 +52,7 @@ AC_PROG_CC
- AC_REQUIRE_CPP
- ALL_LINGUAS="en_GB"
- AM_GNU_GETTEXT([external])
-+AM_GNU_GETTEXT_VERSION([0.13])
- AC_C_BIGENDIAN
- 
- LIBS="$LIBS -lm"
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-glibc-2.10.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-glibc-2.10.patch
deleted file mode 100644
index f2c07a2b146d..000000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-glibc-2.10.patch
+++ /dev/null
@@ -1,1045 +0,0 @@
-diff -ur a/alias_1407.c b/alias_1407.c
---- a/alias_1407.c	2004-10-26 17:35:36.000000000 +0400
-+++ b/alias_1407.c	2009-06-13 14:35:24.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/allpass_1895.c b/allpass_1895.c
---- a/allpass_1895.c	2004-10-26 17:35:42.000000000 +0400
-+++ b/allpass_1895.c	2009-06-13 14:38:16.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/am_pitchshift_1433.c b/am_pitchshift_1433.c
---- a/am_pitchshift_1433.c	2004-10-26 17:35:40.000000000 +0400
-+++ b/am_pitchshift_1433.c	2009-06-13 14:38:25.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/amp_1181.c b/amp_1181.c
---- a/amp_1181.c	2004-10-26 17:35:32.000000000 +0400
-+++ b/amp_1181.c	2009-06-12 17:13:46.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/analogue_osc_1416.c b/analogue_osc_1416.c
---- a/analogue_osc_1416.c	2004-10-26 17:35:38.000000000 +0400
-+++ b/analogue_osc_1416.c	2009-06-13 14:38:36.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/bandpass_a_iir_1893.c b/bandpass_a_iir_1893.c
---- a/bandpass_a_iir_1893.c	2004-10-26 17:35:41.000000000 +0400
-+++ b/bandpass_a_iir_1893.c	2009-06-13 14:38:42.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/bandpass_iir_1892.c b/bandpass_iir_1892.c
---- a/bandpass_iir_1892.c	2004-10-26 17:35:41.000000000 +0400
-+++ b/bandpass_iir_1892.c	2009-06-13 14:38:48.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/bode_shifter_1431.c b/bode_shifter_1431.c
---- a/bode_shifter_1431.c	2004-10-26 17:35:40.000000000 +0400
-+++ b/bode_shifter_1431.c	2009-06-13 14:38:54.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/bode_shifter_cv_1432.c b/bode_shifter_cv_1432.c
---- a/bode_shifter_cv_1432.c	2004-10-26 17:35:40.000000000 +0400
-+++ b/bode_shifter_cv_1432.c	2009-06-13 14:39:00.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/butterworth_1902.c b/butterworth_1902.c
---- a/butterworth_1902.c	2004-10-26 17:35:42.000000000 +0400
-+++ b/butterworth_1902.c	2009-06-13 14:39:07.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/chebstortion_1430.c b/chebstortion_1430.c
---- a/chebstortion_1430.c	2004-10-26 17:35:40.000000000 +0400
-+++ b/chebstortion_1430.c	2009-06-13 14:39:13.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/comb_1190.c b/comb_1190.c
---- a/comb_1190.c	2004-10-26 17:35:32.000000000 +0400
-+++ b/comb_1190.c	2009-06-12 17:26:17.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/comb_1887.c b/comb_1887.c
---- a/comb_1887.c	2004-10-26 17:35:42.000000000 +0400
-+++ b/comb_1887.c	2009-06-13 14:45:46.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/comb_splitter_1411.c b/comb_splitter_1411.c
---- a/comb_splitter_1411.c	2004-10-26 17:35:37.000000000 +0400
-+++ b/comb_splitter_1411.c	2009-06-13 14:36:12.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/const_1909.c b/const_1909.c
---- a/const_1909.c	2004-10-26 17:35:43.000000000 +0400
-+++ b/const_1909.c	2009-06-13 14:49:01.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/crossover_dist_1404.c b/crossover_dist_1404.c
---- a/crossover_dist_1404.c	2005-07-20 15:36:59.000000000 +0400
-+++ b/crossover_dist_1404.c	2009-06-13 14:31:57.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/dc_remove_1207.c b/dc_remove_1207.c
---- a/dc_remove_1207.c	2004-10-26 17:35:34.000000000 +0400
-+++ b/dc_remove_1207.c	2009-06-12 17:31:35.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/decay_1886.c b/decay_1886.c
---- a/decay_1886.c	2004-10-26 17:35:43.000000000 +0400
-+++ b/decay_1886.c	2009-06-13 14:46:06.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/decimator_1202.c b/decimator_1202.c
---- a/decimator_1202.c	2004-10-26 17:35:33.000000000 +0400
-+++ b/decimator_1202.c	2009-06-12 17:29:58.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/declip_1195.c b/declip_1195.c
---- a/declip_1195.c	2004-10-26 17:35:32.000000000 +0400
-+++ b/declip_1195.c	2009-06-12 17:27:08.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/delay_1898.c b/delay_1898.c
---- a/delay_1898.c	2004-10-26 17:35:43.000000000 +0400
-+++ b/delay_1898.c	2009-06-13 14:46:20.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/delayorama_1402.c b/delayorama_1402.c
---- a/delayorama_1402.c	2004-10-26 17:35:36.000000000 +0400
-+++ b/delayorama_1402.c	2009-06-13 14:31:08.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/diode_1185.c b/diode_1185.c
---- a/diode_1185.c	2004-10-26 17:35:32.000000000 +0400
-+++ b/diode_1185.c	2009-06-12 17:16:36.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/divider_1186.c b/divider_1186.c
---- a/divider_1186.c	2004-10-26 17:35:32.000000000 +0400
-+++ b/divider_1186.c	2009-06-12 17:19:08.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/dj_eq_1901.c b/dj_eq_1901.c
---- a/dj_eq_1901.c	2004-10-26 17:35:42.000000000 +0400
-+++ b/dj_eq_1901.c	2009-06-13 14:44:52.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/dj_flanger_1438.c b/dj_flanger_1438.c
---- a/dj_flanger_1438.c	2004-10-26 17:35:40.000000000 +0400
-+++ b/dj_flanger_1438.c	2009-06-13 14:44:55.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/dyson_compress_1403.c b/dyson_compress_1403.c
---- a/dyson_compress_1403.c	2004-10-26 17:35:36.000000000 +0400
-+++ b/dyson_compress_1403.c	2009-06-13 14:31:22.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/fad_delay_1192.c b/fad_delay_1192.c
---- a/fad_delay_1192.c	2005-07-20 15:36:51.000000000 +0400
-+++ b/fad_delay_1192.c	2009-06-12 17:31:17.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/fast_lookahead_limiter_1913.c b/fast_lookahead_limiter_1913.c
---- a/fast_lookahead_limiter_1913.c	2006-08-08 19:49:13.000000000 +0400
-+++ b/fast_lookahead_limiter_1913.c	2009-06-13 14:46:45.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/flanger_1191.c b/flanger_1191.c
---- a/flanger_1191.c	2004-10-26 17:35:33.000000000 +0400
-+++ b/flanger_1191.c	2009-06-12 17:29:41.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/fm_osc_1415.c b/fm_osc_1415.c
---- a/fm_osc_1415.c	2004-10-26 17:35:38.000000000 +0400
-+++ b/fm_osc_1415.c	2009-06-13 14:41:09.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/foldover_1213.c b/foldover_1213.c
---- a/foldover_1213.c	2004-10-26 17:35:35.000000000 +0400
-+++ b/foldover_1213.c	2009-06-13 14:20:25.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/foverdrive_1196.c b/foverdrive_1196.c
---- a/foverdrive_1196.c	2004-10-26 17:35:33.000000000 +0400
-+++ b/foverdrive_1196.c	2009-06-12 17:28:24.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/freq_tracker_1418.c b/freq_tracker_1418.c
---- a/freq_tracker_1418.c	2004-10-26 17:35:38.000000000 +0400
-+++ b/freq_tracker_1418.c	2009-06-13 14:42:12.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/gate_1410.c b/gate_1410.c
---- a/gate_1410.c	2004-10-26 17:35:37.000000000 +0400
-+++ b/gate_1410.c	2009-06-13 14:35:59.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/giant_flange_1437.c b/giant_flange_1437.c
---- a/giant_flange_1437.c	2004-10-26 17:35:41.000000000 +0400
-+++ b/giant_flange_1437.c	2009-06-13 14:41:24.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/gong_1424.c b/gong_1424.c
---- a/gong_1424.c	2004-10-26 17:35:39.000000000 +0400
-+++ b/gong_1424.c	2009-06-13 14:41:17.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/gong_beater_1439.c b/gong_beater_1439.c
---- a/gong_beater_1439.c	2004-10-26 17:35:41.000000000 +0400
-+++ b/gong_beater_1439.c	2009-06-13 14:45:27.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/gsm_1215.c b/gsm_1215.c
---- a/gsm_1215.c	2004-10-26 17:35:35.000000000 +0400
-+++ b/gsm_1215.c	2009-06-13 14:28:45.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/gverb_1216.c b/gverb_1216.c
---- a/gverb_1216.c	2004-10-26 17:35:35.000000000 +0400
-+++ b/gverb_1216.c	2009-06-13 14:29:13.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/hard_limiter_1413.c b/hard_limiter_1413.c
---- a/hard_limiter_1413.c	2004-10-26 17:35:37.000000000 +0400
-+++ b/hard_limiter_1413.c	2009-06-13 14:30:04.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/harmonic_gen_1220.c b/harmonic_gen_1220.c
---- a/harmonic_gen_1220.c	2004-10-26 17:35:36.000000000 +0400
-+++ b/harmonic_gen_1220.c	2009-06-13 14:30:44.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/hermes_filter_1200.c b/hermes_filter_1200.c
---- a/hermes_filter_1200.c	2004-10-26 17:35:33.000000000 +0400
-+++ b/hermes_filter_1200.c	2009-06-12 17:29:01.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/highpass_iir_1890.c b/highpass_iir_1890.c
---- a/highpass_iir_1890.c	2004-10-26 17:35:41.000000000 +0400
-+++ b/highpass_iir_1890.c	2009-06-13 14:43:51.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/hilbert_1440.c b/hilbert_1440.c
---- a/hilbert_1440.c	2004-10-26 17:35:41.000000000 +0400
-+++ b/hilbert_1440.c	2009-06-13 14:43:48.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/imp_1199.c b/imp_1199.c
---- a/imp_1199.c	2006-08-08 19:49:15.000000000 +0400
-+++ b/imp_1199.c	2009-06-13 14:43:43.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/impulse_1885.c b/impulse_1885.c
---- a/impulse_1885.c	2004-10-26 17:35:43.000000000 +0400
-+++ b/impulse_1885.c	2009-06-13 14:43:40.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/inv_1429.c b/inv_1429.c
---- a/inv_1429.c	2004-10-26 17:35:40.000000000 +0400
-+++ b/inv_1429.c	2009-06-13 14:43:34.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/karaoke_1409.c b/karaoke_1409.c
---- a/karaoke_1409.c	2004-10-26 17:35:37.000000000 +0400
-+++ b/karaoke_1409.c	2009-06-13 14:35:45.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/latency_1914.c b/latency_1914.c
---- a/latency_1914.c	2004-10-26 17:35:44.000000000 +0400
-+++ b/latency_1914.c	2009-06-13 14:46:57.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/lcr_delay_1436.c b/lcr_delay_1436.c
---- a/lcr_delay_1436.c	2004-10-26 17:35:40.000000000 +0400
-+++ b/lcr_delay_1436.c	2009-06-13 14:44:08.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/lowpass_iir_1891.c b/lowpass_iir_1891.c
---- a/lowpass_iir_1891.c	2004-10-26 17:35:42.000000000 +0400
-+++ b/lowpass_iir_1891.c	2009-06-13 14:44:23.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/ls_filter_1908.c b/ls_filter_1908.c
---- a/ls_filter_1908.c	2004-10-26 17:35:43.000000000 +0400
-+++ b/ls_filter_1908.c	2009-06-13 14:44:27.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/matrix_ms_st_1421.c b/matrix_ms_st_1421.c
---- a/matrix_ms_st_1421.c	2004-10-26 17:35:38.000000000 +0400
-+++ b/matrix_ms_st_1421.c	2009-06-13 14:42:39.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/matrix_spatialiser_1422.c b/matrix_spatialiser_1422.c
---- a/matrix_spatialiser_1422.c	2004-10-26 17:35:38.000000000 +0400
-+++ b/matrix_spatialiser_1422.c	2009-06-13 14:42:44.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/matrix_st_ms_1420.c b/matrix_st_ms_1420.c
---- a/matrix_st_ms_1420.c	2004-10-26 17:35:38.000000000 +0400
-+++ b/matrix_st_ms_1420.c	2009-06-13 14:42:48.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/mbeq_1197.c b/mbeq_1197.c
---- a/mbeq_1197.c	2006-08-08 19:49:15.000000000 +0400
-+++ b/mbeq_1197.c	2009-06-13 14:42:52.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/mod_delay_1419.c b/mod_delay_1419.c
---- a/mod_delay_1419.c	2004-10-26 17:35:38.000000000 +0400
-+++ b/mod_delay_1419.c	2009-06-13 14:42:21.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/multivoice_chorus_1201.c b/multivoice_chorus_1201.c
---- a/multivoice_chorus_1201.c	2004-10-26 17:35:33.000000000 +0400
-+++ b/multivoice_chorus_1201.c	2009-06-12 17:29:23.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/notch_iir_1894.c b/notch_iir_1894.c
---- a/notch_iir_1894.c	2004-10-26 17:35:42.000000000 +0400
-+++ b/notch_iir_1894.c	2009-06-13 14:42:30.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/phasers_1217.c b/phasers_1217.c
---- a/phasers_1217.c	2004-10-26 17:35:35.000000000 +0400
-+++ b/phasers_1217.c	2009-06-13 14:30:24.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/pitch_scale_1193.c b/pitch_scale_1193.c
---- a/pitch_scale_1193.c	2004-10-26 17:35:44.000000000 +0400
-+++ b/pitch_scale_1193.c	2009-06-13 14:42:03.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/pitch_scale_1194.c b/pitch_scale_1194.c
---- a/pitch_scale_1194.c	2004-10-26 17:35:44.000000000 +0400
-+++ b/pitch_scale_1194.c	2009-06-13 14:41:59.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/plate_1423.c b/plate_1423.c
---- a/plate_1423.c	2004-10-26 17:35:39.000000000 +0400
-+++ b/plate_1423.c	2009-06-13 14:41:55.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/pointer_cast_1910.c b/pointer_cast_1910.c
---- a/pointer_cast_1910.c	2004-10-26 17:35:43.000000000 +0400
-+++ b/pointer_cast_1910.c	2009-06-13 14:41:50.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/rate_shifter_1417.c b/rate_shifter_1417.c
---- a/rate_shifter_1417.c	2004-10-26 17:35:38.000000000 +0400
-+++ b/rate_shifter_1417.c	2009-06-13 14:41:44.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/retro_flange_1208.c b/retro_flange_1208.c
---- a/retro_flange_1208.c	2004-10-26 17:35:34.000000000 +0400
-+++ b/retro_flange_1208.c	2009-06-12 17:42:45.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/revdelay_1605.c b/revdelay_1605.c
---- a/revdelay_1605.c	2004-10-26 17:35:43.000000000 +0400
-+++ b/revdelay_1605.c	2009-06-13 14:46:32.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/ringmod_1188.c b/ringmod_1188.c
---- a/ringmod_1188.c	2004-10-26 17:35:32.000000000 +0400
-+++ b/ringmod_1188.c	2009-06-12 17:24:55.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/satan_maximiser_1408.c b/satan_maximiser_1408.c
---- a/satan_maximiser_1408.c	2004-10-26 17:35:37.000000000 +0400
-+++ b/satan_maximiser_1408.c	2009-06-13 14:35:36.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/sc1_1425.c b/sc1_1425.c
---- a/sc1_1425.c	2004-10-26 17:35:39.000000000 +0400
-+++ b/sc1_1425.c	2009-06-13 14:43:09.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/sc2_1426.c b/sc2_1426.c
---- a/sc2_1426.c	2004-10-26 17:35:39.000000000 +0400
-+++ b/sc2_1426.c	2009-06-13 14:37:55.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/sc3_1427.c b/sc3_1427.c
---- a/sc3_1427.c	2004-10-26 17:35:39.000000000 +0400
-+++ b/sc3_1427.c	2009-06-13 14:37:48.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/sc4_1882.c b/sc4_1882.c
---- a/sc4_1882.c	2005-07-20 15:37:15.000000000 +0400
-+++ b/sc4_1882.c	2009-06-13 14:37:41.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/sc4m_1916.c b/sc4m_1916.c
---- a/sc4m_1916.c	2006-08-08 19:49:14.000000000 +0400
-+++ b/sc4m_1916.c	2009-06-13 14:37:27.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/se4_1883.c b/se4_1883.c
---- a/se4_1883.c	2004-10-26 17:35:41.000000000 +0400
-+++ b/se4_1883.c	2009-06-13 14:37:22.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/shaper_1187.c b/shaper_1187.c
---- a/shaper_1187.c	2004-10-26 17:35:32.000000000 +0400
-+++ b/shaper_1187.c	2009-06-12 17:20:04.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/sifter_1210.c b/sifter_1210.c
---- a/sifter_1210.c	2004-10-26 17:35:34.000000000 +0400
-+++ b/sifter_1210.c	2009-06-12 17:43:33.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/sin_cos_1881.c b/sin_cos_1881.c
---- a/sin_cos_1881.c	2004-10-26 17:35:41.000000000 +0400
-+++ b/sin_cos_1881.c	2009-06-13 14:40:51.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/single_para_1203.c b/single_para_1203.c
---- a/single_para_1203.c	2004-10-26 17:35:34.000000000 +0400
-+++ b/single_para_1203.c	2009-06-12 17:30:27.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/sinus_wavewrapper_1198.c b/sinus_wavewrapper_1198.c
---- a/sinus_wavewrapper_1198.c	2004-10-26 17:35:33.000000000 +0400
-+++ b/sinus_wavewrapper_1198.c	2009-06-12 17:28:42.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/smooth_decimate_1414.c b/smooth_decimate_1414.c
---- a/smooth_decimate_1414.c	2004-10-26 17:35:38.000000000 +0400
-+++ b/smooth_decimate_1414.c	2009-06-13 14:40:12.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/split_1406.c b/split_1406.c
---- a/split_1406.c	2004-10-26 17:35:37.000000000 +0400
-+++ b/split_1406.c	2009-06-13 14:35:10.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/step_muxer_1212.c b/step_muxer_1212.c
---- a/step_muxer_1212.c	2004-10-26 17:35:35.000000000 +0400
-+++ b/step_muxer_1212.c	2009-06-13 14:19:49.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/surround_encoder_1401.c b/surround_encoder_1401.c
---- a/surround_encoder_1401.c	2004-10-26 17:35:36.000000000 +0400
-+++ b/surround_encoder_1401.c	2009-06-13 14:30:56.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/svf_1214.c b/svf_1214.c
---- a/svf_1214.c	2006-08-08 19:48:36.000000000 +0400
-+++ b/svf_1214.c	2009-06-13 14:21:03.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/tape_delay_1211.c b/tape_delay_1211.c
---- a/tape_delay_1211.c	2005-07-20 15:36:53.000000000 +0400
-+++ b/tape_delay_1211.c	2009-06-12 17:43:51.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/transient_1206.c b/transient_1206.c
---- a/transient_1206.c	2004-10-26 17:35:34.000000000 +0400
-+++ b/transient_1206.c	2009-06-12 17:31:00.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/triple_para_1204.c b/triple_para_1204.c
---- a/triple_para_1204.c	2004-10-26 17:35:34.000000000 +0400
-+++ b/triple_para_1204.c	2009-06-12 17:30:40.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/valve_1209.c b/valve_1209.c
---- a/valve_1209.c	2006-08-08 19:48:34.000000000 +0400
-+++ b/valve_1209.c	2009-06-12 17:43:08.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/valve_rect_1405.c b/valve_rect_1405.c
---- a/valve_rect_1405.c	2004-10-26 17:35:36.000000000 +0400
-+++ b/valve_rect_1405.c	2009-06-13 14:32:11.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/vynil_1905.c b/vynil_1905.c
---- a/vynil_1905.c	2004-10-26 17:35:43.000000000 +0400
-+++ b/vynil_1905.c	2009-06-13 14:37:13.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/wave_terrain_1412.c b/wave_terrain_1412.c
---- a/wave_terrain_1412.c	2004-10-26 17:35:37.000000000 +0400
-+++ b/wave_terrain_1412.c	2009-06-13 14:36:28.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/xfade_1915.c b/xfade_1915.c
---- a/xfade_1915.c	2005-07-20 15:37:32.000000000 +0400
-+++ b/xfade_1915.c	2009-06-13 14:40:40.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
-diff -ur a/zm1_1428.c b/zm1_1428.c
---- a/zm1_1428.c	2004-10-26 17:35:39.000000000 +0400
-+++ b/zm1_1428.c	2009-06-13 14:40:45.000000000 +0400
-@@ -6,6 +6,7 @@
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
- 
- #define         _ISOC9X_SOURCE  1
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-pic.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-pic.patch
deleted file mode 100644
index 58fcd64bce88..000000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-pic.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Index: swh-plugins-0.4.15/gsm/Makefile.am
-===================================================================
---- swh-plugins-0.4.15.orig/gsm/Makefile.am
-+++ swh-plugins-0.4.15/gsm/Makefile.am
-@@ -2,12 +2,12 @@ LIBTOOL=libtool
- RANLIB=ranlib
- 
- noinst_HEADERS = gsm.h config.h private.h proto.h unproto.h
--noinst_LIBRARIES = libgsm.a
-+noinst_LTLIBRARIES = libgsm.la
- 
- CFILES = add.c decode.c gsm_decode.c gsm_encode.c long_term.c preprocess.c \
- 	short_term.c code.c gsm_create.c gsm_destroy.c gsm_option.c lpc.c rpe.c table.c
- 
--libgsm_a_SOURCES = $(CFILES) $(noinst_HEADERS)
-+libgsm_la_SOURCES = $(CFILES) $(noinst_HEADERS)
- 
- # Disable autoheader. 
- AUTOHEADER=echo
-Index: swh-plugins-0.4.15/Makefile.am
-===================================================================
---- swh-plugins-0.4.15.orig/Makefile.am
-+++ swh-plugins-0.4.15/Makefile.am
-@@ -48,10 +48,10 @@ DESTDIR = $(INSTALL_ROOT)
- DISTFN = $(distdir)
- 
- # Files needed for FFT based plugins
--pitch_scale_1193_la_LIBADD = util/libpitchscale.a $(FFTW_LIBS)
-+pitch_scale_1193_la_LIBADD = util/libpitchscale.la $(FFTW_LIBS)
- pitch_scale_1193_la_CFLAGS = $(FFTW_CFLAGS)
- pitch_scale_1193_la_SOURCES = pitch_scale_1193.c
--pitch_scale_1194_la_LIBADD = util/libpitchscale.a $(FFTW_LIBS)
-+pitch_scale_1194_la_LIBADD = util/libpitchscale.la $(FFTW_LIBS)
- pitch_scale_1194_la_CFLAGS = $(FFTW_CFLAGS)
- pitch_scale_1194_la_SOURCES = pitch_scale_1194.c
- mbeq_1197_la_LIBADD = $(FFTW_LIBS)
-@@ -60,33 +60,33 @@ mbeq_1197_la_SOURCES = mbeq_1197.c
- imp_1199_la_LIBADD = $(FFTW_LIBS)
- imp_1199_la_CFLAGS = $(FFTW_CFLAGS)
- imp_1199_la_DEPENDENCIES = @top_srcdir@/impulses/*
--hermes_filter_1200_la_DEPENDENCIES = util/libblo.a
--hermes_filter_1200_la_LIBADD = util/libblo.a
--fm_osc_1415_la_DEPENDENCIES = util/libblo.a
--fm_osc_1415_la_LIBADD = util/libblo.a
--analogue_osc_1416_la_DEPENDENCIES = util/libblo.a
--analogue_osc_1416_la_LIBADD = util/libblo.a
--sc1_1425_la_LIBADD = util/libdb.a util/librms.a
--sc2_1426_la_LIBADD = util/libdb.a util/librms.a
--sc3_1427_la_LIBADD = util/libdb.a util/librms.a
--sc4_1882_la_LIBADD = util/libdb.a util/librms.a
--sc4m_1916_la_LIBADD = util/libdb.a util/librms.a
--se4_1883_la_LIBADD = util/libdb.a util/librms.a
--gsm_1215_la_LIBADD = gsm/libgsm.a
--gverb_1216_la_LIBADD = gverb/libgverb.a
-+hermes_filter_1200_la_DEPENDENCIES = util/libblo.la
-+hermes_filter_1200_la_LIBADD = util/libblo.la
-+fm_osc_1415_la_DEPENDENCIES = util/libblo.la
-+fm_osc_1415_la_LIBADD = util/libblo.la
-+analogue_osc_1416_la_DEPENDENCIES = util/libblo.la
-+analogue_osc_1416_la_LIBADD = util/libblo.la
-+sc1_1425_la_LIBADD = util/libdb.la util/librms.la
-+sc2_1426_la_LIBADD = util/libdb.la util/librms.la
-+sc3_1427_la_LIBADD = util/libdb.la util/librms.la
-+sc4_1882_la_LIBADD = util/libdb.la util/librms.la
-+sc4m_1916_la_LIBADD = util/libdb.la util/librms.la
-+se4_1883_la_LIBADD = util/libdb.la util/librms.la
-+gsm_1215_la_LIBADD = gsm/libgsm.la
-+gverb_1216_la_LIBADD = gverb/libgverb.la
- lcr_delay_1436_la_DEPENDENCIES = util/biquad.h
- 
--highpass_iir_1890_la_LIBADD = util/libiir.a
-+highpass_iir_1890_la_LIBADD = util/libiir.la
- highpass_iir_1890_la_SOURCES = highpass_iir_1890.c
--lowpass_iir_1891_la_LIBADD = util/libiir.a
-+lowpass_iir_1891_la_LIBADD = util/libiir.la
- lowpass_iir_1891_la_SOURCES = lowpass_iir_1891.c
--bandpass_iir_1892_la_LIBADD = util/libiir.a
-+bandpass_iir_1892_la_LIBADD = util/libiir.la
- bandpass_iir_1892_la_SOURCES = bandpass_iir_1892.c
--bandpass_a_iir_1893_la_LIBADD = util/libiir.a
-+bandpass_a_iir_1893_la_LIBADD = util/libiir.la
- bandpass_a_iir_1893_la_SOURCES = bandpass_a_iir_1893.c
--notch_iir_1894_la_LIBADD = util/libiir.a
-+notch_iir_1894_la_LIBADD = util/libiir.la
- notch_iir_1894_la_SOURCES = notch_iir_1894.c
--butterworth_1902_la_LIBADD = util/libiir.a
-+butterworth_1902_la_LIBADD = util/libiir.la
- butterworth_1902_la_SOURCES = butterworth_1902.c
- 
- # Rule to build .c files from XML source
-Index: swh-plugins-0.4.15/util/Makefile.am
-===================================================================
---- swh-plugins-0.4.15.orig/util/Makefile.am
-+++ swh-plugins-0.4.15/util/Makefile.am
-@@ -3,16 +3,16 @@ RANLIB=ranlib
- 
- noinst_HEADERS = rms.h db.h blo.h pitchscale.h waveguide_nl.h biquad.h iir.h buffer.h ls_filter.h
- 
--noinst_LIBRARIES = librms.a libdb.a libblo.a libpitchscale.a libiir.a
-+noinst_LTLIBRARIES = librms.la libdb.la libblo.la libpitchscale.la libiir.la
- 
--librms_a_SOURCES = rms.c
--libdb_a_SOURCES = db.c
--libblo_a_SOURCES = blo.c
--libblo_a_CFLAGS = -I@top_srcdir@
--libpitchscale_a_SOURCES = pitchscale.c
--libpitchscale_a_CFLAGS = $(FFTW_CFLAGS)
-+librms_la_SOURCES = rms.c
-+libdb_la_SOURCES = db.c
-+libblo_la_SOURCES = blo.c
-+libblo_la_CFLAGS = -I@top_srcdir@
-+libpitchscale_la_SOURCES = pitchscale.c
-+libpitchscale_la_CFLAGS = $(FFTW_CFLAGS)
- #libpitchscale_a_LIBS = $(FFTW_LIBS)
--libiir_a_SOURCES = iir.c
-+libiir_la_SOURCES = iir.c
- #libbuffer_a_SOURCES = buffer.c
- # Disable autoheader. 
- AUTOHEADER=echo
-Index: swh-plugins-0.4.15/gverb/Makefile.am
-===================================================================
---- swh-plugins-0.4.15.orig/gverb/Makefile.am
-+++ swh-plugins-0.4.15/gverb/Makefile.am
-@@ -3,9 +3,9 @@ RANLIB=ranlib
- 
- noinst_HEADERS = gverb.h gverbdsp.h
- 
--noinst_LIBRARIES = libgverb.a
-+noinst_LTLIBRARIES = libgverb.la
- 
--libgverb_a_SOURCES = gverb.c gverbdsp.c
-+libgverb_la_SOURCES = gverb.c gverbdsp.c
- 
- # Disable autoheader. 
- AUTOHEADER=echo
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-plugindir.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-plugindir.patch
deleted file mode 100644
index 011ea9882090..000000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-plugindir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: swh-plugins-0.4.15/Makefile.am
-===================================================================
---- swh-plugins-0.4.15.orig/Makefile.am
-+++ swh-plugins-0.4.15/Makefile.am
-@@ -39,7 +39,7 @@ SUBDIRS = m4  po util gsm gverb metadata
- EXTRA_DIST = @top_srcdir@/*.xml @top_srcdir@/*.c @top_srcdir@/*.h \
- 	@top_srcdir@/*.dtd @top_srcdir@/*.pl @top_srcdir@/*.css \
- 	@top_srcdir@/impulses/*.h autogen.sh bozosoity-checker.pl
--plugindir = @prefix@/lib/ladspa
-+plugindir = $(libdir)/ladspa
- 
- # Uncomment below for Darwin support.  Or add a conditional for this.
- #AM_CFLAGS = -fno-common -flat_namespace -bundle -undefined suppress -lbundle1.o
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-riceitdown.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-riceitdown.patch
deleted file mode 100644
index f514425e2a94..000000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-riceitdown.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: swh-plugins-0.4.15/configure.in
-===================================================================
---- swh-plugins-0.4.15.orig/configure.in
-+++ swh-plugins-0.4.15/configure.in
-@@ -99,12 +99,12 @@ else
-   AC_MSG_WARN([Can't find architecture specifaction in CFLAGS, picking one from build host CPU type])
-   AC_MSG_WARN([May result in non-portable code])
-   dnl For gcc use:
--  MACHINE="-march=${build_cpu}"
--  if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
--  if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
--  if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
--
--  CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
-+  # MACHINE="-march=${build_cpu}"
-+  # if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
-+  # if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
-+  # if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
-+  # 
-+  # CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
- 
-   dnl For Intel's C compiler use:
-   dnl CC="icc"
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-system_gsm.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-system_gsm.patch
deleted file mode 100644
index cc80af1f58c5..000000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-system_gsm.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: swh-plugins-0.4.15/Makefile.am
-===================================================================
---- swh-plugins-0.4.15.orig/Makefile.am
-+++ swh-plugins-0.4.15/Makefile.am
-@@ -33,7 +33,7 @@ plugin_LTLIBRARIES = \
- 	latency_1914.la xfade_1915.la sc4m_1916.la \
- 	mbeq_1197.la pitch_scale_1193.la pitch_scale_1194.la imp_1199.la
- 
--SUBDIRS = m4  po util gsm gverb metadata
-+SUBDIRS = m4  po util gverb metadata
- 
- # Wacky stuff to stop automake getting confused
- EXTRA_DIST = @top_srcdir@/*.xml @top_srcdir@/*.c @top_srcdir@/*.h \
-@@ -72,7 +72,7 @@ sc3_1427_la_LIBADD = util/libdb.la util/
- sc4_1882_la_LIBADD = util/libdb.la util/librms.la
- sc4m_1916_la_LIBADD = util/libdb.la util/librms.la
- se4_1883_la_LIBADD = util/libdb.la util/librms.la
--gsm_1215_la_LIBADD = gsm/libgsm.la
-+gsm_1215_la_LIBADD = @GSM_LIBS@
- gverb_1216_la_LIBADD = gverb/libgverb.la
- lcr_delay_1436_la_DEPENDENCIES = util/biquad.h
- 
-Index: swh-plugins-0.4.15/configure.in
-===================================================================
---- swh-plugins-0.4.15.orig/configure.in
-+++ swh-plugins-0.4.15/configure.in
-@@ -136,17 +136,19 @@ else
-   AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
- fi
- 
--subdirs="util gsm gverb metadata"
-+GSM_LIBS=-lgsm
-+
-+subdirs="util gverb metadata"
- 
- AC_SUBST(subdirs)
- AC_SUBST(FFTW_LIBS)
- AC_SUBST(STATIC_FFTW_LIBS)
- AC_SUBST(FFTW_CFLAGS)
-+AC_SUBST(GSM_LIBS)
- AC_SUBST(LIBTOOL)
- AC_OUTPUT([ m4/Makefile 
- Makefile
- util/Makefile
--gsm/Makefile
- gverb/Makefile
- metadata/Makefile
- po/Makefile.in
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-x86-asm-optional.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-x86-asm-optional.patch
deleted file mode 100644
index b18ff39948e6..000000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-x86-asm-optional.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur swh-plugins-0.4.15/configure.in swh-plugins-0.4.15-teknohog/configure.in
---- swh-plugins-0.4.15/configure.in	2006-08-08 18:47:16.000000000 +0300
-+++ swh-plugins-0.4.15-teknohog/configure.in	2012-07-04 16:20:19.000000000 +0300
-@@ -87,9 +87,9 @@
- AC_CHECK_FUNC(shm_open,,[AC_CHECK_LIB(rt,shm_open)])
- AC_C99_FUNC_LRINTF()
- 
--AC_ARG_ENABLE(3dnow, [  --enable-3dnow Enables 3DNow! acceleration], AC_DEFINE_UNQUOTED(ACCEL_3DNOW, ""))
--AC_ARG_ENABLE(sse, [  --enable-sse Uses SSE instructions where possible, requires gcc3 and a processor with SSE support], USE_SSE="-msse -mfpmath=sse -malign-double")
--AC_ARG_ENABLE(darwin, [  --enable-darwin Builds plugins that will be shared object in the Darwin OS], DARWIN_CFLAGS="-fno-common -flat_namespace -bundle -undefined suppress -lbundle1.o")
-+AC_ARG_ENABLE(3dnow, [  --enable-3dnow Enables 3DNow! acceleration], AS_IF([test "x$enableval" = "xyes"], [AC_DEFINE_UNQUOTED(ACCEL_3DNOW, "")]))
-+AC_ARG_ENABLE(sse, [  --enable-sse Uses SSE instructions where possible, requires gcc3 and a processor with SSE support], AS_IF([test "x$enableval" = "xyes"], [USE_SSE="-msse -mfpmath=sse -malign-double"]))
-+AC_ARG_ENABLE(darwin, [  --enable-darwin Builds plugins that will be shared object in the Darwin OS], AS_IF([test "x$enableval" = "xyes"], [DARWIN_CFLAGS="-fno-common -flat_namespace -bundle -undefined suppress -lbundle1.o"]))
- 
- CFLAGS=$lrintf_save_CFLAGS -I@top_srcdir@/intl -I@top_srcdir@
- 
diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
index f77be26ee576..3959e3ddf9ce 100644
--- a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
+++ b/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,8 @@ inherit eutils autotools multilib-minimal
 
 DESCRIPTION="Large collection of LADSPA audio plugins/effects"
 HOMEPAGE="http://plugin.org.uk"
-SRC_URI="http://plugin.org.uk/releases/${PV}/${P}.tar.gz"
+SRC_URI="http://plugin.org.uk/releases/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -27,16 +28,16 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog README TODO )
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-pic.patch"
-	epatch "${FILESDIR}/${P}-plugindir.patch"
-	epatch "${FILESDIR}/${P}-riceitdown.patch"
-	epatch "${FILESDIR}/${P}-gettext.patch"
-	epatch "${FILESDIR}/${P}-x86-asm-optional.patch"
-	epatch "${FILESDIR}/${P}-glibc-2.10.patch"
+	epatch "${WORKDIR}/${P}-patchset/${P}-pic.patch"
+	epatch "${WORKDIR}/${P}-patchset/${P}-plugindir.patch"
+	epatch "${WORKDIR}/${P}-patchset/${P}-riceitdown.patch"
+	epatch "${WORKDIR}/${P}-patchset/${P}-gettext.patch"
+	epatch "${WORKDIR}/${P}-patchset/${P}-x86-asm-optional.patch"
+	epatch "${WORKDIR}/${P}-patchset/${P}-glibc-2.10.patch"
 
 	# Use system libgsm, bug #252890
 	rm -rf gsm
-	epatch "${FILESDIR}/${P}-system_gsm.patch"
+	epatch "${WORKDIR}/${P}-patchset/${P}-system_gsm.patch"
 
 	# This is to update gettext macros, otherwise they are incompatible with
 	# recent libtools, bug #231767