Add initial mozilla-1.7 support.

5 files changed, 97 insertions, 15 deletions

diff --git a/net-www/galeon/ChangeLog b/net-www/galeon/ChangeLog
index a515c706bd0d..f780bdc94dd6 100644
--- a/net-www/galeon/ChangeLog
+++ b/net-www/galeon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/galeon
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.89 2004/06/20 02:42:27 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.90 2004/06/20 21:05:45 azarah Exp $
+
+*galeon-1.3.15-r1 (20 Jun 2004)
+
+  20 Jun 2004; Martin Schlemmer <azarah@gentoo.org>
+  +files/galeon-1.3.15-mozilla17-support.patch.gz, +galeon-1.3.15-r1.ebuild:
+  Add initial mozilla-1.7 support.
 
   19 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> galeon-1.3.14a.ebuild:
   Stable on sparc
diff --git a/net-www/galeon/Manifest b/net-www/galeon/Manifest
index d90a5b759e00..491816f9d7c9 100644
--- a/net-www/galeon/Manifest
+++ b/net-www/galeon/Manifest
@@ -1,22 +1,25 @@
-MD5 e2a7e30bf601a9bedecd344af604b7dd ChangeLog 12874
-MD5 75258de01f569c4a233cf24bc5b02346 galeon-1.2.12.ebuild 3423
-MD5 858cb7a3dd32deafc477281cd9b3b45e galeon-1.2.13.ebuild 3424
-MD5 cc092a4f60d9ca4269b8f5db5722eba0 galeon-1.3.10.ebuild 1643
-MD5 b842b865d56e962050b6cf802de86b88 galeon-1.3.11a.ebuild 1880
-MD5 d492fcef2f010114dca845acee70bd5b galeon-1.3.12.ebuild 1858
-MD5 90364318c1e239af0b32281433d45491 galeon-1.3.13a.ebuild 1874
+MD5 829d1af61104953d670efc03027fa7e5 galeon-1.3.15-r1.ebuild 1994
 MD5 0b822b8b914ed71781e9005cf60825d2 galeon-1.3.14a.ebuild 2021
+MD5 e2a7e30bf601a9bedecd344af604b7dd ChangeLog 12874
+MD5 8ee93eeee704ab560177c85a2e9c2e29 galeon-1.2.13.ebuild 3425
+MD5 9ca6069bbcca7d4ec13db5921d3bfb75 galeon-1.3.13a.ebuild 1875
+MD5 d4bc116bcf4aa91121e798d2cdefd564 galeon-1.3.12.ebuild 1859
 MD5 93808e9fd360e57d9a92b81515ef4aaf galeon-1.3.15.ebuild 1942
+MD5 33b93e4e5073b53d0ab7edce3782360a galeon-1.3.11a.ebuild 1881
 MD5 4c1c1e710ea77d8d7db9906084c4228d metadata.xml 215
+MD5 92b1d8d262332ed7ef35cd165e1f9e2a galeon-1.2.12.ebuild 3424
+MD5 2dd1559d4e102544d5a8c1a986f0ac43 galeon-1.3.10.ebuild 1644
+MD5 83b3e914d55414a8161059ceca9fd51f files/galeon-gcc34-fix.gz 290
+MD5 71648981f30022647bdcf652473ba2a9 files/digest-galeon-1.3.12 67
+MD5 c72506690307bdae2ceec562ac7fdbd9 files/galeon-1.2.7-google-UTF8.patch 1594
+MD5 a23309094a211cb6e389cb71c24d24ae files/digest-galeon-1.3.15-r1 67
+MD5 223458ff4eebf0d0e1024d2c6a689e8b files/galeon-1.3.15-gcc34.gz 358
 MD5 436b77780200d51a954cfa3fc77e9e2d files/digest-galeon-1.2.12 66
-MD5 757bec18c63defa1dd1be1b773cd456d files/digest-galeon-1.2.13 66
-MD5 db8a0894d9e2b9bbd8ad10e2a10e0928 files/digest-galeon-1.3.10 67
 MD5 ae742c626affcc36e9763f8f56b81689 files/digest-galeon-1.3.11a 68
-MD5 71648981f30022647bdcf652473ba2a9 files/digest-galeon-1.3.12 67
 MD5 11f8954987c85b967fe666d6783efdc5 files/digest-galeon-1.3.13a 68
