[gentoo-commits] dev/axs:master commit in: /, sys-auth/polkit/, net-analyzer/symon/, dev-vcs/git/, eclass/, ...

[Ian Stakenvicius]

commit:     5e31df8947acbe8efd24b6d889bcd191f2067c90
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  3 17:42:08 2012 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 17:42:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/axs.git;a=commit;h=5e31df89

Synced with tree 2012-07-02 ~17:00UTC , fixed subslot-dep in ruby on libyaml (for the only EAPI=4 ruby ebuild)

---
 dev-lang/ruby/Manifest                             |    2 +-
 dev-lang/ruby/ruby-1.9.3_p194-r1.ebuild            |    2 +-
 dev-perl/Alien-SDL/Alien-SDL-1.434.ebuild          |    4 +-
 dev-perl/Alien-SDL/Manifest                        |    4 +-
 dev-vcs/git/Manifest                               |    4 +-
 dev-vcs/git/git-1.7.8.6.ebuild                     |    4 +-
 eclass/xfconf.eclass                               |    8 +-
 hack-4slotabi-into-portagedb.sh                    |    8 +-
 net-analyzer/symon/Manifest                        |    4 +-
 net-analyzer/symon/symon-2.84.ebuild               |  108 --------------------
 sys-auth/polkit/Manifest                           |    5 +-
 sys-auth/polkit/polkit-0.106-r6.ebuild             |    2 +-
 ...lkit-0.106-r6.ebuild => polkit-0.106-r7.ebuild} |   21 ++---
 13 files changed, 32 insertions(+), 144 deletions(-)

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index e7223c8..793d04b 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -16,7 +16,7 @@ EBUILD ruby-1.8.7_p357.ebuild 5519 RMD160 90f6f4ee76b5e64baea43559feab04b808ab84
 EBUILD ruby-1.8.7_p358.ebuild 5543 RMD160 e76d575240bb3a95ff12f4605e762681c1170622 SHA1 cd98871a9c4791b196c568a1fcef57b04cb2698e SHA256 0a274b8bc2cd321930b7d6e9a0b592d1e189793a7e116bd808e9716aac47bfe2
 EBUILD ruby-1.9.3_p0.ebuild 6269 RMD160 eb62d4f33d691de1e8175cd0c72e10bd1a2d712d SHA1 dfff2b20a926b5ed25419dcb3857ef7fa0704d35 SHA256 5ade38e90ddca6d5bade0958ea69ddedb9aeb45bc406c45f1ec9b53dda8e3f9d
 EBUILD ruby-1.9.3_p125.ebuild 6276 RMD160 4437c369105413b9ec240710d786226f016e4580 SHA1 039260367b09ec2510d9765ab7db28e7d8e295ce SHA256 b7e4490c83bab12583a3ee89543d1447f32e1872d0ce5aa6030a5e6fe87ab47a
-EBUILD ruby-1.9.3_p194-r1.ebuild 6307 RMD160 cbb9f1e319e05c53af2f38d6e2e6cc2b57062fec SHA1 c7302801b8909c269ae82e7da8e136b597080831 SHA256 0afd7e06561782fc6fe39d039faf903baaca78c64ae3048cb1ad905cf0d30d4c
+EBUILD ruby-1.9.3_p194-r1.ebuild 6307 RMD160 8506f6ab64747a7f502ee93213733834c377b871 SHA1 98109ebc3f4aa3afd1b1273556f561170f3d2854 SHA256 e9c5a36ca08fdf48dffe2657d6ead273f55dd7cebaa3b395224d815ff9b88f37
 EBUILD ruby-1.9.3_p194.ebuild 6276 RMD160 aba0b7ad3e091a527c74153b8860db58f9e18074 SHA1 45f662bb2ae30ed52726f586fa2b400af08d10ed SHA256 ce6ccd342e88fcb0b8cf3c1f83a0289a55259d1f6f8d127b47f255b05826c639
 MISC ChangeLog 81910 RMD160 17349d079ed5c454a37ef33443389ed723c0b89a SHA1 1aa4cbf04f60472d505b4ba75be10f99afd8e5d8 SHA256 49c5b5ffc7f3875dc52fd76b69f30c4539e1121524baa3edaeebe0e7e2d4a1fe
 MISC metadata.xml 1388 RMD160 2e3de2f87f5bade79976069f8a4e89ecff342d10 SHA1 a0ed685628b1f5de88e81e1aacc56c28bb2bb52f SHA256 365a88ae053d47050b6b50d05eb518755a3aeb0c91ca77d2d8eeabfd24a2447f

