Version bump for Gnome 3.6. Clean up old revisions.

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

9 files changed, 51 insertions, 448 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index f2a5d4b69f81..df1a847cd9d2 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.287 2012/08/09 08:42:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.288 2012/12/25 23:52:43 eva Exp $
+
+*epiphany-3.6.1 (25 Dec 2012)
+
+  25 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/epiphany-3.2.0-optional-networkmanager.patch, -epiphany-3.2.1.ebuild,
+  -epiphany-3.2.1-r1.ebuild, -files/epiphany-3.2.1-paxctl-introspection.patch,
+  -epiphany-3.2.2.ebuild, -epiphany-3.4.2.ebuild, epiphany-3.4.3.ebuild,
+  +epiphany-3.6.1.ebuild:
+  Version bump for Gnome 3.6. Clean up old revisions.
 
 *epiphany-3.4.3 (09 Aug 2012)
 
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 384856066980..95134d45888a 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -6,32 +6,21 @@ 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.2.0-optional-networkmanager.patch 2729 SHA256 a992b9d25b77f404d8af7435e7ac2b84da2e08a0a99eb6ae212a0302e935b661 SHA512 9c8c548155a971b0cca0a343395391959a31990172078fb9d3dbd6b78390756b0d274ff743983531845f10b7a1b586a9319c706366cac84d671ea5c94c428d62 WHIRLPOOL 6f43039bf2d55171d19c87fab8260935c56f81d43fac30db34bd3acdfee0bfed0e58aeaf6cc178558a1ffc619b89e3051d6210060334d7f537c6b11b7162025b
-AUX epiphany-3.2.1-paxctl-introspection.patch 1578 SHA256 54d57bddaa6384e19cb455edf0b6c609d6767061dcd6accc8189f21cf22c90ce SHA512 4672fbbd29f616419d560fef12f3134a93239afdd02befdda9f4e218c3002024e1d48780407dff416bb603a1470ada11a489a93024456d390b3048ab2fe159c9 WHIRLPOOL 0c41b14d3600e286b938271d1d87eb13cc9cd624b7cc359539db4d4d1942afe8e07ebf1d0730f246d219b2f1e64ee41703dc7b13c83d08a3a8822ee6b37d6fe0
 AUX epiphany-3.3.90-paxctl-introspection.patch 835 SHA256 c7670baab442a5475e33a614d2f71fb4601398a1fc1bc898e6b9359d35d3d6b3 SHA512 c08efa9c4d3f0cc759a758355b5cf32cc4e4101a7a5d2eb03672b72a80829e29058e2561a7e752caa842686f3618dd6f6d0fd68c28b593967b1b596459a5fa07 WHIRLPOOL e45f0e658c636c437068d99e9317c93e90081920e2c1bdb31012e5f6a8c232deac4b7906ee13f635a3cdc878cc83806eb3a5375a138d16014dfcce9c9543642f
 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.2.1.tar.xz 5101156 SHA256 5ade10d9becce1ca43c30d755fda477c5595a1c0514047f07f7d4b817a2154fe SHA512 d59e0c816e7fedc45511c08178bda492e33fc176128c4c81cf93f97a3e51176523f40d74a98c69632480fa50d31fecec9a7bfd988ef1612dfb811c5fc8950fa4 WHIRLPOOL 98093a2c3c1998b8084d44b2d4b8fd980804129094b7cc483f692de56028b0c1157e890026ebc41da61e388bdb122182abd354bf0c1560aa76538c55936a8380
-DIST epiphany-3.2.2.tar.xz 5159580 SHA256 2079cb32b920439b5a97ca5d9f1faeb64d6a1f2c940014220c379a2f982e9ed5
-DIST epiphany-3.4.2.tar.xz 5025056 SHA256 fb5b0d48c4d8725031d023fd6a054c10cb9f166cd430db7fc2383d8d2af5d615 SHA512 daa799c81e7e43612f997a921e630dd2c491440cf88f10bc176eace1a074261ff1b9db26c7af39115d0bb0d5859468b16c611761d18197ed13f27495e1d6ac3c WHIRLPOOL 2dc5b67cc868085c27759646c1f9da57c373aec61f2aed4c74e79041a68d8acdcb5442aa35dd7e73ed8dd111f440eee69c81255a191f397554dd0f5c0270f649
 DIST epiphany-3.4.3.tar.xz 5029412 SHA256 3233fb9e9e8a056c3ef494e85cf5e27068abf51df5fc7f5203ab7afda480f395 SHA512 d6afb43b90473ef5328a171a7e7a2bf4a05cb17a5ed0e143df5387e5ae780610b8e88d4ac66b18cab7fb15a13d05f8c03661f9b0bd471164913ffa11e0f1e41b WHIRLPOOL e1a1f1278198460998edd82a4914045fc895bf3d2edb2baa8c482981713ec8a104261e8d179176f0e8746e4110863414d95d782cbc6775fd4562982bf2362dd8
