gentoo resync : 25.08.2018

10 files changed, 69 insertions, 65 deletions

diff --git a/media-libs/id3lib/Manifest b/media-libs/id3lib/Manifest
index 7936a79d087c..0764e42c5de4 100644
--- a/media-libs/id3lib/Manifest
+++ b/media-libs/id3lib/Manifest
@@ -1,11 +1,11 @@
-AUX id3lib-3.8.3-autoconf259.patch 1130 BLAKE2B e65f7693f5ac6284348aaa52bc286856a22cbd4396725c83113dda96f4637e92fb0ce453b737ae97c61e1d284910fb0894f6e4d21e5a575f1f9f99de25b1d261 SHA512 e7d15ca57889934d1956293454e6326e1fbf81116d42e42732a2f0c9fc04b067ebf43f896d28bfa2fa18978b9099fdc6a36c573da137c2ee80efcbb83cdb04ae
-AUX id3lib-3.8.3-doxyinput.patch 977 BLAKE2B 799a43e588b3c4d196521e0fc183dbc1b47b7faafe24e8225b6adcaa514446519b85fbd93a7ea7944a4394a17240fade7d7911b1e7f55ed546416e18b7f4f87e SHA512 f226281ba0afb7d0f2c49d5769ba374ab36edd228a7b4251c9775c83b50489db6b853044f442268134e2885e9d90500708597d59adccdb563c2eff2dd9af9fa8
-AUX id3lib-3.8.3-gcc-4.3.patch 2971 BLAKE2B 2eac3593420d2d73863e4fe1feff92496bf4515bf4b7a401f13ab26b54578181660fb26449f2786b116354bedb985954b3681ede17d15b0bdd92ee016abc7695 SHA512 14c5376c676d3a67c7fe92f271d0e6067f6168f16fed0c9ac4dd28a0b7280896cb993f17911baac7d8c2cfacd210f6c587c92bc38e54ef71584fbbff50e86bb5
-AUX id3lib-3.8.3-missing_nullpointer_check.patch 329 BLAKE2B 8e4b21193814f4b7c1bb08f54238ea314aec293bb85b2576ed90de812e557ec59d12e9e08d658d04c3c58c6782328b351e7abf03ab8fac8c568c89dd0b5b8535 SHA512 bfda0531711d2dc8a9d0581aaaef940f456ba1d3544c2399d9eff6806f0b564678a4d428e35920cbeac9ed9e2efe3aee640500a89c6853fc921ef79afbf6fdb4
-AUX id3lib-3.8.3-security.patch 1455 BLAKE2B a24784a2921404235d23cc163b9948b41aa834cede1e3f76de8cbe4a15aeeb4d9da8fcf2cf767ae0219242f518b96d322229ae489f2d88d87418c1bcf15719b6 SHA512 ded434b26c36636aef77a69376cece644ad09c81168bbd50e02eea21c4af32efe62fbc31d772fbe94560da6411a8b0562708bfd043b9ab31a4a0944bddb2814f
-AUX id3lib-3.8.3-test_io.patch 281 BLAKE2B 23b6563c1398bb77d1c3af76ebb34adbc9a5012ad1e08b4fb414a2023cdda5c422ca21b0c1cd3ffb8415d59729b8f8368e8a96225d383a3f432fffa5e5748773 SHA512 41138975241980cbdc1e602a6d5ce3c3cfefe7db316b95db99ba8f10daf251e6d761716ab60bfceaa476df3e56597b18a69d0ffed171e4de25bfcb44c6fcfd1d
-AUX id3lib-3.8.3-unicode16.patch 1544 BLAKE2B bb1c6509586f110cd926ee5444119753b4984b37a243fc42b279b6c3e9cefbed0957a2079769b28381c7090995d621156277badd60bf9542422834ae7f51325e SHA512 ba56f77a0672c34df1757435e27aac3b202c8ad4a8b79213f0d314016568937466a535f51d3b65c7ec18d5349bbfcb6d87d37d7124125cfb0aad8eab72e8fe6d
-AUX id3lib-3.8.3-zlib.patch 833 BLAKE2B cf45b2a69a48abe90ee40365d95b6b2aa2df600106e93c905e07ef22ef49cc48ec13785031aa2434e79d082b9c454658c7eee677b0aa49d6beabdf38ff75c4ce SHA512 61937ec6c2751467dd13179db15f06eff04b5b186f82b4327c38388f03c03ac7de277b9173b2b0326141c77335cad7fcd98234994cc5694cd1228e0d81919e53
+AUX id3lib-3.8.3-autoconf259.patch 1103 BLAKE2B f9bc438534eb157fece6500cc8d009d88e3ff88d4b486c54eacd6c735b768a24bf1487eb1e3db24d621f2879b0d049d5a08ca8a92b943477b69f1ead6056c943 SHA512 b0a4bcea15e42b9f599726918d690ec707afcb7e5c7c1b7f80900947f0b3b8a877bdabf303ba001a43139a1249cb48c9099a96e4b1b78438f26b4fa37d2e8f4a
+AUX id3lib-3.8.3-doxyinput.patch 950 BLAKE2B 85c44b5aec6a2c5ab385db977f0ace57cd463cc25f4a628e88ab92d74d2fd98c348ce1699889b7d806a9341a15e80d0721b9a06269c28a088e408847f7a58a1d SHA512 86bdec42d0b6411d493899d1ad00f667ea38133f5b8cf2665fe94ce9db80d54e4aad1f9d8e94bc7578b8c1fd5c43747d07c929f01f66e0d4f71b63543ff04012
+AUX id3lib-3.8.3-gcc-4.3.patch 2670 BLAKE2B 065b6d57a20b0af65c8fb584decfcec56f58162bb356a6fd83c96e1b8897d87ebd409ec9aa9520bc67b352132dc8f5978213dffb6dc47e80c66ce7daa420fc9b SHA512 a8eec4e9b122f4627af2e81fa3b391fb5bfca5d95c6520fe2b67f1388824490c1434f8dfabdbd42ab2855d8ad7a85f2477a0c26c9930dd033a5d4e596f9838cb
+AUX id3lib-3.8.3-missing_nullpointer_check.patch 302 BLAKE2B fe6fd77ab360b1804f937dbeb903aa8837a32dea0c0c3822c469dc0d08093dba90d8682a4a050850072249389c7638311b8b97a323959fe4d887896d7aa45116 SHA512 aad3b6371e060d4121b34831fa84791ad81558f64dcafa2ebd729de62c8b9c160fe949030c985c4bd3fafbc05290eb4268a3821db6bf3e1c44f414883f61f598
+AUX id3lib-3.8.3-security.patch 1459 BLAKE2B eb8401ae625ae374848fcf777502dcc7d541d8d960441533232f6c7772dbe4bdfed69b109acf2ea60ff10c5b0c894a810a801bf7214ad36f3d606feed29ecadd SHA512 ac3920696a3d9a6e5b08fcf93d65ab96855f3493bd6c9d0cf11cebddc5fc9e5e4a1ee9f2076774590f4121f35e3b63710fedf25216194c6b391f073b0489cd5f
+AUX id3lib-3.8.3-test_io.patch 254 BLAKE2B 3b38a82fb990de47a8f65d46171ef8273b180a6a337274fed9ee59e0f53bb3c08285b661a687adc86dd181996362e5c5aea95334e314154bef9b468a314c4df7 SHA512 5efca41cec0e77b325f35f646448edf8ef93ad9f90e8ae687c833cc581aa5ae321a59b3c6089d6b1d17a0245cbc3ca834190cf8ec3dd5ecb0a06cdef2d9d8e7c
+AUX id3lib-3.8.3-unicode16.patch 1490 BLAKE2B 8e9c23cacc11fe87e846830c91946e16641a32baa9717647999fc32522d10e553480d9b5ac5e5e3f12fc4fa72e31667df1c90b734016d0c1adc88d74d0a1901e SHA512 270e498a0586d25ae7cee45dcd45d5d143b0ba5799be34ef10b1577d766a82239bb949c9463cb59d1bf3a92070063252680441cb0691829c963fb4b4520ff4ab
+AUX id3lib-3.8.3-zlib.patch 779 BLAKE2B e7379e6d3136ebc93ddc8b79ce52ba92a41d911b883a74bfdb58d0ac6f774483f821ef66b453fef96649e5e67dbb1afa9c871d104c0dd29a8e1bf11ae8caa853 SHA512 e9c29883731ef417602812d714a14e1b7547d89581ffe40d0d0400218b0491f38cf50b24ab6dd8bcfcc94c95af914c6d34b53429a2789d7c27f0cb7661474dae
 DIST id3lib-3.8.3.tar.gz 950726 BLAKE2B 37afb1292d598e8416251e18beb1d1b4402d11ebd971d3e9b151ae9e092884ec4b0b7f9c19bbd8296fbb7fe7320ced7ba1f733a367662d378d2d82b2b52b7bb2 SHA512 3787e261f86933c1c2f2bff2c4b349b42f5d8636e489e4f39f9d75e6dfbdc79b87009a0f4ce4b786f2fb3dbc01ca9d56c4112095b46244f897e6c9a28573adaf
