Fix sandbox violations without FEATURES=userpriv (bug #233847), clean up ebuild a bit.

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64

3 files changed, 25 insertions, 22 deletions

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index f7bbfdf64012..85679026d092 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/gxine
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.92 2008/08/03 02:29:29 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.93 2008/08/06 14:33:47 chutzpah Exp $
+
+  06 Aug 2008; Patrick McLean <chutzpah@gentoo.org> gxine-0.5.903.ebuild:
+  Fix sandbox violations without FEATURES=userpriv (bug #233847), clean up
+  ebuild a bit.
 
 *gxine-0.5.903 (03 Aug 2008)
 
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 417177ee3394..4bc2fea8e2e3 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gxine-0.4.1-menu-fix.patch 873 RMD160 53007ce37cc67e7ee939258c43d7e32555f2340d SHA1 7fc6ae2c2fa9662ec4bf1903aa74fc75cffa0f48 SHA256 77a1434adbcafad0581149b7ea532d835a3ca49266fa619734a1bb178493b87b
 DIST gxine-0.5.11.tar.bz2 1028982 RMD160 37593c2b926dc0ef3745744c9a9ea79fd4f4d391 SHA1 74d7e46ff55261c36994b60d66e55720cdb9e165 SHA256 48fb4acee5bac9dd6c59716f88f94f3869465381e60e549dea55d28ec4579736
 DIST gxine-0.5.7.tar.bz2 964963 RMD160 063212e277426274169384dd3e104eed127bf914 SHA1 806732097cffcfe23d24be0a1abc1640767e9b13 SHA256 08f9da823bf87ce9a7beae6938ab2e5405004bb85f97ba49e3a2a1738ec0520c
 DIST gxine-0.5.903.tar.bz2 1112012 RMD160 ed137f15ef7628d1862b6bb1029a0d669e3960fa SHA1 2c36ee1bfe6cf63cef74ede85f9194247fb784a0 SHA256 989fdd12eeae994c0462d5fa9c634f18f45828fcda54a03271f3591ae5a0090b
 EBUILD gxine-0.5.11.ebuild 1626 RMD160 2dc49a7a803479210646fda282554be24f38c507 SHA1 9300b7ce767d9e0d62bceec96fa388122cb542c0 SHA256 20eaa4f1085ff248f96d27ed0b05b14e6e67df25252de27d68083de56c959d4d
 EBUILD gxine-0.5.7.ebuild 1654 RMD160 0246b980b32eecc17ad0b0adaaf9226622533ff2 SHA1 ce52a57186b37703a7e6ae0080775cd0073f22d9 SHA256 63d359aae3a3943a8e23a41420e4160481d03ec97e12aaa7e932cc8eed0086ec
-EBUILD gxine-0.5.903.ebuild 1738 RMD160 2dfb76883539f8a5234a0d1c14146390c0fbda0e SHA1 a36a65775e7a41e3292ffd91bd5aaa9257fb76cf SHA256 940e46f01eb1e3fe212a33727c2c07dbb01540ff181ead54f2753c9a6a1b4cd5
-MISC ChangeLog 13334 RMD160 cc0ae118c28100a10de10b2fc94bb627095c1529 SHA1 17156a5044668a50c5c6370baba6e3bfe9a2b60b SHA256 392fc09f8a24234f00819a7f24acb08be560ce9687f93aaf63591285e03e614f
+EBUILD gxine-0.5.903.ebuild 2108 RMD160 1010e6d5c4b3d51f2bbca6d025365bf2319ece8e SHA1 1062d1782189daff9bb404b2a6106cc6d05556f4 SHA256 f17c391a0449a5fa89704151246489cd518d1f58f6fb816daed66c2a8cfabf2e
+MISC ChangeLog 13500 RMD160 405c212d86f9eabdd12b018a3abc9e9a37d4c907 SHA1 1b4e88e1d12b26840da0dc13d61099b8cdca7adc SHA256 19d81991ac3f06a809d9a395bc1ad8c075ab5331c8e0613615459baa5eb495ab
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiVGCgACgkQWt/XSf2CZdk/DQCeL6Wo3szzLZs4ThuAi/+4Liq4
-4pkAnjZ5W4t0XCXDjB14qVBw84CC/KL9
-=QWxX
------END PGP SIGNATURE-----
diff --git a/media-video/gxine/gxine-0.5.903.ebuild b/media-video/gxine/gxine-0.5.903.ebuild
index 57cbef6a34a4..df40863babaf 100644
--- a/media-video/gxine/gxine-0.5.903.ebuild
+++ b/media-video/gxine/gxine-0.5.903.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.903.ebuild,v 1.1 2008/08/03 02:29:29 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.903.ebuild,v 1.2 2008/08/06 14:33:47 chutzpah Exp $
 
-inherit eutils nsplugins fdo-mime libtool
+inherit eutils nsplugins fdo-mime libtool autotools multilib
 
 DESCRIPTION="GTK+ Front-End for libxine"
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -18,7 +18,7 @@ RDEPEND="media-libs/libpng
 	>=x11-libs/gtk+-2.8
 	>=dev-libs/glib-2.10
 	>=x11-libs/pango-1.12
-	>=dev-lang/spidermonkey-1.5_rc6-r1
+	>=dev-lang/spidermonkey-1.7.0
 	lirc? ( app-misc/lirc )
 	nsplugin? ( dev-libs/nspr )
 	x11-libs/libX11
@@ -37,10 +37,16 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i -e '/ac_have_xinerama/ s:text:test:' \
-		"${S}/configure"{,.ac}
 
-	elibtoolize
+	sed -i -e '/ac_have_xinerama/ s:text:test:' "${S}/configure.ac"
+
+	# need to disable calling of xine-list when running without
+	# userpriv, otherwise we get sandbox violations (bug #233847)
+	if [[ ${EUID} == "0" ]]; then
+		sed -i 's:^XINE_LIST=.*$:XINE_LIST=:' "${S}/configure.ac"
+	fi
+
+	eautoreconf
 }
 
 src_compile() {
@@ -51,7 +57,8 @@ src_compile() {
 		$(use_with xcb) \
 		$(use_with hal) \
 		$(use_with xinerama) \
-		--disable-gtk-compat \
+		--enable-watchdog \
+		--with-spidermonkey=/usr/include/js \
 		--disable-dependency-tracking || die "econf failed"
 	emake || die "emake failed"
 }
@@ -60,9 +67,11 @@ src_install() {
 	emake DESTDIR="${D}" \
 		docdir=/usr/share/doc/${PF} \
 		docsdir=/usr/share/doc/${PF} \
-		install || die
+		install || die "emake install failed"
 
-	dodoc AUTHORS ChangeLog NEWS README{,.{cs,de}_l10n TODO BUGS
+	# sometimes an empty libdir gets created
+	rmdir "${D}/usr/$(get_libdir)/gxine"
+	dodoc AUTHORS ChangeLog NEWS README{,.{cs,de},_l10n} TODO BUGS
 
 	use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
 }