Bump and correct some build time deps. GNOME_DOC_INIT implies at least version 0.3.2 of gnome-doc-utils. eauroreconf means that we need to pull the GNOME_COMPILE_WARNINGS macro from gnome-common provided m4 file, and can't rely on the tarball providing an appropriately generated aclocal.m4 - so dep on gnome-common too

Package-Manager: portage-2.1.2_pre2-r9

4 files changed, 103 insertions, 5 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 2d6e4485b93f..71e96399e577 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/epiphany
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.85 2006/10/08 18:08:43 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.86 2006/10/13 12:47:05 leio Exp $
+
+*epiphany-2.16.1 (13 Oct 2006)
+
+  13 Oct 2006; Mart Raudsepp <leio@gentoo.org> +epiphany-2.16.1.ebuild:
+  Version bump; correct some build deps
 
   08 Oct 2006; Stefan Schweizer <genstef@gentoo.org> epiphany-2.16.0.ebuild:
   Firefox 2 also works with this ebuild. From overlay and bug 149104
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index a5e612e638bb..4dba024a7db9 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX epiphany-1.8.4.1-seamonkey.patch 789 RMD160 92244e522a5b2405add24009b5d900b411f3cc0e SHA1 5ba131f070c531952943116ba618219e3799f374 SHA256 17bd7ad4738591a68fc86662b09fcf526a7130ee2a57efda08381246f9b896d8
 MD5 3569cd36dc553140ba6fee476aa26fde files/epiphany-1.8.4.1-seamonkey.patch 789
 RMD160 92244e522a5b2405add24009b5d900b411f3cc0e files/epiphany-1.8.4.1-seamonkey.patch 789
@@ -10,6 +13,7 @@ DIST epiphany-1.8.4.1.tar.bz2 3360178 RMD160 de5e4f6bfed1269300145c015fea34b0323
 DIST epiphany-2.14.2.1.tar.bz2 3599395 RMD160 c25bc2d22fee0eeaa32ce1e1f71b6d5f3de06cbb SHA1 c1b20979670755f2e82beedb475c42a54be8f993 SHA256 f5cc3aa382fb9b0eec4117dcbfb5a7744943602d1a76bf260c7e5c66741ee6d0
 DIST epiphany-2.14.3.tar.bz2 3626121 RMD160 877717318c367fc1f9c9a7f69058179265082d2b SHA1 6be1f3ac4864e75543d114b4705188d65af5f3d4 SHA256 1acc18428a14806a767f4a10c51d235483dc48b8f42f75c4afe95487f7cf36a0
 DIST epiphany-2.16.0.tar.bz2 3756771 RMD160 eba76e08b659ef193d5e6d714a1de6b4b0a51d3a SHA1 5846c45888918412a39ddefea92921e53429719d SHA256 5f856088de0aa8bd77df394b749cbe7aaba84e6815c77d98002b0e1d75669255
+DIST epiphany-2.16.1.tar.bz2 3761594 RMD160 dd4fe05f8ca019a5ba83788ca5d73c169e247cce SHA1 0610dfb98e44c5f958aff9b8db896b9efbf29817 SHA256 edc36ae24624cae00aa06dde6475c31574d5fc281612dfd1e51cda63c7a9300a
 EBUILD epiphany-1.8.4.1-r1.ebuild 2123 RMD160 083841276ef90bd51f2577ad2e50a34bc250c871 SHA1 9601ebe66d26f1b8b26da5c5ab0c7bff2c68b68d SHA256 b56a528fe1623d8da47837186960622ab4c90e95c057f9ff74a71f046bdbe46d
 MD5 52eb670a97be109767e84cee778a6246 epiphany-1.8.4.1-r1.ebuild 2123
 RMD160 083841276ef90bd51f2577ad2e50a34bc250c871 epiphany-1.8.4.1-r1.ebuild 2123
@@ -30,10 +34,14 @@ EBUILD epiphany-2.16.0.ebuild 1943 RMD160 a10ec1b6900312d1c7d4fe7c19c0498d52b95e
 MD5 250e9c568d23a21f7dd364b6e3d70fe2 epiphany-2.16.0.ebuild 1943
 RMD160 a10ec1b6900312d1c7d4fe7c19c0498d52b95e51 epiphany-2.16.0.ebuild 1943
 SHA256 a0a646812d0f286354471ce18da776b56abbdcf1b717f09c828ff6e86f89fe3e epiphany-2.16.0.ebuild 1943
