gentoo resync : 03.07.2021

6 files changed, 2 insertions, 278 deletions

diff --git a/media-libs/libxspf/Manifest b/media-libs/libxspf/Manifest
index 80f95f9c21f0..a0c1664aaed4 100644
--- a/media-libs/libxspf/Manifest
+++ b/media-libs/libxspf/Manifest
@@ -1,8 +1,3 @@
-AUX libxspf-1.2.0-autotools.patch 5008 BLAKE2B 2e0547bb6f7885304e3e4fb03e8562d8df3f0b31690dd57c0838ff889c5fc787c025cb812c5a2477ee9f1b95cee6c3161ba66cf75c6b929cfced1bc2c97e47cc SHA512 dc11038fadbbcfc89bb7c7ce0d63678c3695ca90bf9f83239b84199ad9962bd6c18a30cdf3145c521e66e3f83f99e2ec7ef931206321414b5600b255d3e7b88f
-AUX libxspf-1.2.0-gcc44.patch 520 BLAKE2B 711be1facee0b15d1575daf6f9aadf54a084f733e2f3faeb86918a197464bfcb912efb1f4b93d7c3058d71a8c7f111d6c554ea672644ef5c267a419fa501ac08 SHA512 aa2ee2626504f8b98d1903f1e04e8aab68ea541022f03234b034d477d8d60c8c56af0ca2e1e64aeb28dbde04ca14db2c5ec7b893e6697233752fe629adf169c9
-AUX libxspf-1.2.0-gcc47.patch 267 BLAKE2B bd7c26c5148eed4b936aa811cb98bebcc3ad9b8049827157aea858aa2a48e1283a78d6d8a3fe1726372249a262f029e3a0ccb2269e84ca8bee77b9df037d6d7a SHA512 2e84721ea7e51750ebc3ecad492310ac474563552d46b20aa3184cc26052b91d881ccec7ac283ae76f2b82db7032d371b34a824b4194291427f726c48e8552b6
-DIST libxspf-1.2.0.tar.bz2 372483 BLAKE2B 6a1af724e993bff93979d9e641754e9964dd57363481fda09e91985a773a083f698759e0c4bca6d794ee272bf070304e09282538343fe64bd91a6b876c627868 SHA512 56667b6df89e30517e2e388e2e3b1c083b19d98d69b4ee328d2784bba57a8d50c6b6ae1876cf17e6f9eb1ff872680c8f33b84b826d1290b890ac173c76bea491
 DIST libxspf-1.2.1.tar.bz2 479581 BLAKE2B dccae0d88af421e869034ca5fa5c1306bfdfb0d4c6bf6e5d555cfcbb1ac6032e64d6bbd6fe7e4d6a7c0d51fe10a5dbb74fc0f8ba1e7e30ced4a961add3d5a3cc SHA512 e2ac7c56fe71536c198caffac654056c48c619ca0b8bd97905d564ec7aebb60e74b3cdc94b3a2ae3ca6f195fd56034e0483503dc091f1f4d5808d72d086d2613
