gentoo resync : 13.01.2018

4 files changed, 31 insertions, 29 deletions

diff --git a/media-libs/libxspf/Manifest b/media-libs/libxspf/Manifest
index a5911762d927..d9b56a87a450 100644
--- a/media-libs/libxspf/Manifest
+++ b/media-libs/libxspf/Manifest
@@ -1,5 +1,5 @@
-AUX libxspf-1.2.0-gcc44.patch 512 BLAKE2B f688d85fb8bddecfa1864827e210bc5762724221c353a315fc3b5f2819ee9b2699f96e05cc8e335823b71f27a0df268e4db3431f5f6d96aad8f4f8bda576d59b SHA512 968a5e53d91ddc724d321d7598f3cbe7c6e28a343a96ad27cac92ec9603eead6e4452e2965c780bf530db211e62def810bdefd1edd4e7785fd5f646d01af78d6
-AUX libxspf-1.2.0-gcc47.patch 263 BLAKE2B 05cf6ebd828c31cca516146b2ab53cedc9094a875aceb7feb78a092b0a85c2b19d63799c6f24c8e59ead967e37b25a59f83f99f4089af8319e00bb5e831cb6ed SHA512 893f3cf22aa2ede98efb53f8aef553fd7418254f9aa92f7f2126eb5c2f2b66bae94fe43049b59642793ced74168369e32a04ae21719b8e041b5d9ecc0626e6ad
+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.ebuild 1011 BLAKE2B a5947bf7e0963d656ea17ac724dcfd033102924e3d0922a548d390357900e43ee5704d24bf5ccd18755fa6611e402ab23a8b7994266f04658e9488f9242bdee4 SHA512 95b48eb0281cec4be7ea2622ca4e0e6f209f440677006bb295d615f74404a11c39e714e9da2e17a125ca0b58490c61814fbf7c3e404a237f6fe43fc0d86fe454
+EBUILD libxspf-1.2.0.ebuild 1017 BLAKE2B ca6c00513f893d9f8befb3f1e558e76b6a24481672eabfc7affeba8cad7f8b5688088fcb53576d6bc3b0e8875683e9eda337ba7bf9280cb6b85042cf271d4715 SHA512 a4027b33b273a361fdb55687ccc6d48f5dd08df04757d9f8e48b9ad9e346c7b042a2e2cb6116472a98427be3820ec9c51b0dcdb588a81e16eafa4c26d4c35c14
 MISC metadata.xml 517 BLAKE2B 12f2175a02bdb84c679ff437352cbac8267dac2bd12a3a04fb2e853c4049acac001160daf124b97b9c6170bd73beddf238ea454b8588a2c635efdefee8773ca7 SHA512 eb605d2fb0dfe1fd3e6fc50f29e6408626e2a4fe255db65a0b20844adf1634b9bd0b0bc69c55a2a6ceedaabb41aca03f330af9258d408896042805f7b78cad33
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
index fa16b589df30..668e8af1be16 100644
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
+++ b/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/261604
 
---- test/OfficialSuite.cpp
-+++ test/OfficialSuite.cpp
+--- a/test/OfficialSuite.cpp
++++ b/test/OfficialSuite.cpp
 @@ -21,6 +21,7 @@
   * Sebastian Pipping, sping@xiph.org
   */
@@ -10,8 +10,8 @@ http://bugs.gentoo.org/261604
  #include "OfficialSuite.h"
  #include <xspf/XspfReaderCallback.h>
  using namespace Xspf;
---- test/ProjectOpus/ProjectOpusSuite.cpp
-+++ test/ProjectOpus/ProjectOpusSuite.cpp
+--- a/test/ProjectOpus/ProjectOpusSuite.cpp
++++ b/test/ProjectOpus/ProjectOpusSuite.cpp
 @@ -21,6 +21,7 @@
   * Sebastian Pipping, sping@xiph.org
   */
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
index b408416e7ef7..76c0dca755f8 100644
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
+++ b/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/421745
 
---- examples/read/read.cpp
-+++ examples/read/read.cpp
+--- a/examples/read/read.cpp
++++ b/examples/read/read.cpp
 @@ -43,6 +43,7 @@
  #include <cstdio>
  #include <cstdlib> // MAX_PATH
diff --git a/media-libs/libxspf/libxspf-1.2.0.ebuild b/media-libs/libxspf/libxspf-1.2.0.ebuild
index a7c71fb4d12b..fa7f0ecfa6f8 100644
--- a/media-libs/libxspf/libxspf-1.2.0.ebuild
+++ b/media-libs/libxspf/libxspf-1.2.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils
+EAPI=6
+
+inherit xdg-utils
 
 DESCRIPTION="Playlist handling library"
 HOMEPAGE="http://libspiff.sourceforge.net/"
@@ -11,38 +12,39 @@ 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="doc static-libs test"
+IUSE="static-libs test"
 
-RDEPEND=">=dev-libs/expat-2
+RDEPEND="
+	>=dev-libs/expat-2
 	>=dev-libs/uriparser-0.7.5"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.8
-		media-gfx/graphviz
-		dev-qt/qthelp:4
-		)
 	test? ( >=dev-util/cpptest-1.1 )"
 
-DOCS="AUTHORS ChangeLog NEWS README THANKS"
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc44.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
+	default
+	xdg_environment_reset
+
+	# do not install missing files
+	sed -e 's/gif,//' -i doc/Makefile* \
+		-i bindings/c/doc/Makefile* || die "sed failed"
 }
 
 src_configure() {
-	export XDG_CONFIG_HOME="${T}" #398881#c2
-
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--disable-doc \
 		$(use_enable static-libs static) \
-		$(use_enable test) \
-		$(use_enable doc)
+		$(use_enable test)
 }
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }