aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPriit Laes <plaes@plaes.org>2012-01-17 13:33:17 +0200
committerPriit Laes <plaes@plaes.org>2012-01-17 13:35:18 +0200
commit793617b90c7c92cc884cee7bc0fa99d2d3a649ea (patch)
tree63c942d0b2acd7bfcceb8d214002d41160a023c8 /www-client
parentwww-client/epiphany: Added 3.3.4 to overlay (diff)
downloadgnome-793617b90c7c92cc884cee7bc0fa99d2d3a649ea.tar.gz
gnome-793617b90c7c92cc884cee7bc0fa99d2d3a649ea.tar.bz2
gnome-793617b90c7c92cc884cee7bc0fa99d2d3a649ea.zip
www-client/epiphany: Clean up depends
* Drop USE=networkmanager, as it now uses glib's GNetworkMonitor * Demote nss to regular USE flag status, as it's used only for migrating from ancient gecko-based versions. * Drop gdbus-codegen dependency
Diffstat (limited to 'www-client')
-rw-r--r--www-client/epiphany/Manifest5
-rw-r--r--www-client/epiphany/epiphany-3.3.4.ebuild16
-rw-r--r--www-client/epiphany/epiphany-9999.ebuild16
-rw-r--r--www-client/epiphany/files/epiphany-3.3-optional-networkmanager.patch96
4 files changed, 6 insertions, 127 deletions
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index b3939c78..2af1fc12 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,4 +1,3 @@
-AUX epiphany-3.3-optional-networkmanager.patch 2924 RMD160 cbd298845e52748943f58d8eaaf5581d8260e8a3 SHA1 f372c478d720ccbe9cc4332f37f5ab98bcac8a23 SHA256 729783ac42dde6f8a9cbb15a02d4569ec82e562a0b5e4ba972bb20d1085f9603
DIST epiphany-3.3.4.tar.xz 5149512 RMD160 aca40409e4b3ab5d1a9ec163fff649b09421b5fc SHA1 efdc047eceb08d00db03da63e31c94bc4c161b04 SHA256 a65c367ed6f1d375ba5380b7d84a4828e800321f6e56afc7cbf65db86b5f2325
-EBUILD epiphany-3.3.4.ebuild 2144 RMD160 a917312094c4916defaddb681ec3b1e58a5acecc SHA1 cb7335a4efbb7e21c475ee9e694cb29dba251ab9 SHA256 114ebea4dc9c19d6ddcf635f4b511731bd4ebd9f280acd31156c60bb62e3b7dc
-EBUILD epiphany-9999.ebuild 2232 RMD160 b274798ad6b97d6297a0b6e7153b089942cd11b2 SHA1 8c3c579eced8cd1bf50668adb22711418f15aadd SHA256 b8c3c685f344e45529afb45ba6234cef89d2b9da2206e1d42509dbd1019d0b46
+EBUILD epiphany-3.3.4.ebuild 1653 RMD160 ab237fc28267d50fc4f38e247f43c4d5931320a0 SHA1 97afd3b011fb56d53f9b70af7b93e7282760fc10 SHA256 7e11b6b6ea4ade4ebb839c372f81badf29a2835b760da20a643792b74c7ff2b4
+EBUILD epiphany-9999.ebuild 1742 RMD160 c06380dad51dc811585e3c5637e3a5c68f7deced SHA1 0a529744011980d62df761502173719906724816 SHA256 b6ed16d844607a1809141605a29cb7f060eede6ba809974b4175243e040bf1d5
diff --git a/www-client/epiphany/epiphany-3.3.4.ebuild b/www-client/epiphany/epiphany-3.3.4.ebuild
index 7e4d9c23..1c5ec4d7 100644
--- a/www-client/epiphany/epiphany-3.3.4.ebuild
+++ b/www-client/epiphany/epiphany-3.3.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="avahi doc +introspection +networkmanager +nss test"
+IUSE="avahi doc +introspection nss test"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
# XXX: Should we add seed support? Seed seems to be unmaintained now.
@@ -37,12 +37,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
avahi? ( >=net-dns/avahi-0.6.22 )
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
nss? ( dev-libs/nss )"
-# networkmanager is used purely via dbus
-RDEPEND="${COMMON_DEPEND}
- networkmanager? ( >=net-misc/networkmanager-0.8.997 )"
+DEPEND="${COMMON_DEPEND}"
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
@@ -60,13 +57,4 @@ pkg_setup() {
$(use_enable introspection)
$(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_NETWORKMANAGER"
-}
-
-src_prepare() {
- # Make networkmanager optional for prefix people
- epatch "${FILESDIR}/${PN}-3.3-optional-networkmanager.patch"
- gnome2_src_prepare
}
diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 8e95b260..1c43e64d 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="avahi doc +introspection +networkmanager +nss test"
+IUSE="avahi doc +introspection nss test"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -44,12 +44,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
avahi? ( >=net-dns/avahi-0.6.22 )
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
nss? ( dev-libs/nss )"
-# networkmanager is used purely via dbus
-RDEPEND="${COMMON_DEPEND}
- networkmanager? ( >=net-misc/networkmanager-0.8.997 )"
+RDEPEND="${COMMON_DEPEND}"
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
@@ -68,13 +65,4 @@ pkg_setup() {
$(use_enable introspection)
$(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_NETWORKMANAGER"
-}
-
-src_prepare() {
- # Make networkmanager optional for prefix people
- epatch "${FILESDIR}/${PN}-3.3-optional-networkmanager.patch"
- gnome2_src_prepare
}
diff --git a/www-client/epiphany/files/epiphany-3.3-optional-networkmanager.patch b/www-client/epiphany/files/epiphany-3.3-optional-networkmanager.patch
deleted file mode 100644
index cb8d5206..00000000
--- a/www-client/epiphany/files/epiphany-3.3-optional-networkmanager.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 0d814802873ca8ca58479b32886ef7c4fef493bb Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Tue, 17 Jan 2012 13:05:04 +0200
-Subject: [PATCH] [PATCH] Make networkmanager optional
-
-Original patch by Alexandre Rostovtsev
----
- src/ephy-shell.c | 14 ++++++++++++--
- 1 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/ephy-shell.c b/src/ephy-shell.c
-index 40d2f72..4a19925 100644
---- a/src/ephy-shell.c
-+++ b/src/ephy-shell.c
-@@ -57,7 +57,9 @@ struct _EphyShellPrivate {
- GObject *lockdown;
- EphyBookmarks *bookmarks;
- EphyExtensionsManager *extensions_manager;
-+#ifdef ENABLE_NETWORKMANAGER
- GNetworkMonitor *network_monitor;
-+#endif /* ENABLE_NETWORKMANAGER */
- GtkWidget *bme;
- GtkWidget *history_window;
- GObject *pdm_dialog;
-@@ -549,6 +551,7 @@ ephy_shell_new_window_cb (EphyEmbedSingle *single,
- NULL, NULL, flags, chromemask, is_popup, 0);
- }
-
-+#ifdef ENABLE_NETWORKMANAGER
- static void
- ephy_shell_sync_network_status (GNetworkMonitor *monitor,
- gboolean available,
-@@ -563,6 +566,7 @@ ephy_shell_sync_network_status (GNetworkMonitor *monitor,
-
- ephy_embed_single_set_network_status (single, available);
- }
-+#endif /* ENABLE_NETWORKMANAGER */
-
- static GObject*
- impl_get_embed_single (EphyEmbedShell *embed_shell)
-@@ -581,14 +585,15 @@ impl_get_embed_single (EphyEmbedShell *embed_shell)
-
- priv->embed_single_connected = TRUE;
-
-+#ifdef ENABLE_NETWORKMANAGER
- /* Now we need the net monitor */
- if (ephy_shell_get_net_monitor (shell)) {
- ephy_shell_sync_network_status (priv->network_monitor,
- g_network_monitor_get_network_available (priv->network_monitor),
- shell);
- }
-+#endif /* ENABLE_NETWORKMANAGER */
- }
--
- return embed_single;
- }
-
-@@ -663,6 +668,7 @@ ephy_shell_dispose (GObject *object)
- priv->bookmarks = NULL;
- }
-
-+#ifdef ENABLE_NETWORKMANAGER
- if (priv->network_monitor != NULL) {
- LOG ("Unref net monitor ");
- g_signal_handlers_disconnect_by_func
-@@ -670,6 +676,7 @@ ephy_shell_dispose (GObject *object)
- g_object_unref (priv->network_monitor);
- priv->network_monitor = NULL;
- }
-+#endif /* ENABLE_NETWORKMANAGER */
-
- G_OBJECT_CLASS (ephy_shell_parent_class)->dispose (object);
- }
-@@ -969,6 +976,7 @@ ephy_shell_get_extensions_manager (EphyShell *es)
- GObject *
- ephy_shell_get_net_monitor (EphyShell *shell)
- {
-+#ifdef ENABLE_NETWORKMANAGER
- EphyShellPrivate *priv = shell->priv;
-
- if (priv->network_monitor == NULL) {
-@@ -976,8 +984,10 @@ ephy_shell_get_net_monitor (EphyShell *shell)
- g_signal_connect (priv->network_monitor, "network-changed",
- G_CALLBACK (ephy_shell_sync_network_status), shell);
- }
--
- return G_OBJECT (priv->network_monitor);
-+#else
-+ return NULL;
-+#endif /* ENABLE_NETWORKMANAGER */
- }
-
- static void
---
-1.7.8.3
-