dropped polkit-111 in favour of -r1 now that spidermonkey-17 is unmasked, as per ssuominen's approval

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

3 files changed, 9 insertions, 118 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index 6500d85f05cf..5b5ddf7e799b 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,10 @@
 # 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.144 2013/08/09 18:38:03 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.145 2013/08/09 18:44:12 axs Exp $
+
+  09 Aug 2013; Ian Stakenvicius <axs@gentoo.org> -polkit-0.111.ebuild:
+  dropped polkit-111 in favour of -r1 now that spidermonkey-17 is unmasked, as
+  per ssuominen's approval
 
   09 Aug 2013; Ian Stakenvicius <axs@gentoo.org> polkit-0.110.ebuild,
   polkit-0.111-r1.ebuild:
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 2eb2098a6429..8c80ee43060e 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -6,13 +6,12 @@ DIST polkit-0.110.tar.gz 1390215 SHA256 8e5c5044bb968643b7fa379f287fb10582615df7
 DIST polkit-0.111.tar.gz 1396389 SHA256 02ae544547211b687818c97bcbf19bf6b8b5be7fda93000525a8765c7bed1ea1 SHA512 88eb1dfad25244020632f964219a382f7b7f7efc00cf563c66f9c6e6ef72af3c7198602be751aa8f0845b5b4f928d003e8041e1c92533beb9d00c38a7688b2d0 WHIRLPOOL dc3941e3de2767b766e4b984475485c743de113fe7b6fe1e6d89acff1a113bdb825366bc214a02aa07fdd148337ff11614a37ca450743910c4953979f99f4604
 EBUILD polkit-0.110.ebuild 3134 SHA256 3ecc480f3755637ecf70d5e39d80efac3b25f215d8a70410fc4ea97581eef99c SHA512 83869331bbab29bc6b1586cf8fdb8e52a5362e65d4ca50705bc29e87fd5f848bf63c8c7da055651a6e82e4b73337138481ad659fc693987f151cf2f9fcf477c9 WHIRLPOOL 3de7e2f81da275e33745e75a952bb758474a4495296a397bfca1097e624f9db353c110d5d289a399c186398674e4e5e2fb69581b801e12407869d0566a2af6c2
 EBUILD polkit-0.111-r1.ebuild 3009 SHA256 377bce849a472b30d9584157450243b50932699426555551ecbba5d604f90599 SHA512 b9aa0893f3c1b844ec2ea8bd4d6ac7e1310700e732ebf2bc72b6bb69d74f6870b07a83f638e6f3abf541542121566de1f73338124e26050a4675550696d25932 WHIRLPOOL c51bc55fa7862c5b336299f8d23fc9e29bc8d99eccaea8a8161909a7ecb1912aa5f85662dd7ff659a3070b984406a18ca21eeb2fa88f72942981af4271e94bfb
-EBUILD polkit-0.111.ebuild 2966 SHA256 158aea105b7c7196ca09f653ef29f8953375c63c903d8f407e3f0a206515dcf8 SHA512 3f0cc10c1a1c553b2f518e85f24dfe0711f690cbfa40e782e88e3ceba48a8887c3530d5edded4060d7e933e4fe112ef90d10e2ca7f3222f9f7a5caaed5322bde WHIRLPOOL 4cf5e6904f80d5278adf6cc822633f89cec420be667910756b191d3046109b7ba8d0f2c3f0e007a774bcd0517a286615802605a96270d225d13052b26f8eab5e
-MISC ChangeLog 19994 SHA256 891233aafe9e0ec9e71a594d61653cceb10b9b22eef2bc6062636367599ed9d9 SHA512 c164f63bf13aab8844a8673759d0605d97b62d9cd009c8526286f5a0889fa53e9b4abcd2497b7591b93ba44f16650400675f1fc1dc63f642c7013704f11d4a9c WHIRLPOOL 691d3ffe5a567776e488f5847c59d3d227a9e31f1048f5ff4304a310b66e7ec3487670e991e9776c3a6a2b9c464e8b2ba07c0b7a84a259faa5404c5d576dbba9
+MISC ChangeLog 20172 SHA256 18926de2ba8386e9d230739dc79318cfd5a44583986f26acbbf2b2c11889be82 SHA512 83b3c5c040572ed546d04fcf9e3510f724c5015c01775781bedf8076360ec42e67cd77376bb90ef6c61cc36fe7ae464a4899806c79660976229e7e9006d0d8b8 WHIRLPOOL 37d42e80e42fc27693a54e45dc99d6d8983428af907bf30491f307c8f6f2ba9054b8b4f2c1a7af2a86a3c6f785d188369b2481f98e134cf1c2a0c1bcafcf6560
 MISC metadata.xml 516 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba SHA512 293585c3b4c95b76af687f398645982d84d583e3cbf039a181c67c9710a899dad34cba9ff43f7be03a00d7552f42f0ac0a2a997c3ce7c9b80097a43f501001d4 WHIRLPOOL 4caf1316226570bec927b20957e420217a490c91013154b84f56fddf50cd5b525ccd0fd736a305ef5bc772cca734aadd8fec757238021b3e05046b503468e1a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlIFNx8ACgkQ2ugaI38ACPB/4AD8C+mMsYpnbm+BiTqvZt/s5drT
-+PCasx1EHFpu22rVGeAA/joPPoe/KdnQ8i7cJG7R323b0sHpb7Z4JSIEeEHSMhJm
-=0W/J
+iF4EAREIAAYFAlIFOI8ACgkQ2ugaI38ACPANxwD+NW6aNrPS+RUqQ0pLRgPJTyTW
+QKEiArU19xwq1syMJ8QA/RmbaYx76i4k+G9vMI9LZh0lPFsoemRs8B0mLwasuJWl
+=ODnh
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/polkit-0.111.ebuild b/sys-auth/polkit/polkit-0.111.ebuild
deleted file mode 100644
index ccd9f4473522..000000000000
--- a/sys-auth/polkit/polkit-0.111.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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.111.ebuild,v 1.2 2013/05/15 23:06:24 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="|| ( >=dev-lang/spidermonkey-17[-debug] =dev-lang/spidermonkey-1.8.5*[-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 )
-	pam? (
-		systemd? ( sys-auth/pambase[systemd] )
-		!systemd? ( sys-auth/pambase[consolekit] )
-		)
-	!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) \
-		"$(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
-}