aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-04-14 00:10:31 -0400
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-04-14 00:10:31 -0400
commitd4ba19879e933e0efd942b602af597b5e8b94332 (patch)
tree217ee28c79598d795ecd594fb911606a90025efe /www-client
parentnet-libs/libsoup-gnome: 2.28.0 moved to gx86, sync 9999 with gx86 (diff)
downloadgnome-d4ba19879e933e0efd942b602af597b5e8b94332.tar.gz
gnome-d4ba19879e933e0efd942b602af597b5e8b94332.tar.bz2
gnome-d4ba19879e933e0efd942b602af597b5e8b94332.zip
www-client/epiphany: moved to gx86; sync with gx86
Diffstat (limited to 'www-client')
-rw-r--r--www-client/epiphany/Manifest4
-rw-r--r--www-client/epiphany/epiphany-3.4.0.1.ebuild90
-rw-r--r--www-client/epiphany/epiphany-9999.ebuild16
3 files changed, 11 insertions, 99 deletions
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index af415132..4b275cf5 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,5 +1,3 @@
AUX epiphany-3.3.90-paxctl-introspection.patch 835 RMD160 6b0e132afe80028e0ca66ace51bafe71fe2344c7 SHA1 bad74a12b1f4636bc38f77109e36389899a8ff39 SHA256 c7670baab442a5475e33a614d2f71fb4601398a1fc1bc898e6b9359d35d3d6b3
AUX paxctl.sh 787 RMD160 1944c6ad29d556674a2aab18115d06c2e4842216 SHA1 45475a30566efbe674eeed341dc8e2932b3c732e SHA256 f55473f2b044d25598195b6676175bad9531d4374fff65505d7c717d90d0897e
-DIST epiphany-3.4.0.1.tar.xz 5118028 RMD160 565da5ca8421b33734392fabf8fed2ac9b4d7ff3 SHA1 506999a87d6623c98c9c9379e46728db3711faa0 SHA256 48acfa6efc806cc6b02f783dd92b36ba3bdf94d1e1ae02bed69886f45e400533
-EBUILD epiphany-3.4.0.1.ebuild 2314 RMD160 3c11caf01c0670f4400afd900b4fa62b1347353d SHA1 5fcbf5da05d1eef1f5f306a1d7984fc2569a5080 SHA256 1850874eecc5ab709a2ca4897c36a13873fe424095288d2c0cd4fa45c4bad13f
-EBUILD epiphany-9999.ebuild 2314 RMD160 3c11caf01c0670f4400afd900b4fa62b1347353d SHA1 5fcbf5da05d1eef1f5f306a1d7984fc2569a5080 SHA256 1850874eecc5ab709a2ca4897c36a13873fe424095288d2c0cd4fa45c4bad13f
+EBUILD epiphany-9999.ebuild 2491 RMD160 7cc0ee727311461111d4a621280bfee8444d47cf SHA1 02001b043857a235c9d8c11158276529b4192acb SHA256 14c8c3bedfdf49605fe628f60f5ac3ab26d1d12fc253931df887fa6664b32b4d
diff --git a/www-client/epiphany/epiphany-3.4.0.1.ebuild b/www-client/epiphany/epiphany-3.4.0.1.ebuild
deleted file mode 100644
index 310e70ae..00000000
--- a/www-client/epiphany/epiphany-3.4.0.1.ebuild
+++ /dev/null
@@ -1,90 +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-3.2.1.ebuild,v 1.1 2011/11/06 04:57:01 tetromino 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/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="avahi doc +introspection +nss test"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-# XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND="
- >=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
-
- 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 )
- nss? ( dev-libs/nss )"
-# paxctl needed for bug #407085
-DEPEND="${RDEPEND}
- app-text/gnome-doc-utils
- >=dev-util/intltool-0.40
- dev-util/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
- $(use_enable avahi zeroconf)
- $(use_enable introspection)
- $(use_enable nss)
- $(use_enable test tests)"
-}
-
-src_prepare() {
- # Build-time segfaults under PaX with USE=introspection
- epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
- cp "${FILESDIR}/paxctl.sh" "${S}/" || die
- eautoreconf
- gnome2_src_prepare
-}
-
-src_test() {
- # FIXME: this should be handled at eclass level
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
- GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
- gnome2_src_install
- pax-mark m "${ED}usr/bin/epiphany"
-}
diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 310e70ae..4ad81e0d 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="avahi doc +introspection +nss test"
+IUSE="avahi doc +introspection +jit +nss test"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -45,6 +45,7 @@ RDEPEND="
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 )"
# paxctl needed for bug #407085
DEPEND="${RDEPEND}
@@ -70,10 +71,13 @@ pkg_setup() {
}
src_prepare() {
- # Build-time segfaults under PaX with USE=introspection
- epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
- cp "${FILESDIR}/paxctl.sh" "${S}/" || die
- eautoreconf
+ # 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
+ [[ ${PV} != 9999 ]] && eautoreconf
+ fi
gnome2_src_prepare
}
@@ -86,5 +90,5 @@ src_test() {
src_install() {
gnome2_src_install
- pax-mark m "${ED}usr/bin/epiphany"
+ use jit && pax-mark m "${ED}usr/bin/epiphany"
}