cleanup and bump

8 files changed, 20 insertions, 214 deletions

diff --git a/net-www/galeon/Manifest b/net-www/galeon/Manifest
index 6ae0e51c3aea..cc4766dd5343 100644
--- a/net-www/galeon/Manifest
+++ b/net-www/galeon/Manifest
@@ -1,17 +1,13 @@
-MD5 18e05825c1759cc0616a93b644af6e60 ChangeLog 7523
+MD5 cf7ca75543f6436778f220dc451461ef ChangeLog 7733
 MD5 ec784111eba5eea296151646c1b40e64 galeon-1.2.8.ebuild 3254
 MD5 c90bd5a3f085adc3689e5105bb5c7457 galeon-1.2.6.ebuild 3003
 MD5 de55ba364ec5d350564f7bdb54da2dcf galeon-1.2.7-r1.ebuild 3081
 MD5 ae828a2583699d90d06abbd2e6a0ac9a galeon-1.2.7.ebuild 2825
-MD5 b1dcbfc1f26d6f28e920f26e30df45ca galeon-1.3.2.ebuild 1616
-MD5 e3e35eb1d10dcd317a3e73aef9c6ffd6 galeon-1.3.3.ebuild 1800
 MD5 c424b11c68b4f530bfb7e761f212c600 galeon-1.2.9.ebuild 3263
 MD5 952302c8a0bd5a234d6944a9c012e3de galeon-1.3.4.ebuild 1687
-MD5 dcb74769bc96a7df5c3ac1a71dc11ad4 galeon-1.2.10.ebuild 3276
 MD5 674b53b9933342f691592120a033ee36 galeon-1.2.10a.ebuild 3280
-MD5 a543491be6d4bbbc7db1095d36d81731 galeon-1.3.5.ebuild 1728
+MD5 c63edbd2c72c22ca4a680c2645c54eb1 galeon-1.3.5.ebuild 1728
 MD5 7452327082b17acbb2ae8b41e9d4356c files/digest-galeon-1.2.8 65
-MD5 bbfc72f2fb2c1023fa9722dfa6bbfaa4 files/digest-galeon-1.3.2 579
 MD5 61056f75dbefbbf2d8d48ec8c3323152 files/digest-galeon-1.2.6 65
 MD5 f8fed360b2c0bdd6968c349c75e518c2 files/digest-galeon-1.2.7 65
 MD5 f8fed360b2c0bdd6968c349c75e518c2 files/digest-galeon-1.2.7-r1 65
@@ -21,9 +17,7 @@ MD5 d7f05d8c910cd3bc11b799ef300ae13f files/galeon-1.2.6-to-printpreview.patch 44
 MD5 c72506690307bdae2ceec562ac7fdbd9 files/galeon-1.2.7-google-UTF8.patch 1594
 MD5 0b52f2605f9080d9106dc8f0c1c63d5e files/galeon-multitabfix.diff 670
 MD5 27abbf68b9d04fd4ab742e9217d2a4d3 files/galeon-omffix.patch 1420
-MD5 1547a74d44a66a666139d4bf88fea367 files/digest-galeon-1.3.3 65
 MD5 1745a1b5fb19426c721b8d1aefad75fa files/digest-galeon-1.2.9 65
 MD5 45c670ad8bd2014a4b86dcd37c1c5d11 files/digest-galeon-1.3.4 66
-MD5 c08151870ccc9d91e6e8ceb9a8a83b8b files/digest-galeon-1.2.10 66
 MD5 8a4f5575c0225821b55e84ba7e75ae05 files/digest-galeon-1.2.10a 67
 MD5 78ff9de5754da0f1e1d2767d1fb2bb67 files/digest-galeon-1.3.5 66
