Bump to 3.0.4, from gnome overlay for GNOME 3, remove old

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/www-client/epiphany-extensions/Manifest b/www-client/epiphany-extensions/Manifest
index 3f4c564772818079fa2b1a7dd81182267e27772e..f84adb18e4efad4e73b22fe2c0f0b82236ec7169 100644 (file)
--- a/www-client/epiphany-extensions/Manifest
+++ b/www-client/epiphany-extensions/Manifest
@@ -1,38 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-- -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 AUX epiphany-extensions-2.30.1-fix-es_ES.patch 4792 RMD160 47b5f80b0cfafba3b57877bbeb17d7798e86cd78 SHA1 6c73ee8fbfc5ab8871470cfa7065ca7c11d87666 SHA256 a2a8a073c2092cfdb1ecb82e6591109657a35f844553cef27bf5a91545679346
 DIST epiphany-extensions-2.30.1.tar.bz2 1565963 RMD160 47fec6abc2afc771282e9e80751e7cdca665f751 SHA1 b6ac443ab9fcf82dab53518a4af2f43828fd781a SHA256 2f91b34e5854df382bb30bf93ae469490a5321d1ad006ff45032e3127eddb63d
 DIST epiphany-extensions-2.32.0.tar.bz2 1045984 RMD160 f4ff2a8b937486e8d5ac8571c52b1c8f34e9516e SHA1 20541ea312d1860886a8d377f26779a9bbc99ca6 SHA256 1d6ac9f24050f409812a1653156033c6c005c27bc590f2a54164715771a1e16e
+DIST epiphany-extensions-3.0.0.tar.bz2 1598864 RMD160 bb0d2a3d3ab8f4150fce6b1f9562185510555b48 SHA1 0603cb954532265fa2f3b9765109a79216c91199 SHA256 c9984de0912b307fecd0232135c0e3d8c7f0859867b9693221ff12d1c483b724
 EBUILD epiphany-extensions-2.30.1.ebuild 2085 RMD160 f7f6365b489d25290ce6f31a0c8b5768881d9d3c SHA1 0d47ba3c94d98691c834df704cc92116b40bba61 SHA256 a8c640e67f703a61766426303388bec3da58ca5f9b15b06727c4f2f65586f99b
 EBUILD epiphany-extensions-2.32.0-r1.ebuild 1841 RMD160 fb5dc57c6eb915ca124be872a1a983801dfb9149 SHA1 64c565a8ae5836a64780096b1b32b5edec35e52c SHA256 ee4f4e28e24106e34da62c79d0c3d954a19618a20558e28680320fd1eaf24d50
 EBUILD epiphany-extensions-2.32.0.ebuild 2033 RMD160 ff70d5f7f1f0e344fe6e99c8f33d4a04efc44809 SHA1 d8af66b45da39ea7b184f9720605fa0e975e38d9 SHA256 f0cb65b9c80c5cccc4f9d3a5199054d48df19b83955f3f5f3e3227c1ab873c43
