Remove 'pkg-config --list-all' call.

Fix bug 294183.
Package-Manager: portage-14755-svn/cvs/Linux ppc

4 files changed, 94 insertions, 9 deletions

diff --git a/media-video/miro/ChangeLog b/media-video/miro/ChangeLog
index 358c3129a3c0..4d2eb4dd4a7c 100644
--- a/media-video/miro/ChangeLog
+++ b/media-video/miro/ChangeLog
@@ -1,11 +1,18 @@
 # ChangeLog for media-video/miro
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/miro/ChangeLog,v 1.3 2009/11/20 14:47:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/miro/ChangeLog,v 1.4 2009/11/28 15:09:34 volkmar Exp $
+
+  28 Nov 2009; Mounir Lamouri <volkmar@gentoo.org> miro-2.5.3.ebuild,
+  +files/miro-2.5.3-remove-pkg-config-list-all.patch:
+  Remove 'pkg-config --list-all' call, bug 294183
 
   20 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> miro-2.5.3.ebuild:
   keyword with ~amd64. Per bug #291673.
 
   30 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> miro-2.5.3.ebuild:
+  Add references to upstream bugs.
+
+  30 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> miro-2.5.3.ebuild:
   Add ~x86 keyword (maintainer keywording).
 
 *miro-2.5.3 (30 Oct 2009)
diff --git a/media-video/miro/Manifest b/media-video/miro/Manifest
index 5ca6c0088836..46380020ce57 100644
--- a/media-video/miro/Manifest
+++ b/media-video/miro/Manifest
@@ -2,8 +2,9 @@ AUX miro-2.5.3-disable-xine-hack.patch 746 RMD160 cfb7f550eb9b8b1c18f3ed412737d4
 AUX miro-2.5.3-dont-install-test-files.patch 1422 RMD160 6686dae4476951fa3b48a7891577298a629e86a1 SHA1 f1b816ac394542671f782fa4e6caaa2588151e86 SHA256 ad42ba3024da26c0e16ee8e8747b0eb0fbda604e6eeb3be7274c2ac7ac9aee3b
 AUX miro-2.5.3-fix-debug.patch 472 RMD160 0cee057c074004a4c8662f19fba0d49247a5ba3c SHA1 f0587a930705a2edce7142d2c681c5beaaa5deec SHA256 27bafa26876df1aaef10688757c2eb4a2a3c8fff06665d376c026a316c68c103
 AUX miro-2.5.3-fix-locale.patch 494 RMD160 7ba690456c2ffeeb771288729b023e15af3e295e SHA1 22e48a40df75dbdd8e541704acb6404f217d56bb SHA256 ed3ea7a22cffb9fd1dc8ccc1003648e67b603360aaafb48531c9a58b3f5df8d3
+AUX miro-2.5.3-remove-pkg-config-list-all.patch 2880 RMD160 7aa0300eda840a9662df172c53397c19aab9967a SHA1 1298447816b3e06a4d5c309f66c2916eec1ae2c4 SHA256 ac28c97c1ca3051c3d0c2f7b17eca78a3e45e02c589cda813e98c166a3a21f55
 AUX miro-2.5.3-remove-unittest-option.patch 538 RMD160 f29c534b28ac453cb72d18cb3e0810f6744c38b6 SHA1 4f86a65c368ced0b7a37d091a3705cd2f80d2628 SHA256 889e8480faee3af86d9c2dbfa9375eeb102ca01df6c71b07fcb4b62b326cbe6a
 DIST miro-2.5.3.tar.gz 9943113 RMD160 d70c179d38bb6806962944187e53b5ebf50d03ea SHA1 553d4e173d978bede9dd570f337a264af8f0e28d SHA256 10bd1070b03e97a4c5f14e6a3da079cad7b05be955304d21d583e531673b3a34
