diff options
| -rw-r--r-- | net-www/galeon/ChangeLog | 8 | ||||
| -rw-r--r-- | net-www/galeon/files/digest-galeon-1.2.3-r1 | 1 | ||||
| -rw-r--r-- | net-www/galeon/files/digest-galeon-1.2.3-r2 | 1 | ||||
| -rw-r--r-- | net-www/galeon/files/digest-galeon-1.2.6 | 1 | ||||
| -rw-r--r-- | net-www/galeon/galeon-1.2.3-r2.ebuild | 97 | ||||
| -rw-r--r-- | net-www/galeon/galeon-1.2.5-r1.ebuild | 2 | ||||
| -rw-r--r-- | net-www/galeon/galeon-1.2.6.ebuild (renamed from net-www/galeon/galeon-1.2.3-r1.ebuild) | 55 |
7 files changed, 41 insertions, 124 deletions
diff --git a/net-www/galeon/ChangeLog b/net-www/galeon/ChangeLog index 817304d9581d..0ecee66dd58d 100644 --- a/net-www/galeon/ChangeLog +++ b/net-www/galeon/ChangeLog @@ -1,7 +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.20 2002/09/06 04:28:46 spider Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.21 2002/09/16 04:20:15 blocke Exp $ +*galeon-1.2.6 (16 Sep 2002) + + 16 Sep 2002; Bruce A. Locke <blocke@shivan.org> galeon-1.2.6.ebuild: + Version bump, recommended gcc 3.2 ./configure fix, and unneeded patch + removal. Note: This does not fix the upstream bug involving crashes + with forms and gcc 3.2. (see GNOME bugzilla bug #67691) *galeon-1.2.5-r1 (29 Aug 2002) 06 Sep 2002; Spider <spider@gentoo.org> galeon-1.2.5-r1.ebuild : diff --git a/net-www/galeon/files/digest-galeon-1.2.3-r1 b/net-www/galeon/files/digest-galeon-1.2.3-r1 deleted file mode 100644 index 221ad2154450..000000000000 --- a/net-www/galeon/files/digest-galeon-1.2.3-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 19f9888e0493e6ca5da4752d3dfb5137 galeon-1.2.3.tar.gz 3936664 diff --git a/net-www/galeon/files/digest-galeon-1.2.3-r2 b/net-www/galeon/files/digest-galeon-1.2.3-r2 deleted file mode 100644 index 221ad2154450..000000000000 --- a/net-www/galeon/files/digest-galeon-1.2.3-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 19f9888e0493e6ca5da4752d3dfb5137 galeon-1.2.3.tar.gz 3936664 diff --git a/net-www/galeon/files/digest-galeon-1.2.6 b/net-www/galeon/files/digest-galeon-1.2.6 new file mode 100644 index 000000000000..6eb2c2b75976 --- /dev/null +++ b/net-www/galeon/files/digest-galeon-1.2.6 @@ -0,0 +1 @@ +MD5 85738f037bef3504e08173e4d30e4ae3 galeon-1.2.6.tar.gz 4053858 diff --git a/net-www/galeon/galeon-1.2.3-r2.ebuild b/net-www/galeon/galeon-1.2.3-r2.ebuild deleted file mode 100644 index 3ce4ffa2f725..000000000000 --- a/net-www/galeon/galeon-1.2.3-r2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# /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" - -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 - >net-www/mozilla-1.0 - >=gnome-base/gnome-libs-1.4.1.4 - ( >=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 - nls? ( sys-devel/gettext - >=dev-util/intltool-0.11 )" - - # bonobo? ( >=gnome-base/bonobo-1.0.19-r1 ) - -src_unpack() { - - unpack ${A} - cd ${S} - # 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() { - - 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.5-r1.ebuild b/net-www/galeon/galeon-1.2.5-r1.ebuild index 18d6ad24ac94..5438d27a4af9 100644 --- a/net-www/galeon/galeon-1.2.5-r1.ebuild +++ b/net-www/galeon/galeon-1.2.5-r1.ebuild @@ -7,6 +7,8 @@ SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/${P}.tar.gz" HOMEPAGE="http://galeon.sourceforge.net" +inherit debug + LICENSE="gpl-2" KEYWORDS="*" SLOT="0" diff --git a/net-www/galeon/galeon-1.2.3-r1.ebuild b/net-www/galeon/galeon-1.2.6.ebuild index 83bffa72fc69..3a2c90d25681 100644 --- a/net-www/galeon/galeon-1.2.3-r1.ebuild +++ b/net-www/galeon/galeon-1.2.6.ebuild @@ -1,24 +1,24 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# /space/gentoo/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.3.ebuild,v 1.2 2002/05/27 17:27:39 drobbins Exp +# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.6.ebuild,v 1.1 2002/09/16 04:20:16 blocke Exp $ + S=${WORKDIR}/${P} -DESCRIPTION="A small web-browser for gnome that uses mozillas render engine" +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="*" +LICENSE="GPL-2" +KEYWORDS="x86" SLOT="0" -DEPEND="~net-www/mozilla-1.0-r1 +# This version of galeon supports multiple versions. We are allowing only +# mozilla 1.1-r1 and 1.2a at this time. +DEPEND=">=net-www/mozilla-1.1-r1 + <=net-www/mozilla-1.2a >=gnome-base/gnome-libs-1.4.1.4 - ( >=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/libglade-0.99.0 + =gnome-base/gnome-vfs-1.0* + =gnome-base/gconf-1.0* >=gnome-base/oaf-0.6.7 >=dev-libs/libxml-1.8.16 >=media-libs/gdk-pixbuf-0.16.0-r1 @@ -27,19 +27,25 @@ DEPEND="~net-www/mozilla-1.0-r1 # bonobo? ( >=gnome-base/bonobo-1.0.19-r1 ) -src_unpack() { +pkg_setup() { - unpack ${A} - cd ${S} - # 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 + 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_compile() { - local myconf + local myconf="" use nls || myconf="${myconf} --disable-nls" # use bonobo && myconf="${myconf} --enable-gnome-file-selector" @@ -53,11 +59,12 @@ src_compile() { --with-mozilla-includes=${MOZILLA_FIVE_HOME}/include \ --without-debug --disable-werror \ --disable-applet \ + --disable-werror \ --disable-install-schemas \ - --enable-nautilus-view=auto \ + --enable-nautilus-view=no \ ${myconf} || die - emake || die + emake || make || die } src_install() { @@ -84,8 +91,8 @@ pkg_postinst() { if [ -z "`use gnome`" ] then - einfo "Please remerge libglade with gnome support, or else galeon" - einfo "will not be able to start up." + 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' |