better off creating a new -r instead

4 files changed, 95 insertions, 6 deletions

diff --git a/net-www/galeon/ChangeLog b/net-www/galeon/ChangeLog
index 98d777ce16be..e0e7f9fe03a7 100644
--- a/net-www/galeon/ChangeLog
+++ b/net-www/galeon/ChangeLog
@@ -1,12 +1,14 @@
 # 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.8 2002/05/21 21:15:31 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.9 2002/05/21 21:18:15 blocke Exp $
 
-*galeon-1.2.1 (24 Apr 2002)
+*galeon-1.2.1-r1 (21 May 2002)
+
+  21 May 2002; Bruce A. Locke <blocke@shivan.org> galeon-1.2.1-r1.ebuild:
 
-  21 May 2002; Bruce A. Locke <blocke@shivan.org> galeon-1.2.1.ebuild :
+  Galeon 1.2.1 appears to work fine with Mozilla 1.0_rc2
 
-  Galeon website says its safe with Mozilla 1.0_rc2
+*galeon-1.2.1 (24 Apr 2002)
 
   24 Apr 2002; Spider <spider@gentoo.org> galeon-1.2.1.ebuild :
   add --disable-werror to the build
diff --git a/net-www/galeon/files/digest-galeon-1.2.1-r1 b/net-www/galeon/files/digest-galeon-1.2.1-r1
new file mode 100644
index 000000000000..7989f634d596
--- /dev/null
+++ b/net-www/galeon/files/digest-galeon-1.2.1-r1
@@ -0,0 +1 @@
+MD5 4d058f47f0f626dac3fda70c1c332052 galeon-1.2.1.tar.gz 3931284
diff --git a/net-www/galeon/galeon-1.2.1-r1.ebuild b/net-www/galeon/galeon-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..8314cb885982
--- /dev/null
+++ b/net-www/galeon/galeon-1.2.1-r1.ebuild
@@ -0,0 +1,86 @@
+# 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.1 2002/05/21 21:18:15 blocke 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
+	 http://prdownloads.sourceforge.net/${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
+
+}
+
+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
index e0f0096d6941..09b053b0cf94 100644
--- a/net-www/galeon/galeon-1.2.1.ebuild
+++ b/net-www/galeon/galeon-1.2.1.ebuild
@@ -1,7 +1,7 @@
 # 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.2 2002/05/21 21:15:31 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.1.ebuild,v 1.3 2002/05/21 21:18:15 blocke Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A small web-browser for gnome that uses mozillas render engine"
@@ -9,7 +9,7 @@ SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
 	 http://prdownloads.sourceforge.net/${PN}/${P}.tar.gz"
 HOMEPAGE="http://galeon.sourceforge.net"
 
-DEPEND="~net-www/mozilla-1.0_rc2
+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