-MD5 f9c12ebca3d295c2bc577bd03ff1314a files/digest-galeon-1.3.14a 68
 MD5 a23309094a211cb6e389cb71c24d24ae files/digest-galeon-1.3.15 67
-MD5 c72506690307bdae2ceec562ac7fdbd9 files/galeon-1.2.7-google-UTF8.patch 1594
 MD5 f4cef0104387767ea14b057e4fcd0cdc files/galeon-1.3.10-gcc2_fixes.patch 1262
-MD5 223458ff4eebf0d0e1024d2c6a689e8b files/galeon-1.3.15-gcc34.gz 358
-MD5 83b3e914d55414a8161059ceca9fd51f files/galeon-gcc34-fix.gz 290
+MD5 db8a0894d9e2b9bbd8ad10e2a10e0928 files/digest-galeon-1.3.10 67
+MD5 d346afce357af858f0360938b3ddd7ad files/galeon-1.3.15-mozilla17-support.patch.gz 434
+MD5 f9c12ebca3d295c2bc577bd03ff1314a files/digest-galeon-1.3.14a 68
+MD5 757bec18c63defa1dd1be1b773cd456d files/digest-galeon-1.2.13 66
diff --git a/net-www/galeon/files/digest-galeon-1.3.15-r1 b/net-www/galeon/files/digest-galeon-1.3.15-r1
new file mode 100644
index 000000000000..8203169ed114
--- /dev/null
+++ b/net-www/galeon/files/digest-galeon-1.3.15-r1
@@ -0,0 +1 @@
+MD5 9334cbdf0734f626470e788ce37d21a6 galeon-1.3.15.tar.bz2 3641265
diff --git a/net-www/galeon/files/galeon-1.3.15-mozilla17-support.patch.gz b/net-www/galeon/files/galeon-1.3.15-mozilla17-support.patch.gz
new file mode 100644
index 000000000000..8f1876ac1f4e
--- /dev/null
+++ b/net-www/galeon/files/galeon-1.3.15-mozilla17-support.patch.gz
diff --git a/net-www/galeon/galeon-1.3.15-r1.ebuild b/net-www/galeon/galeon-1.3.15-r1.ebuild
new file mode 100644
index 000000000000..0c14e3c8874e
--- /dev/null
+++ b/net-www/galeon/galeon-1.3.15-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.3.15-r1.ebuild,v 1.1 2004/06/20 21:05:45 azarah Exp $
+
+inherit gnome2 debug libtool eutils
+
+DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)"
+HOMEPAGE="http://galeon.sourceforge.net"
+SRC_URI="mirror://sourceforge/galeon/${P}.tar.bz2"
+
+IUSE=""
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~ia64 ~amd64"
+SLOT="0"
+
+S=${WORKDIR}/${P%%a}
+
+# supports moz-1.4 to 1.7rc2
+RDEPEND="virtual/x11
+	>=net-www/mozilla-1.4
+	>=dev-libs/glib-2
+	>=x11-libs/gtk+-2.4.0
+	>=dev-libs/libxml2-2.4
+	>=gnome-base/gconf-2
+	>=gnome-base/ORBit2-2
+	>=gnome-base/libbonobo-2
+	>=gnome-base/libbonoboui-2.1.1
+	>=gnome-base/libgnomeui-2.0.5
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libglade-2.3.1
+	app-text/scrollkeeper"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.30
+	>=sys-devel/gettext-0.11"
+
+pkg_setup () {
+	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
+	then
+		eerror "you need mozilla-1.4+ compiled against gtk+-2"
+		eerror "export USE=\"gtk2\" ;emerge mozilla -p "
+		die "Need Mozilla compiled with gtk+-2.0!!"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/galeon-1.3.15-gcc34.gz
+	epatch ${FILESDIR}/${P}-mozilla17-support.patch.gz
+}
+
+src_compile() {
+	# even when we have the XML-Parser module there may be a version mismatch
+	# this line will force the use of local intltool when compiling, avoiding mismatch
+	# remove this when we have all users at the same version as upstream.
+	intltoolize --force
+
+
+	elibtoolize
+
+	local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
+	local myconf="--disable-werror"
+
+	myconf="${myconf} --with-mozilla-snapshot=${moz_ver}"
+
+	econf ${myconf} || die "configure failed"
+	make || die "compile failed"
+
+}
+
+DOCS="AUTHORS COPYING COPYING.README ChangeLog FAQ INSTALL README README.ExtraPrefs THANKS TODO NEWS"