gentoo resync : 15.01.2020

7 files changed, 46 insertions, 41 deletions

diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index 122f99560ba0..324e8f5f51ee 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -1,13 +1,13 @@
-AUX 0.15.1b/libid3tag-0.15.1b-64bit-long.patch 567 BLAKE2B 1f1797d093abb56e87be3151f958d9bb06a9320cac1a441c0ebad6114d8e632e0da7ceede7ef6c218c95f4f3be8c7542e71a541f8fbaeaf358860b9fa01f17ab SHA512 f2c19dd5138d1cf58764dfb2acb58b4f36ad18749b0a29de9110f3bf81ae1c56c24701b4a906692863501c175fab81c44d486a94a7ee63ea67f552a68f14dcaa
-AUX 0.15.1b/libid3tag-0.15.1b-a_capella.patch 1303 BLAKE2B 14ab259f31d2389735d35ecd138dac696368b35496c7de94513268fdbbaf3d9d56af74cd7dfcf2592bd14f5d1401c7a52e213851d24eb745d3e1904661b363e7 SHA512 a14fe71d32d620033afc73da9e4be3ecb1b88b750b96b5da960e3d323f0a45030e221d5a001ed9fbdb45d9072fa2f82946bae6a73a1e116355a88deada99435e
+AUX 0.15.1b/libid3tag-0.15.1b-64bit-long.patch 494 BLAKE2B 6d3f37e0b3cb642012cdf6f31a11a6852c524a4ca10c0ec2d7adb925704ce46378261e28c62464e7c5189479d15c8c5fe120fdf968629272879b299345079aa9 SHA512 4641e4fb2a954270af7669b4119bffc5bc1f15f039e11a3c07811a6f148aa2f82c7b56f64f09f724440630b99920651651761c05a77c15b54268907b599e9ff0
+AUX 0.15.1b/libid3tag-0.15.1b-a_capella.patch 875 BLAKE2B 7bc827cfe5c9991726655d444c6860fff3264a5e125dd1574e870796ff52affa10e0c034b4acd9bda3858be2f815cd934daf5755caff93361e2a51ce2234332a SHA512 c7e77bd81f620165d2e5b71c39b62d7633b579c67de30ffb12d51ee52987e072d8a0ff1384232d3c29d60f348d10c33fc47dbba7969e2c874a05009f12f607d0
 AUX 0.15.1b/libid3tag-0.15.1b-compat.patch 452 BLAKE2B c43437ca0319e383e375cb7826f1afa61774f2fb3cb52136ad3a267ea17a4f6bb7532d82e0b354168464f16e69bb3e8a1ea8dd313f5895d9c2e5c8d6b928985f SHA512 91364db67a02106ebd0f8930f16adb25f078f707f95c695b0da6b42f1519e6aadd7cf181d19f2fea6454b3ed64d0388222f279bb1e5c802365b5d3faeb9f30c3
 AUX 0.15.1b/libid3tag-0.15.1b-file-write.patch 1344 BLAKE2B ba1e43314a4e286db21a6236929ef125294a1826724cf13a33c30a906a03dc2e6ec26acc66419c4007208ca8c99324178c3c932569e70c1cf699d7595c3b75ff SHA512 a24cd37eefd6dc282c71f59ea1f612c2347deb87a15bd6aa5c163a61cabe77a0cc882adabae35d5090c711f7f796fb6e3787968e506627336f0f0d4ad7957414