diff --git a/dev-lang/ruby/ruby-1.9.3_p194-r1.ebuild b/dev-lang/ruby/ruby-1.9.3_p194-r1.ebuild
index 6647098..00bbf08 100644
--- a/dev-lang/ruby/ruby-1.9.3_p194-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.9.3_p194-r1.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 	tk? ( dev-lang/tk[threads] )
 	ncurses? ( sys-libs/ncurses )
 	readline?  ( sys-libs/readline )
-	yaml? ( dev-libs/libyaml:* )
+	yaml? ( dev-libs/libyaml:= )
 	virtual/libffi
 	sys-libs/zlib
 	>=app-admin/eselect-ruby-20100402

diff --git a/dev-perl/Alien-SDL/Alien-SDL-1.434.ebuild b/dev-perl/Alien-SDL/Alien-SDL-1.434.ebuild
index 9b68665..58a1808 100644
--- a/dev-perl/Alien-SDL/Alien-SDL-1.434.ebuild
+++ b/dev-perl/Alien-SDL/Alien-SDL-1.434.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/dev-perl/Alien-SDL/Alien-SDL-1.434.ebuild,v 1.1 2012/06/02 16:31:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-SDL/Alien-SDL-1.434.ebuild,v 1.3 2012/07/03 11:15:21 ago Exp $
 
 EAPI="4-slot-abi"
 
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="building, finding and using SDL binaries"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE=""
 
 # Archive::Extract, File::Fetch, File::Find, Test::More -> dev-lang/perl

diff --git a/dev-perl/Alien-SDL/Manifest b/dev-perl/Alien-SDL/Manifest
index 300c689..973a22b 100644
--- a/dev-perl/Alien-SDL/Manifest
+++ b/dev-perl/Alien-SDL/Manifest
@@ -1,6 +1,6 @@
 DIST Alien-SDL-1.430.tar.gz 339593 RMD160 d159d940eb0a5154be362bf939ebaf22e488bc5e SHA1 565206f48c2190aee6637ea4db8c4cc2fba4c0b4 SHA256 726b7693edbaebcf639efba5f387f4c22034746d1c90643ea138bb0935928e93
 DIST Alien-SDL-1.434.tar.gz 65106 RMD160 2ce7732899be52bc136996230f9bcb33392d1220 SHA1 d875f830711896f41a27884b2cc147396a17d089 SHA256 2f6f46acc42ab29e808e5f9d8adfb0ad6a87a29e6b3ba59a712da178105cbe54
 EBUILD Alien-SDL-1.430.ebuild 893 RMD160 55025bce9aae0c99eb754a38e4ab3fd7106b534a SHA1 ef62df438bb59728ab6e73f6211f7ad4f15054ee SHA256 ddecbf6f888e90400c7bb9964a3791baedd0685e4733def4890673bcb094515d
