gentoo resync : 03.12.2017

13 files changed, 9 insertions, 349 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 37e8659306cb..1d9ad3afbd05 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest
index 3d0a2e1330fc..1ee1a5702285 100644
--- a/media-libs/libkate/Manifest
+++ b/media-libs/libkate/Manifest
@@ -3,6 +3,6 @@ DIST libkate-0.3.7.tar.gz 728239 SHA256 b9af203bb731de961807ad13820911fab57230d4
 DIST libkate-0.4.1.tar.gz 906896 SHA256 c40e81d5866c3d4bf744e76ce0068d8f388f0e25f7e258ce0c8e76d7adc87b68 SHA512 2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b WHIRLPOOL 8693527ea8680eded864aae49df840e2071eee434391f828b07224b4af279df0fbc6744af6be8a435aad5cdfb3124df10170bcead7b20a6d63ee3dacb1f28d1c
 EBUILD libkate-0.3.7-r1.ebuild 1171 BLAKE2B ea3d74963b8788433c822db1e574cbd363fea48e80962d888802abc7af8a52fbb5e4f8448b56afe81d8786196e55776ae68532e6f1badf439319433c540985b0 SHA512 ab8f7fe7707aa90a72b362072dd4096a737811bf5da492cff71211df6006fab80d88a3d0a759e91a3dc7669a1af80e8aaeb27017adb9818a3b309b45a046205f
 EBUILD libkate-0.4.1-r1.ebuild 1170 BLAKE2B e291fb9f87220b55cf9ebae392448fad956dabc1872b3a99fa4bd68dd373065f0d92422c5a7eddb62ae19131a15de1d1786dbcbee7b38968a9f4c9f9a16ac36c SHA512 8a9cc877df61e2dca2425ebb7cc3f63cf15e95a55fc4bb9c0cea0357aca911f3d2f86dbd2a0b0cc2cd8a5b974b347484d71c2b34c5cbc38f6b8562bcf2c3bb6f
-EBUILD libkate-0.4.1-r2.ebuild 1165 BLAKE2B 3c5259f37c8097d89c3f6ea587df4e1f7f7bd70f6a5aadc09bf0b15bcf35049f1bec2f23776083ee736f486a2276b89ea2378116c74fec882d877b04fe53dc67 SHA512 31ae83ab786074eef00e6967a71fe2c8f5c03efb6cfce084ef3ea55392a969e6bcbe4e93bb8d94da3f468bc193c787f98d6ea4016c0d30f5c40e53ff8c3d5e98
+EBUILD libkate-0.4.1-r2.ebuild 1164 BLAKE2B f7f5e938758e94c9cf3726bdb6042e6df47c54a1ac576c12d5c6b26706d1b4f2beff6ab07b8dee237e4d91a72bdff0a3ac44ef574dcb0d7436625b6760ae0091 SHA512 ed50e21d9de360c16151aa3ccb661f021d86f13af6c8c441bb5fe86be3ede6d8236076abfa68bf6dbb480f41527334ba8dacee77271f2cdac391fd504c022fbf
 EBUILD libkate-0.4.1-r3.ebuild 1318 BLAKE2B a1e66db77b3f10d5ef7af43bf2fcb7f30c2f00f617777bf49d9b565ca3233ad36e7bc966f7a82182546636328550277927d05e912793ef5fbe03bcc3cf24160f SHA512 692ef685b3bb8a6b8f7cab63f9884407322d608c8705611cbc6298b2b94f0b4b4850a3a7d828256472da32247a7685c957fe414e7b7c46ef152139e58e779237
 MISC metadata.xml 1066 BLAKE2B 61b532ca7ea79a560df1ea1d4e36a0ff5d00a3c1dc81b520d0c9e1a077206d6c9249711f9d76100ed9394a65ab29bbb74d02f4caa51f8f800c14b24ce9a17b47 SHA512 510dadea430ae39da68a3cd97b4a7717b91fcc26cbb0303155718ba5e46d69d2e52e099b272ffe26f34149ef8fe01df80e332009fc905a4f262ef8030327da29
