Patched gxine makefile to properly include X11 libs. This closes bug #65303.

4 files changed, 31 insertions, 15 deletions

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index 83068f1e8836..bc68a4e7fefd 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/gxine
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.20 2004/10/07 03:10:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.21 2004/10/23 05:13:03 chriswhite Exp $
+
+  23 Oct 2004; Chris White <chriswhite@gentoo.org>
+  +files/gxine-0.3.3-Makefile.in.patch, gxine-0.3.3.ebuild:
+  Patched gxine makefile to properly include X11 libs.  This closes bug #65303.
 
   06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> gxine-0.3.3.ebuild:
   get_libdir fixes.
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 126a2cb63d55..1ed5879ce898 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b981516f0f01b38d3f500347aba7e513 ChangeLog 2486
-MD5 1927113a2bf861e370e69d870aded111 gxine-0.3.3.ebuild 1108
+MD5 aaaabe06a2a46d4c55fe169751f8d8ea gxine-0.3.3.ebuild 1233
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
 MD5 a0134d60cfc89d88f7f76826e3728379 files/digest-gxine-0.3.3 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBZLOnArHZZzCEUG0RAppRAJ9YGLJAOWgrsluAytI5JXTLDBLrbwCeN6++
-aPPpKSg1tDsw0GNsh1PQ7dE=
-=jnuU
------END PGP SIGNATURE-----
+MD5 b18643e0d818679a729863e11852b1ac files/gxine-0.3.3-Makefile.in.patch 360
diff --git a/media-video/gxine/files/gxine-0.3.3-Makefile.in.patch b/media-video/gxine/files/gxine-0.3.3-Makefile.in.patch
new file mode 100644
index 000000000000..1047606ea983
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.3.3-Makefile.in.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.in_old	2004-10-23 04:02:47.292943592 +0900
++++ src/Makefile.in	2004-10-23 04:03:13.083022904 +0900
+@@ -148,7 +148,7 @@
+ 
+ gxine_LDADD = @XINE_LIBS@ @GTHREAD2_LIBS@ @GTK2_LIBS@ $(XTEST_LIBS) \
+ 	      $(top_builddir)/src/spidermonkey/libspidermonkey.la \
+-	      $(LIRC_LIBS)
++	      $(LIRC_LIBS) $(X_LIBS)
+ 
+ 
+ gxine_client_SOURCES = client.c
diff --git a/media-video/gxine/gxine-0.3.3.ebuild b/media-video/gxine/gxine-0.3.3.ebuild
index 48c3dc2fb476..eedf06b7bc51 100644
--- a/media-video/gxine/gxine-0.3.3.ebuild
+++ b/media-video/gxine/gxine-0.3.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.3.3.ebuild,v 1.15 2004/10/07 03:10:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.3.3.ebuild,v 1.16 2004/10/23 05:13:03 chriswhite Exp $
 
-inherit nsplugins
+inherit eutils nsplugins
 
 DESCRIPTION="GTK+ Front-End for libxine"
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -22,12 +22,22 @@ KEYWORDS="x86 ~ppc sparc ~amd64 ~ppc64"
 
 SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	#fixes bug #65303 with missing X11 libs
+	epatch ${FILESDIR}/${P}-Makefile.in.patch
+}
+
 src_compile() {
 
 	# Most of these are not working currently, but are here for completeness
 	local myconf
 	use X	   || myconf="${myconf} --disable-x11 --disable-xv"
-	use nls	   || myconf="${myconf} --disable-nls"
+
+	myconf="${myconf} $(use_enable nls)"
 
 	econf ${myconf} || die
 	emake || die