+DIST epiphany-3.6.1.tar.xz 2479828 SHA256 1b4e33e02f7653489be9c49d182be84da13348b4ad3cb4c09c643898586a6008 SHA512 6b0228be7b1303f6af0090d13e83a1fe76132b9ff220d76c7db4f6b07f6c87829fbb1489a728c1300cf49f1bcfe2d3f3e18875a8c44694eb0b2778a3e75caa10 WHIRLPOOL 5cf1ae08c3d03f0b586954c1216dbcf80a680bccbe81dd3006d2e560210ac95076624afd78c95453a471cae9279fbbc104094e5b34fa499bc5bb92c8b17f42d2
 EBUILD epiphany-2.30.6-r1.ebuild 2555 SHA256 c33e1fbb5b7e1eab17635dfe1366e700f7ec3d52c20baa4607f2222c4880680b SHA512 04439f27370575106ed9fee4353761fb2aab9e429c2c4631d6e367178c9b636eaee37152091e82f03726713c6655ad404f263724dc2a91ec49a1f9ffc6035349 WHIRLPOOL 597effacf7ed5d5f881ede096afc9f9b2077908eb4432c170dd26dc290573333e5f2d50dc5444ad692be40a1c68e6b5fbe851067a625766ce55af239ee169204
-EBUILD epiphany-3.2.1-r1.ebuild 2750 SHA256 9f53b187d2828f269ff64e22c42a8ec9521f3eb78738e281c4b530429e689268 SHA512 34b740110e614b730586535eabf249b96dd173702528ead3e2da83b6de802f8103b02a486a5e6c0ed4a30c38d2ce1f0dd98983f03bea658553bb57318dece7d4 WHIRLPOOL 4fa0227558b64aa17997a4b96550188271c85555c815a6031a78300a2e4ed0d87f108b7d52ac7539ff587aa8b287ed5d28bd2d1712e596da919b69b65a893f1d
-EBUILD epiphany-3.2.1.ebuild 2335 SHA256 e6b552ca5b6f809d678219d6dc0d009ca0e5b3909b604188fd4ee524125696a8 SHA512 a2cfe20672337c5b5abc8dceefe4079337ceb1c102f110578211c26a493e57d79b22bb54fc87d123f7f04422dc1618e0cb345187e60c6a504ec26062f872af9f WHIRLPOOL 192665b6dc1747ed9521cdd3df95b73cb172d05372a5db02b1e9bb8d08eca1e34d8c570735b6468e1105c964fa96f251258337ff92a2ad2be71e68ec589995d1
-EBUILD epiphany-3.2.2.ebuild 2747 SHA256 16165b2ddb5fef59a76eea983e7910173c37cab398211a11e0626c96b09810b0 SHA512 6d3183d66f481f278e579eaa0f450cf3009184a147509acdbb45b4211cc02076a575dffdd9126c46ba894cfc23a7e2b49a8b943205d40688ef311c04cd53d9b7 WHIRLPOOL 05ee420d570d16ecfc9a73c62311df46baf5a94e629aa8d7abe4f53ebe9ea0a137afed13b4b222807ff58b0ae80f3d457a3386c93ffa3b5e8ce38e953e27c60a
-EBUILD epiphany-3.4.2.ebuild 2627 SHA256 7d4d853560fd1a5955f1ed74a534687ae029ad06ffa4719cfcab0cbd6e512e6d SHA512 80f063fdbb2117e05483a7de55c76a53ca1f3dad4c4ec5d8eb0709e616d2ad8ecb68864d52b25fc66a81ef6505c2ced5ec3f332c7227158d5ee8061cf5217c90 WHIRLPOOL ea469eb32fabbb3f7d067e36889fbbed5bd453c74d32781d1683730d7787e565f9a981a82daaa458c8ef35161a58b7b1df961aa556637c4dd848ae7894cb7e4b
-EBUILD epiphany-3.4.3.ebuild 2626 SHA256 4f624b5fd2faa0d42a64566c1ede692caf0dfe3c3a11d6c451a3f53b3400e747 SHA512 d0054ad1e187c32a13e911cbaea688ee15b85e25ba0e6fc6ce03286f3d3d661a8c95a695aecdcbdc27ec9e3e472ae32bd1b85bd32b2840f6e2a7ec424cebb902 WHIRLPOOL c901492f68d1bfa3de3a87443c33fcaebff2acfe491230bf6749042e8668397d0534583640ae11e2be80505f57755e2fa4ed979d16afffb248bb62447a5108a5
-MISC ChangeLog 56484 SHA256 d618eee192d50b6045a12f5408748dd37daf8c86deb884743e45dc0b29e9c9c0 SHA512 11f39dd67ebf38d45aee7786cacb2fe27c61dacbb5ca07def87c5c5f35d99d9598eb9ccc93d4058b4e2eac2c930800af2b0dcbc32ae13c965eee78d2d8f75fb6 WHIRLPOOL 521932ce8bff17c6bf9568c04c5acadd23b1afa2c989c2b7aacb3b5c114e51c05b1cad30ff936b08ce41ae6f8ed20b209f335f192a958b432d16b1107cc4c29b
+EBUILD epiphany-3.4.3.ebuild 2568 SHA256 5cfdd3fa30749b98450b3301ae3a4838941a46daf78318db0c49e60e8a36ff14 SHA512 a234290f2450bdce4d942d2476154b47ec928c3e4694283e151e5563c6c2115ebe40040237abde068d800db51258dc34d2b8c616c4714d480936b812f8505a76 WHIRLPOOL b3c00e6ea5b3135bf2d4e34cd2467c839b0ac3b3b4bbe034dc2a0229e1c4d5f8f92556700a970ab10a13934c1bd306be9712606424eaf6e5e01f67d061744c6e
+EBUILD epiphany-3.6.1.ebuild 2456 SHA256 e83aaca91372359fb05038ab781616fd80a87bfaa7a87c9aa6514795cc9d1918 SHA512 b0bb196bd2bb5fa7f5e0225eee896d2e83b008d2005a8aa77b614d2bd33a99320d7c2ad9be979ca39e63b7e216c2f66b6136eebb11835528b7f17b8324f17633 WHIRLPOOL 20e4ea604c2b7e9b1337439d87470a36c57fc2d72320c8b9f3007cbd166562c641c02015cbe216ac50bda60067b880b4672b613205cf01fc1b73792ec5251fcc
+MISC ChangeLog 56875 SHA256 efcb9f07442d3ba8d78faf0516cf2313269ccf7e3f1ff9cf99357346ce59b8ec SHA512 1f8826f02811f95a9f21d34bd6e54b6a42e5e164c46223ad86f79baa13c67bfc2139c50648037b9522bc5962c89e02e88a9a2888570fcb26d89e2af8dbd95888 WHIRLPOOL 83012afb1129a38b96315283c213adf656d8632ed564949269941c22966004e36a91db7e2742ef078df94311f6b83c55f5a6e6181cb8c0ca39a8d2b705f2061c
 MISC metadata.xml 375 SHA256 34a7f30e213476622090d9d1cbbe640a48f365d7e418686d6c855006b9db14f9 SHA512 a2b21d647ee71d004b28a7e3058155955493bab0241b33b970f5ad1c25376e3d8b922d654bb15f4820d53c6856eda469aa9ad793b8ad4335e1c74957afa09bf3 WHIRLPOOL 997d8a11ae22c881d74ac708d7908c062672fb4fbca76f87aa2770df74f18a1ce02c3ba6567b2d925395532a68347d70e878542950b623806d14481681d566a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQI3gGAAoJEJ0WA1zPCt1h6GYIALbavlkgMb8PENxhaL+lgqld
-msbFTMjg6/3z9BgPWuSqc5cLYvTogrCm4kozLOzDKSPgIFPYzykuUbKZ5fzA0KCc
-o5Ip5zPeM4aZYSZkvGo8EmNutQ1M26//ZCv2kmgmGyqz5BCdt7PKcs+7ZcBh+5C0
-gzuBEMvQYPl5s4raer0fZszS6NRbCbyIQ6MxdVcGOsmVbyfKlqmztnFG3ULQD1y1
-pMeGC39eyK8ArYkw11mLnLAgcNPesu4xULEE8mfWgTqnfDFI73wvL11Wnc5k2JHD
-0CQPOx4GC00XkQ43Jl+o3Nh1KKdhNdEV3Hr/ssvEXk70mKVmu3DVWeXV3pc7rRU=
-=lL8Q
+iEYEAREIAAYFAlDaPEwACgkQ1fmVwcYIWAb43ACfQTCh0sKdpB+5MPmCKaIY4PA1
+FFAAn0wQge1oSysWyU+Eu5dgyujc+qNa
+=+pdM
 -----END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-3.2.1-r1.ebuild b/www-client/epiphany/epiphany-3.2.1-r1.ebuild
deleted file mode 100644
index 946851d32858..000000000000
--- a/www-client/epiphany/epiphany-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.2.1-r1.ebuild,v 1.3 2012/05/03 06:01:03 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 pax-utils
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-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.
-# 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
-	>=app-text/iso-codes-0.35
-	>=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
-	x11-libs/libX11
-
-	app-misc/ca-certificates
-	x11-themes/gnome-icon-theme
-
-	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}
-	x11-themes/gnome-icon-theme-symbolic
-	networkmanager? ( >=net-misc/networkmanager-0.8.997 )"
-# paxctl needed for bug #407085
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-apps/paxctl
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-distributor-name=Gentoo
-		--with-ca-file=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		$(use_enable avahi zeroconf)
-		$(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_NETWORK_MANAGER"
-}
-
-src_prepare() {
-	# Make networkmanager optional for prefix people
-	epatch "${FILESDIR}/${PN}-3.2.0-optional-networkmanager.patch"
-	# Build-time segfaults under PaX with USE=introspection
-	epatch "${FILESDIR}/${PN}-3.2.1-paxctl-introspection.patch"
-	cp "${FILESDIR}/gir-paxctl-lt-wrapper" \
-		"${FILESDIR}/paxctl.sh" "${S}/" || die
-	sed -e "s:@S@:${S}:" -i gir-paxctl-lt-wrapper || die
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	pax-mark m "${ED}usr/bin/epiphany"
-}
diff --git a/www-client/epiphany/epiphany-3.2.1.ebuild b/www-client/epiphany/epiphany-3.2.1.ebuild
deleted file mode 100644
index a8bb59c74f10..000000000000
--- a/www-client/epiphany/epiphany-3.2.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.2.1.ebuild,v 1.3 2012/05/03 06:01:03 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-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.
-# 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
-	>=app-text/iso-codes-0.35
-	>=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
-	x11-libs/libX11
-
-	app-misc/ca-certificates
-	x11-themes/gnome-icon-theme
-
-	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}
-	x11-themes/gnome-icon-theme-symbolic
-	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
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-distributor-name=Gentoo
-		--with-ca-file=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		$(use_enable avahi zeroconf)
-		$(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_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/epiphany-3.2.2.ebuild b/www-client/epiphany/epiphany-3.2.2.ebuild
deleted file mode 100644
index c2964ff6f04b..000000000000
--- a/www-client/epiphany/epiphany-3.2.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.2.2.ebuild,v 1.2 2012/05/03 06:01:03 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 pax-utils
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-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.
-# 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
-	>=app-text/iso-codes-0.35
-	>=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
-	x11-libs/libX11
-
-	app-misc/ca-certificates
-	x11-themes/gnome-icon-theme
-
-	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}
-	x11-themes/gnome-icon-theme-symbolic
-	networkmanager? ( >=net-misc/networkmanager-0.8.997 )"
-# paxctl needed for bug #407085
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-apps/paxctl
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-distributor-name=Gentoo
-		--with-ca-file=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		$(use_enable avahi zeroconf)
-		$(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_NETWORK_MANAGER"
-}
-
-src_prepare() {
-	# Make networkmanager optional for prefix people
-	epatch "${FILESDIR}/${PN}-3.2.0-optional-networkmanager.patch"
-	# Build-time segfaults under PaX with USE=introspection
-	epatch "${FILESDIR}/${PN}-3.2.1-paxctl-introspection.patch"
-	cp "${FILESDIR}/gir-paxctl-lt-wrapper" \
-		"${FILESDIR}/paxctl.sh" "${S}/" || die
-	sed -e "s:@S@:${S}:" -i gir-paxctl-lt-wrapper || die
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	pax-mark m "${ED}usr/bin/epiphany"
-}
diff --git a/www-client/epiphany/epiphany-3.4.3.ebuild b/www-client/epiphany/epiphany-3.4.3.ebuild
index 1a2ce387d0cb..3a96619b6a83 100644
--- a/www-client/epiphany/epiphany-3.4.3.ebuild
+++ b/www-client/epiphany/epiphany-3.4.3.ebuild
@@ -1,14 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.4.3.ebuild,v 1.1 2012/08/09 08:42:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.4.3.ebuild,v 1.2 2012/12/25 23:52:43 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 
 inherit autotools eutils gnome2 pax-utils versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