diff --git a/media-libs/libkate/libkate-0.4.1-r2.ebuild b/media-libs/libkate/libkate-0.4.1-r2.ebuild
index 19f3e7378f4c..279c56974bdc 100644
--- a/media-libs/libkate/libkate-0.4.1-r2.ebuild
+++ b/media-libs/libkate/libkate-0.4.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug doc wxwidgets"
 REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d3f85766d65a..059ce15e7448 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,7 +2,7 @@ AUX eselect-mesa.conf.9.2 1630 BLAKE2B 6c67ef9b5dc94f2f26378c004a459680b05084900
 AUX mesa-13-clover-Work-around-build-failure-with-AltiVec.patch 2317 BLAKE2B e2186d0aa5857d6edcd731444c7a98ecc9668ec16d917fca057b12f94b888d4eeb818af9d501672d60d15e3a558845fc4c72ca84e5d72c3150b1e3785b4b4341 SHA512 6b3cd038c0a61b4d64ec0b645086d7cf2c74b97bd0febe5229c88d78e8dc3a4cbd2876a06ca2394f819dd04b0397722fc76c4ce5939c5c58f40ef0d2e2bcbe84
 DIST mesa-13.0.5.tar.xz 9171480 SHA256 bfcea7e2c801525a60895c8aff11aa68457ee9aa35d01a4638e1f310a3f5ef87 SHA512 db5f6a97b40ee6e45ba81280ab4543354e9f274c7112c5a43b8970244f329902a22f68d5eeddad5b64502507f462ffbcc028efc5dff93822adf95d30ba5903c1 WHIRLPOOL 164116608908331d4e8d69c4d2b92dc22e8e6d98725a20e8c2da5cc24b4e9ae9e05ee9c7209d55371b419e0f4e6c1d4752a46d149a968a6b83612aa77f7e480e
 DIST mesa-13.0.6.tar.xz 9179236 SHA256 29ef104a7fc082d352b1599bd6cb1d040be424ccd22f5e0eb7ee9b0e9acd3597 SHA512 2455e044647f674c2f1dd524143b61b8630713fa929bbf6fe1c981436a9c08dc933553d638a22b32d2799afb77be746355b48b1b20af172141c5b63891e94441 WHIRLPOOL 1fdaaf29de96225cf41a3bdeb559a35cf20fda524f80985b2bfdc52095dcb7f6b320704b7ccf754a6f80555925a6a80dfa2b1115a4bdd9bdc1ebb672f115208a
-DIST mesa-17.0.6.tar.xz 9494872 SHA256 89ecf3bcd0f18dcca5aaa42bf36bb52a2df33be89889f94aaaad91f7a504a69d SHA512 537d28aa694c2d48811d2467e33b3adc841067d5f1cdb7e0809ba100f71869090285bbb246e57e5f0177401a539b44cc32b1ccfcb32a1855c14b011b92d32eaf WHIRLPOOL f3ee87377e87cbd23bd9009d840e6c0ae50ccbbb30cfa7be61f3023cbe9519f5b50f22c59dbcc207a106a6e357d77074fcaee63916ee091b920cbc3d511ec2ab
+DIST mesa-17.0.6.tar.xz 9494872 BLAKE2B 1e83b0d40bb911c26880f25b281ba6e065dbf47555812c53e7d6fbccbc36a11a80531b8887eef6fbcb58e91d1eb5425151fdc03588d4ea36c2f268e5a6fcb604 SHA512 537d28aa694c2d48811d2467e33b3adc841067d5f1cdb7e0809ba100f71869090285bbb246e57e5f0177401a539b44cc32b1ccfcb32a1855c14b011b92d32eaf
 DIST mesa-17.1.10.tar.xz 9872168 SHA256 cbc0d681cc4df47d8deb5a36f45b420978128522fd665b2cd4c7096316f11bdb SHA512 728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b WHIRLPOOL d33cc0b7620e01822ce6ca2708f01eccc6c7796c1ed19f3642dab733521d17d794658dbc47bcca7d71f94f99c81637a28738dc6c45c4d1ccc7e2855f07a5f961
 DIST mesa-17.1.8.tar.xz 9902800 SHA256 75ed2eaeae26ddd536150f294386468ae2e1a7717948c41cd14b7875be5269db SHA512 d29fd999d75967683f5aa836cf0b701705f54de428ebbbac059c3e335e94552c0b455aa67fa2870464a086dc58994f2f320710a1abc265dea363241aede71c5b WHIRLPOOL 8faad2f3da8546d48ee9b5470d147de7507a0dc39787a876f6513933e958baa94571d285095fced7c34c674364ab897a896acc39374849fb22026dd05a9bd27f
 DIST mesa-17.2.6.tar.xz 10387604 BLAKE2B 43bd60f9e61bb04e3a2afe4bc6e18099a524cdec3c7948d9ccfffa5bfe50eb3e0625ba6da7bb3b32959ef4a5e3db982daf2f90d3ee555cf65084d70849b3ca12 SHA512 739645d963da2ff79fa0f2bfcc4948516c4f0a768f9d21f98eff049edc88218847afd3786003ccf7b10deec585f4f1d7f70fcc5e5f6e33186ebbb86cd8cb0202
