Version bump - masked for the moment

4 files changed, 224 insertions, 2 deletions

diff --git a/net-www/mozilla-firebird/ChangeLog b/net-www/mozilla-firebird/ChangeLog
index d03689411457..6ab2eec40b7f 100644
--- a/net-www/mozilla-firebird/ChangeLog
+++ b/net-www/mozilla-firebird/ChangeLog
@@ -1,6 +1,11 @@
 # 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.13 2003/07/25 16:25:06 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/ChangeLog,v 1.14 2003/07/29 05:39:39 brad Exp $
+
+*mozilla-firebird-0.6.1 (29 Jul 2003)
+
+  29 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-firebird-0.6.1.ebuild:
+  Version bump
 
 *mozilla-firebird-0.6-r7 (25 Jul 2003)
 
diff --git a/net-www/mozilla-firebird/Manifest b/net-www/mozilla-firebird/Manifest
index 2d8637f92649..4c7e5d8448c3 100644
--- a/net-www/mozilla-firebird/Manifest
+++ b/net-www/mozilla-firebird/Manifest
@@ -1,10 +1,12 @@
 MD5 febebab06fcb3cc7cf269e565795436d mozilla-firebird-0.6-r5.ebuild 4948
 MD5 c44058fad41573d4ce34592bc3f00bc9 mozilla-firebird-0.6-r6.ebuild 5139
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 309c424627f941e192cd0a757f3c75ad ChangeLog 2622
+MD5 edb6f3c2deea68490f12a672aedef811 ChangeLog 2751
 MD5 74dbec8a43a0213b4795b3608577b194 mozilla-firebird-0.6-r7.ebuild 6222
+MD5 733925bd4b6850faf60f2707e1bf0805 mozilla-firebird-0.6.1.ebuild 6217
 MD5 6e4352482ed149b3b9aca78d83de1124 files/MozillaFirebird 753
 MD5 78b9eef353e1aff29cef379e4de6b9fa files/digest-mozilla-firebird-0.6-r5 81
 MD5 78b9eef353e1aff29cef379e4de6b9fa files/digest-mozilla-firebird-0.6-r6 81
 MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
 MD5 78b9eef353e1aff29cef379e4de6b9fa files/digest-mozilla-firebird-0.6-r7 81
+MD5 fc2e91c202d74a43778d6b9d8eeaf197 files/digest-mozilla-firebird-0.6.1 83
diff --git a/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.6.1 b/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.6.1
new file mode 100644
index 000000000000..b813f254fa85
--- /dev/null
+++ b/net-www/mozilla-firebird/files/digest-mozilla-firebird-0.6.1
@@ -0,0 +1 @@
+MD5 3b4d6fcaddb58b789ff391c2fcbb303c MozillaFirebird-source-0.6.1.tar.bz2 29095476
diff --git a/net-www/mozilla-firebird/mozilla-firebird-0.6.1.ebuild b/net-www/mozilla-firebird/mozilla-firebird-0.6.1.ebuild
new file mode 100644
index 000000000000..ec70654ff162
--- /dev/null
+++ b/net-www/mozilla-firebird/mozilla-firebird-0.6.1.ebuild
@@ -0,0 +1,214 @@
+# 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.1.ebuild,v 1.1 2003/07/29 05:39:39 brad Exp $
+
+inherit makeedit flag-o-matic gcc nsplugins eutils
+
+# Added to get MozillaFirebird to compile on sparc.
+replace-sparc64-flags
+
+S=${WORKDIR}/mozilla
+
+DESCRIPTION="The Mozilla Firebird Web Browser"
+HOMEPAGE="http://www.mozilla.org/projects/firebird/"
+SRC_URI="http://ftp.mozilla.org/pub/firebird/releases/${PV}/MozillaFirebird-source-${PV}.tar.bz2"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+SLOT="0"
+LICENSE="MPL-1.1 | NPL-1.1"
+IUSE="java gtk2 ipv6 moznoxft"
+
+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_unpack() {
+	unpack MozillaFirebird-source-${PV}.tar.bz2
+	
+	# alpha stubs patch from lfs project.
+	# <taviso@gentoo.org> (26 Jun 2003)
+	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
+
+	# Fix build with Linux 2.6
+	cp ${S}/security/coreconf/Linux2.5.mk ${S}/security/coreconf/Linux2.6.mk
+	
+}
+
+src_compile() {
+   local myconf="--disable-composer \
+      --with-x \
+      --with-system-jpeg \
+      --with-system-zlib \
+      --with-system-png \
+      --with-system-mng \
+      --disable-mailnews \
+      --disable-calendar \
+      --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 \
+      --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help"
+
+    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 [ -z "`use moznoxft`" ]
+	then
+		if [ -n "`use gtk2`" ]
+		then
+			local pango_version=""
+
+			# We need Xft2.0 localy installed
+			if (test -x /usr/bin/pkg-config) && (pkg-config xft)
+			then
+				pango_version="`pkg-config --modversion pango | cut -d. -f1,2`"
+				pango_version="`echo ${pango_version} | sed -e 's:\.::g'`"
+
+				# We also need pango-1.1, else Mozilla links to both
+				# Xft1.1 *and* Xft2.0, and segfault...
+				if [ "${pango_version}" -gt "10" ]
+				then
+					einfo "Building with Xft2.0 (Gtk+-2.0) support!"
+					myconf="${myconf} --enable-xft --disable-freetype2"
+					touch ${WORKDIR}/.xft
+				else
+					ewarn "Building without Xft2.0 support!"
+					myconf="${myconf} --disable-xft `use_enable truetype freetype2`"
+				fi
+			else
+				ewarn "Building without Xft2.0 support!"
+				myconf="${myconf} --disable-xft `use_enable truetype freetype2`"
+			fi
+		else
+			einfo "Building with Xft2.0 (Gtk+-1.0) support!"
+			myconf="${myconf} --enable-xft --disable-freetype2"
+			touch ${WORKDIR}/.xft
+		fi
+	else
+		myconf="${myconf} --disable-xft `use_enable truetype freetype2`"
+	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
+   filter-flags -ffast-math
+   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
+		  filter-flags -msse2
+      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
+   make 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/MozillaFirebird/plugins
+
+   dobin ${FILESDIR}/MozillaFirebird
+
+	# Fix icons to look the same everywhere
+	insinto /usr/lib/MozillaFirebird/icons
+	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
+	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
+
+	# Install icon and .desktop for menu entry
+	if [ "`use gnome`" ]
+	then
+		insinto /usr/share/pixmaps
+		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
+
+		# Fix comment of menu entry
+		cd ${S}/build/package/rpm/SOURCES
+		perl -pi -e 's:Name=Mozilla:Name=Mozilla Firebird:' mozilla.desktop
+		perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Firebird Web Browser:' mozilla.desktop
+		cd ${S}
+		insinto /usr/share/gnome/apps/Internet
+		doins ${S}/build/package/rpm/SOURCES/mozilla.desktop
+	fi
+}
+
+pkg_preinst() {
+   # Remove the old plugins dir
+   pkg_mv_plugins /usr/lib/MozillaFirebird/plugins
+}