diff --git a/www-client/epiphany/epiphany-3.4.2.ebuild b/www-client/epiphany/epiphany-3.6.1.ebuild
index 5277c3c95c9b..615432823feb 100644
--- a/www-client/epiphany/epiphany-3.4.2.ebuild
+++ b/www-client/epiphany/epiphany-3.6.1.ebuild
@@ -1,70 +1,55 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.4.2.ebuild,v 1.2 2012/05/19 21:58:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.6.1.ebuild,v 1.1 2012/12/25 23:52:43 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 
 inherit autotools eutils gnome2 pax-utils versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
 
+# TODO: coverage
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avahi doc +introspection +jit +nss test"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection +jit +nss test"
+KEYWORDS="~amd64 ~x86"
 
-# XXX: Should we add seed support? Seed seems to be unmaintained now.
 RDEPEND="
+	>=app-crypt/gcr-3.5.5
+	>=app-text/iso-codes-0.35
 	>=dev-libs/glib-2.31.2:2
-	>=x11-libs/gtk+-3.3.14:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.7.92:3[introspection?]
-	>=net-libs/libsoup-gnome-2.37.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=x11-libs/libnotify-0.5.1
+	>=net-dns/avahi-0.6.22
+	>=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/libICE
-	x11-libs/libSM
 	x11-libs/libX11
 
 	x11-themes/gnome-icon-theme
 	x11-themes/gnome-icon-theme-symbolic
 