-EBUILD Alien-SDL-1.434.ebuild 852 RMD160 ad5266b56ebafbda5565eefe73f9b0010c5939e4 SHA1 9ae9bd393e287ba5a38283c03ef00a0106b23b04 SHA256 8d803bd8b0a9895e4a22159cb678b3c9a4e1a07b61b447b86e6486ad1016a533
-MISC ChangeLog 1436 RMD160 8b8f84ffd986e498b86df9a2aac08cc6c780f2d1 SHA1 3b829ce3206bc44dc00c3d09aa8eded889372cc2 SHA256 067c53b6639eeaa0b3cdeccfdbfa747b3408e954052e94fca2c3d856d3372de9
+EBUILD Alien-SDL-1.434.ebuild 844 RMD160 5832a270fc09a227a71ecf9252816a354c75dce3 SHA1 809f81b25d852bc32e86e08a2ac0a9298b9a80ed SHA256 0e2e1408df4c8855b5954fb8392c9e51e904768ecf2aafbcb3d7be21752ab2b0
+MISC ChangeLog 1647 RMD160 f41b31dbbfd17f500f7d574cedf927df49e14b3c SHA1 e5f3bbf1b2b849cb2319f25d0afaf3f5f9723a3a SHA256 f30f3466ea62ab689cad051f0cd6dc4b201f2de9895cbfe01b17370fd4da86d5
 MISC metadata.xml 313 RMD160 13c135ec0d6ae6e11302f623d1f8b3aac04d65e4 SHA1 8aaac502b0a8b852410ede6eae85c1d9ced882fd SHA256 883efcfb65c750bbe22f463c76f2ca9b98f86723cfbaaf93601d1bc7d5064fab

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index e1afbc0..1c1525a 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -58,7 +58,7 @@ EBUILD git-1.7.10.2.ebuild 16493 RMD160 2e5897f28b1b1ea2efeb049a8cdc1c3adf35f9e5
 EBUILD git-1.7.10.ebuild 16490 RMD160 7ee17cfced89b9717d92bfa00725e9ebf69499af SHA1 c2d65ac77974bb50baa5bde5fc32fc772b77861b SHA256 cebc158cce887d68d462ffb172c4304051986e099afc929a6d442a211e9f4e8f
 EBUILD git-1.7.2.5.ebuild 13520 RMD160 9411dac852204b7446bcbaddf3c96ac25f3b6028 SHA1 7fcbba3389a5f8dd1fbf2ed228285d4351b4d000 SHA256 666e01293c6884d6ac11578b45f1fdcdf298cdb6d194c249f8e993d6c1b27343
 EBUILD git-1.7.3.4-r1.ebuild 14029 RMD160 217641ce0f1d00817a1c8bd70d5e7dc422f886fc SHA1 45c8c571e45e46c01f851ef7e1b4281665ccb54a SHA256 9d0c67c61774f8f1f644b182c551d53bdf305dffaad390d0f0aa3cc048c4f662
-EBUILD git-1.7.8.6.ebuild 14790 RMD160 63f20d944910f9091191a2084ccbaf9b4390d530 SHA1 8686a48c33af53cb95f24dcc97f97cf35c185fc4 SHA256 c4201af6cc25c3e58d594d141438f2c84b65367e4b4a5fddf9464ff72981db06
+EBUILD git-1.7.8.6.ebuild 14792 RMD160 a85396bc808327dc5e318033dab8ba32cb9b5735 SHA1 383bf675df4db1071c30c964ded0f482e9c56f4f SHA256 c5ee80cc400664c98668d76b9d8428f43e09b3c948b73b6eaeb2abe3d0b29d68
 EBUILD git-1.7.9.1.ebuild 16491 RMD160 514ed5251a4f9a1a64640e9dc9fb3829813d791e SHA1 05555a84231d8bcc24e0e009fb4e4bf860135b55 SHA256 b58ed3b4dd9b698c637db209241f0b050ab441053b1b4329a97dcc645da3f940
 EBUILD git-1.7.9.2.ebuild 16491 RMD160 0ba19c6653ca04abb40663fe5756aca3f9c133d7 SHA1 4b792ab9ed58ce3014389a3cc6cc762efe59d2b4 SHA256 f8c1cbe9dca6f5f5d1d83229dcb9d41b87da2ba23d1a7af6e9dca59b977eb06d
 EBUILD git-1.7.9.3.ebuild 16491 RMD160 7d1205c3e132fd1ca47bd43d0976ab6a6f81f96c SHA1 2b7a84ede8c7a0b98fdde39b962ca09d00d2db0b SHA256 3192b9806aad116c0eaebab9bb4a569f028cddf60b13bfcc9ede2ed4722df6f0
@@ -67,5 +67,5 @@ EBUILD git-1.7.9.7.ebuild 16491 RMD160 75a5212a8ede60f4f7eaa13661a5de8c98e7d75b
 EBUILD git-1.7.9.ebuild 16489 RMD160 00ad272a1cae25f9ac74f0f5ee7dbf762bcd4d43 SHA1 cd18b9e4d8703b659bed4ed4ff095ab82010bf69 SHA256 a7972d468b50c6f961aa3ee480141c6a41bb4a15ac29fed1be395c502c65dd67
 EBUILD git-1.7.9_rc2.ebuild 16049 RMD160 070b297c65abc81cc2f83c23d81e02ee367cb140 SHA1 89a27aec1caffcd7f132209c9767bda9ea709353 SHA256 3ee576d91626b75bd4a600822723d831b06c84899f0259ffd5f2c98e4f365fe7
 EBUILD git-9999.ebuild 16046 RMD160 cd327830bec3697a8c9c0869e272db2cc9a9c475 SHA1 5f130cd425e6ba4457a607a2ebe95c439f82bff6 SHA256 f1b77d0a618129d5acd55eedb5c530cf7a43a8da203a1a23b0044eb4f48ba9fd