-MISC ChangeLog 25528 RMD160 e034acc68cbcbf01b5d35642be6ec35a8a3da3a7 SHA1 3e54295ca41f55b295b361682df2ef118ac10af8 SHA256 35514954a75801f1f9f42197f9b7aa98a9c311545ca77e66f5f6bf07c12581d0
+EBUILD epiphany-extensions-3.0.0-r1.ebuild 1743 RMD160 86088d7d9c73bd11833947101b1b403b57b90c4b SHA1 e1d92afc291fa36284d764df7032bd2d54ae9599 SHA256 28293a5376ff203edbaac809921e94604472b106c24695f7a7be6ba0958efbdc
+MISC ChangeLog 25719 RMD160 3180b2cf56f3d5bac15e1d238592ad306768a892 SHA1 9bb5fb1e9f377ee18422c35c37d82d7ce2bbc697 SHA256 c267cfe7457802cd59a29756f18cd869f00f3d60d567f2c8a4e5135633cd6bdf
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk3rUtUACgkQCaWpQKGI+9SP7QCfRnhnBAmpBHPJ51M8pIzDWk3T
-uswAn2tRRCm5iWG22G3Jg/oodCqSaAul
-=XjZo
-- -----END PGP SIGNATURE-----
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJODjnlAAoJEPqDWhW0r/LCnQwP/AsXtqE0n3eq+o3UOM+Q++Jv
-e39nqjBrsD/U2Fo9LD6AX4qDC3jFth/1qJauCo/X3YeTC4pZb2eI3kKDk9VGmKxw
-W5Z2hug4qqH+WmpyK5qHjXnNVPQyLbC+R1KFNQKKmUXlz7JU1hct9XiP/VTF2my4
-NWLVb6vWXy2Jg9E+Xyjc3ozDz5sPJnypo0BxX+qQXa0gupR0IIry+pQ9RJz26U96
-O9gO06fD26Q0RTbK7qoISKjzhkSsNECy20gHkeuCezLJZr77FlLwbIPCrloh/sF/
-ZQOoRguHP/EyL+6sg41MtPx8Af+atUei96FE49hNk9FhJ4b4xwiNzpdRMAUGMV6Y
-VIwgaYnDA7ApjfSB1YMI34TdQ/o2W9N7BOjmr1p2OU2kMvfdJLd/nXXbGcqxxX9i
-VRvunko6AgfrExwbpCLXc7X6Yvzalw1CT+Oun6o7AMX+hk/G7XNulHuTZ+ORNQCb
-BK8B3M3juCGnt4av0HPMU+tXnGmtbdbKtYLPLrrgJaMAkhd+GR6iWBZj+82vVcs5
-l5gk101f+DeIjXqvFY+RwaQ07w3nOpsDOrV5aF1oyu0aGrvcHiRp0VegR0joJuw2
-r7wr6rf5zdGw+v9hCCs7nvtoSVYpqqKqnxJVUzDN0l4A9bluSJoJ182iitWyGrpj
-iMuGhaeBc6u+0dvkoKpp
-=uD6F
+iQIcBAEBAgAGBQJOTnlmAAoJEO/kOhxWD91k2hMP/3QLwTUn+mV+rka+56OGlfLF
+iXkV4AY6UsM8ftJStHSzSr2y80bfry72OStnr9u625r7iU0c3LQ1xGPeq5QQPCqn
+buC65v9ny1LWY5JkgfCLQ5mQBKdimtMF8YqrCWZ9ZOrnzu2S1gUfujs0MI4xx7c1
+6Rsy5L99aZdwi66mopOpeWnL33XM0Npnh+Yr33PuOPjKMzMhGxKGlVHA9wsUW0y1
+1jpijcNdK0zgyangI5b/fqEU1u2SOzKS+L5ULb2W8TH0y5DCXXUiZpQ3wgGM68Cd
+xPR6xzfl+DwwdDFswa4AEjJGMQCVAQyFSep/1UZlvidzehLbGYZ2sEI3UVFyPHMH
+d7iugiZtWvCaok/QIzyYrMa/gpzn7lASLnRrrqd9oZ45yVRdnHVE7zHOctYP/G6r
+es+0jS1KuyCwJRVpVIBhY933KEDERxClgKCCT6g8UjeXYyUailDKhbmTpmVMHNdc
+emaWmd7XsDg4WJxgnPcUfn0Lw0X056gtwkYAxPDXGwp5+5Wo8Lv7Bkeddz8Z17MG
+KNv0Kk74IfXniu6ARgvbfcighOsMNSr/a1RIsU44hUOgQFnTHGrx2AmuL495cY1/
+V2/yHkWvUZxLRsECYL2/KOUmY7g3hxj66g7fE8wxfD7Y660+2cMIGggdJsFEA5JQ
+1iAQIsEJK9Z4wJAGRcWO
+=XLYl
 -----END PGP SIGNATURE-----

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 196b019064d69601fc829213d3ba312c056d95da..4f1c3aed38d0734bf7c4bf9d39c7bde45d8de9c3 100644 (file)
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.273 2011/04/30 17:38:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.274 2011/08/19 14:55:22 nirbheek Exp $
+
+*epiphany-3.0.4 (19 Aug 2011)
+
+  19 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -epiphany-2.30.6.ebuild,
+  +epiphany-3.0.4.ebuild:
+  Bump to 3.0.4, from gnome overlay for GNOME 3, remove old
 
   30 Apr 2011; Raúl Porcel <armin76@gentoo.org> epiphany-2.30.6-r1.ebuild:
   alpha/ia64/sparc stable wrt #364973

diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 4c7c3d11372fbd40fa74b8129f5abf936f46d7d3..15ab565978d62c3478fb2d0cb2290800d21e97c7 100644 (file)
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -7,14 +7,25 @@ AUX epiphany-2.30.6-introspection-prefix.patch 710 RMD160 54c07f6d720310058bcbfc
 AUX epiphany-2.30.6-libnotify-0.7.patch 1048 RMD160 3607af827a5732561f2e89d9065f3549e14fcdb0 SHA1 2257b0ecd8916657402374265936706e42a1c9c6 SHA256 c1a59a9df78db07c2cf23d47d881d8d4edf6e55af3d655f8ec9870adf9255390
 AUX epiphany-2.30.6-mime-handler.patch 844 RMD160 ffb3e2295084184bd4cb623f48d94cb7de26e083 SHA1 b8c171d993ddeae3be517e06c465ac0b680df9c7 SHA256 768a092f315c905f18c554616a07eb5595c7d512289c280ea435ea482f0820aa
 DIST epiphany-2.30.6.tar.bz2 5927938 RMD160 60f2c7d699dd8728dc79cce012475972943c4007 SHA1 a4bde975f9b2b97d6aad14b4b8a715b40d19a155 SHA256 278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc
