[gentoo-commits] repo/gentoo:master commit in: media-libs/id3lib/files/, media-libs/id3lib/

[Andreas Sturmlechner]

commit:     f131feed71b585b9ff683ad5d44ba4fbc6e9e057
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 09:14:39 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 18 09:17:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f131feed

media-libs/id3lib: EAPI-6 bump

Package-Manager: Portage-2.3.47, Repoman-2.3.10

 .../id3lib/files/id3lib-3.8.3-autoconf259.patch    |  4 +--
 .../id3lib/files/id3lib-3.8.3-doxyinput.patch      |  4 +--
 media-libs/id3lib/files/id3lib-3.8.3-gcc-4.3.patch | 42 +++++++++++-----------
 .../id3lib-3.8.3-missing_nullpointer_check.patch   |  4 +--
 .../id3lib/files/id3lib-3.8.3-security.patch       |  4 +--
 media-libs/id3lib/files/id3lib-3.8.3-test_io.patch |  4 +--
 .../id3lib/files/id3lib-3.8.3-unicode16.patch      |  8 ++---
 media-libs/id3lib/files/id3lib-3.8.3-zlib.patch    |  8 ++---
 media-libs/id3lib/id3lib-3.8.3-r8.ebuild           | 34 ++++++++++--------
 9 files changed, 58 insertions(+), 54 deletions(-)

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 16921e17425..faa21fc175c 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 b118f487e06..9e230a5cb81 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 090dc0bc092..1aad1a86d8c 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 3b943796784..d075e62f9bd 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 2cf7c142034..9f1e4a98ee4 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 b4a0d24d65e..115e6aafc1a 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 7b1b5935890..de856df6c43 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 @@
 [phone]  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 177320bc17a..721d640200d 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 ca6e9eca543..74943e46257 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-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/"
@@ -23,16 +24,19 @@ 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
 }