Add upstream curl patch and introduce curl useflag (bug #555340). Remove old and broken ebuilds.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

11 files changed, 47 insertions, 852 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 3b701449c2e3..ca1812c35105 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.221 2015/07/19 10:20:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.222 2015/07/20 05:24:17 yngwin Exp $
+
+*mkvtoolnix-8.2.0-r1 (20 Jul 2015)
+
+  20 Jul 2015; Ben de Groot <yngwin@gentoo.org>
+  +files/mkvtoolnix-8.2.0-fix-curl-support.patch, +mkvtoolnix-8.2.0-r1.ebuild,
+  -mkvtoolnix-7.3.0.ebuild, -mkvtoolnix-7.4.0-r1.ebuild,
+  -mkvtoolnix-7.5.0.ebuild, -mkvtoolnix-7.6.0.ebuild, -mkvtoolnix-7.7.0.ebuild,
+  -mkvtoolnix-7.8.0.ebuild, -mkvtoolnix-8.1.0.ebuild, -mkvtoolnix-8.2.0.ebuild:
+  Add upstream curl patch and introduce curl useflag (bug #555340). Remove old
+  and broken ebuilds.
 
 *mkvtoolnix-8.2.0 (19 Jul 2015)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index c6304c4658b0..6a4e531ed3eb 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -4,30 +4,29 @@ Hash: SHA256
 AUX mkvtoolnix-5.8.0-boost-configure.patch 5428 SHA256 060ef650d7cdfe0f6de0c614750a90105665b1321be3a59ef3e1fbec7a46bfa5 SHA512 8965f2e4116fa340753a1414a1bd285ea26a0f38f48cb80b1a57608426d9f24958afff35756135051098edaebfcf0fe07521b59bad4f5193fe6833b0d6e1cd5b WHIRLPOOL 2aab1692234fb364043c07e94f39efd94ae6c57d46b12814626ea3be7afe59d3d5f79de24905fa23aed4b1446ccbc2fdfa86eb69cd2e3c0c2a6298bf5cb841b5
 AUX mkvtoolnix-5.8.0-system-pugixml.patch 2435 SHA256 1e0111dc929dec691808db015c0eddd1bfcd312e5d3bd548957fb0b37ccd3c6e SHA512 a1d4c838527f581dda01d7702a8d42dd1e53bf00103408c4d62d09dc1e1a12bca6fd63d3f740e7d67c858d79d520c5948673f849cf3d8a9698a95666692c64cb WHIRLPOOL 0c12ed938f5ca61de04175982cf756f8da7462182b597eb5c4a2d0f6010d09755ccc4f419ebedb9b1743c4aeb7da0885fd87481791c57e54ed693bd4bb034cbc
 AUX mkvtoolnix-6.6.0-boost-1.56.patch 1695 SHA256 109e2b36016a6a338e41b2744265827608b21f9e5ae54629f0c45d9c4c348403 SHA512 568198e2af3746ebac94c6b096211866a580f6171e38cb39c02e1728ec54c693742f2912600081e4ff44142a9ca8ed0c26b2ba47f7dc85b6363b73ff129a57c2 WHIRLPOOL 90da4ebd18e9df5a64934a63db02f62274814b537ab6a7341174e5016115867d12ff05a97fca9c686a3eec7ca070f0b147763f9a9e40fc7fc34240b250bfa2b6
+AUX mkvtoolnix-8.2.0-fix-curl-support.patch 447 SHA256 5867afc658ab4ad0cdb2685084ea86a3c7c450809388e115a3171eacad169622 SHA512 08d5c18bf383d476c53a6be769f9883eab78c9eda1b4b0ce8769d34b5700271c48ba68d9e0ec97587e839eabb42c31b72e9466a64ee749e776d282d18987d876 WHIRLPOOL f2b4923cd79a79d24d94d57270e704815984073638405104d55e6eae45c92d555c6b6d7437c99941c1973286a265841b49241eb1bbd39b7e164597f829092374
 DIST mkvtoolnix-6.6.0.tar.xz 5174424 SHA256 cb1f965617fe064cf78457d3fbd0685eb31ae5b7e205cf4c8e74b6f27f3399e3 SHA512 c86f10a0a919e6d28c2587b60663c38713cfa6ca0a5188524b81af2fd60e4ea626a01431d29c6ae5885eae05d71af93d857986c5008aec4963dacc3ead9dc26f WHIRLPOOL 55a15bb2fdb62af85e189c39b1a1391d33eb08b4ba116fc307965be6817a944b21d18c034b9a3da16a6e84e93544dbd59f3c7fe9406ab454e15cf8ee1eb815c3
-DIST mkvtoolnix-7.3.0.tar.xz 5225524 SHA256 2cb09f926d16bfa8091a9f8fcbd63f6490bf1f2ce3280001f8d5c4798979d420 SHA512 e725d8bbc97ca0cef0e281f8cfb3477555640bef5ce31fc9cf62d1ce36b95b895cbe757d983a9081ca626025eef3f7ae9052e810d2541d98808e09a5793d2e8f WHIRLPOOL a2ff376e540e709d029cccfd77979971fa7987e475da6a2af9fdf0ee5a85fa4caa32c563baa7a43c94b9d5b5ee7f817ae331641af429aac77e5027c5cb0ea5b5
-DIST mkvtoolnix-7.4.0.tar.xz 5267412 SHA256 6bdfec2ca4fd7ce379660289c800be91fe963bfaf2f6e167fb11d9666d1640fe SHA512 2588281125c81be37eccc33b7277be0a0dff99b7aa8e820b68f4faecbd706b53a6363a54d427b5f36bfbdc773504e4de9e2ce187c271ee0142798db7e1a5fde8 WHIRLPOOL c878fdab9d99072bf514f968e0f697c5b73e2611ab7e27bdab80f8f6d32d331321b9697ac67f948842199eb68464726961c1064e4fc26bac62a3b6437dc60dc5
-DIST mkvtoolnix-7.5.0.tar.xz 5266996 SHA256 17baf799c7a047c9d7026db237b7e702029642e802e473f49764dccb7e3a5b4f SHA512 71aba9d3c3c6fb86f273701dc1d40125a41a63d7b6674f564ba3190ead53666db57a2af32e5710e89412e6251f34fcb53a6869ae6f5a42a2b22507d0db8ca8c6 WHIRLPOOL bb54ce3530743de8e16b8ef3430509d13e629fc84e889ef5298176d181c47484b2ec4138694e5523698ef7d7b66704033bd261364825511678d2a66297908d2f
-DIST mkvtoolnix-7.6.0.tar.xz 5304932 SHA256 74de3298133a491ad8b28868273635385c14b98156cc4195115da66c2c55dcd8 SHA512 13078ffbf3d749f592e2fb5a009f7fec479fb86599aaa9773b78c8a59e1383d0388bcf8abb7fd05b08e43ddd989d5f43eee8524be64f9e55fdf42f47d61a144c WHIRLPOOL 034885ccd14d0b8167cbeb8914050a38c68c0f519f1e560ed6dc41ba2ee8f305df7662ead9a83929639d45e28b7e58d2593822362a71aa68f0d4ea075d72c078
-DIST mkvtoolnix-7.7.0.tar.xz 5336448 SHA256 191d8892b8fb36ac492c710134d419d7578ba802e812a32eb90ae02d4b13c028 SHA512 2ab9999ce0db189e03be130aa0eb5964ff0714da010255d84a7bd4164107dd86e7d5025c87ffc7328e0f7e899dcbc3e85a1094f7765e7393c1f4490eab4f426e WHIRLPOOL 1d18e5d690291636eb00fdbb990fc158652378eadcb3a4d34e075325396a3ac63c8a01dfb0ee0c2de4d38fe45d38b3f116e787be334238110e1fcb47310b6933
-DIST mkvtoolnix-7.8.0.tar.xz 5361192 SHA256 4ea13a75db2170944e95e180aaab97e3f0d42c04d88a0d4baadacd554248fe54 SHA512 6a56013da749fc6c661ade68a5d0fe50e710e2194f756d92cf47ccec471eb49206c14482ba1ccffedaf1ca164d3da49c3ea7f62296957bad7099baef8c7a083a WHIRLPOOL 171b09e9c5c54ce8e7b147cc5dcd28978db4d004c529af44f7900c09bf624de3fbacbae14f32c01e8cf47c4d0050c6fa3f2d7b6ba226ad68fff02e9b6c29b496
-DIST mkvtoolnix-8.1.0.tar.xz 5784428 SHA256 715d88411e23860c085639ebdc9163b4498df7f30169583a9a572add72b572e5 SHA512 00cae7c61ae1d7e9ac0eeb6756c253d05f6192bceacdffc87d7f2b01b589b158f6d76e00632d117452fa9595a93e27503877ab3d1775efbce1c0a97a78aeea99 WHIRLPOOL ad89d9e266d7d3651524b3af8be9cb61441e9eaf12fc640e509c7c18a7493786ca47f4b684dbb30f231f9f803c7c50c929aef186c488d603d85a2bcdf1da681e
 DIST mkvtoolnix-8.2.0.tar.xz 5856988 SHA256 eb6d3d7a0254bb4326dccc9983418801783198cdf4a259f31261dab4e843a5c4 SHA512 200fad08f6912081d7aabbae9330dc41b90af8d6fdce592090b9fedf2325a91f70d3a85ff40b03b57b0682a075050b6b73307872c1e716e8261849c3fb97968b WHIRLPOOL 1b25cd8913eb02018d62de369171ee1a48d31cbce6684c0c7febd2f88c3286bbf386c825ddeae54ef411dc14cc128c9e833408f9b0ac9cb1d5e525ba34aaa4ae
 EBUILD mkvtoolnix-6.6.0.ebuild 2173 SHA256 a9a7aac11c97dcb68a4b4452656ea5ce4fcf8c45241edeb48915bb5fd6b0711c SHA512 ed2995a33968acc34a3e52ea8d2b074afee47f297bb3a29d4ce7ce7f54bd20350213695b69cdb1c726825dfd93102754ad49259a813cc15f0c369d50e6a26336 WHIRLPOOL 205e4c8eb0a8ae62a8a702917d80da3f0aa9c2882fe43f59abd60a5d3ffdcd98a4726a8944bd7e99a489b596e4aed139f66ef70e9ab32fedd743853ed8e92a2b
-EBUILD mkvtoolnix-7.3.0.ebuild 2829 SHA256 2a5d60dbd2ae6e8d6d80a5bbd9fe528111d783e3e85fe8f38f32c3fcc5355aed SHA512 5886347781106926d94ef6fa4106692ecd299f9b491429bbccef6344eae9e364a40d72393420c437f4001242ce91a6246c1bae1813f26d26eb81663c8c3574d5 WHIRLPOOL 7c70d5e5ac4b965e1faadc00858c3fdd7a520fa105d2f9a3bdbd11fefb47eadac3278299a4b109187977821a33e9d06d47e405ec401d3368876d15fe2287f05e
-EBUILD mkvtoolnix-7.4.0-r1.ebuild 2822 SHA256 1da6ab90ee31b8e6763446f099467fce1a22061f00a9caadfc2abd28c84aaadb SHA512 52eef643f6a65e367914c78ba6523cb4f05b5e0628b3d99d6212c03d219a823de495d73529124b1459fc959c60977b5d271d5d1ec84a5da0c0ed4f3e180625b7 WHIRLPOOL 01b165eb0fffe95f88b9bf32b5efcd40e0a5bc1913f1d1848569359cfdb72c50afb5904a75878aea9f5c8fc654f8714fef795820563de01c704ed5f8ffe07125
-EBUILD mkvtoolnix-7.5.0.ebuild 3127 SHA256 f36788f37c132e459ff9b14e961508ee3b4ede25b1898bc195932e8c7714395f SHA512 2a94337179659c17dfaf478df7773fbc2d0453daaecbb339351adc74b61dfa2585e0b1d0243b8815d43cd96b8aa0f8a0ee40c6efd93ca47c6b732272bd92eca3 WHIRLPOOL 89153ef5b18301f5236e9328e7bd7476ef869a0c0cda289a1de3e7e3c56702e6a7fbfee482902a7f9513438d71fa36426981f936722d6e376b0c53adbcd812b8
-EBUILD mkvtoolnix-7.6.0.ebuild 3127 SHA256 af880186f346b0881015eedc39e45b8f7d11cb674c26d4938cd8b2b6aea676dd SHA512 df298111b57e8489978b66f159445bba2136f637d7480c85ba4e4b4547984bcd980f92b00354308addb196f3c31c8c56402ac343efd28d3c44f581c3707db7be WHIRLPOOL cec2f3a1db65c3c914d7ac8b36bed04f0cb21ba0ddc0c8fe4a7fabf6b222c4c7acea57bebd7848417f0f7ff3f5b994023abd7f4ccee3a69da9e172051b7959f9
-EBUILD mkvtoolnix-7.7.0.ebuild 3127 SHA256 55486802d2812e2ce24bf4f1a40b967f4de371412731a58bb79b9155aa3fe1c6 SHA512 58d3e30a9312c636b8130b1ab1ad95f0e8eba3afda52306cf26dab2df03f48a9c7cb95bce1d1ed6ffb9ae89e788ce60164c67375beda3447a797af586a2b3210 WHIRLPOOL 5353617ab7820d8c23da8a0ab8017463dc373c4ecf465bd736df9e180287195923c87731e8921d5ae0366c1f0567a0c399fb49bd7bc928b994eedb0a762376d4
-EBUILD mkvtoolnix-7.8.0.ebuild 3127 SHA256 08c54641a52dff43bd97f38fd4bf1ed6855401f78e18ad761067eefdfdc3ab2e SHA512 18509f19b0fdb5a47f77c3d0783d5f21638e31de9e91b84af8e07b0fa66286ca0e7d0868c116abec4cb1df4d435a27706c79ec2aa5c1f4f68dfac3eef9f04b17 WHIRLPOOL 3ac7e0eb2db149216d55f65300cca20fa3032a7f14213f06d398f453fd10720e5685fc1b71a3f05e468af56071d73cfc65eb72d2774641bba029bce75592fdf5
-EBUILD mkvtoolnix-8.1.0.ebuild 3145 SHA256 c53b05f5b692e4d031c85b862dcb4550a32188e58a4a9bada04a74729f6ff15e SHA512 e1f77f77a9e5609fe66f46652a68895a6fa4d0c8e2ce0e3321b247d0df0753315b449deb1d447a9b19b2f8fcab6d6fde87fd505b785899278b76f3d170d6911c WHIRLPOOL 3451e306edd9564399b3b05d298e8fc87d6eacf969567ff8676b5a93cb5f40d0d920f488e8fff46a57b3114273a61857ef3b577e04ce6cace7786c8a5fb34034
-EBUILD mkvtoolnix-8.2.0.ebuild 3144 SHA256 3484a4224c52a07c4d45d17cf79b61db0ab1741165ac2956d33e886731518106 SHA512 6e6da69ccaba229ba47eb1e2f284aa9f436da9851ffdd54b7c7be61ce463c974f333567afdd93bd473ae1251fd8d83a5e69f7b8a8e77211723b84b3196aa5277 WHIRLPOOL 51c703fb8c7d398350b42f2811f056918d27167cf467a03ce2b1a5aaca103b77f8f3c69014d29b1a9ffe611050c68e3ffc3b6e6a85a44bfe916a6ca2872a1452
-MISC ChangeLog 32412 SHA256 bd410bd9e9d86f9d0341c3c6a57e01a511405048816da6624edb95e55271f6be SHA512 c94099c97edca32b0adb47a33add90b866b13f88ff4c3b5c050cb48c8aa0d2b50d4305974bbe9db82d62c562b8820196e589605d47900485db99f2797c3c0eea WHIRLPOOL 4f811124a5c36fced9d8d7c55f646210b77a92e301b182de570a4e735827d5edc3d3bcb5da83ccd781c325285f98c327a469686b5d031effa666d6963f858fe7
+EBUILD mkvtoolnix-8.2.0-r1.ebuild 3225 SHA256 01348cb1e8afae10bc9e7aef0423e75b24bb02a9ec200c44304de7d407e94663 SHA512 ac47d6547bc22c41b2590c2f10638b1c499ce131a54619e198e268d2c3ddea26bfad8077f61636722946f3be1fc02f9b4465422927b6ba2d1ac5c359c0cd44b7 WHIRLPOOL 8ab97879ccaa4cd8fe994f189027866eabbb92d3e73941cac7baf7bbdd733a3ef101395115e819536021166b14e9f8b41f561bd72e75511946aa486c69954223
+MISC ChangeLog 32895 SHA256 f847d3ae0f6702549f24a8d659490b8958a8b1d4b2b7632c39ed9f69c2a9f8a6 SHA512 958b8320e4ba089b7f0e391ae02838ed1c3482e72654c97776fd2e297f48ae2d55e8ff5a5c3d921cf8ad85c3b6131d54b90364eb22e163795967bc4f25bbce1c WHIRLPOOL 7b3f31a49bf0fbd6c3b768be42198b8675b5c1dc5180cd0f6b995000980aef8878a9f39da841d6436dabb36d1468c2bed40f5152f381f91e28a1c7d3f97e7cc9
 MISC metadata.xml 158 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 SHA512 0bfb0265d3c42ba1958f8e589316112dba381e7701773668443cf0afe678a8d80675392efb2713e3d376b85b03a5b2bfb390c94411e0c6cf8a223b26aa9a04ca WHIRLPOOL 447b37b9f46058b1adc8d30a57460a8ab6b5ec149870c5ea385956cae9dd10a99b36e63526f2d13cabf13a4185f8b4e22a78156ab141a6e397bba298ab7efb2a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlWreeAACgkQCaWpQKGI+9TQlACfc+hE046aBkl6nC/tYeOEM0aw
-VNUAn1eS3Syntl2tTk7yLcYQWeSNGTI5
-=c0y4
+iQJ8BAEBCABmBQJVrIYGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOGeQP/R6gzOkfL6hh5eXI33QR5gHq
+kTw3+yr36D5P5FKDyozwNkWnSmg2D2jDPRzJ9Eke6W0QnzyvLVhwi/vfQ+JNsNF9
+wSp51Q21zInNrMjS0mOqtnrZQ5TL2JT2KTy5AFir3S+juzDKjW095vVbM94eE5n8
+F8Q9rnzLD0+gOc8yrShDXCpckyo4HDWAP5ilGK9IOH80qlalGqg2rLEODyGohOQU
+wcemVEajRAJ9KXr8RrXunRD6vrS1JmB6p0yC/HLwm9rPF3tRbmwnQl6bTGuI6nWv
+g4q1aSEXMLSOR7xVXG5HxhhUrN8FZVykqawhZ8GwSMoB2FUzZOOtmJCo29/5Ds5v
+cwMcekMd+CClBR88z8jMpJ2g7rrjaxFdrV8fvHBqLgMRXKmOR4fxA6rNmfNL8p6y
+v6UvTe0552I8DLmPfao3qizmq90V3kZMO1HRTBx9ytdzRLPESCJu4s4DctSV+ldu
+rUEkOqHJU9gMJJeG7oXlEPclhKBeaD4Uk9/qAJblNGGhoUWRsdbUAmpBjUUooH+4
+gaywXi5Iq6gfeFbpkruQY33foADcTlHnUssrxgAaRAunNCKRtarGQpOKk0eBnRCe
+MDK/y+Lrld0Q0gSLEVARhAoTGofSISRdmfEuNHVX3gi3lr8/+2R0oADGssh3RzLC
+ZeZ6HO3ikraTA6oQW79f
+=WUIV
 -----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch b/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch
new file mode 100644
index 000000000000..67ce30fdbbc6
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch
@@ -0,0 +1,11 @@
+--- a/src/mkvtoolnix-gui/main_window/main_window.cpp
++++ b/src/mkvtoolnix-gui/main_window/main_window.cpp
+@@ -118,7 +118,7 @@ MainWindow::setupMenu() {
+ #if defined(HAVE_CURL_EASY_H)
+   connect(ui->actionHelpCheckForUpdates,       &QAction::triggered,             this, &MainWindow::checkForUpdates);
+ #else
+-  ui->actionGUICheckForUpdates->setVisible(false);
++  ui->actionHelpCheckForUpdates->setVisible(false);
+ #endif  // HAVE_CURL_EASY_H
+ }
+ 
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.3.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.3.0.ebuild
deleted file mode 100644
index 17037cfad986..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-7.3.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.3.0.ebuild,v 1.1 2014/10/23 01:48:14 radhermit Exp $
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch qt5 wxwidgets"
-
-ruby_atom() {
-	local ruby_slot=${1/ruby/}
-	ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
-	echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# hacks to avoid using the ruby eclasses since this requires something similar
-# to the python-any-r1 eclass for ruby which currently doesn't exist
-RUBY_IMPLS=( ruby19 ruby20 ruby21 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do echo $(ruby_atom ${ruby_impl}); done)"
-
-RDEPEND="
-	>=dev-libs/libebml-1.3.0:=
-	>=media-libs/libmatroska-1.4.1:=
-	>=dev-libs/boost-1.46.0:=
-	dev-libs/pugixml
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	>=sys-devel/gcc-4.6
-	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}
-	|| ( ${RUBY_BDEPS} )
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_pretend() {
-	# http://bugs.gentoo.org/419257
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
-	fi
-}
-
-src_prepare() {
-	local ruby_impl
-	for ruby_impl in "${RUBY_IMPLS[@]}"; do
-		if has_version "$(ruby_atom ${ruby_impl})"; then
-			export RUBY=${ruby_impl}
-			break
-		fi
-	done
-
-	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
-	epatch "${FILESDIR}"/${PN}-5.8.0-system-pugixml.patch \
-		"${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use wxwidgets ; then
-		need-wxwidgets unicode
-		myconf="--with-wx-config=${WX_CONFIG}"
-	fi
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable qt5 qt) \
-		$(use_enable wxwidgets) \
-		$(usex pch "" --disable-precompiled-headers) \
-		${myconf} \
-		--disable-optimization \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--without-curl
-}
-
-src_compile() {
-	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
-	dodoc AUTHORS ChangeLog README.md TODO
-	doman doc/man/*.1
-
-	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.4.0-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.4.0-r1.ebuild
deleted file mode 100644
index af3d485bfeb0..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-7.4.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.4.0-r1.ebuild,v 1.2 2015/01/19 20:26:40 graaff Exp $
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch qt5 wxwidgets"
-
-ruby_atom() {
-	local ruby_slot=${1/ruby/}
-	ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
-	echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# hacks to avoid using the ruby eclasses since this requires something similar
-# to the python-any-r1 eclass for ruby which currently doesn't exist
-RUBY_IMPLS=( ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
-	echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
-	>=dev-libs/libebml-1.3.0:=
-	>=media-libs/libmatroska-1.4.1:=
-	>=dev-libs/boost-1.46.0:=
-	dev-libs/pugixml
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	>=sys-devel/gcc-4.6
-	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}
-	|| ( ${RUBY_BDEPS} )
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_pretend() {
-	# http://bugs.gentoo.org/419257
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
-	fi
-}
-
-src_prepare() {
-	local ruby_impl
-	for ruby_impl in "${RUBY_IMPLS[@]}"; do
-		if has_version "$(ruby_atom ${ruby_impl})"; then
-			export RUBY=${ruby_impl}
-			break
-		fi
-	done
-
-	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
-	epatch "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use wxwidgets ; then
-		need-wxwidgets unicode
-		myconf="--with-wx-config=${WX_CONFIG}"
-	fi
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable qt5 qt) \
-		$(use_enable wxwidgets) \
-		$(usex pch "" --disable-precompiled-headers) \
-		${myconf} \
-		--disable-optimization \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--without-curl
-}
-
-src_compile() {
-	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
-	dodoc AUTHORS ChangeLog README.md TODO
-	doman doc/man/*.1
-
-	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild
deleted file mode 100644
index 10c836bce91e..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild,v 1.5 2015/02/08 23:45:37 radhermit Exp $
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch qt5 wxwidgets"
-
-ruby_atom() {
-	local ruby_slot=${1/ruby/}
-	ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
-	echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# hacks to avoid using the ruby eclasses since this requires something similar
-# to the python-any-r1 eclass for ruby which currently doesn't exist
-RUBY_IMPLS=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
-	echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
-	>=dev-libs/libebml-1.3.1:=
-	>=media-libs/libmatroska-1.4.2:=
-	>=dev-libs/boost-1.46.0:=
-	dev-libs/pugixml
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	>=sys-devel/gcc-4.6
-	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}
-	|| ( ${RUBY_BDEPS} )
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_pretend() {
-	# http://bugs.gentoo.org/419257
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
-	fi
-}
-
-src_prepare() {
-	local ruby_impl
-	for ruby_impl in "${RUBY_IMPLS[@]}"; do
-		if has_version "$(ruby_atom ${ruby_impl})"; then
-			export RUBY=${ruby_impl}
-			break
-		fi
-	done
-
-	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
-	epatch "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use qt5 ; then
-		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myconf+=(
-			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
-			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
-			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
-			--with-mkvtoolnix-gui
-		)
-	fi
-
-	if use wxwidgets ; then
-		need-wxwidgets unicode
-		myconf+=( --with-wx-config=${WX_CONFIG} )
-	fi
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable qt5 qt) \
-		$(use_enable wxwidgets) \
-		$(usex pch "" --disable-precompiled-headers) \
-		"${myconf[@]}" \
-		--disable-optimization \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--without-curl
-}
-
-src_compile() {
-	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
-	dodoc AUTHORS ChangeLog README.md TODO
-	doman doc/man/*.1
-
-	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.6.0.ebuild
deleted file mode 100644
index da119601be59..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-7.6.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.6.0.ebuild,v 1.1 2015/02/08 23:54:40 radhermit Exp $
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch qt5 wxwidgets"
-
-ruby_atom() {
-	local ruby_slot=${1/ruby/}
-	ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
-	echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# hacks to avoid using the ruby eclasses since this requires something similar
-# to the python-any-r1 eclass for ruby which currently doesn't exist
-RUBY_IMPLS=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
-	echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
-	>=dev-libs/libebml-1.3.1:=
-	>=media-libs/libmatroska-1.4.2:=
-	>=dev-libs/boost-1.46.0:=
-	dev-libs/pugixml
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	>=sys-devel/gcc-4.6
-	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}
-	|| ( ${RUBY_BDEPS} )
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_pretend() {
-	# http://bugs.gentoo.org/419257
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
-	fi
-}
-
-src_prepare() {
-	local ruby_impl
-	for ruby_impl in "${RUBY_IMPLS[@]}"; do
-		if has_version "$(ruby_atom ${ruby_impl})"; then
-			export RUBY=${ruby_impl}
-			break
-		fi
-	done
-
-	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
-	epatch "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use qt5 ; then
-		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myconf+=(
-			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
-			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
-			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
-			--with-mkvtoolnix-gui
-		)
-	fi
-
-	if use wxwidgets ; then
-		need-wxwidgets unicode
-		myconf+=( --with-wx-config=${WX_CONFIG} )
-	fi
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable qt5 qt) \
-		$(use_enable wxwidgets) \
-		$(usex pch "" --disable-precompiled-headers) \
-		"${myconf[@]}" \
-		--disable-optimization \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--without-curl
-}
-
-src_compile() {
-	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
-	dodoc AUTHORS ChangeLog README.md TODO
-	doman doc/man/*.1
-
-	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.7.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.7.0.ebuild
deleted file mode 100644
index 6e33ab33a3ce..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-7.7.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.7.0.ebuild,v 1.1 2015/03/02 01:25:15 radhermit Exp $
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch qt5 wxwidgets"
-
-ruby_atom() {
-	local ruby_slot=${1/ruby/}
-	ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
-	echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# hacks to avoid using the ruby eclasses since this requires something similar
-# to the python-any-r1 eclass for ruby which currently doesn't exist
-RUBY_IMPLS=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
-	echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
-	>=dev-libs/libebml-1.3.1:=
-	>=media-libs/libmatroska-1.4.2:=
-	>=dev-libs/boost-1.46.0:=
-	dev-libs/pugixml
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	>=sys-devel/gcc-4.6
-	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}
-	|| ( ${RUBY_BDEPS} )
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_pretend() {
-	# http://bugs.gentoo.org/419257
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
-	fi
-}
-
-src_prepare() {
-	local ruby_impl
-	for ruby_impl in "${RUBY_IMPLS[@]}"; do
-		if has_version "$(ruby_atom ${ruby_impl})"; then
-			export RUBY=${ruby_impl}
-			break
-		fi
-	done
-
-	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
-	epatch "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use qt5 ; then
-		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myconf+=(
-			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
-			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
-			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
-			--with-mkvtoolnix-gui
-		)
-	fi
-
-	if use wxwidgets ; then
-		need-wxwidgets unicode
-		myconf+=( --with-wx-config=${WX_CONFIG} )
-	fi
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable qt5 qt) \
-		$(use_enable wxwidgets) \
-		$(usex pch "" --disable-precompiled-headers) \
-		"${myconf[@]}" \
-		--disable-optimization \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--without-curl
-}
-
-src_compile() {
-	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
-	dodoc AUTHORS ChangeLog README.md TODO
-	doman doc/man/*.1
-
-	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.8.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.8.0.ebuild
deleted file mode 100644
index 25ba58e01556..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-7.8.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.8.0.ebuild,v 1.1 2015/04/04 18:40:03 radhermit Exp $
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch qt5 wxwidgets"
-
-ruby_atom() {
-	local ruby_slot=${1/ruby/}
-	ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
-	echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# hacks to avoid using the ruby eclasses since this requires something similar
-# to the python-any-r1 eclass for ruby which currently doesn't exist
-RUBY_IMPLS=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
-	echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
-	>=dev-libs/libebml-1.3.1:=
-	>=media-libs/libmatroska-1.4.2:=
-	>=dev-libs/boost-1.46.0:=
-	dev-libs/pugixml
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	>=sys-devel/gcc-4.6
-	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}
-	|| ( ${RUBY_BDEPS} )
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_pretend() {
-	# http://bugs.gentoo.org/419257
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
-	fi
-}
-
-src_prepare() {
-	local ruby_impl
-	for ruby_impl in "${RUBY_IMPLS[@]}"; do
-		if has_version "$(ruby_atom ${ruby_impl})"; then
-			export RUBY=${ruby_impl}
-			break
-		fi
-	done
-
-	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
-	epatch "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use qt5 ; then
-		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myconf+=(
-			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
-			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
-			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
-			--with-mkvtoolnix-gui
-		)
-	fi
-
-	if use wxwidgets ; then
-		need-wxwidgets unicode
-		myconf+=( --with-wx-config=${WX_CONFIG} )
-	fi
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable qt5 qt) \
-		$(use_enable wxwidgets) \
-		$(usex pch "" --disable-precompiled-headers) \
-		"${myconf[@]}" \
-		--disable-optimization \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--without-curl
-}
-
-src_compile() {
-	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
-	dodoc AUTHORS ChangeLog README.md TODO
-	doman doc/man/*.1
-
-	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.2.0-r1.ebuild
index ad0b05c3c17d..3aa11c64e102 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-8.1.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-8.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-8.1.0.ebuild,v 1.1 2015/07/06 15:56:32 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-8.2.0-r1.ebuild,v 1.1 2015/07/20 05:24:17 yngwin Exp $
 
 EAPI=5
 WX_GTK_VER="3.0"
@@ -13,7 +13,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch qt5 wxwidgets"
+IUSE="curl debug pch qt5 wxwidgets"
 
 ruby_atom() {
 	local ruby_slot=${1/ruby/}
@@ -70,10 +70,11 @@ src_prepare() {
 			break
 		fi
 	done
-
 	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
 
 	epatch "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
+	epatch "${FILESDIR}"/${P}-fix-curl-support.patch #555340
+	epatch_user
 	eautoreconf
 }
 
@@ -99,13 +100,13 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable qt5 qt) \
 		$(use_enable wxwidgets) \
+		$(use_with curl) \
 		$(usex pch "" --disable-precompiled-headers) \
 		"${myconf[@]}" \
 		--disable-optimization \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--without-curl
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
 }
 
 src_compile() {
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.2.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.2.0.ebuild
deleted file mode 100644
index 07ee8d0cb00a..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-8.2.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-8.2.0.ebuild,v 1.1 2015/07/19 10:20:14 pacho Exp $
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch qt5 wxwidgets"
-
-ruby_atom() {
-	local ruby_slot=${1/ruby/}
-	ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
-	echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# hacks to avoid using the ruby eclasses since this requires something similar
-# to the python-any-r1 eclass for ruby which currently doesn't exist
-RUBY_IMPLS=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
-	echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
-	>=dev-libs/boost-1.46.0:=
-	>=dev-libs/libebml-1.3.1:=
-	dev-libs/pugixml
-	media-libs/flac
-	>=media-libs/libmatroska-1.4.2:=
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	>=sys-devel/gcc-4.6
-	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-	)
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}
-	|| ( ${RUBY_BDEPS} )
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_pretend() {
-	# http://bugs.gentoo.org/419257
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
-	fi
-}
-
-src_prepare() {
-	local ruby_impl
-	for ruby_impl in "${RUBY_IMPLS[@]}"; do
-		if has_version "$(ruby_atom ${ruby_impl})"; then
-			export RUBY=${ruby_impl}
-			break
-		fi
-	done
-
-	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
-	epatch "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use qt5 ; then
-		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myconf+=(
-			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
-			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
-			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
-			--with-mkvtoolnix-gui
-		)
-	fi
-
-	if use wxwidgets ; then
-		need-wxwidgets unicode
-		myconf+=( --with-wx-config=${WX_CONFIG} )
-	fi
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable qt5 qt) \
-		$(use_enable wxwidgets) \
-		$(usex pch "" --disable-precompiled-headers) \
-		"${myconf[@]}" \
-		--disable-optimization \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--without-curl
-}
-
-src_compile() {
-	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
-	dodoc AUTHORS ChangeLog README.md TODO
-	doman doc/man/*.1
-
-	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}