Merge branch 'master' of git@github.com:sjnewbury/multilib-overlay

8 files changed, 15 insertions, 15 deletions

diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index fa708f72c..0cb7ecea3 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -2,4 +2,4 @@ AUX gamin-0.1.9-freebsd.patch 16238 RMD160 814d3ea14e9de819bf48bed005fb3d72af0a4
 AUX libgamin-0.1.10-compilewarnings.patch 526 RMD160 b460c5b724a36934c5e4a411a3d5e6d5a8f820ef SHA1 8358f05948018bfd46b752f76006f5272f5f9385 SHA256 dfca2bee08ba14c873a6bcd732359dd7e3a9372d6d9fb82378194d7a73a30e68
 AUX libgamin-0.1.10-noinst-lib.patch 2207 RMD160 f0d2479f5aec3ef8852a36214c168ef560de3594 SHA1 544895f7345413c5314b4d5892492e7b27c8eb6b SHA256 e19ede71d259fbe5888c06635441365a48687034b24c5f15edd808a7cbd9cdc7
 DIST gamin-0.1.10.tar.gz 653392 RMD160 fb6ba5ec2d2f49afacf10dda4095f02f5930d686 SHA1 f4c6b9fe87757552ef58fef4abef9e42cd3142ac SHA256 28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1
-EBUILD libgamin-0.1.10-r2.ebuild 2207 RMD160 73806eb19e3fb0b104d63a045166b4caa37b5f66 SHA1 3885a992ef0e3d4c82ca6587ebb0b20f33dc46d8 SHA256 ed48746f98273b5ab25b7a2e44770869b7a0c963a1dc70ab37bdf6318bebe171
+EBUILD libgamin-0.1.10-r2.ebuild 2207 RMD160 221097d4616a3c2e80226e0341495eb130678598 SHA1 b2ea300bf31ae04f16365bbe14c6c2401e234e6f SHA256 18331b6b28489a5a6663dbe30f2fca4b84e64bf42a010cb32d6d8285c4a4620f
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild
index 91d6eeba6..dcd694600 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild,v 1.7 2009/03/30 13:49:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild,v 1.8 2009/04/12 20:40:18 bluebird Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.gnome.org/~veillard/${MY_PN}/sources/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sh ~sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="debug kernel_linux python"
 
 RESTRICT="test" # need gam-server
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 4651401d5..995cd6514 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -4,5 +4,5 @@ AUX nspr-4.6.1-lang.patch 1718 RMD160 6c3fb440f4b4004289de3f65b996936bcfcbaa45 S
 AUX nspr-4.7.0-prtime.patch 964 RMD160 a963c21fb1ce5e8913d3c41753ca37b24e80798d SHA1 b47ffa12022ea83b738e5d847e61cca026ec7f07 SHA256 3fd4f3c68257dced021c0bfa00245d0da2d6c64205135b1cc89f96a3375dffc7
 DIST nspr-4.7.3.tar.gz 1254585 RMD160 532417c8c4d04a32d6cfc09ea8f2279d5ee69e72 SHA1 351c34c8f26d11a441bc3130655cd9144e724899 SHA256 b1d2419ef1807c38944fc746fff14fda8506589e5462dc31194a9d1b494b9f49
 DIST nspr-4.7.4.tar.gz 1256846 RMD160 7f6478f889dbddd91271d2182ace910f32a2c375 SHA1 7653b922b1953bb21d25fb445d0ead90ac79dd21 SHA256 5532056aff17d6769953727ac7ba8dc62741612e936c5be84496671f8a2d08cd
-EBUILD nspr-4.7.3.ebuild 2668 RMD160 e2ee905ffd9cffd8150343f15fb25e2996ffbcd6 SHA1 ab69dd0c387f5c515e845300fe8dd32c7b617f73 SHA256 19b870624f2e26fe84704b1b32e94986485d989051e8f335586de9fef2d1aaa2
+EBUILD nspr-4.7.3.ebuild 2669 RMD160 c988db26901a171cda567ba1720e30473c81c77e SHA1 ca70d37623f5348d0335e46c8a3f69e94fcdae2d SHA256 791b88c1fd9dccb9ca7f30ca900ee212fae4a345bb931386536ebac6311d6e6a
 EBUILD nspr-4.7.4.ebuild 2677 RMD160 841025a2a87f763b06bc854a87bed2c0f56a8164 SHA1 0de93975bc3214e5d9c9a455a2160c841951b683 SHA256 e7c22bca507492c05608fe45f235a9f1784040349b158a38678f91ffad2568fd