-MISC ChangeLog 89321 RMD160 93ec2b9dae86af7b16e9f4bbff9a29231ab7049f SHA1 566f4d323f6a0af737675ebde64bbb75b28d39cc SHA256 8ad952759d43c8fde6c4765d46a7b22f14f15c1aff537bf3bd358e7d46d56340
+MISC ChangeLog 89422 RMD160 fa1c3d40b0456e250b9b45ef199c354f00180cd6 SHA1 70dd3c66678cf4f4fc6db8dfaaef63937db6b63e SHA256 5685aab13e9446803f98aa7eba0641b296df423be94b8761241cb54a5200fa5e
 MISC metadata.xml 1633 RMD160 1c480edd9e41f778d00b2327e2e1f1b3bf2e16dc SHA1 c48806013bd80c4da499f64caa3660b665270b5d SHA256 d755feb6f78130bdad7592120067448f46e760430599a39c734a5340ef0d7ae8

diff --git a/dev-vcs/git/git-1.7.8.6.ebuild b/dev-vcs/git/git-1.7.8.6.ebuild
index fe49cbf..c217224 100644
--- a/dev-vcs/git/git-1.7.8.6.ebuild
+++ b/dev-vcs/git/git-1.7.8.6.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/dev-vcs/git/git-1.7.8.6.ebuild,v 1.4 2012/06/27 11:57:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild,v 1.5 2012/07/02 05:49:01 jdhore Exp $
 
 EAPI="4-slot-abi"
 
@@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	SRC_URI=""
 	KEYWORDS=""

diff --git a/eclass/xfconf.eclass b/eclass/xfconf.eclass
index 38db0fe..f5b0856 100644
--- a/eclass/xfconf.eclass
+++ b/eclass/xfconf.eclass
@@ -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/eclass/xfconf.eclass,v 1.41 2012/05/22 10:57:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.42 2012/07/02 08:43:37 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -17,18 +17,18 @@
 # @DESCRIPTION:
 # This should be an array defining arguments for econf
 
-AUTOTOOLS_AUTO_DEPEND="no"
+AUTOTOOLS_AUTO_DEPEND=no
 
 unset _xfconf_live
 [[ $PV == *9999* ]] && _xfconf_live=git-2
 
 inherit ${_xfconf_live} autotools base eutils fdo-mime gnome2-utils libtool
 
-EGIT_BOOTSTRAP="autogen.sh"
+EGIT_BOOTSTRAP=autogen.sh
 EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}"
 
 _xfconf_deps=""
-_xfconf_m4=">=dev-util/xfce4-dev-tools-4.9.1 ${AUTOTOOLS_DEPEND}"
+_xfconf_m4=">=dev-util/xfce4-dev-tools-4.10 ${AUTOTOOLS_DEPEND}"
 
 [[ -n $_xfconf_live ]] && _xfconf_deps+=" dev-util/gtk-doc ${_xfconf_m4}"
 [[ -n $EAUTORECONF ]] && _xfconf_deps+=" ${_xfconf_m4}"

diff --git a/hack-4slotabi-into-portagedb.sh b/hack-4slotabi-into-portagedb.sh
index 385d152..15619a8 100755
--- a/hack-4slotabi-into-portagedb.sh
+++ b/hack-4slotabi-into-portagedb.sh
@@ -2,9 +2,11 @@
 
 if [ ! -e /var/lib/layman/axs/hack-4slotabi-into-portagedb.sh ]; then
 	if [ ! -e "$1"/hack-4slotabi-into-portagedb.sh ]; then
-		echo "Error - could not find axs developer overlay in layman repos."
-		echo "Please 'layman -a axs' or specify path to the overlay as a parameter."
-		exit 1
+		if [ "${opath}" == "" ]; then
+			echo "Error - could not find axs developer overlay in layman repos."
+			echo "Please 'layman -a axs' or specify path to the overlay as a parameter."
+			exit 1
+		fi
 	else
 		opath=$1
 	fi

