[gentoo-commits] repo/gentoo:master commit in: www-client/epiphany/files/, www-client/epiphany/

["Pacho Ramos" <pacho@gentoo.org>]

commit:     0e6f0b5ace0c1a8965bd5b26961191e2e6b551ab
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 21:02:33 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 21:03:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e6f0b5a

www-client/epiphany: Don't enable nss by default as people should have already migrated passwords from really old gecko based versions.

Package-Manager: portage-2.2.24

 www-client/epiphany/Manifest                       |  1 -
 www-client/epiphany/epiphany-3.14.2.ebuild         | 97 ----------------------
 www-client/epiphany/epiphany-3.18.0.ebuild         |  2 +-
 .../files/epiphany-3.12.0-missing-symbol.patch     | 39 ---------
 .../files/epiphany-3.14.0-missing-symbol.patch     | 39 ---------
 .../files/epiphany-3.14.0-unittest-1.patch         | 30 -------
 6 files changed, 1 insertion(+), 207 deletions(-)

diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index e2a555d..11e44fe 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,3 +1,2 @@
-DIST epiphany-3.14.2.tar.xz 3063764 SHA256 cc69403b3b7addf30dd6eb703265a77102b8ab3c6194678ad0d2433f251492d0 SHA512 895f70768c4c765fdc221b2d44bfbb6e7599b0231b0af1a7a8a869fd461db6a09cbdd7a0120bda5dfd583d1d667391c574f18caf1aef5971b474d34911581dc7 WHIRLPOOL 0e235b3190b0ef42a9caa241258060dd5db1e8db07275102ec50b5223931badc56b6ad0c7ec32ccf27d74308845d4d9aef736775bbf6e5290a5d9275bd5c669a
 DIST epiphany-3.16.3.tar.xz 3082680 SHA256 d527f1770779ec22d955aeb13b148a846a26144e433ff0480c981af80e2390b1 SHA512 68f4dc0e299b929f244818d93a9af14f48ef2c3a93813fe5457c11d37ddb5a5e2b5ae3f93f0d41e8095590f87d8679d2cee5b6298c128475a9ad9eb6aa3c8bae WHIRLPOOL c82ff5051ac3c1ac2480b846f77893f39f52517f0aa0f7a6084e8b24e98f490264a6adecd89671d89719da835ca84f0613019e281280380bb20d980c2294afe9
 DIST epiphany-3.18.0.tar.xz 3086780 SHA256 d5ba67a8cd85c80b81e076862bcab3fc376ba51b0a1536ca7430608d1f50491d SHA512 16cf080c7aa7f4ec62ec4e143b9407a41ef6f546b2c5e5263a90b72c73ceaf01007dd5047ca3ae79e9418d0484aca0c972cfe640cfdb1314fff709978d1720e2 WHIRLPOOL 61cb7f74d1e1ac188c4c6ae761da5633ee219305847a4e3d7b27299a59229756f3bcc2fede9c625694cb4553a87ba173cc6b2445f06b6a86fe8b13a0355af31d

diff --git a/www-client/epiphany/epiphany-3.14.2.ebuild b/www-client/epiphany/epiphany-3.14.2.ebuild
deleted file mode 100644
index 874cc66..0000000
--- a/www-client/epiphany/epiphany-3.14.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 pax-utils versionator virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web"
-
-# TODO: coverage
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+jit +nss test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.5.5
-	>=app-crypt/libsecret-0.14
-	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.5.90:4[jit?]
-	>=net-libs/libsoup-2.48:2.4
-	>=x11-libs/gtk+-3.13:3
-	>=x11-libs/libnotify-0.5.1:=
-	gnome-base/gnome-desktop:3=
-
-	dev-db/sqlite:3
-	x11-libs/libwnck:3
-	x11-libs/libX11
-
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-
-	nss? ( dev-libs/nss )
-"
-# epiphany-extensions support was removed in 3.7; let's not pretend it still works
-RDEPEND="${COMMON_DEPEND}
-	!www-client/epiphany-extensions
-"
-# paxctl needed for bug #407085
-# eautoreconf requires gnome-common-3.5.5
-DEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-common-3.6
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	sys-apps/paxctl
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix missing symbol in webextension.so, bug #728972
-	epatch "${FILESDIR}"/${PN}-3.14.0-missing-symbol.patch
-
-	# Fix unittests
-	epatch "${FILESDIR}"/${PN}-3.14.0-unittest-*.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		$(use_enable nss) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DISPLAY
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	gnome2_src_install
-	use jit && pax-mark m "${ED}usr/bin/epiphany"
-}

diff --git a/www-client/epiphany/epiphany-3.18.0.ebuild b/www-client/epiphany/epiphany-3.18.0.ebuild
index 5f55544..dfe8607 100644
--- a/www-client/epiphany/epiphany-3.18.0.ebuild
+++ b/www-client/epiphany/epiphany-3.18.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Web"
 # TODO: coverage
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+jit +nss test"
+IUSE="+jit nss test"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="

