reinit the tree, so we can have metadata

12 files changed, 582 insertions, 0 deletions

diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
new file mode 100644
index 000000000000..aea58f2824e2
--- /dev/null
+++ b/media-libs/taglib/Manifest
@@ -0,0 +1,15 @@
+AUX taglib-1.11-install-examples.patch 371 SHA256 77b8a947c8665f37d4b21914ed48822de91db07cebe4138d89c9e54e09c29d05 SHA512 149ce1256ec557ee1e896b56e361f2fcf69633424f9b125666827eda610e84c35bf28e5c3fe5f38d4d87f1eacf977fc5b8b8c2d9c6634997bfe4e4bac122fc37 WHIRLPOOL 93118192c3237878a471d1a6e9fd82c5040f98196a8c29ef445a8251691238937802cd126941b7b072b1263a2383ee5a0cc0acad314853a8feb2ab2f967cc2c2
+AUX taglib-1.11.1-CVE-2017-12678.patch 1340 SHA256 43e84462586ea4d107ee08b0584e072281e88b9e831ee46ed8761040472117d1 SHA512 2b5a8854572c572ebdc2e42cb949069d69ada82ba2bf632f08aadb7f603b86352e13a1da80c0e75a2fdeb5c15bd07aa71f558dba35ae098d61aba5e361c2acdf WHIRLPOOL 8ace562508edeb3857cb0d36f45800f9fd5a65ea49d7a71c8de1fb6f4f1075eacb0aefeb97eb0755395c070130d20ff703f01ce44449a7d0be828586399d2b8b
+AUX taglib-1.6.1-install-examples.patch 581 SHA256 d14af0647c186e7088dfc9cd4bd02a9d1d5499c9406a23c1c0bdbce1f62189d1 SHA512 8af5b52b33c82f0d4961ad3ef0cd72844f84f442db2638ba0187ba808257e7d0602bc5f9c643252c7217d3119b1dd5a6fbf5f84a364f72c1d9154812b14e383b WHIRLPOOL c61d7938825ec3ac412a94b9db5712ee78156818ec586e0641fd0ea89003e4b067e2c0d73c4ebe8d8d94b27f5eabe5fba956840eb14f1ed73d5ebb00e4ea3e43
+AUX taglib-1.9.1-abi-breakage.patch 3888 SHA256 e4d5a6cc4fc6d80421504008e423427f192c6d6d065396b1734d662adfc55b21 SHA512 ec17447f97d83482fbf7fbafd99014344c638436fbadab2144a19679869603106e0f21cdfb738cf77743eb3230d244a81ed93d1bbf62efa1a8a3484d9e43e90b WHIRLPOOL 4de488263916e2f8da734dc9986628ec964d727bf18961c40450637bf3f53337294fa8a5b01b7cd12cb6e01cc33b7d18ee7a622586771224b0109e3583fdd8a9
+AUX taglib-1.9.1-bytevector-simpler.patch 3685 SHA256 89992db2dd7201bfe1862c1cd1e01ae5481b45727b61dd0fbaf2c73da827aba6 SHA512 1d19d40766e8cb74cb60d5b13fb509c56ee1b0d10f622bfea954bbaf2c5a4908c81e026dc07e83764034647818eb875c71a505a6e1425c9d03820d8e0a3a4a11 WHIRLPOOL 82db5824828df8ec81a83879a10a6248fc449feda5732d9a29e2debc3336ac9656bd549863730c220c500061a9f6d0d0472a22bd17f53ceb4f1f73c5ca774320
+AUX taglib-1.9.1-missing-deletes.patch 1194 SHA256 263fbfce5accbcb635b42ae5b7af988a0a8a8d0f2dfdbb6dfd96ebf39421b3fc SHA512 1cc2796401dc1291b19245bd9a6bde9d77549d7ddab96b99b8e0f95c331a1ba7296f7107bd99f6f789cd04dd412d6e330db099ab49344c4dd1a10ccfef203fd1 WHIRLPOOL 8cced81a118f56e36943b1e45aadb234dcd20aa58378bbb5d30a97943b6f0ca4e37ea8381a02d77f8c3f4058fd2598cf450122574420e4627d1b9cedf08b343d
+AUX taglib-1.9.1-order-big-endian.patch 884 SHA256 cc3bd7acfb1c1bbbe0f8299107112bdf572bd716aa3623605f26e4312856ff2f SHA512 4f2c751f03e976da64fc1480e369443d724c420198600ae1a5e9e9cab3172289c73d15b66ec0c95165da30e52dff1d956314fd71fb067e10a11c350566671bd3 WHIRLPOOL dce49ba2b65b4f71a0867104ac81ac3e10cb09e48bf866306d813b03b472e758bc8339dd6135c18b6232a9f6b36369a44c7a6c10a513df537f75f43764fcdc48
+DIST taglib-1.11.1.tar.gz 1261620 SHA256 b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b SHA512 7846775c4954ea948fe4383e514ba7c11f55d038ee06b6ea5a0a1c1069044b348026e76b27aa4ba1c71539aa8143e1401fab39184cc6e915ba0ae2c06133cb98 WHIRLPOOL 243cafaf238303eb2dcdca415ced4dbfb49d4890ba4ad5baec25aff9175bc33e3a20835518d461be946805b7b438c50c86d3999dc98fa648d177ac32a4a0b062
+DIST taglib-1.9.1.tar.gz 654074 SHA256 d4da9aaaddf590ff15273b9b2c4622b6ce8377de0f40bab40155d471ede9c585 SHA512 17523b7ebdd089520289ae817b07f291be93fd0b9d3b2891eb4860a24e45943e94d25b99250c1ac477de5e51b08c39887ca13fdcc2dce17867eb60d1edb26154 WHIRLPOOL 962ec0508d8256a54ea686d4fb8d366f23f82bf10df6406c8012295ceda8416a5f23db6e450551b685798d628623eb5247e6ab7b658f955d897b86340baa5e8e
+EBUILD taglib-1.11.1-r1.ebuild 1396 SHA256 29c72946e88344fba8d6f025039136141aa1d0ae48ff2660eb68ee5381b6a527 SHA512 728cd05a9fd0bb5e5ffb687ff9385ad0903bc64062dd32938f480cebf1bf522ae29b007b7f98df1b95afa1b0ece4380dd707416d073bbba09531c3b07b47fd4e WHIRLPOOL 80ea33a8158a65d15c97ddaa21966cca0d04973e476407c5c37dc733ca3819024446f448f919d467474757da47159c0c60bdd25920d87508340116b9f0124acb
+EBUILD taglib-1.11.1.ebuild 1360 SHA256 4fa0caebd13d0ef1bb93f0caaf8e7999d674ba9f4dda93358d5441494311a9ae SHA512 8c7dd2aa123e56a94b2799fdea76bca1ee02534c770b3e367317eed4594f40a5ab3a38f13e53e35b9284fd5d80e3db27ff5feadf6262bdfda28d1fc9637f26d6 WHIRLPOOL 69d2d704893a3ecf49a1ccd9677f0be7acd60dd9c1a0da3237834fec6a50f8c4008758357ab63d49d9850731c5d79d3c8e5c4c2f9bbfa23f72e861abf47995fc
+EBUILD taglib-1.9.1-r2.ebuild 1847 SHA256 16a7e7a708a28bc819fb358afbba2757c741705c40b7802c9e4f690336674b2a SHA512 d62e4500fdfd5a4ed713e5c9dcfb6a70b04d658df844a548220e63ebc7fde771c34934a44bd9109c519cbc2374e5b81200ddf5695194ffe53c65e803ed7abd49 WHIRLPOOL ee5b34ba07be0fe160992da2b555867f69d9c64a78d18eb8bc98ca7f232f7664175e4e73bf69d293293eab878ede67b5bec5f422bb01829c2a1811927ac4b7d5
+MISC ChangeLog 3798 SHA256 2d9609463502b43ce4d9cc52606aacfb6b41b10dc8efe8d0db6dfc32b0d211f3 SHA512 8720c7e6d323d656ca8c9862b14285682792d4eb87bfa31d78f6c8ee8acac4fb7b5fbf82ec145a76e41dac68cdb5e8c48987e343f985c1123763bd44e745b57f WHIRLPOOL c17222811035b3d57e691d3fbee7049bf960721c22bc6e33dac0039f73983bbeb7745984b0914d1511ac4c4c4e338bbec17fcb2c4e6362883f30c88205265a41
+MISC ChangeLog-2015 19514 SHA256 669deb727b8b32ccde8fc5de4c54fdb49f02c89077217eedb66571577f7e0cfe SHA512 4ede1ed611e1df9a71e9550888183ace3a7eee4ec443e68a4c7ff3a8db88b93583eafedd0b1f3d3aa06a64cf548614da666f61257a95b680052bc019e5a88689 WHIRLPOOL 23ea9a5a684a9c895245c99c2c4a74e26764d98ebc6ea67c1b23fdf51dd4727a313b3d94fc264f67cd66849aaaac3a64b904ccc43eb0d179b204676277513949
+MISC metadata.xml 526 SHA256 d0fbdcdc8ffb2c1aeabc9f35307a2f2564502bd66603bdc9d25dd85e22c3280f SHA512 2441e8b6de28b8e3c098732e411b0ac0cfe8db518b920f1a247855f0759e36a4d47889c04e9ef8f5e9bb82d00d2cd4b6b7f91efcc51971644fa3284b13e56a1a WHIRLPOOL 5e44172d6ee0b73c88751fd99bdd2fc0d1c903c2407b8ee4a0595748c397839e300cd43f0ef1ae289d3f177e742fb56ceba5465d8a140c9fb38fd4c7f547f054
diff --git a/media-libs/taglib/files/taglib-1.11-install-examples.patch b/media-libs/taglib/files/taglib-1.11-install-examples.patch
new file mode 100644
index 000000000000..fd676c6aec14
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.11-install-examples.patch
@@ -0,0 +1,13 @@
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -37,3 +37,10 @@
+ add_executable(strip-id3v1 strip-id3v1.cpp)
+ 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}
++)
++
diff --git a/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch b/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch
new file mode 100644
index 000000000000..4b567da19821
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch
@@ -0,0 +1,30 @@
+From eb9ded1206f18f2c319157337edea2533a40bea6 Mon Sep 17 00:00:00 2001
+From: "Stephen F. Booth" <me@sbooth.org>
+Date: Sun, 23 Jul 2017 10:11:09 -0400
+Subject: [PATCH] Don't assume TDRC is an instance of TextIdentificationFrame
+
+If TDRC is encrypted, FrameFactory::createFrame() returns UnknownFrame
+which causes problems in rebuildAggregateFrames() when it is assumed
+that TDRC is a TextIdentificationFrame
+---
+ taglib/mpeg/id3v2/id3v2framefactory.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
+index 759a9b7be..9347ab869 100644
+--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
++++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
+@@ -334,10 +334,11 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const
+      tag->frameList("TDAT").size() == 1)
+   {
+     TextIdentificationFrame *tdrc =
+-      static_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front());
++      dynamic_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front());
+     UnknownFrame *tdat = static_cast<UnknownFrame *>(tag->frameList("TDAT").front());
+ 
+-    if(tdrc->fieldList().size() == 1 &&
++    if(tdrc &&
++       tdrc->fieldList().size() == 1 &&
+        tdrc->fieldList().front().size() == 4 &&
+        tdat->data().size() >= 5)
+     {
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
new file mode 100644
index 000000000000..f53768175a32
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.6.1-install-examples.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000000..930439fc8349
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.9.1-abi-breakage.patch
@@ -0,0 +1,107 @@
+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
new file mode 100644
index 000000000000..0b134ec82215
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.9.1-bytevector-simpler.patch
@@ -0,0 +1,131 @@
+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
new file mode 100644
index 000000000000..9cdbdcf00fbd
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.9.1-missing-deletes.patch
@@ -0,0 +1,48 @@
+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
new file mode 100644
index 000000000000..86d5201e54d4
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.9.1-order-big-endian.patch
@@ -0,0 +1,33 @@
+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
+
diff --git a/media-libs/taglib/metadata.xml b/media-libs/taglib/metadata.xml
new file mode 100644
index 000000000000..6322822c7534
--- /dev/null
+++ b/media-libs/taglib/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="asf">Provide support for Microsoft's 'advanced systems format' media container.</flag>
+		<flag name="boost">Use <pkg>dev-libs/boost</pkg> instead of GCC built-ins</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">taglib/taglib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/taglib/taglib-1.11.1-r1.ebuild b/media-libs/taglib/taglib-1.11.1-r1.ebuild
new file mode 100644
index 000000000000..6eb8e24027fc
--- /dev/null
+++ b/media-libs/taglib/taglib-1.11.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="A library for reading and editing audio meta data"
+HOMEPAGE="https://taglib.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MPL-1.1"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+SLOT="0"
+IUSE="boost debug examples test"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	boost? ( dev-libs/boost:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.11-install-examples.patch
+	"${FILESDIR}"/${P}-CVE-2017-12678.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/taglib-config
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \
+		-i CMakeLists.txt \
+		-i ConfigureChecks.cmake || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		$(cmake-utils_use_find_package boost Boost)
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	# ctest does not work
+	emake -C "${BUILD_DIR}" check
+}
diff --git a/media-libs/taglib/taglib-1.11.1.ebuild b/media-libs/taglib/taglib-1.11.1.ebuild
new file mode 100644
index 000000000000..d064b14e30f0
--- /dev/null
+++ b/media-libs/taglib/taglib-1.11.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="A library for reading and editing audio meta data"
+HOMEPAGE="https://taglib.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MPL-1.1"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+SLOT="0"
+IUSE="boost debug examples test"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	boost? ( dev-libs/boost:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.11-install-examples.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/taglib-config
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \
+		-i CMakeLists.txt \
+		-i ConfigureChecks.cmake || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		$(cmake-utils_use_find_package boost Boost)
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	# ctest does not work
+	emake -C "${BUILD_DIR}" check
+}
diff --git a/media-libs/taglib/taglib-1.9.1-r2.ebuild b/media-libs/taglib/taglib-1.9.1-r2.ebuild
new file mode 100644
index 000000000000..807331a20de0
--- /dev/null
+++ b/media-libs/taglib/taglib-1.9.1-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-multilib
+
+DESCRIPTION="A library for reading and editing audio meta data"
+HOMEPAGE="https://taglib.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MPL-1.1"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+SLOT="0"
+IUSE="+asf debug examples +mp4 test"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r2
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-install-examples.patch
+	"${FILESDIR}"/${P}-missing-deletes.patch
+	"${FILESDIR}"/${P}-order-big-endian.patch
+	"${FILESDIR}"/${P}-abi-breakage.patch
+	"${FILESDIR}"/${P}-bytevector-simpler.patch
+)
+
+DOCS=( AUTHORS NEWS )
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/taglib-config
+)
+
+multilib_src_configure() {
+	mycmakeargs=(
+		$(multilib_is_native_abi && cmake-utils_use_build examples)
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use_with asf)
+		$(cmake-utils_use_with mp4)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	# ctest does not work
+	emake -C "${BUILD_DIR}" check
+}
+
+pkg_postinst() {
+	if ! use asf; then
+		elog "You've chosen to disable the asf use flag, thus taglib won't include"
+		elog "support for Microsoft's 'advanced systems format' media container"
+	fi
+	if ! use mp4; then
+		elog "You've chosen to disable the mp4 use flag, thus taglib won't include"
+		elog "support for the MPEG-4 part 14 / MP4 media container"
+	fi
+}