-r0 is for stabilization w/ mozjs185 and -r1 is for ~arch with mozjs 17.0

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 131 insertions, 20 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index 02982762887b..c9b26c3d30b9 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/polkit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.149 2013/09/19 16:08:57 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.150 2013/09/19 17:08:30 ssuominen Exp $
+
+*polkit-0.112-r1 (19 Sep 2013)
+
+  19 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> +polkit-0.112-r1.ebuild,
+  polkit-0.112.ebuild:
+  -r0 is for stabilization w/ mozjs185 and -r1 is for ~arch with mozjs 17.0
 
   19 Sep 2013; Doug Goldstein <cardoe@gentoo.org> -polkit-0.111-r1.ebuild:
   Remove vulnerable version
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 17872efdcd0d..c99536fde623 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -7,19 +7,18 @@ DIST polkit-0.110.tar.gz 1390215 SHA256 8e5c5044bb968643b7fa379f287fb10582615df7
 DIST polkit-0.112.tar.gz 1429240 SHA256 d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6 SHA512 e4ad1bd287b38e5650cb94b1897a959b2ceaa6c19b4478ba872eacb13b58758fd42f6ab1718976162d823d850cd5c99b3ccadf1b57d75dea7790101422029d5f WHIRLPOOL af5dd0a17b7356302b0319e80565d6ac916128dfc85b6e2711147f3de86651f11fe8d08f3d6067d7abd24e263be92403f9d8f46935ba93db571e386a603a038a
 EBUILD polkit-0.110-r1.ebuild 2787 SHA256 570da29ce8c19b7138af17454cbb791d96cf172febc1974e621dcd42b8561675 SHA512 d7b6bb260b2cc9199f1cc030ef8fbd12c434ca5564344b8d9dcb6796568fdc619134fba9a726acda5e74e5761d3ce8f0dfb2d04911c6c236d5fc5e6ca5b9c7cd WHIRLPOOL 1975dd5da95940f0dd62fe3c98f72f29dd17e898095f510f55cfcef5a8ff8b3c395cc90f7b8129e59956a9778aee4f05bb75ae2c415bc2313b7c799d73071e1a
 EBUILD polkit-0.110.ebuild 3042 SHA256 77f25cf950072a856731546f040c41fdb6b4e5bf4a9da2aacfdeee8b85d68860 SHA512 8c1555692406becc97eae07b2feb55c63915fcbc91688b6d80527c64b44e58624c806ada9c06efddb96acefc5ce5ac8ecef220594716a942ad651a018aefc8fa WHIRLPOOL ad47215ffcee4ecdddf1d1a5a6a24941462e927f673202ef055c72afd3f5165e2011b853dbbec19e40546143ce23177ec139ed9fb796353fb9935a731b89da3a
-EBUILD polkit-0.112.ebuild 2911 SHA256 bf2208fd70501e509f2e16cec5fcc1dc6f09fdc3b07aa2f56b025e7daa83d2b6 SHA512 05ad14409df776b81d0c7b7244cf4338116c03a1a79df8489e344ad333f469f46043d1bacbf0b23207dfcb018731626ee693b7b626b3bac0450a554e6fcb5e65 WHIRLPOOL 91dd308cb05c8f8da5d8b7b2d0d81ad8ec4509b0b0e8ad4d55fe29199f5345e146cc06d1cc83dd60d73aa22a9a6083b440cb3866955b7ea3109f5129c8d3ca76
-MISC ChangeLog 20904 SHA256 aa56db0f7cb8d2f457de6920fe359fdb6d9cad7b3e9fe1c25827e077bdb88c54 SHA512 17fd6528c60e7c262c4b03aa62f56ffc43fb1a4a9506141b227994be64ccda7042c87bd8a2b75534212dbb4002588ac81e695d8a9d54ef7497b5cc47ae5b395d WHIRLPOOL e6c96682221b0a5e37ff1e31fe8b0f2fe1f7186f9329285ef1cbc0035cb063a2d88c1354edc5bc1b0042adc2d8f7fc91bd8e6426889490fea7f82f01a513604c
+EBUILD polkit-0.112-r1.ebuild 2917 SHA256 c042712741821e5430bb8152bf69717f86d44a2d8ccf7af7a8c08fb53cae9ace SHA512 be704280ac78bbda7ff1480e5cfcf3bb74d7eff4e3cd3c4a20b430f229863cde2e62a8b42d506365cd316722551f9f625122da09050c3d4b403fd3d36d6c2b0b WHIRLPOOL 2f1b853618e825f90f8c70c7c3072b677ccb99ec35f135a501cab83ce175ac219e3e8f80fe2d42e559764960178b4379a55a84e1644ef7bc4c998524d314690a
+EBUILD polkit-0.112.ebuild 2731 SHA256 84de835f0ab4751cdb38807a65e8e65cd02ef5cd94ff0268ca78b3f36390fe4b SHA512 02e84bbd72a92c600c70ab82c4f6adbabc818aca5af0401cc65469cfa5a2fd139c377b42d362a8c8a5f892358db62bd76d50f739b43a38fa26e7a27326781eff WHIRLPOOL 2ccd1676acbf3892464a5b72f82db209b6d8540f81b841662349e2a4c0abe0fd1dbe18ab93ed85180b3e88c7b643b6d07890cd7167341c73b14fa1da3f32a187
+MISC ChangeLog 21118 SHA256 141658ab85663d08043614fd72df55cfd7b82239fccb6dc36fc454e4f146c89b SHA512 4426933411771bb54ac5a3f7321dc6047d5bf36365c2dfe2fdbaf3e8155fb0f5a44fd8a416b8a58499723561971d62c1faa6fc32a1f9e30a357d9c4610a8b0b3 WHIRLPOOL 4d21b14ac72aaf3b6416d870f7614410a9498c20a91dbf24873fc0b25eb729b12263999722af77f902473a11e1c20e46d670d76364b2d4b3583c88de6214fe85
 MISC metadata.xml 516 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba SHA512 293585c3b4c95b76af687f398645982d84d583e3cbf039a181c67c9710a899dad34cba9ff43f7be03a00d7552f42f0ac0a2a997c3ce7c9b80097a43f501001d4 WHIRLPOOL 4caf1316226570bec927b20957e420217a490c91013154b84f56fddf50cd5b525ccd0fd736a305ef5bc772cca734aadd8fec757238021b3e05046b503468e1a5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQF8BAEBCABmBQJSOyGaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
