Hopefully fixed the nsplugin building (bug #156067) this time.

Package-Manager: portage-2.1.2_rc2-r3

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 18115503c41b60352face7cc247eedc92e7b1c51..3d16477f6ed24ee3f9e84670d241a2e7820047f5 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.195 2006/12/01 02:40:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.196 2006/12/01 13:16:06 caster Exp $
+
+  01 Dec 2006; Vlastimil Babka <caster@gentoo.org> vlc-0.8.6_rc1.ebuild:
+  Hopefully fixed the nsplugin building (bug #156067) this time.
 
 *vlc-0.8.6_rc1 (01 Dec 2006)
 

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index ee13f4a82053dca26d4bcfa27547f2fe7d34272b..a010cfc2dd09807e4dd41343f51de90d501510e0 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST vlc-0.8.4a.tar.bz2 7191539 RMD160 50ea307c1aa70d7189a8c7cd09bf5e1d60e4856b SHA1 043462db25e6eeb7f648c600d2dbca1524056580 SHA256 003b6bb71255af006ac3a36ff0184e0cb9d5e08589b2d500f73b3c8052d6adf9
 DIST vlc-0.8.5.tar.bz2 8562996 RMD160 d24140a5b4bf771754028090e103bb5c171e4fd8 SHA1 2f0a26a336a5211f32c7bcc653dfd0b27f1fb26b SHA256 48bc557bec16b48a304e5e760aef10e1c3cca2d74a011bc900bd1768d9ee79fa
 DIST vlc-0.8.6-rc1.tar.bz2 10499652 RMD160 624dc44acdff2033e53d45aa27bb674c971891e3 SHA1 2220648e74f012526e0317b02dc512661ba6c31a SHA256 0d6678dfd99a00bee40b3965ff436bec380bbd5b1dc85b46fbc8a1728b63e7d9
@@ -26,14 +23,14 @@ EBUILD vlc-0.8.6_beta2.ebuild 7820 RMD160 cdd50208e57a5d84da9372f20f5f235dbca622
 MD5 f5c285d2e8d551d31d022624f0eeb3ad vlc-0.8.6_beta2.ebuild 7820
 RMD160 cdd50208e57a5d84da9372f20f5f235dbca62217 vlc-0.8.6_beta2.ebuild 7820
 SHA256 a19dcec045d2280aa47227731b6cd5c301fdd9a358711e63ad0252d073d88de4 vlc-0.8.6_beta2.ebuild 7820
-EBUILD vlc-0.8.6_rc1.ebuild 7982 RMD160 29e4301a033fbcf448bd7276de0bae30abd18198 SHA1 ac3300b70083114624c6d71356dbfa9a2c6ebda4 SHA256 9785c4397d8dbeef282f079a708046d61de414e9271b37d5132d05b681f01f93
-MD5 5516fd674a84fa980b2dc58caa3493cc vlc-0.8.6_rc1.ebuild 7982
-RMD160 29e4301a033fbcf448bd7276de0bae30abd18198 vlc-0.8.6_rc1.ebuild 7982
-SHA256 9785c4397d8dbeef282f079a708046d61de414e9271b37d5132d05b681f01f93 vlc-0.8.6_rc1.ebuild 7982
-MISC ChangeLog 36672 RMD160 e75a7d2445030cf649391c043ea44e8f2a1e129f SHA1 07d4eaba1f4863ab65ee08cab9320dd0c4259be9 SHA256 1837e143675a3c86f22b2e31330c095145d172533a1b4c8d3cadb813bc1fe611
-MD5 9a61c2840d0964866aec2a735dadabcb ChangeLog 36672
-RMD160 e75a7d2445030cf649391c043ea44e8f2a1e129f ChangeLog 36672
-SHA256 1837e143675a3c86f22b2e31330c095145d172533a1b4c8d3cadb813bc1fe611 ChangeLog 36672
+EBUILD vlc-0.8.6_rc1.ebuild 8046 RMD160 95ad50a3f3481c16532954e3e1cce05266fab176 SHA1 cbfa55282ce101fcc443ab7f2605218d7261991a SHA256 7444473ea2ff1ad997d0f4e15f0b743423bdc6bea91ceb539358d6b6dc500fdf
+MD5 7a37b3c292f0556427ca5cb70d0e8581 vlc-0.8.6_rc1.ebuild 8046
+RMD160 95ad50a3f3481c16532954e3e1cce05266fab176 vlc-0.8.6_rc1.ebuild 8046
+SHA256 7444473ea2ff1ad997d0f4e15f0b743423bdc6bea91ceb539358d6b6dc500fdf vlc-0.8.6_rc1.ebuild 8046
+MISC ChangeLog 36808 RMD160 78c0b58b885e9171cc4a287af257cb5b1fd043cd SHA1 98eacee8c64088bb02408bda6335de706e048149 SHA256 0052526634537a091d4cc4cc2d5d473884287ebee5665fd91f0e4ba58e57c0eb
+MD5 3e3256ad94f8069871a840de79caa767 ChangeLog 36808
+RMD160 78c0b58b885e9171cc4a287af257cb5b1fd043cd ChangeLog 36808
+SHA256 0052526634537a091d4cc4cc2d5d473884287ebee5665fd91f0e4ba58e57c0eb ChangeLog 36808
 MISC metadata.xml 158 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 SHA1 9ac37da489ebe6e58e32fe8e037b1ef2d99c6638 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
@@ -53,10 +50,3 @@ SHA256 8ee2b8cad31d5d39f1db30c2e54c506eb983c2963a4cd137f39ef4812417dc0f files/di
 MD5 b5cbe221456a451b9bfbfef3b74db4aa files/digest-vlc-0.8.6_rc1 491
 RMD160 e6a6c774da90365961c3faddcc53b387f99adfb2 files/digest-vlc-0.8.6_rc1 491
 SHA256 a5db2da297832f85b7163811a85914406916556b0c3eb73c99ea6e782bd108cb files/digest-vlc-0.8.6_rc1 491
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFb5YjAiZjviIA2XgRAhRuAKCclxSEF3Va+iepDGstV/QjlFCWXwCcCKwS
-Byy800zDX/ZjQ9VEC9OtekQ=
-=ihhx
------END PGP SIGNATURE-----

diff --git a/media-video/vlc/vlc-0.8.6_rc1.ebuild b/media-video/vlc/vlc-0.8.6_rc1.ebuild
index 153f0964de22bf123e1fd5e659fd2124f766b794..ebb7a2a72fc5be5e88fa0dfe60d387eade2502f0 100644 (file)
--- a/media-video/vlc/vlc-0.8.6_rc1.ebuild
+++ b/media-video/vlc/vlc-0.8.6_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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_rc1.ebuild,v 1.1 2006/12/01 02:40:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6_rc1.ebuild,v 1.2 2006/12/01 13:16:06 caster Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -238,6 +238,7 @@ src_compile () {
                --disable-x264 \
                --enable-utf8 \
                --enable-libtool \
+               $(use_enable nsplugin mozilla) \
                XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
                ${myconf} || die "configuration failed"
 
@@ -255,12 +256,14 @@ src_install() {
        dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \
                doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
 
-       dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
-       mv "${D}"/usr/$(get_libdir)/mozilla/{components,plugins}/* \
-               "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
+       if use nsplugin; then
+               dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+               mv "${D}"/usr/$(get_libdir)/mozilla/{components,plugins}/* \
+                       "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
 
-       rm -rf "${D}/usr/share/doc/vlc" \
-               "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
+               rm -rf "${D}/usr/share/doc/vlc" \
+                       "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
+       fi
 
        use skins || rm -rf "${D}/usr/share/vlc/skins2"