Bump to 3.2.1 from the gnome overlay, drop old. Notable changes: can save pages as...

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 4f1c3aed38d0734bf7c4bf9d39c7bde45d8de9c3..281ba38e61095eafd2885a5a568e972e68e62ff5 100644 (file)
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.274 2011/08/19 14:55:22 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.275 2011/11/06 04:57:01 tetromino Exp $
+
+*epiphany-3.2.1 (06 Nov 2011)
+
+  06 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -epiphany-3.0.4.ebuild, +files/epiphany-3.2.0-optional-networkmanager.patch,
+  +epiphany-3.2.1.ebuild:
+  Bump to 3.2.1 from the gnome overlay, drop old. Notable changes: can save
+  pages as web applications, support for webkit-gtk's spell checker, UI
+  improvements, stability improvements, about:plugins.
 
 *epiphany-3.0.4 (19 Aug 2011)
 

diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 15ab565978d62c3478fb2d0cb2290800d21e97c7..94fc99f09d0c15614d28c784d99105b1c2296152 100644 (file)
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,31 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX epiphany-2.30.6-clearing-passwd.patch 3920 RMD160 cf0bd2480672bffef819c4ab276b86b5063277f0 SHA1 bb387af0a09f494dce4e24a387f29a02bed01178 SHA256 3b6fb2e532be75938f80e74e7559c02f81ae512cccb2e6aff9a37fbe5288d94e
 AUX epiphany-2.30.6-dbus-fix.patch 581 RMD160 52802eb04e3a98946913624fcc72740bebde366f SHA1 bf448d233392474b88db51a126e1b313ce744fa5 SHA256 6a0d826767eeed02300b612e16af99a8f3840ce1f754d437a1ddd8da9d254e95
 AUX epiphany-2.30.6-introspection-prefix.patch 710 RMD160 54c07f6d720310058bcbfcb36a968c1950e69455 SHA1 a5a8d616e3e82b5574dfbd97e2b9cd6afe7389e6 SHA256 19f273f7e193c27d667f0b65443a5fe33b67b1d25a3af14eab0a81c5ea5cdda1
 AUX epiphany-2.30.6-libnotify-0.7.patch 1048 RMD160 3607af827a5732561f2e89d9065f3549e14fcdb0 SHA1 2257b0ecd8916657402374265936706e42a1c9c6 SHA256 c1a59a9df78db07c2cf23d47d881d8d4edf6e55af3d655f8ec9870adf9255390
 AUX epiphany-2.30.6-mime-handler.patch 844 RMD160 ffb3e2295084184bd4cb623f48d94cb7de26e083 SHA1 b8c171d993ddeae3be517e06c465ac0b680df9c7 SHA256 768a092f315c905f18c554616a07eb5595c7d512289c280ea435ea482f0820aa
+AUX epiphany-3.2.0-optional-networkmanager.patch 2729 RMD160 1f95db1db426d8be1ef85dc2c7c36178077b546b SHA1 0b1849ed500a46dbebf52fbe14959e650ef8d828 SHA256 a992b9d25b77f404d8af7435e7ac2b84da2e08a0a99eb6ae212a0302e935b661
 DIST epiphany-2.30.6.tar.bz2 5927938 RMD160 60f2c7d699dd8728dc79cce012475972943c4007 SHA1 a4bde975f9b2b97d6aad14b4b8a715b40d19a155 SHA256 278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc
-DIST epiphany-3.0.4.tar.xz 5082008 RMD160 b6e35f1a9237a3f4b8492fc4e8c1b69d6238aafa SHA1 aca1150c0e9acb532eb631924653929a9046e3eb SHA256 3cfc25c4c939e3df960c28e6c27e7e78645e1121d8634ecbd307672df1f37333
+DIST epiphany-3.2.1.tar.xz 5101156 RMD160 96831872603b51860e315c184285549d886ac93e SHA1 bb82f9890bc27374139305a41952974826a9dab8 SHA256 5ade10d9becce1ca43c30d755fda477c5595a1c0514047f07f7d4b817a2154fe
 EBUILD epiphany-2.30.6-r1.ebuild 2563 RMD160 2877645f280cfb763cffce9bceaa0a7f132a5c15 SHA1 d8abb6fd9d142f363b0a5b7d5c18098e083a61ca SHA256 05014ba4566735fc75c9a26e87cb93df2f23e228753b5321d428b88c1e13d324
