Fix the arch logic for HPPA (to match how IA64 and MIPS are handled in the ebuild)

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 14 insertions, 7 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index 6e51f31d7217..00b9ef23e01a 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-auth/polkit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.177 2014/08/14 08:46:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.178 2014/08/14 14:14:06 ssuominen Exp $
+
+  14 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> polkit-0.112-r1.ebuild,
+  polkit-0.112-r2.ebuild:
+  Fix the arch logic for HPPA (to match how IA64 and MIPS are handled in the
+  ebuild)
 
   14 Aug 2014; Jeroen Roovers <jer@gentoo.org> polkit-0.112-r1.ebuild:
   Stable for HPPA (bug #519870).
diff --git a/sys-auth/polkit/polkit-0.112-r1.ebuild b/sys-auth/polkit/polkit-0.112-r1.ebuild
index 1fdbd7073e4a..5fa08c76ed8e 100644
--- a/sys-auth/polkit/polkit-0.112-r1.ebuild
+++ b/sys-auth/polkit/polkit-0.112-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r1.ebuild,v 1.13 2014/08/14 08:46:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r1.ebuild,v 1.14 2014/08/14 14:14:06 ssuominen Exp $
 
 EAPI=5
 inherit eutils multilib pam pax-utils systemd user
@@ -70,7 +70,7 @@ src_configure() {
 		$(use_enable introspection) \
 		--disable-examples \
 		$(use_enable nls) \
-		$(if use ia64 || use mips; then echo --with-mozjs=mozjs185; else echo --with-mozjs=mozjs-17.0; fi) \
+		$(if use hppa || use ia64 || use mips; then echo --with-mozjs=mozjs185; else echo --with-mozjs=mozjs-17.0; fi) \
 		"$(systemd_with_unitdir)" \
 		--with-authfw=$(usex pam pam shadow) \
 		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
@@ -83,7 +83,8 @@ src_compile() {
 	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
 	local f='src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest'
 	local m='m'
-	# ia64 and mips uses spidermonkey-1.8.5 which requires different pax-mark flags
+	# hppa, ia64 and mips uses spidermonkey-1.8.5 which requires different pax-mark flags
+	use hppa && m='mr'
 	use ia64 && m='mr'
 	use mips && m='mr'
 	pax-mark ${m} ${f}
diff --git a/sys-auth/polkit/polkit-0.112-r2.ebuild b/sys-auth/polkit/polkit-0.112-r2.ebuild
index e3c6bda390d2..38163c95538e 100644
--- a/sys-auth/polkit/polkit-0.112-r2.ebuild
+++ b/sys-auth/polkit/polkit-0.112-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r2.ebuild,v 1.3 2014/08/13 12:24:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r2.ebuild,v 1.4 2014/08/14 14:14:06 ssuominen Exp $
 
 EAPI=5
 inherit eutils multilib pam pax-utils systemd user
@@ -70,7 +70,7 @@ src_configure() {
 		$(use_enable introspection) \
 		--disable-examples \
 		$(use_enable nls) \
-		$(if use ia64 || use mips; then echo --with-mozjs=mozjs185; else echo --with-mozjs=mozjs-17.0; fi) \
+		$(if use hppa || use ia64 || use mips; then echo --with-mozjs=mozjs185; else echo --with-mozjs=mozjs-17.0; fi) \
 		"$(systemd_with_unitdir)" \
 		--with-authfw=$(usex pam pam shadow) \
 		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
@@ -85,7 +85,8 @@ src_compile() {
 	local m=''
 	# Only used when USE="jit" is enabled for 'dev-lang/spidermonkey:17' wrt #485910
 	has_version 'dev-lang/spidermonkey:17[jit]' && m='m'
-	# ia64 and mips uses spidermonkey-1.8.5 which requires different pax-mark flags
+	# hppa, ia64 and mips uses spidermonkey-1.8.5 which requires different pax-mark flags
+	use hppa && m='mr'
 	use ia64 && m='mr'
 	use mips && m='mr'
 	pax-mark ${m} ${f}