-EBUILD miro-2.5.3.ebuild 3213 RMD160 09d763431dd48a43556b02b3f0e1617fb0ff9eeb SHA1 05e082aa0df5def9456930ea547446f73931834b SHA256 98c2bbd3486213c6d7b3a1cbe813a7e1a47ad7b2a1e4e24d18860413313c4e89
-MISC ChangeLog 839 RMD160 d906eb14db08c2b084cdbfd60f2327875c6cc983 SHA1 2b2e8090e18565403f6ed109f59ee2935a22a38e SHA256 cbaf76f496b37770441834715b6258bd3a2b80eb32435ea60120281216cae8c0
+EBUILD miro-2.5.3.ebuild 3489 RMD160 7a1180bb7acb5e0bec06f35a3274861d071944b2 SHA1 1203034d54df21eef4f97371111b0eea96cff9dd SHA256 df303847a29c0fb190603dcd3d762a92897be35dc364d2e60c53d29484bbda01
+MISC ChangeLog 1118 RMD160 62ba3b1213f819258f58fbdac05e23adcf7769b3 SHA1 e8a96ac0876b7cbc4be8976209db4e4ce4dd8201 SHA256 3886006e3f0ecf0d5f56b1d02d6da668867f0b89a2b1e13b3de012d1f822ed49
 MISC metadata.xml 257 RMD160 224ee82bfe66c5da4a2dc1dd697b1782e7f03cb9 SHA1 6b583c76750b206bd133403d1a4685a14f8e6b95 SHA256 45f231de4d8bc5ed6309ba83d2eb9a06b8e13f828d7b74e909a144439356cd62
diff --git a/media-video/miro/files/miro-2.5.3-remove-pkg-config-list-all.patch b/media-video/miro/files/miro-2.5.3-remove-pkg-config-list-all.patch
new file mode 100644
index 000000000000..569c68af663e
--- /dev/null
+++ b/media-video/miro/files/miro-2.5.3-remove-pkg-config-list-all.patch
@@ -0,0 +1,74 @@
+From b5acbb41f5c6b2c4ce3b4a6944459ea425d7f971 Mon Sep 17 00:00:00 2001
+From: Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
+Date: Sat, 28 Nov 2009 14:39:19 +0100
+Subject: [PATCH] Remove use of 'pkg-config --list-all' to 'pkg-config --exists'.
+ Fix bug 4613.
+
+---
+ platform/gtk-x11/setup.py |   23 +++++++++++++----------
+ 1 files changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/platform/gtk-x11/setup.py b/platform/gtk-x11/setup.py
+index a731ff6..94dc72a 100755
+--- a/platform/gtk-x11/setup.py
++++ b/platform/gtk-x11/setup.py
+@@ -297,6 +297,14 @@ def parse_pkg_config(command, components, options_dict = None):
+ 
+     return options_dict
+ 
++def package_exist(package_name):
++  """
++  Return True if the package is present in the system. False otherwise.
++  The check is made with pkg-config.
++  """
++  # pkg-config returs 0 if the package is present
++  return subprocess.call(['pkg-config', '--exists', package_name]) == 0
++
+ def compile_xine_extractor():
+     rv = os.system("gcc %s -o %s `pkg-config --libs --cflags gdk-pixbuf-2.0 glib-2.0 libxine`" %
+                    (os.path.join(platform_dir, "xine/xine_extractor.c"), os.path.join(platform_dir, "xine/xine_extractor")))
+@@ -346,11 +354,6 @@ fi
+ 
+ #### MozillaBrowser Extension ####
+ def get_mozilla_stuff():
+-    try:
+-        packages = get_command_output("pkg-config --list-all")
+-    except RuntimeError, error:
+-        sys.exit("Package config error:\n%s" % (error,))
+-
+     if XPCOM_LIB and GTKMOZEMBED_LIB and XULRUNNER_19 != None:
+         print "\nUsing XPCOM_LIB, GTKMOZEMBED_LIB and XULRUNNER_19 values...."
+         xulrunner19 = XULRUNNER_19
+@@ -360,24 +363,24 @@ def get_mozilla_stuff():
+     else:
+         print "\nTrying to figure out xpcom_lib, gtkmozembed_lib, and xulrunner_19 values...."
+         xulrunner19 = False
+-        if re.search("^libxul", packages, re.MULTILINE):
++        if package_exist('libxul'):
+             xulrunner19 = True
+             xpcom_lib = 'libxul'
+             gtkmozembed_lib = 'libxul'
+ 
+-        elif re.search("^xulrunner-xpcom", packages, re.MULTILINE):
++        elif package_exist('xulrunner-xpcom'):
+             xpcom_lib = 'xulrunner-xpcom'
+             gtkmozembed_lib = 'xulrunner-gtkmozembed'
+ 
+-        elif re.search("^seamonkey-xpcom", packages, re.MULTILINE):
++        elif package_exist('seamonkey-xpcom'):
+             xpcom_lib = 'seamonkey-xpcom'
+             gtkmozembed_lib = 'seamonkey-gtkmozembed'
+ 
+-        elif re.search("^mozilla-xpcom", packages, re.MULTILINE):
++        elif package_exist('mozilla-xpcom'):
+             xpcom_lib = 'mozilla-xpcom'
+             gtkmozembed_lib = 'mozilla-gtkmozembed'
+ 
+-        elif re.search("^firefox-xpcom", packages, re.MULTILINE):
++        elif package_exist('firefox-xpcom'):
+             xpcom_lib = 'firefox-xpcom'
+             gtkmozembed_lib = 'firefox-gtkmozembed'
+ 
+-- 
+1.6.3.3
+
diff --git a/media-video/miro/miro-2.5.3.ebuild b/media-video/miro/miro-2.5.3.ebuild
index 67ca57bdc95a..0094f54cce44 100644
--- a/media-video/miro/miro-2.5.3.ebuild
+++ b/media-video/miro/miro-2.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/miro/miro-2.5.3.ebuild,v 1.3 2009/11/20 14:47:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/miro/miro-2.5.3.ebuild,v 1.4 2009/11/28 15:09:34 volkmar Exp $
 
 EAPI="2"
 
