new version that incorporates several patches from previous release

Package-Manager: portage-2.0.51.20-r5

5 files changed, 111 insertions, 28 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 1fae44af7431..2b23b9c71833 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/epiphany
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.9 2005/04/27 17:34:12 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.10 2005/05/02 02:43:47 joem Exp $
+
+*epiphany-1.6.3 (02 May 2005)
+
+  02 May 2005; Joe McCann <joem@gentoo.org>
+  +files/epiphany-1.6.3-fix_includes.patch, +epiphany-1.6.3.ebuild:
+  new version that incorporates several patches from previous release
 
   27 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.4.8.ebuild:
   Stable on alpha.
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 8be1da16c666..398ad4d5e874 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,43 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 c9bc7c2c21c0458bed8184c4ae139b45 ChangeLog 14410
 MD5 e5f523ab3c3864df6bc9a056270cdf26 epiphany-1.2.10.ebuild 1338
-MD5 3bd417e2964a7df37b72259889c5d224 epiphany-1.6.0-r2.ebuild 1617
-MD5 e54f2151068f2ed7a217a701132f4850 ChangeLog 14197
-MD5 c7411391205185fcfd7fa2ffb8908d04 epiphany-1.6.0-r1.ebuild 1519
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 8aed3342a6f92a5aef502cd9cf13b561 epiphany-1.6.0.ebuild 1434
-MD5 b49c9f6e18e33a9e295c2b730d9bbd0c epiphany-1.4.8.ebuild 1462
-MD5 4e94eac2f85ebe735922ae85ff8f5a68 epiphany-1.4.6.ebuild 1475
-MD5 c7b5bfcfb32adb78e2fc258783cbb8d1 epiphany-1.4.7.ebuild 1497
+MD5 67e7eacaf6ef55d800de3f5a881e3412 epiphany-1.2.9-r1.ebuild 1468
 MD5 359f0d9afadb78a2fc50ad795631eb11 epiphany-1.4.4.ebuild 1375
 MD5 0873a2aa499ea61b33cdaefdf9b46b10 epiphany-1.4.5.ebuild 1375
-MD5 67e7eacaf6ef55d800de3f5a881e3412 epiphany-1.2.9-r1.ebuild 1468
+MD5 4e94eac2f85ebe735922ae85ff8f5a68 epiphany-1.4.6.ebuild 1475
+MD5 c7b5bfcfb32adb78e2fc258783cbb8d1 epiphany-1.4.7.ebuild 1497
+MD5 b49c9f6e18e33a9e295c2b730d9bbd0c epiphany-1.4.8.ebuild 1462
+MD5 c7411391205185fcfd7fa2ffb8908d04 epiphany-1.6.0-r1.ebuild 1519
+MD5 3bd417e2964a7df37b72259889c5d224 epiphany-1.6.0-r2.ebuild 1617
 MD5 78f80546e6e74d2c7b910cf5534987e9 epiphany-1.6.0-r3.ebuild 1530
-MD5 24ec843041b5b9fd528431dd8e291297 files/digest-epiphany-1.4.8 68
-MD5 30122eb94b387560a22559fecccf1d84 files/epiphany-1.5.5-fix_includes.patch 497
-MD5 40c2cd3b20e5f2847e868edbc4f58915 files/epiphany-1.6.0-wallet_fix.patch 598
+MD5 8aed3342a6f92a5aef502cd9cf13b561 epiphany-1.6.0.ebuild 1434
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 25f0e3662f5007533d59b510f1ca3299 epiphany-1.6.3.ebuild 1376
+MD5 56ee35e359c12574247645a59250f5f8 files/digest-epiphany-1.2.10 69
+MD5 86259cda058c165aeb287a2b885b1b7a files/digest-epiphany-1.2.9-r1 68
+MD5 ebbdfe54389d750d3f1772e17d28a790 files/digest-epiphany-1.4.4 68
+MD5 7b909f5b1fad8adc32b25e92037b010f files/digest-epiphany-1.4.5 68
 MD5 8b89ef168d67e7ae303ae92d4997d401 files/digest-epiphany-1.4.6 68
-MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r3 68
-MD5 687a46caa636617d50fcf56d46f4c9f2 files/epiphany-1.2.9-mozilla-1.7.3.patch 972
-MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r2 68
-MD5 c1fc78ef3e0793861e74799bbcb6238c files/epiphany-1.6.0-fix_includes.patch 519
 MD5 7ba3d886ab73458f0569cd500a39b66f files/digest-epiphany-1.4.7 68
+MD5 24ec843041b5b9fd528431dd8e291297 files/digest-epiphany-1.4.8 68
 MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0 68
-MD5 2a6d9343d321b67fb737cb87301facfc files/epiphany-1.6.0-wallet_password.patch 1307
-MD5 ebbdfe54389d750d3f1772e17d28a790 files/digest-epiphany-1.4.4 68
-MD5 124caf61eb374940967a1d4c561270ca files/epiphany-1.4.6-fix_includes.patch 869
-MD5 a9590e1794335ecb9fb376a3b128570b files/epiphany-1.6.0-view_source.patch 11178
+MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r1 68
+MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r2 68
+MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r3 68
+MD5 687a46caa636617d50fcf56d46f4c9f2 files/epiphany-1.2.9-mozilla-1.7.3.patch 972
 MD5 f06f6e1c83f9668cfe31e9da7129ba4a files/epiphany-1.3.4-fix_includes.patch 720
