Version bump for Gnome 3.10

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 21 insertions, 126 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index e4ffc5abab70..e97cc72b9123 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.299 2013/12/08 19:41:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.300 2013/12/24 17:42:03 pacho Exp $
+
+*epiphany-3.10.3 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +epiphany-3.10.3.ebuild,
+  -epiphany-3.6.1.ebuild, -epiphany-3.8.1.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> epiphany-3.8.2.ebuild:
   x86 stable, bug #478252
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index b4b44504bca7..992851aeed10 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -12,19 +12,17 @@ AUX epiphany-3.7.5-test-gwarning.patch 976 SHA256 d2d6c70e0271902f534809c9995bd9
 AUX gir-paxctl-lt-wrapper 276 SHA256 28569b4c59e620bc2ed11fa8c8adc553c7bae98d32d4fc2cd8b2780aee52c090 SHA512 4169122fe1cac52cefefe63d0060aa891ee7f993df714aa9fe823abc5b51ff6c7664b70e875d308f277feb18b1f08d50de985df27774496ecedef8838c9e87fa WHIRLPOOL efed452ad405071fe2d9e81b55425f2c999fc1fe4d43154da313a6bacd55184b7a511998eca582cf730d7986d8eb5a942ec129a8f368e0dcd6845047939324cc
 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.6.1.tar.xz 2479828 SHA256 1b4e33e02f7653489be9c49d182be84da13348b4ad3cb4c09c643898586a6008 SHA512 6b0228be7b1303f6af0090d13e83a1fe76132b9ff220d76c7db4f6b07f6c87829fbb1489a728c1300cf49f1bcfe2d3f3e18875a8c44694eb0b2778a3e75caa10 WHIRLPOOL 5cf1ae08c3d03f0b586954c1216dbcf80a680bccbe81dd3006d2e560210ac95076624afd78c95453a471cae9279fbbc104094e5b34fa499bc5bb92c8b17f42d2
-DIST epiphany-3.8.1.tar.xz 2504796 SHA256 8c231bb1af8daf739524bd89aa44873f5936b8a849da49326427486ed825523f SHA512 f73b25fb7fbf567b8c14834752df60b7e54f446b172829718f6b8de4a0e45d2190a03bf71f6597fbc20a98e6bb3932f036efc6c791ca189a47cbf264f83bd771 WHIRLPOOL 20b46d40d05fd0e6d0504303494350dcf392978377f74c5377c440f9b3ad8d7fa4dde1651083a09ebd7100ee1c845d5e7828a287030125389beeeaee007a337e
+DIST epiphany-3.10.3.tar.xz 3088664 SHA256 c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7 SHA512 732e53ce67af886e164f16107e46a6000fe8f9a0b2b828c489f19bdd232d6450c32daadbf4c5c422e563e49727cbffd99371c9fab52d435412fc817dd1200b5d WHIRLPOOL ceeffa612d3315733c63bf4b6e808fee17da4aa1c541ae84bc878f0751ff61b8906954aa133198f7d34f059157dfedc9d0e87b742e2f591a0fbd6fb308cb1fa2
 DIST epiphany-3.8.2.tar.xz 2531592 SHA256 ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a SHA512 bf95de7828c57b82d57aef0a93764041b8fc1c463229fd772243b2fc6ca2e8f5743b48b0f8abb60e15ee6f9f28085f0959b0c711cfb22743c4962c0b0399ad22 WHIRLPOOL a36fc50093765b3a64fc9171e16facf84ff5d3f8933c15f3818df7e9c15a7636503626fe899948bff5716c67839aa8162b093238aa09ca617ec33c2448f1cb13
 EBUILD epiphany-2.30.6-r1.ebuild 2555 SHA256 c33e1fbb5b7e1eab17635dfe1366e700f7ec3d52c20baa4607f2222c4880680b SHA512 04439f27370575106ed9fee4353761fb2aab9e429c2c4631d6e367178c9b636eaee37152091e82f03726713c6655ad404f263724dc2a91ec49a1f9ffc6035349 WHIRLPOOL 597effacf7ed5d5f881ede096afc9f9b2077908eb4432c170dd26dc290573333e5f2d50dc5444ad692be40a1c68e6b5fbe851067a625766ce55af239ee169204