-EBUILD id3lib-3.8.3-r8.ebuild 1319 BLAKE2B d294a5995a84ec43a686035d709e22abefc0e79b800629aeac0929f609007ebec630ad992e75e0bcdc91566bf9298a63adb1bfad68a13f5b770733d80c76df6b SHA512 b3d158cd02607bacdb717d27114ab69e9cda8be3ef9588803467488c9f77733234998f4298868a2acf91ff078f065635fbb2413164d8b972bae5e83345e51f7b
+EBUILD id3lib-3.8.3-r8.ebuild 1351 BLAKE2B 73e2f951cd87d781007c3b9cee93ab9d3937c538223357cc19b970066d12236ca3631fba9c304c794930dd5332b28cc3039a86bd5de1360861f023fe357bc85f SHA512 6c52bba8d8410096befe2fec96a8409b9f1219b2a65b1a012b25cd9768bdf9e4307f30993a1ea0e2bd906e4405d647fd2b53c392d73ca6f503189a7dfa391f09
 MISC metadata.xml 339 BLAKE2B 7edd7b91c817463342d9d8123d07014bc77b8d1342a1bbf17811ec54ed2c749441de32f6d518b30ab718459a3edde8b1f4953b7202df294407da192f33c669b7 SHA512 e5d02d27394556f17ac426d2c87cc19aa8c603913d9c5ca3641154e87b54f5de6768dfa4334c371d3a65af5c39f265f561b1bac6ab497ed5b41ad10891d5a800
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-autoconf259.patch b/media-libs/id3lib/files/id3lib-3.8.3-autoconf259.patch
index 16921e17425e..faa21fc175c0 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-autoconf259.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-autoconf259.patch
@@ -1,7 +1,7 @@
 Index: id3lib-3.8.3/configure.in
 ===================================================================
