Let it work with xul-1.9.2 and sync with fedora/debian patches.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 67 insertions, 5 deletions

diff --git a/www-client/galeon/ChangeLog b/www-client/galeon/ChangeLog
index 24cd332789d6..5b7f04a0c6c5 100644
--- a/www-client/galeon/ChangeLog
+++ b/www-client/galeon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/galeon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.55 2010/01/10 17:22:05 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.56 2010/05/06 21:31:07 pacho Exp $
+
+*galeon-2.0.7-r2 (06 May 2010)
+
+  06 May 2010; Pacho Ramos <pacho@gentoo.org> +galeon-2.0.7-r2.ebuild:
+  Revision bump to sync with latest fedora and debian patches. Most notable
+  changes include xulrunner-1.9.2 (thanks a lot to Hicham HAOUARI in bug
+  #310411 and #302552), updated plugin patch (fixes bug #303605 reported by
+  Thomas Raschbacher) and some updates to adapt to new gnome-session.
 
   10 Jan 2010; Hanno Boeck <hanno@gentoo.org> -galeon-2.0.4.ebuild,
   -files/galeon-2.0.4-maketest.diff, -galeon-2.0.7.ebuild,
diff --git a/www-client/galeon/Manifest b/www-client/galeon/Manifest
index dc92ab882b39..bed15b779117 100644
--- a/www-client/galeon/Manifest
+++ b/www-client/galeon/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA1
 
 AUX galeon-2.0.7-build-with-xulrunner-1.9.1.patch 1848 RMD160 543a3584d22dac260a7dedda5ec9692c468bc715 SHA1 8024056997277a9d56c503cacf8e59cb85605bce SHA256 f1df509f02196bed354665736305ba95c11b05f051713903c6bdd6d6d21fdbb5
+DIST galeon-2.0.7-patches-r1.tar.bz2 34786 RMD160 d8d2889b57c9863ce46b8a4991db775d3af1a117 SHA1 f0ff11fcda7bcfe1ca6bd60a666a54e31fef1ebd SHA256 663c4c2f27d8ae5de6cd596ef70d799fe812909828b631253b20b1c904752b8f
 DIST galeon-2.0.7-patches.tar.lzma 100072 RMD160 38c24fe18b93951c6805a2402648b9cdd778d6f8 SHA1 56fb068186cf8f5e247dd64333f9c19f89cbb049 SHA256 69b01ea3e80fb186635273f9b79737cb62c4d9169c234878279396a4ea22d3f7
 DIST galeon-2.0.7.tar.bz2 3096337 RMD160 a443dfc11447a006d21d9e7852c616b41492a6f6 SHA1 14ccb53a7b3f398eb3ac3f7ca6aeb63348689a62 SHA256 c6fb0c9e7e2a4014ee7c785cec35380985138bd9aa2b33e9cb63de497ea68b3b
 EBUILD galeon-2.0.7-r1.ebuild 1301 RMD160 c133db1660c010c1a286bd22c18fd7013f6d3891 SHA1 93e0ef6a3b6491b24c90f0814ae9f6992473a4dc SHA256 ca2b2566d2013ff7c82a700a0c6c9d57264645ead6ac3034ba34003888d0c505
-MISC ChangeLog 22136 RMD160 566256e61748cab59ba603b55b60ae7acb58b0a7 SHA1 077ae20456466e83d652cc3ccea04fab6049b9fb SHA256 016be77c0fd39449b0b176adbc4d2916b947ed417e6b999cd31cb3f57a4a1748
+EBUILD galeon-2.0.7-r2.ebuild 1422 RMD160 98a40331f931298590665663763ebb95df8e2415 SHA1 0e4d01ff362177e89571b0b24b7aa5bd2070781a SHA256 d4ec6fe0fa52cd37a4e309a6c7b4cb09b3c7122aa1dce0d37a1b352e71094edf
+MISC ChangeLog 22535 RMD160 33dfb68c14b790667cc629c0efcdd57be8abe939 SHA1 fe6118b07c53b0a9753c6b52a16359a86b44365c SHA256 a961a0ff96c51d517f4b91032bfa21a3a0e088f2adc8a59214edda4d0b0fd7e2
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktKDMMACgkQr2QksT29OyD2mQCfdvt2ADxiI8B2xUhMnH5WnxAn
-XZgAnR9/EhVbzcUvZwvsKAGR9xcSc3JZ
-=Lp9z
+iEYEARECAAYFAkvjNSQACgkQCaWpQKGI+9QUNwCfb2wnRHTvOkhljzG/qZay/W/2
+CEAAn0BGDTPDX8Jst4qVTTSTj2NZhJ4s
+=zDY4
 -----END PGP SIGNATURE-----
diff --git a/www-client/galeon/galeon-2.0.7-r2.ebuild b/www-client/galeon/galeon-2.0.7-r2.ebuild
new file mode 100644
index 000000000000..81f1e12bb9fd
--- /dev/null
+++ b/www-client/galeon/galeon-2.0.7-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-2.0.7-r2.ebuild,v 1.1 2010/05/06 21:31:07 pacho Exp $
+
+EAPI="2"
+inherit autotools gnome2 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
+	mirror://gentoo/${P}-patches-r1.tar.bz2"
+
+LICENSE="GPL-2"
+IUSE=""
+KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86"
+SLOT="0"
+RDEPEND=">=net-libs/xulrunner-1.9.2
+	>=x11-libs/gtk+-2.12.0
+	>=dev-libs/libxml2-2.6.6
+	>=gnome-base/libgnomeui-2.5.2
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/gnome-desktop-2.10.0
+	>=gnome-base/libglade-2.3.1"
+DEPEND="${RDEPEND}
+	app-text/rarian
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.30
+	>=sys-devel/gettext-0.11"
+
+DOCS="AUTHORS ChangeLog FAQ README README.ExtraPrefs THANKS TODO NEWS"
+
+src_prepare() {
+	gnome2_src_prepare
+	cd "${S}"
+
+	for i in "${WORKDIR}/${P}-patches-r1/*"; do
+		epatch $i || die "patch $i failed"
+	done
+
+	sed -i s/libxul-embedding-unstable/libxul/ configure.in || die
+	sed -i s/TextZoom/FullZoom/ mozilla/GaleonWrapper.cpp || die
+	eautoreconf
+}
+
+src_configure() {
+	myconf="--with-mozilla=libxul"
+	econf ${myconf} || die "configure failed"
+}
+
+src_compile() {
+	emake MOZILLA_HOME="$(pkg-config libxul --variable=sdkdir)"/bin || die "compile failed"
+}