remove Werror from build

10 files changed, 28 insertions, 181 deletions

diff --git a/net-www/epiphany/ChangeLog b/net-www/epiphany/ChangeLog
index 7f167f27b506..d65623f95787 100644
--- a/net-www/epiphany/ChangeLog
+++ b/net-www/epiphany/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for net-www/epiphany
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.10 2003/07/16 14:52:53 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.11 2003/07/27 19:29:04 foser Exp $
 
 *epiphany-0.8.0 (16 Jul 2003)
 
+  27 Jul 2003; foser <foser@gentoo.org> epiphany-0.8.0.ebuild :
+  Fix mozilla dep to be moer forgiving
+  Remove -Werror to fix gcc2 build failures (#22413)
+
   16 Jul 2003; Hanno Boeck <hanno@gentoo.org> epiphany-0.8.0.ebuild:
   Version bump.
 
diff --git a/net-www/epiphany/Manifest b/net-www/epiphany/Manifest
index 19af3be0fca7..64152dceb713 100644
--- a/net-www/epiphany/Manifest
+++ b/net-www/epiphany/Manifest
@@ -1,11 +1,4 @@
-MD5 63f8d994a1dc112197a680baec090edf ChangeLog 1578
-MD5 6e88fe6945f2fba0995a5e77a28c797b epiphany-0.7.0.ebuild 1218
-MD5 423c9bf2ba0d2c6b858e71e580b0a88d epiphany-0.7.3.ebuild 1218
-MD5 3dcf9550225a42e93bab4ab26ae3d7b4 epiphany-0.7.3-r1.ebuild 1311
+MD5 0984475f62a403dfc8418850d092b48a epiphany-0.8.0.ebuild 1413
+MD5 233d333ed606e9241e877128c8f223d2 ChangeLog 1735
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 ca1f245144a0fe5b698e225f05d53013 epiphany-0.8.0.ebuild 1307
-MD5 8b7e0d5dbefcdc3398812d365dfcfb8a files/digest-epiphany-0.7.0 68
-MD5 71ca521b24101fa9e437e01afaec9397 files/digest-epiphany-0.7.3 68
-MD5 e9b02b08287ab6b521a54faaa0074207 files/ppc_va_list.patch 552
-MD5 71ca521b24101fa9e437e01afaec9397 files/digest-epiphany-0.7.3-r1 68
 MD5 17b971d82c0b4df1773e40079d2f012c files/digest-epiphany-0.8.0 68
diff --git a/net-www/epiphany/epiphany-0.7.0.ebuild b/net-www/epiphany/epiphany-0.7.0.ebuild
deleted file mode 100644
index feb49c037bdf..000000000000
--- a/net-www/epiphany/epiphany-0.7.0.ebuild
+++ /dev/null
@@ -1,50 +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/epiphany/epiphany-0.7.0.ebuild,v 1.5 2003/07/09 15:43:33 liquidx Exp $
-
-inherit gnome2 debug
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://epiphany.mozdev.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-G2CONF="${G2CONF} --with-mozilla-snapshot=1.3"
-
-RDEPEND=">=gnome-base/gconf-1.2
-	>=x11-libs/gtk+-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/bonobo-activation-2
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/ORBit2-2
-	>=gnome-base/gnome-vfs-2
-	=net-www/mozilla-1.3*
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-	if [ "${ARCH}" = "ppc" ] ; then
-		epatch ${FILESDIR}/ppc_va_list.patch
-	fi
-}
-
-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
-}
-
diff --git a/net-www/epiphany/epiphany-0.7.3-r1.ebuild b/net-www/epiphany/epiphany-0.7.3-r1.ebuild
deleted file mode 100644
index 3ee33d9cbf18..000000000000
--- a/net-www/epiphany/epiphany-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,49 +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/epiphany/epiphany-0.7.3-r1.ebuild,v 1.1 2003/07/10 17:27:36 spider Exp $
-
-
-# This fixes a paralell build problem that recently cropped up on my sytem
-MAKEOPTS="-j1"
-inherit gnome2 debug
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://epiphany.mozdev.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-G2CONF="${G2CONF} --with-mozilla-snapshot=1.4"
-
-RDEPEND=">=gnome-base/gconf-1.2
-	>=x11-libs/gtk+-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/bonobo-activation-2
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/ORBit2-2
-	>=gnome-base/gnome-vfs-2
-	=net-www/mozilla-1.4*
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
-
-pkg_setup () {
-	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
-	then
-		eerror "you need mozilla-1.4 compiled against gtk+-2"
-		eerror "export USE=\"gtk2\" ;emerge mozilla -p "
-		die "Need Mozilla compiled with gtk+-2.0!!"
-	fi
-}
-
-pkg_postinst() {
-	einfo "Gconf keys for some settings have changed,"
-	einfo "you may have to reset some settings."
-}
diff --git a/net-www/epiphany/epiphany-0.7.3.ebuild b/net-www/epiphany/epiphany-0.7.3.ebuild
deleted file mode 100644
index 334c168b9ca2..000000000000
--- a/net-www/epiphany/epiphany-0.7.3.ebuild
+++ /dev/null
@@ -1,46 +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/epiphany/epiphany-0.7.3.ebuild,v 1.2 2003/07/09 15:43:33 liquidx Exp $
-
-inherit gnome2 debug
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://epiphany.mozdev.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-G2CONF="${G2CONF} --with-mozilla-snapshot=1.3"
-
-RDEPEND=">=gnome-base/gconf-1.2
-	>=x11-libs/gtk+-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/bonobo-activation-2
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/ORBit2-2
-	>=gnome-base/gnome-vfs-2
-	=net-www/mozilla-1.3*
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
-
-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
-}
-
-pkg_postinst() {
-	einfo "Gconf keys for some settings have changed,"
-	einfo "you may have to reset some settings."
-}
diff --git a/net-www/epiphany/epiphany-0.8.0.ebuild b/net-www/epiphany/epiphany-0.8.0.ebuild
index 62f8856a4381..08c8522fa3fe 100644
--- a/net-www/epiphany/epiphany-0.8.0.ebuild
+++ b/net-www/epiphany/epiphany-0.8.0.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-0.8.0.ebuild,v 1.1 2003/07/16 14:52:53 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-0.8.0.ebuild,v 1.2 2003/07/27 19:29:05 foser Exp $
 
