version bumping both galeons

6 files changed, 189 insertions, 4 deletions

diff --git a/net-www/galeon/ChangeLog b/net-www/galeon/ChangeLog
index 66c33ebbae73..245b395cee4f 100644
--- a/net-www/galeon/ChangeLog
+++ b/net-www/galeon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/galeon
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.51 2003/07/12 18:16:32 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.52 2003/07/21 21:50:49 liquidx Exp $
+
+*galeon-1.3.6 (21 Jul 2003)
+
+  21 Jul 2003; Alastair Tse <liquidx@gentoo.org> galeon-1.2.11.ebuild,
+  galeon-1.3.6.ebuild:
+  bumping both gtk1 and gtk2 versions of galeon
 
   12 Jul 2003; Alastair Tse <liquidx@gentoo.org> galeon-1.3.5-r1.ebuild:
   it can support both 1.3 and 1.4
diff --git a/net-www/galeon/Manifest b/net-www/galeon/Manifest
index 53aa91591c03..6202c53c16f9 100644
--- a/net-www/galeon/Manifest
+++ b/net-www/galeon/Manifest
@@ -1,4 +1,4 @@
-MD5 506773cf85c46edbe36f46a67e357456 ChangeLog 8188
+MD5 12d2cfe816b839521bd6455620983dab ChangeLog 8360
 MD5 44ae21af9822c522df1daaab8aecacae galeon-1.2.8.ebuild 3256
 MD5 7da7a0f82545464b2cc9a44baad4f60c galeon-1.2.6.ebuild 3009
 MD5 8c7e142a94cde3cb307436a257cbe87d galeon-1.2.7-r1.ebuild 3082
@@ -7,10 +7,10 @@ MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 fde9f6e9c912f3a70983efbe4fa3b9cd galeon-1.3.5-r1.ebuild 1639
 MD5 0413e6e8b20ba340bf124a4a7381e2cb galeon-1.2.9.ebuild 3264
 MD5 a9dfb5161aae2559121416e088510721 galeon-1.3.4.ebuild 1706
-MD5 981fad01f6c020f6eeed236a6b2a24a3 galeon-1.3.6.ebuild 1639
+MD5 97168137db627f922a90bfc86721efe7 galeon-1.3.6.ebuild 1636
 MD5 075fe65978afdfd25487ebafc1316268 galeon-1.2.10a.ebuild 3278
 MD5 645ee27a9ef9866e6107cab7f119a3b4 galeon-1.3.5.ebuild 1748
-MD5 2b9f00361eb77ebe1d6c4617798b36a8 galeon-1.2.11.ebuild 3232
+MD5 a2a4c91720f86d4a962c5923651e3375 galeon-1.2.11.ebuild 3230
 MD5 7452327082b17acbb2ae8b41e9d4356c files/digest-galeon-1.2.8 65
 MD5 78ff9de5754da0f1e1d2767d1fb2bb67 files/digest-galeon-1.3.5-r1 66
 MD5 61056f75dbefbbf2d8d48ec8c3323152 files/digest-galeon-1.2.6 65