-EBUILD epiphany-3.0.4.ebuild 1848 RMD160 5b49ccb9de73397425d929a0171cccbf106be3fa SHA1 d051ed27cd26787a21490812de6d3cc03d3bf723 SHA256 1d4c41ecc0b9150aded3a27cc656d15e79b8656c5eea9fd7b1fba394fd24fac3
-MISC ChangeLog 53644 RMD160 87a637a902e288aa889fefac800ff5d42a9a4fb0 SHA1 bb6c7ea8dc413de14d0e1d4eedda174d217364a3 SHA256 82d422920159915bff045ed9937b8f269f9114e0a060ad3d6a765e041b1eee3c
+EBUILD epiphany-3.2.1.ebuild 2301 RMD160 67608630b6062b09fbb569cf9b7ad6470a207b28 SHA1 ed00879191f08c44dbadd69eb9c41a737c36c3b8 SHA256 44cc70e604d28a806812bd55bc56eed842f2751032efb9240fe04c17339eabf1
+MISC ChangeLog 54044 RMD160 9e73a474f6ef19bd55d064bb8405752633919957 SHA1 d5eac86721a54ffaa0c9b31953bac6274a350d51 SHA256 20ff3fb35881d8061ceda67cf50f591763e6e8581745072521d965cbbb669d59
 MISC metadata.xml 375 RMD160 4b38d1fe16a065d10967f7f17d768dc02bf1fae8 SHA1 96a760f61a9e0bb73120bb75a53b2247b84e9f14 SHA256 34a7f30e213476622090d9d1cbbe640a48f365d7e418686d6c855006b9db14f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOTnlgAAoJEO/kOhxWD91kx6sP/RdFHvtB4ZWcvhkdzAk7K2gq
-8bY0qVvZwx8WwFv8hSig7MzGI5CdhvJxhdhayHYM/WX3ealWHhupqHKXr7wwQ8sj
-Brb20SkR70OpEF+10mxrfJPQ/s+aD4peP/k7SL7o/u/HwOLkIsGpxgWsUZ9zWKyy
-GuDrC37BN5ezMkn2u0FRyvteg9eT5JqRYT3oBbw/t0IF+/kOKswUahpZ0IxKOz3+
-PqMW9/e6d5jwN37YL2Q1WLqhjXNI5i/ZTSjh8BljrdOCYrGjAEza/HgV7WFWcGfE
-movoqOthM8QfDNBE1J6njucTuJIG3C/cC34KxjICAZgRwNqvkSDZH83666m6Bk/e
-qpdaRJloDMoC+0XZz4Zj1f48NcwUhuG7UOk4tbH2aq2NsY6qXWbexTVjdev2/bP9
-wLsciU9xQjhdS64VWSjxQjObE2C7f6NxuMyn/D4OWEP7T4JT7NGm4j40PhwT9Q/n
-gm9iAh1OFMJnq2tBlZ/TAz/vr4muLfnOCzPR/FF0/kNeit47uU08+22lZsJTvzW2
-vqIuzy8wcLNQhoFCxD6l8t3JDKUpwhCuE+r99X9htimKSQnT3dXuqtLrYq2RsufG
-2mEA7VfzFr8OlZOWVYRAtfTFSThFXBtUdEFAzrL3wqGeodynNM0CenCbO5BFpMNy
-SFLwsShRk8ihijEgc1Fx
-=hDSX
+iF4EAREIAAYFAk62E6IACgkQdjK8w9WeBnC8SQEAh0nG+Je3tXEdy6WwO1CrNh3g
+ytagf8UmEWk5whBeb8QBAKmAot6v9f6Iab3xlRSCOHOs1G6i46BnkxLyvxiobqqH
+=FFnB
 -----END PGP SIGNATURE-----