-N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prveIoH/AxMO87z5GqV9JqC1Pnc7BCe
-xOJiq00wcO07wqAvlkPtbHVVn6uTUFfJR6GwOUvs/PQwmDvFDVWcYpXCMNmlW9sc
-iEgHKN4CBJqmvFfTZr/QrZxYMK5/W9MGQFQlXm1NgTY6oT48lfWcUOLSmt5glWaQ
-aUHfCU0RCTxprEG/gzs+LTBs7+mLj4IP69NhvLRXdlRgffVmUj5A7YqdTio16vcm
-P4lz+RIstxE4WQzGbvv0tIt3qWBbSer4+Zx3xxaqZce0V4syaNorBXuPBAlTYBvB
-YG+j2rsggr0j8BE2mIXwCEvPOnBTkox6NTtuKI05ve5q9UIjlwaRVV0bQ+5zy6s=
-=eGmv
+iQEcBAEBCAAGBQJSOy9gAAoJEEdUh39IaPFNVt4IAJNJGjf9j8dVEvnBSopg2Oec
++Zwx8p8tzwearyqjNX367DPS7lZN2334Nv0TadewcJ2wC6TfaQ3TyWoZsg246ah/
+CBf4MAcgaEc9RVc4g9cnf2o1lRoUtAkxbGpUOrOle4DQ/5VkgUyoH/4VCU6PmPup
+ft9l3cFeihOfu2kjKqanj1vHkaGDghhD6C8OWiFa16ksfFTn23KiDfYeSuVFVbjY
+DSK2zeIhdl8XxeWkUucdtfytRmepGThmCkdosSBpIzBPF7+azSdhtHxA1GA1lDfP
+hZk9prGeX5rqadcDC7hYyYbgUbOPd7jkEXvKBNc7Lz3hDFEU0W7yc09q8EEKQ3E=
+=s1ha
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/polkit-0.112-r1.ebuild b/sys-auth/polkit/polkit-0.112-r1.ebuild
new file mode 100644
index 000000000000..a912a7b88502
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.112-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2013 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.1 2013/09/19 17:08:30 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 ~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] )
+	!ia64? ( 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) \
+		$(usex ia64 --with-mozjs=mozjs185 --with-mozjs=mozjs-17.0) \
+		"$(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'
+	# ia64 uses spidermonkey-1.8.5 which requires different pax-mark flags
+	use ia64 && 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.112.ebuild
index 1a911af7357c..406c6e8a8f36 100644
--- a/sys-auth/polkit/polkit-0.112.ebuild
+++ b/sys-auth/polkit/polkit-0.112.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/sys-auth/polkit/polkit-0.112.ebuild,v 1.1 2013/09/19 15:47:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112.ebuild,v 1.2 2013/09/19 17:08:30 ssuominen Exp $
 
 EAPI=5
 inherit eutils multilib pam pax-utils systemd user
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~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] )
-	!ia64? ( dev-lang/spidermonkey:17[-debug] )
+RDEPEND="=dev-lang/spidermonkey-1.8.5*[-debug]
 	>=dev-libs/glib-2.32
 	>=dev-libs/expat-2:=
 	introspection? ( >=dev-libs/gobject-introspection-1 )
@@ -67,7 +66,7 @@ src_configure() {
 		$(use_enable introspection) \
 		--disable-examples \
 		$(use_enable nls) \
-		$(usex ia64 --with-mozjs=mozjs185 --with-mozjs=mozjs-17.0) \
+		--with-mozjs=mozjs185 \
 		"$(systemd_with_unitdir)" \
 		--with-authfw=$(usex pam pam shadow) \
 		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
@@ -79,9 +78,7 @@ 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 uses spidermonkey-1.8.5 which requires different pax-mark flags
-	use ia64 && m='mr'
+	local m='mr'
 	pax-mark ${m} ${f}
 }