diff --git a/net-analyzer/symon/Manifest b/net-analyzer/symon/Manifest
index efe2052..3b303a1 100644
--- a/net-analyzer/symon/Manifest
+++ b/net-analyzer/symon/Manifest
@@ -2,9 +2,7 @@ AUX symon-init.d 680 RMD160 b944a18cefedc75a17f4cba0a7d9f824cf2ab8ab SHA1 dfb140
 AUX symon.conf 313 RMD160 2a892b80bbf6d1f78c06875782a080d28661fd84 SHA1 15d93dd00106a8bd9444a79ffab9a1fd0c22af76 SHA256 3f4914f65fa4456de5ee70da3c6f40f416d6452fac8a439648cc565c791cec73
 AUX symux-init.d 674 RMD160 1de1e203dd711df1cfdc95beef65c02ade32976b SHA1 2c0da16555cb9a965f89ed3dd904638e560389ee SHA256 a985bfb53ea2bfcc47a57d5b10ec8411853795a11a6892caaa974ddfecce75dd
 AUX symux.conf 952 RMD160 7e88432728d7b9884695b9a55a5d1b11246b0b9f SHA1 81c077f320f1aa98b20336eee2cf1f25cf59e206 SHA256 20f915f55f084c1f9b55410c097c8165e2d621924e3496c9e3add7c1de655126
-DIST symon-2.84.tar.gz 105849 RMD160 0211185b3e19593e3a6807fe58ecfdd72520a6bc SHA1 1a4a79c01b43ae3efc7e9179266d3f7375eb94f3 SHA256 4b67beae478f4314c81428d44578670914fbc8e761e9c7ae0d9701c267f7a371
 DIST symon-2.85.tar.gz 106011 RMD160 c355c188d23284de175756e044c43e8c9f6cc6e2 SHA1 96e4d0e6dbd763249fcc09c5e25e1ae233781fea SHA256 547329a1efbc2408298256d31a005db23869117ccf6249c052ef662b3ee12d35
-EBUILD symon-2.84.ebuild 2663 RMD160 3c024ce3a45926a51c7587878432fdf9bffa3fcc SHA1 5f56ba7309dd0689682b5f66441cf53f7ba2210c SHA256 5e03d563719a37fb4d46ad0184470de37059d6b4f99ba4900b962a4f62ad4dd2
 EBUILD symon-2.85.ebuild 2663 RMD160 2c56768eb7820d0efa4d5d61e5e1525138662b9e SHA1 11ba235dd2a623ede96c58ee10e40d6b70a3e5c9 SHA256 3f30c92eb9e5b3f2e25b37e8b4b77a16b914816b20e76022d6a026fb8bb219cb
-MISC ChangeLog 2491 RMD160 3ad3b6c8aca0173560fd3f3fe3395169023f1409 SHA1 a1aac27b5a89d422791650b2526ac5ad8c2c8ad4 SHA256 e99e04dd27432fd4c01a2446e70c588b278c7523d1ec7aa3d1d9ff0252424af8
+MISC ChangeLog 2605 RMD160 6cf21db592d247e5badecdfc91c6e30df8cf2659 SHA1 7092de95622e1dc26a3c71315649683ece923ac6 SHA256 b43c24e08574c2a82368e9603c3d6e97a496b1e45dc89590746c01374be4f564
 MISC metadata.xml 512 RMD160 6b444d2d140460d6ba170a4492710c092854b9f5 SHA1 ea9074b4229bc8ea0c90d59d1885c6536803fd6e SHA256 c95f7e3719ea159f70b49b972150f6fb2f366f2373636a0a6167a6efe36b4631

