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

[Miroslav Šulc]

commit:     d66495df3aee07869edcdf2c2c190b3fefc58b25
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  2 17:22:13 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Oct  2 17:22:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d66495df

media-libs/libid3tag: removed obsolete 0.15.1b-r4

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-libs/libid3tag/Manifest                      |  1 -
 .../0.15.1b/libid3tag-0.15.1b-64bit-long.patch     | 24 ---------
 .../0.15.1b/libid3tag-0.15.1b-a_capella.patch      | 33 ------------
 .../files/0.15.1b/libid3tag-0.15.1b-compat.patch   | 13 -----
 .../0.15.1b/libid3tag-0.15.1b-file-write.patch     | 52 ------------------
 .../0.15.1b/libid3tag-0.15.1b-fix_overflow.patch   | 11 ----
 .../files/0.15.1b/libid3tag-0.15.1b-tag.patch      | 17 ------
 .../libid3tag-0.15.1b-unknown-encoding.patch       | 25 ---------
 ....15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch | 21 --------
 media-libs/libid3tag/files/id3tag.pc               | 11 ----
 .../files/libid3tag-0.15.1b-fix-signature.patch    | 12 -----
 media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild   | 62 ----------------------
 12 files changed, 282 deletions(-)

diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index 5b20ce8d0c6..3ca1f1af506 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -1,2 +1 @@
-DIST libid3tag-0.15.1b.tar.gz 338143 BLAKE2B a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 SHA512 ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3
 DIST libid3tag-0.16.1.tar.gz 98074 BLAKE2B f7acbe4117ef54e5d1705289af3b31ded7e87a7d2ba6e19a02863a391ce4fffee9110011cae42568d7ccbe256f899d7868182f02ed0b662d46f3f78e14c1eb43 SHA512 621cbdf7a0ea5cdca6a9133c88fb07ff0c519ed73bc26a535de3928f4784b912bb44315b45362600d53cd03083b66f38d674d1880ca30e5f6c342321977a6eb2

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
deleted file mode 100644
index bb320c7aa70..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/id3tag.h
-+++ b/id3tag.h
-@@ -25,6 +25,8 @@
- # ifndef LIBID3TAG_ID3TAG_H
- # define LIBID3TAG_ID3TAG_H
- 
-+#include <stdint.h>
-+
- # ifdef __cplusplus
- extern "C" {
- # endif
-@@ -36,10 +38,10 @@
- typedef unsigned char id3_byte_t;
- typedef unsigned long id3_length_t;
- 
--typedef unsigned long id3_ucs4_t;
-+typedef uint32_t id3_ucs4_t;
- 
- typedef unsigned char id3_latin1_t;
--typedef unsigned short id3_utf16_t;
-+typedef uint16_t id3_utf16_t;
- typedef signed char id3_utf8_t;
- 
- struct id3_tag {

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
deleted file mode 100644
index e196cb4df26..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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[] =
-   { 'D', 'r', 'u', 'm', ' ', 'S', 'o', 'l', 'o', 0 };
--static id3_ucs4_t const genre_A_CAPPELLA[] =
--  { 'A', ' ', 'C', 'a', 'p', 'p', 'e', 'l', 'l', 'a', 0 };
-+static id3_ucs4_t const genre_A_CAPELLA[] =
-+  { 'A', ' ', 'C', 'a', 'p', 'e', 'l', 'l', 'a', 0 };
- static id3_ucs4_t const genre_EURO_HOUSE[] =
-   { 'E', 'u', 'r', 'o', '-', 'H', 'o', 'u', 's', 'e', 0 };
- static id3_ucs4_t const genre_DANCE_HALL[] =
-@@ -452,7 +452,7 @@
-   genre_DUET,
-   genre_PUNK_ROCK,
-   genre_DRUM_SOLO,
--  genre_A_CAPPELLA,
-+  genre_A_CAPELLA,
-   genre_EURO_HOUSE,
-   genre_DANCE_HALL,
-   genre_GOA,
---- a/genre.dat.in
-+++ b/genre.dat.in
-@@ -153,7 +153,7 @@
- Duet
- Punk Rock
- Drum Solo
--A Cappella
-+A Capella
- Euro-House
- Dance Hall
- Goa

diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-compat.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-compat.patch
deleted file mode 100644
index 6ef1a22d5a6..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur libid3tag-0.15.1b/compat.gperf libid3tag-0.15.1b.fixed/compat.gperf
---- libid3tag-0.15.1b/compat.gperf	Fri Jan 23 01:41:32 2004
-+++ libid3tag-0.15.1b.fixed/compat.gperf	Thu Oct 19 12:21:10 2006
-@@ -237,6 +237,9 @@
-     encoding = id3_parse_uint(&data, 1);
-     string   = id3_parse_string(&data, end - data, encoding, 0);
- 
-+    if (string == 0)
-+      continue;
-+
-     if (id3_ucs4_length(string) < 4) {
-       free(string);
-       continue;

diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-file-write.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-file-write.patch
deleted file mode 100644
index aa61d09f874..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-file-write.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ur -x '*.lo' -x '*.o' -x config.h -x config.log libid3tag-0.15.1b/file.c libid3tag-0.15.1b-fixed/file.c
---- libid3tag-0.15.1b/file.c	2004-01-23 12:41:32.000000000 +0300
-+++ libid3tag-0.15.1b-fixed/file.c	2005-05-24 23:34:08.000000000 +0400
-@@ -37,6 +37,10 @@
- #  include <assert.h>
- # endif
- 
-+# ifdef HAVE_SYS_STAT_H
-+#  include <sys/stat.h>
-+# endif
-+
- # include "id3tag.h"
- # include "file.h"
- # include "tag.h"
-@@ -575,6 +579,10 @@
- int v2_write(struct id3_file *file,
- 	     id3_byte_t const *data, id3_length_t length)
- {
-+  struct stat st;
-+  char *buffer;
-+  id3_length_t datalen, offset;
-+  
-   assert(!data || length > 0);
- 
-   if (data &&
-@@ -592,9 +600,25 @@
-   }
- 
-   /* hard general case: rewrite entire file */
-+  if (stat(file->path, &st) == -1)
-+    return -1;
- 
--  /* ... */
-+  offset = file->tags ? file->tags[0].length : 0;
-+  datalen = st.st_size - offset;
-+  if ((buffer = (char *) malloc(datalen)) == NULL)
-+    return -1;
- 
-+  if (fseek(file->iofile, offset, SEEK_SET) == -1 ||
-+      fread(buffer, datalen, 1, file->iofile) != 1 ||
-+      fseek(file->iofile, 0, SEEK_SET) == -1 ||
-+      fwrite(data, length, 1, file->iofile) != 1 ||
-+      fwrite(buffer, datalen, 1, file->iofile) != 1 ||
-+      fflush(file->iofile) == EOF) {
-+    free(buffer);
-+    return -1;
-+  }
-+  free(buffer);
-+  
-  done:
-   return 0;
- }

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
deleted file mode 100644
index 5e0a1f60e7a..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/field.c
-+++ b/field.c
-@@ -291,7 +291,7 @@
- 
-       end = *ptr + length;
- 
--      while (end - *ptr > 0) {
-+      while (end - *ptr > 0 && **ptr != '\0') {
- 	ucs4 = id3_parse_string(ptr, end - *ptr, *encoding, 0);
- 	if (ucs4 == 0)
- 	  goto fail;

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
deleted file mode 100644
index 4d13e47018c..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/tag.c
-+++ b/tag.c
-@@ -714,9 +714,12 @@
- 
-   frame = id3_tag_findframe(tag, ID3_FRAME_TRACK, 0);
-   if (frame) {
--    unsigned int track;
-+    id3_ucs4_t const *string;
-+    unsigned int track = 0;
- 
--    track = id3_ucs4_getnumber(id3_field_getstrings(&frame->fields[1], 0));
-+	string = id3_field_getstrings(&frame->fields[1], 0);
-+	if (string)
-+    	track = id3_ucs4_getnumber(string);
-     if (track > 0 && track <= 0xff) {
-       ptr[-2] = 0;
-       ptr[-1] = track;

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
deleted file mode 100644
index 91b3d2a5eb0..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/compat.gperf
-+++ b/compat.gperf
-@@ -236,6 +236,10 @@
- 
-     encoding = id3_parse_uint(&data, 1);
-     string   = id3_parse_string(&data, end - data, encoding, 0);
-+    if (!string)
-+    {
-+	continue;
-+    }
- 
-     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);
-     break;
-+  default:
-+  	/* FIXME: Unknown encoding! Print warning? */
-+	return NULL;
-   }
- 
-   if (ucs4 && !full) {

diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch
deleted file mode 100644
index e2e6eaeb6df..00000000000
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libid3tag-0.15.1b/utf16.c
-+++ libid3tag-0.15.1b/utf16.c
-@@ -282,5 +282,18 @@
- 
-   free(utf16);
- 
-+  if (end == *ptr && length % 2 != 0)
-+  {
-+     /* We were called with a bogus length.  It should always
-+      * be an even number.  We can deal with this in a few ways:
-+      * - Always give an error.
-+      * - Try and parse as much as we can and
-+      *   - return an error if we're called again when we
-+      *     already tried to parse everything we can.
-+      *   - tell that we parsed it, which is what we do here.
-+      */
-+     (*ptr)++;
-+  }
-+
-   return ucs4;
- }

diff --git a/media-libs/libid3tag/files/id3tag.pc b/media-libs/libid3tag/files/id3tag.pc
deleted file mode 100644
index e6860006891..00000000000
--- a/media-libs/libid3tag/files/id3tag.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: id3tag
-Description: ID3 tag reading library
-Requires:
-Version: 0.15.0b
-Libs: -L${libdir} -lid3tag -lz
-Cflags: -I${includedir}

diff --git a/media-libs/libid3tag/files/libid3tag-0.15.1b-fix-signature.patch b/media-libs/libid3tag/files/libid3tag-0.15.1b-fix-signature.patch
deleted file mode 100644
index a365811c55f..00000000000
--- a/media-libs/libid3tag/files/libid3tag-0.15.1b-fix-signature.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -pur libid3tag-0.15.1b-orig/compat.h libid3tag-0.15.1b/compat.h
---- libid3tag-0.15.1b-orig/compat.h	2004-01-23 10:41:32.000000000 +0100
-+++ libid3tag-0.15.1b/compat.h	2017-03-15 01:49:23.808834401 +0100
-@@ -34,7 +34,7 @@ struct id3_compat {
- };
- 
- struct id3_compat const *id3_compat_lookup(register char const *,
--					   register unsigned int);
-+					   register size_t);
- 
- int id3_compat_fixup(struct id3_tag *);
- 

diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
deleted file mode 100644
index 6e6a0e634ee..00000000000
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="The MAD id3tag library"
-HOMEPAGE="http://www.underbit.com/products/mad/"
-SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=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() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		$(use_enable debug debugging)
-}
-
-multilib_src_install() {
-	default
-
-	# This file must be updated with every version update
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${FILESDIR}"/id3tag.pc
-	sed -i \
-		-e "s:prefix=.*:prefix=${EPREFIX}/usr:" \
-		-e "s:libdir=\${exec_prefix}/lib:libdir=${EPREFIX}/usr/$(get_libdir):" \
-		-e "s:0.15.0b:${PV}:" \
-		"${ED}"/usr/$(get_libdir)/pkgconfig/id3tag.pc || die
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}