-EBUILD libxspf-1.2.0-r1.ebuild 870 BLAKE2B 67db633d9b407008a2d7208c435e759a6242613e5aa33e88bbc357bdc74780ce42c6c58175f35ec8e82f10fcb2bbb21364c828a84002a2136f1bafdb9a631295 SHA512 de6f8d1d844c824f161c0ed3c8496b8855a632973f20f04c15078e4ede3fe6a30104a71248d3136b25db09b5f9e63dcf624382790ea5a76f7d2ea2d9f61d5390
-EBUILD libxspf-1.2.1.ebuild 700 BLAKE2B 150676b1f38529e2b09796e8d892a80f8213ba6d4e9f30bd6d09b561ec39ef5cf5ee330edad7329ad00116b1bf3d98ef91e3ffb8e86188c436de76cb1971a427 SHA512 debef3f4008bfa5baee3fe6e600d23d7cfc46483e79ecd1a00db342c8d8c3a9c0fddb7230fe1b7a4bc3a7e6cf4aa224a5f2d9eec4c057e72cd1c17325067e620
+EBUILD libxspf-1.2.1.ebuild 697 BLAKE2B 7ce15375e61a08f27e18b4cd17e87aa895e85b8a02101e2e4f85f2463b8d665e7b0785a328ec6f7189f50a2b41581b8bfe774d35754c681e5dc5eae244bf51cf SHA512 afce063753aa6cd972bb8190cb1c23954455cc7edd76fe938c6a8847d5c81be2c529118ea09874fd8ebfbea44d6d770a71ac7b704fde13eaa72f8440c410aed4
 MISC metadata.xml 517 BLAKE2B 12f2175a02bdb84c679ff437352cbac8267dac2bd12a3a04fb2e853c4049acac001160daf124b97b9c6170bd73beddf238ea454b8588a2c635efdefee8773ca7 SHA512 eb605d2fb0dfe1fd3e6fc50f29e6408626e2a4fe255db65a0b20844adf1634b9bd0b0bc69c55a2a6ceedaabb41aca03f330af9258d408896042805f7b78cad33
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-autotools.patch b/media-libs/libxspf/files/libxspf-1.2.0-autotools.patch
deleted file mode 100644
index 93a4c1c7f2e8..000000000000
--- a/media-libs/libxspf/files/libxspf-1.2.0-autotools.patch
+++ /dev/null
@@ -1,191 +0,0 @@
---- a/bindings/c/doc/configure.ac
-+++ b/bindings/c/doc/configure.ac
-@@ -1,8 +1,8 @@
- # Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.61)
--AC_INIT(Doxyfile.in)
-+AC_INIT(libxspf, 1.2.0)
- AC_CONFIG_AUX_DIR([../../../build-aux])
--AM_INIT_AUTOMAKE(xspf_c-doc, 1.2.0)
-+AM_INIT_AUTOMAKE
- 
- 
- ## Doxygen
---- a/bindings/c/doc/Makefile.am
-+++ b/bindings/c/doc/Makefile.am
-@@ -28,7 +28,7 @@
- ## Install doc files
- install-data-local:
- 	$(MKDIR_P) "$(DESTDIR)$(docdir)/html"  ## Didn't work with installdirs-local
--	$(INSTALL_DATA) html/*.{css,gif,html,png} "$(DESTDIR)$(docdir)/html/"
-+	$(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/"
- 	$(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
- 
- 
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,16 +1,15 @@
- # Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.61)
--AC_INIT(src/XspfReader.cpp)
-+AC_INIT(libxspf, 1.2.0)
- AC_CONFIG_AUX_DIR([build-aux])
--AM_INIT_AUTOMAKE(libxspf, 1.2.0)
-+AM_INIT_AUTOMAKE
- 
--AC_PROG_LIBTOOL
--AC_PROG_INSTALL
- AC_PROG_CC
- AC_PROG_CXX
- PKG_PROG_PKG_CONFIG
- 
- AC_HEADER_STDC
-+LT_INIT
- 
- 
- 
-@@ -29,40 +28,6 @@
- 
- 
- 
--# Expat
--AC_ARG_WITH(expat, [
--===========================================================================
--Extra options:
--AS_HELP_STRING([--with-expat=DIR], [override path of Expat])
--AS_HELP_STRING([], [("/lib" and "/include" is appended)]
--)], [
--	if test "x${withval}" = "x"; then
--		AC_MSG_ERROR([No path given for option --with-expat])
--	fi
--	LDFLAGS="-L${withval}/lib ${LDFLAGS}"
--	CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
--], [])
--
--AC_ARG_WITH(expat-inc, [AS_HELP_STRING(
--	[--with-expat-inc=DIR], [override include path of Expat]
--)], [
--	if test "x${withval}" = "x"; then
--		AC_MSG_ERROR([No path given for option --with-expat-inc])
--	fi
--	CPPFLAGS="-I${withval} ${CPPFLAGS}"
--], [])
--
--AC_ARG_WITH(expat-lib, [AS_HELP_STRING(
--	[--with-expat-lib=DIR], [override library path of Expat]
--)], [
--	if test "x${withval}" = "x"; then
--		AC_MSG_ERROR([No path given for option --with-expat-lib])
--	fi
--	LDFLAGS="-L${withval} ${LDFLAGS}"
--], [])
--
--
--
- # uriparser
- AC_ARG_WITH(uriparser, [AS_HELP_STRING(
- 	[--with-uriparser=DIR], [override path of uriparser])
-@@ -110,29 +75,8 @@
- 
- 
- 
--# Local headers must come very first. Otherwise we
--# risk including headers of an already installed
--# libxspf version if its path is in CPPFLAGS
--CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}"
--
--
--
--# Append $prefix as a fallback at the very end
--if test "x${prefix}" != "xNONE"; then
--	WORKING_PREFIX=${prefix}
--else
--	WORKING_PREFIX=${ac_default_prefix}
--fi
--LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib"
--CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include"
--
--
--
- # Check presence
--EXPAT_MISSING="Please install expat 1.95.8 or later.
--   On a Debian-based system enter 'sudo apt-get install libexpat-dev'."
--AC_CHECK_LIB(expat, XML_ResumeParser,, AC_MSG_ERROR(${EXPAT_MISSING}))
--AC_CHECK_HEADER(expat.h,, AC_MSG_ERROR(${EXPAT_MISSING}))
-+PKG_CHECK_MODULES([EXPAT], [expat])
- 
- PKG_CHECK_MODULES([URIPARSER], [
- 	liburiparser >= 0.7.5
---- a/doc/configure.ac
-+++ b/doc/configure.ac
-@@ -1,8 +1,8 @@
- ## Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.61)
--AC_INIT(Doxyfile.in)
-+AC_INIT(libxspf, 1.2.0)
- AC_CONFIG_AUX_DIR([../build-aux])
--AM_INIT_AUTOMAKE(libxspf-doc, 1.2.0)
-+AM_INIT_AUTOMAKE
- 
- 
- ## Doxygen
-@@ -30,7 +30,6 @@
- fi
- AC_SUBST(GENERATE_HTMLHELP)
- AC_SUBST(QHG_LOCATION)
--AC_SUBST(srcdir, [${ac_abs_confdir}])
- 
- 
- AC_CONFIG_FILES([
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -26,7 +26,7 @@
- ## Install doc files
- install-data-local:
- 	$(MKDIR_P) "$(DESTDIR)$(docdir)/html"  ## Didn't work with installdirs-local
--	$(INSTALL_DATA) html/*.{css,gif,html,png} "$(DESTDIR)$(docdir)/html/"
-+	$(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/"
- 	$(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
- 
- 
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,8 +1,10 @@
- ## Process this file with automake to produce Makefile.in
--AUTOMAKE_OPTIONS = 1.10.1 gnu dist-zip dist-bzip2 dist-lzma subdir-objects
-+AUTOMAKE_OPTIONS = 1.10.1 gnu dist-zip dist-bzip2 subdir-objects
- 
- ACLOCAL_AMFLAGS = -I m4
- 
-+AM_CPPFLAGS = -I$(top_srcdir)/include
-+
- if GENERATE_DOC
- SUBDIRS = \
- 	. \
-@@ -39,9 +41,10 @@
- endif
- 
- 
--libxspf_la_CFLAGS = @URIPARSER_CFLAGS@
-+libxspf_la_CFLAGS = $(URIPARSER_CFLAGS) $(EXPAT_CFLAGS)
-+libxspf_la_LIBADD = $(URIPARSER_LIBS) $(EXPAT_LIBS)
- 
--libxspf_la_LDFLAGS = @URIPARSER_LIBS@ -version-info 4:1:0
-+libxspf_la_LDFLAGS = -version-info 4:1:0
- 
- libxspf_la_SOURCES = \
- 	src/XspfChunkCallback.cpp \
-@@ -146,11 +149,9 @@
- if XSPF_TEST_ENABLED
- test_xspf_test_CFLAGS = @CPPTEST_CFLAGS@
- 
--test_xspf_test_LDFLAGS = @CPPTEST_LIBS@
--
--test_xspf_test_LDADD = libxspf.la
-+test_xspf_test_LDADD = libxspf.la @CPPTEST_LIBS@
- 
--test_xspf_test_CPPFLAGS = -DXSPF_SRCDIR=\"${srcdir}\"
-+test_xspf_test_CPPFLAGS = -DXSPF_SRCDIR=\"${srcdir}\" -I$(top_srcdir)/include
- 
- test_xspf_test_SOURCES = \
- 	test/ProjectOpus/ProjectOpusSuite.cpp \
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
deleted file mode 100644
index 668e8af1be16..000000000000
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/261604
-
---- a/test/OfficialSuite.cpp
-+++ b/test/OfficialSuite.cpp
-@@ -21,6 +21,7 @@
-  * Sebastian Pipping, sping@xiph.org
-  */
- 
-+#include <cstdio>
- #include "OfficialSuite.h"
- #include <xspf/XspfReaderCallback.h>
- using namespace Xspf;
---- a/test/ProjectOpus/ProjectOpusSuite.cpp
-+++ b/test/ProjectOpus/ProjectOpusSuite.cpp
-@@ -21,6 +21,7 @@
-  * Sebastian Pipping, sping@xiph.org
-  */
- 
-+#include <cstdio>
- #include "ProjectOpusSuite.h"
- #include <xspf/XspfReader.h>
- #include <xspf/XspfTrack.h>
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
deleted file mode 100644
index 76c0dca755f8..000000000000
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/421745
-
---- a/examples/read/read.cpp
-+++ b/examples/read/read.cpp
-@@ -43,6 +43,7 @@
- #include <cstdio>
- #include <cstdlib> // MAX_PATH
- #include <climits> // PATH_MAX
-+#include <unistd.h> // getcwd
- 
- 
- #if defined(__WIN32__) || defined(WIN32)
diff --git a/media-libs/libxspf/libxspf-1.2.0-r1.ebuild b/media-libs/libxspf/libxspf-1.2.0-r1.ebuild
deleted file mode 100644
index 2d587d5b770f..000000000000
--- a/media-libs/libxspf/libxspf-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Playlist handling library"
-HOMEPAGE="http://libspiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/expat-2
-	>=dev-libs/uriparser-0.7.5"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cpptest-1.1 )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc44.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-autotools.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-doc \
-		--disable-static \
-		$(use_enable test)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libxspf/libxspf-1.2.1.ebuild b/media-libs/libxspf/libxspf-1.2.1.ebuild
index d14dc695b584..5d7cbe6142d7 100644
--- a/media-libs/libxspf/libxspf-1.2.1.ebuild
+++ b/media-libs/libxspf/libxspf-1.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"