Version bump.

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

4 files changed, 128 insertions, 16 deletions

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index c08bf2d435af..ea777032d943 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/gxine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.110 2011/06/22 02:30:29 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.111 2011/10/04 13:10:48 ssuominen Exp $
+
+*gxine-0.5.906 (04 Oct 2011)
+
+  04 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> +gxine-0.5.906.ebuild,
+  +files/gxine-0.5.906-endif.patch:
+  Version bump.
 
   22 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gxine-0.5.905-r1.ebuild:
   Fix spidermonkey version for the new versioning scheme
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 23bc494b1af5..370f1f651d06 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -4,24 +4,21 @@ Hash: SHA1
 AUX gxine-0.5.905-desktop.patch 377 RMD160 ea7d11a796ff9142cf0f578b3b5a2fe3de4f2125 SHA1 b4a327db63dc99a755a34cb60b15e03a7b3d39d9 SHA256 e0051e9737382b3c21e2d3e6f0d9eacd1fb5d589f480a155a396e1924512d7a5
 AUX gxine-0.5.905-fix-nspr-useage.patch 433 RMD160 65af0ddee220ca456acf20eea521fe6a4600cd23 SHA1 fc7a2ce90a8e84d1f519a786de9f477264ea925b SHA256 4d05d9144eba4f30976ed3e33e3985c782b95227d165ab90b4f453c377451ea6
 AUX gxine-0.5.905-spidermonkey-update.patch 674 RMD160 de859a4e370271edcb9b3fc18a3f896596a88dc7 SHA1 efa8619defd5af20cd7e57fcb8364ba491e374dd SHA256 c054c12984ddf6fd07ad029a52fcbce209bd443de9d44e827cbf4e9e4b8144d7
+AUX gxine-0.5.906-endif.patch 349 RMD160 0683bb409616d8ef878e4144e747bd0032fc236f SHA1 0c48cf0457f21dea9bdc70bed62421cd6bbdebfb SHA256 d3d14fdffe9f8e1872bcbf28670d48b72ed76d7a882902bb298902bb8ca4b6fa
 DIST gxine-0.5.905.tar.bz2 1203720 RMD160 3dc30ba9f402d20e3ad3f469cc753607ccc3d194 SHA1 dc01b617641d6eac4152259c592f15f31b9d9bf0 SHA256 9dcca3e581fddfc4cea8f9e45c99652f4dd336c1ca7726e910870b9c778b0cbf
+DIST gxine-0.5.906.tar.xz 906964 RMD160 6c131bc266acf50bea6f240b3c93ee0fa8692426 SHA1 88495a76f5d7e885d8c75ef145667f21e9a55ede SHA256 7cab1f17cedddef947d32cdc94aa276d20f741db356b08e5efdbf954e9ceaf14
 EBUILD gxine-0.5.905-r1.ebuild 2334 RMD160 e783d2100c2eda581471ea5696cf3b72406224a9 SHA1 c0da7181251c3f91a7a518eb02e2098b52fac371 SHA256 510fed87da5591d01e0a8ae054156cefc09a6dd8e9fd1d22f6f7b2ec143ebeb5