diff --git a/www-client/epiphany/epiphany-3.0.4.ebuild b/www-client/epiphany/epiphany-3.2.1.ebuild
similarity index 58%
rename from www-client/epiphany/epiphany-3.0.4.ebuild
rename to www-client/epiphany/epiphany-3.2.1.ebuild
index af764864b09dc63f4f37e8dcb2c9ff86c4c99e71..2d19748b00a799a3c7ec6b7a5e11983b190e22e3 100644 (file)
--- a/www-client/epiphany/epiphany-3.0.4.ebuild
+++ b/www-client/epiphany/epiphany-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.0.4.ebuild,v 1.1 2011/08/19 14:55:22 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.2.1.ebuild,v 1.1 2011/11/06 04:57:01 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -12,21 +12,22 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avahi doc +introspection networkmanager +nss test"
+IUSE="avahi doc +introspection +networkmanager +nss test"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND=">=dev-libs/glib-2.25.13:2
+# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
+# and 2.30.0
+COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
        >=x11-libs/gtk+-3.0.2:3[introspection?]
        >=dev-libs/libxml2-2.6.12:2
        >=dev-libs/libxslt-1.1.7
-       >=x11-libs/startup-notification-0.5
-       >=dev-libs/dbus-glib-0.71
        >=app-text/iso-codes-0.35
-       >=net-libs/webkit-gtk-1.4.2:3[introspection?]
+       >=net-libs/webkit-gtk-1.6.1:3[introspection?]
        >=net-libs/libsoup-gnome-2.33.1:2.4
        >=gnome-base/gnome-keyring-2.26.0
        >=gnome-base/gsettings-desktop-schemas-0.0.1
+       >=x11-libs/libnotify-0.5.1
 
        x11-libs/libICE
        x11-libs/libSM
@@ -37,30 +38,38 @@ RDEPEND=">=dev-libs/glib-2.25.13:2
 
        avahi? ( >=net-dns/avahi-0.6.22 )
        introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-       networkmanager? ( net-misc/networkmanager )
-       nss? ( dev-libs/nss )
-"
-DEPEND="${RDEPEND}
+       nss? ( dev-libs/nss )"
+# networkmanager is used purely via dbus
+RDEPEND="${COMMON_DEPEND}
+       networkmanager? ( >=net-misc/networkmanager-0.8.997 )"
+DEPEND="${COMMON_DEPEND}
        app-text/gnome-doc-utils
+       >=dev-util/gdbus-codegen-2.30.0
        >=dev-util/intltool-0.40
        dev-util/pkgconfig
        sys-devel/gettext
-       doc? ( >=dev-util/gtk-doc-1 )
-"
+       doc? ( >=dev-util/gtk-doc-1 )"
 
 pkg_setup() {
        DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
        G2CONF="${G2CONF}
                --enable-shared
-               --disable-maintainer-mode
                --disable-schemas-compile
                --disable-scrollkeeper
                --disable-static
                --with-distributor-name=Gentoo
-               --with-ca-file=${ROOT}/etc/ssl/certs/ca-certificates.crt
+               --with-ca-file=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
                $(use_enable avahi zeroconf)
                $(use_enable introspection)
-               $(use_enable networkmanager network-manager)
                $(use_enable nss)
                $(use_enable test tests)"
+       # Upstream no longer makes networkmanager optional, but we still want
+       # to make it possible for prefix users to use epiphany
+       use networkmanager && CFLAGS="${CFLAGS} -DENABLE_NETWORK_MANAGER"
+}
+
+src_prepare() {
+       # Make networkmanager optional for prefix people
+       epatch "${FILESDIR}/${PN}-3.2.0-optional-networkmanager.patch"
+       gnome2_src_prepare
 }

