Re-fixed bug #77153.

Package-Manager: portage-2.0.51.22-r3

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 30631e0ed5c57a20bc987ba957d851fdc08171b8..f77925f4a616e0c3b54a1de4c9cb0c79fa2e80e3 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.119 2005/11/27 21:43:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.120 2005/11/28 01:57:51 chriswhite Exp $
+
+  28 Nov 2005; Chris White <chriswhite@gentoo.org> vlc-0.8.1-r1.ebuild:
+  Re-fixed bug #77153.
 
 *vlc-0.8.4-r1 (27 Nov 2005)
 

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 9017f5dda5c5619100e9b455820e67b8e00a2829..ad9516bd072b8d3e08394f8c2a2c6aa9fb5d3b02 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e7bbb8559b7daabed46df76df7a8ddf4 ChangeLog 24220
-MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
-MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r1 127
-MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r2 127
-MD5 d84791584b167d4cf96f365498050a62 files/digest-vlc-0.8.4 127
-MD5 e7f91e71a2b7c89a96d477ac21852415 files/digest-vlc-0.8.4-r1 127
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 985ef1204c12d8382a06256f63dc4a4e vlc-0.8.1-r1.ebuild 6675
 MD5 34c899e9870f05ff49336006f2a0ab92 vlc-0.8.2-r1.ebuild 7576
 MD5 06b1c25d0b8b20d67db5a61f4c8078f5 vlc-0.8.2-r2.ebuild 7458
-MD5 53d31638607ad4bdb22ccefb6ffd21a1 vlc-0.8.4-r1.ebuild 6923
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 2645273efbef9b24561d36e1cad85ac5 ChangeLog 24317
 MD5 c7260ce34328b0bb07e6c71813959374 vlc-0.8.4.ebuild 7045
+MD5 53d31638607ad4bdb22ccefb6ffd21a1 vlc-0.8.4-r1.ebuild 6923
+MD5 b591b42c362967ecb4666f426314c737 vlc-0.8.1-r1.ebuild 6701
+MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r1 127
+MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
+MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r2 127
+MD5 e7f91e71a2b7c89a96d477ac21852415 files/digest-vlc-0.8.4-r1 127
+MD5 d84791584b167d4cf96f365498050a62 files/digest-vlc-0.8.4 127
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDiiiSAiZjviIA2XgRAhfyAJ9dN5pfdEHx1QjO8PehijRGJUAXcACdFJpd
-U17G1tW0CNLLjBAPFubtrek=
-=gNw2
+iD8DBQFDitrDFdQwWVoAgN4RAkl0AKC7HgCkaUXFIpGLgHLhMBIhkn7EYQCg8YCx
+/i6aERQeMPbe4H4NTgIRKBc=
+=YNwS
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/vlc-0.8.1-r1.ebuild b/media-video/vlc/vlc-0.8.1-r1.ebuild
index 6332166c00584d799fe0d4fccc6ddc1ceaf7a3d3..bf52b4b7909d2bb2bdb4152c3a9829cfb564ddbd 100644 (file)
--- a/media-video/vlc/vlc-0.8.1-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.1-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-video/vlc/vlc-0.8.1-r1.ebuild,v 1.21 2005/11/24 17:36:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r1.ebuild,v 1.22 2005/11/28 01:57:51 chriswhite Exp $
 
 inherit libtool toolchain-funcs eutils wxwidgets
 
@@ -179,11 +179,10 @@ src_compile () {
                sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
        fi
 
-       # reason why:
-       # looks for xpidl in /usr/lib/mozilla/xpidl
-       # and doesn't find it there because it's
-       # in /usr/bin! - ChrisWhite
-       if use nsplugin; then
+       # upstream fixed the previously lacking logic
+       # check for /usr/bin/xpidl and sed, otherwise
+       # assume the default. - ChrisWhite
+       if use nsplugin && [ -e /usr/bin/xpidl ] ; then
                sed -e "s:^XPIDL = .*:XPIDL = /usr/bin/xpidl:" -i mozilla/Makefile \
                || die "could not fix XPIDL path"
        fi