-MISC ChangeLog 24082 RMD160 2a4232c7024f95541882a7e21b927c3cfa30d865 SHA1 c8c321d6b8ef1d74ccd5d54306b63f3e2d52f4b7 SHA256 fc0f8b058809d6a6ea9a8b0648853e0ace1035a0b1998530c915b12e4307992b
-MD5 8b1e6eda66c75f767f664dd883f208e4 ChangeLog 24082
-RMD160 2a4232c7024f95541882a7e21b927c3cfa30d865 ChangeLog 24082
-SHA256 fc0f8b058809d6a6ea9a8b0648853e0ace1035a0b1998530c915b12e4307992b ChangeLog 24082
+EBUILD epiphany-2.16.1.ebuild 1982 RMD160 e7e94b821099f991721808511617bfbbd3bdbbc7 SHA1 072af6f2765c2b5acc5b5d642d32194118bb5d0e SHA256 745ec49bb543d844328bbb9c9e6e464773a0c8b88071a818e3e00945cb7ffec0
+MD5 f9f26da9390e0079e70d08de418dd526 epiphany-2.16.1.ebuild 1982
+RMD160 e7e94b821099f991721808511617bfbbd3bdbbc7 epiphany-2.16.1.ebuild 1982
+SHA256 745ec49bb543d844328bbb9c9e6e464773a0c8b88071a818e3e00945cb7ffec0 epiphany-2.16.1.ebuild 1982
+MISC ChangeLog 24224 RMD160 3289017981c06082a298d325d979fd87ad5ff30c SHA1 37258e2564512d74b109ba1500910eb8ef804de3 SHA256 fe16a0d2373905b12afc49ea27263d6260a85a36e76ea6206dd20d02532a8810
+MD5 06bb117cb2a1c4835797d97061b27cc5 ChangeLog 24224
+RMD160 3289017981c06082a298d325d979fd87ad5ff30c ChangeLog 24224
+SHA256 fe16a0d2373905b12afc49ea27263d6260a85a36e76ea6206dd20d02532a8810 ChangeLog 24224
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -53,3 +61,13 @@ SHA256 f6c50e38d4c78fcac7502a9a0b8386d587fbd70c03e4f17e5cf385971e5e444f files/di
 MD5 e1700d1a8ef0373cc223cc9b8484746f files/digest-epiphany-2.16.0 253
 RMD160 c3a3764ed757b7c03a4add603fb968b704c9e07a files/digest-epiphany-2.16.0 253
 SHA256 9d34b55087061307dfa972b492ac1c1a5866285336d970e0e53be140d67db42b files/digest-epiphany-2.16.0 253
+MD5 dd439a49d73c308804518dfea2da617c files/digest-epiphany-2.16.1 253
+RMD160 53de0fa736b907a37cabec8b474ca94c23e794a4 files/digest-epiphany-2.16.1 253
+SHA256 4ae08901d8f0039174bfdaefffde4ae810cea81aa0c9b06d3ed60ec6ccdb8c03 files/digest-epiphany-2.16.1 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFL4qykeYb6olFHJcRAimnAJsHjgHdL5Z0o6izopTTbFTfve52awCeKFgR
+RzoHHpsvRihaPHMJ9hJZBBc=
+=rDiE
+-----END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-2.16.1.ebuild b/www-client/epiphany/epiphany-2.16.1.ebuild
new file mode 100644
index 000000000000..1b7c16ad6b82
--- /dev/null
+++ b/www-client/epiphany/epiphany-2.16.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.16.1.ebuild,v 1.1 2006/10/13 12:47:05 leio Exp $
+
+inherit eutils gnome2 multilib autotools
+
+DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
+HOMEPAGE="http://www.gnome.org/projects/epiphany/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc python"
+
+RDEPEND=">=dev-libs/glib-2.12
+	>=x11-libs/gtk+-2.10
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/libglade-2.3.1
+	>=gnome-base/gnome-vfs-2.9.2
+	>=gnome-base/libgnome-2.14
+	>=gnome-base/libgnomeui-2.14
+	>=gnome-base/gnome-desktop-2.9.91
+	>=x11-libs/startup-notification-0.5
+	>=gnome-base/gconf-2
+	>=app-text/iso-codes-0.35
+	>=www-client/mozilla-firefox-1.5
+	>=sys-apps/dbus-0.35
+	python? (
+		>=dev-lang/python-2.3
+		>=dev-python/pygtk-2.7.1
+		>=dev-python/gnome-python-2.6 )
+	x11-themes/gnome-icon-theme"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	>=app-text/gnome-doc-utils-0.3.2
+	>=gnome-base/gnome-common-2.12.0
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+	G2CONF="--disable-scrollkeeper \
+		--with-mozilla=firefox \
+		$(use_enable python)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch ${FILESDIR}/${PN}-1.9.2-broken-firefox.patch
+
+	cp aclocal.m4 old_macros.m4
+	AT_M4DIR=". ${S}/m4" WANT_AUTOCONF="2.5" \
+	eautoreconf || die "Failed to reconfigure"
+}
+
+src_compile() {
+	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat
+	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat.tmp
+	addpredict /usr/$(get_libdir)/mozilla-firefox/components/compreg.dat.tmp
+
+	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
+	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
+
+	gnome2_src_compile
+}
diff --git a/www-client/epiphany/files/digest-epiphany-2.16.1 b/www-client/epiphany/files/digest-epiphany-2.16.1
new file mode 100644
index 000000000000..0d91ef770a7e
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-2.16.1
@@ -0,0 +1,3 @@
+MD5 25fecb147b1c68cc71d2af2bac727724 epiphany-2.16.1.tar.bz2 3761594
+RMD160 dd4fe05f8ca019a5ba83788ca5d73c169e247cce epiphany-2.16.1.tar.bz2 3761594
+SHA256 edc36ae24624cae00aa06dde6475c31574d5fc281612dfd1e51cda63c7a9300a epiphany-2.16.1.tar.bz2 3761594