-EBUILD epiphany-3.6.1.ebuild 2645 SHA256 f0f6414a83335aff7cb43bfaa0c54290dfb9747fbb239d759e1fd29643cab261 SHA512 5ff4eee99db43610807ac36dae3ec959f66282b762788f91a636a616b2ee1ba1c1c2950ab457981b4022a5714fb69a685522185c233fe8f8a2690cbfb66e810f WHIRLPOOL 2ffdfc5048b3904f7d1a0115060f1b406309f01917caa5cedab308e9ae6f90e34c295a9048820622ae1cb9cf223a59fabf37332d128d0d90f3a50c8bf20ca815
-EBUILD epiphany-3.8.1.ebuild 2369 SHA256 2602282a34b8ef59b4fea1c256ce94067a76b00c5f80d3b030b32d430dbabd05 SHA512 74a9f52bc699c32bb1157d2d8fde75608002f9c726512a5d4711ab8fe5367ee1881189afa56d7770804b45600bfaed6a3da0730cec7518d04f91bed6c5a419f7 WHIRLPOOL 9fb39ed63fa8d2067d16922abff8f28dbe53144f6590280872a26937808d8a31f5b7543d04e2663f9776bac317938fb379217c309f577e9ba463a97652bb7ce6
+EBUILD epiphany-3.10.3.ebuild 2038 SHA256 081921ff495032ec919e421e5fde9df3285364d74c7e01a36a2a4bd448215da6 SHA512 1e895cd6d10b5fdacd5150af7354abbf060eb3e31ed6dcf0814172b2a508596a0da0463f53719a529a57b7a3a51cff04a371689bfc88461da70bb211aa4ca1a4 WHIRLPOOL 2f6a5117c4b737f9789ec71f3ad6c99ee59718f2ef28f9ceca40ef34dd5fab4917da51fa33d0f5f226755e0c2e541acfb54e8887cf9019a0c1f6bf62c4247199
 EBUILD epiphany-3.8.2.ebuild 1914 SHA256 22d7b55c3b76f90fb5245a2274b45b42a0094147129c9bfb30107bff2c2e73d3 SHA512 649d1a125d78b11f80437934dbc6136e22d32735f62add55e14375637c7d8041395e295f7bf05039b1a0718ac5700250979ef1793192d327a9002e22d4fe5246 WHIRLPOOL 2955aed8a6dfbef25deb3d5fa1fd69bab0b077f2a6b555f0ede4467fce208a5795179be00735ee8fa9cb598fbf9b5391d6bd89cbe98bc1c5b16c62b7670a6e66
-MISC ChangeLog 58316 SHA256 2be9081a2b5406309b3b120d217baad361b8c352ad0c17dadd3efd0e52ceba67 SHA512 48485fe8154f6266613c8d60b2da16fc6f3e007879a0bd7c1b85a53bcc6e84c9f6935d23b3c492363ad18c99968be10f663a9b734a3ca7f06289f39eca0702cb WHIRLPOOL 7af62a8f947bcc7dd82c1fe6a7090f47a69816b60940c9f13bfdf71b8003e6d2335b3411d3b699b17d6a8ed2922a4bae1ce2a7f3aba092af82f2c9bb4f26e062
+MISC ChangeLog 58500 SHA256 84bda932f52d1f0d454b7fbf454f9f00456401a5dd6567fd2df1aa99d6e73d47 SHA512 beb833559672c9d8258877134d3b809bc296adb85f94892d8afbbb10397c16ea9c1c4d09f959edd46735a446a339fbc998161eabd5a9cade02cbd7acf79d3034 WHIRLPOOL 9cd2eab9939f4250f5e9f5320b0714eb41e2071961d36772da6afd98f326ddb45be6a39f3690b2f634fee16716fe627ef9ffaec3b9c96b12aa85206211882dc4
 MISC metadata.xml 375 SHA256 34a7f30e213476622090d9d1cbbe640a48f365d7e418686d6c855006b9db14f9 SHA512 a2b21d647ee71d004b28a7e3058155955493bab0241b33b970f5ad1c25376e3d8b922d654bb15f4820d53c6856eda469aa9ad793b8ad4335e1c74957afa09bf3 WHIRLPOOL 997d8a11ae22c881d74ac708d7908c062672fb4fbca76f87aa2770df74f18a1ce02c3ba6567b2d925395532a68347d70e878542950b623806d14481681d566a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKky1sACgkQCaWpQKGI+9SSWwCfRbRqSMMZO+xYp6D8gZLq+Z4B
