[gentoo-commits] repo/gentoo:master commit in: media-libs/libid3tag/, media-libs/libid3tag/files/0.15.1b/

[David Seifert]

commit:     dd253feed23adc325b7e6bcf4415c2dd5f4f42f6
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 15:25:03 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 15:25:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd253fee

media-libs/libid3tag: Port to EAPI 7

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../0.15.1b/libid3tag-0.15.1b-64bit-long.patch     |  4 +--
 .../0.15.1b/libid3tag-0.15.1b-a_capella.patch      | 10 +++---
 .../0.15.1b/libid3tag-0.15.1b-fix_overflow.patch   |  4 +--
 .../files/0.15.1b/libid3tag-0.15.1b-tag.patch      |  4 +--
 .../libid3tag-0.15.1b-unknown-encoding.patch       | 14 ++++----
 media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild   | 39 +++++++++++++---------
 6 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch
index 852d9efd69b..bb320c7aa70 100644
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch
@@ -1,5 +1,5 @@
---- id3tag.h.orig	2004-01-23 18:22:46.000000000 -0500
-+++ id3tag.h	2008-05-04 19:46:33.000000000 -0400
+--- a/id3tag.h
++++ b/id3tag.h
 @@ -25,6 +25,8 @@
  # ifndef LIBID3TAG_ID3TAG_H
  # define LIBID3TAG_ID3TAG_H

diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch
index 2adc2e6ced2..e196cb4df26 100644
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch
@@ -1,6 +1,5 @@
-diff -urNad /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat libid3tag-0.15.1b/genre.dat
---- a/libid3tag-0.15.1b/genre.dat	2004-02-16 21:34:39.000000000 -0500
-+++ b/libid3tag-0.15.1b/genre.dat	2004-09-06 09:50:33.000000000 -0400
+--- a/genre.dat
++++ b/genre.dat
 @@ -277,8 +277,8 @@
    { 'P', 'u', 'n', 'k', ' ', 'R', 'o', 'c', 'k', 0 };
  static id3_ucs4_t const genre_DRUM_SOLO[] =
@@ -21,9 +20,8 @@ diff -urNad /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat libid
    genre_EURO_HOUSE,
    genre_DANCE_HALL,
    genre_GOA,
-diff -urNad /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat.in libid3tag-0.15.1b/genre.dat.in
---- a/libid3tag-0.15.1b/genre.dat.in	2004-01-23 04:41:32.000000000 -0500
-+++ b/libid3tag-0.15.1b/genre.dat.in	2004-09-06 09:50:33.000000000 -0400
+--- a/genre.dat.in
++++ b/genre.dat.in
 @@ -153,7 +153,7 @@
  Duet
  Punk Rock

diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch
index 26c54c5d2cf..5e0a1f60e7a 100644
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch
@@ -1,5 +1,5 @@
---- field.c.orig	2008-05-05 09:49:15.000000000 -0400
-+++ field.c	2008-05-05 09:49:25.000000000 -0400
+--- a/field.c
++++ b/field.c
 @@ -291,7 +291,7 @@
  
        end = *ptr + length;

diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch
index 2badfb35cff..4d13e47018c 100644
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch
@@ -1,5 +1,5 @@
---- tag.c.orig	Fri Apr 18 18:14:33 2003
-+++ tag.c	Mon Sep 26 22:29:24 2005
+--- a/tag.c
++++ b/tag.c
 @@ -714,9 +714,12 @@
  
    frame = id3_tag_findframe(tag, ID3_FRAME_TRACK, 0);

diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch
index 7c70d002038..91b3d2a5eb0 100644
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch
@@ -1,6 +1,5 @@
-diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf
---- libid3tag-0.15.1b~/compat.gperf	2004-01-23 09:41:32.000000000 +0000
-+++ libid3tag-0.15.1b/compat.gperf	2007-01-14 14:36:53.000000000 +0000
+--- a/compat.gperf
++++ b/compat.gperf
 @@ -236,6 +236,10 @@
  
      encoding = id3_parse_uint(&data, 1);
@@ -10,11 +9,10 @@ diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf
 +	continue;
 +    }
  
-     if (id3_ucs4_length(string) < 4) {
-       free(string);
-diff -urNad libid3tag-0.15.1b~/parse.c libid3tag-0.15.1b/parse.c
---- libid3tag-0.15.1b~/parse.c	2004-01-23 09:41:32.000000000 +0000
-+++ libid3tag-0.15.1b/parse.c	2007-01-14 14:37:34.000000000 +0000
+     if (string == 0)
+       continue;
+--- a/parse.c
++++ b/parse.c
 @@ -165,6 +165,9 @@
    case ID3_FIELD_TEXTENCODING_UTF_8:
      ucs4 = id3_utf8_deserialize(ptr, length);

diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
index 0a3a7443ad6..bb711194b43 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-# eutils for einstalldocs
-inherit epatch epunt-cxx eutils libtool ltprune multilib multilib-minimal
+EAPI=7
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="The MAD id3tag library"
 HOMEPAGE="http://www.underbit.com/products/mad/"
@@ -12,25 +12,32 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug static-libs"
+IUSE="debug"
 
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-util/gperf"
+	>=dev-util/gperf-3.1"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}/${P}-64bit-long.patch
+	"${FILESDIR}"/${PV}/${P}-a_capella.patch
+	"${FILESDIR}"/${PV}/${P}-compat.patch
+	"${FILESDIR}"/${PV}/${P}-file-write.patch
+	"${FILESDIR}"/${PV}/${P}-fix_overflow.patch
+	"${FILESDIR}"/${PV}/${P}-tag.patch
+	"${FILESDIR}"/${PV}/${P}-unknown-encoding.patch
+	"${FILESDIR}"/${PV}/${P}-utf16.patchlibid3tag-0.15.1b-utf16.patch
+	"${FILESDIR}"/${P}-fix-signature.patch
+)
 
 src_prepare() {
-	epunt_cxx #74489
-	epatch "${FILESDIR}/${PV}"/*.patch
-	# gperf 3.1 and newer generate code with a size_t length parameter,
-	# older versions are incompatible and take an unsigned int.
-	has_version '>=dev-util/gperf-3.1' && epatch "${FILESDIR}/${P}-fix-signature.patch"
-
-	elibtoolize #sane .so versionning on fbsd and .so -> .so.version symlink
+	default
+	eautoreconf
 }
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_enable debug debugging)
 }
 
@@ -48,6 +55,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
 	einstalldocs
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }