Version bump, use spidermonkey-185 because of problems with memory handling when using mozjs-17 (#553334)

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

5 files changed, 34 insertions, 270 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index e8b221c54763..df558e134c43 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/polkit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.193 2015/06/06 08:52:19 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.194 2015/07/04 13:26:52 pacho Exp $
+
+*polkit-0.113 (04 Jul 2015)
+
+  04 Jul 2015; Pacho Ramos <pacho@gentoo.org> +polkit-0.113.ebuild,
+  -files/polkit-0.110-W_define.patch, -polkit-0.110.ebuild,
+  -polkit-0.112-r1.ebuild, -polkit-0.112.ebuild:
+  Version bump, use spidermonkey-185 because of problems with memory handling
+  when using mozjs-17 (#553334)
 
 *polkit-0.112-r3 (06 Jun 2015)
 
diff --git a/sys-auth/polkit/files/polkit-0.110-W_define.patch b/sys-auth/polkit/files/polkit-0.110-W_define.patch
deleted file mode 100644
index 8e502b878bc7..000000000000
--- a/sys-auth/polkit/files/polkit-0.110-W_define.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.freedesktop.org/show_bug.cgi?id=62220
-
-Failure to compile on SH4 arch because <sys/wait.h> is missing for #define's of:
-WIFEXITED, WEXITSTATUS, WIFSIGNALED, WTERMSIG
-
-Errors are like this:
-
-polkitbackendjsauthority.c:1509:3: warning: implicit declaration of function 'WIFEXITED' [-Wimplicit-function-declaration]
-polkitbackendjsauthority.c:1509:3: warning: nested extern declaration of 'WIFEXITED' [-Wnested-externs]
-
-polkitbackendjsauthority.c:(.text+0x3008): undefined reference to `WIFEXITED'
-polkitbackendjsauthority.c:(.text+0x3010): undefined reference to `WIFEXITED'
-
---- src/polkitbackend/polkitbackendjsauthority.c
-+++ src/polkitbackend/polkitbackendjsauthority.c
-@@ -20,6 +20,7 @@
-  */
- 
- #include "config.h"
-+#include <sys/wait.h>
- #include <errno.h>
- #include <pwd.h>
- #include <grp.h>
diff --git a/sys-auth/polkit/polkit-0.110.ebuild b/sys-auth/polkit/polkit-0.110.ebuild
deleted file mode 100644
index 7ad37ee725ba..000000000000
--- a/sys-auth/polkit/polkit-0.110.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.110.ebuild,v 1.16 2015/03/03 09:56:07 dlan Exp $
-
-EAPI=5
-inherit eutils multilib pam pax-utils systemd user
-
-DESCRIPTION="Policy framework for controlling privileges for system-wide services"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/polkit"
-SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="examples gtk +introspection kde nls pam selinux systemd"
-
-RDEPEND=">=dev-lang/spidermonkey-1.8.5-r1:0=[-debug]
-	>=dev-libs/glib-2.32
-	>=dev-libs/expat-2
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-		)
-	selinux? ( sec-policy/selinux-policykit )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/intltool
-	virtual/pkgconfig"
-PDEPEND="
-	gtk? ( || (
-		>=gnome-extra/polkit-gnome-0.105
-		lxde-base/lxpolkit
-		) )
-	kde? ( sys-auth/polkit-kde-agent )
-	!systemd? ( >=sys-auth/consolekit-0.4.5_p2012[policykit] )"
-
-QA_MULTILIB_PATHS="
-	usr/lib/polkit-1/polkit-agent-helper-1
-	usr/lib/polkit-1/polkitd"
-
-pkg_setup() {
-	local u=polkitd
-	local g=polkitd
-	local h=/var/lib/polkit-1
-
-	enewgroup ${g}
-	enewuser ${u} -1 -1 ${h} ${g}
-	esethome ${u} ${h}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-W_define.patch
-
-	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
-
-	if has_version '>=dev-lang/spidermonkey-1.8.7'; then
-		sed -i \
-			-e '/mozjs/s:185:187:g' \
-			configure src/polkitbackend/polkitbackendjsauthority.c || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		--enable-man-pages \
-		--disable-gtk-doc \
-		$(use_enable systemd libsystemd-login) \
-		$(use_enable introspection) \
-		--disable-examples \
-		$(use_enable nls) \
-		"$(systemd_with_unitdir)" \
-		--with-authfw=$(usex pam pam shadow) \
-		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
-		--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}
-	elif has_version '<dev-lang/spidermonkey-1.8.7'; then
-		pax-mark mr ${f}
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc docs/TODO HACKING NEWS README
-
-	fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d
-
-	diropts -m0700 -o polkitd -g polkitd
-	keepdir /var/lib/polkit-1
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins src/examples/{*.c,*.policy*}
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
-	chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
-}
diff --git a/sys-auth/polkit/polkit-0.112-r1.ebuild b/sys-auth/polkit/polkit-0.112-r1.ebuild
deleted file mode 100644
index 5fa08c76ed8e..000000000000
--- a/sys-auth/polkit/polkit-0.112-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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.14 2014/08/14 14:14:06 ssuominen Exp $
-
-EAPI=5
-inherit eutils multilib pam pax-utils systemd user
-
-DESCRIPTION="Policy framework for controlling privileges for system-wide services"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/polkit"
-SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="examples gtk +introspection kde nls pam selinux systemd"
-
-RDEPEND="
-	ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
-	hppa? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
-	mips? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
-	!hppa? ( !ia64? ( !mips? ( dev-lang/spidermonkey:17[-debug] ) ) )
-	>=dev-libs/glib-2.32
-	>=dev-libs/expat-2:=
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-		)
-	selinux? ( sec-policy/selinux-policykit )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/intltool
-	virtual/pkgconfig"
-PDEPEND="
-	gtk? ( || (
-		>=gnome-extra/polkit-gnome-0.105
-		lxde-base/lxpolkit
-		) )
-	kde? ( sys-auth/polkit-kde-agent )
-	!systemd? ( sys-auth/consolekit[policykit] )"
-
-QA_MULTILIB_PATHS="
-	usr/lib/polkit-1/polkit-agent-helper-1
-	usr/lib/polkit-1/polkitd"
-
-pkg_setup() {
-	local u=polkitd
-	local g=polkitd
-	local h=/var/lib/polkit-1
-
-	enewgroup ${g}
-	enewuser ${u} -1 -1 ${h} ${g}
-	esethome ${u} ${h}
-}
-
-src_prepare() {
-	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		--enable-man-pages \
-		--disable-gtk-doc \
-		$(use_enable systemd libsystemd-login) \
-		$(use_enable introspection) \
-		--disable-examples \
-		$(use_enable nls) \
-		$(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)") \
-		--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'
-	local m='m'
-	# 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}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc docs/TODO HACKING NEWS README
-
-	fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d
-
-	diropts -m0700 -o polkitd -g polkitd
-	keepdir /var/lib/polkit-1
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins src/examples/{*.c,*.policy*}
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
-	chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
-}
diff --git a/sys-auth/polkit/polkit-0.112.ebuild b/sys-auth/polkit/polkit-0.113.ebuild
index 4bfb2137b152..d742cce195d2 100644
--- a/sys-auth/polkit/polkit-0.112.ebuild
+++ b/sys-auth/polkit/polkit-0.113.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112.ebuild,v 1.10 2013/09/23 19:17:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.113.ebuild,v 1.1 2015/07/04 13:26:52 pacho Exp $
 
 EAPI=5
 inherit eutils multilib pam pax-utils systemd user