-MISC ChangeLog 15731 RMD160 615ceeaf426504b69d5e01373fda42aa79e77bef SHA1 d24f8252e0a9eb8c4d9ff2afa4ca554ae7f413dd SHA256 abb6ed8b1e74767db7713e40cbc4e2c6b8d1d236c401bcb66763a957b5fd56cf
+EBUILD gxine-0.5.906.ebuild 2520 RMD160 11828d2802ca827704531e798d9a8317e391c1b9 SHA1 f8f133fd5a7d42b3167d3866e02cd4c45391d8cc SHA256 a78722ceeff70cce9e57c9751578f3c6ce9bc4284a3b3988fd21d8b9c3e7d094
+MISC ChangeLog 15892 RMD160 0bcfd71c991e740f217a37dbdb1cd1769249f6cf SHA1 74d4377c9752a198ae75bf357d6622fad2797cb6 SHA256 e230a42c10daf4aef541fb1b0afb22bc0ef1315c28495180885be7a7f8498453
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOAVPLAAoJEO/kOhxWD91kQowP/3kSCARbxohtbPmn+IgHam1l
-Bq42ZDx4bxhatwbdlMUo5zd1XPkUy4hUQFa7H9iJU+mAScOUsfDbQP1aiQqfG4+R
-djuMU4EBLhhmIWac7p4WPb3sMm3/2ce90MSk+nc+qVs6ynIeJ2yG7TuwjcpIhu65
-3VSU20Nmv3Vt/pcVkTEur27oHiswRynDH6uqZ9vSc+y5ppFH0O+NxqUDI6dlUpIk
-/OPKHTknP9x9/KKJSHdJ3FhjmatnnYolt2isZokKnS5q3hFObffUMlce0SXjX/JO
-nFGfBWQDVPztvCcEocrsU4GAOUg91f5DI1/M5zN7vGNWrxAo3gvJ/bgVSG5tDp3/
-R5AGbbzgUiqci5ZBuK6FkNgTOxavDKGQJEqqqHyOy2Bx6TyJZmgLGLsIsVCPjksS
-oTFMMS7POEyXv0G681li9kFbTbi1V+ePFJv0XU3LyeXfp8Le11s0fNzYXlxQ7U/0
-/rWsb3FYcaO0TsB+cXt6yJXEnHNW0rE8ap0iIsbidjTT3aAP7iUBfXyt+OZU+bLd
-x2MyJh7yaErtBVLWiJm0IMc6eMRavgEBJa1qzVvVy5XxW/ADMJLOyNFj0P3ghShQ
-GPqF/qlGUQhSRixArVi/eGD+C0NpHBoE0kMgnmMhmvywAVkIbecokMXeCIO2e6zK
-LvGCBEY1GtrxYDwiU76R
-=cZY2
+iQEcBAEBAgAGBQJOiwX8AAoJEEdUh39IaPFN0LUH/00nSwJsfXrxGMwmzXDvv76c
++BsYwaJbGMXkjpAPiVEV7GO0dNA5NRJc3tmp48fLyRwVYG+4mT9PTyOdH10B8X9U
+19CulJRAlpv7CwJCnwJyJJBO4jKKudjPSqZPi6ezrbX7eEmlLV0tB5VI56ZWHtCO
+1nFfxI8aXCPhMXYQWu23AaCBZJr6FmYMvOXxHF5V+x9VGWgZYgli7CEQK62Dzbak
+a2fFfhvySOyqeZtHo/FDkjV1fwHEIsYnqfQGRgIRAKSIYrQjx6WvNjTsf7pzTSpv
+agWZ5tHpV6ggghCATT8YAcfacyLsr4YPz950QoAMjPTAavJB+IFC1J25VXX9ehQ=
+=IlDJ
 -----END PGP SIGNATURE-----
diff --git a/media-video/gxine/files/gxine-0.5.906-endif.patch b/media-video/gxine/files/gxine-0.5.906-endif.patch
new file mode 100644
index 000000000000..40c4a8a39458
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.906-endif.patch
@@ -0,0 +1,14 @@
+lirc.c:227:3: error: ‘gxine_lirc_thread’ undeclared (first use in this function)
+
+--- src/lirc.c
++++ src/lirc.c
+@@ -223,8 +223,8 @@
+   if (gxine_lirc_thread_created)
+     pthread_join (gxine_lirc_thread, NULL);
+   gxine_lirc_start ();
+-#endif
+   JS_SET_RVAL (cx, vp, gxine_lirc_thread ? JSVAL_TRUE : JSVAL_FALSE);
++#endif
+   return JS_TRUE;
+ }
+
diff --git a/media-video/gxine/gxine-0.5.906.ebuild b/media-video/gxine/gxine-0.5.906.ebuild
new file mode 100644
index 000000000000..7502dc02bedb
--- /dev/null
+++ b/media-video/gxine/gxine-0.5.906.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.906.ebuild,v 1.1 2011/10/04 13:10:48 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins toolchain-funcs
+
+DESCRIPTION="GTK+ Front-End for libxine"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Temporarily unkeyworded for testing -ssuominen
+#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="gnome lirc nls nsplugin udev xcb xinerama"
+
+RDEPEND=">=media-libs/xine-lib-1.1.17
+	>=x11-libs/gtk+-2.8:2
+	>=dev-libs/glib-2.10:2
+	>=x11-libs/pango-1.12
+	>=dev-lang/spidermonkey-1.8.2.15
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	gnome? ( >=dev-libs/dbus-glib-0.88 )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	nsplugin? ( dev-libs/nspr
+		x11-libs/libXaw
+		x11-libs/libXt )
+	udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) )
+	xcb? ( x11-libs/libxcb )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	# ld: cannot find -ljs
+	sed -i -e '/JS_LIBS="`spidermonkey_locate_lib/s:js:mozjs:' m4/_js.m4 || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.5.905-desktop.patch \
+		"${FILESDIR}"/${PN}-0.5.905-fix-nspr-useage.patch \
+		"${FILESDIR}"/${P}-endif.patch
+
+	# need to disable calling of xine-list when running without
+	# userpriv, otherwise we get sandbox violations (bug #233847)
+	if [[ ${EUID} == "0" ]]; then
+		sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable lirc) \
+		--enable-watchdog \
+		$(use_with xcb) \
+		$(has_version '<dev-lang/spidermonkey-1.8.5' && echo --with-spidermonkey=/usr/include/js) \
+		$(use_with nsplugin browser-plugin) \
+		$(use_with udev gudev) \
+		--without-hal \
+		$(use_with gnome dbus) \
+		$(use_with xinerama)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		docsdir=/usr/share/doc/${PF} \
+		install
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README{,.{cs,de},_l10n} TODO
+	use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
+}
+
+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
+}