Version bump for Gnome 3.12.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 149 insertions, 5 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index e950592fbc80..9b73d597f1a3 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.305 2014/04/27 09:10:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.306 2014/04/27 21:47:45 eva Exp $
+
+*epiphany-3.12.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +epiphany-3.12.0.ebuild,
+  +files/epiphany-3.12.0-missing-symbol.patch:
+  Version bump for Gnome 3.12.
 
   27 Apr 2014; Pacho Ramos <pacho@gentoo.org> -epiphany-3.8.2.ebuild:
   drop old
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 28f28bb63383..9d417eb3b989 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -6,6 +6,7 @@ AUX epiphany-2.30.6-dbus-fix.patch 581 SHA256 6a0d826767eeed02300b612e16af99a8f3
 AUX epiphany-2.30.6-introspection-prefix.patch 710 SHA256 19f273f7e193c27d667f0b65443a5fe33b67b1d25a3af14eab0a81c5ea5cdda1 SHA512 b5d2c14d102eb4d9c493d2d783f7ba42cc3a58bd019172c84f43206fb7e1cadadbf1222c8ff988344495b20e206dd852fc26df40ed883459a25a7a10cd297384 WHIRLPOOL b825a3a0bd8c4f4abca5cd4e52b2f4444db607f025436810d7f0220d4297dd29e3dc66b7399e30d0113b935e0373861597cb55ff3d680edb6172e8fefe09bd96
 AUX epiphany-2.30.6-libnotify-0.7.patch 1048 SHA256 c1a59a9df78db07c2cf23d47d881d8d4edf6e55af3d655f8ec9870adf9255390 SHA512 57dbabbceef0d7a7dc6a5002aaf6730dfabed0d528b2c2bd1d17a46881e0005b8e1b6612a8a6fa964a24b6e741b7a9435da761a1ab2e2d209f5ef0ac345f8286 WHIRLPOOL cc24a425a295075589adaebe4a92a10799f27c13e3d578df5045e8ff879e10836f36697f9a791f1b9ceda9a06e0dc3e43f1e7314b2441e221829b047663d65a3
 AUX epiphany-2.30.6-mime-handler.patch 844 SHA256 768a092f315c905f18c554616a07eb5595c7d512289c280ea435ea482f0820aa SHA512 81f986209ddacd076027fcb8bcb4c77476a282a63cc0058f6a4e4121690254e699294173f9bf7a432bb245a95e74d034d3be3627437a0218fa38994655d54193 WHIRLPOOL f09181d1339068d1c4728849b05f0d3ce4f8ab7055a07a0a53141ff07bb2b1f0c1297f4a45af3a78b4ee440b89bb8daa4d8a0c500077e5623fab53727e60ed0e
+AUX epiphany-3.12.0-missing-symbol.patch 1432 SHA256 804822f48ed9ee6f48d60477601c715a7d73013b6030ec70e5dab06062854bd8 SHA512 980ad30fdc665b05601e0d5eb1a0cf451a2bbbddaebf34ad4cff3bd7e0b07e7961527844be6b3f16f81e22952058d691e731d00d05274e908bade75d63d7bd5a WHIRLPOOL 6d0cfa4db6b08318e73b481aa57fdabe001aad73d37a6444006d9ed22547d57105c0403ab8312951cc135f767b5710fd81a5bd80cdc3400c7a34d2474faca59f
 AUX epiphany-3.3.90-paxctl-introspection.patch 835 SHA256 c7670baab442a5475e33a614d2f71fb4601398a1fc1bc898e6b9359d35d3d6b3 SHA512 c08efa9c4d3f0cc759a758355b5cf32cc4e4101a7a5d2eb03672b72a80829e29058e2561a7e752caa842686f3618dd6f6d0fd68c28b593967b1b596459a5fa07 WHIRLPOOL e45f0e658c636c437068d99e9317c93e90081920e2c1bdb31012e5f6a8c232deac4b7906ee13f635a3cdc878cc83806eb3a5375a138d16014dfcce9c9543642f
 AUX epiphany-3.6.1-test-gwarning.patch 604 SHA256 79ac35fd0eed7333fc26d2ce68ba5be9d91d9a3e44f0da882a870a96552cd196 SHA512 dc8cff14505cae85a6c474ec498de723375a0bad11d1b2434fa9d9560391cbcdcec4c4227065d0aa532e403ba3946c7a0cb0c5b9deff3f51a3fbfea099cf0284 WHIRLPOOL 3f15398c3042fb93292025ce624051bf9af8cc138b856df7cda355a062cff2144b514c62cc6b0a8db336b16c163f60bae8e551a9163b1fcbcc69d901f1ff941c
 AUX epiphany-3.7.5-test-gwarning.patch 976 SHA256 d2d6c70e0271902f534809c9995bd99d276d0b211f0c67c0a170ccf5166b000d SHA512 a91e4540577ed3f418be216af4b728d350ad8206593ad5968737ec49a4865917470a120d07b08580410694d43fd8434464aaf40a62d50abf5ea0071bf02eb3d4 WHIRLPOOL 9ecd3d435d1a0076dbc35aed15d49b460ce198e20370858fc1623a918749f269b0525ef8b41240cfab724304ddaf5a86db5d3ed5a0b69a8b1b62fb276a2caf97
