Remove seamonkey support as per upstream, bug #130969. Force building

against firefox 2.0 in the meantime.
Package-Manager: portage-2.1.2_rc4-r4

diff --git a/x11-libs/wxmozilla/ChangeLog b/x11-libs/wxmozilla/ChangeLog
index 77eb490ae800151013adc04aef51d1696bca6496..240cd6bf6af8b8ea2330a7e041624812674a24de 100644 (file)
--- a/x11-libs/wxmozilla/ChangeLog
+++ b/x11-libs/wxmozilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/wxmozilla
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxmozilla/ChangeLog,v 1.10 2007/01/02 09:01:35 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxmozilla/ChangeLog,v 1.11 2007/01/02 21:47:53 dirtyepic Exp $
+
+  02 Jan 2007; Ryan Hill <dirtyepic@gentoo.org>
+  wxmozilla-0.5.7_pre20070102.ebuild:
+  Remove seamonkey support as per upstream, bug #130969. Force building
+  against firefox 2.0 in the meantime.
 
 *wxmozilla-0.5.7_pre20070102 (02 Jan 2007)
 

diff --git a/x11-libs/wxmozilla/Manifest b/x11-libs/wxmozilla/Manifest
index 29275ba87cc3c34bda2f4edfc7334dd791bbb34b..e733d01609324338cf5d05029bc93861bce6968b 100644 (file)
--- a/x11-libs/wxmozilla/Manifest
+++ b/x11-libs/wxmozilla/Manifest
@@ -8,14 +8,14 @@ EBUILD wxmozilla-0.5.6.ebuild 1183 RMD160 d35b5333b4406379f2bf59aa79b791da2c0844
 MD5 5bfcc23101d4b586d637afb2115c2cab wxmozilla-0.5.6.ebuild 1183
 RMD160 d35b5333b4406379f2bf59aa79b791da2c084488 wxmozilla-0.5.6.ebuild 1183
 SHA256 88d5e764f56b1a1a07f172dbde7cbb1566b013a5ec5c5d3f18aeab6e8d449d44 wxmozilla-0.5.6.ebuild 1183
-EBUILD wxmozilla-0.5.7_pre20070102.ebuild 1911 RMD160 873f1ac89e60bc4f8f933ef706da15ec2ad5870e SHA1 c8d02b866036fc73a2c788d7f0c72cf3c51346f8 SHA256 1a7f660f6a460241d870e27f709117f65724e678fc3dd47e8b764f1d45c88481
-MD5 c4901924783b88ed13a51d51771649be wxmozilla-0.5.7_pre20070102.ebuild 1911
-RMD160 873f1ac89e60bc4f8f933ef706da15ec2ad5870e wxmozilla-0.5.7_pre20070102.ebuild 1911
-SHA256 1a7f660f6a460241d870e27f709117f65724e678fc3dd47e8b764f1d45c88481 wxmozilla-0.5.7_pre20070102.ebuild 1911
-MISC ChangeLog 1849 RMD160 f693a52af33ac6023e35b0caec649e0470de86fd SHA1 6c2a2ac0704bed28fc03d6d8cea95d9829948a5d SHA256 4536e57241dfe3ed4df855e6019465b10ce87f4fa050d55d3227dd489385207c
-MD5 ed17e06a99d0a4b2f4e8d07d57b53280 ChangeLog 1849
-RMD160 f693a52af33ac6023e35b0caec649e0470de86fd ChangeLog 1849
-SHA256 4536e57241dfe3ed4df855e6019465b10ce87f4fa050d55d3227dd489385207c ChangeLog 1849
+EBUILD wxmozilla-0.5.7_pre20070102.ebuild 1878 RMD160 950301c54e3c773877ce10881c88a6c808303a98 SHA1 b3ab598e4f973fd203712fec971b3f4b56b4a548 SHA256 1073353b9caef38fce5a9c124af13aff39d6b6fa2963b16f235ec9acd01c1ea8
+MD5 e030a81c8e8bcc31b175cf6f0ea37142 wxmozilla-0.5.7_pre20070102.ebuild 1878
+RMD160 950301c54e3c773877ce10881c88a6c808303a98 wxmozilla-0.5.7_pre20070102.ebuild 1878
+SHA256 1073353b9caef38fce5a9c124af13aff39d6b6fa2963b16f235ec9acd01c1ea8 wxmozilla-0.5.7_pre20070102.ebuild 1878
+MISC ChangeLog 2047 RMD160 63c94623e2e737b96a77a606d3adb290f9a22e4f SHA1 6ba29fa1646b4031d75ad9445a47e7b63886b924 SHA256 76794993c696d1102dfea5701061b5b241bfcc9299b4e94a27ed076673cba11d
+MD5 c898310f7e9d68b60edce19274f9f48b ChangeLog 2047
+RMD160 63c94623e2e737b96a77a606d3adb290f9a22e4f ChangeLog 2047
+SHA256 76794993c696d1102dfea5701061b5b241bfcc9299b4e94a27ed076673cba11d ChangeLog 2047
 MISC metadata.xml 230 RMD160 8900642143e34e5c6dd1df987c924ede96ae6bb0 SHA1 6c8fe85479c2fb5db137f9b9f85b56449bf21d79 SHA256 4bb9573931fffa78f631176d18a7aa5341ac7d832169f2ebc6df3d65f16b8e8b
 MD5 2f58f2c24eeea3b0135c9dfffba7fe67 metadata.xml 230
 RMD160 8900642143e34e5c6dd1df987c924ede96ae6bb0 metadata.xml 230