diff --git a/net-analyzer/symon/symon-2.84.ebuild b/net-analyzer/symon/symon-2.84.ebuild
deleted file mode 100644
index 38a306b..0000000
--- a/net-analyzer/symon/symon-2.84.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/symon-2.84.ebuild,v 1.1 2012/02/15 15:49:30 jer Exp $
-
-EAPI="4-slot-abi"
-GENTOO_DEPEND_ON_PERL=no
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="Performance and information monitoring tool"
-HOMEPAGE="http://www.xs4all.nl/~wpd/symon/"
-SRC_URI="http://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="perl +symon symux"
-
-RDEPEND="perl? ( dev-lang/perl:= )
-	symux? ( net-analyzer/rrdtool )"
-DEPEND="${RDEPEND}
-	virtual/pmake"
-
-S=${WORKDIR}/${PN}
-
-# Deletes the directory passed as an argument from the internal pmake
-# variable SUBDIR.
-zap_subdir() {
-	sed -i "/^SUBDIR/s/$1//" Makefile || die
-}
-
-pkg_setup() {
-	use symon && USE_SYMON=1 && return
-
-	if ! use perl && ! use symon && ! use symux; then
-		ewarn "You have all available USE flags disabled. Therefore, only the"
-		ewarn "system monitor will be emerged. Please, enable at least one USE"
-		ewarn "flag to avoid this message."
-		USE_SYMON=1
-	fi
-}
-
-src_prepare() {
-	# Respect LDFLAGS.
-	sed -i "/^[ \t]*\${CC}.*\${LIBS}/s/\${CC}/& \${LDFLAGS}/" sym*/Makefile \
-		|| die "sed ldflags failed"
-
-	# Do some sed magic in accordance with the USE flags.
-	use perl && [[ -z ${USE_SYMON} ]] && ! use symux && zap_subdir lib
-	! use perl && zap_subdir client
-	! use symux && zap_subdir symux
-	[[ -z ${USE_SYMON} ]] && zap_subdir symon
-}
-
-src_compile() {
-	pmake CC="$(tc-getCC)" CFLAGS+="${CFLAGS}" STRIP=true || die "pmake failed"
-}
-
-src_install() {
-	if [[ -n ${USE_SYMON} ]]; then
-		insinto /etc
-		doins "${FILESDIR}"/symon.conf
-
-		newinitd "${FILESDIR}"/symon-init.d symon
-
-		dodoc CHANGELOG HACKERS TODO
-
-		doman symon/symon.8
-		dosbin symon/symon
-	fi
-
-	if use perl; then
-		dobin client/getsymonitem.pl
-
-		perlinfo
-		insinto ${VENDOR_LIB}
-		doins client/SymuxClient.pm
-	fi
-
-	if use symux; then
-		insinto /etc
-		doins "${FILESDIR}"/symux.conf
-
-		newinitd "${FILESDIR}"/symux-init.d symux
-
-		doman symux/symux.8
-		dosbin symux/symux
-
-		dodir /usr/share/symon
-		insinto /usr/share/symon
-		doins symux/c_smrrds.sh
-		fperms a+x /usr/share/symon/c_smrrds.sh
-
-		dodir /var/lib/symon/rrds/localhost
-	fi
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-
-	if use symux; then
-		elog "The RRDs files can be obtained by running"
-		elog "/usr/share/symon/c_smrrds.sh all."
-		elog "For information about migrating RRDs from a previous"
-		elog "symux version read the LEGACY FORMATS section of symux(8)."
-		elog "To view the rrdtool pictures of the stored data, emerge"
-		elog "net-analyzer/syweb."
-	fi
-}

diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 62d4b1d..643201a 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -4,6 +4,7 @@ DIST polkit-0.106.tar.gz 1381428 RMD160 6fa79aaa4e67e072d16860f1a242b053cc311bc3
 EBUILD polkit-0.104-r1.ebuild 3599 RMD160 0971476dcae7e67dbdd40588d47ebbbc61873b65 SHA1 e179cfc1e5a4a383ae98bc4913c03e32a267e41b SHA256 a4c259b6a560da465278a4a1aba930e8abf1eade4a82adc239e078d8975f6709
 EBUILD polkit-0.105.ebuild 2241 RMD160 e7a155386c6b9fb189799d423cb0843ca8fc6ba7 SHA1 dc20155d6178c0a017ff8c1374428102b22c9468 SHA256 4ec832b243b7623a289ba38cee2576e6cda162d9fb3ad1afb995ae797968cfb8
 EBUILD polkit-0.106-r5.ebuild 3064 RMD160 5b6e155a11696971833fcc4489085ec7203acee7 SHA1 66b4f3839076ae28c366631e70cab8968f123eb5 SHA256 8780b8e36dfb84d78d33bf92087593336f3be9e29c80661bef1224a636da0bfa
