Increase the minimum dependency of xulrunner to 1.9, remove configure option for...

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index f663c717683edbfc905cc5938b4d449b7e328799..4997810234564aac073d5abeb0d7a38824b2eaf0 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.598 2010/06/25 09:18:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.599 2010/06/26 09:22:11 nirbheek Exp $
+
+  26 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org> vlc-1.0.6.ebuild:
+  Increase the minimum dependency of xulrunner to 1.9, remove configure
+  option for 1.8, bug 324953
 
   25 Jun 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.1.0.ebuild,
   vlc-1.1.9999.ebuild, vlc-9999.ebuild:

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 270a2582a7a4e600ee7b1ce82131729e38782f84..e58310fbb491ce126bf0c2c4f5adb99ff012b7cf 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST vlc-1.0.6.tar.bz2 22149704 RMD160 2185eb418748f2aadfce5e61b7a9de66a62ef2d1 SHA1 834346a84a71d915440b7741e04b6e02de451786 SHA256 f521933e7a1021746d8ecde6caa2f9d1b43187ab2e13df6abc07540e415e1842
 DIST vlc-1.1.0.tar.bz2 23908512 RMD160 55d9d64ebeda9dcdcec488f17a1aefc4a64b4b16 SHA1 b3545548d9d99942f7a463d2758dcbc7ad250b05 SHA256 a9fb2c5cc400464bbb53ba6feb94f14884f3c76d52eac1ee4c2953a1ce63f1c8
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506 SHA1 91bcd66f3b393202153595e8c44926cc051d7451 SHA256 c3c2b7841bde69762feed36758d95ccd5cc0ee390310cfad91bbfa3bca72b1e3
 DIST vlc-patches-85.tar.bz2 3361 RMD160 59cee85e2f6ad560cd3102b83ab7e0a6ad990164 SHA1 0171ebafd334d71cd0b6d8ffc2fa974c91d1ff9f SHA256 ecc34d936d8f2a32b45e2a70480b551e46aaadb5e9a37e3e0423bb2a668c7fd8
-EBUILD vlc-1.0.6.ebuild 12316 RMD160 f9e95b57ca80417f744808f47d92f92c4a1f8027 SHA1 ad8ba73ec351c0623a91b28bd27aad44893a5d99 SHA256 a5c00bd42a93d39eb356b43f6e9ba660db0138690bd19b302041514507b8c62c
+EBUILD vlc-1.0.6.ebuild 12224 RMD160 5a6b842122fb912a688c23e23dd8aaff77d1532c SHA1 2dd9d563450ae53fd833fc4d6de9ddda288d41ec SHA256 a451ef21f95174ee1bbd78526c233d7c414efe64e66dca5b487089921d6f3055
 EBUILD vlc-1.1.0.ebuild 12011 RMD160 2144404dd71954d727dc117e20f88e8b1b060352 SHA1 21965a8fe2dfa62edff58d1a9f8880a345ef4691 SHA256 c0a248edac757cc39eade0661127e015554e44062e8e76325db67258f08160ae
 EBUILD vlc-1.1.9999.ebuild 11994 RMD160 f5fcf8be7508b982f5ea97e7f2542d44993c2d2e SHA1 f6c1e0d73715bdac81a2013dd60ddecc49340daa SHA256 b56184683427d6a32bfcfcf960971e7dc2a02ef125e0d57aed2ab3382756ecfb
 EBUILD vlc-9999.ebuild 11990 RMD160 98c6a7155040f1f597793d0aac039ab616ea71c2 SHA1 d29be8860dcc8efecbda21410df6f078d4183806 SHA256 f76639d1f1dcc73e8628ff52593573c11c220ca7567b3300c50845571c48fa49
-MISC ChangeLog 92660 RMD160 dc7b123bfd108f192ae98acea3d7ba0aba06c8b7 SHA1 3c8ee98f49d3a4c8255ec566728a4c397f0fbda4 SHA256 49745c00e16ef0c11f21c573c5087b9b743f3f1a9a1e05ccc581459acd851e5f
+MISC ChangeLog 92834 RMD160 e4ec818825c0a49fdfbe86250c9b4a67f213c0a1 SHA1 6d1f030019e8b8407087077adbd6626ebc420894 SHA256 5320ecefe6e69bbc2684e33bb89c44031bc8462a7f7b36729959b873c51109e0
 MISC metadata.xml 4410 RMD160 a45aa6995938c863a9f9c351471392fd91d88119 SHA1 36bb27e88806dea7926b3965fb14afcdbfe5653c SHA256 7e240147c0cffdb48ac2736144e6064396c765d1627ff22c1d4fac6f2b6473a4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwkk3EACgkQvFcC4BYPU0oO5QCfasadLe6+9DTMes9rGMjvNKhu
-94oAoINxiv3QWKMkLG8GNi4pxJJPQibp
-=LpGI
------END PGP SIGNATURE-----

diff --git a/media-video/vlc/vlc-1.0.6.ebuild b/media-video/vlc/vlc-1.0.6.ebuild
index 21e5e9c2155f706369b0bddfed5592013e239814..c37e2ff27522978a2e6d33b1c71126daf4b5aec4 100644 (file)
--- a/media-video/vlc/vlc-1.0.6.ebuild
+++ b/media-video/vlc/vlc-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild,v 1.9 2010/05/19 07:32:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild,v 1.10 2010/06/26 09:22:11 nirbheek Exp $
 
 EAPI="2"
 
@@ -111,7 +111,7 @@ RDEPEND="
                mtp? ( >=media-libs/libmtp-0.3.0 )
                musepack? ( >=media-sound/musepack-tools-444 )
                ncurses? ( sys-libs/ncurses )
-               nsplugin? ( >=net-libs/xulrunner-1.8 x11-libs/libXpm x11-libs/libXt )
+               nsplugin? ( >=net-libs/xulrunner-1.9 x11-libs/libXpm x11-libs/libXt )
                ogg? ( media-libs/libogg )
                pda? ( x11-libs/gtk+:2 )
                png? ( media-libs/libpng )
@@ -247,11 +247,7 @@ src_configure() {
        local MOZILLA_PC
 
        if use nsplugin; then
-               if has_version 'net-libs/xulrunner:1.9' ; then
-                       MOZILLA_PC=libxul
-               else
-                       MOZILLA_PC=xulrunner-plugin
-               fi
+               MOZILLA_PC=libxul
        fi
 
        econf \