diff --git a/x11-libs/wxmozilla/wxmozilla-0.5.7_pre20070102.ebuild b/x11-libs/wxmozilla/wxmozilla-0.5.7_pre20070102.ebuild
index b220b0430bfd9a680a8c72bc54e39841f4a712b8..d67f2893fce8c08a9f4639e8f1b25da43cc4720e 100644 (file)
--- a/x11-libs/wxmozilla/wxmozilla-0.5.7_pre20070102.ebuild
+++ b/x11-libs/wxmozilla/wxmozilla-0.5.7_pre20070102.ebuild
@@ -1,21 +1,29 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxmozilla/wxmozilla-0.5.7_pre20070102.ebuild,v 1.1 2007/01/02 09:01:35 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxmozilla/wxmozilla-0.5.7_pre20070102.ebuild,v 1.2 2007/01/02 21:47:53 dirtyepic Exp $
 
 inherit eutils wxwidgets
 
-IUSE="doc firefox python"
+# Currently force building against firefox.  Seamonkey is supported but
+# crashes.  Upstream will fix and release as 0.5.7. bug #130969
+#IUSE="doc firefox python"
+IUSE="doc python"
 
 DESCRIPTION="Mozilla widget for wxWindows"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 HOMEPAGE="http://wxmozilla.sourceforge.net/"
 
+#DEPEND="
+#      =x11-libs/wxGTK-2.6*
+#      firefox? ( >=www-client/mozilla-firefox-2.0 )
+#      !firefox?       ( >=www-client/seamonkey-1.0.0 )
+#      python? ( dev-lang/python
+#                      >=dev-python/wxpython-2.6.3 )"
 DEPEND="
-       =x11-libs/wxGTK-2.6*
-       firefox? ( >=www-client/mozilla-firefox-2.0 )
-       !firefox?       ( >=www-client/seamonkey-1.0.0 )
-       python? ( dev-lang/python
-                       >=dev-python/wxpython-2.6.3 )"
+   =x11-libs/wxGTK-2.6*
+   >=www-client/mozilla-firefox-2.0
+   python? ( dev-lang/python
+           >=dev-python/wxpython-2.6.3 )"
 
 SLOT="0"
 LICENSE="wxWinLL-3"
@@ -32,33 +40,21 @@ src_compile() {
 
        # Current Problems:
        #   -can't find wx-config without the funky configure option
-       #       -can't find wxpython
-       #               configure runs:
-       #                       wxpyvername=`$PYTHON -c "from wx.build.config import getExtraPath; print getExtraPath(addOpts=1)"
-       #               python replies:
-       #                       sh: wx-config: command not found
-       #                       sh: wx-config: command not found
-       #                       sh: wx-config: command not found
-       #                       sh: wx-config: command not found
-       #                       sh: wx-config: command not found
+       #   -configure will give a warning about wxpython, but it can be ignored.
 
        # Currently Working:
        #
-       #       USE="-python" builds against seamonkey-1.0.7
-       #   USE="python" builds against seamonkey-1.0.7 but i'm not sure everything's
-       #       installed correctly.
-
-       # Currently Testing:
-       #       FF 2.0
+       # Firefox 2.0 support.  Builds against seamonkey-1.0.7 but crashes
 
        WX_GTK_VER="2.6"
        need-wxwidgets unicode
 
-       if use firefox; then
-               myconf="--enable-firefox --disable-seamonkey"
-       else
-               myconf="--disable-firefox --enable-seamonkey"
-       fi
+       #if use firefox; then
+       #       myconf="--enable-firefox --disable-seamonkey"
+       #else
+       #       myconf="--disable-firefox --enable-seamonkey"
+       #fi
+       myconf="--enable-firefox --disable-seamonkey"
 
        econf \
                $(use_enable python) \
@@ -74,7 +70,7 @@ src_install() {
        emake DESTDIR="${D}" install || die "install failed"
 
        if use doc; then
-               dodoc README
+               dodoc README Changelog NEWS
                newdoc demo/main.cpp example.cpp
                use python && dodoc wxPython/demo/*.py
        fi