@@ -13,14 +14,16 @@ AUX gir-paxctl-lt-wrapper 276 SHA256 28569b4c59e620bc2ed11fa8c8adc553c7bae98d32d
 AUX paxctl.sh 787 SHA256 f55473f2b044d25598195b6676175bad9531d4374fff65505d7c717d90d0897e SHA512 bbe21688544d3718af5c201212f3b0ae12e91c1119026e967b0cd8acc5200fad483c06e57a24bf83e1839def01dbbbe2d31e7ad4625e8be5ae9bc29e4534a343 WHIRLPOOL 66db2b4101a35aeae40e217465f74ae410733a390cb55dd056bc1f26c245a6f75d124687d1efe8b0f01b5e038fa28ebeeb67367974979fefbf1001defb09ba2e
 DIST epiphany-2.30.6.tar.bz2 5927938 SHA256 278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc SHA512 0057ad94bfba73c3957da185ce087fdcfc621df7e7818fbf46aea63a288de8df7c63b41eafb412a5d8ba3cfafbd3159f0dcda26b66a16c0dca3e0fe54dc84525 WHIRLPOOL 7cf994100bae0a4f9f2fcb13fbbcf47aeb49815910bd51ff05feff369a619aed09079f9c627b7fecad2cb76be9ba15db1791bd0fe42297a60d3730e093f47201
 DIST epiphany-3.10.3.tar.xz 3088664 SHA256 c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7 SHA512 732e53ce67af886e164f16107e46a6000fe8f9a0b2b828c489f19bdd232d6450c32daadbf4c5c422e563e49727cbffd99371c9fab52d435412fc817dd1200b5d WHIRLPOOL ceeffa612d3315733c63bf4b6e808fee17da4aa1c541ae84bc878f0751ff61b8906954aa133198f7d34f059157dfedc9d0e87b742e2f591a0fbd6fb308cb1fa2
+DIST epiphany-3.12.0.tar.xz 3023172 SHA256 c1872e38854b01320d5b8fc17179ebd0ae5ee247c92d3d3cdb7f2b9f54c90d25 SHA512 b28bf7ed9090025d18a9b797c5ac268564038166675dbd998c3534074724a1796be4b55f7b7c56f6308807410929963d5c3c2d9524b586e949482f6c7850d5bf WHIRLPOOL 7b95a3dbee784d62590304fc2e3bca673d33cada5ad3d9cd8cc65d883c329594589894e1d37a661b58c4662bfdc84a217b6243b53bc8e4e9b288f4aa39fd99dc
 EBUILD epiphany-2.30.6-r1.ebuild 2555 SHA256 c33e1fbb5b7e1eab17635dfe1366e700f7ec3d52c20baa4607f2222c4880680b SHA512 04439f27370575106ed9fee4353761fb2aab9e429c2c4631d6e367178c9b636eaee37152091e82f03726713c6655ad404f263724dc2a91ec49a1f9ffc6035349 WHIRLPOOL 597effacf7ed5d5f881ede096afc9f9b2077908eb4432c170dd26dc290573333e5f2d50dc5444ad692be40a1c68e6b5fbe851067a625766ce55af239ee169204
 EBUILD epiphany-3.10.3.ebuild 2196 SHA256 557de820a7ba646fe02c9515af975a32d582eb170db13763572050a535c03051 SHA512 f0b75972ce64027ad2c39c8bc427958dd31719e07147e2a047d2b586df39dea6bde72d91834a52a6e68a7d67f83745d6a9bc6fd79a8bb5c2242dc5b4583d9580 WHIRLPOOL df9e053715e1c936b987b8163e04fb6076da92904fcffaba3ad1c8c210ef945c195a737751bc20c0bb86ed1d9fc633fdf6857770ff9ea47b08ce7746f07823e4
