diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-10-08 06:24:32 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-10-08 06:24:32 +0000 |
| commit | c015730ab855d54814b3c4c8233f9e5d0c71121b (patch) | |
| tree | 198fe867b0cc1b7c93ef0f4a376143aca5016cc1 /sys-auth | |
| parent | Version bump. (diff) | |
| download | gentoo-2-c015730ab855d54814b3c4c8233f9e5d0c71121b.tar.gz gentoo-2-c015730ab855d54814b3c4c8233f9e5d0c71121b.tar.bz2 gentoo-2-c015730ab855d54814b3c4c8233f9e5d0c71121b.zip | |
Use pax-mark in src_compile() instead of src_install() for src_test() wrt #423927 by "kensington" and "Nikoli". Punt bogus RESTRICT for multilib-strict and emphatize it's an Portage issue instead of polkit issue in src_install() message.
(Portage version: 2.2.0_alpha135/cvs/Linux x86_64)
Diffstat (limited to 'sys-auth')
| -rw-r--r-- | sys-auth/polkit/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-auth/polkit/polkit-0.107-r1.ebuild | 33 |
2 files changed, 29 insertions, 12 deletions
diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog index 8132e6863192..1a6bbc84c84f 100644 --- a/sys-auth/polkit/ChangeLog +++ b/sys-auth/polkit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-auth/polkit # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.104 2012/10/07 10:46:47 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.105 2012/10/08 06:24:32 ssuominen Exp $ + + 08 Oct 2012; Samuli Suominen <ssuominen@gentoo.org> polkit-0.107-r1.ebuild: + Use pax-mark in src_compile() instead of src_install() for src_test() wrt + #423927 by "kensington" and "Nikoli". Punt bogus RESTRICT for multilib-strict + and emphatize it's an Portage issue instead of polkit issue in src_install() + message. 07 Oct 2012; Agostino Sarubbo <ago@gentoo.org> polkit-0.107-r1.ebuild: Stable for amd64, wrt bug #436666 diff --git a/sys-auth/polkit/polkit-0.107-r1.ebuild b/sys-auth/polkit/polkit-0.107-r1.ebuild index 2fd655365ef7..47ec6246d5c3 100644 --- a/sys-auth/polkit/polkit-0.107-r1.ebuild +++ b/sys-auth/polkit/polkit-0.107-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.107-r1.ebuild,v 1.2 2012/10/07 10:46:47 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.107-r1.ebuild,v 1.3 2012/10/08 06:24:32 ssuominen Exp $ EAPI=4 inherit eutils multilib pam pax-utils systemd user @@ -14,9 +14,7 @@ SLOT="0" KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="examples gtk +introspection kde nls pam selinux systemd" -RESTRICT="multilib-strict" #424423 - -RDEPEND=">=dev-lang/spidermonkey-1.8.5 +RDEPEND=">=dev-lang/spidermonkey-1.8.5-r1 >=dev-libs/glib-2.32 >=dev-libs/expat-2 introspection? ( >=dev-libs/gobject-introspection-1 ) @@ -76,7 +74,27 @@ src_configure() { --with-os-type=gentoo } +src_compile() { + default + + # Required for polkitd on hardened/PaX due to spidermonkey's JIT + local f='src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest' + if has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then + pax-mark m ${f} + else + pax-mark mr ${f} + fi +} + src_install() { + if has multilib-strict ${FEATURES}; then + ewarn + ewarn "Possible broken flag multilib-strict in FEATURES detected." + ewarn "Your build will likely fail to install wrt bug #424423." + ewarn "This is a bug in the Package Manager instead of polkit." + ewarn + fi + emake DESTDIR="${D}" install dodoc docs/TODO HACKING NEWS README @@ -92,13 +110,6 @@ src_install() { fi prune_libtool_files - - # Required for polkitd on hardened/PaX due to spidermonkey's JIT - if has_version '<dev-lang/spidermonkey-1.8.7'; then - pax-mark mr "${ED}"/usr/lib/polkit-1/polkitd - elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then - pax-mark m "${ED}"/usr/lib/polkit-1/polkitd - fi } pkg_postinst() { |