diff --git a/www-client/epiphany/files/epiphany-3.12.0-missing-symbol.patch b/www-client/epiphany/files/epiphany-3.12.0-missing-symbol.patch
deleted file mode 100644
index 6f2d835..0000000
--- a/www-client/epiphany/files/epiphany-3.12.0-missing-symbol.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 267ec3e2d7ca0f1881cb76d702ac673727f7507a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 22 Apr 2014 21:15:42 +0200
-Subject: [PATCH] Add missing files to webextension library
-
-Otherwise, results in:
-
-avril 22 21:09:36 kanae epiphany.desktop[32013]: Error loading module
-'/usr/lib64/epiphany/3.12/web-extensions/libephywebextension.so':
-/usr/lib64/epiphany/3.12/web-extensions/libephywebextension.so:
-undefined symbol: ephy_profile_utils_set_migration_version
----
- embed/web-extension/Makefile.am | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
-index 5bdb174..be4b08f 100644
---- a/embed/web-extension/Makefile.am
-+++ b/embed/web-extension/Makefile.am
-@@ -22,6 +22,8 @@ libephywebextension_la_SOURCES = \
- 	$(top_srcdir)/lib/ephy-file-helpers.h \
- 	$(top_srcdir)/lib/ephy-form-auth-data.c \
- 	$(top_srcdir)/lib/ephy-form-auth-data.h \
-+	$(top_srcdir)/lib/ephy-profile-utils.c \
-+	$(top_srcdir)/lib/ephy-profile-utils.h \
- 	$(top_srcdir)/lib/ephy-settings.c \
- 	$(top_srcdir)/lib/ephy-settings.h \
- 	$(top_srcdir)/lib/ephy-string.c \
-@@ -39,6 +41,7 @@ libephywebextension_la_CPPFLAGS = \
- libephywebextension_la_CFLAGS = \
- 	-DSHARE_DIR=\"$(pkgdatadir)\" \
- 	-DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \
-+	-DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
- 	$(WEB_EXTENSION_CFLAGS)
- 
- libephywebextension_la_LIBADD = \
--- 
-1.9.0
-

diff --git a/www-client/epiphany/files/epiphany-3.14.0-missing-symbol.patch b/www-client/epiphany/files/epiphany-3.14.0-missing-symbol.patch
deleted file mode 100644
index ede1a5d..0000000
--- a/www-client/epiphany/files/epiphany-3.14.0-missing-symbol.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 46540674cec3fe63f1d560591720f946770159da Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 22 Apr 2014 21:15:42 +0200
-Subject: [PATCH 1/3] Add missing files to webextension library
-
-Otherwise, results in:
-
-avril 22 21:09:36 kanae epiphany.desktop[32013]: Error loading module
-'/usr/lib64/epiphany/3.12/web-extensions/libephywebextension.so':
-/usr/lib64/epiphany/3.12/web-extensions/libephywebextension.so:
-undefined symbol: ephy_profile_utils_set_migration_version
----
- embed/web-extension/Makefile.am | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
-index 86b48b7..a755c89 100644
---- a/embed/web-extension/Makefile.am
-+++ b/embed/web-extension/Makefile.am
-@@ -22,6 +22,8 @@ libephywebextension_la_SOURCES = \
- 	$(top_srcdir)/lib/ephy-file-helpers.h \
- 	$(top_srcdir)/lib/ephy-form-auth-data.c \
- 	$(top_srcdir)/lib/ephy-form-auth-data.h \
-+	$(top_srcdir)/lib/ephy-profile-utils.c \
-+	$(top_srcdir)/lib/ephy-profile-utils.h \
- 	$(top_srcdir)/lib/ephy-settings.c \
- 	$(top_srcdir)/lib/ephy-settings.h \
- 	$(top_srcdir)/lib/ephy-string.c \
-@@ -39,6 +41,7 @@ libephywebextension_la_CPPFLAGS = \
- libephywebextension_la_CFLAGS = \
- 	-DSHARE_DIR=\"$(pkgdatadir)\" \
- 	-DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \
-+	-DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
- 	$(AM_CFLAGS) \
- 	$(WEB_EXTENSION_CFLAGS)
- 
--- 
-2.1.2
-

diff --git a/www-client/epiphany/files/epiphany-3.14.0-unittest-1.patch b/www-client/epiphany/files/epiphany-3.14.0-unittest-1.patch
deleted file mode 100644
index 3b948a5..0000000
--- a/www-client/epiphany/files/epiphany-3.14.0-unittest-1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ddf0dea8e4eb5fe263ddc85d661ce58e55dd554f Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 19 Oct 2014 23:03:02 +0200
-Subject: [PATCH 2/3] Gentoo tests run in ${PORTAGE_TMPDIR} which is not
- guaranteed to be /tmp
-
----
- tests/ephy-file-helpers-test.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
-index c33c1da..bdf7455 100644
---- a/tests/ephy-file-helpers-test.c
-+++ b/tests/ephy-file-helpers-test.c
-@@ -92,12 +92,7 @@ test_ephy_file_helpers_init (void)
-       GFile *file;
- 
-       file = g_file_new_for_path (tmp_dir);
--      /* As a safety measure, only try recursive delete on paths
--       * prefixed with /tmp. */
--      if (g_str_has_prefix (tmp_dir, "/tmp"))
-         g_assert (ephy_file_delete_dir_recursively (file, NULL));
--      else
--        g_warning ("INIT: dangerous path returned as tmp_dir: %s", tmp_dir);
- 
-       g_object_unref (file);
-     }
--- 
-2.1.2
-