-MISC ChangeLog 59071 SHA256 06492c04ff38657c068286e8aa1b19769801123d38c0918988634132724403ad SHA512 a30b7e4d88d108f989e9fcbef2ec937a788aaafde57cd17e1065a0005d56d9207bd91f3d9948322ddd8bbf116de7c2b018f66f9f2b0820e9ed3d9cb2e3d168bc WHIRLPOOL dd7dff7a60fe1fdf2af916c49d513d8c16da4db9ff04a0745baa4dc9499ae6104bc86db6102452ca9431e1200d1d0f663badf134245c82bd426b214e9a2bafe2
+EBUILD epiphany-3.12.0.ebuild 2339 SHA256 b8ae33bd12abd1ea2926287c26b391668f3c2f56d919d61894612aca4d2cc68c SHA512 7a62081ef63f76197a882487f5df704c77682851c239f4be939644295394e3f0d8c4c98511bb0f4214480b9e7da4ac050ed5c09b665368004511ef7e768df85d WHIRLPOOL b47efd72f28a54b44383f324a5895a1ea696f8a436fc76643922f9076914d7cd558ee03f9622b290e68ad7b99a94cc48addd4e753d8fda19ceca490e2810fc0a
+MISC ChangeLog 59259 SHA256 3c3617c4f9cc5034a45d2ae1e2c1685f454eeadd43f6bd2181a3854312ff7db9 SHA512 f992cf781ea958bf25707830669ea7bda9deae4fe8d7bdee96f0e73ab95ef70eb674abed9532b87409e44d90806c6e293ed28f7cfdd31184847ac34610253400 WHIRLPOOL 10aebd23c3a084852390a3fa03c242cb608f4d6a9f9634a7143324bb3a9b990618adbda83e3291c7cea37ee33215a1c6e44e96bbd3999bf0abf5f46da819829f
 MISC metadata.xml 375 SHA256 34a7f30e213476622090d9d1cbbe640a48f365d7e418686d6c855006b9db14f9 SHA512 a2b21d647ee71d004b28a7e3058155955493bab0241b33b970f5ad1c25376e3d8b922d654bb15f4820d53c6856eda469aa9ad793b8ad4335e1c74957afa09bf3 WHIRLPOOL 997d8a11ae22c881d74ac708d7908c062672fb4fbca76f87aa2770df74f18a1ce02c3ba6567b2d925395532a68347d70e878542950b623806d14481681d566a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNcyZEACgkQCaWpQKGI+9S4CgCeKg5fptrEHjemDnEcPkoVk/UX
-AYMAoIV+2BUhT6Xip5ByHX10kBEmgg4q
-=jK7i
+iEYEAREIAAYFAlNdewIACgkQ1fmVwcYIWAYI4gCdEpANteUKDeB4yVnWdx9WGGIS
+ct8An2AXv6o3dbA511Q2PZ3XnWXivqVP
+=ax25
 -----END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-3.12.0.ebuild b/www-client/epiphany/epiphany-3.12.0.ebuild
new file mode 100644
index 000000000000..b9186771ee5b
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.12.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.12.0.ebuild,v 1.1 2014/04/27 21:47:45 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 pax-utils versionator virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="http://projects.gnome.org/epiphany/"
+
+# 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.4:3[jit?]
+	>=net-libs/libsoup-2.42.1:2.4
+	>=x11-libs/gtk+-3.11.6: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}
+	>=dev-util/intltool-0.50
+	sys-apps/paxctl
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# Tests refuse to run with the gsettings trick for some reason
+RESTRICT="test"
+
+src_prepare() {
+	# Fix missing symbol in webextensio.so
+	epatch "${FILESDIR}"/${P}-missing-symbol.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) \
+		ITSTOOL=$(type -P true)
+}
+
+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/files/epiphany-3.12.0-missing-symbol.patch b/www-client/epiphany/files/epiphany-3.12.0-missing-symbol.patch
new file mode 100644
index 000000000000..6f2d8350ec23
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-3.12.0-missing-symbol.patch
@@ -0,0 +1,39 @@
+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
+