various small galeon fixes

4 files changed, 24 insertions, 8 deletions

diff --git a/net-www/galeon/ChangeLog b/net-www/galeon/ChangeLog
index 6e0e38993f45..fbd78c2a26a7 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.83 2004/05/12 12:55:08 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.84 2004/05/30 13:37:31 hanno Exp $
+
+  30 May 2004; Hanno Boeck <hanno@gentoo.org> +files/galeon-gcc34-fix.gz,
+  galeon-1.3.14a.ebuild:
+  Fix compilation with gcc 3.4.
+  Add support for mozilla 1.7-rc-versions.
+  Marked stable x86.
 
   12 May 2004; Alexander Gabert <pappy@gentoo.org> galeon-1.2.12.ebuild:
   removed hardened-gcc logic
diff --git a/net-www/galeon/Manifest b/net-www/galeon/Manifest
index a71f74c6f501..ed6433d22e68 100644
--- a/net-www/galeon/Manifest
+++ b/net-www/galeon/Manifest
@@ -1,16 +1,17 @@
-MD5 b4c566fdfed85d9c8339caec1cc8e84e ChangeLog 12072
+MD5 401dfa22cf7916185e4728250d0192eb ChangeLog 12268
 MD5 92b1d8d262332ed7ef35cd165e1f9e2a galeon-1.2.12.ebuild 3424
 MD5 2dd1559d4e102544d5a8c1a986f0ac43 galeon-1.3.10.ebuild 1644
 MD5 33b93e4e5073b53d0ab7edce3782360a galeon-1.3.11a.ebuild 1881
 MD5 d4bc116bcf4aa91121e798d2cdefd564 galeon-1.3.12.ebuild 1859
-MD5 9ca6069bbcca7d4ec13db5921d3bfb75 galeon-1.3.13a.ebuild 1875
-MD5 b9f5d6701119fbb80119ea6df56cb3f6 galeon-1.3.14a.ebuild 1873
 MD5 4c1c1e710ea77d8d7db9906084c4228d metadata.xml 215
+MD5 9ca6069bbcca7d4ec13db5921d3bfb75 galeon-1.3.13a.ebuild 1875
+MD5 2882cb0d49b557c77a800f9cb496c1d9 galeon-1.3.14a.ebuild 2010
 MD5 436b77780200d51a954cfa3fc77e9e2d files/digest-galeon-1.2.12 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 c72506690307bdae2ceec562ac7fdbd9 files/galeon-1.2.7-google-UTF8.patch 1594
 MD5 f4cef0104387767ea14b057e4fcd0cdc files/galeon-1.3.10-gcc2_fixes.patch 1262
+MD5 11f8954987c85b967fe666d6783efdc5 files/digest-galeon-1.3.13a 68
+MD5 f9c12ebca3d295c2bc577bd03ff1314a files/digest-galeon-1.3.14a 68
+MD5 83b3e914d55414a8161059ceca9fd51f files/galeon-gcc34-fix.gz 290
diff --git a/net-www/galeon/files/galeon-gcc34-fix.gz b/net-www/galeon/files/galeon-gcc34-fix.gz
new file mode 100644
index 000000000000..854dbc52c62b
--- /dev/null
+++ b/net-www/galeon/files/galeon-gcc34-fix.gz
diff --git a/net-www/galeon/galeon-1.3.14a.ebuild b/net-www/galeon/galeon-1.3.14a.ebuild
index 1fb201c527d9..8231ce79bf60 100644
--- a/net-www/galeon/galeon-1.3.14a.ebuild
+++ b/net-www/galeon/galeon-1.3.14a.ebuild
@@ -1,6 +1,6 @@
 # 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.14a.ebuild,v 1.1 2004/03/28 14:46:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.3.14a.ebuild,v 1.2 2004/05/30 13:37:31 hanno Exp $
 
 inherit gnome2 debug libtool
 
@@ -11,7 +11,7 @@ RESTRICT="nomirror"
 
 IUSE=""
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~ia64 ~amd64"
+KEYWORDS="x86 ~ppc ~alpha ~sparc ~ia64 ~amd64"
 SLOT="0"
 
 S=${WORKDIR}/${P%%a}
@@ -45,6 +45,11 @@ pkg_setup () {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/galeon-gcc34-fix.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
@@ -54,6 +59,10 @@ src_compile() {
 
 	elibtoolize
 
+	if [ `echo ${moz_ver} | grep 1.7rc` ]
+	then
+		moz_ver="trunk"
+	fi
 
 	local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
 	local myconf="--disable-werror"