new dev version 'n cleanup

9 files changed, 26 insertions, 150 deletions

diff --git a/net-www/galeon/ChangeLog b/net-www/galeon/ChangeLog
index 245b395cee4f..81f3423ca701 100644
--- a/net-www/galeon/ChangeLog
+++ b/net-www/galeon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/galeon
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.52 2003/07/21 21:50:49 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.53 2003/07/25 20:52:01 foser Exp $
+
+*galeon-1.3.7 (25 Jul 2003)
+
+  galeon-1.3.7; foser <foser@gentoo.org> galeon-1.3.7.ebuild :
+  Added intltool and scrollkeeper deps
+  inherit debug because it's a dev release
 
 *galeon-1.3.6 (21 Jul 2003)
 
diff --git a/net-www/galeon/Manifest b/net-www/galeon/Manifest
index a3d09aed3dbc..82d6a4bea1ba 100644
--- a/net-www/galeon/Manifest
+++ b/net-www/galeon/Manifest
@@ -1,17 +1,11 @@
 MD5 97168137db627f922a90bfc86721efe7 galeon-1.3.6.ebuild 1636
 MD5 075fe65978afdfd25487ebafc1316268 galeon-1.2.10a.ebuild 3278
 MD5 a2a4c91720f86d4a962c5923651e3375 galeon-1.2.11.ebuild 3230
-MD5 645ee27a9ef9866e6107cab7f119a3b4 galeon-1.3.5.ebuild 1748
-MD5 97168137db627f922a90bfc86721efe7 galeon-1.3.7.ebuild 1636
-MD5 12d2cfe816b839521bd6455620983dab ChangeLog 8360
-MD5 a9dfb5161aae2559121416e088510721 galeon-1.3.4.ebuild 1706
+MD5 73d0f23d2829366e90befbf230f7c493 galeon-1.3.7.ebuild 1645
+MD5 01417a35fcbb6fcbcb8ea5a76a0193fb ChangeLog 8533
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 fde9f6e9c912f3a70983efbe4fa3b9cd galeon-1.3.5-r1.ebuild 1639
 MD5 d7f05d8c910cd3bc11b799ef300ae13f files/galeon-1.2.6-to-printpreview.patch 448
 MD5 ac03f7ff1c8c933092c3ff11d59e998c files/digest-galeon-1.2.11 66
-MD5 78ff9de5754da0f1e1d2767d1fb2bb67 files/digest-galeon-1.3.5-r1 66
-MD5 45c670ad8bd2014a4b86dcd37c1c5d11 files/digest-galeon-1.3.4 66
-MD5 78ff9de5754da0f1e1d2767d1fb2bb67 files/digest-galeon-1.3.5 66
 MD5 4b04a9c0dc0217c87db1aa94efea4747 files/digest-galeon-1.3.6 66
 MD5 cac60ede25616b6306b53a878da624eb files/digest-galeon-1.3.7 66
 MD5 8a4f5575c0225821b55e84ba7e75ae05 files/digest-galeon-1.2.10a 67