@@ -11,8 +11,8 @@ EBUILD mesa-13.0.5.ebuild 13605 BLAKE2B 31f0f37632ef1a0e11ca1dfb7f084ab0070e0f77
 EBUILD mesa-13.0.6.ebuild 13553 BLAKE2B 30614f1f5201caf6c4a701e08a70809a2f0ccb405a63d386c62f5999ae6df379020d3ef138fa72512e65d8bcd2ff4b228b2a603b2b84197ed0399472620ffbe2 SHA512 715a50c81cd752dd46b24b41da5e964cfffe13d6870ef9a9f6f18c22adfedd516ffb42845735fb52fe40d4e6ffc7507ee96c569ff3dae89503f3dece72b2647c
 EBUILD mesa-17.0.6.ebuild 13560 BLAKE2B fd2dbce008cadca8141e16dd7f2cc8660aa4a167c888d7728c9061021fe4c090d9d71ca701d8c43715f29c6412aa098312c974ffe5a10d7539d961e043bf71cd SHA512 7caefbaed248f2dffd5cc9bb8fe769d3e412c71659f462b9fabed173766b7dac449707d7e80caaed1f3e81ef01c169c6b366376bbf33b8bd4dfc8771f5e6d334
 EBUILD mesa-17.1.10.ebuild 13436 BLAKE2B 33d0bdb9de92460a682ca5089df1842a0c6ea485724cf684e778993cc0cc47e751fa042f68fb4b47c0aa6d0d952e163cc04806d130c4cd20e65014a82eef66a2 SHA512 b29bb8f80706f2bdf5602951b346901c0357e81e3e73afab1ca6ccdf1c1037660f6b66d05c999563bc22d0da68416c68368b8d741e1c961164161d8b5dd41170
-EBUILD mesa-17.1.8.ebuild 13430 BLAKE2B b2b44aff78c4fbf62628dd36df03b9a812e9fde09e00777398c56f57c68a966ef1eae89bb0059c192311435346f6193d5535f6c3ead9103079f7604e23d13ea8 SHA512 5c60f50fea2ba5c4aea96dd8d3a2eeb47b1bae500ba609006978c7d71841a2eb32abeb1c363e4d84ba3d6f8ebb044870830a984ae18a39db5181457e73d4a178
-EBUILD mesa-17.2.6.ebuild 15003 BLAKE2B 5038fbd6f7ab4aa3a94b28949036a6dc6d7f927cff0c0b13611b42aab7e0e7ba6765377a24cfde04b3466e3531f824e79e68f0ab87fb2ba9fe95eb7b8e5f89a5 SHA512 32f832d8898932935cb1985a5bab4dc4c70f0baf29657be7b409f53578f205591ab8bfec3a6d77c827ebc20114de3c8292ad1defca26ceff615764d5dfdacffe
-EBUILD mesa-17.3.0_rc5.ebuild 14889 BLAKE2B d33d36a58695fab37981da32f0c1f0b4d5e218576972cb92c5ba603a0ec62efe0dbaa5f5f8e8010f2027dc9e0fac5536249a26317aff4103af91539dfac56e82 SHA512 2a1f092ca26281352d6394656301142b7e8790196fb840c8a7572207709d3a2a82f07839b5c536be426b5b383abaf91b23de050fd6ce931e83429e07bfa8c6b3
+EBUILD mesa-17.1.8.ebuild 13429 BLAKE2B b3042ec0a019be66e1924106b7ae84c285bcffc10f76a3b7e29f0b17ad4a01a6a1158fed3a276fae1f2743531f7177d1885158c318e698be553f73e80e92e8cc SHA512 1c6cb318a27a53efc52e83d0c09f28ca69e533c69047bcda1a226cfdfd644786c2ebb942ee2b1299947e0b955de87c04c5879671a2cd9392eda07876c97920c1
+EBUILD mesa-17.2.6.ebuild 15006 BLAKE2B afff4eb4640402b2fd36d86cbae220e956c4a09917d6081c304779124ba86a4373ca37cbbe8610396ee7c2a0a24659432689e70fde79b4a355c122b61b4d2caa SHA512 9d1e62aca188b73dbfc63434934f1202060945320e35805f519bc85c22f7765057d594b095874f12f04f0f9ebe3be0705a92392c7deb52711dc232c2ca93739f
+EBUILD mesa-17.3.0_rc5.ebuild 14892 BLAKE2B e3fb731721a648981bc901a4b96a0d76d6e0a1d9393d515bff62c808c700626052983a5d0ec29b2f584da70246fb53eba99abb9403eccb62fd74e289b9113d11 SHA512 57ac595432a400c8435ba4e60d4a64e2333e33cd5f2c0ad8292a30677fbcd85ebe60c913f8d47b66cb79ed06b42f4da3e288675514ecefaed8c74d1f98553087
 EBUILD mesa-9999.ebuild 14910 BLAKE2B ff2479202876410dcf8404adff9a68732c65f72346395e912a0c90efb61ce7bb33f91e48e8b373902678f8627a2424f64d1152397b20e08f665f68688fbf7996 SHA512 1103851cbfef5e489213c0513f562759f3232d193cd72319bca65f5ea84e2cf04c9b9cd56288b07607648c0939e6cb9a5c5a7b2bece108309fe318bdac774da1
 MISC metadata.xml 2536 BLAKE2B a30728ec6658664e099b04732e8058058822df20c381918057d4daadbc548806ef5d117b8e5dc8e3f2005c9abbaaa121e8364daff7ceb66b0c5295f45a0471af SHA512 1cd7e6d44125ee93792e403205fa07b434867764f31135e26997518e5b848ffdc57af6b3591c541531bab45c9bb629b88638001a03c314347c708f743899e666