+MD5 124caf61eb374940967a1d4c561270ca files/epiphany-1.4.6-fix_includes.patch 869
 MD5 5dd8a008a5612c492c8d0b648f5b0954 files/epiphany-1.4.6-moz-nsiurip.patch 1071
-MD5 7b909f5b1fad8adc32b25e92037b010f files/digest-epiphany-1.4.5 68
-MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r1 68
-MD5 86259cda058c165aeb287a2b885b1b7a files/digest-epiphany-1.2.9-r1 68
-MD5 56ee35e359c12574247645a59250f5f8 files/digest-epiphany-1.2.10 69
+MD5 30122eb94b387560a22559fecccf1d84 files/epiphany-1.5.5-fix_includes.patch 497
+MD5 c1fc78ef3e0793861e74799bbcb6238c files/epiphany-1.6.0-fix_includes.patch 519
+MD5 a9590e1794335ecb9fb376a3b128570b files/epiphany-1.6.0-view_source.patch 11178
+MD5 40c2cd3b20e5f2847e868edbc4f58915 files/epiphany-1.6.0-wallet_fix.patch 598
+MD5 2a6d9343d321b67fb737cb87301facfc files/epiphany-1.6.0-wallet_password.patch 1307
+MD5 eb83ab75c0e81a4aff0d93a8d8a4e338 files/digest-epiphany-1.6.3 68
+MD5 3e5d6d82d44078ec1c95566207f9bad1 files/epiphany-1.6.3-fix_includes.patch 369
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCb80pKf2g/qXtneoRAuvhAJ9iMVw1I3ltHflaFvb9wVPHcB1tngCdFiu4
-Qn7T7wwoG/8wv00o2FgDBxM=
-=4zjW
+iD8DBQFCdZN+XjcVihsel0ERArUcAKDCAbe3tiyzc2Wtq7mTLAZL7+MT+gCfeXPs
+84062IpJo2fQdJArZf88WL0=
+=SN4c
 -----END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-1.6.3.ebuild b/www-client/epiphany/epiphany-1.6.3.ebuild
new file mode 100644
index 000000000000..56d2ed8cd2f5
--- /dev/null
+++ b/www-client/epiphany/epiphany-1.6.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.6.3.ebuild,v 1.1 2005/05/02 02:43:47 joem Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
+HOMEPAGE="http://www.gnome.org/projects/epiphany/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2.6
+	>=x11-libs/pango-1.8
+	>=x11-libs/gtk+-2.6.3
+	>=gnome-base/gconf-1.2
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/libgnomeui-2.6.0
+	>=gnome-base/libglade-2.3.1
+	>=gnome-base/libbonoboui-2.2
+	>=gnome-base/orbit-2
+	>=gnome-base/gnome-vfs-2.9.2
+	>=gnome-base/gnome-desktop-2.9.91
+	|| ( >=www-client/mozilla-1.7.3
+		 >=www-client/mozilla-firefox-1.0.2-r1 )
+	>=x11-themes/gnome-icon-theme-2.9.3
+	>=x11-libs/startup-notification-0.5"
+# dbus? ( >=sys-apps/dbus-0.22 )
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+USE_DESTDIR="1"
+
+# Mozilla/Firefox DEPEND on >=gtk+-2 now, no need
+# to check it <obz@gentoo.org>
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# Fix include paths for our mozilla
+	epatch ${FILESDIR}/${P}-fix_includes.patch
+}
diff --git a/www-client/epiphany/files/digest-epiphany-1.6.3 b/www-client/epiphany/files/digest-epiphany-1.6.3
new file mode 100644
index 000000000000..7347c490516e
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.6.3
@@ -0,0 +1 @@
+MD5 dcb0dfd819a04dfaa55e63d10ef51496 epiphany-1.6.3.tar.bz2 3021173
diff --git a/www-client/epiphany/files/epiphany-1.6.3-fix_includes.patch b/www-client/epiphany/files/epiphany-1.6.3-fix_includes.patch
new file mode 100644
index 000000000000..33aff4129edc
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-1.6.3-fix_includes.patch
@@ -0,0 +1,19 @@
+--- embed/mozilla/Makefile.in.orig	2005-04-10 23:26:41.774136440 +0200
++++ embed/mozilla/Makefile.in	2005-04-10 23:26:57.013819656 +0200
+@@ -343,6 +343,7 @@
+ 	docshell		\
+ 	dom			\
+ 	exthandler		\
++	find			\
+ 	helperAppDlg		\
+ 	gfx			\
+ 	history			\
+@@ -355,6 +356,7 @@
+ 	passwordmgr		\
+ 	pipboot			\
+ 	pipnss			\
++	pref			\
+ 	shistory		\
+ 	sidebar			\
+ 	uriloader		\
+