gnome 2.6 commit

7 files changed, 28 insertions, 68 deletions

diff --git a/net-www/epiphany/ChangeLog b/net-www/epiphany/ChangeLog
index f15dc22cd913..11d9412c7f99 100644
--- a/net-www/epiphany/ChangeLog
+++ b/net-www/epiphany/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/epiphany
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.44 2004/03/09 23:34:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.45 2004/03/20 23:16:26 foser Exp $
+
+*epiphany-1.2.0 (20 Mar 2004)
+
+  20 Mar 2004; foser <foser@gentoo.org> epiphany-1.2.0.ebuild
+  Gnome 2.6 commit
 
   09 Mar 2004; <agriffis@gentoo.org> epiphany-1.0.7.ebuild:
   stable on alpha and ia64
diff --git a/net-www/epiphany/Manifest b/net-www/epiphany/Manifest
index 707cc306e947..4bee6e92b36e 100644
--- a/net-www/epiphany/Manifest
+++ b/net-www/epiphany/Manifest
@@ -1,12 +1,10 @@
-MD5 fd0d74f9eb8eca7e6e54fac4abbc0711 ChangeLog 5911
+MD5 15213f5ebf1527ddd06305a6917e3133 epiphany-1.0.7.ebuild 1222
+MD5 c25dfa21bca952ef26c698bcf9e8ff08 epiphany-1.2.0.ebuild 1322
 MD5 656b1ae4d2e0afb9108aee5fef2fa655 epiphany-1.0.3.ebuild 1235
-MD5 8e515b1bf8456d52fdfce9994656c4c0 epiphany-1.0.4.ebuild 1218
-MD5 da70a41aea108d1b73d4eea0b0ad307c epiphany-1.0.6.ebuild 1215
+MD5 30239c0133709c47888cc82551bf2098 ChangeLog 6021
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 15213f5ebf1527ddd06305a6917e3133 epiphany-1.0.7.ebuild 1222
-MD5 4f5a4ce778dfb58b2bfbd405814d48fa files/digest-epiphany-1.0.3 68
-MD5 6acfaf152abf3f6e7ac85b8fc3c01de2 files/digest-epiphany-1.0.4 68
-MD5 12d908bfb7e273274671768ee2e0fecf files/digest-epiphany-1.0.6 68
-MD5 dd22fe99981a9507d5ad6db00f67eb17 files/epiphany-1.0-disable_Werror.patch 597
 MD5 654a860f4c48d5a11c8fda09d91c6bf6 files/epiphany-1.0.1-session_get_windows-session.patch 528
+MD5 dd22fe99981a9507d5ad6db00f67eb17 files/epiphany-1.0-disable_Werror.patch 597
+MD5 4f5a4ce778dfb58b2bfbd405814d48fa files/digest-epiphany-1.0.3 68
 MD5 5edb401fcdae44c283b7d8b7fbdeba84 files/digest-epiphany-1.0.7 68
+MD5 14a3f5f5ad09282f2e58aacc435a9727 files/digest-epiphany-1.2.0 68
diff --git a/net-www/epiphany/epiphany-1.0.6.ebuild b/net-www/epiphany/epiphany-1.0.6.ebuild
deleted file mode 100644
index ac5628f2fd19..000000000000
--- a/net-www/epiphany/epiphany-1.0.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.0.6.ebuild,v 1.5 2004/01/29 05:05:33 agriffis Exp $
-
-inherit gnome2
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://epiphany.mozdev.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ~amd64 ia64"
-IUSE="gnome"
-
-RDEPEND=">=gnome-base/gconf-1.2
-	>=x11-libs/gtk+-2
-	>=dev-libs/libxml2-2.5.9
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/ORBit2-2
-	>=gnome-base/gnome-vfs-2
-	>=net-www/mozilla-1.4
-	gnome? ( >=gnome-base/nautilus-2.2 )"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
-
-use gnome \
-	&& G2CONF="${G2CONF} --enable-nautilus-view=yes" \
-	|| G2CONF="${G2CONF} --enable-nautilus-view=no"
-
-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
-}
-
diff --git a/net-www/epiphany/epiphany-1.0.4.ebuild b/net-www/epiphany/epiphany-1.2.0.ebuild
index 6ac288be57cc..082db206ca17 100644
--- a/net-www/epiphany/epiphany-1.0.4.ebuild
+++ b/net-www/epiphany/epiphany-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.0.4.ebuild,v 1.5 2004/02/24 09:34:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.2.0.ebuild,v 1.1 2004/03/20 23:16:26 foser Exp $
 
 inherit gnome2
 
@@ -9,24 +9,26 @@ HOMEPAGE="http://epiphany.mozdev.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha ~amd64 ia64"
-IUSE="gnome"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+IUSE="gnome doc"
 
-RDEPEND=">=gnome-base/gconf-1.2
-	>=x11-libs/gtk+-2
-	>=dev-libs/libxml2-2.5.9
+RDEPEND=">=dev-libs/glib-2.3.5
+	>=x11-libs/gtk+-2.3.5
+	>=gnome-base/gconf-1.2
+	>=dev-libs/libxml2-2.6.6
 	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
+	>=gnome-base/libglade-2.3.1
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/ORBit2-2
-	>=gnome-base/gnome-vfs-2
+	>=gnome-base/gnome-vfs-2.3.1
 	>=net-www/mozilla-1.4
-	gnome? ( >=gnome-base/nautilus-2.2 )"
+	gnome? ( >=gnome-base/nautilus-2.5 )"
 
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	dev-util/pkgconfig
-	dev-util/intltool"
+	>=dev-util/intltool-0.29
+	doc? ( >=dev-util/gtk-doc-1 )"
 
 DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
 
@@ -34,6 +36,8 @@ use gnome \
 	&& G2CONF="${G2CONF} --enable-nautilus-view=yes" \
 	|| G2CONF="${G2CONF} --enable-nautilus-view=no"
 
+MAKEOPTS="${MAKEOPTS} -j1"
+
 pkg_setup () {
 
 	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
@@ -42,5 +46,5 @@ pkg_setup () {
 		eerror "export USE=\"gtk2\" ;emerge mozilla -p "
 		die "Need Mozilla compiled with gtk+-2.0!"
 	fi
-}
 
+}
diff --git a/net-www/epiphany/files/digest-epiphany-1.0.4 b/net-www/epiphany/files/digest-epiphany-1.0.4
deleted file mode 100644
index c7f6de1e48ff..000000000000
--- a/net-www/epiphany/files/digest-epiphany-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 08770eaef79ae21ca43e1a2d3217dc37 epiphany-1.0.4.tar.bz2 1828216
diff --git a/net-www/epiphany/files/digest-epiphany-1.0.6 b/net-www/epiphany/files/digest-epiphany-1.0.6
deleted file mode 100644
index 520dae0a9ab4..000000000000
--- a/net-www/epiphany/files/digest-epiphany-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eeb1c339aaf62d7f85a39c93c706b45d epiphany-1.0.6.tar.bz2 1828202
diff --git a/net-www/epiphany/files/digest-epiphany-1.2.0 b/net-www/epiphany/files/digest-epiphany-1.2.0
new file mode 100644
index 000000000000..d955acd634b3
--- /dev/null
+++ b/net-www/epiphany/files/digest-epiphany-1.2.0
@@ -0,0 +1 @@
+MD5 631ef1f4bbe4750e11c299cf5549674e epiphany-1.2.0.tar.bz2 2084285