gentoo resync : 07.10.2018

4 files changed, 75 insertions, 15 deletions

diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index f0448758f55b..f4b859a22bab 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,5 +1,7 @@
+AUX xine-ui-0.99.10-desktop.patch 996 BLAKE2B 3ea4d4f4c3a9c3fd93f211c949694abef94d9f115d41f45afce07632f96473912e393b14de8fba714f9d11bb351ff8df41d056d6c4aebd680f03f84b5498d60a SHA512 f4d40ff11f851ab2e56e902fd9c5cf51f530c76308d6f7f6675cd5b90486a1e265d29b12375c10a57a8a825b45132fef9ca471dad056c5524e817678ce79626f
+AUX xine-ui-0.99.10-libcaca.patch 977 BLAKE2B f91dd8813b549ea00db0028e6a86d04ff7a27575f749509e27e331cfa9d76ac50349e52bc74ebdf4b7ae9b357209e5da292f2eee24c0a79204202417adfa9c98 SHA512 edde19d900c19ca6530877041a0d78d9a0d7fad44d3ec62f76e5907c8907ffe338434161d1c59066ddce132b61ee6072981ef00899588bb6adebbdb461d0d2ce
 DIST xine-ui-0.99.10.tar.xz 1762968 BLAKE2B eede1a7b43f3fca37c092541145a4d13813185a740c396503bdfc93fd96d4d3bf52ad2daed4389634e2a517972c1233e3d9b1af74b718dd9def58eb2e702d967 SHA512 73cbc72375b27335e9d5f5527c35dab12d1ae40539b587630b3d8709471e4c61ce7b619062b75f587252c0647c234ffcf611f3b4e38e0447f7041b7ca5d7289e
 DIST xine-ui-0.99.9.tar.xz 1759568 BLAKE2B 5e8d94c64d254f52c0e5f6926b5c0e8cc7ba065f00363e728e48d6dafb26e2cd5496fb20e3d81a1c4f5bf6165b6f13ed2b28eea31e6efd4f9e9256bed5bafc49 SHA512 575b20a19c5740ba0336af9dea0a1bc15d23b7471379b9d72aeb585e23f95b336368b96a28d4804726507f059dc431cc3f9adfd8b615b08c0e67b65287c2b6c7
-EBUILD xine-ui-0.99.10.ebuild 1901 BLAKE2B 7266d73e30442b60ffd941f1074fe749d105b1307c15ab1b3587e9f2b1d54502e9ff22ae931bb1a8e0af211d4ddefa85b1f85d81170f7cf5a16839ac8d906c42 SHA512 d948983d5834e1f2f34b02744f04e56c9c57e6ff9cf21bebfcb17436589beac6bc60cfa7d032b6f58dcb6e1eb5cdc2c0dfddc88a9bf4398f9d32ce1d41b73196
+EBUILD xine-ui-0.99.10.ebuild 2041 BLAKE2B 1ce636d83db52cd0796592a8d9f133c30f134fbff8ba4c4118c219a6bc21d70648b2ebfe58083f18bfb1b564c211e4612252944ff2b4cbead78bf18da51bc497 SHA512 599c3110ca5f4b7f03758850be900814229a0d9b24b39084f3393f6aa183b4a349ac8b752cd82fc38e6ee504a238a7c3f7b67971f0e79d54f43bb6c0be81394d
 EBUILD xine-ui-0.99.9.ebuild 1896 BLAKE2B 06d87ab48f19bf0fdfee3cecac3f1961fa10ea7bcf2bbdc21fd598a82d97be8cb8742174a7ac1324184cf469b8dea1322e08e40133b986983ef5f7c196942da2 SHA512 ae3d41e072d4c65f50721d0ef22b75dac11db5f5a8e432b4f625a32c6c16a73665dbe3e79fa9804dbda58018fe8a3679fd4c7738fe14263cca578a39ad6053df
 MISC metadata.xml 386 BLAKE2B 8874545c1b0a0b9f60505dc08c933e3268f42b64fb1eed4e889d30af4ba3b6c74b1b1986f06425aa00ca81ab91e993a37e2c723ec4f53bbf69a2ccae8ba3ed69 SHA512 ead8587493161ece36b38168e0c628a05a97d1dfc7dddec3d7a966a783621634be28bd661a6e0d65e370dd7066ef49019265967f7394aa4026b3ae97de26a820
