From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SIwBz-0007OT-LV for garchives@archives.gentoo.org; Sat, 14 Apr 2012 06:10:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 725B3E0D0A; Sat, 14 Apr 2012 06:10:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 325B1E0D0A for ; Sat, 14 Apr 2012 06:10:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 523781B401D for ; Sat, 14 Apr 2012 06:10:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 364B5E542E for ; Sat, 14 Apr 2012 06:10:17 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1334376631.d4ba19879e933e0efd942b602af597b5e8b94332.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: www-client/epiphany/ X-VCS-Repository: proj/gnome X-VCS-Files: www-client/epiphany/epiphany-3.4.0.1.ebuild www-client/epiphany/epiphany-9999.ebuild X-VCS-Directories: www-client/epiphany/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: d4ba19879e933e0efd942b602af597b5e8b94332 X-VCS-Branch: master Date: Sat, 14 Apr 2012 06:10:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: bbaf598f-eac6-4bd8-93bc-17d51b623bc6 X-Archives-Hash: b51ed865d1aa0c23af526014459e8506 commit: d4ba19879e933e0efd942b602af597b5e8b94332 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Sat Apr 14 04:10:31 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Sat Apr 14 04:10:31 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dd4ba1987 www-client/epiphany: moved to gx86; sync with gx86 --- www-client/epiphany/epiphany-3.4.0.1.ebuild | 90 ---------------------= ------ www-client/epiphany/epiphany-9999.ebuild | 16 +++-- 2 files changed, 10 insertions(+), 96 deletions(-) diff --git a/www-client/epiphany/epiphany-3.4.0.1.ebuild b/www-client/epi= phany/epiphany-3.4.0.1.ebuild deleted file mode 100644 index 310e70a..0000000 --- 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.eb= uild,v 1.1 2011/11/06 04:57:01 tetromino Exp $ - -EAPI=3D"4" -GCONF_DEBUG=3D"yes" - -inherit autotools eutils gnome2 pax-utils versionator virtualx -if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION=3D"GNOME webbrowser based on Webkit" -HOMEPAGE=3D"http://projects.gnome.org/epiphany/" - -LICENSE=3D"GPL-2" -SLOT=3D"0" -IUSE=3D"avahi doc +introspection +nss test" -if [[ ${PV} =3D 9999 ]]; then - KEYWORDS=3D"" -else - KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -fi - -# XXX: Should we add seed support? Seed seems to be unmaintained now. -RDEPEND=3D" - >=3Ddev-libs/glib-2.31.2:2 - >=3Dx11-libs/gtk+-3.3.14:3[introspection?] - >=3Ddev-libs/libxml2-2.6.12:2 - >=3Ddev-libs/libxslt-1.1.7 - >=3Dapp-text/iso-codes-0.35 - >=3Dnet-libs/webkit-gtk-1.7.92:3[introspection?] - >=3Dnet-libs/libsoup-gnome-2.37.1:2.4 - >=3Dgnome-base/gnome-keyring-2.26.0 - >=3Dgnome-base/gsettings-desktop-schemas-0.0.1 - >=3Dx11-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? ( >=3Dnet-dns/avahi-0.6.22 ) - introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) - nss? ( dev-libs/nss )" -# paxctl needed for bug #407085 -DEPEND=3D"${RDEPEND} - app-text/gnome-doc-utils - >=3Ddev-util/intltool-0.40 - dev-util/pkgconfig - sys-apps/paxctl - sys-devel/gettext - doc? ( >=3Ddev-util/gtk-doc-1 )" - -pkg_setup() { - DOCS=3D"AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO" - G2CONF=3D"${G2CONF} - --enable-shared - --disable-schemas-compile - --disable-scrollkeeper - --disable-static - --with-distributor-name=3DGentoo - $(use_enable avahi zeroconf) - $(use_enable introspection) - $(use_enable nss) - $(use_enable test tests)" -} - -src_prepare() { - # Build-time segfaults under PaX with USE=3Dintrospection - 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=3D"${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/epipha= ny/epiphany-9999.ebuild index 310e70a..4ad81e0 100644 --- a/www-client/epiphany/epiphany-9999.ebuild +++ b/www-client/epiphany/epiphany-9999.ebuild @@ -15,7 +15,7 @@ HOMEPAGE=3D"http://projects.gnome.org/epiphany/" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -IUSE=3D"avahi doc +introspection +nss test" +IUSE=3D"avahi doc +introspection +jit +nss test" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else @@ -45,6 +45,7 @@ RDEPEND=3D" =20 avahi? ( >=3Dnet-dns/avahi-0.6.22 ) introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) + !jit? ( net-libs/webkit-gtk[-jit] ) nss? ( dev-libs/nss )" # paxctl needed for bug #407085 DEPEND=3D"${RDEPEND} @@ -70,10 +71,13 @@ pkg_setup() { } =20 src_prepare() { - # Build-time segfaults under PaX with USE=3Dintrospection - epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch" - cp "${FILESDIR}/paxctl.sh" "${S}/" || die - eautoreconf + # Build-time segfaults under PaX with USE=3Dintrospection 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} !=3D 9999 ]] && eautoreconf + fi gnome2_src_prepare } =20 @@ -86,5 +90,5 @@ src_test() { =20 src_install() { gnome2_src_install - pax-mark m "${ED}usr/bin/epiphany" + use jit && pax-mark m "${ED}usr/bin/epiphany" }