Removing bogus CVS dependency from the ebuild.

5 files changed, 165 insertions, 5 deletions

diff --git a/net-www/mozilla-firebird/ChangeLog b/net-www/mozilla-firebird/ChangeLog
index 126ab9c3020e..a1eb1ada93ea 100644
--- a/net-www/mozilla-firebird/ChangeLog
+++ b/net-www/mozilla-firebird/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-www/mozilla-firebird
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/ChangeLog,v 1.2 2003/06/03 06:51:48 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/ChangeLog,v 1.3 2003/06/03 14:33:01 brad Exp $
+
+*mozilla-firebird 0.6-r2 (02 June 20032)
+
+  03 June 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6-r2.ebuild :
+  - Remove bad dependency on dev-util/cvs
+
+*mozilla-firebird 0.6-r1 (02 June 20032)
+
+  03 June 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6-r1.ebuild :
+  - Change not depends from !net-www/MozillaFirebird-bin to !net-www/mozilla-firebird-bin
+  - Add headers to the ebuilds, ChangeLog file
 
 *mozilla-firebird 0.6 (02 June 2003)
 
diff --git a/net-www/mozilla-firebird/Manifest b/net-www/mozilla-firebird/Manifest
index f6b8fd5e549b..f773134b3bc9 100644
--- a/net-www/mozilla-firebird/Manifest
+++ b/net-www/mozilla-firebird/Manifest
@@ -1,6 +1,8 @@
 MD5 0a0b11d86465f6fa20dbea2b27a36239 mozilla-firebird-0.6.ebuild 4028
-MD5 7f61b1d485c9e98f6206c78c841d745a ChangeLog 419
-MD5 c5dea99630b5cbadbccc6076e3cfb262 mozilla-firebird-0.6-r1.ebuild 4031
+MD5 ea497964b6dbf52847c8094487529365 mozilla-firebird-0.6-r1.ebuild 4015
+MD5 194139858e8b3ff8cecd1b466e97bdfc mozilla-firebird-0.6-r2.ebuild 4015
+MD5 861f20532deee673044638f18460fb46 ChangeLog 838
 MD5 6e4352482ed149b3b9aca78d83de1124 files/MozillaFirebird 753
 MD5 78b9eef353e1aff29cef379e4de6b9fa files/digest-mozilla-firebird-0.6 81
 MD5 78b9eef353e1aff29cef379e4de6b9fa files/digest-mozilla-firebird-0.6-r1 81
+MD5 78b9eef353e1aff29cef379e4de6b9fa files/digest-mozilla-firebird-0.6-r2 81
diff --git a/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.6-r2 b/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.6-r2
new file mode 100644
index 000000000000..7c8e90ff1655
--- /dev/null
+++ b/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.6-r2
@@ -0,0 +1 @@
+MD5 de52dd03f8628724f14f517cd6346755 MozillaFirebird-0.6-source.tar.bz2 31992582
diff --git a/net-www/mozilla-firebird/mozilla-firebird-0.6-r1.ebuild b/net-www/mozilla-firebird/mozilla-firebird-0.6-r1.ebuild
index 0c919d75a807..60cf222eeeaa 100644
--- a/net-www/mozilla-firebird/mozilla-firebird-0.6-r1.ebuild
+++ b/net-www/mozilla-firebird/mozilla-firebird-0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/mozilla-firebird-0.6-r1.ebuild,v 1.1 2003/06/03 06:51:48 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/mozilla-firebird-0.6-r1.ebuild,v 1.2 2003/06/03 14:33:01 brad Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins
 
@@ -41,7 +41,6 @@ RDEPEND="virtual/x11
 DEPEND="${RDEPEND}
    virtual/glibc
    dev-lang/perl
-   dev-util/cvs
    java? ( >=dev-java/java-config-0.2.0 )"
    
 # needed by src_compile() and src_install()