-	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	!jit? ( net-libs/webkit-gtk[-jit] )
-	nss? ( dev-libs/nss )"
+	nss? ( dev-libs/nss )
+"
 # paxctl needed for bug #407085
+# eautoreconf requires gnome-common-3.5.5
 DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.40
+	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
-	jit? ( sys-apps/paxctl )
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable introspection)
-		$(use_enable nss)
-		$(use_enable test tests)"
-}
+"
 
 src_prepare() {
 	# Build-time segfaults under PaX with USE=introspection when building
@@ -77,6 +62,18 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
+src_configure() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+	G2CONF="${G2CONF}
+		--enable-shared
+		--disable-static
+		--with-distributor-name=Gentoo
+		$(use_enable introspection)
+		$(use_enable nss)
+		$(use_enable test tests)"
+	gnome2_src_configure
+}
+
 src_compile() {
 	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
 	unset DISPLAY
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
deleted file mode 100644
index 0ac61120449b..000000000000
--- a/www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-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
-
diff --git a/www-client/epiphany/files/epiphany-3.2.1-paxctl-introspection.patch b/www-client/epiphany/files/epiphany-3.2.1-paxctl-introspection.patch
deleted file mode 100644
index ba5eab47ef0b..000000000000
--- a/www-client/epiphany/files/epiphany-3.2.1-paxctl-introspection.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f9ba4d6428f06f717eb16e83a728f82b314383f1 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 4 Mar 2012 19:47:17 -0500
-Subject: [PATCH] Add libtool wrapper for building introspection under PaX
-
----
- src/Makefile.am |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index c46160c..2aa94d1 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -299,7 +299,7 @@ EPHY_GIR_C_FILES = \
- 
- EphyEgg-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER)
- 	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
--	$(INTROSPECTION_SCANNER) -v --warn-all \
-+	LIBTOOL="$(LIBTOOL)" $(INTROSPECTION_SCANNER) -v --warn-all \
- 		--identifier-prefix=Egg \
- 		--symbol-prefix=egg \
- 		--namespace=EphyEgg \
-@@ -307,6 +307,7 @@ EphyEgg-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER)
- 		--include=Gtk-3.0 \
- 		--include=libxml2-2.0 \
- 		--library=$(top_builddir)/lib/egg/libegg.la \
-+		--libtool="bash $(top_srcdir)/gir-paxctl-lt-wrapper -m" \
- 		--pkg=gtk+-3.0 \
- 		--pkg=libxml-2.0 \
- 		--output=$@ \
-@@ -318,6 +319,7 @@ EphyEgg-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER)
- 
- Epiphany-$(EPIPHANY_API_VERSION).gir: EphyEgg-$(EPIPHANY_API_VERSION).gir $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \
-                                       $(EPHY_GIR_C_FILES) epiphany
-+	bash $(top_srcdir)/paxctl.sh -m ./epiphany
- 	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
- 	$(INTROSPECTION_SCANNER) -v --warn-all \
- 		--identifier-prefix=Ephy \
--- 
-1.7.8.5
-