---- id3lib-3.8.3.orig/configure.in
-+++ id3lib-3.8.3/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -168,7 +168,7 @@ if test $has_iconv = 1; then
  		iconv_oldstyle=1, iconv_oldstyle=0)
    if test $iconv_oldstyle = 1; then
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-doxyinput.patch b/media-libs/id3lib/files/id3lib-3.8.3-doxyinput.patch
index b118f487e06c..9e230a5cb81e 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-doxyinput.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-doxyinput.patch
@@ -1,7 +1,7 @@
 Index: id3lib-3.8.3/doc/Doxyfile
 ===================================================================
---- id3lib-3.8.3.orig/doc/Doxyfile
-+++ id3lib-3.8.3/doc/Doxyfile
+--- a/doc/Doxyfile
++++ b/doc/Doxyfile
 @@ -262,17 +262,7 @@ WARN_FORMAT            = "$file:$line: $
  # with spaces. 
  
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-gcc-4.3.patch b/media-libs/id3lib/files/id3lib-3.8.3-gcc-4.3.patch
index 090dc0bc092d..1aad1a86d8c3 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-gcc-4.3.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-gcc-4.3.patch
@@ -1,6 +1,6 @@
-diff -Naur id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in
---- id3lib-3.8.3-orig/configure.in	2008-03-05 18:03:25.000000000 -0600
-+++ id3lib-3.8.3/configure.in	2008-03-05 18:15:42.000000000 -0600
+diff -Naur a/configure.in id3lib-3.8.3/configure.in
+--- a/configure.in	2008-03-05 18:03:25.000000000 -0600
++++ b/configure.in	2008-03-05 18:15:42.000000000 -0600
 @@ -227,7 +227,6 @@
  )
  AC_CHECK_HEADERS(               \
@@ -9,9 +9,9 @@ diff -Naur id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in
    ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
  )
  
-diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h
---- id3lib-3.8.3-orig/include/id3/id3lib_strings.h	2008-03-05 18:19:46.000000000 -0600
-+++ id3lib-3.8.3/include/id3/id3lib_strings.h	2008-03-05 18:19:38.000000000 -0600
+diff -Naur a/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h
+--- a/include/id3/id3lib_strings.h	2008-03-05 18:19:46.000000000 -0600
++++ b/include/id3/id3lib_strings.h	2008-03-05 18:19:38.000000000 -0600
 @@ -30,6 +30,7 @@
  #define _ID3LIB_STRINGS_H_
  
@@ -20,9 +20,9 @@ diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/i
  
  #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
  namespace std
-diff -Naur id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h
---- id3lib-3.8.3-orig/include/id3/writers.h	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/include/id3/writers.h	2008-03-05 18:23:05.000000000 -0600
+diff -Naur a/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h
+--- a/include/id3/writers.h	2003-03-01 18:23:00.000000000 -0600
++++ b/include/id3/writers.h	2008-03-05 18:23:05.000000000 -0600
 @@ -30,7 +30,7 @@
  
  #include "id3/writer.h"
@@ -32,9 +32,9 @@ diff -Naur id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writ
  
  class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
  {
-diff -Naur id3lib-3.8.3-orig/examples/demo_convert.cpp id3lib-3.8.3/examples/demo_convert.cpp
---- id3lib-3.8.3-orig/examples/demo_convert.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_convert.cpp	2008-03-05 18:26:50.000000000 -0600
+diff -Naur a/examples/demo_convert.cpp id3lib-3.8.3/examples/demo_convert.cpp
+--- a/examples/demo_convert.cpp	2003-03-01 18:23:00.000000000 -0600
++++ b/examples/demo_convert.cpp	2008-03-05 18:26:50.000000000 -0600
 @@ -84,7 +84,7 @@
    }
  }