-EBUILD polkit-0.106-r6.ebuild 3239 RMD160 9b102b555d97b0d58d19abaa9255407b30a01041 SHA1 b6524bba4d27bcce2a23ea7f74bdf399caecf70b SHA256 b6d3e2365abb19208bcc76328bf96dd49673ffdd50c84eefbf54fdd05973167c
-MISC ChangeLog 13370 RMD160 bf0a601a62e2a8ee14d0047a6f2b4d874784e570 SHA1 65f23be7c9c1b2ca430ab7e75fa3ad1061ba5a40 SHA256 44732e39e931962426ae6ff45461bf921c1885d6946c0caf9923b9f15940d95b
+EBUILD polkit-0.106-r6.ebuild 3250 RMD160 185c1ac7f60807cbd4b71c459ce06b5a2861af92 SHA1 9a230cb7c23057b30a4d0b6546a328206107097b SHA256 6078455d53a56aeb538178a75af89fa735c09bcba75b1c765ffbb416535d8d19
+EBUILD polkit-0.106-r7.ebuild 3020 RMD160 70c0953a1c0ba464128b2b8e67edc1d5fa7e9e73 SHA1 65894ab14d0978bfb04705bd292769ed54d5de65 SHA256 2ea5ecf091dba1e1264f87bbc7567661a4dc67f6fcec2ad00948927d5a6846ba
+MISC ChangeLog 13689 RMD160 1c057944fa809674542a4a2b0e4554033b651073 SHA1 5e192524e59dd40f282fcf2f651fc2dff3d14a14 SHA256 589a0b62b59a531eb225b287c5704838132f46f1e3eabee2974aec451a49d582
 MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba

diff --git a/sys-auth/polkit/polkit-0.106-r6.ebuild b/sys-auth/polkit/polkit-0.106-r6.ebuild
index 9d2fc34..d7da574 100644
--- a/sys-auth/polkit/polkit-0.106-r6.ebuild
+++ b/sys-auth/polkit/polkit-0.106-r6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106-r6.ebuild,v 1.1 2012/07/01 13:30:22 ssuominen Exp $
 
-EAPI=4
+EAPI="4-slot-abi"
 inherit eutils multilib pam pax-utils systemd user
 
 DESCRIPTION="Policy framework for controlling privileges for system-wide services"

diff --git a/sys-auth/polkit/polkit-0.106-r6.ebuild b/sys-auth/polkit/polkit-0.106-r7.ebuild
similarity index 83%
copy from sys-auth/polkit/polkit-0.106-r6.ebuild
copy to sys-auth/polkit/polkit-0.106-r7.ebuild
index 9d2fc34..e4f48b6 100644
--- a/sys-auth/polkit/polkit-0.106-r6.ebuild
+++ b/sys-auth/polkit/polkit-0.106-r7.ebuild
@@ -1,8 +1,8 @@
 # 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.106-r6.ebuild,v 1.1 2012/07/01 13:30:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106-r7.ebuild,v 1.1 2012/07/02 16:29:47 ssuominen Exp $
 
-EAPI=4
+EAPI="4-slot-abi"
 inherit eutils multilib pam pax-utils systemd user
 
 DESCRIPTION="Policy framework for controlling privileges for system-wide services"
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug examples gtk +introspection kde nls pam selinux systemd"
 
+RESTRICT="multilib-strict" #424423
+
 RDEPEND=">=dev-lang/spidermonkey-1.8.5:=
 	>=dev-libs/glib-2.32
 	>=dev-libs/expat-2
@@ -54,11 +56,7 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
-	has_version "dev-lang/spidermonkey:0/187" && { sed -i -e '/mozjs/s:185:187:g' configure || die; }
-	# http://bugs.freedesktop.org/show_bug.cgi?id=51617
-	sed -i \
-		-e "/polkit-agent-helper-1/s:/lib/polkit-1:/$(get_libdir)/polkit-1:" \
-		src/polkitagent/polkitagentsession.c || die
+	has_version "dev-lang/spidermonkey0/187" && { sed -i -e '/mozjs/s:185:187:g' configure || die; }
 }
 
 src_configure() {
@@ -79,10 +77,7 @@ src_configure() {
 }
 
 src_install() {
-	emake \
-		DESTDIR="${D}" \
-		libprivdir="${EPREFIX}"/usr/$(get_libdir)/polkit-1 \
-		install
+	emake DESTDIR="${D}" install
 
 	dodoc docs/TODO HACKING NEWS README
 
@@ -101,9 +96,9 @@ src_install() {
 
 	# 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/$(get_libdir)/polkit-1/polkitd
+		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/$(get_libdir)/polkit-1/polkitd
+		pax-mark m "${ED}"/usr/lib/polkit-1/polkitd
 	fi
 }