-kg8Ani25OO8YbsFQ6Zd5o+t3yG9pnVSe
-=XWq9
+iEYEAREIAAYFAlK5x20ACgkQCaWpQKGI+9TNUwCffKitg/hq0MCJwCP4nE8V/IpC
+iD0An0jyOMssBt9TsmtioyXy7zJ1d921
+=RRIN
 -----END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-3.8.1.ebuild b/www-client/epiphany/epiphany-3.10.3.ebuild
index 7ab677ec6ae0..99e59767d86a 100644
--- a/www-client/epiphany/epiphany-3.8.1.ebuild
+++ b/www-client/epiphany/epiphany-3.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.8.1.ebuild,v 1.1 2013/04/17 17:45:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.10.3.ebuild,v 1.1 2013/12/24 17:42:03 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -24,12 +24,11 @@ RDEPEND="
 	>=dev-libs/glib-2.35.6:2
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-1.11.92:3[jit?]
+	>=net-libs/webkit-gtk-2.2.2:3[jit?]
 	>=net-libs/libsoup-2.42.1:2.4
-	>=x11-libs/gtk+-3.7.10:3
+	>=x11-libs/gtk+-3.9.12:3
 	>=x11-libs/libnotify-0.5.1:=
 	gnome-base/gnome-desktop:3=
 
@@ -45,23 +44,14 @@ RDEPEND="
 # paxctl needed for bug #407085
 # eautoreconf requires gnome-common-3.5.5
 DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# Fix testsuite, upstream bug #698221
-	# FIXME: patches don't fix above bug, but I cannot then reach
-	# the test they are supposed to solve.
-#	epatch "${FILESDIR}/${PN}-3.7.5-test-gwarning.patch"
-#	sed -e '/\/do_migration_invalid/,+1 d' \
-#		-i tests/ephy-migration-test.c || die
-
-	gnome2_src_prepare
-}
+# Tests refuse to run with the gsettings trick for some reason
+RESTRICT="test"
 
 src_configure() {
 	gnome2_src_configure \
@@ -69,7 +59,8 @@ src_configure() {
 		--disable-static \
 		--with-distributor-name=Gentoo \
 		$(use_enable nss) \
-		$(use_enable test tests)
+		$(use_enable test tests) \
+		ITSTOOL=$(type -P true)
 }
 
 src_compile() {
@@ -82,9 +73,7 @@ src_test() {
 	# FIXME: this should be handled at eclass level
 	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
 
-	# FIXME:
-	#use jit && pax-mark m $(list-paxables tests/test*) #415801
-
+	unset DISPLAY
 	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
 }
 
diff --git a/www-client/epiphany/epiphany-3.6.1.ebuild b/www-client/epiphany/epiphany-3.6.1.ebuild
deleted file mode 100644
index ddb320b9ca06..000000000000
--- a/www-client/epiphany/epiphany-3.6.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.6.1.ebuild,v 1.5 2013/02/02 23:13:52 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="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="+introspection +jit +nss test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=app-crypt/gcr-3.5.5
-	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.31.2:2
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gnome-keyring-2.26.0
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-1.9.6:3[jit?,introspection?]
-	>=net-libs/libsoup-gnome-2.39.6:2.4
-	>=x11-libs/gtk+-3.5.2:3[introspection?]
-	>=x11-libs/libnotify-0.5.1:=
-	gnome-base/gnome-desktop:3=
-
-	dev-db/sqlite:3
-	x11-libs/libX11
-
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	nss? ( dev-libs/nss )
-"
-# paxctl needed for bug #407085
-# eautoreconf requires gnome-common-3.5.5
-DEPEND="${RDEPEND}
-	introspection? ( jit? ( >=gnome-base/gnome-common-3.5.5 ) )
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.50
-	sys-apps/paxctl
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix testsuite
-	epatch "${FILESDIR}/${PN}-3.6.1-test-gwarning.patch"
-	sed -e '/\/do_migration_invalid/,+1 d' \
-		-i tests/ephy-migration-test.c || die
-
-	# Build-time segfaults under PaX with USE=introspection when building
-	# against webkit-gtk[introspection,jit]
-	if use introspection && use jit; then
-		epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
-		cp "${FILESDIR}/paxctl.sh" "${S}/" || die
-		eautoreconf
-	fi
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		$(use_enable introspection) \
-		$(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
-
-	use jit && pax-mark m $(list-paxables tests/test*) #415801
-	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"
-}