add missing entries; add check for mozilla compiled against gtk+-1.2

4 files changed, 37 insertions, 2 deletions

diff --git a/net-www/galeon/ChangeLog b/net-www/galeon/ChangeLog
index 0bed1bb81c77..64769c82ba64 100644
--- a/net-www/galeon/ChangeLog
+++ b/net-www/galeon/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2002/06/09 02:27:01 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.16 2002/07/13 16:42:42 azarah Exp $
+
+  14 Jul 2002; Martin Schlemmer <azarah@gentoo.org> galeon-1.2.5.ebuild :
+  Add an check for Mozilla compiled against gtk+-1.2, if not quit with
+  an error message.
+
+  14 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add SLOT, FEATURES, and LICENSE entries.
 
 *galeon-1.2.5.ebuild (08 Jun 2002)
   08 Jun 2002; Ryan Phillips <rphillips@gentoo.org> :
diff --git a/net-www/galeon/galeon-1.2.3-r1.ebuild b/net-www/galeon/galeon-1.2.3-r1.ebuild
index 0220bd1c0fab..83bffa72fc69 100644
--- a/net-www/galeon/galeon-1.2.3-r1.ebuild
+++ b/net-www/galeon/galeon-1.2.3-r1.ebuild
@@ -7,6 +7,10 @@ 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="*"
+SLOT="0"
+
 DEPEND="~net-www/mozilla-1.0-r1
 	>=gnome-base/gnome-libs-1.4.1.4
 	( >=gnome-base/libglade-0.17
diff --git a/net-www/galeon/galeon-1.2.3-r2.ebuild b/net-www/galeon/galeon-1.2.3-r2.ebuild
index 2f35f10d5aa4..3ce4ffa2f725 100644
--- a/net-www/galeon/galeon-1.2.3-r2.ebuild
+++ b/net-www/galeon/galeon-1.2.3-r2.ebuild
@@ -7,6 +7,10 @@ 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="*"
+SLOT="0"
+
 # dont merge mozilla-1.0, as it wont work with galeon, rather start
 # with mozilla-1.0-r1
 DEPEND="~net-www/mozilla-1.0
diff --git a/net-www/galeon/galeon-1.2.5.ebuild b/net-www/galeon/galeon-1.2.5.ebuild
index 7ec13be58d49..2aa52534df30 100644
--- a/net-www/galeon/galeon-1.2.5.ebuild
+++ b/net-www/galeon/galeon-1.2.5.ebuild
@@ -7,6 +7,10 @@ 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="*"
+SLOT="0"
+
 # dont merge mozilla-1.0, as it wont work with galeon, rather start
 # with mozilla-1.0-r1
 DEPEND="~net-www/mozilla-1.0
@@ -26,6 +30,22 @@ DEPEND="~net-www/mozilla-1.0
 
 	# bonobo? ( >=gnome-base/bonobo-1.0.19-r1 )
 
+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 do 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}
@@ -38,7 +58,7 @@ src_unpack() {
 
 src_compile() {
 
-	local myconf
+	local myconf=""
 
 	use nls || myconf="${myconf} --disable-nls"
 	# use bonobo && myconf="${myconf} --enable-gnome-file-selector"