diff --git a/dev-libs/nspr/nspr-4.7.3.ebuild b/dev-libs/nspr/nspr-4.7.3.ebuild
index a82156c0c..ac6f91a13 100644
--- a/dev-libs/nspr/nspr-4.7.3.ebuild
+++ b/dev-libs/nspr/nspr-4.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.3.ebuild,v 1.7 2008/12/27 16:14:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.3.ebuild,v 1.8 2009/04/12 14:56:15 bluebird Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar
 
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="ipv6 debug"
 
 DEPEND=">=dev-db/sqlite-3.5[lib32?]"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 7f8de59a4..3a49ab6f2 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -6,5 +6,5 @@ AUX nss-3.12-config.patch 4192 RMD160 22955dd1a51b285748fff9f854946a461a9b43f2 S
 AUX nss-mips64-2.patch 540 RMD160 16c461f453470238922065068dd6530b908bb64f SHA1 27062b98164c946d5116b64a49c7c164b261fdbd SHA256 06ad64812bd49382ff4165bfa452fd697a5ca2c03e8f3ffb9aa1bcfa14499b34
 DIST nss-3.12.2.tar.bz2 3974864 RMD160 eebddb26f26268550d106301464e0f98944a5e04 SHA1 a668ddb8e80c90aaa6d958f85745c6595a493f38 SHA256 84fb75ded8db4a4a38cb12a7aeeeade4fed68ff0f5e9f069ffe021d3b36f94a4
 DIST nss-3.12.3.tar.bz2 4066954 RMD160 b5339eda9dfc87385b2c11e2ca53be249b75ed69 SHA1 eeca14a37629287baa10eb7562a5fb927e9dd171 SHA256 68152f9ad62b49c8860306a6056f5c42f1a66095749e97346a2c3001528075f4
-EBUILD nss-3.12.2.ebuild 4819 RMD160 1d0650f490c68e6144b3866b8c9276e2d2e07aad SHA1 0c8c041bd0370affe3d360c2cc65a5ceef2d2148 SHA256 a6cf8850bad529588112d8498928fd42d0376869af03ab83492b719d26e466e3
+EBUILD nss-3.12.2.ebuild 4819 RMD160 65d3924a96c33271f0a5fedf5960fe73eacd54b1 SHA1 47dbf27b45ddf36bcdf56b11ffcc1162c52cbdf7 SHA256 13c8e082c53f83b7148d49dfe20d00a930e5375568dc233d32c00bb161b8698a
 EBUILD nss-3.12.3.ebuild 4898 RMD160 2fb1838a03d0d0861e0e3905be45136c723bc01c SHA1 508b51572db5c7022d3e7f712d2458ccb219d06d SHA256 d0a6e1dead97ec18c5f26e92870488527f5361720f7d0ef072ed4c3eadbe2c61
diff --git a/dev-libs/nss/nss-3.12.2.ebuild b/dev-libs/nss/nss-3.12.2.ebuild
index 11adb6132..1357064e5 100644
--- a/dev-libs/nss/nss-3.12.2.ebuild
+++ b/dev-libs/nss/nss-3.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.2.ebuild,v 1.5 2009/02/15 11:32:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.2.ebuild,v 1.6 2009/04/12 14:56:16 bluebird Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
 
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="utils"
 
 S="${WORKDIR}/mozilla"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 07a66924b..ce536ef56 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -26,4 +26,4 @@ AUX openssl-0.9.8k-toolchain.patch 675 RMD160 f376b878964dbb78ad973baed47b3c45fb
 DIST openssl-0.9.8j.tar.gz 3738359 RMD160 d60417e0fd943fbffc6dae8391a21dcf5d97e967 SHA1 f70f7127a26e951e8a0d854c0c9e6b4c24df78e4 SHA256 7131242042dbd631fbd83436f42aea1775e7c32f587fa4ada5a01df4c3ae8e8b
 DIST openssl-0.9.8k.tar.gz 3852259 RMD160 496df7a5d33457b0d8e3b930a8e5cf068923182c SHA1 3ba079f91d3c1ec90a36dcd1d43857165035703f SHA256 7e7cd4f3974199b729e6e3a0af08bd4279fde0370a1120c1a3b351ab090c6101
 EBUILD openssl-0.9.8j.ebuild 6500 RMD160 d54f851c83d92845f2f1430f8235902d764ba1dc SHA1 d9e5cb993d46e5e3ca7980b9d52d91d5aecc78ef SHA256 2b302c27617001194a3822646e27abad1f12eef08d0eea1d7f71673a820ca0b4
-EBUILD openssl-0.9.8k.ebuild 6221 RMD160 61f9b5f6d01bcfd5df4cf464d199aa7ab82fc4e5 SHA1 23b38fb2808bb3c9dbd18b49e50212b216640d3f SHA256 9989b41805fa4ffea99201ac25ddadf2c8e88a2d0cf84bb594fe778ae76817db
+EBUILD openssl-0.9.8k.ebuild 6220 RMD160 02173123c692260d67f7411799e3d56914b1c263 SHA1 7e1439ea8572f4288a9ffbde9cb67210f0c1b8c3 SHA256 b38004bced525adca9ab4a1bb99960861606e4f558911269ecb26f8dd71182c7
diff --git a/dev-libs/openssl/openssl-0.9.8k.ebuild b/dev-libs/openssl/openssl-0.9.8k.ebuild
index 4dfb9e20d..7513bcdf2 100644
--- a/dev-libs/openssl/openssl-0.9.8k.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8k.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8k.ebuild,v 1.7 2009/04/02 14:46:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8k.ebuild,v 1.8 2009/04/09 20:20:29 vapier Exp $
 
 EAPI="2"
 
@@ -168,11 +168,11 @@ multilib-native_src_install_internal() {
 	done
 	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
 
-	diropts -m0700
-	keepdir /etc/ssl/private
-
 	dodir /etc/sandbox.d #254521
 	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${D}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir /etc/ssl/private
 }
 
 multilib-native_pkg_preinst_internal() {