diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-08-11 08:17:25 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-08-11 08:17:25 +0000 |
| commit | 86adeff2d177be6280ed7fa2f02e0095c192492f (patch) | |
| tree | 77b7a4d2b8571b5ab5f5c8a548b7326a08e6ec5c | |
| parent | Mask more ruby18-only packages for removal. (diff) | |
| download | gentoo-2-86adeff2d177be6280ed7fa2f02e0095c192492f.tar.gz gentoo-2-86adeff2d177be6280ed7fa2f02e0095c192492f.tar.bz2 gentoo-2-86adeff2d177be6280ed7fa2f02e0095c192492f.zip | |
Restore pax marking of /usr/bin/midori because net-libs/webkit-gtk[jit] is broken again wrt #480290 by "A. Person"
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
| -rw-r--r-- | www-client/midori/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/midori/midori-0.5.4.ebuild | 16 |
2 files changed, 19 insertions, 3 deletions
diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog index c371b9942a48..eeade1282d34 100644 --- a/www-client/midori/ChangeLog +++ b/www-client/midori/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/midori # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.114 2013/07/31 04:50:26 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.115 2013/08/11 08:17:25 ssuominen Exp $ + + 11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> midori-0.5.4.ebuild: + Restore pax marking of /usr/bin/midori because net-libs/webkit-gtk[jit] is + broken again wrt #480290 by "A. Person" 31 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> -files/midori-0.4.6-dl.patch, -midori-0.4.6-r1.ebuild, -midori-0.5.2.ebuild: diff --git a/www-client/midori/midori-0.5.4.ebuild b/www-client/midori/midori-0.5.4.ebuild index 191db49ba359..246ac0da6140 100644 --- a/www-client/midori/midori-0.5.4.ebuild +++ b/www-client/midori/midori-0.5.4.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/midori/midori-0.5.4.ebuild,v 1.1 2013/07/17 06:02:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.4.ebuild,v 1.2 2013/08/11 08:17:25 ssuominen Exp $ EAPI=5 VALA_MIN_API_VERSION=0.16 @@ -18,7 +18,7 @@ else S=${WORKDIR}/${PN}_${PV}_all_ fi -inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils vala ${_live_inherits} +inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 waf-utils vala ${_live_inherits} DESCRIPTION="A lightweight web browser based on WebKitGTK+" HOMEPAGE="http://www.midori-browser.org/" @@ -95,6 +95,18 @@ src_configure() { ${myconf} } +src_install() { + waf-utils_src_install + + local jit_is_enabled + if use deprecated; then + has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes + else + has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes + fi + [[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290 +} + pkg_preinst() { gnome2_icon_savelist } |