diff --git a/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch b/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch
new file mode 100644
index 000000000000..04aecb7ccf11
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch
@@ -0,0 +1,23 @@
+--- a/misc/desktops/xine.desktop.in	2017-12-28 17:34:15.000000000 +0100
++++ b/misc/desktops/xine.desktop.in	2018-10-03 18:53:23.909196224 +0200
+@@ -6,5 +6,5 @@
+ Icon=xine
+ Terminal=false
+ Type=Application
+-Categories=Application;AudioVideo;Player;
+-MimeType=
+\ No newline at end of file
++Categories=AudioVideo;Player;
++MimeType=
+\ No newline at end of file
+--- a/misc/desktops/Makefile.am	2017-12-28 17:34:15.000000000 +0100
++++ b/misc/desktops/Makefile.am	2018-10-03 19:52:23.262534618 +0200
+@@ -32,7 +32,7 @@
+ if XINE_LIST
+ xine.desktop: xine.desktop.in @XINE_LIST@
+ 	$(AM_V_GEN)cat $< > $@; \
+-	@XINE_LIST@ | perl -ne 'print join(";",sort(split(";")))' >> $@; \
++	@XINE_LIST@ | perl -ne 'print join("\n",split(";"))' | sort -u | xargs | perl -ne 'print join(";",sort(split(" ")))' >> $@; \
+ 	echo ';$(INPUT_MIME_TYPES)' >> $@
+ else
+ XINE_MIME = $(if $(shell test "$(XINE_CONFIG)" = '' && echo y),$(shell pkg-config --variable=plugindir libxine),$(shell $(XINE_CONFIG) --plugindir))/mime.types
diff --git a/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch b/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
new file mode 100644
index 000000000000..c5a359758d4a
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
@@ -0,0 +1,24 @@
+diff -r efe11fb1562e configure.ac
+--- a/configure.ac	Thu Dec 28 18:08:02 2017 +0200
++++ b/configure.ac	Sun Apr 01 23:00:22 2018 -0600
+@@ -374,7 +374,7 @@
+    if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
+       AC_MSG_ERROR([CACA support requested, but libcaca 0.99 not found])
+    fi
+-   if test test "x$have_caca" = "xyes"; then
++   if test "x$have_caca" = "xyes"; then
+      AM_DL()
+    fi
+    AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <caca.h> 
+
+--- a/configure 	Thu Dec 28 18:08:02 2017 +0200
++++ b/configure 	Sun Apr 01 23:00:22 2018 -0600
+@@ -12651,7 +12651,7 @@
+    if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
+       as_fn_error $? "CACA support requested, but libcaca 0.99 not found" "$LINENO" 5
+    fi
+-   if test test "x$have_caca" = "xyes"; then
++   if test "x$have_caca" = "xyes"; then
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
+ $as_echo_n "checking for dlopen in -lc... " >&6; }
diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild b/media-video/xine-ui/xine-ui-0.99.10.ebuild
index 90ab46eefcff..ae016e03898e 100644
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.10.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit gnome2-utils xdg-utils
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
 
 DESCRIPTION="Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
+HOMEPAGE="https://xine-project.org/home"
 SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
 
-RDEPEND="|| ( app-arch/tar app-arch/libarchive )
+RDEPEND="
+	|| ( app-arch/tar app-arch/libarchive )
 	media-libs/libpng:0=
 	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
 	virtual/jpeg:0
@@ -35,17 +37,26 @@ RDEPEND="|| ( app-arch/tar app-arch/libarchive )
 		x11-libs/libXv:=
 		x11-libs/libXxf86vm:=
 		xinerama? ( x11-libs/libXinerama:= )
-		)"
+	)
+"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.18.3 )
 	X? (
 		x11-base/xorg-proto
 		x11-libs/libXt
-		)
-	virtual/pkgconfig"
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-libcaca.patch
+)
 
 src_prepare() {
-	rm -f misc/xine-bugreport
+	default
+	eautoreconf
+	rm misc/xine-bugreport || die
 }
 
 src_configure() {
@@ -65,16 +76,16 @@ src_configure() {
 }
 
 src_install() {
+	# xine-list apparently may cause sandbox violation, bug 654394
+	addpredict /dev/dri
+
 	emake \
 		DESTDIR="${D}" \
 		docdir="/usr/share/doc/${PF}" \
 		docsdir="/usr/share/doc/${PF}" \
 		install
-	dodoc AUTHORS ChangeLog NEWS README
-}
 
-pkg_preinst() {
-	gnome2_icon_savelist
+	einstalldocs
 }
 
 pkg_postinst() {