diff --git a/net-www/galeon/files/digest-galeon-1.2.11 b/net-www/galeon/files/digest-galeon-1.2.11
new file mode 100644
index 000000000000..120230817fac
--- /dev/null
+++ b/net-www/galeon/files/digest-galeon-1.2.11
@@ -0,0 +1 @@
+MD5 a24ac42b93621bc4df9476daf3056956 galeon-1.2.11.tar.gz 4216345
diff --git a/net-www/galeon/files/digest-galeon-1.3.6 b/net-www/galeon/files/digest-galeon-1.3.6
new file mode 100644
index 000000000000..b0b0c1f9bdd0
--- /dev/null
+++ b/net-www/galeon/files/digest-galeon-1.3.6
@@ -0,0 +1 @@
+MD5 4f95257e5098e256b6e0d60a4eca4432 galeon-1.3.6.tar.bz2 2898961
diff --git a/net-www/galeon/galeon-1.2.11.ebuild b/net-www/galeon/galeon-1.2.11.ebuild
new file mode 100644
index 000000000000..9fd5b550d293
--- /dev/null
+++ b/net-www/galeon/galeon-1.2.11.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.11.ebuild,v 1.1 2003/07/21 21:50:49 liquidx Exp $
+
+IUSE="nls"
+
+inherit eutils libtool gnome.org
+
+DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)"
+SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
+	 mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://galeon.sourceforge.net"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+SLOT="0"
+
+RDEPEND=">=net-www/mozilla-1.3
+	>=gnome-base/gnome-libs-1.4.1.4
+	<=gnome-base/libglade-0.99.0
+	=gnome-base/gnome-vfs-1.0*
+	=gnome-base/gconf-1.0*
+	>=gnome-base/oaf-0.6.10
+	>=dev-libs/libxml-1.8.17
+	>=media-libs/gdk-pixbuf-0.18.0
+	nls? ( sys-devel/gettext
+	>=dev-util/intltool-0.17 )"
+	# bonobo? ( >=gnome-base/bonobo-1.0.19-r1 )
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	dev-util/pkgconfig"
+
+pkg_setup() {
+
+	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk.so ]
+	then
+		eerror
+		eerror "It seems that your Mozilla was not compiled against gtk+-1.2,"
+		eerror "but rather gtk+-2.0.  As Galeon does not support this setup yet,"
+		eerror "you will have to remerge Mozilla with gtk+-1.2 support.  This"
+		eerror "can be done by taking \"gtk2\" out of your USE flags:"
+		eerror
+		eerror " # USE="-gtk2" emerge mozilla "
+		eerror
+		die "Need Mozilla compiled with gtk+-1.2!!"
+	fi
+}
+
+src_unpack() {
+
+	unpack ${A}
+
+	# Add UTF8 support to the google smart bookmarks.  Note that
+	# it will probibly only work for a newly created bookmark ...
+	# <azarah@gentoo.org> (26 Dec 2002)
+	cd ${S}; epatch ${FILESDIR}/${PN}-1.2.7-google-UTF8.patch
+}
+
+src_compile() {
+
+	elibtoolize
+
+	local myconf=
+	local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
+
+	use nls || myconf="${myconf} --disable-nls"
+	# use bonobo && myconf="${myconf} --enable-gnome-file-selector"
+
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--with-mozilla-libs=${MOZILLA_FIVE_HOME} \
+		--with-mozilla-includes=${MOZILLA_FIVE_HOME}/include \
+		--without-debug	--disable-werror \
+		--disable-applet \
+		--disable-werror \
+		--disable-install-schemas \
+		--enable-nautilus-view=no \
+		--with-mozilla-snapshot=${moz_ver} \
+		${myconf} || die
+
+	emake || make || die
+}
+
+src_install() {
+
+	# galeon-config-tool was rewritten for 1.2.0 and causes sandbox
+	# violations if gconfd is shut down...  The schemas seem to install
+	# fine without it (at least it seems like it... *sigh*)
+	#gconftool --shutdown
+
+	make prefix=${D}/usr \
+	     mandir=${D}/usr/share/man \
+	     sysconfdir=${D}/etc \
+	     localstatedir=${D}/var/lib \
+	     install || die
+
+	dodoc AUTHORS ChangeLog COPYING* FAQ NEWS README TODO THANKS
+	rm -rf ${D}/var/lib/scrollkeeper
+}
+
+pkg_postinst() {
+
+	galeon-config-tool --fix-gconf-permissions
+	galeon-config-tool --pkg-install-schemas
+	scrollkeeper-update
+	
+	if [ -z "`use gnome`" ]
+	then
+		einfo "Please make sure libglade was built with gnome support, or"
+		einfo "else galeon will not be able to start up."
+		einfo
+		einfo 'To do this, type: '
+		einfo 'USE="gnome" emerge libglade'
+	fi
+}
+
diff --git a/net-www/galeon/galeon-1.3.6.ebuild b/net-www/galeon/galeon-1.3.6.ebuild
new file mode 100644
index 000000000000..df792c742484
--- /dev/null
+++ b/net-www/galeon/galeon-1.3.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2003 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.6.ebuild,v 1.1 2003/07/21 21:50:49 liquidx Exp $
+
+inherit gnome2 libtool
+
+S="${WORKDIR}/${P}"
+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"
+SLOT="0"
+
+# supports both moz-1.3 and moz-1.4
+RDEPEND="virtual/x11
+	>=net-www/mozilla-1.3
+	>=dev-libs/glib-2.0
+	>=x11-libs/gtk+-2.0
+	>=dev-libs/libxml2-2.4
+	>=gnome-base/gconf-2.0
+	>=gnome-base/ORBit2-2.0
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/libbonoboui-2.1.1
+	>=gnome-base/bonobo-activation-2.0
+	>=gnome-base/libgnomeui-2.0
+	>=gnome-base/gnome-vfs-2.0
+	>=gnome-base/libglade-2.0"
+        
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+    >=sys-devel/gettext-0.11"
+
+pkg_setup () {
+   if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
+   then
+      eerror "you need mozilla-1.3+ compiled against gtk+-2"
+      eerror "export USE=\"gtk2\" ;emerge mozilla -p "
+      die "Need Mozilla compiled with gtk+-2.0!!"
+   fi
+         
+}
+
+src_compile() {
+    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"