-
-# This fixes a paralell build problem that recently cropped up on my sytem
-MAKEOPTS="-j1"
 inherit gnome2 debug
 
 DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
@@ -15,8 +12,6 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
 
-G2CONF="${G2CONF} --with-mozilla-snapshot=1.4"
-
 RDEPEND=">=gnome-base/gconf-1.2
 	>=x11-libs/gtk+-2
 	>=dev-libs/libxml2-2
@@ -26,24 +21,41 @@ RDEPEND=">=gnome-base/gconf-1.2
 	>=gnome-base/libbonoboui-2.1.1
 	>=gnome-base/ORBit2-2
 	>=gnome-base/gnome-vfs-2
-	=net-www/mozilla-1.4*
+	>=net-www/mozilla-1.3
 	app-text/scrollkeeper"
 
 DEPEND="${RDEPEND}
+	sys-devel/autoconf
 	dev-util/pkgconfig"
 
 DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
 
+MAKEOPTS="${MAKEOPTS} -j1"
+
 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
 }
 
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+
+	# quick fix for #22413
+	mv configure.in configure.in.old
+	sed -e "s:GNOME_COMPILE_WARNINGS(error)::" configure.in.old > configure.in
+
+	autoconf || die
+
+}
+
 pkg_postinst() {
-	einfo "Gconf keys for some settings have changed,"
+	einfo "GConf keys for some settings have changed,"
 	einfo "you may have to reset some settings."
 }
diff --git a/net-www/epiphany/files/digest-epiphany-0.7.0 b/net-www/epiphany/files/digest-epiphany-0.7.0
deleted file mode 100644
index d9ca8eedb50a..000000000000
--- a/net-www/epiphany/files/digest-epiphany-0.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 db0e1071f9cc1b7dac1854557c27a177 epiphany-0.7.0.tar.bz2 1194230
diff --git a/net-www/epiphany/files/digest-epiphany-0.7.3 b/net-www/epiphany/files/digest-epiphany-0.7.3
deleted file mode 100644
index c99f897ea172..000000000000
--- a/net-www/epiphany/files/digest-epiphany-0.7.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10c9481303255bd7a356964ed8392ab6 epiphany-0.7.3.tar.bz2 1193899
diff --git a/net-www/epiphany/files/digest-epiphany-0.7.3-r1 b/net-www/epiphany/files/digest-epiphany-0.7.3-r1
deleted file mode 100644
index c99f897ea172..000000000000
--- a/net-www/epiphany/files/digest-epiphany-0.7.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10c9481303255bd7a356964ed8392ab6 epiphany-0.7.3.tar.bz2 1193899
diff --git a/net-www/epiphany/files/ppc_va_list.patch b/net-www/epiphany/files/ppc_va_list.patch
deleted file mode 100644
index 513fde6e9df9..000000000000
--- a/net-www/epiphany/files/ppc_va_list.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN epiphany-0.7.0.orig/lib/ephy-node.c epiphany-0.7.0/lib/ephy-node.c
---- epiphany-0.7.0.orig/lib/ephy-node.c	2003-06-09 17:27:08.000000000 +0200
-+++ epiphany-0.7.0/lib/ephy-node.c	2003-06-09 17:28:16.000000000 +0200
-@@ -115,7 +115,9 @@
- static void
- callback (long id, EphyNodeSignalData *data, gpointer *user_data)
- {
--	va_list valist = (va_list) user_data[0];
-+	va_list valist;
-+	/* workaround for gcc on ppc*/
- 	EphyNodeSignalType type = GPOINTER_TO_INT (user_data[1]);
-+	__va_copy(valist, user_data[0]);
- 
- 	if (data->type != type) return;