Fix empty xlibs. Bug #91707

Package-Manager: portage-2.0.52-r1

4 files changed, 35 insertions, 9 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 2165be33ce6a..7777bf60cb10 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.56 2005/07/27 20:16:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.57 2005/09/26 15:31:47 dang Exp $
+
+  26 Sep 2005; <dang@gentoo.org> +files/rhythmbox-0.8.8-empty-xlib.patch,
+  rhythmbox-0.8.8-r1.ebuild:
+  Fix empty xlibs. Bug #91707
 
   27 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   rhythmbox-0.8.8-r1.ebuild:
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 33b0be631ce4..d9042d2621c1 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4d41e769208d5bac88295e4787ba90e1 rhythmbox-0.8.8-r1.ebuild 2531
+MD5 ff60c2d320a8e0e8e55bfac395f77eb3 rhythmbox-0.8.8-r1.ebuild 2636
+MD5 2f257514868cffde4127ec0a91c6b8b8 ChangeLog 6557
 MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200
-MD5 1f204be2751d01e7530bfdf6ad7f215a ChangeLog 6427
-MD5 9f5bc9bf255b78cc67342f9fc9423ef6 files/rhythmbox-0.8.8-ipod.patch 809
+MD5 a3ff016aec5eec7277e2598ad013b80a files/rhythmbox-0.8.8-empty-xlib.patch 496
 MD5 44a42f72ca8c0f3136fded12f1aa7172 files/digest-rhythmbox-0.8.8-r1 69
 MD5 7c49ce1b3d4a78dc9adba805fd3b82fb files/rhythmbox-0.8.7-gst_shn_support.patch 665
+MD5 9f5bc9bf255b78cc67342f9fc9423ef6 files/rhythmbox-0.8.8-ipod.patch 809
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC5+vPKRy60XGEcJIRAoAzAJ9qmd8vo8H4YDdXMMbqFlLmZoBOhACdE9HX
-LnAPEyK9qFKPkZKd9qKagMU=
-=oUge
+iD8DBQFDOBSyomPajV0RnrERAmn7AJwKgal4GSL17xedlAMOwkgSxra7/ACfaPzO
+ensEewP7qKviwi3waIPd4KA=
+=3E3A
 -----END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.8.8-empty-xlib.patch b/media-sound/rhythmbox/files/rhythmbox-0.8.8-empty-xlib.patch
new file mode 100644
index 000000000000..f25abddb264a
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.8.8-empty-xlib.patch
@@ -0,0 +1,18 @@
+diff -u -ruN rhythmbox-0.8.8.orig/configure.ac rhythmbox-0.8.8/configure.ac
+--- rhythmbox-0.8.8.orig/configure.ac	2004-10-05 14:06:30.000000000 -0400
++++ rhythmbox-0.8.8/configure.ac	2005-06-29 19:10:54.000000000 -0400
+@@ -339,8 +339,12 @@
+ 
+ AC_PATH_X
+ 
+-CFLAGS="-I$x_includes $CFLAGS"
+-LIBS="-L$x_libraries $LIBS"
++if test x"$x_includes" != x; then
++	CFLAGS="-I$x_includes $CFLAGS"
++fi
++if test x"$x_libraries" != x; then
++	LIBS="-L$x_libraries $LIBS"
++fi
+ 
+ have_xidle=no
+ AC_COMPILE_IFELSE([
diff --git a/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild
index 32f0defdc573..996a1b6a0af0 100644
--- a/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild,v 1.8 2005/07/27 20:16:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild,v 1.9 2005/09/26 15:31:47 dang Exp $
 
 inherit gnome2 eutils
 
@@ -81,5 +81,8 @@ src_unpack()
 	epatch ${FILESDIR}/${PN}-0.8.7-gst_shn_support.patch
 	# fix ipod crasher
 	epatch ${FILESDIR}/${P}-ipod.patch
+	# Fix empty X libs. Bug #91707
+	epatch ${FILESDIR}/${P}-empty-xlib.patch
 
+	autoconf || die "Autoconf failed"
 }