+DIST epiphany-3.0.4.tar.xz 5082008 RMD160 b6e35f1a9237a3f4b8492fc4e8c1b69d6238aafa SHA1 aca1150c0e9acb532eb631924653929a9046e3eb SHA256 3cfc25c4c939e3df960c28e6c27e7e78645e1121d8634ecbd307672df1f37333
 EBUILD epiphany-2.30.6-r1.ebuild 2563 RMD160 2877645f280cfb763cffce9bceaa0a7f132a5c15 SHA1 d8abb6fd9d142f363b0a5b7d5c18098e083a61ca SHA256 05014ba4566735fc75c9a26e87cb93df2f23e228753b5321d428b88c1e13d324
-EBUILD epiphany-2.30.6.ebuild 2363 RMD160 4bde1923ba236d8f72337c8100965b49c7c5933f SHA1 dbd5b423c96cc1f8ec61989baa42214cafeb13e3 SHA256 2f01cbbad99c056439a90e10d7774f4a12c5bdd9a253d4938cbd4e96a8126c33
-MISC ChangeLog 53446 RMD160 d97bb131b12dac3b0200a3e8b2599da4511b723f SHA1 86a22eea0554ac88965d1cf66a51644cdff45532 SHA256 1dc8e06a092130747b525fdb8c4692a2462acfa67520fb2d266d0456f0fc972c
+EBUILD epiphany-3.0.4.ebuild 1848 RMD160 5b49ccb9de73397425d929a0171cccbf106be3fa SHA1 d051ed27cd26787a21490812de6d3cc03d3bf723 SHA256 1d4c41ecc0b9150aded3a27cc656d15e79b8656c5eea9fd7b1fba394fd24fac3
+MISC ChangeLog 53644 RMD160 87a637a902e288aa889fefac800ff5d42a9a4fb0 SHA1 bb6c7ea8dc413de14d0e1d4eedda174d217364a3 SHA256 82d422920159915bff045ed9937b8f269f9114e0a060ad3d6a765e041b1eee3c
 MISC metadata.xml 375 RMD160 4b38d1fe16a065d10967f7f17d768dc02bf1fae8 SHA1 96a760f61a9e0bb73120bb75a53b2247b84e9f14 SHA256 34a7f30e213476622090d9d1cbbe640a48f365d7e418686d6c855006b9db14f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk28SR4ACgkQuQc30/atMkCtFACgs/6Fz2MKRulvuE+Z1SRydf39
-LroAnA6ssx3Lva7aF3DeSFDZqzCRwx5w
-=Wedt
+iQIcBAEBAgAGBQJOTnlgAAoJEO/kOhxWD91kx6sP/RdFHvtB4ZWcvhkdzAk7K2gq
+8bY0qVvZwx8WwFv8hSig7MzGI5CdhvJxhdhayHYM/WX3ealWHhupqHKXr7wwQ8sj
+Brb20SkR70OpEF+10mxrfJPQ/s+aD4peP/k7SL7o/u/HwOLkIsGpxgWsUZ9zWKyy
+GuDrC37BN5ezMkn2u0FRyvteg9eT5JqRYT3oBbw/t0IF+/kOKswUahpZ0IxKOz3+
+PqMW9/e6d5jwN37YL2Q1WLqhjXNI5i/ZTSjh8BljrdOCYrGjAEza/HgV7WFWcGfE
+movoqOthM8QfDNBE1J6njucTuJIG3C/cC34KxjICAZgRwNqvkSDZH83666m6Bk/e
+qpdaRJloDMoC+0XZz4Zj1f48NcwUhuG7UOk4tbH2aq2NsY6qXWbexTVjdev2/bP9
+wLsciU9xQjhdS64VWSjxQjObE2C7f6NxuMyn/D4OWEP7T4JT7NGm4j40PhwT9Q/n
+gm9iAh1OFMJnq2tBlZ/TAz/vr4muLfnOCzPR/FF0/kNeit47uU08+22lZsJTvzW2
+vqIuzy8wcLNQhoFCxD6l8t3JDKUpwhCuE+r99X9htimKSQnT3dXuqtLrYq2RsufG
+2mEA7VfzFr8OlZOWVYRAtfTFSThFXBtUdEFAzrL3wqGeodynNM0CenCbO5BFpMNy
+SFLwsShRk8ihijEgc1Fx
+=hDSX
 -----END PGP SIGNATURE-----

