gentoo resync : 02.09.2020

3 files changed, 239 insertions, 0 deletions

diff --git a/media-libs/libxspf/Manifest b/media-libs/libxspf/Manifest
index d3a6a8808fca..7d1a1f0144c8 100644
--- a/media-libs/libxspf/Manifest
+++ b/media-libs/libxspf/Manifest
@@ -1,5 +1,7 @@
+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
+EBUILD libxspf-1.2.0-r1.ebuild 884 BLAKE2B 54c0cb49b176e75e92c3f2e4dea41558d9458773d8598dc3a3117c49dd2f01e5b7965cfc0eb5bada9d7acefffc599f3b837a81add64a70e9fcfcb1114016fa02 SHA512 67babeda397457faeaefe65741fd98b109481fc34bfe840ace9dda094dfe596ef6a623e70d5f59dc3f1302c173381235c8ae5150ee9ac618e39916feca360607
 EBUILD libxspf-1.2.0.ebuild 1041 BLAKE2B 66287fd7d64a97a8f7d40059a33333468326f791f61416864013fca4f72f4b95736196ba0355c3e9bba4f3ee34cf0a88bb64fadcbb827517c56a681f19673f1e SHA512 e6ac22c36827be2507382033a0f9ae7fd58aff3640b2bd4275c3c425054acd9deafe2a76236963559e729dd709682640e35e0029b8b8591eebf1f6bff68bb060
 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
new file mode 100644
index 000000000000..93a4c1c7f2e8
--- /dev/null
+++ b/media-libs/libxspf/files/libxspf-1.2.0-autotools.patch
@@ -0,0 +1,191 @@
+--- 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/libxspf-1.2.0-r1.ebuild b/media-libs/libxspf/libxspf-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..7912dd3d9ca6
--- /dev/null
+++ b/media-libs/libxspf/libxspf-1.2.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 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-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
+}