@@ -45,20 +45,22 @@ S="${WORKDIR}/${P}/platform/gtk-x11"
 # psyco can make miro speedier, add a USE flag, recommand in postinst ?
 
 # TODO:
-# create a real test suite
-# try to have a real xine/gstreamer choice
+# create a real test suite, upstream bug 12369
+# try to have a real xine/gstreamer choice, upstream bug 12371
 
 src_prepare() {
 	# install only needed locales
-	epatch "${FILESDIR}"/${P}-fix-locale.patch
+	epatch "${FILESDIR}"/${P}-fix-locale.patch # upstream bug 12368
 	# fix debug mode
 	epatch "${FILESDIR}"/${P}-fix-debug.patch
 	# disable xine hack which is failing
 	epatch "${FILESDIR}"/${P}-disable-xine-hack.patch
 	# prevent installing unneeded test files
-	epatch "${FILESDIR}"/${P}-dont-install-test-files.patch
+	epatch "${FILESDIR}"/${P}-dont-install-test-files.patch # upstream bug 12370
 	# do not show --unittest option
-	epatch "${FILESDIR}"/${P}-remove-unittest-option.patch
+	epatch "${FILESDIR}"/${P}-remove-unittest-option.patch # upstream bug 12370
+	# remove 'pkg-config --list-all' call, bug 294183, upstream bug 4613
+	epatch "${FILESDIR}"/${P}-remove-pkg-config-list-all.patch
 
 	# disable autoupdate
 	sed -i -e "/autoupdate/d" ../../portable/startup.py || die "sed failed"
@@ -80,6 +82,7 @@ src_prepare() {
 src_test() {
 	# there is a test suite but it has been designed to be used when installed
 	# should be fixed
+	#./run.sh --unittests || die "tests failed"
 	:
 }