Version bump. Backported fixes from master.

Package-Manager: portage-2.2_rc72/cvs/Linux x86_64

3 files changed, 83 insertions, 6 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 0a75ef2ee9be..c582e7f45bc2 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.252 2010/08/23 22:18:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.253 2010/08/31 18:33:53 eva Exp $
+
+*epiphany-2.30.5 (31 Aug 2010)
+
+  31 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  +epiphany-2.30.5.ebuild:
+  Version bump. Backported fixes from master.
 
   23 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
   -epiphany-2.26.3-r2.ebuild:
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index a6c5fdfc4b78..82f3e775390c 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -21,15 +21,17 @@ AUX epiphany-2.30.2-uri-crash.patch 782 RMD160 b5db55676c1c67582c8cfaad4f53cc198
 DIST epiphany-2.26.3.tar.bz2 5655997 RMD160 ef2474c8523a6787227d3dfa5e8fc9d443708a0c SHA1 d1143fd2f287efe3eab648e1feded9f4911e3236 SHA256 bc3e79cb0d62c30ef32c7cf9eef563b1de1af60f31729dae43c3795d214880ad
 DIST epiphany-2.28.2.tar.bz2 5697393 RMD160 2cfde41e96ceace397bf42231dffd577353f8eeb SHA1 8f382e18dba2ca4292350f1c979986a68ee9b668 SHA256 98b7a60bb42fa5c8ebdec1bf623319ae730e5674ddbcfaf51649093adb079490
 DIST epiphany-2.30.2.tar.bz2 5881032 RMD160 c0bb5e1a14ccbe72531cbf3f0f416c5172437a86 SHA1 76b55e002131ffc00f5b1f244d77e2b75e3fcf1b SHA256 cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a
+DIST epiphany-2.30.5.tar.bz2 5915763 RMD160 0c75dde55ecb3cc6188b7326ab415851ead06ce8 SHA1 40d06fd3c7650653b53bd2313f3403855c0db981 SHA256 dce631547d841a8e6ff5f676c2f41bf8995584b78856391293ea0272742d0e74
 EBUILD epiphany-2.26.3-r4.ebuild 3344 RMD160 36626fac6aee7092e34981c0acc4c0de0ef12b19 SHA1 01ac31f800d5ab13542beada8e9666b8dd3bf95c SHA256 01da9dc81e160dd7b83bd03dc392f6dc9c1bcd4ff7e2a8920479d98f955d267a
 EBUILD epiphany-2.28.2.ebuild 1654 RMD160 6a2816b6d7670602d6e2fb471dc00fa135e73d70 SHA1 67a40d7ddb972c537f01e9eb69f5f73f7c857f0a SHA256 25c69182e40ca6e2ff79f0003980a27673ac65234d98ff653bb993575a8f006c
 EBUILD epiphany-2.30.2-r1.ebuild 2413 RMD160 14dcb9ebff964970fc7d39209290b31ce1da2e17 SHA1 94167345a04fda90dda9441ca8d36ee67d0d27b6 SHA256 ff21a83d0489ef1f53c9668845dcff28c64cc2084a28ec8e45ef3e3ad006d031
-MISC ChangeLog 49499 RMD160 246327f1ab50d177d1f51c779a9462e27e0c21b5 SHA1 7e2820942a34e8c6b4e672a1d524105c7bec4f87 SHA256 b808c4394f6f3f948acd39103244224771b84610036d253666fa732540f48abe
+EBUILD epiphany-2.30.5.ebuild 1860 RMD160 ea68e2c063a3955debd43ef70ce1cfd41a4c11bc SHA1 cb702e8ab9ef2a3d097c0d891ebf8242acc21b17 SHA256 da4b4d6501ec1b0a4b2ddf916549d2a4c178ec13b1efb1db4e4f9c30326c86ca
+MISC ChangeLog 49659 RMD160 2f4b6be8efe3e0838675b25407c4142961d45724 SHA1 e5845ab20225d98767a60878f1eaf7eb84c0d28e SHA256 3e0c4a8c19128d40ec39d72f266cec14a56722576f226370193a52a3d60020bf
 MISC metadata.xml 276 RMD160 459f04368f1f1341a41c24a487a475b22e878228 SHA1 c296c95eafc63e398d5d203f4eaa26a3826b2b6c SHA256 9e2cf9fb8bee83947d19caa6b4610e82b916daa9f744661f19e4f8138e80490a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxy86MACgkQ1fmVwcYIWAaeMwCcDUTt6mB2S1EcorMvlzkECOxL
-t6EAn2GO/KBjCk2VMqOExRlSzjlMJA7p
-=AtOr
+iEYEARECAAYFAkx9SxwACgkQ1fmVwcYIWAb2igCgnHlHEKEH4u+stLqWLP+3Nbm/
+FSMAniSRJ7PnipRTeN0AfuCHMrIsRjvU
+=87Pl
 -----END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-2.30.5.ebuild b/www-client/epiphany/epiphany-2.30.5.ebuild
new file mode 100644
index 000000000000..6ae1a4176e6a
--- /dev/null
+++ b/www-client/epiphany/epiphany-2.30.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.5.ebuild,v 1.1 2010/08/31 18:33:53 eva Exp $
+
+EAPI="2"
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="http://www.gnome.org/projects/epiphany/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+# We are not ready for introspection yet
+IUSE="avahi doc networkmanager +nss test"
+
+# TODO: add seed support
+RDEPEND=">=dev-libs/glib-2.19.7
+	>=x11-libs/gtk+-2.19.5
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.7
+	>=x11-libs/startup-notification-0.5
+	>=x11-libs/libnotify-0.4
+	>=dev-libs/dbus-glib-0.71
+	>=gnome-base/gconf-2
+	>=app-text/iso-codes-0.35
+	>=net-libs/webkit-gtk-1.2.3
+	>=net-libs/libsoup-gnome-2.29.91
+	>=gnome-base/gnome-keyring-2.26.0
+
+	x11-libs/libICE
+	x11-libs/libSM
+
+	avahi? ( >=net-dns/avahi-0.6.22 )
+	networkmanager? ( net-misc/networkmanager )
+	nss? ( dev-libs/nss )
+	x11-themes/gnome-icon-theme"
+#       introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40
+	>=app-text/gnome-doc-utils-0.3.2
+	doc? ( >=dev-util/gtk-doc-1 )"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-introspection
+		--disable-scrollkeeper
+		--disable-maintainer-mode
+		--with-distributor-name=Gentoo
+		$(use_enable avahi zeroconf)
+		$(use_enable networkmanager network-manager)
+		$(use_enable nss)
+		$(use_enable test tests)"
+}
+
+src_compile() {
+	# Fix sandbox error with USE="introspection" and "doc"
+	# https://bugs.webkit.org/show_bug.cgi?id=35471
+	addpredict "$(unset HOME; echo ~)/.local"
+	emake || die "Compile failed"
+}