diff --git a/net-www/galeon/files/digest-galeon-1.3.4 b/net-www/galeon/files/digest-galeon-1.3.4
deleted file mode 100644
index 5bbbf0c93fa7..000000000000
--- a/net-www/galeon/files/digest-galeon-1.3.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6cdda4d62abeed1ff4ecae25cf44bf10 galeon-1.3.4.tar.bz2 2699344
diff --git a/net-www/galeon/files/digest-galeon-1.3.5 b/net-www/galeon/files/digest-galeon-1.3.5
deleted file mode 100644
index 7d7c2cf9a50a..000000000000
--- a/net-www/galeon/files/digest-galeon-1.3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d0a503e82e0c676712859ee273dcd81 galeon-1.3.5.tar.bz2 2848667
diff --git a/net-www/galeon/files/digest-galeon-1.3.5-r1 b/net-www/galeon/files/digest-galeon-1.3.5-r1
deleted file mode 100644
index 7d7c2cf9a50a..000000000000
--- a/net-www/galeon/files/digest-galeon-1.3.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d0a503e82e0c676712859ee273dcd81 galeon-1.3.5.tar.bz2 2848667
diff --git a/net-www/galeon/files/digest-galeon-1.3.7 b/net-www/galeon/files/digest-galeon-1.3.7
new file mode 100644
index 000000000000..b1a453c442bf
--- /dev/null
+++ b/net-www/galeon/files/digest-galeon-1.3.7
@@ -0,0 +1 @@
+MD5 9b89ebfb0a4019f0edd3ef227abc111f galeon-1.3.7.tar.bz2 2979682
diff --git a/net-www/galeon/galeon-1.3.4.ebuild b/net-www/galeon/galeon-1.3.4.ebuild
deleted file mode 100644
index ba10ed59e4d4..000000000000
--- a/net-www/galeon/galeon-1.3.4.ebuild
+++ /dev/null
@@ -1,61 +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.4.ebuild,v 1.4 2003/07/19 21:02:19 pvdabeel Exp $
-
-inherit gnome.org gnome2 libtool
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)"
-HOMEPAGE="http://galeon.sourceforge.net"
-
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-SLOT="0"
-
-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*
-	>=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}
-	dev-util/pkgconfig
-    >=sys-devel/gettext-0.11"
-
-pkg_setup () {
-   if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
-   then
-      eerror "you need mozilla-1.3+ compiled against gtk+-2"
-      eerror "export USE=\"gtk2\" ;emerge mozilla -p "
-      die "Need Mozilla compiled with gtk+-2.0!!"
-   fi
-         
-}
-
-src_compile() {
-    elibtoolize
-    local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
-    local myconf="--disable-werror"
-    
-    if [ -z "${moz_ver}" ]; then
-       moz_ver=${REQ_MOZ_VER}
-    fi
-    myconf="${myconf} --with-mozilla-snapshot=${moz_ver}"
-    
-    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.5.ebuild b/net-www/galeon/galeon-1.3.5.ebuild
deleted file mode 100644
index 2693a6e0ca5b..000000000000
--- a/net-www/galeon/galeon-1.3.5.ebuild
+++ /dev/null
@@ -1,62 +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.5.ebuild,v 1.3 2003/07/19 21:02:19 pvdabeel Exp $
-
-inherit gnome2 libtool
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)"
-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.3"
-
-# we only allow this to build against moz-1.3, on purpose.
-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}
-	dev-util/pkgconfig
-    >=sys-devel/gettext-0.11"
-
-pkg_setup () {
-   if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
-   then
-      eerror "you need mozilla-1.3+ compiled against gtk+-2"
-      eerror "export USE=\"gtk2\" ;emerge mozilla -p "
-      die "Need Mozilla compiled with gtk+-2.0!!"
-   fi
-         
-}
-
-src_compile() {
-    elibtoolize
-    local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
-    local myconf="--disable-werror"
-    
-    if [ -z "${moz_ver}" ]; then
-       moz_ver=${REQ_MOZ_VER}
-    fi
-    myconf="${myconf} --with-mozilla-snapshot=${moz_ver}"
-    
-    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.5-r1.ebuild b/net-www/galeon/galeon-1.3.7.ebuild
index babb0839449a..c504702eb024 100644
--- a/net-www/galeon/galeon-1.3.5-r1.ebuild
+++ b/net-www/galeon/galeon-1.3.7.ebuild
@@ -1,42 +1,43 @@
 # 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.5-r1.ebuild,v 1.3 2003/07/19 21:02:19 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.3.7.ebuild,v 1.1 2003/07/25 20:52:01 foser Exp $
 
-inherit gnome2 libtool
+inherit gnome2 debug libtool
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)"
 HOMEPAGE="http://galeon.sourceforge.net"
 SRC_URI="mirror://sourceforge/galeon/${P}.tar.bz2"
 
 IUSE=""
 LICENSE="GPL-2"
-KEYWORDS="~x86 ppc"
+KEYWORDS="~x86 ~ppc"
 SLOT="0"
 
 # supports both moz-1.3 and moz-1.4
 RDEPEND="virtual/x11
 	>=net-www/mozilla-1.3
-	>=dev-libs/glib-2.0
-	>=x11-libs/gtk+-2.0
+	>=dev-libs/glib-2
+	>=x11-libs/gtk+-2
 	>=dev-libs/libxml2-2.4
-	>=gnome-base/gconf-2.0
-	>=gnome-base/ORBit2-2.0
-	>=gnome-base/libbonobo-2.0
+	>=gnome-base/gconf-2
+	>=gnome-base/ORBit2-2
+	>=gnome-base/libbonobo-2
 	>=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"
+	>=gnome-base/bonobo-activation-2
+	>=gnome-base/libgnomeui-2.0.5
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libglade-2
+	app-text/scrollkeeper"
         
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-    >=sys-devel/gettext-0.11"
+	dev-util/intltool
+	>=sys-devel/gettext-0.11"
 
 pkg_setup () {
    if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
    then
-      eerror "you need mozilla-1.4+ compiled against gtk+-2"
+      eerror "you need mozilla-1.3+ compiled against gtk+-2"
       eerror "export USE=\"gtk2\" ;emerge mozilla -p "
       die "Need Mozilla compiled with gtk+-2.0!!"
    fi