diff --git a/net-www/galeon/files/digest-galeon-1.2.10 b/net-www/galeon/files/digest-galeon-1.2.10
deleted file mode 100644
index c3804def00b3..000000000000
--- a/net-www/galeon/files/digest-galeon-1.2.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4fbcb46e5803eec5a6b5107993302c02 galeon-1.2.10.tar.gz 4114714
diff --git a/net-www/galeon/files/digest-galeon-1.3.2 b/net-www/galeon/files/digest-galeon-1.3.2
deleted file mode 100644
index bab8157b02d0..000000000000
--- a/net-www/galeon/files/digest-galeon-1.3.2
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 d7f05d8c910cd3bc11b799ef300ae13f /files/galeon-1.2.6-to-printpreview.patch 448
-MD5 27abbf68b9d04fd4ab742e9217d2a4d3 /files/galeon-omffix.patch 1420
-MD5 0b52f2605f9080d9106dc8f0c1c63d5e /files/galeon-multitabfix.diff 670
-MD5 7ab21c1d290a8ed06666290bdc6cc66b /files/galeon-1.2.1-gcc3.1.patch 577
-MD5 73a12e14b8a0a3595bbe9b63e505c3ac /files/galeon-1.2.0-gcc3.patch 1132
-MD5 c72506690307bdae2ceec562ac7fdbd9 /files/galeon-1.2.7-google-UTF8.patch 1594
-MD5 b1dcbfc1f26d6f28e920f26e30df45ca /galeon-1.3.2.ebuild 1616
-MD5 bbec6131a4fecd655f389193a4e35beb galeon-1.3.2.tar.gz 3626777
diff --git a/net-www/galeon/files/digest-galeon-1.3.3 b/net-www/galeon/files/digest-galeon-1.3.3
deleted file mode 100644
index 385d87265ca5..000000000000
--- a/net-www/galeon/files/digest-galeon-1.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e08a66e4c263d24532aacdd695bc75e5 galeon-1.3.3.tar.gz 3726510
diff --git a/net-www/galeon/files/digest-galeon-1.3.5 b/net-www/galeon/files/digest-galeon-1.3.5
new file mode 100644
index 000000000000..7d7c2cf9a50a
--- /dev/null
+++ b/net-www/galeon/files/digest-galeon-1.3.5
@@ -0,0 +1 @@
+MD5 6d0a503e82e0c676712859ee273dcd81 galeon-1.3.5.tar.bz2 2848667
diff --git a/net-www/galeon/galeon-1.2.10.ebuild b/net-www/galeon/galeon-1.2.10.ebuild
deleted file mode 100644
index 6062dc1baf42..000000000000
--- a/net-www/galeon/galeon-1.2.10.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.10.ebuild,v 1.1 2003/04/21 21:24:37 liquidx Exp $
-
-IUSE="nls"
-
-inherit eutils libtool gnome.org
-
-REQ_MOZ_VER="1.3"
-
-S="${WORKDIR}/${P}"
-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="~x86 ~ppc ~alpha ~sparc"
-SLOT="0"
-
-RDEPEND="=net-www/mozilla-${REQ_MOZ_VER}*
-	>=gnome-base/gnome-libs-1.4.1.4
-	<=gnome-base/libglade-0.99.0
-	=gnome-base/gnome-vfs-1.0*
-	=gnome-base/gconf-1.0*
-	>=gnome-base/oaf-0.6.10
-	>=dev-libs/libxml-1.8.17
-	>=media-libs/gdk-pixbuf-0.18.0
-	nls? ( sys-devel/gettext
-	>=dev-util/intltool-0.17 )"
-	# bonobo? ( >=gnome-base/bonobo-1.0.19-r1 )
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper"
-
-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 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_unpack() {
-
-	unpack ${A}
-
-	# Add UTF8 support to the google smart bookmarks.  Note that
-	# it will probibly only work for a newly created bookmark ...
-	# <azarah@gentoo.org> (26 Dec 2002)
-	cd ${S}; epatch ${FILESDIR}/${PN}-1.2.7-google-UTF8.patch
-}
-
-src_compile() {
-
-	elibtoolize
-
-	local myconf=
-	local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
-
-	[ -z "${moz_ver}" ] && moz_ver="${REQ_MOZ_VER}"
-
-	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-werror \
-		--disable-install-schemas \
-		--enable-nautilus-view=no \
-		--with-mozilla-snapshot=${moz_ver} \
-		${myconf} || die
-
-	emake || make || 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 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'
-	fi
-}
-
diff --git a/net-www/galeon/galeon-1.3.2.ebuild b/net-www/galeon/galeon-1.3.2.ebuild
deleted file mode 100644
index b473ceb944ae..000000000000
--- a/net-www/galeon/galeon-1.3.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.3.2.ebuild,v 1.2 2003/04/05 02:35:53 lostlogic Exp $
-
-inherit gnome2
-# inherit debug to enable debugging and do it after gnome2 so as not gnome2 notices debugging
-inherit debug libtool
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://galeon.sourceforge.net"
-
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-SLOT="0"
-
-RDEPEND="virtual/x11
-        >=net-www/mozilla-1.3*
-		>=dev-libs/glib-2.0
-		>=x11-libs/gtk+-2.0
-		>=dev-libs/libxml2-2.4
-		>=gnome-base/gconf-2.0
-		>=gnome-base/ORBit2-2.0
-		>=gnome-base/libbonobo-2.0
-		>=gnome-base/libbonoboui-2.1.1
-		>=gnome-base/bonobo-activation-2.0
-		>=gnome-base/libgnomeui-2.0
-		>=gnome-base/gnome-vfs-2.0
-		>=gnome-base/libglade-2.0"
-        
-DEPEND="${RDEPEND}
-    >=sys-devel/gettext-0.11"
-
-pkg_setup () {
-   if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
-   then
-      eerror "you need mozilla-1.2 compiled against gtk+-2"
-      eerror "export USE=\"gtk2\" ;emerge mozilla -p "
-      die "Need Mozilla compiled with gtk+-2.0!!"
-   fi
-         
-}
-
-src_compile() {
-    elibtoolize
-    # only support mozilla-1.3_beta
-    local myconf=" --with-mozilla-snapshot=1.3b --disable-werror"
-    
-    econf ${myconf} || die "configure failed"
-    make || die "compile failed"
-}
-
-DOCS="AUTHORS COPYING COPYING.README ChangeLog FAQ INSTALL README README.ExtraPrefs THANKS TODO NEWS"
diff --git a/net-www/galeon/galeon-1.3.3.ebuild b/net-www/galeon/galeon-1.3.5.ebuild
index 24f48cd6ada7..e44f4042e894 100644
--- a/net-www/galeon/galeon-1.3.3.ebuild
+++ b/net-www/galeon/galeon-1.3.5.ebuild
@@ -1,36 +1,35 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.3.3.ebuild,v 1.2 2003/03/17 11:24:30 vladimir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.3.5.ebuild,v 1.1 2003/06/10 22:49:03 liquidx Exp $
 