diff --git a/www-client/epiphany/epiphany-2.30.6.ebuild b/www-client/epiphany/epiphany-2.30.6.ebuild
deleted file mode 100644 (file)
index 90109cd..0000000
--- a/www-client/epiphany/epiphany-2.30.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.6.ebuild,v 1.11 2011/03/22 19:46:27 ranger Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-
-# We are not ready for introspection yet
-IUSE="avahi doc +introspection networkmanager +nss test"
-
-# TODO: add seed support
-RDEPEND=">=dev-libs/glib-2.19.7:2
-       >=x11-libs/gtk+-2.19.5:2[introspection?]
-       >=dev-libs/libxml2-2.6.12:2
-       >=dev-libs/libxslt-1.1.7
-       >=x11-libs/startup-notification-0.5
-       >=x11-libs/libnotify-0.4
-       >=dev-libs/dbus-glib-0.71
-       >=gnome-base/gconf-2:2
-       >=app-text/iso-codes-0.35
-       >=net-libs/webkit-gtk-1.2.3:2[introspection?]
-       >=net-libs/libsoup-gnome-2.29.91:2.4
-       >=gnome-base/gnome-keyring-2.26
-
-       x11-libs/libICE
-       x11-libs/libSM
-
-       app-misc/ca-certificates
-       x11-themes/gnome-icon-theme
-
-       avahi? ( >=net-dns/avahi-0.6.22 )
-       introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-       networkmanager? ( net-misc/networkmanager )
-       nss? ( dev-libs/nss )"
-DEPEND="${RDEPEND}
-       app-text/scrollkeeper
-       >=dev-util/pkgconfig-0.9
-       >=dev-util/intltool-0.40
-       >=app-text/gnome-doc-utils-0.3.2
-       doc? ( >=dev-util/gtk-doc-1 )
-       gnome-base/gnome-common"
-# eautoreconf needs:
-#      gnome-base/gnome-common
-
-pkg_setup() {
-       DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-       G2CONF="${G2CONF}
-               --disable-scrollkeeper
-               --disable-maintainer-mode
-               --with-distributor-name=Gentoo
-               $(use_enable avahi zeroconf)
-               $(use_enable introspection)
-               $(use_enable networkmanager network-manager)
-               $(use_enable nss)
-               $(use_enable test tests)"
-}
-
-src_prepare() {
-       gnome2_src_prepare
-       epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-
-       # introspection: Fix build by telling g-ir-scanner what the prefix is
-       epatch "${FILESDIR}"/${P}-introspection-prefix.patch
-
-       # DBUS_LIBS is needed for libephymain.la
-       epatch "${FILESDIR}"/${P}-dbus-fix.patch
-
-       intltoolize --force --copy --automake || die "intltoolize failed"
-       eautoreconf
-}
-
-src_compile() {
-       # Fix sandbox error with USE="introspection" and "doc"
-       # https://bugs.webkit.org/show_bug.cgi?id=35471
-       addpredict "$(unset HOME; echo ~)/.local"
-       gnome2_src_compile
-}

diff --git a/www-client/epiphany/epiphany-3.0.4.ebuild b/www-client/epiphany/epiphany-3.0.4.ebuild
new file mode 100644 (file)
index 0000000..af76486
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.0.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.0.4.ebuild,v 1.1 2011/08/19 14:55:22 nirbheek 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.
+RDEPEND=">=dev-libs/glib-2.25.13:2
+       >=x11-libs/gtk+-3.0.2:3[introspection?]
+       >=dev-libs/libxml2-2.6.12:2
+       >=dev-libs/libxslt-1.1.7
+       >=x11-libs/startup-notification-0.5
+       >=dev-libs/dbus-glib-0.71
+       >=app-text/iso-codes-0.35
+       >=net-libs/webkit-gtk-1.4.2: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/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 )
+       networkmanager? ( net-misc/networkmanager )
+       nss? ( dev-libs/nss )
+"
+DEPEND="${RDEPEND}
+       app-text/gnome-doc-utils
+       >=dev-util/intltool-0.40
+       dev-util/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-maintainer-mode
+               --disable-schemas-compile
+               --disable-scrollkeeper
+               --disable-static
+               --with-distributor-name=Gentoo
+               --with-ca-file=${ROOT}/etc/ssl/certs/ca-certificates.crt
+               $(use_enable avahi zeroconf)
+               $(use_enable introspection)
+               $(use_enable networkmanager network-manager)
+               $(use_enable nss)
+               $(use_enable test tests)"
+}