Version bump with sys-libs/readline >= 6.3 compability patch wrt #504208 by Dmitry Derevyanko. Import yet another "prevent crash on exit" fix from Debian patchset.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 148 insertions, 10 deletions

diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index 4dbd7c59f813..4a257db1d7be 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/xine-ui
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.184 2014/06/22 17:53:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.185 2014/07/25 19:25:36 ssuominen Exp $
+
+*xine-ui-0.99.8 (25 Jul 2014)
+
+  25 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/xine-ui-0.99.8-readline-6.3.patch, +xine-ui-0.99.8.ebuild:
+  Version bump with sys-libs/readline >= 6.3 compability patch wrt #504208 by
+  Dmitry Derevyanko. Import yet another "prevent crash on exit" fix from Debian
+  patchset.
 
   22 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
   -files/xine-ui-0.99.6-curl-headers.patch,
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 276b1f5e3c3a..b19e29c654a8 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xine-ui-0.99.8-readline-6.3.patch 1191 SHA256 01406f9a6da04e07608fe51e2bfbbe9b6b959da01423771a4cc6951b3dd95ec5 SHA512 443cffe3cc865e414e5a3ee8666d3d59d57b79c1d64d35afd6a1f915a66251370c6b041e457e04e7dc38c1bd945e00054856014a58f1661f5c9f2ae55d7a8da3 WHIRLPOOL c8f6b9114038f7ec6703fa7077bcf0123a5ee7b3cac5f5aa8073d6b0907843570f11bf448849fed498f6dc0bd2890ec7ead05c2af9da992978ba8e1ccbff703c
 DIST xine-ui-0.99.7.tar.xz 1752328 SHA256 9d8cdfd1c5c84251d6978765b059adf57099ff6c447f3e4b59066c8563f66bc4 SHA512 6070d28cb3f5bb816b1f218d07c5e0001e71069dfc6b6c761b95960f095736923a6e83a97dfab88d93688c1029a7c1d30dc4a2327e2c8481b3b06cb7cc837c1f WHIRLPOOL 7b7b87b56029c11d3ea1036420dca09e730370294659cadc0e5937cd36383e84a941f89bd69535566ffc8cd639aa21ea439ba1e82b1f46fa6211ecf7cc4a09f1
+DIST xine-ui-0.99.8.tar.xz 1758372 SHA256 1ac5a9fc8dbf81f12a8677108bf2b623e70d7adbb83b83912b9cdf00bc78b2a7 SHA512 a2d11b0c512b9d485e0bbe418b36fb5fd52fe1a9c68cdb865771fc580b30bff513825f3e24ef85a902669c2c1ea8947512dd9abe4c12fdef94b8852cc8588da3 WHIRLPOOL c7d67f94422dfdbd609b3e2d880134a2e2d414981d229870157c10f5c54928101336f83f70d6c56c8da238fd25933b4490958e379d2d0a64721553f3fd7d6638
 EBUILD xine-ui-0.99.7.ebuild 2045 SHA256 318815d2e2a8b1eeee94e8579b2bf23576f3fb9c163ab5b0a04fb1bfc3da38c2 SHA512 36f28ddcbe7aa2017f693165c4b4e122c821c25a0e23d4414db9ea19a5bae79740572637e589cd2ca40d3aadac31727a9297f374c6ce7ad41fa45d1f1f5b324b WHIRLPOOL 1ebe6f7d23b88e6da4bf962c0c3ea792b34e34bfa739d13ab1bc5a365d225ac3e8ff2eccd65520b370895e6485289bf876ea636a79a12c16f0b0c839348e6001