diff --git a/net-www/mozilla-firebird/mozilla-firebird-0.6-r2.ebuild b/net-www/mozilla-firebird/mozilla-firebird-0.6-r2.ebuild
new file mode 100644
index 000000000000..4946e320dfa7
--- /dev/null
+++ b/net-www/mozilla-firebird/mozilla-firebird-0.6-r2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/mozilla-firebird-0.6-r2.ebuild,v 1.1 2003/06/03 14:33:01 brad Exp $
+
+inherit makeedit flag-o-matic gcc nsplugins
+
+# Added to get MozillaFirebird to compile on sparc.
+replace-sparc64-flags
+
+EMVER="0.65.2"
+IPCVER="1.0.0.1"
+
+S=${WORKDIR}/mozilla
+
+DESCRIPTION="The Mozilla Firebird Web Browser"
+HOMEPAGE="http://www.mozilla.org/projects/firebird/"
+SRC_URI="http://komodo.mozilla.org/pub/firebird/releases/${PV}/MozillaFirebird-${PV}-source.tar.bz2"
+
+KEYWORDS="~x86 ~ppc ~sparc"
+SLOT="0"
+LICENSE="MPL-1.1 | NPL-1.1"
+IUSE="java gtk2 ipv6"
+
+RDEPEND="virtual/x11
+   >=dev-libs/libIDL-0.8.0
+   >=gnome-base/ORBit-0.5.10-r1
+   virtual/xft
+   >=sys-libs/zlib-1.1.4
+   >=media-libs/jpeg-6b
+   >=media-libs/libmng-1.0.0
+   >=media-libs/libpng-1.2.1
+   >=sys-apps/portage-2.0.36
+   dev-libs/expat
+   app-arch/zip
+   app-arch/unzip
+   ( gtk2? >=x11-libs/gtk+-2.1.1 :
+     =x11-libs/gtk+-1.2* )
+   java?  ( virtual/jre )
+	!net-www/mozilla-firebird-bin"
+
+DEPEND="${RDEPEND}
+   virtual/glibc
+   dev-lang/perl
+   java? ( >=dev-java/java-config-0.2.0 )"
+   
+# needed by src_compile() and src_install()
+export MOZ_PHOENIX=1
+export MOZ_CALENDAR=0
+export MOZ_ENABLE_XFT=1
+
+src_compile() {
+   local myconf="--disable-composer \
+      --with-x \
+      --with-system-jpeg \
+      --with-system-zlib \
+      --with-system-png \
+      --with-system-mng \
+      --disable-mailnews \
+      --disable-calendar \
+      --enable-xft \
+      --disable-pedantic \
+      --disable-svg \
+      --enable-mathml \
+      --without-system-nspr \
+      --enable-nspr-autoconf \
+      --enable-xsl \
+      --enable-crypto \
+      --enable-xinerama=no \
+      --with-java-supplement \
+      --with-pthreads \
+      --with-default-mozilla-five-home=/usr/lib/MozillaFirebird \
+      --with-user-appdir=.phoenix \
+      --disable-jsd \
+      --disable-accessibility \
+      --disable-tests \
+      --disable-debug \
+      --disable-dtd-debug \
+      --disable-logging \
+      --enable-reorder \
+      --enable-strip \
+      --enable-strip-libs \
+      --enable-cpp-rtti \
+      --enable-xterm-updates \
+	  --enable-optimize=-O2 \
+      --disable-ldap \
+      --disable-toolkit-qt \
+      --disable-toolkit-xlib"
+
+    if [ -n "`use gtk2`" ] ; then
+        myconf="${myconf} --enable-toolkit-gtk2 \
+                          --enable-default-toolkit=gtk2 \
+                          --disable-toolkit-gtk"
+    else
+        myconf="${myconf} --enable-toolkit-gtk \
+                          --enable-default-toolkit=gtk \
+                          --disable-toolkit-gtk2"
+    fi
+
+    if [ -n "`use ipv6`" ] ; then
+        myconf="${myconf} --enable-ipv6"
+    fi
+
+   # Crashes on start when compiled with -fomit-frame-pointer
+   filter-flags -fomit-frame-pointer
+   append-flags -s -fforce-addr
+
+   if [ "$(gcc-major-version)" -eq "3" ]; then
+      # Currently gcc-3.2 or older do not work well if we specify "-march"
+      # and other optimizations for pentium4.
+      if [ "$(gcc-minor-version)" -lt "3" ]; then
+          replace-flags -march=pentium4 -march=pentium3
+      fi
+
+	  # Enable us to use flash, etc plugins compiled with gcc-2.95.3
+      if [ "${ARCH}" = "x86" ]; then
+          myconf="${myconf} --enable-old-abi-compat-wrappers"
+      fi
+   fi
+
+   econf ${myconf} || die
+
+   edit_makefiles
+   emake MOZ_PHOENIX=1 || die
+}
+
+src_install() {
+   # Plugin path creation
+   PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
+   dodir /${PLUGIN_DIR}
+
+   dodir /usr/lib
+   dodir /usr/lib/MozillaFirebird
+   cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirebird
+
+   #fix permissions
+   chown -R root.root ${D}/usr/lib/MozillaFirebird
+   
+   # Plugin path setup (rescuing the existent plugins)
+   src_mv_plugins /usr/lib/${PN}/plugins
+
+   dobin ${FILESDIR}/MozillaFirebird
+}
+
+pkg_preinst() {
+   # Remove the old plugins dir
+   pkg_mv_plugins /usr/lib/${PN}/plugins
+}