Make firefox default; add seamonkey use flag

Package-Manager: portage-2.1.2.5

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index ca19b15bfb37833a8d75ab939ea5870220469f80..a34be65b846bdfff78f832557caf0e04ac92a69b 100644 (file)
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/totem
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.158 2007/04/18 18:49:01 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.159 2007/05/02 15:01:01 dang Exp $
+
+*totem-2.18.1-r1 (02 May 2007)
+
+  02 May 2007; Daniel Gryniewicz <dang@gentoo.org> -totem-2.18.0.ebuild,
+  +totem-2.18.1-r1.ebuild:
+  Bump to 2.18.1-r1
+       - Re-arrange gecko deps so that firefox is the default, and xulrunner and
+         seamonkey have USE flags.  This is for 2 reasons:  First, sparc needs a
+         seamonkey flag, so it can mask it; second, this brings totem in line with
+         other gnome packages like epiphany.
 
   18 Apr 2007; Saleem Abdulrasool <compnerd@gentoo.org> totem-2.18.1.ebuild:
   Add inputproto to DEPEND (bug #175128)

diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index d1ab1a2d2bc7fda958e91588d2c8261231109ef6..0c8322af3ce76b6f7dbdb38986d323d6cfb2d76c 100644 (file)
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 01_build_mozilla_plugin_with_firefox_xpcom.patch 1994 RMD160 a77cbdf94118eea56a9fdec60470d816da621b50 SHA1 a637293d27af9c3a1c7044aa15813b1637c1e269 SHA256 d198c31c00563798468abfa7d6de8329d208bb71c830599176ba355649a9c24b
 MD5 6c254a486d447e680d77048262dfe78d files/01_build_mozilla_plugin_with_firefox_xpcom.patch 1994
 RMD160 a77cbdf94118eea56a9fdec60470d816da621b50 files/01_build_mozilla_plugin_with_firefox_xpcom.patch 1994
@@ -34,7 +37,6 @@ DIST totem-1.2.1.tar.bz2 1411347 RMD160 7d7e69003cd73e060c3e0f9f8b25e23ac484db63
 DIST totem-1.4.2.tar.bz2 1707854 RMD160 87d844ac490adf6210f47a652e17b6fb17c10d3f SHA1 0d19052858ddf981b98de3143bf5ccd60bbee1e4 SHA256 31141a6c55f3252ea01742aecba4c01cb438d7fc93d71a18b53bf06f2e65c03b
 DIST totem-2.16.4.tar.bz2 1820381 RMD160 e3329834482b9efd2ba049191919be93f6b1071f SHA1 9e586eac620b2792a1e7fc5461ff2edf8f6f0312 SHA256 b459e1c01c124f6876b3a00b32f9272571e86395f4a6ee3b3ff8d60aac5d4848
 DIST totem-2.16.5.tar.bz2 1820880 RMD160 1a93768600860dc1dec7782039cfd27c45577bef SHA1 9f5d646207bff371744d63f376d891bad5da85af SHA256 7dab6a72cbf9d242a8eb13e4fce70aa3e730f7f74dad84181034022edfbb37df
-DIST totem-2.18.0.tar.bz2 2050182 RMD160 2b8cf5583ac31f88c3eb5cccb414b5b1561ed93f SHA1 28b2a41fa97e367659215e3d76ca3abfa7ea93ca SHA256 5f5228c64865b3caf928caada2eca8868abc04d939ac0f03a1069f7815584fca
 DIST totem-2.18.1.tar.bz2 2074935 RMD160 bf648b1306d4eb6cfbe7403e4bd2b5c43b058392 SHA1 64e174d0ef3f6857ed29e9e0dfd64a16125436f3 SHA256 205b4f4c318d29fdb21d5bfc2416038d55c79f1bbccd85ef4333f5963b38e7be
 EBUILD totem-1.2.1-r1.ebuild 3333 RMD160 0a3ee2f8457f527bb177117942d5dbcb4bf9c0fc SHA1 caac3fa22f1b02bc9e45701fedf6c821f24d4107 SHA256 fd92ecb10ae3ff36747f64c24720d87b66fdf25443651122cb372c175d803f13
 MD5 57bb436948fc3aa3af54b6ca4549b497 totem-1.2.1-r1.ebuild 3333
@@ -52,18 +54,18 @@ EBUILD totem-2.16.5.ebuild 4603 RMD160 632890c61f330bd912156b00b59ec1ace539445e
 MD5 bb8f6d74ce3a6d8581c6ed1481e8d896 totem-2.16.5.ebuild 4603
 RMD160 632890c61f330bd912156b00b59ec1ace539445e totem-2.16.5.ebuild 4603
 SHA256 bf9498964171fe31beeda7db9d5a5164c7afb1b0b45b6c0a9ba70385e92d776b totem-2.16.5.ebuild 4603
-EBUILD totem-2.18.0.ebuild 4382 RMD160 2f3b8c8960a718edef4646be8201567579b45852 SHA1 4e31473edf83a91c1dfe5f13c5d2808240bfcc55 SHA256 c9ea39e79595ea13fa25055f65126ca8f55e0fcb4716dee671522aa92b2742c6
-MD5 c4de0802e3a4a7cd74672778b33b2e23 totem-2.18.0.ebuild 4382
-RMD160 2f3b8c8960a718edef4646be8201567579b45852 totem-2.18.0.ebuild 4382
-SHA256 c9ea39e79595ea13fa25055f65126ca8f55e0fcb4716dee671522aa92b2742c6 totem-2.18.0.ebuild 4382
+EBUILD totem-2.18.1-r1.ebuild 4383 RMD160 f45bbeabf014bce56cedc09f5c5533744b2d2a93 SHA1 00e72e3f2b66cb5868bab89b1856a88a6c952a96 SHA256 62c0a5136b89a321ac6d706488a2bb88b57b21fcde2df7c0e841bb38ada9100e
+MD5 954d5bf824113e99ebdb5da847a065d9 totem-2.18.1-r1.ebuild 4383
+RMD160 f45bbeabf014bce56cedc09f5c5533744b2d2a93 totem-2.18.1-r1.ebuild 4383
+SHA256 62c0a5136b89a321ac6d706488a2bb88b57b21fcde2df7c0e841bb38ada9100e totem-2.18.1-r1.ebuild 4383
 EBUILD totem-2.18.1.ebuild 4398 RMD160 a70c0121352a8784dccbad453a0b7a7df3327e92 SHA1 f8b6a324cf8de7b761737b8308fe1b431d1b2c9f SHA256 852d602880c347ef8da7c62715f80dca34e9a9f9abe66f919026680dd6ce708f
 MD5 dfe98269a7645e40df5c34b3cc751555 totem-2.18.1.ebuild 4398
 RMD160 a70c0121352a8784dccbad453a0b7a7df3327e92 totem-2.18.1.ebuild 4398
 SHA256 852d602880c347ef8da7c62715f80dca34e9a9f9abe66f919026680dd6ce708f totem-2.18.1.ebuild 4398
-MISC ChangeLog 22015 RMD160 37bcb2c76f2cce0424b3fe53b2686d2f8a276c5f SHA1 5440da0e4c3f103dea81b4da24960481a805a9df SHA256 c70862f4a347e425a7a2561f7d7fddc1590bf55abd1715645320d1a0f84d417b
-MD5 07f52c9a5405d9ae8627c3cb218aec02 ChangeLog 22015
-RMD160 37bcb2c76f2cce0424b3fe53b2686d2f8a276c5f ChangeLog 22015
-SHA256 c70862f4a347e425a7a2561f7d7fddc1590bf55abd1715645320d1a0f84d417b ChangeLog 22015
+MISC ChangeLog 22438 RMD160 a3019c93b49d7e5cb685a467dd415e875331c422 SHA1 8967c00c4179064c6ab7defb2340fea9524e9d32 SHA256 c2e0bed59be9a45b38c349076d863ab8ad30ad3d0f01da30cce52b36f0a83802
+MD5 37c28cb16f61e80b4212e2bca0dfc9d5 ChangeLog 22438
+RMD160 a3019c93b49d7e5cb685a467dd415e875331c422 ChangeLog 22438
+SHA256 c2e0bed59be9a45b38c349076d863ab8ad30ad3d0f01da30cce52b36f0a83802 ChangeLog 22438
 MISC metadata.xml 521 RMD160 d715631cdb935e3f1cfc70e88d8dfbd10ae3159c SHA1 cbf35cd1be8178679cc8dc62463fedb4a11042f9 SHA256 67adda7ef1db1c932df3f4a03186d86119e9c26c96f2c17d554150dc133f6197
 MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521
 RMD160 d715631cdb935e3f1cfc70e88d8dfbd10ae3159c metadata.xml 521
@@ -80,9 +82,16 @@ SHA256 dcd58ed98b6426d5ac56544ee86805d2ac21515edf4c7b6c14a1e00f1b921dc6 files/di
 MD5 d0760d5645ad29a473fb12e8aa7d888d files/digest-totem-2.16.5 244
 RMD160 261b5430e3d754952a5bdc68b566f8b2fa2078fa files/digest-totem-2.16.5 244
 SHA256 46a23f411a2192670f130b321c3447e460439306c7d70339badfdfad426de7c1 files/digest-totem-2.16.5 244
-MD5 b1367f5dbd5faf5a80d29898cea44472 files/digest-totem-2.18.0 244
-RMD160 7d741e640cfb9885362990f4555f15d51f7723f7 files/digest-totem-2.18.0 244
-SHA256 1d28e0cbdf0f7019f998ad9205b3da055c98a9f7d23e6280921c0f6fbccd1d6b files/digest-totem-2.18.0 244
 MD5 56dae3e182a06eda20367d16ba9c4da8 files/digest-totem-2.18.1 244
 RMD160 3b94341ca15922b7c0859fc3bd56d9ed5289111e files/digest-totem-2.18.1 244
 SHA256 e7ff4ab52f9f9d33cfaaf94dc238b6869e2f6cf1e679807b0c020295d67c38ef files/digest-totem-2.18.1 244
+MD5 56dae3e182a06eda20367d16ba9c4da8 files/digest-totem-2.18.1-r1 244
+RMD160 3b94341ca15922b7c0859fc3bd56d9ed5289111e files/digest-totem-2.18.1-r1 244
+SHA256 e7ff4ab52f9f9d33cfaaf94dc238b6869e2f6cf1e679807b0c020295d67c38ef files/digest-totem-2.18.1-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGOKfJomPajV0RnrERAvxhAJ0ZzI/cLuaz2Ld/O7yQzrnmarCRXACdHHJ1
+ZWAF3VKwDIK+PhR9CXEjkJ0=
+=WJc1
+-----END PGP SIGNATURE-----

diff --git a/media-video/totem/files/digest-totem-2.18.0 b/media-video/totem/files/digest-totem-2.18.0
deleted file mode 100644 (file)
index f8fa7c8..0000000
--- a/media-video/totem/files/digest-totem-2.18.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1a3bfeaac6297b259967f5d79896b0e7 totem-2.18.0.tar.bz2 2050182
-RMD160 2b8cf5583ac31f88c3eb5cccb414b5b1561ed93f totem-2.18.0.tar.bz2 2050182
-SHA256 5f5228c64865b3caf928caada2eca8868abc04d939ac0f03a1069f7815584fca totem-2.18.0.tar.bz2 2050182

diff --git a/media-video/totem/files/digest-totem-2.18.1-r1 b/media-video/totem/files/digest-totem-2.18.1-r1
new file mode 100644 (file)
index 0000000..a690f5d
--- /dev/null
+++ b/media-video/totem/files/digest-totem-2.18.1-r1
@@ -0,0 +1,3 @@
+MD5 c8faa37112cfd2edfebdd1df88519f36 totem-2.18.1.tar.bz2 2074935
+RMD160 bf648b1306d4eb6cfbe7403e4bd2b5c43b058392 totem-2.18.1.tar.bz2 2074935
+SHA256 205b4f4c318d29fdb21d5bfc2416038d55c79f1bbccd85ef4333f5963b38e7be totem-2.18.1.tar.bz2 2074935

diff --git a/media-video/totem/totem-2.18.0.ebuild b/media-video/totem/totem-2.18.1-r1.ebuild
similarity index 86%
rename from media-video/totem/totem-2.18.0.ebuild
rename to media-video/totem/totem-2.18.1-r1.ebuild
index 66e6906d622f7e583a79bd7d0c75f4212d3b00f1..02b80ea501e110247d5ca5c40c178cef928f8aca 100644 (file)
--- a/media-video/totem/totem-2.18.0.ebuild
+++ b/media-video/totem/totem-2.18.1-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/totem/totem-2.18.0.ebuild,v 1.1 2007/03/27 22:07:07 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.18.1-r1.ebuild,v 1.1 2007/05/02 15:01:01 dang Exp $
 
 inherit autotools eutils gnome2 multilib
 
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 # No 0.10.0 release for gst-plugins-pitdfdll yet
 # IUSE="win32codecs"
 
-IUSE="a52 debug dvd ffmpeg firefox flac gnome hal lirc mad mpeg nsplugin nvtv ogg theora vorbis xulrunner xv"
+IUSE="a52 debug dvd ffmpeg flac gnome hal lirc mad mpeg nsplugin nvtv ogg seamonkey theora vorbis xulrunner xv"
 
 RDEPEND=">=dev-libs/glib-2.12
         >=x11-libs/gtk+-2.10
@@ -51,10 +51,10 @@ RDEPEND=">=dev-libs/glib-2.12
         hal? ( =sys-apps/hal-0.5* )
         lirc? ( app-misc/lirc )
         nsplugin?      (
-                                firefox? ( www-client/mozilla-firefox )
-                               !firefox?       (
-                                                               xulrunner? ( net-libs/xulrunner )
-                                                               !xulrunner? ( www-client/seamonkey )
+                               xulrunner? ( net-libs/xulrunner )
+                               !xulrunner?     (
+                                                               seamonkey? ( www-client/seamonkey )
+                                                               !seamonkey? ( www-client/mozilla-firefox )
                                                        )
                                >=x11-misc/shared-mime-info-0.17
                                >=x11-libs/startup-notification-0.8
@@ -89,6 +89,7 @@ RDEPEND=">=dev-libs/glib-2.12
 
 DEPEND="${RDEPEND}
          x11-proto/xproto
+         x11-proto/inputproto
          app-text/scrollkeeper
          gnome-base/gnome-common
        >=dev-util/intltool-0.35
@@ -117,14 +118,13 @@ pkg_setup() {
 
        if use nsplugin ; then
            G2CONF="${G2CONF} --enable-browser-plugins"
-
-           if use firefox || use sparc ; then
-               G2CONF="${G2CONF} --with-gecko=firefox"
-               elif use xulrunner || use sparc; then
-               G2CONF="${G2CONF} --with-gecko=xulrunner"
+               if use xulrunner ; then
+                       G2CONF="${G2CONF} --with-gecko=xulrunner"
+               elif use seamonkey ; then
+                       G2CONF="${G2CONF} --with-gecko=seamonkey"
                else
-               G2CONF="${G2CONF} --with-gecko=seamonkey"
-           fi
+                       G2CONF="${G2CONF} --with-gecko=firefox"
+               fi
        else
            G2CONF="${G2CONF} --disable-browser-plugins"
        fi
@@ -140,7 +140,7 @@ src_unpack() {
        gnome2_src_unpack
 
        if use nsplugin ; then
-               epatch ${FILESDIR}/${PN}-2.17.5-browser-plugins.patch
+               epatch ${FILESDIR}/${P}-browser-plugins.patch
                eautoreconf
        fi
 }