-inherit gnome2
-# inherit debug to enable debugging and do it after gnome2 so as not gnome2 notices debugging
-inherit debug libtool
+inherit gnome2 libtool
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://galeon.sourceforge.net"
+SRC_URI="mirror://sourceforge/galeon/${P}.tar.bz2"
 
 IUSE=""
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 SLOT="0"
 
-REQ_MOZ_VER="1.3b"
+REQ_MOZ_VER="1.3"
 
+# we only allow this to build against moz-1.3, on purpose.
 RDEPEND="virtual/x11
-        >=net-www/mozilla-1.3_beta
-		>=dev-libs/glib-2.0
-		>=x11-libs/gtk+-2.0
-		>=dev-libs/libxml2-2.4
-		>=gnome-base/gconf-2.0
-		>=gnome-base/ORBit2-2.0
-		>=gnome-base/libbonobo-2.0
-		>=gnome-base/libbonoboui-2.1.1
-		>=gnome-base/bonobo-activation-2.0
-		>=gnome-base/libgnomeui-2.0
-		>=gnome-base/gnome-vfs-2.0
-		>=gnome-base/libglade-2.0"
+	=net-www/mozilla-1.3*
+	>=dev-libs/glib-2.0
+	>=x11-libs/gtk+-2.0
+	>=dev-libs/libxml2-2.4
+	>=gnome-base/gconf-2.0
+	>=gnome-base/ORBit2-2.0
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/libbonoboui-2.1.1
+	>=gnome-base/bonobo-activation-2.0
+	>=gnome-base/libgnomeui-2.0
+	>=gnome-base/gnome-vfs-2.0
+	>=gnome-base/libglade-2.0"
         
 DEPEND="${RDEPEND}
     >=sys-devel/gettext-0.11"