diff --git a/media-libs/mesa/mesa-17.1.8.ebuild b/media-libs/mesa/mesa-17.1.8.ebuild
index f0443941a305..0366bb61c356 100644
--- a/media-libs/mesa/mesa-17.1.8.ebuild
+++ b/media-libs/mesa/mesa-17.1.8.ebuild
@@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-17.2.6.ebuild b/media-libs/mesa/mesa-17.2.6.ebuild
index 12be4d77969f..c73b6d0c97be 100644
--- a/media-libs/mesa/mesa-17.2.6.ebuild
+++ b/media-libs/mesa/mesa-17.2.6.ebuild
@@ -153,7 +153,7 @@ LLVM_DEPSTR="
 		sys-devel/llvm:4[${MULTILIB_USEDEP}]
 		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
 	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	<sys-devel/llvm-6:=[${MULTILIB_USEDEP}]
 "
 LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
diff --git a/media-libs/mesa/mesa-17.3.0_rc5.ebuild b/media-libs/mesa/mesa-17.3.0_rc5.ebuild
index 34d01959bac4..14e934a13216 100644
--- a/media-libs/mesa/mesa-17.3.0_rc5.ebuild
+++ b/media-libs/mesa/mesa-17.3.0_rc5.ebuild
@@ -153,7 +153,7 @@ LLVM_DEPSTR="
 		sys-devel/llvm:4[${MULTILIB_USEDEP}]
 		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
 	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	<sys-devel/llvm-6:=[${MULTILIB_USEDEP}]
 "
 LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index b41999398f56..35682631a8e3 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,10 +1,5 @@
 AUX taglib-1.11-install-examples.patch 371 BLAKE2B ee42b80e8c6093dbfc4c89c25bcb6bd25e2f5152c14743fa49c6c44a14f93a961f08a4d53337efe0800d98126a8aa58627a330e19386283cc16d8f20c9637262 SHA512 149ce1256ec557ee1e896b56e361f2fcf69633424f9b125666827eda610e84c35bf28e5c3fe5f38d4d87f1eacf977fc5b8b8c2d9c6634997bfe4e4bac122fc37
 AUX taglib-1.11.1-CVE-2017-12678.patch 1340 BLAKE2B 6940c22df9d4d7969253a8755e8050544d733e33cda8fbc1b4991ab94f879d052de31c140c468125b09859625eea84624d6c340f4385a45ee6ca30d8872a556b SHA512 2b5a8854572c572ebdc2e42cb949069d69ada82ba2bf632f08aadb7f603b86352e13a1da80c0e75a2fdeb5c15bd07aa71f558dba35ae098d61aba5e361c2acdf
