From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Thu, 4 Jan 2007 12:34:51 +0000 (+0000)
Subject: Make sure the correct wx-config is used, hopefully closes bug #159674.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=51d4b5de5d2dd0f0d5636d8d4354597c585a7880;p=gentoo.git

Make sure the correct wx-config is used, hopefully closes bug #159674.
Package-Manager: portage-2.1.2_rc4-r5
---

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 71d6634cf8cd..5a160281b53e 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.202 2007/01/03 16:10:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.203 2007/01/04 12:34:51 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.6-r1.ebuild:
+  Make sure the correct wx-config is used, hopefully closes bug #159674.
 
 *vlc-0.8.6-r1 (03 Jan 2007)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index f0cf8f42eeea..d3b72c0c5b33 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -21,18 +21,18 @@ EBUILD vlc-0.8.5-r5.ebuild 7479 RMD160 d87443d301afdc32f29b74beb908852bd309c737
 MD5 81ff77133353f46a2181354d2978d73e vlc-0.8.5-r5.ebuild 7479
 RMD160 d87443d301afdc32f29b74beb908852bd309c737 vlc-0.8.5-r5.ebuild 7479
 SHA256 9a7e6659a999ac2749b9222d58ed8816ab7f0bae848a588f618837ed927f0761 vlc-0.8.5-r5.ebuild 7479
-EBUILD vlc-0.8.6-r1.ebuild 8193 RMD160 f7c183ecdec38cd895500dcf38b4453fecf3232f SHA1 bbe68b67c7c2f6dde73a21ef4f437fe254996504 SHA256 f805d79ca185ed47fc8eabeb98aaa083eb8886c5f49be567f78fbc8f84910706
-MD5 904716adcb17ac7b2f0747364a01e227 vlc-0.8.6-r1.ebuild 8193
-RMD160 f7c183ecdec38cd895500dcf38b4453fecf3232f vlc-0.8.6-r1.ebuild 8193
-SHA256 f805d79ca185ed47fc8eabeb98aaa083eb8886c5f49be567f78fbc8f84910706 vlc-0.8.6-r1.ebuild 8193
+EBUILD vlc-0.8.6-r1.ebuild 8092 RMD160 9ec815652a1c18164b2b7003527c1274f57d168c SHA1 ede18e7453f2d51571be12078f9fed814fd64be1 SHA256 f1ef81adb5c44d30427b9fca73506be2f93b236df479a1fef31640324600d01a
+MD5 d773effcf00f972beaf4281f53ddd374 vlc-0.8.6-r1.ebuild 8092
+RMD160 9ec815652a1c18164b2b7003527c1274f57d168c vlc-0.8.6-r1.ebuild 8092
+SHA256 f1ef81adb5c44d30427b9fca73506be2f93b236df479a1fef31640324600d01a vlc-0.8.6-r1.ebuild 8092
 EBUILD vlc-0.8.6.ebuild 8190 RMD160 98a81e11dc0df7e913c64b3c032143cb07861547 SHA1 bd0549cc843a1304250e6900290595b210108c6c SHA256 ed9b24ea048fe27768948aa1c8c121ae944c0c962f5bbec95e789aa6b16e21f7
 MD5 078b11431b7c0ce0a036f5f948761091 vlc-0.8.6.ebuild 8190
 RMD160 98a81e11dc0df7e913c64b3c032143cb07861547 vlc-0.8.6.ebuild 8190
 SHA256 ed9b24ea048fe27768948aa1c8c121ae944c0c962f5bbec95e789aa6b16e21f7 vlc-0.8.6.ebuild 8190
-MISC ChangeLog 37828 RMD160 34d0c4166ad1633927318fcf637ac19073122e0d SHA1 81300981a8463b6e8d4d9663e28e101735833957 SHA256 c3cbfcd2b8f37fbe9a6db15d02535c7f1ee61ad530ffe379363a9722a6efc202
-MD5 3d23eb0a26e49001c2180572c3bb4b32 ChangeLog 37828
-RMD160 34d0c4166ad1633927318fcf637ac19073122e0d ChangeLog 37828
-SHA256 c3cbfcd2b8f37fbe9a6db15d02535c7f1ee61ad530ffe379363a9722a6efc202 ChangeLog 37828
+MISC ChangeLog 37976 RMD160 9bc8d1d9c1e4c010b5273f194e61c7fef81ed0e8 SHA1 4400ee5af760bb075853bbb01f35821418e3eabd SHA256 fec22e9783d77ff0d8cd691980c1917f02ae40bf3a94d1b106091d74b2702327
+MD5 b888051cd3d116b522bacaecd187067f ChangeLog 37976
+RMD160 9bc8d1d9c1e4c010b5273f194e61c7fef81ed0e8 ChangeLog 37976
+SHA256 fec22e9783d77ff0d8cd691980c1917f02ae40bf3a94d1b106091d74b2702327 ChangeLog 37976
 MISC metadata.xml 158 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 SHA1 9ac37da489ebe6e58e32fe8e037b1ef2d99c6638 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
@@ -55,7 +55,7 @@ SHA256 46e3bae591b10b274bd7453a4d44edecc31286f0429609bcc134ddb03e8f9965 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFm9WXAiZjviIA2XgRAqLeAKDfTCZEGxGNE2XUoFMbwWJz0Za8eACcDDJj
-+tW14z87VJHpLh7Gpy0ovXM=
-=yxvN
+iD8DBQFFnPR4AiZjviIA2XgRAt1PAJ9NI6k75AZ5igF2UCIj5r1DtNvxyACfXbK5
+8/yXF1seYxBxVjmF91318rI=
+=yC+E
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.8.6-r1.ebuild b/media-video/vlc/vlc-0.8.6-r1.ebuild
index fec987b68ce8..e2608c188f46 100644
--- a/media-video/vlc/vlc-0.8.6-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.1 2007/01/03 16:10:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.2 2007/01/04 12:34:51 flameeyes Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -144,9 +144,6 @@ src_compile () {
 	local XPIDL=""
 	local MOZILLA_CONFIG=""
 
-	use wxwindows && \
-		myconf="${myconf} --with-wx-config=$(basename ${WX_CONFIG}) --with-wx-config-path=$(dirname ${WX_CONFIG})"
-
 	use vlm && \
 		myconf="${myconf} --enable-vlm --enable-sout" || \
 		myconf="${myconf} --disable-vlm"
@@ -246,6 +243,7 @@ src_compile () {
 		--enable-libtool \
 		$(use_enable nsplugin mozilla) \
 		XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
+		WX_CONFIG="${WX_CONFIG}" \
 		${myconf} || die "configuration failed"
 
 	if [[ $(gcc-major-version) == 2 ]]; then