mozilla-1.0 update

16 files changed, 20 insertions, 492 deletions

diff --git a/net-www/galeon/ChangeLog b/net-www/galeon/ChangeLog
index 65744edd06ff..11cde6cfb902 100644
--- a/net-www/galeon/ChangeLog
+++ b/net-www/galeon/ChangeLog
@@ -1,8 +1,10 @@
 # ChangeLog for net-www/galeon
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.13 2002/06/05 17:10:10 spider Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.14 2002/06/06 20:16:22 azarah Exp $
 
+*galeon-1.2.3-r2.ebuild (06 Jun 2002)
+  06 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Update to use mozilla-1.0-r1 and up.
 
 *galeon-1.2.3-r1 (05 Jun 2002)
   05 Jun 2002; Spider <spider@gentoo.org> galeon-1.2.3-r1.ebuild :
diff --git a/net-www/galeon/files/digest-galeon-1.2.0 b/net-www/galeon/files/digest-galeon-1.2.0
deleted file mode 100644
index bd8672c095b2..000000000000
--- a/net-www/galeon/files/digest-galeon-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 766744240a9e06f9aad427c2e6e214f2 galeon-1.2.0.tar.gz 3921182
diff --git a/net-www/galeon/files/digest-galeon-1.2.0-r1 b/net-www/galeon/files/digest-galeon-1.2.0-r1
deleted file mode 100644
index bd8672c095b2..000000000000
--- a/net-www/galeon/files/digest-galeon-1.2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 766744240a9e06f9aad427c2e6e214f2 galeon-1.2.0.tar.gz 3921182
diff --git a/net-www/galeon/files/digest-galeon-1.2.0-r2 b/net-www/galeon/files/digest-galeon-1.2.0-r2
deleted file mode 100644
index bd8672c095b2..000000000000
--- a/net-www/galeon/files/digest-galeon-1.2.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 766744240a9e06f9aad427c2e6e214f2 galeon-1.2.0.tar.gz 3921182
diff --git a/net-www/galeon/files/digest-galeon-1.2.0-r3 b/net-www/galeon/files/digest-galeon-1.2.0-r3
deleted file mode 100644
index bd8672c095b2..000000000000
--- a/net-www/galeon/files/digest-galeon-1.2.0-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 766744240a9e06f9aad427c2e6e214f2 galeon-1.2.0.tar.gz 3921182
diff --git a/net-www/galeon/files/digest-galeon-1.2.1 b/net-www/galeon/files/digest-galeon-1.2.1
deleted file mode 100644
index 7989f634d596..000000000000
--- a/net-www/galeon/files/digest-galeon-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d058f47f0f626dac3fda70c1c332052 galeon-1.2.1.tar.gz 3931284
diff --git a/net-www/galeon/files/digest-galeon-1.2.1-r1 b/net-www/galeon/files/digest-galeon-1.2.1-r1
deleted file mode 100644
index 7989f634d596..000000000000
--- a/net-www/galeon/files/digest-galeon-1.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d058f47f0f626dac3fda70c1c332052 galeon-1.2.1.tar.gz 3931284
diff --git a/net-www/galeon/files/digest-galeon-1.2.1-r2 b/net-www/galeon/files/digest-galeon-1.2.1-r2
deleted file mode 100644
index 7989f634d596..000000000000
--- a/net-www/galeon/files/digest-galeon-1.2.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d058f47f0f626dac3fda70c1c332052 galeon-1.2.1.tar.gz 3931284
diff --git a/net-www/galeon/files/digest-galeon-1.2.3-r2 b/net-www/galeon/files/digest-galeon-1.2.3-r2
new file mode 100644
index 000000000000..221ad2154450
--- /dev/null
+++ b/net-www/galeon/files/digest-galeon-1.2.3-r2
@@ -0,0 +1 @@
+MD5 19f9888e0493e6ca5da4752d3dfb5137 galeon-1.2.3.tar.gz 3936664
diff --git a/net-www/galeon/galeon-1.2.0-r1.ebuild b/net-www/galeon/galeon-1.2.0-r1.ebuild
deleted file mode 100644
index 6ef08ad4d355..000000000000
--- a/net-www/galeon/galeon-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.0-r1.ebuild,v 1.3 2002/05/27 17:27:39 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A small webbrowser for gnome that uses mozillas render engine"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
-	 mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://galeon.sourceforge.net"
-
-DEPEND=">=dev-libs/libxml-1.8.16
-        >=dev-util/intltool-0.11
-		~net-www/mozilla-0.9.9
-		>=gnome-base/libglade-0.17-r1
-		>=gnome-base/gnome-core-1.4.0.4-r1
-		>=gnome-base/gnome-vfs-1.0.2-r1
-		>=gnome-base/gconf-1.0.7-r2
-		>=gnome-base/oaf-0.6.7
-		>=media-libs/gdk-pixbuf-0.16.0-r1
-		>=gnome-base/ORBit-0.5.13
-		=x11-libs/gtk+-1.2*
-		>=gnome-base/bonobo-1.0.19
-		nls? ( sys-devel/gettext )"
-
-
-src_compile() {
-
-	local myconf
-
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	./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-applet					\
-		    --disable-install-schemas			\
-		    --enable-nautilus-view=auto			\
-			$myconf || die
-
-	emake || 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
-}
-
-pkg_postinst() {
-
-	galeon-config-tool --fix-gconf-permissions
-	galeon-config-tool --pkg-install-schemas
-	scrollkeeper-update
-
-}
-
diff --git a/net-www/galeon/galeon-1.2.0-r2.ebuild b/net-www/galeon/galeon-1.2.0-r2.ebuild
deleted file mode 100644
index e4a48e78aa3e..000000000000
--- a/net-www/galeon/galeon-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.0-r2.ebuild,v 1.2 2002/05/27 17:27:39 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A small web-browser for gnome that uses mozillas render engine"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
-	 mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://galeon.sourceforge.net"
-
-DEPEND="~net-www/mozilla-0.9.9
-	>=gnome-base/gnome-libs-1.4.1.4
-	>=gnome-base/libglade-0.17-r1
-	>=gnome-base/gnome-vfs-1.0.2-r1
-	>=gnome-base/gconf-1.0.7-r2
-	>=gnome-base/oaf-0.6.7
-	>=dev-libs/libxml-1.8.16
-	>=media-libs/gdk-pixbuf-0.16.0-r1
-	bonobo? ( >=gnome-base/bonobo-1.0.19-r1 )
-	nls? ( sys-devel/gettext
-	>=dev-util/intltool-0.11 )"
-
-
-src_compile() {
-
-	local myconf
-
-	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-applet					\
-		--disable-install-schemas			\
-		--enable-nautilus-view=auto			\
-		${myconf} || die
-
-	emake || 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
-}
-
-pkg_postinst() {
-
-	galeon-config-tool --fix-gconf-permissions
-	galeon-config-tool --pkg-install-schemas
-	scrollkeeper-update
-
-}
-
diff --git a/net-www/galeon/galeon-1.2.0-r3.ebuild b/net-www/galeon/galeon-1.2.0-r3.ebuild
deleted file mode 100644
index 8eeaf478bc9c..000000000000
--- a/net-www/galeon/galeon-1.2.0-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.0-r3.ebuild,v 1.4 2002/05/27 17:27:39 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A small web-browser for gnome that uses mozillas render engine"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
-	 mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://galeon.sourceforge.net"
-
-DEPEND="~net-www/mozilla-0.9.9
-	>=gnome-base/gnome-libs-1.4.1.4
-	>=gnome-base/libglade-0.17-r1
-	>=gnome-base/gnome-vfs-1.0.2-r1
-	>=gnome-base/gconf-1.0.7-r2
-	>=gnome-base/oaf-0.6.7
-	>=dev-libs/libxml-1.8.16
-	>=media-libs/gdk-pixbuf-0.16.0-r1
-	nls? ( sys-devel/gettext
-	>=dev-util/intltool-0.11 )"
-
-	# bonobo? ( >=gnome-base/bonobo-1.0.19-r1 )
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/galeon-1.2.0-gcc3.patch || die
-
-}
-
-src_compile() {
-
-	local myconf
-
-	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-applet					\
-		--disable-install-schemas			\
-		--enable-nautilus-view=auto			\
-		${myconf} || die
-
-	emake || 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
-}
-
-pkg_postinst() {
-
-	galeon-config-tool --fix-gconf-permissions
-	galeon-config-tool --pkg-install-schemas
-	scrollkeeper-update
-	
-	if [ -z "`use gnome`" ]
-	then
-		einfo "Please remerge libglade with gnome support, or else galeon"
-		einfo "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.2.0.ebuild b/net-www/galeon/galeon-1.2.0.ebuild
deleted file mode 100644
index be2558ed4dba..000000000000
--- a/net-www/galeon/galeon-1.2.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.0.ebuild,v 1.4 2002/05/27 17:27:39 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A small webbrowser for gnome that uses mozillas render engine"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
-	 mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://galeon.sourceforge.net"
-
-DEPEND=">=dev-libs/libxml-1.8.16
-        >=dev-util/intltool-0.11
-		~net-www/mozilla-0.9.9
-		>=gnome-base/libglade-0.17-r1
-		>=gnome-base/gnome-core-1.4.0.4-r1
-		>=gnome-base/gnome-vfs-1.0.2-r1
-		>=gnome-base/gconf-1.0.7-r2
-		>=gnome-base/oaf-0.6.7
-		>=media-libs/gdk-pixbuf-0.16.0-r1
-		>=gnome-base/ORBit-0.5.13
-		=x11-libs/gtk+-1.2*
-		>=gnome-base/bonobo-1.0.19
-		nls? ( sys-devel/gettext )"
-
-
-src_compile() {
-
-	local myconf
-
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					 	\
-		    --sysconfdir=/etc					\
-		    --localstatedir=/var/lib			\
-		    --with-mozilla-libs=${MOZILLA_FIVE_HOME}	\
-	        --with-mozilla-includes=${MOZILLA_FIVE_HOME}/include	\
-		    --without-debug					 	\
-		    --disable-applet					\
-		    --disable-install-schemas			\
-		    --enable-nautilus-view=auto			\
-			$myconf || die
-
-	emake || 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						 \
-	     sysconfdir=${D}/etc					 \
-	     localstatedir=${D}/var/lib					 \
-	     install || die
-
-	dodoc AUTHORS ChangeLog COPYING* FAQ NEWS README TODO THANKS
-}
-
-pkg_postinst() {
-
-	galeon-config-tool --fix-gconf-permissions
-	galeon-config-tool --pkg-install-schemas
-	scrollkeeper-update
-
-}
-
diff --git a/net-www/galeon/galeon-1.2.1-r2.ebuild b/net-www/galeon/galeon-1.2.1-r2.ebuild
deleted file mode 100644
index 75725bc48341..000000000000
--- a/net-www/galeon/galeon-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.1-r2.ebuild,v 1.2 2002/05/27 17:27:39 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A small web-browser for gnome that uses mozillas render engine"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
-	 mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://galeon.sourceforge.net"
-
-DEPEND="~net-www/mozilla-1.0_rc2
-	>=gnome-base/gnome-libs-1.4.1.4
-	>=gnome-base/libglade-0.17-r1
-	>=gnome-base/gnome-vfs-1.0.2-r1
-	>=gnome-base/gconf-1.0.7-r2
-	>=gnome-base/oaf-0.6.7
-	>=dev-libs/libxml-1.8.16
-	>=media-libs/gdk-pixbuf-0.16.0-r1
-	nls? ( sys-devel/gettext
-	>=dev-util/intltool-0.11 )"
-
-	# bonobo? ( >=gnome-base/bonobo-1.0.19-r1 )
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/galeon-1.2.0-gcc3.patch || die
-	patch -p1 < ${FILESDIR}/galeon-1.2.1-gcc3.1.patch || die
-}
-
-src_compile() {
-
-	local myconf
-
-	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-install-schemas \
-		--enable-nautilus-view=auto \
-		${myconf} || die
-
-	emake || 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
-}
-
-pkg_postinst() {
-
-	galeon-config-tool --fix-gconf-permissions
-	galeon-config-tool --pkg-install-schemas
-	scrollkeeper-update
-	
-	if [ -z "`use gnome`" ]
-	then
-		einfo "Please remerge libglade with gnome support, or else galeon"
-		einfo "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.2.1.ebuild b/net-www/galeon/galeon-1.2.1.ebuild
deleted file mode 100644
index 087ed2a254c9..000000000000
--- a/net-www/galeon/galeon-1.2.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.1.ebuild,v 1.4 2002/05/27 17:27:39 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A small web-browser for gnome that uses mozillas render engine"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
-	 mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://galeon.sourceforge.net"
-
-DEPEND="~net-www/mozilla-1.0_rc1
-	>=gnome-base/gnome-libs-1.4.1.4
-	>=gnome-base/libglade-0.17-r1
-	>=gnome-base/gnome-vfs-1.0.2-r1
-	>=gnome-base/gconf-1.0.7-r2
-	>=gnome-base/oaf-0.6.7
-	>=dev-libs/libxml-1.8.16
-	>=media-libs/gdk-pixbuf-0.16.0-r1
-	nls? ( sys-devel/gettext
-	>=dev-util/intltool-0.11 )"
-
-	# bonobo? ( >=gnome-base/bonobo-1.0.19-r1 )
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/galeon-1.2.0-gcc3.patch || die
-
-}
-
-src_compile() {
-
-	local myconf
-
-	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-install-schemas			\
-		--enable-nautilus-view=auto			\
-		${myconf} || die
-
-	emake || 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
-}
-
-pkg_postinst() {
-
-	galeon-config-tool --fix-gconf-permissions
-	galeon-config-tool --pkg-install-schemas
-	scrollkeeper-update
-	
-	if [ -z "`use gnome`" ]
-	then
-		einfo "Please remerge libglade with gnome support, or else galeon"
-		einfo "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.2.1-r1.ebuild b/net-www/galeon/galeon-1.2.3-r2.ebuild
index e2d658f7f73d..dd1d30aa1334 100644
--- a/net-www/galeon/galeon-1.2.1-r1.ebuild
+++ b/net-www/galeon/galeon-1.2.3-r2.ebuild
@@ -1,19 +1,24 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.1-r1.ebuild,v 1.4 2002/05/27 17:27:39 drobbins Exp $
-
+# /space/gentoo/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.3.ebuild,v 1.2 2002/05/27 17:27:39 drobbins Exp
 S=${WORKDIR}/${P}
 DESCRIPTION="A small web-browser for gnome that uses mozillas render engine"
 SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
 	 mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://galeon.sourceforge.net"
 
-DEPEND="~net-www/mozilla-1.0_rc2
+# dont merge mozilla-1.0, as it wont work with galeon, rather start
+# with mozilla-1.0-r1
+DEPEND="~net-www/mozilla-1.0
+	>net-www/mozilla-1.0
 	>=gnome-base/gnome-libs-1.4.1.4
-	>=gnome-base/libglade-0.17-r1
-	>=gnome-base/gnome-vfs-1.0.2-r1
-	>=gnome-base/gconf-1.0.7-r2
+	( >=gnome-base/libglade-0.17
+	  <gnome-base/libglade-1.99.0 )
+	( >=gnome-base/gnome-vfs-1.0
+	  <gnome-base/gnome-vfs-1.9.0 )
+	( >=gnome-base/gconf-1.0
+	  <gnome-base/gconf-1.1.0 )
 	>=gnome-base/oaf-0.6.7
 	>=dev-libs/libxml-1.8.16
 	>=media-libs/gdk-pixbuf-0.16.0-r1
@@ -26,7 +31,10 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/galeon-1.2.0-gcc3.patch || die
+	# These patches break on this version of galeon.
+	# Are they needed for gcc3/3.1 support?
+	#patch -p1 < ${FILESDIR}/galeon-1.2.0-gcc3.patch || die
+	#patch -p1 < ${FILESDIR}/galeon-1.2.1-gcc3.1.patch || die
 }
 
 src_compile() {