-MISC ChangeLog 27903 SHA256 ada5bee56a57d7475c30f3ee7ec2480aff52561c0bb02841b169e6ffab7bbf42 SHA512 b2fb35d33347fb512084bc8ac6aea4be0ad3c2ecc2eecd9d35c9d64d3de758255f4623e9c7d6f0761f4f4c66f03b81028632c38d431e96b9f676785f8a3d49bd WHIRLPOOL 1da35ee7590bbab5ec9f982bbe4380556a3173a676b70e29d0110a4ca2fed68958ea13cbf9081c1ef295c99a95db825c443a6186de70f0e9d64bc9494e046dff
+EBUILD xine-ui-0.99.8.ebuild 2156 SHA256 e72ff019f3e670b2e2af75e3fb400c2491a82c5f39631279aba8e4c5092180df SHA512 4d195e8e204d42c61a77abe94ae5b1117359fd97dc3dc3d65dae52f56543ca24be020bbaff1a22b46090beb706204cd8f598a4e0f13097247909f10f4bfd8d9f WHIRLPOOL 0aa7efa2a6d8b56e7e37cff59b947b8cda65769cbb00da8dd0131610cda505bd341d794c4794756b8c13f2a22d030c826eca5950d336cad612642ffef90dfe12
+MISC ChangeLog 28227 SHA256 8ee2f5fea2c8af64d5a04bfbeb4c5037c19e65c654dd53fd6d31ca2d0f8b8649 SHA512 f5e4721d25181cc13c56377b001f51e26611d2ef46693a3266b3066a49b85cdcfe1fa5911acf410352752dd84fd2a12f9c2786e62e2470218256de8052c97234 WHIRLPOOL a7723d18e4376d16c45737b1800d6ef39bd57464c0df9e23e882fde4d10cfce418ae7e1dca599d6bc32b354d9fcf22f0687cda9b7fc1346db04cba99be5664e3
 MISC metadata.xml 314 SHA256 7d249cbdf83d624b16eca3d7a1dd04db70b4f168197c904397d76f86200e96da SHA512 8aa906e5cfe4f604362647beaff9e710ae8f0dced03916b232d5aeea60bb606354abd059b15a20d1efe638a67b4f23d9731acaff7043856072772077144ddef8 WHIRLPOOL 003b90a77ac20b2bbb2a97abb0da5cfbb39ae34f6c07078a784652a95f8b36283d0f124ec9c912654e00b41d96297ab87209ab24089195a80e1eb5ac92a5ff0e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTpxc/AAoJEEdUh39IaPFNHA4IAJKaK6ZggB3eEJQK6JjufuHr
-hRcoLNjeHTGWVeymVBCRrY6qsON8kwOX2WWR2ZLb/aWyeUO7wA5UbYIWaA9paJcb
-rXXNs9r7EsCNfYw0DI9SrGILOU0sWNomQlX1zw1Maiy0X8YCS4JyZI+8b6vUrsbq
-nEhh8eAL4s8mVJjUlSwKMVwJrktP62gLCNJpRU1YA00wlMdgt1JSSNvT/FulNRj2
-aJ+horB8i1dqrByxISoz8kRV9RfvkErqmtu9vjAHLary7r4KjKqYv0rJxQcOQRv+
-zcj1ElNTTTevdjpdJCTiQh99FbvSS0G+avN35rXmQfiUCpRRcxBLTXgEW31vwLk=
-=+XcU
+iQEcBAEBCAAGBQJT0q8vAAoJEEdUh39IaPFNQk8IAJFLHX9V/KFIdUtvxvmc4kIo
+Zvj4P4Y3zO4BFBltTyLL2rhRWyv9auSk1Eq19ZxYAyqPkE02KfZ/ZUWS5/wPiVRb
+ukdw35kEMp7FRsIWyACOioW/JSJ8upkYpw2DquwWu5pQi5mwwvE+y0Hhq2iBOE+p
+tKBv6hDYO/RIzISoMG8hEZJlWm33hh2/Qp2X5yD1Z91vgG6hoYMZkfWlU+CQpkSD
+Adg2Dm+LDgK53mXLal4ZRFYtbAjpnJH4nwOUP6s9j3ii/nrDZoU1J+a1tC0inyde
+4QoG68vW2JKzsUEqAGFna9rPia/e3N20ZWLuSgIwFUiI/w5jd7wM8Rk8vkmWqEs=
+=+uqQ
 -----END PGP SIGNATURE-----