@@ -11,32 +11,42 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="examples gtk +introspection kde nls pam selinux systemd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="examples gtk +introspection jit kde nls pam selinux systemd test"
 
-RDEPEND="=dev-lang/spidermonkey-1.8.5*[-debug]
-	>=dev-libs/glib-2.32
+CDEPEND="
+	dev-lang/spidermonkey:0/mozjs185[-debug]
+	>=dev-libs/glib-2.32:2
 	>=dev-libs/expat-2:=
-	introspection? ( >=dev-libs/gobject-introspection-1 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
 	pam? (
 		sys-auth/pambase
 		virtual/pam
 		)
-	selinux? ( sec-policy/selinux-policykit )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
+	systemd? ( sys-apps/systemd:0= )
+"
+DEPEND="${CDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
+	dev-util/gtk-doc-am
 	dev-util/intltool
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-policykit )
+"
 PDEPEND="
 	gtk? ( || (
 		>=gnome-extra/polkit-gnome-0.105
 		lxde-base/lxpolkit
 		) )
-	kde? ( sys-auth/polkit-kde-agent )
-	!systemd? ( sys-auth/consolekit[policykit] )"
+	kde? ( || (
+		kde-plasma/polkit-kde-agent
+		sys-auth/polkit-kde-agent
+		) )
+	!systemd? ( sys-auth/consolekit[policykit] )
+"
 
 QA_MULTILIB_PATHS="
 	usr/lib/polkit-1/polkit-agent-helper-1
@@ -70,6 +80,7 @@ src_configure() {
 		"$(systemd_with_unitdir)" \
 		--with-authfw=$(usex pam pam shadow) \
 		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
+		$(use_enable test) \
 		--with-os-type=gentoo
 }
 
@@ -77,9 +88,7 @@ src_compile() {
 	default
 
 	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
-	local f='src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest'
-	local m='mr'
-	pax-mark ${m} ${f}
+	pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest
 }
 
 src_install() {