-AUX 0.15.1b/libid3tag-0.15.1b-fix_overflow.patch 324 BLAKE2B 229a97eb0c9d136a36a629185fde8541727d5fe5f4ecfb93c34fc8e0e70cd1024e0988d3f66f069e952d13040dfa13d1aa8b894b31b2b9dc92384a92d328548a SHA512 895d6a71540c8a60258e8900479bbce8f3eef67c9b0ff631130862778b3688568c5e363e0ba2a7b55a2e4a9109e22673eda69903e7bcaa77776de876cb09295b
-AUX 0.15.1b/libid3tag-0.15.1b-tag.patch 527 BLAKE2B 045268d964d4dddad836a1a8e2a75db9762d6fc442f95cc1155639979c120941876c35d31587378be69f0610449babb583ff41fd8d4f5c7e261a3b2ccee6590b SHA512 d610b108b896126ff721d1910e882ba06089aef1d3d8db60b6b76548b777f03962200fc5f046d96f1b655de4dff0a3031231f78094037c9506f7ad7798e01c8f
-AUX 0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch 879 BLAKE2B 77541d2bc967a46a4557e614309f403ac8320fe1380117da21f99a9b80fb31b49fd06e6ba0234589102b26a733447ff17fe3a448e9400c7a904822354f7b5b97 SHA512 b5fab5bec89ac1d1180edae3871718170b442ec79ebde0536b50a70d6aba98761fd93fe79ebb81ee21a12643d5fb84085b7c7fd62c321284da1d61c48bd34809
+AUX 0.15.1b/libid3tag-0.15.1b-fix_overflow.patch 251 BLAKE2B 5b61c73ed52d6e2f7b45bee2200e314c51338b1b93414a3e567e301c6aa133db96f22f95a94b5969195123949eb277c329573bf631d1fcf416d202bf122fbf88 SHA512 183c721a1524ee507572e300b875b0640b9f50d6257e16e818861cc0f8aadc193dc25c832c8f748a5722e4ed7e1f7f942e6f66ca674baf623410beafda973f39
+AUX 0.15.1b/libid3tag-0.15.1b-tag.patch 476 BLAKE2B 9437c589417dc4825a43718b79638ea0fa1aa5b2c027e3a9101afd02a5bd4053e7cf04bb69dfb9eeda2558132a4a7d63b1485515171397d9c355249ff29721ea SHA512 7e1cab9e05bf12bbcb20bcf82ee6e54dab049fc1234f65814de269e27f779e76c1e7732d9a725f811350d633b303ce9419a8bcb186f19f0685e1f6e938055084
+AUX 0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch 507 BLAKE2B 5554786abfe2d909d4a1cdcab8fb076010519f6e0dfdfc137b8e533f56c7563a62204bec1845284e22b45d201e7ccfd65303255515a1e71dfa0f84eb47f65cf3 SHA512 c7c67cd1c6d54d03e964d02f7993222e3b995d67f4ba54372cc0b91978447920d54d655d5db99985f41448096131beb46b418a43e5bdb1dec0edeaf19937a61f
 AUX 0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch 583 BLAKE2B 1ce651271b297fb1aadf952549b44946ca15643b733abfe6573e898345748086b5db4641c52dea76b0d19b17ad86ddf67930ef265c1d43d93d641212c578356d SHA512 973d037f116dc9ac5d11895eb6043cbdb18c9d87165a20c4a1989fbcebdff067739d754b6233f41b8b6a88d9cf90848ef3ee22f1439e3ebdff0be6d6fc348a53
 AUX id3tag.pc 222 BLAKE2B 3ad47be06f4752c8398f12a598e2955e8164bd633681995aa1aee925a335a0f8472a91288a13374ce8db6b1c554b6c1077c3ee1b6c713e455136f9ed0dc91142 SHA512 591fdff509376a3afeb43d6dc7f9063f2388d024494952d366dae2ba8ffc3d2d5e430e0ad7470951d6c740f794529994b882d12840ff06d2fffffe70c2feae84
 AUX libid3tag-0.15.1b-fix-signature.patch 424 BLAKE2B f3dce1cb1372f175758b7c48b3ee3a6f1c95c840f7103116f9ea3ef805c5aa186c2c87747f02cb67fda1e4c13c806c5a0b32b304c2f66941fddac0942761b62e SHA512 3f320d1d8719afd84aa0cf2a9e5615f3f535f84d1987f12df0a9d3f2b7c02e2c87fbc3aa41d538cdc4f8a30e629de6f3fc3a4e79f23448fd39d4c0c438c803fb
 DIST libid3tag-0.15.1b.tar.gz 338143 BLAKE2B a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 SHA512 ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3
-EBUILD libid3tag-0.15.1b-r4.ebuild 1618 BLAKE2B 9ab8e36538eafb82efdaa914eafb02dab1ca9450b8385a851ce53073c73fd4b76a495984e981a045dfd805f55f3adb24dc2762ccac0c15efa4b97a9b6378504b SHA512 ee91f687bb0353bd017763c0ffc79477a5dbdfa9c21b4a662216042734452255c5924f861b823901d2c46b1ef52d9bd40a803af51f7bdc91bd750d6bae228a51
+EBUILD libid3tag-0.15.1b-r4.ebuild 1653 BLAKE2B b0837aa395bc4e6f3f9dec2c3185610c76fdb5811323a5a0011b521b8c4de828514187fa422cb1266e645c2f6f41886d23088e99f07a03fb072070cb6d81e3a0 SHA512 8848dcaba72ee077644590e8c67fec87d12d37edf83f97de53ce8e41d217ff74d793dc5db3178f6eea351ddd57783c8d96cc8a7788d3d9eb26ea0fafb6028d13
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
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 852d9efd69b2..bb320c7aa70b 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 2adc2e6ced28..e196cb4df269 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 26c54c5d2cfe..5e0a1f60e7aa 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 2badfb35cffa..4d13e47018c7 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 7c70d0020384..91b3d2a5eb06 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 0a3a7443ad69..bb711194b438 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
 }