galeon 1.2.0 and removing some old ebuilds

12 files changed, 83 insertions, 265 deletions

diff --git a/net-www/galeon/ChangeLog b/net-www/galeon/ChangeLog
index 5a068e1ddae4..c7d06d49e782 100644
--- a/net-www/galeon/ChangeLog
+++ b/net-www/galeon/ChangeLog
@@ -1,13 +1,12 @@
 # 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.1 2002/02/01 21:53:36 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.2 2002/03/13 04:28:58 blocke Exp $
+
+*galeon-1.2.0 (12 Mar 2002)
+
+  12 Mar 2002; Bruce A. Locke <blocke@shivan.org> galeon-1.2.0.ebuild :
+
+  New stable release of galeon.  (Note to developers: galeon changed the
+  way it deals with installing gconfd schemas)
 
-*galeon-1.0.2-r1 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/net-www/galeon/files/digest-galeon-1.0.2 b/net-www/galeon/files/digest-galeon-1.0.2
deleted file mode 100644
index aae14b882b9c..000000000000
--- a/net-www/galeon/files/digest-galeon-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f65a0461fcf7bf1026ff4c4288653849 galeon-1.0.2.tar.gz 3170491
diff --git a/net-www/galeon/files/digest-galeon-1.0.2-r1 b/net-www/galeon/files/digest-galeon-1.0.2-r1
deleted file mode 100644
index aae14b882b9c..000000000000
--- a/net-www/galeon/files/digest-galeon-1.0.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f65a0461fcf7bf1026ff4c4288653849 galeon-1.0.2.tar.gz 3170491
diff --git a/net-www/galeon/files/digest-galeon-1.1.2 b/net-www/galeon/files/digest-galeon-1.1.2
deleted file mode 100644
index 130f8caee3c3..000000000000
--- a/net-www/galeon/files/digest-galeon-1.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 effb6bffc18fdcdacc7297c0f0e28aed galeon-1.1.2.tar.gz 3471627
diff --git a/net-www/galeon/files/digest-galeon-1.1.2-r1 b/net-www/galeon/files/digest-galeon-1.1.2-r1
deleted file mode 100644
index 130f8caee3c3..000000000000
--- a/net-www/galeon/files/digest-galeon-1.1.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 effb6bffc18fdcdacc7297c0f0e28aed galeon-1.1.2.tar.gz 3471627
diff --git a/net-www/galeon/files/digest-galeon-1.2.0 b/net-www/galeon/files/digest-galeon-1.2.0
new file mode 100644
index 000000000000..bd8672c095b2
--- /dev/null
+++ b/net-www/galeon/files/digest-galeon-1.2.0
@@ -0,0 +1 @@
+MD5 766744240a9e06f9aad427c2e6e214f2 galeon-1.2.0.tar.gz 3921182
diff --git a/net-www/galeon/galeon-1.0.2-r1.ebuild b/net-www/galeon/galeon-1.0.2-r1.ebuild
deleted file mode 100644
index 1eaa08c3bae7..000000000000
--- a/net-www/galeon/galeon-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,63 +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.0.2-r1.ebuild,v 1.1 2002/01/24 13:36:04 hallski 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
-	 http://prdownloads.sourceforge.net/${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.7
-	>=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
-	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				 \
-		    $myconf || die
-
-	emake || die
-}
-
-src_install() {
-
-	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.0.2.ebuild b/net-www/galeon/galeon-1.0.2.ebuild
deleted file mode 100644
index de3f96b35e65..000000000000
--- a/net-www/galeon/galeon-1.0.2.ebuild
+++ /dev/null
@@ -1,62 +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.0.2.ebuild,v 1.1 2001/12/31 23:48:03 azarah 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
-	 http://prdownloads.sourceforge.net/${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.7
-	>=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
-	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				 \
-		    $myconf || die
-
-	emake || die
-}
-
-src_install() {
-
-	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.1.2-r1.ebuild b/net-www/galeon/galeon-1.1.2-r1.ebuild
deleted file mode 100644
index a0ed35964a33..000000000000
--- a/net-www/galeon/galeon-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,63 +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.1.2-r1.ebuild,v 1.2 2002/01/24 13:36:04 hallski 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
-	 http://prdownloads.sourceforge.net/${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.7
-	>=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
-	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				 \
-		    $myconf || die
-
-	emake || die
-}
-
-src_install() {
-
-	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.1.2.ebuild b/net-www/galeon/galeon-1.1.2.ebuild
deleted file mode 100644
index a4f0e9dbb02a..000000000000
--- a/net-www/galeon/galeon-1.1.2.ebuild
+++ /dev/null
@@ -1,62 +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.1.2.ebuild,v 1.1 2002/01/17 23:51:19 g2boojum 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
-	 http://prdownloads.sourceforge.net/${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.7
-	>=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
-	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				 \
-		    $myconf || die
-
-	emake || die
-}
-
-src_install() {
-
-	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.1.3.ebuild b/net-www/galeon/galeon-1.1.3.ebuild
index 8514076f4170..062c76e91ca7 100644
--- a/net-www/galeon/galeon-1.1.3.ebuild
+++ b/net-www/galeon/galeon-1.1.3.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.1.3.ebuild,v 1.1 2002/02/05 20:24:05 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.1.3.ebuild,v 1.2 2002/03/13 04:28:58 blocke Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A small webbrowser for gnome that uses mozillas render engine"
@@ -11,7 +11,7 @@ HOMEPAGE="http://galeon.sourceforge.net"
 
 DEPEND=">=dev-libs/libxml-1.8.16
         >=dev-util/intltool-0.11
-	>=net-www/mozilla-0.9.8
+	=net-www/mozilla-0.9.8
 	>=gnome-base/libglade-0.17-r1
 	>=gnome-base/gnome-core-1.4.0.4-r1
 	>=gnome-base/gnome-vfs-1.0.2-r1
diff --git a/net-www/galeon/galeon-1.2.0.ebuild b/net-www/galeon/galeon-1.2.0.ebuild
new file mode 100644
index 000000000000..7fe76fba1d19
--- /dev/null
+++ b/net-www/galeon/galeon-1.2.0.ebuild
@@ -0,0 +1,72 @@
+# 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.1 2002/03/13 04:28:58 blocke 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
+	 http://prdownloads.sourceforge.net/${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.10
+		>=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
+
+}
+