-AUX taglib-1.6.1-install-examples.patch 581 BLAKE2B 65bc122295b1c28a59a56db7bb9894ee0b6ad6a74083bd5417cd098d5b87f47b4437684a556db311859f6439996451046328e2ada3c43ab3259d62b970e778ff SHA512 8af5b52b33c82f0d4961ad3ef0cd72844f84f442db2638ba0187ba808257e7d0602bc5f9c643252c7217d3119b1dd5a6fbf5f84a364f72c1d9154812b14e383b
-AUX taglib-1.9.1-abi-breakage.patch 3888 BLAKE2B 928c61111a3f45dfc6383bf53c3411cfb9ca6851401cd410231b97d4e7a60eb05616a8995e89d8b6e87cb48bf23a7a3cde2e8334ff4af7e529d44f2effecc0f6 SHA512 ec17447f97d83482fbf7fbafd99014344c638436fbadab2144a19679869603106e0f21cdfb738cf77743eb3230d244a81ed93d1bbf62efa1a8a3484d9e43e90b
-AUX taglib-1.9.1-bytevector-simpler.patch 3685 BLAKE2B 38018145649747dbf8ffa44dd6eadc86a162d0bedba5d7ab1603cab9cab938efec2015b53841ecdb83b67dc8bf620c19d0052bf82bd19cd3ff130f2ce593b53f SHA512 1d19d40766e8cb74cb60d5b13fb509c56ee1b0d10f622bfea954bbaf2c5a4908c81e026dc07e83764034647818eb875c71a505a6e1425c9d03820d8e0a3a4a11
-AUX taglib-1.9.1-missing-deletes.patch 1194 BLAKE2B 4559e86ea704f16d58e0e5e671c6f35f2062febfa7287a7abfef1eace5fc49f42db2a79d4895b4f7f05a5ec202dfee39876d18ca326d59aef3d47276bfdddf23 SHA512 1cc2796401dc1291b19245bd9a6bde9d77549d7ddab96b99b8e0f95c331a1ba7296f7107bd99f6f789cd04dd412d6e330db099ab49344c4dd1a10ccfef203fd1
-AUX taglib-1.9.1-order-big-endian.patch 884 BLAKE2B 9382802fe5bb4d2cf20a5a075ffeb5200b2cec5acfe33eb68031a80b7a1718c7578fe9f091f29be61a13bc7a3ec3ee87f1a54033ab271c56f3cf98de74e71263 SHA512 4f2c751f03e976da64fc1480e369443d724c420198600ae1a5e9e9cab3172289c73d15b66ec0c95165da30e52dff1d956314fd71fb067e10a11c350566671bd3
 DIST taglib-1.11.1.tar.gz 1261620 SHA256 b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b SHA512 7846775c4954ea948fe4383e514ba7c11f55d038ee06b6ea5a0a1c1069044b348026e76b27aa4ba1c71539aa8143e1401fab39184cc6e915ba0ae2c06133cb98 WHIRLPOOL 243cafaf238303eb2dcdca415ced4dbfb49d4890ba4ad5baec25aff9175bc33e3a20835518d461be946805b7b438c50c86d3999dc98fa648d177ac32a4a0b062
 EBUILD taglib-1.11.1-r1.ebuild 1394 BLAKE2B 513e615c8f6ed52923f922215e97367a82706cb905711697a554f8c5a780c747ffd0930d22d976233e3b77afe97d62c64c2c085ec1d1cd7fc4812416eb3e1843 SHA512 6dc269c47c6f869eb5f0e3e547e6d90f77fd7f81f7170bafe59824a4c1d75d6fab5e4c4fcfa22cea96fb6d8ddbf6da8e9acfe8a2089034484b0215f7f0cdcbac
 MISC metadata.xml 425 BLAKE2B 47fff2e6d248780975e5b7748de1cdce6f09d614b79ee055da57dc9062c7567f46864bc306bfabf17a7c61dbfca0d16df41d9c8a574a8fc220e359d41f247b1e SHA512 31bd061f371cc8f300a22c150b86ef163f0cdd1d5e6b1c0ef0652038a2a1a5372a2910e201df28a70cb57f87945636b1ad352858f75714f3889068f94391c4d0