@@ -44,9 +44,9 @@ diff -Naur id3lib-3.8.3-orig/examples/demo_convert.cpp id3lib-3.8.3/examples/dem
  {
    flags_t ulFlag = ID3TT_ALL;
    gengetopt_args_info args;
-diff -Naur id3lib-3.8.3-orig/examples/demo_info.cpp id3lib-3.8.3/examples/demo_info.cpp
---- id3lib-3.8.3-orig/examples/demo_info.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_info.cpp	2008-03-05 18:27:40.000000000 -0600
+diff -Naur a/examples/demo_info.cpp id3lib-3.8.3/examples/demo_info.cpp
+--- a/examples/demo_info.cpp	2003-03-01 18:23:00.000000000 -0600
++++ b/examples/demo_info.cpp	2008-03-05 18:27:40.000000000 -0600
 @@ -309,7 +309,7 @@
  
  #define DEBUG
@@ -56,9 +56,9 @@ diff -Naur id3lib-3.8.3-orig/examples/demo_info.cpp id3lib-3.8.3/examples/demo_i
  {
    ID3D_INIT_DOUT();
  
-diff -Naur id3lib-3.8.3-orig/examples/demo_tag.cpp id3lib-3.8.3/examples/demo_tag.cpp
---- id3lib-3.8.3-orig/examples/demo_tag.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_tag.cpp	2008-03-05 18:31:20.000000000 -0600
+diff -Naur a/examples/demo_tag.cpp id3lib-3.8.3/examples/demo_tag.cpp
+--- a/examples/demo_tag.cpp	2003-03-01 18:23:00.000000000 -0600
++++ b/examples/demo_tag.cpp	2008-03-05 18:31:20.000000000 -0600
 @@ -46,7 +46,7 @@
      os << "v2";
  }
@@ -68,9 +68,9 @@ diff -Naur id3lib-3.8.3-orig/examples/demo_tag.cpp id3lib-3.8.3/examples/demo_ta
  {
    int ulFlag = ID3TT_ID3;
    ID3D_INIT_DOUT();
-diff -Naur id3lib-3.8.3-orig/examples/demo_copy.cpp id3lib-3.8.3/examples/demo_copy.cpp
---- id3lib-3.8.3-orig/examples/demo_copy.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_copy.cpp	2008-03-05 18:32:44.000000000 -0600
+diff -Naur a/examples/demo_copy.cpp id3lib-3.8.3/examples/demo_copy.cpp
+--- a/examples/demo_copy.cpp	2003-03-01 18:23:00.000000000 -0600
++++ b/examples/demo_copy.cpp	2008-03-05 18:32:44.000000000 -0600
 @@ -81,7 +81,7 @@
    }
  }
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-missing_nullpointer_check.patch b/media-libs/id3lib/files/id3lib-3.8.3-missing_nullpointer_check.patch
index 3b9437967842..d075e62f9bdb 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-missing_nullpointer_check.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-missing_nullpointer_check.patch
@@ -1,5 +1,5 @@
---- id3lib-3.8.3/src/header_tag.cpp.orig	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/src/header_tag.cpp	2009-07-13 22:54:21.000000000 +0200
+--- a/src/header_tag.cpp	2003-03-02 01:23:00.000000000 +0100
++++ b/src/header_tag.cpp	2009-07-13 22:54:21.000000000 +0200
 @@ -54,7 +54,7 @@
  {
    size_t bytesUsed = ID3_TagHeader::SIZE;
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-security.patch b/media-libs/id3lib/files/id3lib-3.8.3-security.patch
index 2cf7c1420340..9f1e4a98ee43 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-security.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-security.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/189610
 
---- src/tag_file.cpp
-+++ src/tag_file.cpp
+--- a/src/tag_file.cpp
++++ b/src/tag_file.cpp
 @@ -242,8 +242,8 @@
      strcpy(sTempFile, filename.c_str());
      strcat(sTempFile, sTmpSuffix.c_str());
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-test_io.patch b/media-libs/id3lib/files/id3lib-3.8.3-test_io.patch
index b4a0d24d65e3..115e6aafc1a0 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-test_io.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-test_io.patch
@@ -1,5 +1,5 @@
---- id3lib-3.8.3/examples/test_io.cpp.orig	2004-09-21 23:40:48.398826320 +0200
-+++ id3lib-3.8.3/examples/test_io.cpp	2004-09-21 23:40:55.408760648 +0200
+--- a/examples/test_io.cpp	2004-09-21 23:40:48.398826320 +0200
++++ b/examples/test_io.cpp	2004-09-21 23:40:55.408760648 +0200
 @@ -16,6 +16,7 @@
  using std::cerr;
  
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-unicode16.patch b/media-libs/id3lib/files/id3lib-3.8.3-unicode16.patch
index 7b1b59358903..de856df6c43c 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-unicode16.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-unicode16.patch
@@ -1,6 +1,6 @@
 diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
---- id3lib-3.8.3.orig/ChangeLog	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/ChangeLog	2006-02-22 00:33:59.946214472 +0100
+--- a/ChangeLog	2003-03-02 01:23:00.000000000 +0100
++++ b/ChangeLog	2006-02-22 00:33:59.946214472 +0100
 @@ -1,3 +1,8 @@
 +2006-02-17  Jerome Couderc
 +
@@ -11,8 +11,8 @@ diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
  
  	* THANKS (1.20): added more people 
 diff -ruN id3lib-3.8.3.orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp
---- id3lib-3.8.3.orig/src/io_helpers.cpp	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/src/io_helpers.cpp	2006-02-22 00:35:02.926639992 +0100
+--- a/src/io_helpers.cpp	2003-03-02 01:23:00.000000000 +0100
++++ b/src/io_helpers.cpp	2006-02-22 00:35:02.926639992 +0100
 @@ -363,11 +363,22 @@
      // Write the BOM: 0xFEFF
      unicode_t BOM = 0xFEFF;
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-zlib.patch b/media-libs/id3lib/files/id3lib-3.8.3-zlib.patch
index 177320bc17a3..721d640200df 100644
--- a/media-libs/id3lib/files/id3lib-3.8.3-zlib.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-zlib.patch
@@ -1,6 +1,6 @@
 diff -Naur id3lib-3.8.3.orig/Makefile.am id3lib-3.8.3/Makefile.am
---- id3lib-3.8.3.orig/Makefile.am	2003-03-01 16:23:00.000000000 -0800
-+++ id3lib-3.8.3/Makefile.am	2004-09-12 19:05:39.564456828 -0700
+--- a/Makefile.am	2003-03-01 16:23:00.000000000 -0800
++++ b/Makefile.am	2004-09-12 19:05:39.564456828 -0700
 @@ -28,7 +28,7 @@
  endif
  
@@ -11,8 +11,8 @@ diff -Naur id3lib-3.8.3.orig/Makefile.am id3lib-3.8.3/Makefile.am
  INCLUDES = @ID3LIB_DEBUG_FLAGS@
  
 diff -Naur id3lib-3.8.3.orig/src/Makefile.am id3lib-3.8.3/src/Makefile.am
---- id3lib-3.8.3.orig/src/Makefile.am	2003-03-01 16:23:00.000000000 -0800
-+++ id3lib-3.8.3/src/Makefile.am	2004-09-12 19:08:30.814149521 -0700
+--- a/src/Makefile.am	2003-03-01 16:23:00.000000000 -0800
++++ b/src/Makefile.am	2004-09-12 19:08:30.814149521 -0700
 @@ -77,6 +77,7 @@
  endif
  
diff --git a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
index df3dc169a92f..74943e462577 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=6
+
+inherit autotools
 
 DESCRIPTION="Id3 library for C/C++"
 HOMEPAGE="http://id3lib.sourceforge.net/"
@@ -19,20 +20,23 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 
-DOCS="AUTHORS ChangeLog HISTORY README THANKS TODO"
+DOCS=( AUTHORS ChangeLog HISTORY README THANKS TODO )
 
 S=${WORKDIR}/${P/_}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-zlib.patch
+	"${FILESDIR}"/${P}-test_io.patch
+	"${FILESDIR}"/${P}-autoconf259.patch
+	"${FILESDIR}"/${P}-doxyinput.patch
+	"${FILESDIR}"/${P}-unicode16.patch
+	"${FILESDIR}"/${P}-gcc-4.3.patch
+	"${FILESDIR}"/${P}-missing_nullpointer_check.patch
+	"${FILESDIR}"/${P}-security.patch
+)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-zlib.patch \
-		"${FILESDIR}"/${P}-test_io.patch \
-		"${FILESDIR}"/${P}-autoconf259.patch \
-		"${FILESDIR}"/${P}-doxyinput.patch \
-		"${FILESDIR}"/${P}-unicode16.patch \
-		"${FILESDIR}"/${P}-gcc-4.3.patch \
-		"${FILESDIR}"/${P}-missing_nullpointer_check.patch \
-		"${FILESDIR}"/${P}-security.patch
+	default
 
 	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {.,zlib}/configure.in || die
 
@@ -46,14 +50,14 @@ src_configure() {
 src_compile() {
 	default
 	if use doc; then
-		pushd doc >/dev/null
+		pushd doc >/dev/null || die
 		doxygen Doxyfile || die
-		popd >/dev/null
+		popd >/dev/null || die
 	fi
 }
 
 src_install() {
+	use doc && local HTML_DOCS=( doc/. )
 	default
-	prune_libtool_files
-	use doc && dohtml -r doc
+	find "${D}" -name '*.la' -delete || die
 }