diff --git a/www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch b/www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch
new file mode 100644 (file)
index 0000000..0ac6112
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch
@@ -0,0 +1,94 @@
+From c29d0825816a541c98a3b0b7f1d6bae454cba2b5 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Wed, 7 Sep 2011 17:17:42 -0400
+Subject: [PATCH] Make networkmanager optional
+
+Some people cannot use it for various reasons (e.g. prefix).
+---
+ src/ephy-shell.c |   14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/src/ephy-shell.c b/src/ephy-shell.c
+index c436da1..29b79e6 100644
+--- a/src/ephy-shell.c
++++ b/src/ephy-shell.c
+@@ -63,7 +63,9 @@ struct _EphyShellPrivate {
+   EggToolbarsModel *toolbars_model;
+   EggToolbarsModel *fs_toolbars_model;
+   EphyExtensionsManager *extensions_manager;
++#ifdef ENABLE_NETWORK_MANAGER
+   EphyNetworkManager *nm_proxy;
++#endif
+   GtkWidget *bme;
+   GtkWidget *history_window;
+   GObject *pdm_dialog;
+@@ -435,6 +437,8 @@ ephy_shell_new_window_cb (EphyEmbedSingle *single,
+      NULL, NULL, flags, chromemask, is_popup, 0);
+ }
+ 
++#ifdef ENABLE_NETWORK_MANAGER
++
+ static void
+ ephy_shell_sync_network_status (EphyNetworkManager *nm_proxy,
+                                 NMState state,
+@@ -452,6 +456,8 @@ ephy_shell_sync_network_status (EphyNetworkManager *nm_proxy,
+   ephy_embed_single_set_network_status (single, net_status);
+ }
+ 
++#endif /* ENABLE_NETWORK_MANAGER */
++
+ static GObject*
+ impl_get_embed_single (EphyEmbedShell *embed_shell)
+ {
+@@ -469,12 +475,14 @@ impl_get_embed_single (EphyEmbedShell *embed_shell)
+ 
+     priv->embed_single_connected = TRUE;
+ 
++#ifdef ENABLE_NETWORK_MANAGER
+     /* Now we need the net monitor   */
+     if (ephy_shell_get_net_monitor (shell)) {
+         ephy_shell_sync_network_status (priv->nm_proxy,
+                                         ephy_network_manager_get_state (priv->nm_proxy),
+                                         shell);
+     }
++#endif
+   }
+ 
+   return embed_single;
+@@ -563,6 +571,7 @@ ephy_shell_dispose (GObject *object)
+     priv->bookmarks = NULL;
+   }
+ 
++#ifdef ENABLE_NETWORK_MANAGER
+   if (priv->nm_proxy != NULL) {
+     LOG ("Unref net monitor ");
+     g_signal_handlers_disconnect_by_func
+@@ -570,6 +579,7 @@ ephy_shell_dispose (GObject *object)
+     g_object_unref (priv->nm_proxy);
+     priv->nm_proxy = NULL;
+   }
++#endif /* ENABLE_NETWORK_MANAGER */
+ 
+   G_OBJECT_CLASS (ephy_shell_parent_class)->dispose (object);
+ }
+@@ -915,6 +925,7 @@ ephy_shell_get_extensions_manager (EphyShell *es)
+ GObject *
+ ephy_shell_get_net_monitor (EphyShell *shell)
+ {
++#ifdef ENABLE_NETWORK_MANAGER
+   EphyShellPrivate *priv = shell->priv;
+ 
+   if (priv->nm_proxy == NULL) {
+@@ -929,6 +940,9 @@ ephy_shell_get_net_monitor (EphyShell *shell)
+   }
+ 
+   return G_OBJECT (priv->nm_proxy);
++#else
++  return NULL;
++#endif /* ENABLE_NETWORK_MANAGER */
+ }
+ 
+ static void
+-- 
+1.7.6.1
+