diff --git a/media-libs/taglib/files/taglib-1.6.1-install-examples.patch b/media-libs/taglib/files/taglib-1.6.1-install-examples.patch
deleted file mode 100644
index f53768175a32..000000000000
--- a/media-libs/taglib/files/taglib-1.6.1-install-examples.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -purN taglib-1.6.1.orig/examples/CMakeLists.txt taglib-1.6.1/examples/CMakeLists.txt
---- taglib-1.6.1.orig/examples/CMakeLists.txt	2009-09-09 14:16:38.000000000 -0400
-+++ taglib-1.6.1/examples/CMakeLists.txt	2009-12-14 18:47:33.405385063 -0500
-@@ -45,6 +45,12 @@ ADD_EXECUTABLE(strip-id3v1 strip-id3v1.c
- 
- TARGET_LINK_LIBRARIES(strip-id3v1  tag )
- 
-+INSTALL(TARGETS
-+	tagreader tagreader_c tagwriter framelist strip-id3v1
-+	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-+)
- 
- endif(BUILD_EXAMPLES)
- 
diff --git a/media-libs/taglib/files/taglib-1.9.1-abi-breakage.patch b/media-libs/taglib/files/taglib-1.9.1-abi-breakage.patch
deleted file mode 100644
index 930439fc8349..000000000000
--- a/media-libs/taglib/files/taglib-1.9.1-abi-breakage.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 3bf30af66c8fd77a88d9379a0956ddb2fc70dc20 Mon Sep 17 00:00:00 2001
-From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
-Date: Wed, 6 Nov 2013 17:01:21 +0900
-Subject: [PATCH 2/6] Fixed ABI breakage in TagLib::String
-
----
- taglib/toolkit/tstring.cpp | 20 ++++++++++++++++++--
- taglib/toolkit/tstring.h   | 12 ++++++++++--
- tests/test_string.cpp      | 14 ++++++++++++++
- 3 files changed, 42 insertions(+), 4 deletions(-)
-
-diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
-index 75a9833..fb6e947 100644
---- a/taglib/toolkit/tstring.cpp
-+++ b/taglib/toolkit/tstring.cpp
-@@ -209,8 +209,16 @@ String::String(const std::string &s, Type t)
- String::String(const wstring &s, Type t)
-   : d(new StringPrivate())
- {
--  if(t == UTF16 || t == UTF16BE || t == UTF16LE)
-+  if(t == UTF16 || t == UTF16BE || t == UTF16LE) {
-+    // This looks ugly but needed for the compatibility with TagLib1.8. 
-+    // Should be removed in TabLib2.0.
-+    if (t == UTF16BE)
-+      t = WCharByteOrder;
-+    else if (t == UTF16LE)
-+      t = (WCharByteOrder == UTF16LE ? UTF16BE : UTF16LE);
-+
-     copyFromUTF16(s.c_str(), s.length(), t);
-+  }
-   else {
-     debug("String::String() -- A TagLib::wstring should not contain Latin1 or UTF-8.");
-   }
-@@ -219,8 +227,16 @@ String::String(const wstring &s, Type t)
- String::String(const wchar_t *s, Type t)
-   : d(new StringPrivate())
- {
--  if(t == UTF16 || t == UTF16BE || t == UTF16LE)
-+  if(t == UTF16 || t == UTF16BE || t == UTF16LE) {
-+    // This looks ugly but needed for the compatibility with TagLib1.8. 
-+    // Should be removed in TabLib2.0.
-+    if (t == UTF16BE)
-+      t = WCharByteOrder;
-+    else if (t == UTF16LE)
-+      t = (WCharByteOrder == UTF16LE ? UTF16BE : UTF16LE);
-+
-     copyFromUTF16(s, ::wcslen(s), t);
-+  }
-   else {
-     debug("String::String() -- A const wchar_t * should not contain Latin1 or UTF-8.");
-   }
-diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h
-index 57945be..605b9c2 100644
---- a/taglib/toolkit/tstring.h
-+++ b/taglib/toolkit/tstring.h
-@@ -134,13 +134,21 @@ namespace TagLib {
- 
-     /*!
-      * Makes a deep copy of the data in \a s.
-+     *
-+     * /note If \a t is UTF16LE, the byte order of \a s will be swapped regardless 
-+     * of the CPU byte order.  If UTF16BE, it will not be swapped.  This behavior
-+     * will be changed in TagLib2.0.
-      */
--    String(const wstring &s, Type t = WCharByteOrder);
-+    String(const wstring &s, Type t = UTF16BE);
- 
-     /*!
-      * Makes a deep copy of the data in \a s.
-+     *
-+     * /note If \a t is UTF16LE, the byte order of \a s will be swapped regardless 
-+     * of the CPU byte order.  If UTF16BE, it will not be swapped.  This behavior
-+     * will be changed in TagLib2.0.
-      */
--    String(const wchar_t *s, Type t = WCharByteOrder);
-+    String(const wchar_t *s, Type t = UTF16BE);
- 
-     /*!
-      * Makes a deep copy of the data in \a c.
-diff --git a/tests/test_string.cpp b/tests/test_string.cpp
-index a815a0b..9a574b3 100644
---- a/tests/test_string.cpp
-+++ b/tests/test_string.cpp
-@@ -75,6 +75,20 @@ public:
- 	String unicode3(L"\u65E5\u672C\u8A9E");
- 	CPPUNIT_ASSERT(*(unicode3.toCWString() + 1) == L'\u672C');
- 
-+    String unicode4(L"\u65e5\u672c\u8a9e", String::UTF16BE);
-+    CPPUNIT_ASSERT(unicode4[1] == L'\u672c');
-+
-+    String unicode5(L"\u65e5\u672c\u8a9e", String::UTF16LE);
-+    CPPUNIT_ASSERT(unicode5[1] == L'\u2c67');
-+
-+    wstring stduni = L"\u65e5\u672c\u8a9e";
-+
-+    String unicode6(stduni, String::UTF16BE);
-+    CPPUNIT_ASSERT(unicode6[1] == L'\u672c');
-+
-+    String unicode7(stduni, String::UTF16LE);
-+    CPPUNIT_ASSERT(unicode7[1] == L'\u2c67');
-+
-     CPPUNIT_ASSERT(strcmp(String::number(0).toCString(), "0") == 0);
-     CPPUNIT_ASSERT(strcmp(String::number(12345678).toCString(), "12345678") == 0);
-     CPPUNIT_ASSERT(strcmp(String::number(-12345678).toCString(), "-12345678") == 0);
--- 
-1.8.4.2
-
diff --git a/media-libs/taglib/files/taglib-1.9.1-bytevector-simpler.patch b/media-libs/taglib/files/taglib-1.9.1-bytevector-simpler.patch
deleted file mode 100644
index 0b134ec82215..000000000000
--- a/media-libs/taglib/files/taglib-1.9.1-bytevector-simpler.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 4a7d31c87bf41c1de21cb725176d5b34c2a95720 Mon Sep 17 00:00:00 2001
-From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
-Date: Thu, 14 Nov 2013 14:05:32 +0900
-Subject: [PATCH 3/6] Rewrote ByteVector::replace() simpler
-
----
- taglib/toolkit/tbytevector.cpp | 77 +++++++++++++++---------------------------
- tests/test_bytevector.cpp      |  5 +++
- 2 files changed, 33 insertions(+), 49 deletions(-)
-
-diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
-index b658246..566a20f 100644
---- a/taglib/toolkit/tbytevector.cpp
-+++ b/taglib/toolkit/tbytevector.cpp
-@@ -31,6 +31,7 @@
- #include <iostream>
- #include <cstdio>
- #include <cstring>
-+#include <cstddef>
- 
- #include <tstring.h>
- #include <tdebug.h>
-@@ -508,62 +509,40 @@ ByteVector &ByteVector::replace(const ByteVector &pattern, const ByteVector &wit
-   if(pattern.size() == 0 || pattern.size() > size())
-     return *this;
- 
--  const uint withSize = with.size();
--  const uint patternSize = pattern.size();
--  int offset = 0;
-+  const size_t withSize    = with.size();
-+  const size_t patternSize = pattern.size();
-+  const ptrdiff_t diff = withSize - patternSize;
-+  
-+  size_t offset = 0;
-+  while (true)
-+  {
-+    offset = find(pattern, offset);
-+    if(offset == static_cast<size_t>(-1)) // Use npos in taglib2.
-+      break;
- 
--  if(withSize == patternSize) {
--    // I think this case might be common enough to optimize it
-     detach();
--    offset = find(pattern);
--    while(offset >= 0) {
--      ::memcpy(data() + offset, with.data(), withSize);
--      offset = find(pattern, offset + withSize);
--    }
--    return *this;
--  }
- 
--  // calculate new size:
--  uint newSize = 0;
--  for(;;) {
--    int next = find(pattern, offset);
--    if(next < 0) {
--      if(offset == 0)
--        // pattern not found, do nothing:
--        return *this;
--      newSize += size() - offset;
--      break;
-+    if(diff < 0) {
-+      ::memmove(
-+        data() + offset + withSize, 
-+        data() + offset + patternSize, 
-+        size() - offset - patternSize);
-+      resize(size() + diff);
-     }
--    newSize += (next - offset) + withSize;
--    offset = next + patternSize;
--  }
--
--  // new private data of appropriate size:
--  ByteVectorPrivate *newData = new ByteVectorPrivate(newSize, 0);
--  char *target = DATA(newData);
--  const char *source = data();
--
--  // copy modified data into new private data:
--  offset = 0;
--  for(;;) {
--    int next = find(pattern, offset);
--    if(next < 0) {
--      ::memcpy(target, source + offset, size() - offset);
--      break;
-+    else if(diff > 0) {
-+      resize(size() + diff);
-+      ::memmove(
-+        data() + offset + withSize, 
-+        data() + offset + patternSize, 
-+        size() - diff - offset - patternSize);
-     }
--    int chunkSize = next - offset;
--    ::memcpy(target, source + offset, chunkSize);
--    target += chunkSize;
--    ::memcpy(target, with.data(), withSize);
--    target += withSize;
--    offset += chunkSize + patternSize;
--  }
- 
--  // replace private data:
--  if(d->deref())
--    delete d;
-+    ::memcpy(data() + offset, with.data(), with.size());
- 
--  d = newData;
-+    offset += withSize;
-+    if(offset > size() - patternSize)
-+      break;
-+  }
- 
-   return *this;
- }
-diff --git a/tests/test_bytevector.cpp b/tests/test_bytevector.cpp
-index 9efd23a..eca74f8 100644
---- a/tests/test_bytevector.cpp
-+++ b/tests/test_bytevector.cpp
-@@ -239,6 +239,11 @@ public:
-       a.replace(ByteVector("ab"), ByteVector());
-       CPPUNIT_ASSERT_EQUAL(ByteVector("cdf"), a);
-     }
-+    {
-+      ByteVector a("abcdabf");
-+      a.replace(ByteVector("bf"), ByteVector("x"));
-+      CPPUNIT_ASSERT_EQUAL(ByteVector("abcdax"), a);
-+    }
-   }
- 
- };
--- 
-1.8.4.2
-
diff --git a/media-libs/taglib/files/taglib-1.9.1-missing-deletes.patch b/media-libs/taglib/files/taglib-1.9.1-missing-deletes.patch
deleted file mode 100644
index 9cdbdcf00fbd..000000000000
--- a/media-libs/taglib/files/taglib-1.9.1-missing-deletes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c14a3b5c3d0831f7c113d0cf95840c4671d9ebd4 Mon Sep 17 00:00:00 2001
-From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
-Date: Tue, 13 May 2014 20:07:02 +0900
-Subject: [PATCH] Added some missing deletes to test_flac.cpp.
-
----
- tests/test_flac.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/test_flac.cpp b/tests/test_flac.cpp
-index caec715..364fb11 100644
---- a/tests/test_flac.cpp
-+++ b/tests/test_flac.cpp
-@@ -91,6 +91,7 @@ public:
-     newpic->setData("JPEG data");
-     f->addPicture(newpic);
-     f->save();
-+    delete f;
- 
-     f = new FLAC::File(newname.c_str());
-     lst = f->pictureList();
-@@ -138,6 +139,7 @@ public:
-     f->removePictures();
-     f->addPicture(newpic);
-     f->save();
-+    delete f;
- 
-     f = new FLAC::File(newname.c_str());
-     lst = f->pictureList();
-@@ -165,6 +167,7 @@ public:
- 
-     f->removePictures();
-     f->save();
-+    delete f;
- 
-     f = new FLAC::File(newname.c_str());
-     lst = f->pictureList();
-@@ -185,6 +188,7 @@ public:
-     tag->setTitle("NEW TITLE 2");
-     f->save();
-     CPPUNIT_ASSERT_EQUAL(String("NEW TITLE 2"), tag->title());
-+    delete f;
- 
-     f = new FLAC::File(newname.c_str());
-     tag = f->tag();
--- 
-1.9.0
-
diff --git a/media-libs/taglib/files/taglib-1.9.1-order-big-endian.patch b/media-libs/taglib/files/taglib-1.9.1-order-big-endian.patch
deleted file mode 100644
index 86d5201e54d4..000000000000
--- a/media-libs/taglib/files/taglib-1.9.1-order-big-endian.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From db3e961d1098d5efe57364f540f68a5996dc83c2 Mon Sep 17 00:00:00 2001
-From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
-Date: Tue, 13 May 2014 18:22:16 +0900
-Subject: [PATCH] Fixed a wrong byte order handling on big-endian machines.
-
----
- taglib/toolkit/tstring.cpp | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
-index 603455a..1ec083b 100644
---- a/taglib/toolkit/tstring.cpp
-+++ b/taglib/toolkit/tstring.cpp
-@@ -47,10 +47,14 @@
- 
- namespace 
- {
--
-   inline unsigned short combine(unsigned char c1, unsigned char c2)
-   {
--    return (c1 << 8) | c2;
-+    using namespace TagLib::Utils;
-+
-+    if(SystemByteOrder == LittleEndian)
-+      return (c1 << 8) | c2;
-+    else
-+      return (c2 << 8) | c1;
-   }
- 
-   void UTF16toUTF8(const wchar_t *src, size_t srcLength, char *dst, size_t dstLength)
--- 
-1.9.0
-