diff --git a/media-video/xine-ui/files/xine-ui-0.99.8-readline-6.3.patch b/media-video/xine-ui/files/xine-ui-0.99.8-readline-6.3.patch
new file mode 100644
index 000000000000..3799975d0afb
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.8-readline-6.3.patch
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/show_bug.cgi?id=504208
+
+Fix building with readline >= 6.3 API (see network.c change)
+Fix another crash on exit (see main.c change)
+
+patches/debian-changes from xine-ui_0.99.8-2.debian.tar.xz at http://packages.debian.org/xine-ui
+
+--- src/xitk/main.c
++++ src/xitk/main.c
+@@ -1255,8 +1255,10 @@ static void event_listener(void *user_da
+       gGui->mixer.volume_level = (aevent->left + aevent->right) / 2;
+       if(gGui->mixer.method == SOUND_CARD_MIXER) {
+ 	gGui->mixer.mute = aevent->mute;
+-	xitk_slider_set_pos(panel->mixer.slider, gGui->mixer.volume_level);
+-	xitk_checkbox_set_state(panel->mixer.mute, gGui->mixer.mute);
++	if (panel) {
++	  xitk_slider_set_pos(panel->mixer.slider, gGui->mixer.volume_level);
++	  xitk_checkbox_set_state(panel->mixer.mute, gGui->mixer.mute);
++	}
+       }
+     }
+     break;
+--- src/xitk/network.c
++++ src/xitk/network.c
+@@ -1255,7 +1255,7 @@ int main(int argc, char **argv) {
+   rl_readline_name = PROGNAME;
+   rl_set_prompt(session.prompt);
+   rl_initialize();
+-  rl_attempted_completion_function = (CPPFunction *)completion_function;
++  rl_attempted_completion_function = completion_function;
+   
+   signal(SIGPIPE, SIG_IGN);
+   
diff --git a/media-video/xine-ui/xine-ui-0.99.8.ebuild b/media-video/xine-ui/xine-ui-0.99.8.ebuild
new file mode 100644
index 000000000000..c4dd691f4170
--- /dev/null
+++ b/media-video/xine-ui/xine-ui-0.99.8.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.8.ebuild,v 1.1 2014/07/25 19:25:36 ssuominen Exp $
+
+EAPI=5
+inherit eutils fdo-mime gnome2-utils
+
+DESCRIPTION="Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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:= )
+	media-libs/libpng:0=
+	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
+	virtual/jpeg:0
+	aalib? ( media-libs/aalib:= )
+	curl? ( >=net-misc/curl-7.10.2:= )
+	libcaca? ( media-libs/libcaca:= )
+	lirc? ( app-misc/lirc:= )
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-6.2:= )
+	X? (
+		x11-libs/libICE:=
+		x11-libs/libSM:=
+		x11-libs/libX11:=
+		x11-libs/libXext:=
+		x11-libs/libXft:=
+		x11-libs/libXrender:=
+		x11-libs/libXScrnSaver:=
+		x11-libs/libXtst:=
+		x11-libs/libXv:=
+		x11-libs/libXxf86vm:=
+		xinerama? ( x11-libs/libXinerama:= )
+		)"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.18.3 )
+	X? (
+		x11-libs/libXt
+		x11-proto/inputproto
+		x11-proto/xf86vidmodeproto
+		xinerama? ( x11-proto/xineramaproto )
+		)
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-readline-6.3.patch
+	rm -f misc/xine-bugreport
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable lirc) \
+		$(use_enable vdr vdr-keys) \
+		--disable-nvtvsimple \
+		$(use_enable debug) \
+		$(use_with X x) \
+		$(use_with readline) \
+		$(use_with curl) \
+		$(use_with aalib) \
+		$(use_with libcaca caca) \
+		--without-fb
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		docsdir="/usr/share/doc/${PF}" \
+		install
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}