Sync with portage [Fri Feb 7 14:45:21 MSK 2014].

2014-02-07 14:45:44 +04:00 · 2014-02-07 14:45:44 +04:00 · 7280b7d472
commit 7280b7d472
parent a7adecaf6a
2105 changed files with 31677 additions and 9812 deletions
--- a/app-arch/lz4/ChangeLog
+++ b/app-arch/lz4/ChangeLog
@ -1,6 +1,13 @@
 # ChangeLog for app-arch/lz4
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.9 2014/02/06 00:26:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.11 2014/02/06 19:01:43 jer Exp $
+
+  06 Feb 2014; Jeroen Roovers <jer@gentoo.org> lz4-0_p106-r1.ebuild:
+  Marked ~hppa (bug #499468).
+
+  06 Feb 2014; Jeroen Roovers <jer@gentoo.org> lz4-0_p106-r1.ebuild,
+  +files/lz4-0_p106-cflags.patch:
+  Do not set -Os/-O3/-march=native (bug #499470).

  06 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> lz4-0_p106-r1.ebuild:
  Keyword x86, amd64-linux and x86-linux
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256

+AUX lz4-0_p106-cflags.patch 630 SHA256 fa5a2e429ff7bfc5ff3fd02e5e8078d44f7c704c402d259546c00ad497d445c4 SHA512 0c7cc51229fe20ee0c5e5cb3d933f924750fe3aaa0e97ac78f1f74e4810bf4d9d431990cf12992f25f29dfaffb9dc66b42f3ab6d49147ff881a5cbe49990a89d WHIRLPOOL 754ab3e1cc255ff5226771edc9e9fd977644cf887c49048f4ac1df4e07a347a9dd707aecf952c6223f9b23944b5051fb0032a0605e00964d3ab6af91cc7d93a9
 AUX lz4-0_p106-install-to-bindir.patch 2141 SHA256 3799ef8a56f5cbeecd5f6ceb8716454990087965136322ccd99c6911e60dc924 SHA512 853be770173b46188c4f293f13c263053fd3837c23e959b2d19e36c5d3c8c04798b619224fe02b20f414494baf4db4235b7c223ce665b9b90f14a655c8303f8c WHIRLPOOL 6aac55ec15e8b82a16b06faa50bcb362ace5100bab3788d81ed3618f6efae787664855db14bd0f5393624647d13df40214f873ee7da24d505f9aa4fb371bcdf5
 DIST lz4-0_p106.tar.xz 129352 SHA256 a9a09c4ebb962995d10e7e4f7d9224aaa93f308899de18a414948a58e87b6f22 SHA512 8b2bafbf78be7c42831e264d7acdca12712c88369cecdb3aa4621c84bb6b450c372f5153f7c3939a5f70d5810c62b98993697397319d286a1bb51b1e4a6ecde6 WHIRLPOOL fc5bb47b73606b125d8e155365d1fe101083e68e684ffd6014440e0f1416f1f6ecc64b797083e6939bd3e8cd42018e46a1864ae4542160c96933a47df9421a42
-EBUILD lz4-0_p106-r1.ebuild 1272 SHA256 b794304510a324e0903ffe3ca763dd834b19004a8e4241fefdf295e1015ecbd0 SHA512 b90673951fde73a199d3c9fbd438285ae7d011552d1740a87c1f75dc38e1967ce8b94fd1c4722d62953476cbb493f6a8204875edd3268be760fa3d8c3f72f31c WHIRLPOOL c20e0e53de1db66ea32144d7fd51ffef80e830e0450f89d1460ec726cbebda35939fd302e92f04829ccb939e5053084e465e448e684f526b35fb129628b88ce7
+EBUILD lz4-0_p106-r1.ebuild 1314 SHA256 fddc3fae2aa783a437e5ddade40303c6bb6b657de84a0dc68d76001d4877e64b SHA512 fe2eb130f5afbb14213e9880c97c1c551526aa23dca0905ac04d34259b1c1d955c2107207be4cd32cec2742a7daf3813f33d3a5a4e1d68f5784d480735997312 WHIRLPOOL 965610fc1fba080065d847a4494613a3d9b18333caa61140387f826ca4331df2abcfa1b33f3e4d42c9f2902110472f0de07894795c3a04c22e6897e398ac5e6a
 EBUILD lz4-9999.ebuild 1234 SHA256 485148f4c8bf3c23492398cd73cbfc1837c5199b33b90161521a9bf8fabddd43 SHA512 6aa4a354a6ca7fad93384dd66eda4126ad6351f01273bb215dd0de90ca6c711a0d4c9905116d1c31ff491f46d5261f0a77b9c4c4bacf71e0e27adfc32b18a714 WHIRLPOOL 970078089485e96d8967a2a9087cd287bc4e0895c5e2d46fcd258fae6e9e8e3b2b89e05d6eb78ce65148f35f299a2d278e604227480314724601c19312d9890b
-MISC ChangeLog 1788 SHA256 59c3d9c669cd613b53c9d8345b94b70020a6461e68bcaf2cb618f2c1a8446260 SHA512 d374fb93cb119b24c71bc878782ebc943147ccbde6adb613335d82c5209dbd28d51c690da86cb748a3c733ed4255ebc84941d4f285d3d90389decde983005cdd WHIRLPOOL 7b91c3653d273c9cb40004f8207078ea8bae3efab2d66370f1352e819cd9dc7572cca0a4bfab13f3800ef68edde1e12bf6df31867fb2fb7eeafa9def5f1f5bcb
+MISC ChangeLog 2038 SHA256 f3b53e582bc5a714c55cec439994f8ad8f2935fe78de27ecf28f42f86fa982da SHA512 47782a01fa1ad273796638fbb0865c2b93864ce9098bb181e3ad1d2f45ce5a2613feb84c0e123133201f9bfa61af95a6cd8bba3bbf581b668ae402da59cf4883 WHIRLPOOL a46d7f444956750f8a41f642e7f506ffd0410d982c2927892c4461e4608f0492b0579953bd943660fdd4543aa3f51310061a603432200ebe70e3aedae474e8a3
 MISC metadata.xml 228 SHA256 a317cd066ed83c5b5acf9d49869cb2f153499bb90cee389334bee9781534f5e8 SHA512 1638d4580908d32ad6fad71d109a58d699c9111d26c1073ae95b20248fc2a5da91a1f73153f01942df25c64865586e970e6532a312cd374d9866bf21264ddc54 WHIRLPOOL 11e5655c66af420e31f60d3ab19ef3ff55222271dd63bca94b548c7a63bbc73e8edfb4d80648d143c7d8315f8ba66bc4140dcf97ff85ea472e2a7cab1de98264
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iEYEAREIAAYFAlLy1swACgkQ1ycZbhPLE2BHeACbBJNRji5Y6vehcgcjacZ+E4FF
-AOUAn21Asj9afEJf5YDA+Z3pxaJ5ny6I
-=MiTA
+iEYEAREIAAYFAlLz3BgACgkQVWmRsqeSphNl8ACdEn6/NPOSqUKKd/w8gCHvecz1
+qxgAn2HO9DHHJWmzrCkX50zHDLj7Hikp
+=W5D0
 -----END PGP SIGNATURE-----
--- a/app-arch/lz4/files/lz4-0_p106-cflags.patch
+++ b/app-arch/lz4/files/lz4-0_p106-cflags.patch
@ -0,0 +1,22 @@
+--- a/cmake/pack/CMakeLists.txt
+++ b/cmake/pack/CMakeLists.txt
+@@ -36,7 +36,7 @@
+ ADD_DEFINITIONS("-Wundef")
+ ADD_DEFINITIONS("-Wcast-align")
+ ADD_DEFINITIONS("-Wno-implicit-function-declaration")
+-ADD_DEFINITIONS("-O3 -march=native -std=c99")
+ADD_DEFINITIONS("-std=c99")
+ INCLUDE_DIRECTORIES (${SRC_DIR})
+ 
+ 
+--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
+@@ -99,7 +99,7 @@
+ ADD_DEFINITIONS("-Wundef")
+ ADD_DEFINITIONS("-Wcast-align")
+ ADD_DEFINITIONS("-Wno-implicit-function-declaration")
+-ADD_DEFINITIONS("-Os -march=native -std=c99")
+ADD_DEFINITIONS("-std=c99")
+ INCLUDE_DIRECTORIES (${SRC_DIR})
+ 
+ 
--- a/app-arch/lz4/lz4-0_p106-r1.ebuild
+++ b/app-arch/lz4/lz4-0_p106-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p106-r1.ebuild,v 1.2 2014/02/06 00:26:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p106-r1.ebuild,v 1.4 2014/02/06 19:01:43 jer Exp $

 EAPI=5

@ -14,7 +14,7 @@ if [ ${PV} == "9999" ] ; then
 	ESVN_PROJECT="lz4-read-only"
 else
 	SRC_URI="http://dev.gentoo.org/~ryao/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
 fi

 DESCRIPTION="Extremely Fast Compression algorithm"
@ -33,6 +33,7 @@ src_prepare() {
 		subversion_src_prepare
 	else
 		epatch "${FILESDIR}/${P}-install-to-bindir.patch"
+		epatch "${FILESDIR}/${P}-cflags.patch"
 	fi
 	cmake-utils_src_prepare
 }
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/seahorse
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.172 2013/12/24 15:24:50 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.173 2014/02/06 23:30:07 eva Exp $
+
+*seahorse-3.10.2 (06 Feb 2014)
+
+  06 Feb 2014; Gilles Dartiguelongue <eva@gentoo.org> +seahorse-3.10.2.ebuild:
+  Version bump.

 *seahorse-3.10.1 (24 Dec 2013)

--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@ -4,16 +4,18 @@ Hash: SHA256
 AUX seahorse-2.32.0-libnotify-0.7.patch 729 SHA256 8f7b2fc0ad1cb572de3c31ed694e5131e8ec6373e9f3e202d98858a12902c467 SHA512 a8752d88779969923b8866e5f627e469cb2e3da06e00e8a4fc9cc39f2e5de9c93f17d81fda7ba143e523105a3d1909cfc3b72e460dd3d6fb48bae7970b5cdcea WHIRLPOOL 33ca07d06d5623c6924ebbab5d28a0a4ae3c0d3b226d8083769c308b425535d70b41c9776547335a9efb30f6875fa2e772c9155a99ab824e04ecfd0c108f6ceb
 DIST seahorse-2.32.0.tar.bz2 2491230 SHA256 f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d SHA512 b75d94dbce8a00ecec4c230975104b0868f5b51bbcaf18a3b0a2520156c1b1336ad60a978775657fdca0bdabd0ebcd52a5e086a25ed8be1cbae9354245705879 WHIRLPOOL ce686c02f8f3935e963ef2fcf4b334372cb8698eb67353891276c79e3f587e50d3b9cb8bd5291eaff21e1e7bc48a82ddc8fa87a24cdf39e1c1732846d71d1e5d
 DIST seahorse-3.10.1.tar.xz 2110272 SHA256 1df307481988c272d5648a335b2e8bb545b568a00c3f2ca2f3aa732badb46985 SHA512 5e86eea1cfcdd9d69cb5e3f16dc4506855a30df341fd955a036fb95e325fa4c6a5e1b3d3c837aea79518ed98ac466719844672a368c0566af9ff9db776e28264 WHIRLPOOL 4b694ef5859d565e3a1bc7ab27b8a85f3f91bf0646c09d69b45dc1bc2670b23184d25e785fabda9fb6290a2c26b52e4594bfa6310b99d0990a7e9e82bd96a7ad
+DIST seahorse-3.10.2.tar.xz 2109592 SHA256 89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16 SHA512 7257f96c4e77902c018cfcff9e2096ab216fd4bfde729c08d7305f20e58664675381ad60e394d0536e392345cc6bcfb2de59af1a2a4e3e5ae56856aa8fc0d80c WHIRLPOOL 9c940ac1168b12c19884aff2b8ffbad48b1e0f1aaebca182489722e2c542f54fedafcc17c912b21afff547e4c6b1253c2d8c2a2f2195978b21edef3b055151b8
 DIST seahorse-3.8.2.tar.xz 2012712 SHA256 b3837d088b7e3f7ebc41cb3f11c5c85e2df7e06bdc538a3e85bb1a13c34c9a12 SHA512 bef79052b874e752a6adcce7273bb5bc0ef513c9814374494f5da1e78e8653f0ef59ea7b5233e59419113e2b18d35578e2d902cc8ffbdeb50a419a0257fc3ada WHIRLPOOL 59ad2c53bfed0ca731e1fe1e61af215eea5c7a81c133a6fd5b5787731626a3fd44fca58b490063a5c4d1ccffed614f5ae6ccd59d4d551b02ea66c9d45456834f
 EBUILD seahorse-2.32.0.ebuild 2162 SHA256 badf51a1c01e93ba577a0458f68d3724a2b313a44bba565b6b1696a20b11dfe5 SHA512 484f27fda351e6adb8732da527f091fe2299a56bc909a5a9fc2edc4b00fef795111bd07090c97bf73e8f7feca6b5863ca7bf41c991e64adabbb6bddd1d2607ef WHIRLPOOL 8a565ff071f14a638622473909ae2214192f7a49233e44709151f1807258c2bfbd3135d18087144f532d56f140acfc76e3a5ce9c4010a4ecddda59bd6041a04b
 EBUILD seahorse-3.10.1.ebuild 1536 SHA256 e8eb0f7ba319121a1e7b3abbf56e264d60b6444da3e51bdce79fd2942d880436 SHA512 a9987c730543435a72eba84d2b8566af8f68c3272e4ec3e3aab8f8c097f5f797209d3c7eeae1f8e8a040587ddde4e1ecc8aa1b8ee69c0b64c3d107056258edea WHIRLPOOL 8ef79d57d00efdcd2d81346e310a5d42d2469648d27da12172028f600015b37ac2e1591f8b4e782a182064b9095b160924413c4f0562fc11036d61e71088606c
+EBUILD seahorse-3.10.2.ebuild 1534 SHA256 73b07ab35941f77aec8826add2018c1d89da95cc181cbf40de3dd68794194c73 SHA512 3fa9c39c55ad6aa624594805a8a42509603ec85d8087c0b202fba3838fc1ef271cd82326c88b831196f2a917b77fd0e84e6b0528b36039e1a700c12b12342d81 WHIRLPOOL d55a15796264132a767e9add91082cf05ae3b77faf182573049c3fe2e8b10fb800e2b85b9d615c79e35418bcae564af6a3929a8785d63dbef18843b01ec5b452
 EBUILD seahorse-3.8.2.ebuild 1505 SHA256 edce30328881bd8d02e649434a52915bf5e46f68c942713553978f473a51b37d SHA512 e264d5d49093aa98e0fecd4b2891bb90b37be839cecfdd3fc913b226af36c4e737aa1d3f0cad4d7d3802623e144c49c34717bd801585439b9ea8f13975849507 WHIRLPOOL 99d2633cd125b6caf0d2cdd95be36b815eb7277da641167af15130d049f0c032a4542273a5b022ff08664bd52690861c74ca4796a0c9c0de54b124477f59229d
-MISC ChangeLog 24933 SHA256 b82938f42c4a49d59459e61aa543c885d0423d42ba45bf4f89900c09f56805d4 SHA512 1dee8486bd744429431c966a279607d3eccadffbb2037e60beaa65305ce5a75adda3a92c2b02e79ccbb9038dd16e0edc53750672f1ab7e092a3521cfca70a728 WHIRLPOOL 85aa29caab1273519f59d2e0743db9c860df43ea111cb493c44fb75fdd4e6491aa572a6a9e5834c7a5922a10a236cbe9072012e478e4a8cd1538e082330e118d
+MISC ChangeLog 25059 SHA256 77930dabbd17c40d2c74172c7156d37ca9981420e738ce07cd459903d71648fe SHA512 dcd012f27464b79dde4814594b3fd8b83255baacd17a19b8dc72280c24646e13bfb2795c05e78681798a00edc344a689ee9e29109ba1681088ccf938b5219302 WHIRLPOOL 1a8037e02bc321857e2dd6cfc1ec826a24f4ff66f3427b9c699eab4698051f1b805819327e16263c2a2a3cc8395ef0dbd1ae29431d9111da02079cf1b12a0072
 MISC metadata.xml 780 SHA256 a451d0176823370754ceaaa2bd6d5e372523008eaf29410541378392241d20d6 SHA512 3e5c6a4edd1ab1ce4353145afbb96a353b126c19295536e1207766fe7348050842e871e93013d63d067078ffe3c017d366e4677390992de2a7d1d9a5775960c1 WHIRLPOOL 39481ab218ed04e835f5447ed74df6d4d26102c8e0f0e48b4f85aea41afa0284b529d28ad937e9d02fef17d52e564c3c765ee8117d8ce3fbc3b08d780dcfcaea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iEYEAREIAAYFAlK5p0MACgkQCaWpQKGI+9R3wQCffuX+kUC3flJZPt7kbdgsp1mX
-VHoAn2k1cZJ1WmobQGEcqWraqc6E/p0n
-=UcnK
+iEYEAREIAAYFAlL0GwAACgkQ1fmVwcYIWAZc5ACfaLyZr6RYX5VOOujX/3fl5y79
+LkoAoJcs0oQ4r+umEW2yEn599y7v0jC6
+=Vw+b
 -----END PGP SIGNATURE-----
--- a/app-crypt/seahorse/seahorse-3.10.2.ebuild
+++ b/app-crypt/seahorse/seahorse-3.10.2.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.10.2.ebuild,v 1.1 2014/02/06 23:30:07 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="A GNOME application for managing encryption keys"
+HOMEPAGE="http://projects.gnome.org/seahorse/index.html"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE="avahi debug ldap"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.9.1:=
+	>=dev-libs/glib-2.10:2
+	>=x11-libs/gtk+-3.4:3
+	>=app-crypt/libsecret-0.16
+	>=net-libs/libsoup-2.33.92:2.4
+	x11-misc/shared-mime-info
+
+	net-misc/openssh
+	>=app-crypt/gpgme-1
+	|| (
+		=app-crypt/gnupg-2.0*
+		=app-crypt/gnupg-1.4* )
+
+	avahi? ( >=net-dns/avahi-0.6:= )
+	ldap? ( net-nds/openldap:= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Need seahorse-plugins git snapshot
+RDEPEND="${COMMON_DEPEND}
+	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
+"
+
+src_prepare() {
+	# FIXME: Do not mess with CFLAGS with USE="debug"
+	sed -e '/CFLAGS="$CFLAGS -g/d' \
+		-e '/CFLAGS="$CFLAGS -O0/d' \
+		-i configure.ac configure || die "sed 1 failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-pgp \
+		--enable-ssh \
+		--enable-pkcs11 \
+		--disable-static \
+		--enable-hkp \
+		$(use_enable avahi sharing) \
+		$(use_enable debug) \
+		$(use_enable ldap) \
+		ITSTOOL=$(type -P true) \
+		VALAC=$(type -P true)
+}
--- a/app-crypt/signing-party/ChangeLog
+++ b/app-crypt/signing-party/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/signing-party
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/signing-party/ChangeLog,v 1.40 2013/07/04 12:18:00 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/signing-party/ChangeLog,v 1.41 2014/02/06 19:54:24 radhermit Exp $
+
+*signing-party-1.1.5 (06 Feb 2014)
+
+  06 Feb 2014; Tim Harder <radhermit@gentoo.org> +signing-party-1.1.5.ebuild:
+  Version bump (bug #500554).

  04 Jul 2013; Agostino Sarubbo <ago@gentoo.org> signing-party-1.1.4.ebuild:
  Stable for x86, wrt bug #469364
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@ -1,27 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256

 AUX signing-party-makefile.diff 469 SHA256 c9930db5439f522af8f492f1fd5eabfbcb490e9bb50ec36a07f908badc65db9a SHA512 b2acd11419bc4d14b4845d75edc10e85770afafb0cb86ca718db506d7537c7a873a5f661e37ca051a4903169acf9cf1699a0b6efc343618739e5b59ac782e6f8 WHIRLPOOL 984a5fe9d1c57933b7411676a1f4c3c86bf8db09800c52958e04cd41c0374e91e6521d08091df69ef37c70173ce619a63a4f315ad670a560d52a6c95ddb399c1
 DIST signing-party_1.1.3.orig.tar.gz 223459 SHA256 b3d774de41b97861f1acd33502be44e5f3dcec05d990a4095518dc65106237c4 SHA512 8ae680971ea97eff761b2aba55c4e95f043b6052ea27cc6009878a8a5bf53cca21a87d55364b5fa0e7436151124e73a9edc95635545889204083b0d8830643eb WHIRLPOOL c545c23c67e0d49bcaeaac9800aa418113d88264d2cbe72f865bf0c081b26efbd658123b3f8a18883dbddf76aaf39c1a59612a23ac9540a707d319f62ceee82d
 DIST signing-party_1.1.4.orig.tar.gz 230259 SHA256 3d135437540ad1e5b3bb209ee90896a6b9153170eb0e4c93d018c1952fb80fa1 SHA512 935a192d8ce0057731b3422d217a90890dd97d9c84a3a46e3e4a2536f41e6752a44a86ba13db9b9a3e24a629dd6e78cb599a7999eeffea0a2b3b83b775dea36c WHIRLPOOL b5efdbd37d3277fd4fedc0938abcedada2c9a603bfdb1e93882e60abd698e4d4ef9535fde8d6c0c57818603e12507d911a150022fea5690b72eac66eecda803f
+DIST signing-party_1.1.5.orig.tar.gz 230579 SHA256 af67052373996d8c34f9a4eb4822305c4d5f1dab6c807722f4b04fb5035c1363 SHA512 9af5cf2ac0bd19730c834af9185d5c9ed9b55a22ff8f5b9ed143e1246e01bebfe78754d690a17c2785fd7d7b02559fb45089ab5cdf5d766e9bd88d69abdbe6db WHIRLPOOL 46832d7236bdf0ac8de4337abf7b53f4f264add4e87887bd2bd20fcd1e08a893e898d35f42e18a7518b84a5184dab35ba9a22796dfeb2c11c85b7627d7b0086a
 EBUILD signing-party-1.1.3-r4.ebuild 3035 SHA256 71978510eba26abf3af9f74ca35641ae2f19b442acb75e51ea4974f2bb114493 SHA512 2e9a04aeb6a741f2b72cf3b04ae38437a09349f9808438f62b953959274df4f7fbf1361aa14e518d251f0390276a9572e7457b18e98185ee7fd1b4bc6770e12f WHIRLPOOL 8b1ef88720ee34377eb0561dc9bff8d365d180ebd06cc434908af09e37be3d841677bbdbdbc7aa49a15c41ca7051b85926e647c86f902b35e8e6ce9fd2f6c269
 EBUILD signing-party-1.1.4.ebuild 2851 SHA256 98a2fabb85432867d970b87ceb9adb23a9088e5e8822e19e2be9d5c195988136 SHA512 47d2d9f697bec2e76133ea3ce798654d8140a9cc4568dfac3c4f148a07413884e8b240216c2c9e536883c4c62ba8086894e078dd66498c19a1100dace922023c WHIRLPOOL 24b00e7f5d3f025ce1457ecfbbbe44354f70b43ffa24ad7e428471c4ab4e8ad871dc07b76b23bb893186a976259d3062d5589bc4ab985fa76bb1775d325fb64b
-MISC ChangeLog 5777 SHA256 c964b663cddf5122fd3856689277b44cf9273784bfb66980fb849fafe4a88779 SHA512 fc3ab2cf195d77df46f478bb70a33232b490802bc8be7c9a429a93022c8193ebada4b5bd6c4dd67315c29af0fb1293c20160f78f4a0f85435331990126986cc8 WHIRLPOOL cd58c4dd4f389bfd0a986e31aa2b13cfa61b4a30a50b07dacb730c97beea79937e4dd3d0965dec40a3739f641c5c64943e5a44578e888cfb2a0881c836525c16
+EBUILD signing-party-1.1.5.ebuild 2824 SHA256 aa92ed0d06ca946b0fe4411ee64e433a7e21d222b86c6739f915022a37b630b0 SHA512 718db3086842d146a3dca21d914b0ffe0798f9df89677889fae46f73f75d1250604fd1c2d7c123ede0bbeda0203c96920e50370faa378ed608fb10fcd1a18e47 WHIRLPOOL 8978a25892b5b63ad88a4d8bc4b6855f1ad63be011182ab5fddccc744007d0106dc3144e46c83baf714694c5d4311423b1e1a717ebc7dcb9dc9ed98ad30d0596
+MISC ChangeLog 5928 SHA256 fff56b2b9204d55da38e8f50000887bcc2cc63a4ff646f4a058666f8ba042b99 SHA512 e146d5757fc6f9c946de671889eb8822b455dded92d9467a5706205205abf2f9c8fd6da7fbb069705367f9b1e4b13d8cece3f9bf2a016c0661eb24793944545e WHIRLPOOL 8fc66cc51448e2c72c724c21e86f679f54038a2f5c12c5453efe86e030b3e655387c81227c2a4baf027f179321af08ccc64acf8d2dc6cc412d36410e20b0dfd9
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)

-iQIcBAEBCgAGBQJR1Wf5AAoJELp701BxlEWfaW8P/R2qASGmGgH4v/TBmefWDJ2u
-cwU+saWwMQOx77Bgb4CH6WZyH91nRCvEQy312WOIN2mIewg6xjAwGcsjWcn2UYn9
-IgVXY9krKLH1Hx5mlROZ8MJqiR1GoC58eZyN+bLO3itPUSVfvt/Fa02xZdzTjnSv
-yGZ2tKW+4ma7SNTBJONTW1M/c8j85Y2sJHu4MXrzCWMZWsAtURohD2Aq0Q23ezql
-w/3sewIwpbpuNqz5MEk4M+Fp20a7vsfbu79WU8ZqT4mwFV731a1ZNfTVV1y6D8R6
-kin5XB6z1nIx5DcjJXNciAn+kUmZF58mhJLKsQoi+c+6766xXaVy07zT9U4qMEA0
-sedq6iiBvYmCEYcgBU753QA6gJZWpV2MSk846DRVs7E/upmiwHdRJd0ACOdMQOyt
-xcg7p3srA7bsCZvuKEpYtBqrq3epy6a2IHDv9a0HbEG7D+ZRDfLX+Ta8nEAgpMkI
-2xcX/ouK0IZ9BD9UpLXIhjnrlDqaEzC6xJcfQIdD2AFvpHI5OSiENuXb9myPH208
-oEKpapGtrkBUlf3C3VX0DgUlEKv1hoFzYWnJoI1EhUG/BjHJF/XFFRDkgvsJMsTE
-aW/+qqmw5melKmor3y2SjWT5AETlkaUGkX79qQRtRLRup+2WkMbWrHu5B58D4+kt
-1Kl/lTDLPQCANUJFWRPJ
-=v2Ae
+iQEcBAEBCAAGBQJS8+hzAAoJEEqz6FtPBkyjpZ4IAKbpX4sykRz80z1M/nDwOuH5
+9nwqnKQGL0MykytkQVsDMFvr6xJgcPUlqyCTtv0xq1zjW5w0iJfdqLSr0813gkh6
+R61rXwN4XvLKUAHzXXea6SUYbPv5Zaqq08n+8K5soBmfstEIXLMUm4ccROeZmcl
+jMmS24QVekomQY9OPZw7wZ3tCfX3io9lmVMVsz29I8UDg+uPHEKykEcip46/LXpJ
+Os//wHlYlW5tbd3/zvjKedwRnmKjAd8/JBE/vWjdF+C2tFG5mFaP1APYgoK2OkOk
+weAQxTP2IKaW0QLQgsA5RU73pk302l+HVQ1Q+Z9UJosMPbdI0keQLctGbAqAyEA=
+=FeB6
 -----END PGP SIGNATURE-----
--- a/app-crypt/signing-party/signing-party-1.1.5.ebuild
+++ b/app-crypt/signing-party/signing-party-1.1.5.ebuild
@ -0,0 +1,104 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/signing-party/signing-party-1.1.5.ebuild,v 1.1 2014/02/06 19:54:24 radhermit Exp $
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A collection of several tools related to OpenPGP"
+HOMEPAGE="http://pgp-tools.alioth.debian.org/"
+SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-1.3.92
+	dev-perl/GnuPG-Interface
+	dev-perl/text-template
+	dev-perl/MIME-tools
+	net-mail/qprint
+	>=dev-perl/MailTools-1.62
+	virtual/mailx
+	virtual/mta
+	|| (
+		dev-perl/libintl-perl
+		dev-perl/Text-Iconv
+		app-text/recode
+	)"
+
+src_prepare() {
+	# app-crypt/keylookup
+	rm -r keylookup || die
+	# media-gfx/springgraph
+	rm -r springgraph || die
+
+	epatch "${FILESDIR}"/${PN}-makefile.diff
+
+	sed -i "s:/usr/share/doc/signing-party/caff/caffrc.sample:${EPREFIX}/usr/share/doc/${P}/caff/caffrc.sample.gz:g" \
+		caff/caff || die
+	sed -i "s/make pgpring/\$(MAKE) pgpring/" keyanalyze/Makefile || die
+	sed -i "s|:/usr/share/signing-party|:${EPREFIX}/usr/share/signing-party|" \
+		gpgsigs/gpgsigs || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	# Check Makefile when a new tool is introduced to this package.
+	# caff
+	dobin caff/caff caff/pgp-clean caff/pgp-fixkey
+	docinto caff
+	dodoc caff/{README*,THANKS,TODO,caffrc.sample}
+	# gpgdir
+	dobin gpgdir/gpgdir
+	docinto gpgdir
+	dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*}
+	# gpg-key2ps
+	dobin gpg-key2ps/gpg-key2ps
+	docinto gpg-key2ps
+	dodoc gpg-key2ps/README
+	# gpglist
+	dobin gpglist/gpglist
+	# gpg-mailkeys
+	dobin gpg-mailkeys/gpg-mailkeys
+	docinto gpg-mailkeys
+	dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README}
+	# gpgparticipants
+	dobin gpgparticipants/gpgparticipants
+	# gpgwrap
+	dobin gpgwrap/bin/gpgwrap
+	docinto gpgwrap
+	dodoc gpgwrap/{LICENSE,NEWS,README}
+	doman gpgwrap/doc/gpgwrap.1
+	# gpgsigs
+	dobin gpgsigs/gpgsigs
+	insinto /usr/share/signing-party
+	doins gpgsigs/gpgsigs-eps-helper
+	# keyanalyze
+	# TODO: some of the scripts are intended for webpages, and not really
+	# packaging, so they are NOT installed yet.
+	newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze
+	dobin keyanalyze/{keyanalyze,process_keys}
+	docinto keyanalyze
+	dodoc keyanalyze/{README,Changelog}
+	# See app-crypt/keylookup instead
+	#dobin keylookup/keylookup
+	#docinto keylookup
+	#dodoc keylookup/NEWS
+	# sig2dot
+	dobin sig2dot/sig2dot
+	dodoc sig2dot/README.sig2dot
+	# See media-gfx/springgraph instead
+	#dobin springgraph/springgraph
+	#dodoc springgraph/README.springgraph
+	# all other manpages, and the root doc
+	doman */*.1
+	dodoc README
+}
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@ -1,6 +1,14 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.362 2014/01/05 08:17:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.364 2014/02/06 23:24:27 eva Exp $
+
+*gedit-3.10.4 (06 Feb 2014)
+
+  06 Feb 2014; Gilles Dartiguelongue <eva@gentoo.org> +gedit-3.10.4.ebuild:
+  Version bump.
+
+  06 Feb 2014; Pacho Ramos <pacho@gentoo.org> gedit-2.30.4.ebuild:
+  Clean pyc files properly (#500506 by Fred)

  05 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org> gedit-2.30.4.ebuild,
  +files/gedit-2.30.4-underlinking.patch:
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@ -5,20 +5,18 @@ AUX gedit-2.30.2-tests-skip.patch 1402 SHA256 faf11f3817052dd76aa9d34af938c4cd81
 AUX gedit-2.30.4-underlinking.patch 491 SHA256 88b5f78173b17e874b71cd42f2a61c82900efae5d506fe8ecf6286c50b2e0cd0 SHA512 483cd11f82697de45efca711f24c0d417d918b59d802561fecc83af8f33a4c3de6c01bc4c723a8e8363fecfed1c5c2baaa42b2e9496aa6836b1e160dc790f18f WHIRLPOOL 796bd41ed11be9d5459bb5204b0b9ecd9cd47b1861b02fb45006dfd7004bc48e422ac918ad6ed05c12317a65cf96c4e46fe5709508b4b3a947d3a2907ea23f51
 DIST gedit-2.30.4.tar.bz2 4705692 SHA256 a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c SHA512 31d96a86d4d207fe83aa1c8b8faadd82c2c6eeca019f2df4fdf75a8678233e76edf7a09f32dba6350ab9fc003029cbb585608d864632e1d13c42650d1894b5e1 WHIRLPOOL fe5183f33992d6ec1ce8365321f829828d6c9606b42a6872e323351ac4bee0c488fb5ed06dda8e1aac4a09be3dbad7196e48d9cccf5d0f1c6dd759224051eca6
 DIST gedit-3.10.3.tar.xz 3088516 SHA256 d0efec59622061389fcc06d23b88e2621d4d66b4bafe7d4461c1c7d48a54bc82 SHA512 0346671b145bb8f30aa19b85d9d5cd178f3c538f60df16bee2f9c055b707903e2c927fba4ccc0569f74e93015f4d8fea8dd29865e93ed5fc78eb6821075bfab6 WHIRLPOOL 81b6e7a347abaf279442f739f9923b58a9401adbfc26ca3847de71f4e505e8b6cc86626ce13207a1944a5ba357c3d0d8d82da1a5ea902fa68b83341a3c62233b
+DIST gedit-3.10.4.tar.xz 3086320 SHA256 40dc10b6e26fd8523087e7321a20a063f4c1e586dffd7ce8ee78eead11359f9e SHA512 36fe1a309594338e6b0f8285eb8789386724e0a9c9f5f3ff898d138c0949c04ce693896f4e4766666e3afe795dea46caf0403ff82570dfd60e6dc5ccb99642d4 WHIRLPOOL 73c40ae9c73fd31a8dd5468924a338c4e8055c021a9f8800555f781e5bf9d71cfbb9c57666127e52ed3311933a7d0402ca3844b1d8bac439274cf88889c5953d
 DIST gedit-3.8.3.tar.xz 3074384 SHA256 dfbc2d9cf975b247c6a6b8bd1ae1b72d8e8a1f862f5f3d084a404853092cf9d3 SHA512 3a7466e6c447e2c8388b5480d1f154644c840c1d8cdd9ab2f6d4acc338282e505b721a39cd9720153669b13229d640664580219ec569b4199aa073b0131e088c WHIRLPOOL 11d25d14c3e0f98121407860237895393d88d83139a4dda5c1a00e8ae677c19879fd692c68d17a3d1193f55a298ec9d3de06a347df8a511f1d5e1baf9fe1ea56
-EBUILD gedit-2.30.4.ebuild 2223 SHA256 1c13427e6a17d98ecdedb6d68e19a3f62b047e5686a39182667548aebd6b7069 SHA512 e31b601818a97892e52e627100445d9b519147f5974da0064cb529095a0c1ba1143e1fb784e235ea7ba80a19b1b8a0aae1e7cd6e21d58b5add350e3027e6c1bf WHIRLPOOL dfa120613a46db67b7388aad05cafa538fd97e40bc24159e6b06813a70365985b6c4ea1eae0bca93081ed5aa79adedb6868e5b860d5355a7e2ea8c959ad16e2b
+EBUILD gedit-2.30.4.ebuild 2139 SHA256 d8892e29f599a1f1914b6cc86e1ae89f4afe3087bebff87a3cd74cd8e07a4433 SHA512 05ba413cb9bcca13a00cdc30c5c91d5b20e1028bfe76506139a0ba914e0378bb3b55c68794d3d77aec5f891b73e06fe3032d477133639cb4748e0be30df44513 WHIRLPOOL b85b15c9915ca26e840dc8a2849d1be9245fc47cf14d78d9a12dea3c3e5bcb3ae8e0c47068b128329af74238c5b6c072042435970488583c35b2052c2347c44d
 EBUILD gedit-3.10.3.ebuild 2362 SHA256 d6989ca9e62891044aa8159a55b59096660fbdcd20964592aee875b4b17475b8 SHA512 45a249cedf09d351e54063963fecaaadd6354c158486c5b189858279429e805dc6b17a56a6a7f51d7b4c87e2446788da8c7f5c3257dd9196f4033013fdeefa8a WHIRLPOOL 7294e8b34873edd7c46a5d3d9e15c5c8791b8cd0431cef579ef42827ab76bb066dee3135b45a4f24715335aaa8a48158d128c2f5af90adde043955b8e8828540
+EBUILD gedit-3.10.4.ebuild 2360 SHA256 0dadd0800391c66c23ef7c126f0b81c51493efe665122bc3ede4fa23d9d7639c SHA512 135746b0be4cf1e32e0ff889deec32e6da1ed5bf4ee9a15e19c42a27d1a2bd2ac5761b561668af2dd1a2babbe54d5a89d524a07673aaf17b89c32fd2400ddd5a WHIRLPOOL e74c89dab35b273ff2ada3d987454b324426f45648a5918244c9341e1acd0566b12db5ec96b8174ec6a95e2ddc89064d69e4d77c48dc9dc066d1bb2226817ae6
 EBUILD gedit-3.8.3.ebuild 2357 SHA256 2bfed20b2364cdc03ce63876e9363bf2747eb4a11dadf543a9362ab200adf1da SHA512 c95677d88d52308dc625c98a571d1d0a1c591efe0c894393dd56c6b20eec98c73415590c7acf2e29ff2b9f3fd1077adf46a1bcda5a2baac514e6bd7b8e576775 WHIRLPOOL 8973e07b9cd20112f0c7aaf25cd320534f2b44435fa6d890439a8d7f1de227fe70b3cde96a024efe6c7843bd2652f522de6ba7dfb13c14757f79d63be878f9f3
-MISC ChangeLog 45885 SHA256 d889b05ec42efb0b7200babf9ab345221cadab10cc5ebeab70c7f1e215c34e1d SHA512 55b82cb41db3d8282bfa882a4a69ac0790ff35a5101672f8d4bbb172d702070c2988c6a148178b78696caba44f12016ab7940b054f670d33cba9a9f1a9c3fef0 WHIRLPOOL 8963bf97844fa0f9c7249666211b87b0714d36661605dd608b1729547fc2f2c0aed2a230f9936ea87deadfc76ba1e78c4f22fef173bc0f557cba71a817352507
+MISC ChangeLog 46114 SHA256 8ffdf99baf8613bc7fb6d5c11c4b37baf5a90db851c22e7623d16edd69a65f81 SHA512 b4ea763259fe7dbe41a369a7151f023acb6c9129e27b574a0237b3159a7693a240884dcfd73fca7868baaad07939d99bcb4149210cae487a7703e92acc12313e WHIRLPOOL 4b3bc155403b93ddf572885c9eb2be149e855fdc1d90539e56b9f76b667aea7548f4ceb35fda328125e06f880f024bd647f8bfe97056b9c35af974869b955fa9
 MISC metadata.xml 276 SHA256 8dec58657a80b4973306f2f6d5da03a819b949c3f8e93b3065eafda55f1f8465 SHA512 9c1f48389dedc905b448e4085b9fec8f37ef777aacf14e18541e39680ccf83a968c7ee8fea8b9ede61704ac174380c7cc56858182fb6f59a589ab1d70b8eea7d WHIRLPOOL 902de8d338629274e1ec7a7a6b13316e88f09847d5158a92fdc3337e33c26dcda79ff8bf425dc0de42657ba14769478335249d13cba2342f8adb247a1f40e905
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iQEcBAEBCAAGBQJSyRUEAAoJEJ0WA1zPCt1hbSIH/1QVFgjzNvjwDNLoi0cCl1i6
-9RE+SSS2zdmuItupCc2ZgxTrN2V29ar4p/53ctiCMsUf/RS/axZHfZJ3zXN0FFw6
-lGjGNebmeIbO+0TdxneWkuK3HY+LAT7UwSC0tW797onjyOdWN9X5QI7o5PPGUsU+
-D22by5XTwLkcw8p3DuM9jMM0XTPR/tgV2rDiMcIrqH637JBu5orsX+3a1N/17148
-6p/x6+7fxTZ+65ulh/l/kGGj+/V0kCBubaD6V8xkITOsefKIjLx/bowH2CQPzZnY
-/hPzaMMaX0rkZLI1a2IkwD1zxDTGPeAvkJzsWKV6OiVWGEFjs3xf3xeG4CZ5nFc=
-=qDtm
+iEYEAREIAAYFAlL0GawACgkQ1fmVwcYIWAacpQCeI/GA5eeqCwenpxPVxjVNbQXU
+h+cAoNdVE1Y83ALob6gxDwuPdXWiQD7K
+=TxOR
 -----END PGP SIGNATURE-----
--- a/app-editors/gedit/gedit-2.30.4.ebuild
+++ b/app-editors/gedit/gedit-2.30.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.30.4.ebuild,v 1.14 2014/01/05 08:17:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.30.4.ebuild,v 1.15 2014/02/06 19:08:15 pacho Exp $

 EAPI="3"
 GCONF_DEBUG="no"
@ -70,9 +70,7 @@ src_prepare() {

 	gnome2_src_prepare

-	# disable pyc compiling
-	mv "${S}"/py-compile "${S}"/py-compile.orig
-	ln -s $(type -P true) "${S}"/py-compile
+	python_clean_py-compile_files
 }

 pkg_postinst() {
--- a/app-editors/gedit/gedit-3.10.4.ebuild
+++ b/app-editors/gedit/gedit-3.10.4.ebuild
@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.10.4.ebuild,v 1.1 2014/02/06 23:24:27 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python3_{2,3} )
+
+inherit eutils gnome2 multilib python-r1 virtualx
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="http://live.gnome.org/Gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+introspection +python spell zeitgeist"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+
+# X libs are not needed for OSX (aqua)
+COMMON_DEPEND="
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/glib-2.37.5:2
+	>=x11-libs/gtk+-3.9.9:3[introspection?]
+	>=x11-libs/gtksourceview-3.9.91:3.0[introspection?]
+	>=dev-libs/libpeas-1.7.0[gtk]
+
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+
+	x11-libs/libX11
+
+	net-libs/libsoup:2.4
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/gobject-introspection-0.9.3
+		>=x11-libs/gtk+-3:3[introspection]
+		>=x11-libs/gtksourceview-3.6:3.0[introspection]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] )
+	spell? (
+		>=app-text/enchant-1.2:=
+		>=app-text/iso-codes-0.35 )
+	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/scrollkeeper-0.3.11
+	dev-libs/libxml2:2
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.50.1
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+# yelp-tools, gnome-common needed to eautoreconf
+
+src_configure() {
+	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
+	gnome2_src_configure \
+		--disable-deprecations \
+		--enable-updater \
+		--enable-gvfs-metadata \
+		$(use_enable introspection) \
+		$(use_enable python) \
+		$(use_enable spell) \
+		$(use_enable zeitgeist) \
+		ITSTOOL=$(type -P true)
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.175 2014/01/20 22:33:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.176 2014/02/07 05:39:40 polynomial-c Exp $
+
+  07 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.3.6.ebuild:
+  Improved ifconfig location fix.

  20 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.2.22.ebuild,
  virtualbox-4.3.6.ebuild:
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -14,24 +14,24 @@ DIST VirtualBox-4.3.6.tar.bz2 89609199 SHA256 c547e1e32e0b06fba9ee4ca7842f8ddee8
 DIST virtualbox-4.2.18-patches-01.tar.xz 3788 SHA256 9a147e3a3da7e1e07b70aed67042c822897c7874ccaa3690c9497862373d8222 SHA512 021f8a566ede223ead5a2605bff3917195165c543f760ee7af004ab97d5dcf0771e6ccb62148d7986a34872ea8c35db952286fb8534b1f69804e192701bd8108 WHIRLPOOL 9818df1703636fecfbda1bbeb4d167d845701fe9de2827a97573a26ffb3cb9feaa22ee2849c45d3ea700a9c305185eb404b15572b0f4e666f8a8e6158a48b9eb
 DIST virtualbox-4.3.4-patches-01.tar.xz 3512 SHA256 92602471590278f42db4e13aeb3975620ce0b8f1f883b82a534b6998bb4fc2e3 SHA512 3a487283066b96fb8abc765d446dbc3d3b34ed93a12d932e843b7ecdf644a02fc185f47764cfb3e4b996e104da8e1fc07432892ea126229c174e00f748468496 WHIRLPOOL 19b344f784e866b87c1f7583081746776da5203737bbb284a32b8bcb48a8546286cd209b6749c6c77c08ee02039afcf3838d49d179ae4cc1592ca1fbd5fd5b12
 EBUILD virtualbox-4.2.22.ebuild 12300 SHA256 e9edc84dcda2b139a6bce90950c31a56977db718cf8daaa00f42eabcd8028bcc SHA512 c5fba1bb18cd6852fd307e9b7b8f9fb872a7f9ff870eb4e3e978ec2e6ce89a8fd4ee1f6ac5cd9c3bef8324ea304c2962db14bdde20d9f0a7204256cba2ab6244 WHIRLPOOL a7409552e7e4711bd00ca8d26d8041c244a5b6749888b098dd266f30bde147c0036b57e324dadeea5cd4958899229a5206682b606215f4919afe34aa84281572
-EBUILD virtualbox-4.3.6.ebuild 12576 SHA256 61fd74ed24219abc46b2d34bc880083e79ce4d857d29767b162c32e9baaa1e68 SHA512 945f8c716d1fb72309309870826da85ce1b58093e6da8e7ba8ebaf6528bfbe16d3029d82d157c2ed4c6c864b0f1148073b93c4830aa6a32eaf3cd17b7c9cf7f6 WHIRLPOOL 0e5f5d155023b6f0f645753854e9cb40bc8f7be9f218c6e4837b68fe92c9ef7f3f4b3ec5cfd2d46dc3b1bb87468348fc15adf67f6b610e2ab6dd64806addf914
+EBUILD virtualbox-4.3.6.ebuild 12792 SHA256 73ba9d9144e86a7be20658903b042c8872d2a49876cc762e368687e9d4a967f3 SHA512 069903ebab5ad5621000f6a84090e436e49c190d1cb18636f59e0094f523e49b459ae2e997e4e3fea99efe9042b341258fd9bcef86ff3960fbf94d271ffe4bc5 WHIRLPOOL 38e98379a779580a39273f0870e66313bf9b15b3eb325eb819c318969f47733e82bec579608c500202cfc75d68e50280929267997abfaf57347267b0372b1be1
 EBUILD virtualbox-9999.ebuild 5123 SHA256 8cd24ad4cc1fab5562d58ebcf531b3131796eb24c40489d98bfb2078cd0b3803 SHA512 3c4658a749419a64f7ed8636e62f385db059639d58a2152ac1b136f54f8577407ba0553f612511ea7819eb4e26727ab516f62b11faac5d2e4b6de73892206430 WHIRLPOOL 317967e118951cda333e6db60a6e8f37df7a53599d752271d8f29873caa1e9bb22774963e8972989516031516b293c5b8dd9f7f5e680ac785d7f16437bf8c2ca
-MISC ChangeLog 25581 SHA256 c5e53fe538d35cbd0e8280830297cb245ca2dceb85daa17b560ce213b622dea3 SHA512 dd108f2a0c8f59f8bd03026cef2bf49717aad622da589325a8b08333a4bdb66bf1cec4d5134acf974c248b12515d9cf570b81a6784edb1739153cc13c2837036 WHIRLPOOL b99d2b8ac90c0ff8ca72f3586783f44c5b878ca7ccf290fb56273d579f74acc0408ed37ab44480d13b2f51ecb9d71e415a9ac5226f61d769713297ea2318c65a
+MISC ChangeLog 25695 SHA256 df50b892b84e2bbbe04bfbcfa83db3127d362877216c568c48033dc254b85dd9 SHA512 856996e71d76bbd35794b7bffaf8e7ce4569ec51ca848219002fc6ec867f9f5180d207360626ee434809e9fb14b575e0896dce71b7b61170c24cd759bef2055a WHIRLPOOL c83c5b7233a24527e47323b6ef537acc230f67f8f847674e5f02383e05ff21d5558ba61b8e2f18b8efb13696a2f3336690958ba8ca9f626e10660cf80a7d664d
 MISC metadata.xml 673 SHA256 5cf3053a2f23eff40c24dfdb7af90d4bf905df95a7406f6298ae9e5e547cbe79 SHA512 79b4b7477041212815e0b509016b692ac719625534ba93540ac5afe655e47ed2ed27d7ba51b494a49a6ac603733ba0b66a2a517f27e4d0e6b7563eb7d4e640ec WHIRLPOOL 6bcb7711e01036fa3ff064ffdc5021da6fca464d4da77d8e93d033304c7c1d3ed105723d5d5e7fa3328daec929c7c7a90c9c82572bb082765f286b53c3feb688
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iQIcBAEBCAAGBQJS3aQxAAoJEPiazRVxLXTFPDMP/2gNNzpnhmvJsjBplUnPlXDT
-l+zFuJGLqGsSoolgrKVxkSD5WQRrUsD5pYyDeNliTFqYcB9IkfwbZbhbHV9PWFxJ
-fJdDbFPyjat0M/x3ZBdEKh2BPJn9jf+caMODMwv6M5cyc8thkAtnzdZmXGKO5czv
-1qUJCUxvYkEsDC2tqgH5bc2s/U8kLk77aICBRYYk95QaInXXsiVTjZ+H3ldrvyWy
-CaEznmwx8eW2s/7IturXssr+YJFkn3heurWqBpGuvTk+hkTF7vAxtV6qniSSVL2u
-LXSyDsdb2wzr+PXkZcTS0zzPqP9o+vfTTa9dNd9IC/K+cPCZKi7tZNC494T2yBvQ
-+sVeBor1OTgUnub8Ldpvpz7C/Ytt0r9+momOiedbAIcS8K7x9aeLk743qPzOHOVQ
-GF1ptJud+vChYYKznjIz7bdAy7iYSXrSXWvUgzZMsxF5LIrd8jbsyAX1Z44e3EjI
-5+L+BABGvXmwFEh0UZCZ8bh5k5gPQznWrc6fDlbtunTcSHgENdqwzW277Wue7qWK
-3x88hQAOKwzPrfOf3hntK7s8DwOmzOir2L0uod3AeptszZHpqlti8ItA8zbWo32F
-BmbKzqCvLnAXHkwvyLQOs7Bjcf3Hty/w6yNJttQ+rtQcdCiFVPJKSNnMImbPS0P8
-zY6WKP0aGIIbn1PdGRPy
-=UN1x
+iQIcBAEBCAAGBQJS9HGdAAoJEPiazRVxLXTFPQoP/3QBqwE21iA5xlMm7ad6w1Ah
+dSrFWLdIlhS/edOENi628Mgv/w/qn1CSf+bZg1Iy5CoJDJvhPu/Fu0FYolNSVuua
+OjOq/xdiT1BKrasS1rBJKMrgLjGr7ZHh8stbFrYHcE42Ph0kRKUFpYsRpIj94Rmo
+o5w3/8pRQNQc0ekvPpks6MIkjXhmAwO6TVZtJMre+Udhe0WrYtQXOt6EZqAuhonw
+aveuNqkgp63q9GrU+n+Z5XA52jN4Mzu4JVFtJpwzG86IZVSW+PGp5UeBAL2zNwy4
+bBasNp5PZ3mHuYzgo7krUGxhMkMNf1/UC5tZGwOhtRmnPuwZj8fBip3xIUNwcwgN
+Lo8gBryvP4LzZRYyUXSWxyBIH6NzzuR4hLR45RP6CVvjkmVwXAHOB4Mw67VN31BA
+hf22zKRlK4pJIMWxEXt5mFS8tHdHVp33LVlcEXWBmitHzJ2XzIxE0evtnHoP77Nb
+Tq/XFo4FoFRhS1miASh+ZhrdTfZta0JWIplm8B5ZzBzOAQx0TkjBQpj5xg8W90em
+HleU33H6bqVkwdTHD01RkePKs53U4Drnt3ananR+H2bgG5oRVa5MZfAPhsUrRuH8
+8M2EkMGOYL3sqrORghMpIZ8GZBpEt/nIzHp7kXT0McVdbqU33eijO7/CuyduH/r7
+fImmcIoYVaHz7KjtH+iJ
+=s/Ll
 -----END PGP SIGNATURE-----
--- a/app-emulation/virtualbox/virtualbox-4.3.6.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.3.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.6.ebuild,v 1.2 2014/01/20 22:33:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.6.ebuild,v 1.3 2014/02/07 05:39:40 polynomial-c Exp $

 EAPI=5

@ -178,11 +178,13 @@ src_prepare() {
 	epatch_user

 	# fix location of ifconfig binary (bug #455902)
-	local ifcfg="$(type -p ifconfig)"
-	if [ "${ifcfg}" != "/sbin/ifconfig" ] ; then
-		sed "/VBOXADPCTL_IFCONFIG_PATH/s@/sbin/ifconfig@${ifcfg}@" \
-			-i "${S}"/src/apps/adpctl/VBoxNetAdpCtl.cpp \
-			|| die
+	local target_file="src/apps/adpctl/VBoxNetAdpCtl.cpp"
+	local define_string="VBOXADPCTL_IFCONFIG_PATH"
+	local vbox_ifcfg="$(grep "^#define ${define_string}" ${target_file} | sed 's@.*"\([[:alpha:]/]\+\)".*@\1@')" #'
+	local sys_ifcfg="$(type -p ifconfig)"
+	if [ -n "${vbox_ifcfg}" ] && [ "${ifcfg}" != "${vbox_ifcfg}" ] ; then
+		sed "/${define_string}/s@${vbox_ifcfg}@${sys_ifcfg}@" \
+			-i "${S}/${target_file}" || die
 	fi
 }

--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.215 2014/01/28 08:25:49 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.216 2014/02/07 02:14:50 idella4 Exp $
+
+*xen-tools-4.2.2-r6 (07 Feb 2014)
+
+  07 Feb 2014; Ian Delaney <idella4@gentoo.org> +xen-tools-4.2.2-r6.ebuild,
+  -xen-tools-4.2.2-r5.ebuild:
+  revbump; add xencommons init scripts to 4.2.2, rm 4.2.2-r5, fixes Bug #499992

  28 Jan 2014; Yixun Lan <dlan@gentoo.org> files/xenstored.initd:
  fix local variable  collision, thanks Cyril Nahon
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@ -68,24 +68,14 @@ DIST seabios-dir-remote-20130720.tar.gz 3201017 SHA256 0cf06b54e8ae1cfc25f2942ee
 DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea
 DIST xen-4.3.1.tar.gz 16429423 SHA256 3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd SHA512 f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275 WHIRLPOOL 087390786cea9aee273a5d81988436303991aa5ea92faf111d3b619517368f8c8feef84f4f8c602cac723980a344eb90414887db4ca88a2ee14bc6b0253e36ca
 EBUILD xen-tools-4.2.2-r3.ebuild 11697 SHA256 9407f8c81db48b9c41845cbf60635675b5f0c7917cff073d6b43bf2f9dfc0a41 SHA512 77b16ea53ba72363d77c64722b18705c80c51d0fe4fa63018b2611d9da049186c6914047e3e8683e48bcb53d2a77a05e00f3f3d7bf5a70b5900b3395a04e1382 WHIRLPOOL 046f0e38775b7af9293f713e30aa17725601f0ac5c75b59d0b86262bbab5b89ffb95f808a20be7fe40be419f58e48787857dfffc0ba23dfdbfb650ec7a19a070
-EBUILD xen-tools-4.2.2-r5.ebuild 12537 SHA256 f2fcf9ef58386807c7effe79fe9c295e3478d4449e6d45daf916155bfa0fea53 SHA512 4848dedb4054aeb6c7732b3cb144eec728c53ee7ccd7b5cbda90781188bd9d2c89404d834da6c1318eeb7e85248273163e557344b47fe7b9eab0440abc48f45f WHIRLPOOL 75b8ceaa23c20e952ce6538e0cc02abc0b1a74d1d621d2f53d1c8023ebda6f18bdb5ec4b545a382b0323ffffbdd3b5d6a29a724e5d2686dfc44cc83cc3271333
+EBUILD xen-tools-4.2.2-r6.ebuild 12988 SHA256 76cd381e72159c6b0c394f111afcc16be5bf368897a11bec9dfcddc633dce222 SHA512 5215bf7b6f1971129b9b3374c384353dbbab402f299c4b47699780d5c8ea8f5003d66c81529261f4a54c26b1631d11373ce58807183c0adb65742098304f2008 WHIRLPOOL ccc80b631c9bd7d4b7b05649154ab2d6bec0ab44d8ff4387cb22bf02763559883e8e3df86b1e5b4f2d12333b85b4ff202c2a0b5271bffe4b46b19e8e66615c38
 EBUILD xen-tools-4.3.1-r3.ebuild 13154 SHA256 deca70269214c5d7ed5899e8e5678da2ac6254cb80c753edd381c887110c880e SHA512 da9c6ce72d9dfacfdd8e1557e8748c439a6e036b9eabb30913ddc34c0a8e62dfec4d3ff87e322c841d6945df9bec722ec035615919dede4c145b3b45f70593f4 WHIRLPOOL 87813318d37973da70fa77463d4f8d90a560253d4d50207775fcbe36c43fca59e927e6b591a4ee2fdfb94e9d7344254de256aa83a6eba1eedc1eec9edcb3433b
-MISC ChangeLog 50772 SHA256 bee0396cd4c7652fa2141ab9bb8e0b34a5301ae0f7e9b4682c37b5ae66d84900 SHA512 6bbd443ebe87387ad99eb9ab7a058b109b26a0ac19ecf8a81dc3d3f1825e116259c97cece2f2ea3ac1fb8e69e483d04fee18a4e5efac5081939a1b7cc31e07df WHIRLPOOL 04bb0a95e52dcd1fe72b5f11a0eb8afb491b8726b8604bcd3bbc58fd8ff9b431ec0d1347ba81ee78e08aa205ae3d394e5f67e4b5ae006aba5fec42cc03f897b0
+MISC ChangeLog 50997 SHA256 187fc1b769169993284ec4c1bea518d68806768190b4b5303ba4cf0d4ace31bf SHA512 6b21a38add3128b2b409604bab56efb978a5dd9c20ffa7ceee095220f7307f6772080add4168e5da73f51e4edff039b521b5b12cef888581d96a7b3dfda498fe WHIRLPOOL 05b57d22359d70f9d8b37b454b0760a7aee7f30ad0c757b84d040a23d8958cfb394a7cfbd26a246b15130588cf48d0a01235d0ee8b48e7dcb4a498a7e16cfbeb
 MISC metadata.xml 912 SHA256 c60760f1637a70d67aa32d4f94d31552769a7b12621c80f897c6ea9591d8620e SHA512 c1ed27bb987d0d9ff8e6d934973772489884f4c1ef6916862cfbaebd3030a360d876b6b9d713cff2b47b99f9144699c8cf7ff693abd22b5a76bd02d1de73e9cf WHIRLPOOL 2fad840e70030a454fec22c5cbfa539d8f31ad4f825f833360a169109e8ee6bd98ab446cf7be5f2ec13dd852223b225f81708d673c582233739f223ab6a37053
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iQIcBAEBCAAGBQJS52mZAAoJEJIMDbyqvv1VAnMP/1+8KxuUIQGQH84tviRVrx3v
-m+ARiuR6EM4cD+P12RijjhZYRb8xGAs/cDs4+FRLHXVIT6Xx41AhlBMlmarI3Ok8
-jRZ2ldECed8p3scfxsOU4rmUITjSuUHZnhJI1iwKNR5H0lYaDxdHrxFkHYm2uGUa
-g+8wlPuOe3yR+pTDIwEBoKn5iTPQoUDWXNDNMdusCEIyWxGIadWUeqf0Ox35BwTx
-/9AMtpptCF2ehmswJ5IUjn33eCP3MNHYdhJueNHP4zdhK+HcQQY4gBc/8S9YDH6X
-z2uLt6OZVfj3xOcSr91oVZF9SbLaTQ1LRNlK4Vk2l0QKbdeo+TQ5kQ/GBYxTMURB
-UkC7Wl4HFbSOueIa6t0ba8yfHma3OO9r5Fd31SXZ5YwuUka638nTp2sottqTtC29
-vKTlX3Zx2PM58AdwO2lBx9G9tpIw6ycyy9ky/xMnn2woYXMugGlHbnMH1bh6YfgB
-6Mz/XArmwtbwQvPuoSZNcPY+p+HlCXshpiOrnO2oN1RRXE41LCQP1aK0VG+87aHM
-C9kOi2VidoyZZxw7Skws5sN2iG1QcF3UG3CQG3QLJOoFwEI9v12mFHyfK0HyXzCd
-1GEuJChUdCW48DCBqwgweECjgZRVQzG3zT6l5qnRy8ptqq3RNGy1V1J6Swqi6JUp
-32sPqAqHtrTrKDIzhuwT
-=h8Ak
+iEYEAREIAAYFAlL0QDcACgkQso7CE7gHKw2ECACcCdH9c9ZAcQHxqmq2DLBx+WLh
+RsoAoLMb8wjxN7eEGY4sXhxSp/mIwWSc
+=OFCQ
 -----END PGP SIGNATURE-----
--- a/app-emulation/xen-tools/xen-tools-4.2.2-r6.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.2-r6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r5.ebuild,v 1.3 2014/01/27 08:58:09 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r6.ebuild,v 1.1 2014/02/07 02:14:50 idella4 Exp $

 EAPI=5

@ -252,6 +252,10 @@ src_prepare() {
 	sed -i -e "/\/var\/lock\/subsys/d" \
 		tools/Makefile || die

+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons || die
+
 	epatch_user
 }

@ -320,6 +324,8 @@ src_install() {
 	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
 	newinitd "${FILESDIR}"/xenstored.initd xenstored
 	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons

 	if use screen; then
 		cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
@ -338,7 +344,7 @@ src_install() {
 	fi

 	# xend expects these to exist
-	keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
+	keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen

 	# for xendomains
 	keepdir /etc/xen/auto
@ -357,6 +363,9 @@ pkg_postinst() {
 	elog "Official Xen Guide and the offical wiki page:"
 	elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml"
 	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem at boot."
+	elog "Add by use of rc-update on completion of the install"

 	if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
 		echo
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.145 2014/01/24 15:37:31 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.146 2014/02/07 08:21:21 idella4 Exp $
+
+*xen-4.3.1-r5 (07 Feb 2014)
+*xen-4.2.2-r4 (07 Feb 2014)
+
+  07 Feb 2014; Ian Delaney <idella4@gentoo.org>
+  +files/xen-4.3-CVE-2014-263-XSA-84-85.patch, +xen-4.2.2-r4.ebuild,
+  +xen-4.3.1-r5.ebuild, -xen-4.2.2-r3.ebuild, -xen-4.3.1-r4.ebuild:
+  revbumps; Sec patches XSA 84, 85 added wrt Sec. Bugs #500536, 500528, rm old

  24 Jan 2014; Yixun Lan <dlan@gentoo.org> -xen-4.2.2-r2.ebuild,
  -xen-4.3.0-r5.ebuild, -xen-4.3.0-r6.ebuild, -xen-4.3.1-r2.ebuild,
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@ -17,6 +17,7 @@ AUX xen-4.2-XSA-87.patch 616 SHA256 df9c1507d7bb0e5266a2fadd992d1e6ed0f7bf5be746
 AUX xen-4.2-efi.patch 2216 SHA256 0886961e2656fe7e140dd0ac0e6620d4c14ef0796b8f8889bda163e2a9f8db8b SHA512 ecaa4f1f1c3ca737931fe5343529708dfb7ec7040dbf2acf2b155e7c7f019ce3e2630ddb302213570a2647fe220dbf23eb6c28618d6b1be9161e25fcadd71cb4 WHIRLPOOL 63b56e22683b2755ae17e7871c1b535d750f655ff8c003979d039654f5ef3303457b5d4469f216c1744202d4d1f4561f7498c1d93171ab1110a93e3a2fa8db8d
 AUX xen-4.3-CVE-2013-4553-XSA-74.patch 1389 SHA256 b505cdba662b1b1cd91d5611fac998c6b4e89e366780c6b9864b6965075afb38 SHA512 fc0c1a1777a751096bc5990eee04e754deed2f18b8c8a5d65bf19c71ba9788599369f51e2d518f613e8cea8cb0d2d22ad60cec4d1b8805d7bd8e0818a54afb2b WHIRLPOOL e324f4922f61a22840ac0268fe2643a0fe496409d12a5797d7ba057ecd4982f8a9224e20615721c34680d45145d3933090ca1a11644cd2ca8f312995c3cba96f
 AUX xen-4.3-CVE-2013-6375-XSA-75.patch 1748 SHA256 039a74a4ccd1f17a5fd5341d160af87b14875dc1b2e46d8e4d337581031228d8 SHA512 195d147643b626ab9265d83ba2d7fbdef7b5716533682b723f32cbbbde6089fafb49e11c68ba6d323bb120fb0d34d85caf5ec5759048f60ba9096e479729c32b WHIRLPOOL eb52b7334ead997fea54810498be22bf47bcd2230a2ea2552b6125f3f78b5f9f9df49a7625c43ed700b3e56c6ea8979171e6be2e6d54d53c706517fc901d4702
+AUX xen-4.3-CVE-2014-263-XSA-84-85.patch 6086 SHA256 91725c156bae4209f1401b38a37c1a38941ef6e9370ac3425523555fde81d835 SHA512 c26f9b3ecdb2894a72033850a532e0d9b735ba8e73c3cfc379171ec17c8f82e07596e6bd9824242702645d77e37054c0668279ad55effe10461d70e0831c39e8 WHIRLPOOL 94d0bf7fdc5064b0463344e1a09c81d9a41ab5c565c88accc511c547ed4ab3c0c7ac76443eab02c4b0153552ec2dc139da10960c5a8944aa9b49cee03160a911
 AUX xen-4.3-XSA-87.patch 916 SHA256 a13ce270b177d33537d627b85471abaa01215cd458541f4c6524914d7c81eb38 SHA512 a1ad45f8311787ac0e1ed1a186f9c4e9aea924398ec7bbbc5b1e4b2d3b4617e113b385ff2aee854458270b0d73ed11defac5dfe603b1fd7b97f4c951def559b3 WHIRLPOOL b3a36c01d4e0bca3c5df42488f9bfc91e756af8c899d7414b81b7dac2bb60733555321b607ed229817ac546ebce65fddce0f8781909d7021d19b44a931fb85bf
 AUX xen-4.3-fix_dotconfig-gcc.patch 8854 SHA256 4e0d22acdb4ecc4a1d418ec91bc6ddb9ef1c283ee3ca1f67bac85d3116d76ccc SHA512 b4c969b0cf166862ea5c5cb0912d7dae8c5bf7befd6dd6bdf4e56df8a4daf85c0a36c94247053f74edc0f24b1c15a18e7ddae9d24ad28d54b726a1fbbab442be WHIRLPOOL de7b614ae486fd2cc591b405b475745b003c638c9be4c8153b61a368802af36d2a2974d1e022eb14fb58ad9260f9f82c438c84cb65c3499076c579f7e1c3e6ad
 AUX xen-CVE-2013-1442-XSA-62.patch 1350 SHA256 364577f317a714099c068eb1ab771643ada99b5067fdd1eb5149fa5db649b856 SHA512 4738a229a6f18d670da07b3acbaf6e227af5fb3e7b0b414dc98671be02208aefc66ebe07f7396d9158d0fa15993b9d418fd65747880c64694b1a06b8be961419 WHIRLPOOL 758aed345d0c5792a5d5a53200ef5094e662be507823010bb7dcfcccd07bc38b897d67295abf2d5d5b3f1b93efc9c684af78da6e3e3d77ecb65ef69fe2f5fa6d
@ -33,25 +34,15 @@ AUX xen-CVE-2013-6885-XSA-82.patch 1447 SHA256 db47b9dcb2124995754e7b43d7eedb5aa
 DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea
 DIST xen-4.3.1.tar.gz 16429423 SHA256 3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd SHA512 f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275 WHIRLPOOL 087390786cea9aee273a5d81988436303991aa5ea92faf111d3b619517368f8c8feef84f4f8c602cac723980a344eb90414887db4ca88a2ee14bc6b0253e36ca
 EBUILD xen-4.2.2-r1.ebuild 3756 SHA256 2ad7f2faed080ea2e4d991d7dd902826059e4a22b444e2f1b74b5bc1e54d50a2 SHA512 c6041bf852ffa425d93134e9c08334c71e96dc9cb795c8bc7a5eb485fa46d55f5de61ff9db55d484cbe0b641d9e850e4eb7c0eefd1b021ed21a050e1e78c4177 WHIRLPOOL 86e7873cc84b01064c1e7cd46003a43104257a3f7330a1433d85ce841b658a0a35e18f9284b8520a497b408d4b5ab6ce76cb1af67fb42019b86517f4b51f2d61
-EBUILD xen-4.2.2-r3.ebuild 4069 SHA256 d1f43bd402e14a42fa082804d9c7aa0644f77999b2ec11bae346cd066f652571 SHA512 44d4fd1df859e5ac8ab88b3312417e097ad16c72716d80c121ea98a2cfe257a5a96a42a31dbd23b06912528cb4ff438028e4c6031c7a200d8f45f11fc270c7a5 WHIRLPOOL 0f99b062996ce66959dfbda005bcadb58bda37fe7ce3f99363e2612c3afa26a8f2cc5c7d695ffd6868ff6b28e40e1a219c0576418b53b1db13e76ad78efe9785
+EBUILD xen-4.2.2-r4.ebuild 4150 SHA256 6846e0753c012c5d891532e8ae32d7d0a2405cca8840f6530fca080815702b13 SHA512 99208b6ce2b1e98e892fb289970cc4499a7b61fd66590f04aaab513f9cb5c37f7d2796f025630500df51c57c02a9b9e53b33d32a4d574db95e23d34a4ee1cfcb WHIRLPOOL 4bb4a3fae926cf69c3cbe0aae91303e932be25aa5fae7133f256d80ef444eb84f6001d9c76470cd3171bc213e111258fc17de1e207cb1d0177199b4fd381399c
 EBUILD xen-4.3.1-r1.ebuild 3901 SHA256 a94af83d0bb8ffcebd66223309818da75c60507ae2c9e803eac7488fd3970de9 SHA512 12ea99f6475d9c40c00b3aae81ba620a28fd65f72e93c93c5cd516e61966a6fc3d7a5b17919cb2704e08c9ff354b9d7fa610c461ff71ec99e11eed82ad7735f5 WHIRLPOOL 0c8ba609acb43bdc3df00b1298519b1bbabb941f032f43a6b386b5570da83767d929fbd1ef07e2b5a80b538544fcd2ec1cd0807f4f58840b6f7d7e25205fafc4
-EBUILD xen-4.3.1-r4.ebuild 4043 SHA256 3bfdc26ab446d9fcef07f19135b15ea251dcc6e07f86dcf21adb7c8df606fc0b SHA512 d4c7c35268f6f69eeef12445dd96d5fe67fe5a3d6e67a8199d6b52e2e84da02a6b245f7d2b4262e8e50d0f63d30040a26b685e1c1c7348dbfb5e4cb4f6774568 WHIRLPOOL b59b698829b6572cedef7cb4527e2e99afa3b61b680147f8534970b9a8045fd0371847d73a5fabeca43d0b60593a797d34d4f794e6794412855f2764137eda98
-MISC ChangeLog 26747 SHA256 bbc11bbaf9745c40c97d28bc7bd7cdb5d2a64a509efc2bdeffcf7aeb95328311 SHA512 0f20b173463cdde9a403bf7054b6ee8d51ff310055a36790d0c79988de7968e35710e8b4c1c68e090444ee73ab72b6550fe92b6775b80cfb93110d395132738e WHIRLPOOL 4fb138df07d5a25f10542b84ae65ef5391f7edf44fe4a89f54021a0df8a09052144876f20d67718ed8de52f6d0e68d9780fd20050f1e6ec059d5ca815c51d5e1
+EBUILD xen-4.3.1-r5.ebuild 4123 SHA256 02c497740315c3c0fdde279d61a64bdb4cd7eee92a1033f141750600e9051406 SHA512 ff02eed18fdf2cbf85ff2d63060996ab44b65e95e18e5d8f186719a5d9e440fdd5c05b891e727b86308da652e45197f058fc58f72fb4d27c0d7108be5b2d0760 WHIRLPOOL 8c521375d879b14d6110228c7c1175303a428a709eee9f836ca19cb06443c49d8e5f36db2e2d7f238e0ddf6468cffaf471db07bc7a66b96e96822c3e6bb1c2d3
+MISC ChangeLog 27072 SHA256 d45dae9167f0614bda67b0bf6637d7609139b74cecba99bf26dc008c4749228e SHA512 67af955fee4b176b4493bc4633925836ae087d15696be906cb0be5e986d049e9e94b6353570033432936fc9cd2afc63b5e95318366709439c8259c778df25056 WHIRLPOOL 77ac012b2374efefb26d48e28218f2c91a7144608072c7ee8cb3ff24b9052a1c28b88872b0a4620d019eb139e516b865ff3db08de0c56ad3635cead121c83957
 MISC metadata.xml 572 SHA256 0f510aa5a7261b30e5eff6961fa9dd95b19db63e0eea93cfad1d47460318ba07 SHA512 8bbca8d353aa3b556783bddd4822b97c0372b169edb89ff2907a00895e014ff9dba9e8efccf04f45de8a69ce63849505455e9735c224700d1ebf93aa3f097ac5 WHIRLPOOL 1f5517720776198868cf5a0165b9daf2ee48187bde4ad4d86533c65898da608bde779289df7ef83eaf076e0ce284607fc21f61fc3ca0baaf86873ca400491d0e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iQIcBAEBCAAGBQJS4ojIAAoJEJIMDbyqvv1VUWwQAK/zuDVB8BOdToSxOIPrD3uU
-w8aklyqsly+D7dOL0fvVhlIN85xBdYwbBMUZRWt/AvCW5ITrjfFF8UXZKAG8t3g5
-WFTUs37xcgiR68rzCyg+mQv1aw1m54HZ+1mRg3qf920rP0gpbRDKFpjKSIm5bQ4e
-16sfVgC2Qi//XOjOIFNQwxCAztkMV2Y6IRLfg+SQtaqj7ABiEUqRJ2mmPt+Iop1b
-CJdZOS9LadCHB0nk9b7E6hhoKQpfMRhHZdNvJPdnI1OF5n7ky00YS3S6gul44Tic
-VZ/E247+fKSbEIWF8A0aAYTh4fl7Gfab8B4scCLGhbEngn63Vj6YcwPBPqOy7dOe
-vcj2nhrLSQbnvtksX92uK4e2tKeyVJbvppNVThwF17NQNuyU9C3F4OXZf8MwjVGk
-bNEuR/2Tj7t+aNEZ0o8OvrELxfDkncs9QxIZUP9X8JHU6g+Y5a5iMsB4pYMHfa7Q
-WL+ZRncUs8DCVP4sCPzVMl7zRvjDrVSAW+HylOi8Q0BEBth1JVtSIRhke+/tK//M
-S8pzNHNt24u0WSFzxBILpXrFY5HJLRHjCqskOymHdCVQZubLmv01GolRJlv5PQlJ
-NrEX00jp4to2JX3b2u+JA5RuipdYOusJ6dEK6ukfqiBNRl/4DGh0aWTOKLWEwPx/
-VygipFpolbTjv8+5deAK
-=wzfF
+iEYEAREIAAYFAlL0lh8ACgkQso7CE7gHKw0zIACeIejC6rYwwJK+AAYku5eF0zbb
+qoAAnAkQXDJMZbg43Odjlce9/hjHW9za
+=PS18
 -----END PGP SIGNATURE-----
--- a/app-emulation/xen/files/xen-4.3-CVE-2014-263-XSA-84-85.patch
+++ b/app-emulation/xen/files/xen-4.3-CVE-2014-263-XSA-84-85.patch
@ -0,0 +1,188 @@
+From: Xen.org security team <security () xen org>
+Date: Thu, 06 Feb 2014 14:18:48 +0000
+
+flask: fix reading strings from guest memory
+
+Since the string size is being specified by the guest, we must range
+check it properly before doing allocations based on it. While for the
+two cases that are exposed only to trusted guests (via policy
+restriction) this just uses an arbitrary upper limit (PAGE_SIZE), for
+the FLASK_[GS]ETBOOL case (which any guest can use) the upper limit
+gets enforced based on the longest name across all boolean settings.
+
+This is XSA-84.
+
+Reported-by: Matthew Daley <mattd@bugfuzz.com>
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
+===================================================================
+From: Xen.org security team <security () xen org>
+Date: Thu, 06 Feb 2014 12:38:51 +0000
+
+From 593bc8c63d582ec0fc2b3a35336106cf9c3a8b34 Mon Sep 17 00:00:00 2001
+From: Matthew Daley <mattd@bugfuzz.com>
+Date: Sun, 12 Jan 2014 14:29:32 +1300
+Subject: [PATCH] xsm/flask: correct off-by-one in
+ flask_security_avc_cachestats cpu id check
+
+This is XSA-85
+
+Signed-off-by: Matthew Daley <mattd@bugfuzz.com>
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+Reviewed-by: Ian Campbell <ian.campbell@citrix.com>
+---
+ xen/xsm/flask/flask_op.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c
+index 4426ab9..22878f5 100644
+--- a/xen/xsm/flask/flask_op.c
+++ b/xen/xsm/flask/flask_op.c
+@@ -53,6 +53,7 @@ static DEFINE_SPINLOCK(sel_sem);
+ /* global data for booleans */
+ static int bool_num = 0;
+ static int *bool_pending_values = NULL;
+static size_t bool_maxstr;
+ static int flask_security_make_bools(void);
+ 
+ extern int ss_initialized;
+@@ -71,9 +72,15 @@ static int domain_has_security(struct do
+                         perms, NULL);
+ }
+ 
+-static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf, uint32_t size)
+static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf,
+                               size_t size, size_t max_size)
+ {
+-    char *tmp = xmalloc_bytes(size + 1);
+    char *tmp;
+
+    if ( size > max_size )
+        return -ENOENT;
+
+    tmp = xmalloc_array(char, size + 1);
+     if ( !tmp )
+         return -ENOMEM;
+ 
+@@ -99,7 +106,7 @@ static int flask_security_user(struct xe
+     if ( rv )
+         return rv;
+ 
+-    rv = flask_copyin_string(arg->u.user, &user, arg->size);
+    rv = flask_copyin_string(arg->u.user, &user, arg->size, PAGE_SIZE);
+     if ( rv )
+         return rv;
+ 
+@@ -210,7 +217,7 @@ static int flask_security_context(struct
+     if ( rv )
+         return rv;
+ 
+-    rv = flask_copyin_string(arg->context, &buf, arg->size);
+    rv = flask_copyin_string(arg->context, &buf, arg->size, PAGE_SIZE);
+     if ( rv )
+         return rv;
+ 
+@@ -303,7 +310,7 @@ static int flask_security_resolve_bool(s
+     if ( arg->bool_id != -1 )
+         return 0;
+ 
+-    rv = flask_copyin_string(arg->name, &name, arg->size);
+    rv = flask_copyin_string(arg->name, &name, arg->size, bool_maxstr);
+     if ( rv )
+         return rv;
+ 
+@@ -334,7 +341,7 @@ static int flask_security_set_bool(struc
+         int num;
+         int *values;
+ 
+-        rv = security_get_bools(&num, NULL, &values);
+        rv = security_get_bools(&num, NULL, &values, NULL);
+         if ( rv != 0 )
+             goto out;
+ 
+@@ -440,7 +447,7 @@ static int flask_security_make_bools(voi
+     
+     xfree(bool_pending_values);
+     
+-    ret = security_get_bools(&num, NULL, &values);
+    ret = security_get_bools(&num, NULL, &values, &bool_maxstr);
+     if ( ret != 0 )
+         goto out;
+ 
+@@ -457,7 +457,7 @@ static int flask_security_avc_cachestats(struct xen_flask_cache_stats *arg)
+ {
+     struct avc_cache_stats *st;
+ 
+-    if ( arg->cpu > nr_cpu_ids )
+    if ( arg->cpu >= nr_cpu_ids )
+         return -ENOENT;
+     if ( !cpu_online(arg->cpu) )
+         return -ENOENT;
+-- 
+1.8.5.2
+--- a/xen/xsm/flask/include/conditional.h
+++ b/xen/xsm/flask/include/conditional.h
+@@ -13,7 +13,9 @@
+ #ifndef _FLASK_CONDITIONAL_H_
+ #define _FLASK_CONDITIONAL_H_
+ 
+-int security_get_bools(int *len, char ***names, int **values);
+#include <xen/types.h>
+
+int security_get_bools(int *len, char ***names, int **values, size_t *maxstr);
+ 
+ int security_set_bools(int len, int *values);
+ 
+--- a/xen/xsm/flask/ss/services.c
+++ b/xen/xsm/flask/ss/services.c
+@@ -1850,7 +1850,7 @@ int security_find_bool(const char *name)
+     return rv;
+ }
+ 
+-int security_get_bools(int *len, char ***names, int **values)
+int security_get_bools(int *len, char ***names, int **values, size_t *maxstr)
+ {
+     int i, rc = -ENOMEM;
+ 
+@@ -1858,6 +1858,8 @@ int security_get_bools(int *len, char **
+     if ( names )
+         *names = NULL;
+     *values = NULL;
+    if ( maxstr )
+        *maxstr = 0;
+ 
+     *len = policydb.p_bools.nprim;
+     if ( !*len )
+@@ -1879,16 +1881,17 @@ int security_get_bools(int *len, char **
+ 
+     for ( i = 0; i < *len; i++ )
+     {
+-        size_t name_len;
+        size_t name_len = strlen(policydb.p_bool_val_to_name[i]);
+
+         (*values)[i] = policydb.bool_val_to_struct[i]->state;
+         if ( names ) {
+-            name_len = strlen(policydb.p_bool_val_to_name[i]) + 1;
+-            (*names)[i] = (char*)xmalloc_array(char, name_len);
+            (*names)[i] = xmalloc_array(char, name_len + 1);
+             if ( !(*names)[i] )
+                 goto err;
+-            strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len);
+-            (*names)[i][name_len - 1] = 0;
+            strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len + 1);
+         }
+        if ( maxstr && name_len > *maxstr )
+            *maxstr = name_len;
+     }
+     rc = 0;
+ out:
+@@ -2006,7 +2009,7 @@ static int security_preserve_bools(struc
+     struct cond_bool_datum *booldatum;
+     struct cond_node *cur;
+ 
+-    rc = security_get_bools(&nbools, &bnames, &bvalues);
+    rc = security_get_bools(&nbools, &bnames, &bvalues, NULL);
+     if ( rc )
+         goto out;
+     for ( i = 0; i < nbools; i++ )
+
--- a/app-emulation/xen/xen-4.2.2-r4.ebuild
+++ b/app-emulation/xen/xen-4.2.2-r4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.2-r3.ebuild,v 1.1 2014/01/24 15:25:38 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.2-r4.ebuild,v 1.1 2014/02/07 08:21:21 idella4 Exp $

 EAPI=5

@ -48,8 +48,9 @@ XSA_PATCHES=(
 	"${FILESDIR}"/${PN}-4.2-CVE-2013-4553-XSA-74.patch
 	"${FILESDIR}"/${PN}-CVE-2013-4554-XSA-76.patch
 	"${FILESDIR}"/${PN}-CVE-2013-6400-XSA-80.patch
-	"${FILESDIR}"/${PN}-4-XSA-83.patch						#bug #499054
-	"${FILESDIR}"/${PN}-4.2-XSA-87.patch					#bug #499124
+	"${FILESDIR}"/${PN}-4-XSA-83.patch					# bug #499054
+	"${FILESDIR}"/${PN}-4.2-CVE-2014-263-XSA-84-85.patch			# bug #500528 500536
+	"${FILESDIR}"/${PN}-4.2-XSA-87.patch					# bug #499124
 )

 pkg_setup() {
--- a/app-emulation/xen/xen-4.3.1-r5.ebuild
+++ b/app-emulation/xen/xen-4.3.1-r5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.1-r4.ebuild,v 1.1 2014/01/24 15:25:38 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.1-r5.ebuild,v 1.1 2014/02/07 08:21:21 idella4 Exp $

 EAPI=5

@ -49,8 +49,9 @@ XSA_PATCHES=(
 	"${FILESDIR}"/${PN}-4.3-CVE-2013-4553-XSA-74.patch
 	"${FILESDIR}"/${PN}-CVE-2013-4554-XSA-76.patch
 	"${FILESDIR}"/${PN}-CVE-2013-6400-XSA-80.patch
-	"${FILESDIR}"/${PN}-4-XSA-83.patch					#bug #499054
-	"${FILESDIR}"/${PN}-4.3-XSA-87.patch				#bug #499124
+	"${FILESDIR}"/${PN}-4-XSA-83.patch				# bug #499054
+	"${FILESDIR}"/${PN}-4.3-CVE-2014-263-XSA-84-85.patch		# bug #500528 500536
+	"${FILESDIR}"/${PN}-4.3-XSA-87.patch				# bug #499124
 )

 pkg_setup() {
--- a/app-misc/gnote/ChangeLog
+++ b/app-misc/gnote/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for app-misc/gnote
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.38 2013/12/24 15:36:21 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.39 2014/02/06 23:49:17 eva Exp $
+
+*gnote-3.10.2 (06 Feb 2014)
+
+  06 Feb 2014; Gilles Dartiguelongue <eva@gentoo.org> +gnote-3.10.2.ebuild:
+  Version bump.

 *gnote-3.10.1 (24 Dec 2013)

--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@ -3,15 +3,17 @@ Hash: SHA256

 AUX gnote-0.8.2-signal_idle-header.patch 592 SHA256 a11009cc34e60e517ff102de7f336eee5bea6294454d0ce92a381d27f9647fea SHA512 22433446f06bab04f0fabc4db4f901b3a876efe25bd33a461a22f23a5554e4cbe0b0594ac8dcb71b86f0dcbd2bc8d6f39cf0baaabf4fec5820e945d3ffa8fe28 WHIRLPOOL b67ffa31a56bd60dbfda7e3c59441449333868f577fa780eb187c0ca01d8c9f809b4889d83d5f53310ec42e8248520402dc39b1c8ba94006a28e2693ead69ee5
 DIST gnote-3.10.1.tar.xz 3038896 SHA256 8466343c43cb5fb223a7abfe43e6e963f64403f96a3c823f5a37474e83d5e1a0 SHA512 f9713a2cced90e00d4aadc3d57a4e946f0d16f41ff72823e36c65ad56a8c0e2d112fe3bc82c487974f089daff962d69b40a04fd5ff3600c569a265fa1fbe8203 WHIRLPOOL e7075b00145145285a41da539666c4db4349e1d5f96075aba49506306533623e559ac3fa348cf0cc9f54194749bd6b2949e2ca8641ac80849520a7233c6260b9
+DIST gnote-3.10.2.tar.xz 3042052 SHA256 0311fb5cf4311e8db50628b4773bfc891c8cb843d655911888d48b1ff94aa220 SHA512 00dac283ccfb93d0d33131b5acb15e8b7c1d096810b652e98142722aff696c3a2967ad79c3c3952721a3f012d8df1a54051e94b1bc0bf4e11e0f87ab7177f849 WHIRLPOOL dc99c3bf86e05edbafe39ae5c19b2fdad5d4f693daa479f877c0991df0d48b986270883d3af910821e55958d9bbd68e7ef24086485498a2a1b7f8a5762106b06
 DIST gnote-3.8.1.tar.xz 2632020 SHA256 35bb4c5c0fd94bb3e8e5b91dcfff7e376408dd95fb2468ce9e248f6738d036aa SHA512 e8e320246522aba5311d60c4f9d2b90032f873f2fd0397fa03568dca0c86b9738cf52765f8779206ecd9d9b4a7b732f4bb64daabfda5e35dee49ec08e52dc51e WHIRLPOOL 3af01a5ed06c6bd9769e332769ede49733209a01ed13526af606830bdcc13b5d3d024cb35266f90b2cf777a17ae73ac76744fe450d5588db30bd1e95a7cf6267
 EBUILD gnote-3.10.1.ebuild 1685 SHA256 cbc68e100a75fff92054c1942aa9d034e69cf140f9f263abf5e35bbd15e129b2 SHA512 6f1571074c1b913fb1bcd53ae81582b895840ce1d1635c6197048b2b86bd994bb21d674fb0ccc73f29ea0fe21afad34792e6c0e965a8495a52824b66e14a55ad WHIRLPOOL 68e3f49f403b071972a21d10dd5a4aeb670d77ba1cf8a06387fcf1dca0e2fac64ec7d38ac2e82d12e569ed3c214a7a28e67edf6347f9163c81fbf80aaa9086e1
+EBUILD gnote-3.10.2.ebuild 1683 SHA256 6b342e920a98abdc14973c432d5199f883a2b14761f6dd5e87adade1cfc84204 SHA512 60a6334a504e32fb9afcf0dca4aab4702106b8ec9545c1315cbec824fe551b6875f51d8d60f4abbabddd2691fad9a475b9f16be142a7eb57bb1b2e054fdd592a WHIRLPOOL 65009331dfcf4ec71ce6c414fef8defd3afedc18ecce905ec024e4185d2faa6a86d9a197b847fd4aba92a455f51228b60cbe06bb8edc0d302a7f170076721a2e
 EBUILD gnote-3.8.1.ebuild 1613 SHA256 ea329b00a189ab0125dccf1e84f6a281284cdbc69ef0ee7e1cdf62ff07f3ff6e SHA512 7f3fd28c8087cd5ad5be413045edb39f94972acb34dc59e36c9a944f5fe36a97120160b34e4b5a4c90b5b4bea026fc551915a17f4e35a67dea76e3115642351a WHIRLPOOL 94e65a2fb26fec4869c68a07f24eb3c8bc7ef2b54c4234e92ec4ece86186c2c1b1a6474d9c05e2aea480997541fdcbb91c66c98f1c25f06eb5b02718ad0490f8
-MISC ChangeLog 6162 SHA256 ee9b05bca758ea5e99f89210252fde595bf4f4a42e9ba3ba90ade20aa60e237a SHA512 7cc4cae58a2286d81b7811ef8a9da7df03dec48a31dd9cb0e7f20238e007c52e5cd9a8213c0eff7d7a18c2f6dca48bf089095de1f0a88d36b8c049b6fd0caeed WHIRLPOOL fa3f897153ccfdc28bcc339d8b66458c74cfd049557008cb2868f5d46ef4e001fa0a221019ee8541d9a8777289aa3e00f503199f9ddda4167aef4222879fbbe2
+MISC ChangeLog 6282 SHA256 1b91ebd51ddc1e9f8dad791261c39c1c76b4d6608e84420c691223ca27520625 SHA512 56092c7d312286fdb8e0cb02db511fea5358e8126ac288eaabaae0a904535e41eb5d7faddeb9b07f83249e93e08f5176c7aadd9e621025d3b75976d6cdf237d7 WHIRLPOOL 4d49481a397ca5bef154f77296b79ea7c2b6189f3171b27c6c4146c7c11c695a4f5a08cf2ce9f7a9f658bac20443c363153ed09a3085a74675a16bc6d46f508f
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iEYEAREIAAYFAlK5qfYACgkQCaWpQKGI+9TU9QCfcnA2AyJZ6OifhkgzlreevXp9
-IqYAn323yhAeiU1V9wUjUWCFz4Zt51qs
-=j5a0
+iEYEAREIAAYFAlL0H34ACgkQ1fmVwcYIWAb2swCgiOvJVMg8wDSgbXzN987nSt4q
+3rkAn1cxTtgcb2XaFpYsS+TcC+gzsUBt
+=iQ8n
 -----END PGP SIGNATURE-----
--- a/app-misc/gnote/gnote-3.10.2.ebuild
+++ b/app-misc/gnote/gnote-3.10.2.ebuild
@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-3.10.2.ebuild,v 1.1 2014/02/06 23:49:17 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 readme.gentoo
+
+DESCRIPTION="Desktop note-taking application"
+HOMEPAGE="http://live.gnome.org/Gnote"
+
+LICENSE="GPL-3+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +X"
+
+# Automagic glib-2.32 dep
+COMMON_DEPEND="
+	>=app-crypt/libsecret-0.8
+	>=app-text/gtkspell-3.0:3
+	>=dev-cpp/glibmm-2.32:2
+	>=dev-cpp/gtkmm-3.6:3.0
+	>=dev-libs/boost-1.34
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2:2
+	dev-libs/libxslt
+	>=sys-apps/util-linux-2.16:=
+	>=x11-libs/gtk+-3.6:3
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+DEPEND="${DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not alter CFLAGS
+	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
+	gnome2_src_prepare
+
+	if has_version net-fs/wdfs; then
+		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
+		synchronize notes."
+	else
+		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
+		If you want to use that functionality just emerge net-fs/wdfs.
+		Gnote will automatically detect that you did and let you use it."
+	fi
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_with X x11-support) \
+		ITSTOOL=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
--- a/app-portage/porticron/ChangeLog
+++ b/app-portage/porticron/ChangeLog
@ -1,6 +1,13 @@
 # ChangeLog for app-portage/porticron
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/porticron/ChangeLog,v 1.33 2014/01/11 11:21:47 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/porticron/ChangeLog,v 1.34 2014/02/06 08:30:46 xmw Exp $
+
+*porticron-0.7_p20140126 (06 Feb 2014)
+
+  06 Feb 2014; Michael Weber <xmw@gentoo.org>
+  +files/porticron-0.7_p20140126-portage-2.2.8.patch,
+  +porticron-0.7_p20140126.ebuild:
+  Add portage 2.2.8 patch by pinkybyte

 *porticron-0.7_p20131113 (11 Jan 2014)

--- a/app-portage/porticron/Manifest
+++ b/app-portage/porticron/Manifest
@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256

+AUX porticron-0.7_p20140126-portage-2.2.8.patch 760 SHA256 3d1c38df727ecf5d85e8ede02e07e22f53fe77d58350eb7a7d1e8e825a266eb6 SHA512 4822999104a803f1d053ecde0b3332f13c81e1cb83c57fc142cac65895d3ffffa1c40e6c3ee35e791da4b650bf1e526de0e296944e854f5f8d477cefc6ae74a9 WHIRLPOOL ed1dec7f763a97dcd8fd074c70be8942a4bf52bb891bf2bcd696fb9b632e1272947604819b52b05cd9d9cb650b54ccaf8d89638e8c380cd9b68a322a075061f7
 DIST porticron-0.6.tar.gz 4628 SHA256 f772a346197f4ca06258044034a96851f63e28e0977354570b578334c2d4d964 SHA512 3f19ec723d5f923e45987c6b84362db2031655beda5d06accd96085705a6d488f1bf380d769756520979d924768da9eca10a5e0167073d4c121de9f804ee8551 WHIRLPOOL 696163b6852ebd7f418075c2ecf99b3ff3dbf6919feb10d6d7dc7a544178dab0e72183d30a44cb3605cfbfc214730ebc1a689f03f356a0e02b636ed284390ebb
 DIST porticron-0.7_p20131113.tar.gz 4453 SHA256 46b61958a182d9cdd73dbea76a017855eebc4780dc75692503c0d1e7ff0ea482 SHA512 c14c5ff18eff74d7c225883dc0e1cea16666f0dcab07f9b249aed0db2874179eacc824c0f35dc2cfd97dc0c2db5f2bf6d13c3e76a2cd1b87de46fb073622f3d5 WHIRLPOOL f932a2319be582b564412badb456daf0fd86e3991ffc63fa25718337669b860097ac6d446a220f4e56e3a97cb8660a9f2bd25eeb1c54a2921fb0c7d6991bad5b
+DIST porticron-0.7_p20140126.tar.gz 4453 SHA256 46b61958a182d9cdd73dbea76a017855eebc4780dc75692503c0d1e7ff0ea482 SHA512 c14c5ff18eff74d7c225883dc0e1cea16666f0dcab07f9b249aed0db2874179eacc824c0f35dc2cfd97dc0c2db5f2bf6d13c3e76a2cd1b87de46fb073622f3d5 WHIRLPOOL f932a2319be582b564412badb456daf0fd86e3991ffc63fa25718337669b860097ac6d446a220f4e56e3a97cb8660a9f2bd25eeb1c54a2921fb0c7d6991bad5b
 EBUILD porticron-0.6.ebuild 801 SHA256 5c8024ab2f21425e19ddf7987b8e60872d5f684df639f2401b491b76dda3ede4 SHA512 a6a5c9a12c19a8cc5efb820c8507c96961f7e647b4c50b761ad1cf1ba2d0c29965fb7c0581edc1b4ee5cbf9fc4465a14a1152d01786ef44c9d0c04f2bc47da02 WHIRLPOOL 5835479072da33cd5871a1105fe5d7f947b5eb35850839062abc2c4ab0ca37082542cb58ea00ef2f35994326f9deef1c7604a02b2d63c70bbf7ed8b224db06bb
 EBUILD porticron-0.7_p20131113.ebuild 654 SHA256 0f86b87acdf2e0a0bfaf1047d2ceff1c545ad7c1dda69cccb1abdd6d9cd2c64d SHA512 d9c091346a67b51fe6b64eaa3f25454ef486d9b7172aad284e31e7841426e026ab0a1dde80a08e34a0e31af915e159ef82384b0beb7a11a52f0b42b8018a7814 WHIRLPOOL 0fa9c40adf6c69673ac15ac3da9c0025582bb83cd4b409aa3f03e78eee3fdb532d01a993e2abae6b86d3bd6dd719fea8bcd8f262a5ee14aa57fe44cef400fa5c
-MISC ChangeLog 4319 SHA256 a223b8121f69dcef14d202fd0e14199ad1adeebdf2688102dc27c02046ff81bf SHA512 efefea127db71c92871f0c29680d933b6a423d2769f54e18b6cf87b77f148a83020c5f8a2c72f460e521261476bf5eb70e2700e3aec617013c7327178931c0c8 WHIRLPOOL 251bcd8099637c28e255c120ac484d43ad5c3900135d18d1d2c53803a2c8a14abb110f503ff3e185903698edf7ac2ee2039a0d7287cf315e1374844aa567934a
+EBUILD porticron-0.7_p20140126.ebuild 727 SHA256 32b5e4e9b67529cb2b1ad5ba0528363a7ea5b8bbf7012a1113d914aee18aceb1 SHA512 52d08361b1b46a505c141eac19dd8a611cbeb067bcc314a0eee104d7573e18c6161bd119a97a81e8d39acba473dc7b0fdfaad41c2a2650b174f53cf00d41671b WHIRLPOOL c388f47e5bc76e055e7535b4a7407e7de5802ce6efc7fbe4f62df19228d889bc456f44d2cf24f3ae7cd847c4a75afa1e5a8e33815f055e3a16055b1bb39955cb
+MISC ChangeLog 4534 SHA256 7688689e7ce4f47c23051ca13ccb302bfaee816783c4f7bfd53207af304a7038 SHA512 00c07bc87d9d7f7a8950e662140375d1b695034a09210ba8a67b45737541ca41441aad9047609a31abd19a6bae1a2bddac23bccf34d278f43902c33d34310475 WHIRLPOOL 3ab030c4324d7d5f5d23527b908aaa9cf90a51b19c2dfb36f34d0e8de5142cb7b8b92b3ad76f6b00277fd4c8de96a51adb4d894f4ae628258e8fba267d536dff
 MISC metadata.xml 229 SHA256 00623a2bf9805231bab8d5b718d8c7a040b795495b9c8b82810e1aff3df4e046 SHA512 3accf69d4f7a0b09c18ebfd8bd799b29a7e762e76808def6ec7cdd8bbc87951c9c8475333dad0e351af0eb1f4a6a015628f42a585031a92acf0b5b222588c9a7 WHIRLPOOL 267b6b9f2c50b02c4d113239c919953e7ba1fa615fc7428ee0ba768aff6efd91f719387bb7722905212b86440de27c997e1358ed2d93aabaed288a5b0722d05d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iF4EAREIAAYFAlLRKVAACgkQknrdDGLu8JCXUAD/SGF+BNcPP4PlRzxSOT0VQnQW
-x29v/DOCcKEXm3AbxaYA/0he5ccUnuLM80PqSSwCZoADE4PgZQotYilYKS4eH62W
-=0wd0
+iF4EAREIAAYFAlLzSD0ACgkQknrdDGLu8JAyYQEAhbOPAgyPlCRafcXZKpuAGFE1
+0emCKrrIVSqBK6VLey8BAIPBXI9+CmQ5rlOEGgPgOvGQ1qDDZMPySHduiggQfY/G
+=Uofv
 -----END PGP SIGNATURE-----
--- a/app-portage/porticron/files/porticron-0.7_p20140126-portage-2.2.8.patch
+++ b/app-portage/porticron/files/porticron-0.7_p20140126-portage-2.2.8.patch
@ -0,0 +1,26 @@
+From 7a7002d5af62d0a4791a386cdc3560330f27f1c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rainer=20M=C3=BCller?= <raimue@codingfarm.de>
+Date: Sun, 26 Jan 2014 23:23:03 +0100
+Subject: [PATCH] Avoid the deprecated `portageq portdir'
+
+This implements the fix proposed in hollow/porticron#6.
+---
+ bin/porticron | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/porticron b/bin/porticron
+index d168b27..86a1f70 100755
+--- a/bin/porticron
+++ b/bin/porticron
+@@ -117,7 +117,7 @@ FQDN=$(hostname --fqdn)
+ HOST=$(hostname -s)
+ IP=$(dig +short ${FQDN} | tr '\n' ' ')
+ DATE=$(date -R)
+-PORTDIR=$(portageq portdir)
+PORTDIR=$(portageq get_repo_path $(portageq envvar EROOT) gentoo)
+ 
+ # replace variables
+ for var in FQDN HOST IP DATE; do
+-- 
+1.8.5.1
+
--- a/app-portage/porticron/porticron-0.7_p20140126.ebuild
+++ b/app-portage/porticron/porticron-0.7_p20140126.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/porticron/porticron-0.7_p20140126.ebuild,v 1.1 2014/02/06 08:30:46 xmw Exp $
+
+EAPI="5"
+
+inherit eutils vcs-snapshot
+
+DESCRIPTION="cron script to sync portage and send update mails to root"
+HOMEPAGE="http://github.com/hollow/porticron"
+SRC_URI="https://github.com/hollow/${PN}/tarball/df727fe -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="net-dns/bind-tools"
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-portage-2.2.8.patch
+}
+
+src_install() {
+	dosbin bin/porticron
+	insinto /etc
+	doins etc/porticron.conf
+}
--- a/app-shells/mksh/ChangeLog
+++ b/app-shells/mksh/ChangeLog
@ -1,6 +1,14 @@
 # ChangeLog for app-shells/mksh
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/ChangeLog,v 1.47 2013/11/21 00:21:11 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/ChangeLog,v 1.48 2014/02/06 09:37:57 polynomial-c Exp $
+
+*mksh-49 (06 Feb 2014)
+
+  06 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> -mksh-40f.ebuild,
+  -mksh-41.ebuild, -mksh-41b.ebuild, -mksh-41c.ebuild, -mksh-42.ebuild,
+  -mksh-43.ebuild, -mksh-44.ebuild, -mksh-45.ebuild, -mksh-46.ebuild,
+  -mksh-47.ebuild, -mksh-48.ebuild, +mksh-49.ebuild:
+  Version bump. Removed old versions.

 *mksh-48b (21 Nov 2013)

--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@ -1,29 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mksh-40f-etc-configurable.patch 993 SHA256 9908537998a8d41b011449c69b451d2cce7929f42fe755728c38a43728f00ab6 SHA512 d382fcdae6b5ad6940c0fff01a114209f91f5420f6f28771aec63f92bcea0b1ef274cd0919b5258f605dd84698c949db22e887f27cc7e42f85b6799c0ff63125 WHIRLPOOL 2012280d92af631cd1cecc78568a4b1895bce221b10b346228a9edffb43fc3507a40d75e37b7aa3343afe305473ce0b623c261cbffc3b251538e07ea43074f39
-DIST mksh-R40f.cpio.gz 331196 SHA256 d8657102f3e9f0c432388f1c820821ebe0eee442739604293488e6266c298762 SHA512 a396ef02aecd713d44597da286bac2bdfe12f12f9712ebc21825283f3900bfca5b79125ca7e191c9970bde761e7873fc68ad3c822238e70697d65eb373560c75 WHIRLPOOL 4627639d67155cdfe09d0bff1fc16abf4111654a8538378ed4465fd71013e9562869c967bdcecf7c300712363775ef6cd67ae51c1cb52424c6a1ae36f2db68f8
-DIST mksh-R41.tgz 341489 SHA256 32522287a9d4daad176dc97d420000a07c0947fdbc853004fc84f02dbdd87c91 SHA512 b28c52face5227964fee8dd60f088e4c0866c3572240a0d9529c31f49892f7589fb68db4ed58528b51e4dd7cfc1f94713755eb4cd0fc6bd257c39954f9a463f3 WHIRLPOOL b8a6d90d42311384a9384f8948e6307941994dbd8d77647c6f203ab77089624474e6809f71df4da2e6735a4e2119b6dceedd6d8f5a56eeddce10c575da7e2d29
-DIST mksh-R41b.tgz 343553 SHA256 265c25ac5c06da6d346b19588b12a7d0fa4a3ec25b73eaa472924a96eaa68249 SHA512 102c25957edc575b77f27df2fd122e293ff7ae03117c21c5fbea019747a9884fd98db165cb21a88731ddeba940fb6bfb2dac1cc823b619f4ceb6b492ec28a048 WHIRLPOOL 7e4d99b0b8dbdc4c00694e99d1b1c3a114d3f85c64d7dcf409d2a176a2099be59030fc505226f8d53cf790e0808de22a5d24a856a00e74d9ce0465239a0fa91b
-DIST mksh-R41c.tgz 343671 SHA256 825fc0cdf000d9862d5a5cd0b3b61a5d1f5ac2ef33edbe4d16c4c86e6fe4d799 SHA512 b4d3854daab49bb83991700159ab9a257b98c3a01bb9629adc56915cb78c360299fdd2dbadb5d7d679f13402f348ac369ddbc007d8ecdd5a94579c1815e4ba27 WHIRLPOOL 7785ae239517217e9df1f488213c9566423d6ff83687a6828de46dad467944286adeea2aeb3fc8fc568aa9f2b34eb356cff10358c0b7dab67fec83f0815d621f
-DIST mksh-R42.tgz 345721 SHA256 8a45ca6a9fa228b887ca9fd7f28657f0d568a298f056700cad088064f8ead80d SHA512 5b2c950a5bf371436da8c441993ef8d14df2d90d335f08e202dc7732c9c7ba93da96cb1c841ebb37f5886b70c8468f09bbf19f65d3365762d737d48699cc3390 WHIRLPOOL 9400a3290db44eea8f404fc8feef1acda2ac78904931775c2e3b4768da5df26807d6816df59bc69a767d2caf1a37a9ffa7f2181f05f562a379b712cfadebb3d0
-DIST mksh-R43.tgz 346192 SHA256 65e54a0cd4189b80cf24fdf1b1b959a707522451025cc22f7d3ba451566ffc81 SHA512 e480ba4d09d8165758e16397527cfafaeb1aa7018b01fc034bf8b76907d787b5f9975f4bd190df47314bc30d24d4db1d537d5a1ccd11cae7e0412c5e2a723f35 WHIRLPOOL 54731e9b8a8bcbac7ac74d5b7bd007a2dd87dc2b22f501712233bda1df105fc833931e9d7e52b98ab39b09627c2cad6b4166f503bf7fe961c39dd298b1039ae7
 DIST mksh-R44.tgz 346239 SHA256 016f2196f75211308f5bf184ead97cf0718039717ad3f499994188bc941f8775 SHA512 01d3767d5ed63dd6136e8a2cdcb1ec59672f20d255468c41c68ddf097675e104928fc4d0717a57d4908630193c9269b20a6b81eb4a10bdf1d0ffb043e51e21ea WHIRLPOOL fdb112e937533fd3e7dd49e8b0a9db55925e486973fa07b3722d002f8a4d0d11e98e82f5428e1b608e406858e2511d6d960d79ff01965ffa2501a159280ef653
-DIST mksh-R45.tgz 346164 SHA256 90137336a836ad180c6e4f84065b993414aacb2e954afeac506cefb51d432cb8 SHA512 bb3750426ec650adcfde2629f8c39965bffde7bb67083aad038d6bb2c29c1684438c94ce5498e7ce52f2df9817b434af076077ff925c8e789869059e65999e22 WHIRLPOOL 7ebed173a9a8ce8d8f53a504f44c7dc399326bcdba47ee1ad60565633d64c95ad89b0523d7860ef0194d6c7a610acff8087eb0805373b78981607adf10ed5300
-DIST mksh-R46.tgz 349524 SHA256 dbe6bf60b111a962ed33eb16dffa4d726d62dc0d60ad5429f0d575fc430af05a SHA512 672f6e452715ed4f2732e911bdc0283920ba59b56ccb18ca0b9726ad47cc180e23798f6bb463650fb03caada87d8b9dff93dc35314edfe1d8c5cccb6764c12d8 WHIRLPOOL 96c37c3d4bf5789f32b88dde2271a8ddd1f5da5ee0e9fdd51e0c3380b6a94b1cd6e5a98f00fc664b5f06b756f3e9dae504f49d42b68e6f0d59f8fe9ceba95560
-DIST mksh-R47.tgz 351675 SHA256 b7159f09c551d97357b5b8a76829bfd6c668cc93f15faa92d510ad6dc0dab939 SHA512 6063983c8dba85d90a1d7d8350082c7fd4319e48c7b29f89bc7819dc95d0d859e36971afb06e1d68fa1f2d0f6eba18b7696cb1c93ee230eef81b4e1a9c6d6175 WHIRLPOOL 018d18123cbd3f8155bc78606daca9957e6e3707e7f8b7d18569c26fcab180828e34dca50744b26127caf82d410541a424a0aaf77e05c3a1ed82ffbaba9de3a5
-DIST mksh-R48.tgz 362932 SHA256 56f6578073a669e33ced5364e0939ed6ccdb32db054489d4070afbefa36d2c73 SHA512 eea8e7a0dce54692feef165ef6da120e9451e64d6185e7b09bb2f81b5165f8a3dfc090ec748de3a91b7ddbed2562d15664f3dfd9b58bdb8a185ffeca7781d003 WHIRLPOOL b4a146d85e533f41bee18d23a88620e44c83cac5744a635d63a0df7ac722277a59b98c0f5f2b9fbc68b8567025c330048607d8fb3105d64248e94f022be01947
 DIST mksh-R48b.tgz 362969 SHA256 e67686187ba6dfbf99b7f6b5f841dfb5cd9f980504f8b631d7d3bfd98d345792 SHA512 7096c4cd56f623a378cf3fb22b9bb8f21445de68f4207f493f21c17fd8330e8ff6d715233b9d7f5a6508cc629cbb06d66943ad32a47b36352c5565280a6b792b WHIRLPOOL b92cb91856e82969638387f8caef0a4795485b791b1d2767e50f17f6a2bb2cb130d5e34ecb0b8ff2cc3509a3f4371fe7f50778ef1a9a97cd302d42e79cd108c2
-EBUILD mksh-40f.ebuild 959 SHA256 88fc1a1a62fe3729ec3934f61a713095b7aafda29bceda124562986a22c6deea SHA512 9cc3b7ee637d98fa902d83f50f4416877ddd80994571bc538bd68adb2a5721a01ae67de2ac12dad371432011e39c1b93eb282fb1b6a9a2b8e5a526ea1dec94b8 WHIRLPOOL 0a23e99b86c0f235c343ddfc583923e615ea0d2a1d41e366079a38cf79bb9561e5cf37f699d12d51b802a0b0b5a6c5af26117841e6acf3f2142010a5331fd03f
-EBUILD mksh-41.ebuild 887 SHA256 6de9a092313f3f9d949daffcbaed4455c64cbe7da6c8de78d15014cca64e724b SHA512 5571fb5072ea9c28eaf5036a964e27f63f0b6eac05475c34572aa26fb624a57c6263fe6a013cac83a16bedc83189a92581f933a0591e6135d1a208676fa2451a WHIRLPOOL ad7fc315f5c7cca488015d3f8fb4432f81989ff234ee986b391e5a607bd920a2b20ed3e231c7154e4fc6d199975757d1e236b8360b5bdfee53d260256c29d602
-EBUILD mksh-41b.ebuild 888 SHA256 cf3939f5b86715ce073515572f3d33bbb92b4395d8f8218726fb114304d49186 SHA512 c029734c409acca0f8c7a1f749c223f61808e848cc800867a20441311913ee5f8cab05828b076ac15d569edae62d826423a538e8dd1ed1961e3b1e80deb4f492 WHIRLPOOL 3cae3587e453855fafbce5727f45378774581f9904812167e40a6b4412049d35fce56c78a99a96195f6f5357accfb15d63d2f18ac04f3c9e7585e4c8935e7d23
-EBUILD mksh-41c.ebuild 888 SHA256 087b92708eea7d79db82d8d56433ad1ddd570a34c121da0bd78344c4d14bef79 SHA512 d0c092f9b5d2145ff2594fba1757779d0f3b11c866c511f03698ae2224c585723aec5af67a30bee397b7d9970c363329018a6b924e29ca31a63408a11f11c2d6 WHIRLPOOL 2d5a8eb68b01e21140208493ffc714055535eb1d11622c2cef1203b7a0932f8733add90f7ffaf04e4346b55a22ad3d9a9755378a98e2e0850bf98a100c6854f4
-EBUILD mksh-42.ebuild 887 SHA256 cba9cbf49faacf2bb646679b08bd6069196db80933acb9526696ad67b48a1d5b SHA512 8c412634c72d854d79892f03d8e2d9a902bda22dc06893c6e52d54a2b8dc1afbba708342b3816161e4c1c9389f22374875f5386e2e71f191855061cfc4573dd3 WHIRLPOOL 7cd7ebf4119331b7d6164e01dbee96bf498521fa106e76cf65c5506e6efa544827fbea7fe98f8c5f668ec32923ced881a547164457e26ffeb364a6bbe83e9f43
-EBUILD mksh-43.ebuild 887 SHA256 1b108506acf831ba0b5220539558f7de02d81b2cac8f66105212ea60357a75c4 SHA512 bdabf18604cd088a1e16027d967c75612ebcd801872760f0221c2f28a449e074b5c17736d77dae1e496a2034f77b9986f4fd491c32d132eca509333ad5f3429c WHIRLPOOL 7f34d0881a63663411b8a2a7980fa28db47222e1e533d543198843d8a9a3710614a3c66ece5feaa73ea73eb79dcc8eef4a2893dad41605604b8b89e19d0f9801
+DIST mksh-R49.tgz 371550 SHA256 4dd6c37fe2b8603be3d59744d7866d72913fca49d8a68d3254d064b12eb3da49 SHA512 5299caeccc6151837e970b7f71ce30c10ceccb65104e347933194fa0ab9af6f7f26688e7b827b059fbcbce09d3fc6fea78a465a421a6e5088c2ca415288541af WHIRLPOOL 93c817211c27564766403121a2e8222eeaef107536e6ab9becd2ac5183790f9261408ff22a6ba91c923082e9a44f7b8fc6f51c12bc34b717b3ba67f053fbe799
 EBUILD mksh-44-r1.ebuild 1043 SHA256 6b1c8210fdc24fc5813893142a09511c06149e0515f0b08234b7709eb3e33510 SHA512 10d24d185daad383d45bd72f7ef383809c745f6f153873eb19b0c7d297d39144d7a1a68505ffb8968e230ad2d26caced83bd3fbce9a890e6e8ef54197de4df26 WHIRLPOOL 6de7785d60ee6fed4e7f874f1b4532a64c7af45416c4dcfccfa78265016afee0b742494180e13758dcbc5a8145e754c679d8c8d2c2f21ebce71666fdd03d0fed
-EBUILD mksh-44.ebuild 887 SHA256 4601c0678301d1fe5a864f9e886c7d5850369e3b92e729e13f7e445b627418aa SHA512 213dc74afd181c75804b732affcaacc32bb9ed2e9bb9cce12218a6dfe76d3f12367a48998c1778d08e49029a3d21845e91177bd6d997d972746eb1ae47c92232 WHIRLPOOL e7a9bb669aebb9a4f5b72214ebed966aa93341a957a257c753130b0f28efe8554efbbd3cfaa40e8338770173503c719ffdcdf59e7bb7359c41f0146e9b95f79a
-EBUILD mksh-45.ebuild 1003 SHA256 af6f36957628a5bf12001b22e5ec02ca719be624afb4cdb59e3cbd83cab57303 SHA512 32b564536b3af2040912e8d004495503e18ef75ac524191b33b418e667441a1b09824a33e40b690bd403d309d09bf356760622e6460a8f6bd00210971f096f7b WHIRLPOOL b998871f633c56d21cca05e8f30332ffb589b56592912435e1cefd47df55a2d81bd3a4fe823244f36931fe92ba1431d53eda01a5fbf127d947334b2eab21b00d
-EBUILD mksh-46.ebuild 1003 SHA256 25764743c5f2fb527a00a47085c6b45b9ce07efac1a4536cc4f149d9a9644ba2 SHA512 0348a516f0f8e3a8531988e6e47a882ba93af0812cacf47b246446383de9a1354c2fb9c3e298c4b8d9fecb2fb346f1e6fa47aa99702ad4fac1992f2f99d462ae WHIRLPOOL 3a349e9845e2f89cf25042492b7cefcd9535af869d74e18465218cad09c792c2527e3938bf0fb3d8e24ae1ecbc37545c70b8c0d3ca507456d347c325d0a51f3b
-EBUILD mksh-47.ebuild 1003 SHA256 cac752945606b918b8f924662d1abd0ce2f5cb824f97965a994a7bcc7dadee77 SHA512 dc4086e3dfb552d3b1a2df106235de5859bb5bad7c749822cf4e429756ec34d9091713c5d541e8043ffe5bbda456cf1aee3ad1d1bf02b4ff187aae02d672985b WHIRLPOOL 2072275735463c401573142ef8f5f2cc9fcb53f702af015929485e3e1b458a3b0d0099a8450ae85e2fa6555774b4378a4bbf3f0e92e699de481bf2dc2150cd24
-EBUILD mksh-48.ebuild 1003 SHA256 acdb851282d5da530e6a59fa1bb6d9ebcc0ed1f6375b835ead28211a7227d42a SHA512 687f642213a371f8070c703a4cd7627442b16301379f91ed82d16630e39171e5447c736d3f510f7328b4a61394c3cd22d54fc3c11c59a3b3f566a2c613067de4 WHIRLPOOL fe1d1f9e2424030dcc7b203e757ea2090fe3a8a03f01044d23eef37f972b2edce6f8994ad2023a1c152cca3d7d5cedf49df7a2b4f26a038e286e96427179b482
 EBUILD mksh-48b.ebuild 1004 SHA256 9f7cd8e0165183a1222031605e0840fd7ed796b2bc91b2a158d0596e50302c20 SHA512 ce3ad7727632986cf0952e4c6e4c034ff8c87122e4177b7b7f72b60a5974e41581b4d0395acba9b55eadee3fe65e81896a654662ec1cd55dad3e9c4f191a1d76 WHIRLPOOL c93d83eb16613a8a05962a269df2fa0fe7d50cef38426d5f09426500248b021b897efcc8716b89d812dc8c67ffaeee0fa2e12cba0d15ea1d34288a918c4230e2
+EBUILD mksh-49.ebuild 1013 SHA256 76f01354878b3feab6e28921c3e4de10c590113f55fe5c1c6899587b1a21b672 SHA512 575f76622a3f8a281723151d5f735602441083a61d7db6061fb808339f67841e705794255a3e26fde5bd004753ae128a0d4457533281e630802e7d5f689ed099 WHIRLPOOL 28ec5a47d2669d37a5f1c21a62841ff19b877cecdbcbf7a6e0c6ce27d8b71c6a714be1b8fc6cd1ae04cfbd0b85477a13c64645a97dc3af396c51eacfb6e02ef0
 EBUILD mksh-9999.ebuild 1170 SHA256 7f921a13eb77f931d37acbfc92164040c1ed207336ff825b3ad5c7c255957bd2 SHA512 2305077bd12456aa7a37c689c4a2bcd3c3d874ff2ae75ae8e956973fc094bbe474e6f8ee9d9532156fbbdf1a9b909c1228ee105829fad9771dcd532a52cef2c6 WHIRLPOOL 4dfb39eff331686284b26888defe35f27945f8967761a348e1c40af1b9de6cf09053be9c6793af79f9e578888dbe80f5695e60d483fecd3728cbb974b51aac24
-MISC ChangeLog 5766 SHA256 ae19a91334bafa25a0fc5f6101d46b2830c5281e22e74d7ef616e9d0c243f96f SHA512 a5797f32eb6f6b17bb8f7a4487033c83bd6b0ebaf82f55dd9da8ae5ab5c253e331538ad26debd1e7516a5a2846e039eb9ef08a9a1ad2a4c31bb5862ec856f382 WHIRLPOOL 49a2735b3c993639059b7ce790d9dfcfbe21bee1894651a6e795294c5c7ae27e50b45ef73de048bfd547806e48fb42160825b92caa46965ec1210bf38946abc3
+MISC ChangeLog 6101 SHA256 ed2d7c64d754942d1e66f6d808238dc339f9e89b3110254326e5a55cc2fe1816 SHA512 a106a84bc691f044fd027f2ea5bbc09e87380ccb45b74cb89513d650efb78fae54a926e2a6d7899134ae74d56139f3af0419fcbab725e7165a17fcc8a81bc2b4 WHIRLPOOL c866abb7f8301d663ffebd22c3559e88087a95c513c79f9c69376892f40460b1166d170342d3fe41cb5e9ee860c30a9e0f59beef9749a3d0ad20bf433e014a47
 MISC metadata.xml 196 SHA256 e8ef5daeda229c876fcf81068b64452d16ca1674618ee72fe8c294f6ead29445 SHA512 ba2a04029fc9fd51726e618311fc0d5ca87333acb0c067a353000a5e0cd31a9f4095adc14faae4d1f14409303051f381c66c3a4cd6ac6699a9476193ac7030f4 WHIRLPOOL 002f8951fc98cfd1917aeef67a1ef0fbc7b662f4cce3c4d9735f198ec8fcaa7e258524a80dbdea1eb485db6faae224dfb317af827582c0777faeba8cd2950ccb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJS81f2AAoJEPiazRVxLXTF8YMQAJR1rfEIl5OoHhRZG23deLPY
+jo/AKQZIePbmUedE3rq8Bn7aWsOLAF/t45xA6/QjcxZCiVs+iQS0Jzd6d3gaYyPa
+4K5744E8cjJLyRwFbSRbhKQUhL/6KeOMHnsuaaIpjgTaaLpEtLJZzAHdMJbGQNcQ
+zfX43ssCtmL+SERDOckmYxSa0MtkK9PATofeaGLcCeO7B6oTnkI8hr/Sj+aotRzM
+fOmiK/YKzrpkl6pZsVudjSmwtJ4c+iEVAOIEn4XUKj4+CZ6RPxx7ljSuFWjAVKLv
+uMj3tee/b2ndm01D/B67/nj07Di18jXMtLX5JlbIBfGrOBEm08ij2J9bSNWOTF6/
+XjsKnSkDmjJiudmNcLAWhZEkaTeGHTUUM4HUG52HySsc9duRDP+ReiqvKQ/4WDcb
+CZP81mRUpeQeYBttWkNcS185wSNId2ysOBB/KxCsTnaE/w/QBPaywIcSGgyQvRjS
+bxBAEHxWqf2AgcX22/wU6SlwkP/03WUCwA2QPBcXOwQsFLuQGT48PGIVDVI/7iWi
+7c7OsqfmHwgsEL/W4rDK1/dEjnCQhwdHAbtBXoPlo55Vd7VD7UuqAwbcnBBZKwQh
+5j/Yu7mcLDH1G8M0xLF6bQlps+4uCWIAKxjNj45SiXUAn3yhAFhC5uNTKy8ZAvrn
+IGMlkILPJkkJU7lQJRcN
+=iHKY
+-----END PGP SIGNATURE-----
--- a/app-shells/mksh/mksh-40f.ebuild
+++ b/app-shells/mksh/mksh-40f.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-40f.ebuild,v 1.2 2012/09/22 20:04:21 ottxor Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs unpacker
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-ARC4_VERSION="1.14"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.cpio.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND="app-arch/cpio"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_prepare(){
-	epatch "${FILESDIR}/${P}-etc-configurable.patch"
-}
-
-src_compile() {
-	tc-export CC
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
--- a/app-shells/mksh/mksh-41.ebuild
+++ b/app-shells/mksh/mksh-41.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-41.ebuild,v 1.1 2012/12/01 03:12:33 patrick Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs unpacker
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-ARC4_VERSION="1.14"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND="app-arch/cpio"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
--- a/app-shells/mksh/mksh-41b.ebuild
+++ b/app-shells/mksh/mksh-41b.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-41b.ebuild,v 1.1 2013/02/12 02:14:38 patrick Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs unpacker
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-ARC4_VERSION="1.14"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND="app-arch/cpio"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
--- a/app-shells/mksh/mksh-41c.ebuild
+++ b/app-shells/mksh/mksh-41c.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-41c.ebuild,v 1.1 2013/02/22 08:42:22 patrick Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs unpacker
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-ARC4_VERSION="1.14"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND="app-arch/cpio"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
--- a/app-shells/mksh/mksh-42.ebuild
+++ b/app-shells/mksh/mksh-42.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-42.ebuild,v 1.1 2013/02/12 02:14:38 patrick Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs unpacker
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-ARC4_VERSION="1.14"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND="app-arch/cpio"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
--- a/app-shells/mksh/mksh-43.ebuild
+++ b/app-shells/mksh/mksh-43.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-43.ebuild,v 1.1 2013/02/22 08:42:22 patrick Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs unpacker
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-ARC4_VERSION="1.14"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND="app-arch/cpio"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
--- a/app-shells/mksh/mksh-44.ebuild
+++ b/app-shells/mksh/mksh-44.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-44.ebuild,v 1.1 2013/03/06 03:55:18 patrick Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs unpacker
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-ARC4_VERSION="1.14"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND="app-arch/cpio"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
--- a/app-shells/mksh/mksh-46.ebuild
+++ b/app-shells/mksh/mksh-46.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-46.ebuild,v 1.1 2013/05/04 08:23:39 patrick Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static; then unset CC; export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
--- a/app-shells/mksh/mksh-47.ebuild
+++ b/app-shells/mksh/mksh-47.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-47.ebuild,v 1.1 2013/08/05 09:16:46 patrick Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static; then unset CC; export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
--- a/app-shells/mksh/mksh-48.ebuild
+++ b/app-shells/mksh/mksh-48.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-48.ebuild,v 1.1 2013/08/15 02:47:30 patrick Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static; then unset CC; export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
--- a/app-shells/mksh/mksh-49.ebuild
+++ b/app-shells/mksh/mksh-49.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-45.ebuild,v 1.1 2013/04/27 02:38:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-49.ebuild,v 1.1 2014/02/06 09:37:57 polynomial-c Exp $

-EAPI=4
+EAPI=5

 inherit eutils toolchain-funcs

@ -20,7 +20,11 @@ S="${WORKDIR}/${PN}"
 src_compile() {
 	tc-export CC
 	# we want to build static with klibc
-	if use static; then unset CC; export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
+	if use static ; then
+		unset CC
+		export CC="/usr/bin/klcc"
+		export LDSTATIC="-static"
+	fi
 	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
 	# we can't assume lto existing/enabled, so we add a fallback
 	sh Build.sh -r -c lto || sh Rebuild.sh || die
--- a/app-text/xmlto/ChangeLog
+++ b/app-text/xmlto/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-text/xmlto
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/ChangeLog,v 1.80 2014/01/18 11:51:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/ChangeLog,v 1.81 2014/02/07 07:27:35 vapier Exp $
+
+  07 Feb 2014; Mike Frysinger <vapier@gentoo.org> xmlto-0.0.25.ebuild:
+  Force configure to always detect bash as /bin/bash.  Drop unused flex dep and
+  implicit system grep dep.

  18 Jan 2014; Mike Frysinger <vapier@gentoo.org> xmlto-0.0.24-r1.ebuild,
  xmlto-0.0.25.ebuild:
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@ -7,23 +7,23 @@ DIST xmlto-0.0.24-mans.tar.bz2 4575 SHA256 1a5b78cf9b349023aaed17c2b39d94e123da5
 DIST xmlto-0.0.24.tar.bz2 111860 SHA256 30f59f4cc87a5e86f74fc1d2e63ceb6adc7a260d438e0439689efc2588976e13 SHA512 f503b30f7bda2bc8e5c3cf422503c2c73148b6a74959df2e01107509c8a6d30cbc3204e45b212ed7c459ac6a631e72559b950a0a7916ae89815d3c8fab5141bd WHIRLPOOL e68636b925ba9ff719631e002d046fa7393f152589e41ed5f14186d38b6ca203617e06d89d3c65d8b0ce04810f1653235a511997660ebd483174dd33673a504e
 DIST xmlto-0.0.25.tar.bz2 116496 SHA256 361cb70d5d0b4b753db00b67ed8bc1d53d0bc96c407d0310aefe854470b7e536 SHA512 53d99619f4c067dc72c0ccf32c85a4efa21d25666c4ed984c63a99ec2291c0264ea05ad79faa801feaddc599c7bcdb2fb851f0384a0989b527fb97ed4980ed48 WHIRLPOOL 6aef4048131c4c9a05ab433f52fbd3c20e14be31d65a5b76eebc13a26578c3d6a0b3f4c8f3604c16529de7d127fe05e91c2cdc77f597d9e6c9ca8b97e7498ba1
 EBUILD xmlto-0.0.24-r1.ebuild 1537 SHA256 676f695a68c098210bf12a16700b0e3b61e5e2b95f4eff5b260023f15f719363 SHA512 2c1f42726e518b4af72484fd7c98b0f4fef94b6ac85e2277759d7785c51645a6ff1ebd4b18a1fa6c791b9dcfcd07e9230899f0293d42f19c83abb6bafd324938 WHIRLPOOL b7992ab80ad95be6f20c09e89ac32b31a1a52e89b7fd4116ebc2bae128390d95d069a35a9688f3d10047b0a12e1eb7cb96090cda9bd9ec68a23b9d891ffff7d6
-EBUILD xmlto-0.0.25.ebuild 1335 SHA256 81aea0e1095d4032ed7e66043d2d6db3d48544f81d1f844143d103cbf7e6d584 SHA512 444e26632d801322dd98da370472b4927db33ee62a86616effb74433624fa9246e99a81c1678df9389b8400dafcf75f8f688ede3749b28d205fde6fa35583dfa WHIRLPOOL 87993baf147735c99a955e55b9dddd21ee15041cba14707965a4aef56c5849a3811fd4014ea8df0a3d4317d851977e0d52956e3558e9e54c58ef1d3754c8a918
-MISC ChangeLog 10248 SHA256 deeed3f2602569a67b90a446253eeccd1346d6bc7ebcb8deffafd5f38dc943a7 SHA512 7720fcf4ff62f57a5c2dc3706ee6f4525481ccfb956cc3d9ac45fcb82a5dfab058ffa2436a58388f0cabc20d3e55c819f14eb05449e3dcfb85004d5e8eca962c WHIRLPOOL f5c7203834d22ca40d28f511ded4a7189739f3908d51d5ca2d130081bf11eb9fe3da7560f4d0bfc0f9311f434e6501330590ce1783791e51b961e7896c2576d8
+EBUILD xmlto-0.0.25.ebuild 1442 SHA256 cd31a48345ac9e37f91640e36bb7ada358cef0424bdf906d452bdfb8298a0886 SHA512 58ca4232486baf9c9e52833b5fee129b09a07303cc61dd0004e723e07834c1fdcb2a8150d70b83a206188372157c4153fb30033883570b3a38ef12f88d95d6c6 WHIRLPOOL 532d55bc7d681f8a914eb108dcfc954804ec13f9104f5adf64a021996e45e06963c171918a0d2610ab476c7058a143285759838a9bf4f41df1ffd2548e8b1444
+MISC ChangeLog 10428 SHA256 9877082353f1de27e4566021dd5dc76f6573bf14bd9fec2fc4b50c20428a3d57 SHA512 3ea3684b5e9776eead8b2d61785b4d2a0b3636f36ba29e97aeebc0a7a1f812a96cca5ba2d2f2b565d311c4def31f1128dd5cec133df1ca326f175ac233cfd724 WHIRLPOOL e029e7d60e8df390ec4f19afcc8a4824f57889579b6d29739fd66ca79c63836de6f992526d20b451ed307ff0ac09de4dc1b0b4c94bcaf00f5c9202842290abf9
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iQIcBAEBCAAGBQJS2mq8AAoJEPGu1DbS6WIAkfsP/AxUBaOzewYTiJegzCLTpExp
-GhWsI0kbKcmgNFxoO5VMvunrc4Q5g4BOkQebIG7LkCetNVOBVBdRS4EuO0J8Pk0o
-K3JvJ8kfiKaqxU5vd290IoLKKLutAuUnOXnyzhK1Htx7PQFZJgSUwSONgV0FCuxH
-xuVsH0oHG21gLOjFT4ISDvDbbJamBvzFMZcF6W0OjvkpDI3GbbqG3msymTEGJVhN
-VJi5UNKBttRo95WYi8wflVQcQamlnCLRX/BLAELVy7vFVQSt70k+0reCwL8W7RJo
-Cp47uh2IoFCzX8FwgLYV813s4fUODq3VMXczpVdJWJ5vanD15ynsCfcGMvjiyecQ
-ZsdmTC85vSBDav0MbFcbPpXKN91N0cJP6Bdt4izDzHJfQ6GwcYe8TMcNU+p54Iv0
-Dq5jb79lHtz51K0Jfm4JvO9L4BnKKFhbn3RMMfrc29pzpeg70enKmzFVIGurqRx8
-qoMaRyK1aaNgp9HHNtHb4Ep9u7Pk0LEtuxvtH/KVm1AauT6e+qIuUU482awdz4J1
-AzuF+SY4spytvKyOq/4MP4lMXeknGRI29/w3fnNYtYaQeUXLcoNmhbrDuDIgW0C9
-t4ERbvbM8nuQmbuntjHxRrtyKyAuo42vZOuiK+HFrZup3ThLT6Ndpwq8RyiT/zbH
-Hkzw3XrN3yG03hZeQ4dH
-=ip0Z
+iQIcBAEBCAAGBQJS9IrvAAoJEPGu1DbS6WIATsUP/RgoHpevpE6/p9+anQ/Ffyoe
+Gpf80z8UG8ZBQCKaZgZOKX8cKuWysFIQH1qbKU75e97Natx7d0SQ4d15pBsJao5z
+tWjRMs3fBmMvGMaDmn55vG/zMLBGneqgRLuom97+UE5JfhuGMig0W/saDlE0p+Ai
+bMErQ3idMfT7LgTi5Lxvpd8N25r582XSHrKvdXQei4x5SEZHdrvF5FOCVyPWzsfp
+NYh109JZiOOjl35m03g+hK1FuXTxAU19PM451Vv5+79HudDyYZ9UkgSjgSQXnGU7
+pISPLxK0NYLIc/KEINJPjbXFnZGtcgA6/88jE3/swR25TzNulvWLoqMcY5TO9gt6
+Od7oqNKN9RsWGg8/AL6QXiVkkKfVyZ9t2SttKH7ERQPFw0fOxPnBy2dv4cT6firA
+scFljWI1CyItyffCZ/NGRS4PKPT/w3tltG06dgSiKpSn0v1Cz/oleK3aztEeTLrq
+AWYLN0WkxNC/jsIjGxT2b/dqXob5YjXVGgoou+rPRKPyt2D2xYSPH0g3GAPSb3rm
+U1iBpwdZQYsaHodENf5x50wxAhxgnwAtWjwrNfSFWscxfaW2tFCp/CXyX3gujXFI
+GrB5BKL/vrT+PWN32nFn1gq42w7mzdfCCqESAnU+osbJWKeFRSxYpLr9in8STZEB
+SD0lpDR8egYbq4U6ITmt
+=CXdt
 -----END PGP SIGNATURE-----
--- a/app-text/xmlto/xmlto-0.0.25.ebuild
+++ b/app-text/xmlto/xmlto-0.0.25.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.25.ebuild,v 1.3 2014/01/18 11:51:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.25.ebuild,v 1.4 2014/02/07 07:27:35 vapier Exp $

 EAPI=4
 inherit eutils
@ -18,13 +18,12 @@ RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
 	app-text/docbook-xml-dtd:4.2
 	app-shells/bash
 	dev-libs/libxslt
-	sys-apps/grep
 	|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
 	|| ( sys-apps/util-linux app-misc/getopt )
 	|| ( sys-apps/which sys-freebsd/freebsd-ubin )
 	latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
+# We only depend on flex when we patch the imput lexer.
+DEPEND="${RDEPEND}"

 DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS"

@ -33,7 +32,8 @@ src_prepare() {
 }

 src_configure() {
-	export BASH
+	# We don't want the script to detect /bin/sh if it is bash.
+	export ac_cv_path_BASH=/bin/bash
 	has_version sys-apps/util-linux || export GETOPT=getopt-long
 	econf
 }
--- a/dev-java/bcmail/ChangeLog
+++ b/dev-java/bcmail/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for dev-java/bcmail
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/ChangeLog,v 1.41 2013/09/05 22:34:27 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/ChangeLog,v 1.42 2014/02/06 13:59:08 tomwij Exp $
+
+*bcmail-1.50 (06 Feb 2014)
+
+  06 Feb 2014; Tom Wijsman <TomWij@gentoo.org> +bcmail-1.50.ebuild:
+  Version bump to 1.50.

 *bcmail-1.38-r3 (05 Sep 2013)

--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@ -4,20 +4,22 @@ Hash: SHA256
 DIST bcmail-jdk14-138.tar.gz 386478 SHA256 629bbe7f00c96b201db4b76f777014763110d9de5021593505f906a31fa7bb7c SHA512 1d79aebee02a8d0017dc0b05f68e49fc031a797043eec173aa68ef0148e06b6ebe4d001a1494d6ed95114b1534ece7c47982e119ad8aec2485323babe34f3a13 WHIRLPOOL 272b1c73ffb4a46737a5a4bd5c2105a7411d6cddfcb1dd511688662fc6d55c20027cf1adb30da9a4ce24db34800cff3d71771a60d57e157b1081c1bc7f16eef7
 DIST bcmail-jdk15-145.tar.gz 483519 SHA256 e74e2a48135e9396ed3622d9dae64eb66e6e88e4b0d17a3522c8d55ee5e95d62 SHA512 2d3232d5eb1cd75ad56a7316beb32880f3f935fcd3ed0a6cb2cc3e1861dc9f0bece0cbae53471760246505adb5c28328691eb82e11fedb0b160c1248d21c48bb WHIRLPOOL abb41f525717886b21551808dfc375a691ceed1a192eb46603fb91398c132768093229389b0247a49121b098d0338f37980bd8980c0c1a85fb91754f586d411f
 DIST bcmail-jdk15on-149.tar.gz 223450 SHA256 60287652b35962761d5b7f347d4abdf40d8eb687ecb822a9dab79de425374daf SHA512 fe6c7a8455692a388ddc19d8e0346167e71f34bc96a9797f88584c4c101b1fe88928a97ca601135969947137a7577b61a2f314af83f633b381c5b9adfc425849 WHIRLPOOL 60b808e401134889ef17c1ad6908548c2912aa63ec065c0a3df9f96a77a8734b9d75aa07a221723dcabfe1a10e09915227b0eed6176627c2a2808c1ab37bb8c8
+DIST bcmail-jdk15on-150.tar.gz 221760 SHA256 1005a21cc5bf705801d217fb5eb90d97106bc11bf1f7079573a64b12f3e080c9 SHA512 91727ddc4bf932cfaedd3cb90a807b5fec3120e56fde3e5fc73bb5bf2e97db50a35a63e0b5e342fe29e4b974579c5cdd5d427d01c9dd8e7abd521ccd3d1959f1 WHIRLPOOL 96893e526007a9635f847010c0c37d17974b999cd71baba416cd287a31407e815ddbb6ae0069c46d362479dc369b726926a026d3267e34bfcc23aea9b523eb6f
 EBUILD bcmail-1.38-r1.ebuild 1261 SHA256 632f75a5dd0271bec6366276e0adc35c8d1bc4ad59dd8166322c6e453acd7846 SHA512 62ea68ca03602305928331567ad5e68f861ec84fdf65b76aa46712eb8df00f25d8df2b1f82cd69cd00832f25466a49fd1dbf74f1372f853dbd6242b8111ea249 WHIRLPOOL 74b7c50cb4d1b1ae4c6feb3e159f719c33d76dcb053a8aa4c8acb14c63d32a67156f7aa50403aa925837d169c513598bae7cd0402d402bc7a4d80903e6be2bc2
 EBUILD bcmail-1.38-r3.ebuild 1303 SHA256 ed14d462d6a122b30916479c81a3e44da8692c24392cd99f726c7b49c2d8a5f8 SHA512 5aac2bd1e1bbe698f89950908f5c059ddb0b293a714fa77578fd3d42335274c56cc62f1763e20177a785d84715557b76cece9e525490064d08b3bf54b31798ff WHIRLPOOL 2cb83a524231e8f808592e2f85c2eb019d0c97059c15eaf4e37ac3191336339f809eeab83adc845c0494c6e40dcc821f33a8d0a0471620e1faa2727d331225b2
 EBUILD bcmail-1.45-r2.ebuild 1273 SHA256 b86cdb59f09aee4a0ecc3b63beed8057fa5350816b35838db9e39b03d92fda4a SHA512 721a8ac5ac7d5fe725f2050c1a6326453a8b03d1ec42b9eb00303aca725ea9d106dc54b92f402137b9f809b6a1246c636e16299e82a8fcb0d0c913b4bce80ce3 WHIRLPOOL c61458b223469f54aa3bba4251264e48993ed687df9fc6486d49ead6cc3ecbc076f2ab7746520a5b978dd8c9baf7d76d710b875d85323e5b33f1aa067f7dd13b
 EBUILD bcmail-1.49.ebuild 1857 SHA256 ffc2020a1cee201693b4a23fb31372c86906129a7160ea0f479f1da03cf01ebc SHA512 d537857510546de584dc81a460c5a3d5a0031441463f02666f0e9f168316ba6c57b52696e0f35aca08dde92705afb4d37dd7e8ac281ba7e72865465a2a381c70 WHIRLPOOL 0395815bc3a1aae873865b24402540831893263d40056c37d869490913fa282656200d53bc8fe2b2d6fa46b6035fcec4f7448aaa4b784d56f030b7557817bf29
-MISC ChangeLog 5579 SHA256 9314532a3d2b2a6677a5bce3a0abf07cec7917a2cb3354ccf260e094e2e93a0b SHA512 02b7ab681b2e8567d902c2f038895336660cf852e263cc2443e5d7232041b93bac728bd2762f95a6b456e85354ddfc981e0fad1580864f15238bc4da725afcb8 WHIRLPOOL 85aab196ae396e312891ee3e601c6dae3df6329dc5027a777837ab848ead3f28a21d2105252250eeb1e4ac09c2879504b40458678eb71baf08763c591f7a97a0
+EBUILD bcmail-1.50.ebuild 1848 SHA256 3889c9a487e7d1c21d948168944dc29e417129a76cbc9b9b5d54b666bb6bf291 SHA512 c176dc763e5273954b237022035175c1c3cbae12d126fadef572b2a9fb83b29e9277cd8c46d4323c0faaa98daf02daaddf9c40b403cd797dd5e12487656bc0e6 WHIRLPOOL 1f9eaf063f6ab095bb09f0578f09b04c223d9ee76e01e0e828004503529a0c9ca2b5975b3cd48e2b802c7110dcb4a84e36f2f1ef1fabd178aef8b271b0275bfa
+MISC ChangeLog 5700 SHA256 ff6c11675363787d61603291266db945885128f2b207d28ff614dbb711339794 SHA512 5bfaa14e6a28d6530b15ec02145f10d260292675fe8a9d5d53249dcf17db2b1e670228a88a1de3f08ae250c58467cacf1db328baf191b3765359d89cc2458107 WHIRLPOOL 970708af54fe2a13427ba66ac7cc8f45087e934b64454c2cef7da4728f249849d5dbd3c629592a593066f67da0825d51ac0dc4cb04322c35264fa9576659956f
 MISC metadata.xml 291 SHA256 8c4fcd1bc741de757078e811eae3b33f67ea2b30780bb6fd29303216820b58cb SHA512 bba7360c64a44c9a6a48e4604b9af368b28dbce44981599c14e6cb92999fa2556b1d99006091a3556f6563666e884ee28717fbfdf77b3972e1e8871aff713fb4 WHIRLPOOL fb9c248612f30d4b35e58b328e931ee67cf08a91c110df08276aafe6a17406da60d3dd93f9f4404c5e802a10484918aa31696d3381b801defabfc79fe03ed4c4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)

-iQEcBAEBCAAGBQJSKQb8AAoJEJWyH81tNOV9MnoH/3WNilvfXb1b2UuFOjwlZWVj
-FbqwVo5rmEBOrNl0OirXzAJQHjyEjDCcokDvd3vIhlM7NL4gKSmEHYo8OKx2bpfx
-XYkOy7JXQoQWsuq+imBrLwcSnv7opCjj8wqFPykCf79T1+V+v7Ms5Co+HPvE6KUa
-JEfR1sNQBt+U57hYU/fwJOwWiBLQSTBTuTouOqIPA+KMV6JDD0gzs90RAhzsAmXB
-0RDYAMnPkk0HnJFHfugGXXSyDza2svtUgyA94mqZJbeQLZmZjujtEtcvWWrnE7R8
-YUOnAQRy5LFuSyy63fEK/5kx91uImDyIvcX1FpDLvamZD/ncZi1mJ4sMdmbHl7U=
-=w3+1
+iQEcBAEBCAAGBQJS85TUAAoJEJWyH81tNOV9og8IAJtz97WcYbWSlr0Mi4IH7kLh
+51ScEEpMyVT1xmrHSC5OAhzS8973+2/YTv4Y1I39HbvtYSeIzlK3JQ8XTRCPUERz
+PAqpW/4K2yWUv0zM9zNjDIElmuIGrG1dNBO9ZaJIxY0TYAOUr8Z0GlZ9IFhtx/LR
+RhLISKcM/Rs1zd4QvRebzJItOIpXRO62Ln5VJGTloSQI6/husvxT8TjSWiRdRjbh
+qdLsAg4NEFZVhzRgcfays+XG7XYrsOmuL2vBe35rrVmBmiRa2QiAUyyD5LnqGF8T
+5kmyGdR3b7OTbjaeeclRJZp/2mqQXYd0l+rFQZt7xWYmj9Z6QRW6oqCAzlVCYWA=
+=gGoQ
 -----END PGP SIGNATURE-----
--- a/dev-java/bcmail/bcmail-1.50.ebuild
+++ b/dev-java/bcmail/bcmail-1.50.ebuild
@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.50.ebuild,v 1.1 2014/02/06 13:59:08 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+COMMON_DEPEND=">=dev-java/bcprov-${PV}:0[test?]
+		~dev-java/bcpkix-${PV}:0[test?]
+		dev-java/sun-jaf:0
+		java-virtuals/javamail:0"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	test? ( dev-java/junit:0 )
+	${COMMON_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+# Package can't be build with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	mkdir "${S}"/classes
+
+	if use test ; then
+		java-pkg_jar-from --build-only junit
+	fi
+}
+
+src_compile() {
+	find org -name "*.java" > "${T}"/src.list
+
+	local cp="$(java-pkg_getjars bcprov,bcpkix,sun-jaf,javamail)"
+	if use test ; then
+		cp="${cp}:junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
+
+	cd "${S}"/classes
+	jar -cf "${S}"/${PN}.jar * || die "failed to create jar"
+}
+
+src_test() {
+	local cp="${PN}.jar:bcprov.jar:bcpkix.jar:junit.jar"
+
+	java -cp ${cp} org.bouncycastle.mail.smime.test.AllTests | tee mail.tests
+
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
--- a/dev-java/bcpg/ChangeLog
+++ b/dev-java/bcpg/ChangeLog
@ -1,6 +1,13 @@
 # ChangeLog for dev-java/bcpg
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpg/ChangeLog,v 1.1 2013/07/05 10:39:36 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpg/ChangeLog,v 1.2 2014/02/06 13:59:13 tomwij Exp $
+
+*bcpg-1.50 (06 Feb 2014)
+*bcpg-1.49-r1 (06 Feb 2014)
+
+  06 Feb 2014; Tom Wijsman <TomWij@gentoo.org> +bcpg-1.49-r1.ebuild,
+  +bcpg-1.50.ebuild, -bcpg-1.49.ebuild:
+  Version bump to 1.50.

 *bcpg-1.49 (05 Jul 2013)

--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@ -2,17 +2,19 @@
 Hash: SHA256

 DIST bcpg-jdk15on-149.tar.gz 652057 SHA256 938c3cb6ae11b43616d08e08af5e4311a1bf291c6cbfd0b5d6a769b8cf82227c SHA512 059fc7a229f2478059a69c28256aa4fdfb214d70204c38ecd1e60cdecda4525868254542b26282ca461b3f41968e2069ebc9d64d7faa299b87e1def292ca865a WHIRLPOOL 25ca6a90e277f0e38b5116c565c189acca057a14dbd6c762eb1e3f57eb8f41dae848412e3cdf3492ad6290dc211ed70b8ab1282326f7500c138f71e663d44f64
-EBUILD bcpg-1.49.ebuild 2004 SHA256 d2fc73c5c41985eccced4049f40240cf9a406480ecf69e6152afc5288bf84a1d SHA512 eb0c680ccb8228f633f94d9bcf9bb9ee502a5f5b40db7d47a87375a77b11aaa95f24248b2d79f97e581d5c80063e579c84a3fa73e1c8cbb74e633a4e76343290 WHIRLPOOL d64c542e8eb6e1bca3d1c9509d61bf2412810f5eec62e1d646f290d164ddb1097ff608ead919e7fb1dac9b95ab0e3e5bbaf02bfb67b7951366972152b53c24d8
-MISC ChangeLog 385 SHA256 07c3135a3f80994b4f1d904d1223a60da16742bfd07a8e41261186cc54ccdd3b SHA512 1a2f6fd0569c004699b63ebbea362f4da95f5cbecc8f15fcbf2cc7404209805997b7dea8536301b8250d4236bbdcdef1b8c5b3932bba82971d8af3e3d4bd67c6 WHIRLPOOL 4ba46d111a99fd7607eac5fcc2ca5ccc67bdd85aa4ba4a87d7695b2349e223c80a17da208fa532f809f8649a115c3996fed036db9d1a0b961b65abf04959f8d4
+DIST bcpg-jdk15on-150.tar.gz 691012 SHA256 7a5097f02db626c2dd2b8c05fdb90c09b1c14a9aaec341fa7c94b0d956790b0c SHA512 763d253b9bb45b7e7fab75d557daa784c3d4a503ced979adc986e5688c3939db248853c864a2f4bec6d5b1dd9ed668d5f278c91b5607774fc703971d0b330fe6 WHIRLPOOL b14e374c3750f2a717dbfee3644bb1b69fa626bf04ccb00ef1762cdac81043422d92c4759c63d0dbb0e2d467701214885e064fc3e79a8d72d9111f7323284ba4
+EBUILD bcpg-1.49-r1.ebuild 2009 SHA256 2aa94c47d1aa11ea28caf8d1b53aabcc2a59c99154cad8f2c3c13aa485256325 SHA512 779a954391c582d7e19e618563492cdebc117a27240f81601fc1fa1143b797b6ff3c643a573f17cc4a9fb3731a46264bc071baa756fa9b7da5583d73105cdfae WHIRLPOOL 5c66298796921f4616ad68617efc12f5c15adf208993ac59564c9a3493b112478d3b846db181728f973d88c1e04e1356918c65a753ef3a0e7b2b3704425f1465
+EBUILD bcpg-1.50.ebuild 1924 SHA256 429eae9d55c2701e87ed6a67701cda9a1c63fd61f147b34cea92b75ec865ec1f SHA512 743a29304781d15115cd50e598334ce1a5c81da763bb23134e88a505cfe3fdeac8b25b7a8ece7f778f94492669e451984c8e28c70fe245401c10698e9d667420 WHIRLPOOL 853593a66e4a3a2a0d9c1d0d73370edfdda8c523c40f15393f2965982ada37d7a86d053f6c4ad76478806a0bdb73dd1a84be04442f49d1d447feace74b36c656
+MISC ChangeLog 573 SHA256 a4d8e88e0c056e97116fdf595a312c18739925c0a2660b6769b19b12168c81dd SHA512 995f97471948c8fd523444a3f4f36532b7e516dd01f3750cce4ceb359c048ad760f23f757c3eb23eecaabd76acd443af4441ea4e26069e95422eef8b833c3900 WHIRLPOOL 4faf9892cac27565540905e918c4fbd213d753b46d27ccbf8758b7e938b325424fe65e7025ba5ccf0f2645ff371e766edb7aabf82067aa2d0ff1bdfdb628241e
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)

-iQEcBAEBCAAGBQJR1qG4AAoJEJWyH81tNOV9S2YIALes6MQ0jY76zyvmYfKqbOIO
-xDvVgPDtnB3xgXgvnRnH/OLMVvdJRsOa3XENbxu6zvVU4WBCfFa6plIcND+LOzu1
-3T/UvdLlMngXotIyKqE7/E7XcgM3a8xH6t3ae1v5o68AnImFETFhj28yjn60nbm3
-vs5JNEqjxYGgV9vEw5J6uIbOJ5yCxrJwF8U51UoX5+6VTrm+9j4IhGjQSfKLU6aT
-x/vK4K5tV9zS9Tp/iAmUmq3pfkAjnjDfqZixJSzsXdTGdveFQQkkMk3pZx5xiwJe
-uzo6MK3Mo2AybRYUqKBlExlmBw4FZfLo2Kh4Ynwrp2CIDsNXXkw02wX3C8P7AzU=
-=wZxn
+iQEcBAEBCAAGBQJS85TZAAoJEJWyH81tNOV9mekIALwaM8SnLcwniIlc+ccjsyCT
+1aoQ9h/BKTib7UHQnEGstLGnBICXCq+yOoVQG8CtDjEh/rHcoehMJHee5vca28kc
+pP3Hr6vnXdOmqg4zTQcp/cdeEwrnLXvUsr8w+Iw6DK71gFWPJJ9ZI6QO3/cHJVbk
+f7u2zgl+wKOejrZuGrnmke83QtCJEPxBGurUAHELZ2fxr7MNCMAyh2/UZLW69LPK
+CsIDvFCVrcuTFeiWg00ImzgUJOPcyRat4B5/9yWnvpwF0XxRChWnsYR8KmwdtfAy
+FFD/FhE22lEcsZ38DeaXTdNADfFr+h8SHgw2yZSDwYU5CgKfq1SiTT/gfSNOOFc=
+=YtQD
 -----END PGP SIGNATURE-----
--- a/dev-java/bcpg/bcpg-1.49-r1.ebuild
+++ b/dev-java/bcpg/bcpg-1.49-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpg/bcpg-1.49.ebuild,v 1.1 2013/07/05 10:39:36 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpg/bcpg-1.49-r1.ebuild,v 1.1 2014/02/06 13:59:13 tomwij Exp $

 EAPI="5"

@ -23,8 +23,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 RESTRICT="test"

 COMMON_DEPEND="
-	~dev-java/bcmail-${PV}:0[test?]
-	~dev-java/bcprov-${PV}:0[test?]"
+	>=dev-java/bcmail-${PV}:0[test?]
+	>=dev-java/bcprov-${PV}:0[test?]"

 DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip
--- a/dev-java/bcpg/bcpg-1.50.ebuild
+++ b/dev-java/bcpg/bcpg-1.50.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpg/bcpg-1.50.ebuild,v 1.1 2014/02/06 13:59:13 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts.
+# Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-java/bcprov-${PV}:0[test?]"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	test? ( dev-java/junit:0 )
+	${COMMON_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	mkdir "${S}"/classes
+
+	if use test ; then
+		java-pkg_jar-from --build-only junit
+	fi
+
+	java-pkg_jar-from bcprov
+}
+
+src_compile() {
+	find org -name "*.java" > "${T}"/src.list
+
+	local cp="bcprov.jar"
+	if use test ; then
+		cp="${cp}:junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
+
+	cd "${S}"/classes || die
+
+	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
+}
+
+src_test() {
+	local cp="${PN}.jar:bcprov.jar:junit.jar"
+	local pkg="org.bouncycastle"
+
+	java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
+
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
--- a/dev-java/bcpkix/ChangeLog
+++ b/dev-java/bcpkix/ChangeLog
@ -1,6 +1,13 @@
 # ChangeLog for dev-java/bcpkix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpkix/ChangeLog,v 1.4 2014/01/23 20:26:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpkix/ChangeLog,v 1.5 2014/02/06 13:59:03 tomwij Exp $
+
+*bcpkix-1.49-r2 (06 Feb 2014)
+*bcpkix-1.50 (06 Feb 2014)
+
+  06 Feb 2014; Tom Wijsman <TomWij@gentoo.org> +bcpkix-1.49-r2.ebuild,
+  +bcpkix-1.50.ebuild, -bcpkix-1.49-r1.ebuild:
+  Version bump to 1.50.

  23 Jan 2014; Tim Harder <radhermit@gentoo.org> bcpkix-1.49-r1.ebuild:
  Fix bcprov dep atom.
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@ -2,17 +2,19 @@
 Hash: SHA256

 DIST bcpkix-jdk15on-149.tar.gz 1212204 SHA256 8adcc21c2f848e449d6a15daec96adf73174c93015ddf0f4eb8bb6f964500f8a SHA512 be70da827c8edf5c4a4960aa78b16bdde62932e140ae1294a011402b1ec0914bcee246bd69fe6fde6c7c5d637c33fa68c7c6b791341cad9d12ad52ccee9ca2c6 WHIRLPOOL f4786f609833ca43dce0eefb5ccea5f9aaa7d53ad574bae3b069b95fba1678839140ef1e98f5924bc8703a22a4f446d22819cabb4161401dd71560c35d0af9fc
-EBUILD bcpkix-1.49-r1.ebuild 2482 SHA256 9da13537ab883412f0732f5331b791470ab5eaf659c2976ed40ffc3ea535cc5d SHA512 203183da466fff0cc612567fa3f6009590fadaaec40dd1f0c99d8c0b6e8d6e3bda2212a64ced60a4fd05d557727a695bc2574bc6745af8a5ed6a651cf565e2a1 WHIRLPOOL 67492e0147261ea5cae2216ffcef95e44c132763163201fde94d4ab593d2b65e175745509bea7d666b98ffa0377378e3b1beabc506ea9d3f7dd67fb9e9695b83
-MISC ChangeLog 1051 SHA256 e4fe641fa21bd06736c196514406ac1e01065bcb6a5a3487bb5c82e672f69a33 SHA512 c97799ca7e9ad070e84b00ce3093c14a2d1c69b596208056bc6a8b15a5479cf491175557bf4c6c2fa75acb655057e36f2327b815f230b2d0aabbe6ce8ebc6c87 WHIRLPOOL 79b2513c342ff72890ab9cc4490b1ff62a2fc4e47cdc940809c48e787d3bcb7c3e398a66442aef9507f34f5262afddf554dd34c71705354823fe5d62c06e7a8d
+DIST bcpkix-jdk15on-150.tar.gz 1149901 SHA256 0be5bb948ec481b3d1f30ee80ef593b298b3782697f9eeee5c74cf270689b520 SHA512 17c5a9aa8c04defab46987063f847ee5fdedfc42d51e29ecad5053e3df5895c2c01899edb9222c3dab3ecf204eac9744249163dc2c1572fa2becaaf0924d2eb3 WHIRLPOOL 07197f1271ffc965479badcfd6b75450e5b0744f93031dd3721406dcac04c3f360b0d537cde3efa0f44f9ac06b4427a60f00743bfacd8dc7cf0a3d70193d5b32
+EBUILD bcpkix-1.49-r2.ebuild 2480 SHA256 a56d3aa245a071f4451cf1f3325cf9965be6905d043ff4444fb896c11fb6e021 SHA512 df34037c50b756ae1c3d9875ef7c987e00423966b2ce0087fb49d801850ceb34fc59310879f8794e5368dd1782ee17400c5a3bc930b4e2405953dcc55d476a47 WHIRLPOOL 9435c83a4839c4c75e9c037d7c968c506ef56578835c9843fb75a86b8341cf5dc479d461ce5219401db4af8503738e49991353d663fe117f2dd19f2b3d3d74a9
+EBUILD bcpkix-1.50.ebuild 2551 SHA256 77703e6c29c2fdfbafb7690fe9ee055a6f534c97f8d0ebacce76eca48dbefec7 SHA512 30e02b4b010ad74c4bf8ef33a79f5d8bc4ba96d95c81748ee51f69565dc52598b8cd30d9afeeac049b89059b08f5435bd7bfd525e3aceb7e1724a7eb99963fc4 WHIRLPOOL 0d864566684c4ddd74bc0ccf56a993deaa65684e75b5e9f5d2fe4a744efdf064ce822de3920bebdc86579b81946cf4faa84479e6ebbe580c80b7956cd2f9d578
+MISC ChangeLog 1249 SHA256 bfe7df9383d79cd743d0ea8e8c11bdad5b0fc10407fb0e45f3fe9df41ebdb6eb SHA512 95c484c66a3cee7576e6d9d3f518c2e37e01dda14c6ef38e705c2adf277b964d916759292094287d167d69236161f29591874362fe0520d38b76f9f8a9dda75c WHIRLPOOL 43527513d93b5cc2e4710795c730b85897551b36b41458a93c2b948abbb69e090a73b120f64c6e8d4ad6a578dfd05489a067dd70f56c793924d4adbe44b2186a
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iQEcBAEBCAAGBQJS4XsLAAoJEEqz6FtPBkyjOJsH+wah0J23xxXGG9lNvk4jVP7M
-hJJjgP3HswXRFsX+VGa8Tf0L+y8RYZ6DSq9Hoikgc2uVQOfJmvu+/wmbHUtW1F/N
-edN4Q+7dsuSRUyTJI7gJvis1BSQL9piI1IfVaDPfYc74fjFPClYF/7AoDzx/+kp9
-ebNW30Qxm4WGqIJd276F+wNOXH9zQqbtjrf9as9T2r6K3FdYOctboof3x8NEExXt
-8wI02l6Z9S3UAb+r+qKRweBSxNdKByHV+Uq/LdGqVkTpBlk+xk/WeFYlWu33BIXr
-WAS7+TuYVq8Fa5phIZAtmsFcmYf8+edpPMeK/uA/+LOpy6H5DOtLXPIlvYgq3cA=
-=Tnho
+iQEcBAEBCAAGBQJS85TQAAoJEJWyH81tNOV9jVkIAJuskoKLuda1+MUatw+dW7p7
+pJuYVagg5lNfBQAWzyx6sMz1TxSyyJpBM5g/6fBlREZ+VFMifsDD2a9zS7VJg7ZD
+r6IUrj7OK4wajAdn6KhoNphm7La6GWPccfWiCPf9HPYaezEJhSJfpqEqCMmGACYv
+cy7Z3QY5Im/Gnk+sDSz5wo7qkenKB1D9N78RnI9Tros9miP9QAQDt7xTNwbe4RIu
+RCGoDzN0uN9Zb69bjyRHFFrZ93E9AgZm4S8q992/kYDdRX2g5KxT2SQ3pGRZS7DJ
+5E6Y/ehXV/nFnJAHBYPVJtdnFY/FH1Ce8f1kFKKIlmLQzKWpYjnNuGDOUiXms+Q=
+=Y6g2
 -----END PGP SIGNATURE-----
--- a/dev-java/bcpkix/bcpkix-1.49-r2.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.49-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpkix/bcpkix-1.49-r1.ebuild,v 1.3 2014/01/23 20:26:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpkix/bcpkix-1.49-r2.ebuild,v 1.1 2014/02/06 13:59:03 tomwij Exp $

 EAPI="5"

@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 RESTRICT="test"

 COMMON_DEPEND="
-	~dev-java/bcprov-${PV}:0[test?]"
+	>=dev-java/bcprov-${PV}:0[test?]"

 DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip
--- a/dev-java/bcpkix/bcpkix-1.50.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.50.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpkix/bcpkix-1.50.ebuild,v 1.1 2014/02/06 13:59:03 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Needs further investigation.
+#
+#  - java.lang.RuntimeException: java.security.NoSuchProviderException:
+#    JCE cannot authenticate the provider BC
+#
+#  - error: package org.bouncycastle.util.test does not exist
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-java/bcprov-${PV}:0[test?]"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	test? ( dev-java/junit:0 )
+	${COMMON_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	mkdir "${S}"/classes
+
+	if use test ; then
+		java-pkg_jar-from --build-only junit
+	fi
+
+	java-pkg_jar-from bcprov
+}
+
+src_compile() {
+	find org -name "*.java" > "${T}"/src.list
+
+	local cp="bcprov.jar"
+	if use test ; then
+		cp="${cp}:junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
+
+	cd "${S}"/classes || die
+
+	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
+}
+
+src_test() {
+	local cp="${PN}.jar:bcprov.jar:junit.jar"
+	local pkg="org.bouncycastle"
+
+	java -cp ${cp} ${pkg}.tsp.test.AllTests | tee tsp.tests
+	java -cp ${cp} ${pkg}.pkcs.test.AllTests | tee pkcs.tests
+	java -cp ${cp} ${pkg}.openssl.test.AllTests | tee openssl.tests
+	java -cp ${cp} ${pkg}.mozilla.test.AllTests | tee mozilla.tests
+	java -cp ${cp} ${pkg}.eac.test.AllTests | tee eac.tests
+	java -cp ${cp} ${pkg}.dvcs.test.AllTests | tee dvcs.tests
+	java -cp ${cp} ${pkg}.cms.test.AllTests | tee cms.tests
+	java -cp ${cp} ${pkg}.cert.test.AllTests | tee cert.tests
+	java -cp ${cp} ${pkg}.cert.ocsp.test.AllTests | tee cert.ocsp.tests
+	java -cp ${cp} ${pkg}.cert.crmf.test.AllTests | tee cert.crmf.tests
+	java -cp ${cp} ${pkg}.cert.cmp.test.AllTests | tee cert.cmp.tests
+
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
--- a/dev-java/bcprov/ChangeLog
+++ b/dev-java/bcprov/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for dev-java/bcprov
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/ChangeLog,v 1.58 2013/09/01 11:42:36 grobian Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/ChangeLog,v 1.59 2014/02/06 13:58:56 tomwij Exp $
+
+*bcprov-1.50 (06 Feb 2014)
+
+  06 Feb 2014; Tom Wijsman <TomWij@gentoo.org> +bcprov-1.50.ebuild:
+  Version bump to 1.50.

  01 Sep 2013; Fabian Groffen <grobian@gentoo.org> bcprov-1.38-r2.ebuild:
  Marked *-macos
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@ -6,6 +6,7 @@ DIST bcprov-jdk15-140.tar.gz 3494846 SHA256 4284e5b4eef0ae410aa1e65868058230a86c
 DIST bcprov-jdk15-145.tar.gz 3427337 SHA256 7751a677d2cf7f8f9494a9b80c884e88de63be3be6fd9fccecee854196c611e2 SHA512 789ae99942e7d565ee58b2411f1ac089a999c4b947d81d640850190ff80d8aa27448d401deff5f44d9ebb4b75f492cf58a6d1d7bcab78198872bea6e98c9f7c3 WHIRLPOOL bb30f3c4192aef793d1193ce4a85f7aa801dca5ae5c0e17807e8c0d549bf883424985025b157266fc5b504a8892e37494295f780c736903d484c5cee70b5bc33
 DIST bcprov-jdk15on-148.tar.gz 4070349 SHA256 e3fc3dab563e52939c7fa22f93a051a819729a03dbeabfb6e1998ed41943b56b SHA512 5216f6511c2ab280dc5a06a94017c2045befaa23c4ba71e67f20375f498ac2e1706b772440b5f5615cc18a52ce79fd61f7f95d2663202b50f29196dff33cde46 WHIRLPOOL 9020e24c3f7a63a555760f07ee93ffd0f58350558bf2bf02a5229468867d747e29521b48784ca9f8aeaa832059fe62f02f622ab141c8608d71692ca8c68d9b89
 DIST bcprov-jdk15on-149.tar.gz 4329897 SHA256 a22ca93539a34bdbce793a0093dd3f7f8c313e318368772806fa5db3f0603ac6 SHA512 123b2c7063b8a1fe068571d8227269fd77b6d07163aec35dca2219b5a2e0ad970995a74027cc515ecaa6112ccb395fcc4db6fa323f9eadab2c4d6e62991c9143 WHIRLPOOL 9c4057cbf11254a7d99d492840b7921dbe296bc5675a5527b917a1b4496c027fbf5db60a555e4abe05f03d528836c6512d4241d4a1a7425750957c3a43680103
+DIST bcprov-jdk15on-150.tar.gz 4629743 SHA256 468259c9166fbcf87ad284ae46fae45408cb7cfc9c406862ea75d5b8696f4f2a SHA512 95400c338a65cbb7d1e80c776de41d3d372b4237aee91526a06774c3d4beb735dcfb4c1ed182a12f2ccac8204b9c546863d79eb99723394d48c415fa32b6ee0e WHIRLPOOL 4f0db66b6e7cc4faf7fbd09a9c4ba7618123657d86e4552157d998e5ae8bb21843fe5ebfa8a9e622b1d9697a0e6e9637a55501fefda238c91a0bbd5be7010c38
 EBUILD bcprov-1.38-r2.ebuild 1498 SHA256 1d8d7d5c17b5a4dbe31f22ce119320c34721da95d4a1fddc4e38088c1cf97c8b SHA512 ac796b2470fc94b1296bcfe9375dabba2b71e4daa3a1c881f34f35ffb8747d059ea0c6a5bb95d6c37e170ce0a463700af5b7f4e35f5f082ae47f71b4d4baea26 WHIRLPOOL 9d9e6230a401396a6ff91e8fe0ba945dba97d7a0c44ec75015e4a14e299156bbfc9882d79e3d307bb37031fe0fbeac96527406852499cf7a40f48cf43cc127c9
 EBUILD bcprov-1.38-r3.ebuild 1501 SHA256 4cc918139da4af70f43b1614b401135a1fc7fa2b71cd39217ce619d7f7203948 SHA512 e4671ec71a7362a52ba4d5109f0039325ff50d140460979903c738b2354b33a3168543cf0678231bcf33756efc8404d4bb62293e480381ae3ef3a6f63801c182 WHIRLPOOL 81d2f014bdee612ecd2b2adc9448c20fc0cd5ecec1b96e61449eba37ac9fffc28e0d6adc7366497c447b16d6711a55395123d2d2b26a02cbbb05c325d88f2ec6
 EBUILD bcprov-1.40-r1.ebuild 1471 SHA256 86268ff3a283c5d4fac95200522c6f0037569e9e57f3f79ba9f675c0be0f6bad SHA512 50892d419d330a8ede7446c3cdfb2fc6f8d2e0bbfc4c7aa4d5ee22fd4f558631ab238dc64426a2cd182be6e972f333117b727bef2ce62d7507e03e92b4ed70a9 WHIRLPOOL 2e8334b9456bc31bae2b32eb2cc6db512945b221c57da0e9e040d5dfb73a5a8598eb37ed6a786b4abfb14e2926f17e8ff657eec08ac3ad1643d8b8360328ff33
@ -13,12 +14,17 @@ EBUILD bcprov-1.45-r1.ebuild 1482 SHA256 7ebb137831ed6a0c4de412fe4be5c813f7368df
 EBUILD bcprov-1.45.ebuild 1476 SHA256 52dfbdf683f1cd31a27a1a375ccd126a361d8c8e0cdaf340bc595f1b619cd15e SHA512 4294101a8a58300b732425047cc6d54222d1888243f67b54832cc993eb850489a06b1c5f5e442ed9e85563f93489f6458f3af785afec268ca7172c33f00d58f1 WHIRLPOOL cc434692ed8cccd9126c6346130577537f941c6ef07dc2cbf89902cb60edfed6b5f490b9ae70d0d92b4a9f7df967f5c52a5f4344ca12bd3f765d899a7f24ec45
 EBUILD bcprov-1.48-r1.ebuild 1621 SHA256 3533a728dc4c9385a449a61fbd7180168c107bbdda9497dffb3a6a11a2b0dc69 SHA512 b42a49a21e9202aa67c29e855f0d22e995f743ad32371348790e6ec819215e500c50977087d3a71e89b07168acc0c7db4ec4396b5f1fdeb6f75c8c7bc6c670a8 WHIRLPOOL dd2265474499d8a88264e4fc6ead81dff296c204e9784f4290619355d024e9f32a9ca755511048c09a2a7b2ccfc8d43eab3518807ea5358eb679a537e700e65f
 EBUILD bcprov-1.49-r2.ebuild 2047 SHA256 8304f8164c5f4f1c42027371da3d5491618a08514df4267a24343d98fb8271ba SHA512 f253476d0de476f8bd60a1512066fbaf3dd8746f7d452bee220ccb7335ea879176e880d544db7221632ce1c06e4a61e7e575489522619f4da81cb6c606791b03 WHIRLPOOL 76e384927a8e18afdbaf1774d9cf77f9d140bcebc14c2aa7bf108043053cb558b81d1f4e0131e8f7a765a6b749358323fbd421880b44e4ece3435dbd55a781ac
-MISC ChangeLog 8561 SHA256 e94c13400aa291112ca6f8eebbd6498328b23921ff53d18974aa963df50c2606 SHA512 ff22dc95e00ddde693a6bb4272d85b360227eb7f652bd1f1242f98b245e80201bfee5efb7ab64c4b392a435e2d620af4442346917e8ce10b0ae053b802e99143 WHIRLPOOL c21be340a0c5670b6dfc538b831e04c5e6b7d4fc29b4af04ec6dfd54c85b178f2766e6a28a0ed248d1fd24df3e5141a36ccdc14a32e3a234a79860d339f3ff10
+EBUILD bcprov-1.50.ebuild 2043 SHA256 1d6765b39836a62563deac2c0a554e1ab2cec273e740de133d09d10cfa495aed SHA512 eb0e79174411b2c7a411d0f5ab2877ba5abc559fbf7ee393e21ecf61b02536888a1bf8befb1f9fafe3c13023f1d132ffb4f6e68acdb81023c0e9aff208e38a57 WHIRLPOOL 9469791318a47391bfeec2f47500977a92c7caa2d319f6dc7b0da25cce9462427d008bec288991b349047779122e11947eee93a961ca809d4fb64b2d8127350c
+MISC ChangeLog 8681 SHA256 3123850534e15dba0fffb8430cb1b117af2a3f4b628203028289f7a9c854684c SHA512 d08ca853031d9f40f9da4a1ca822ab3df43f44db5f47c8d7c9a89db56560103a07c13039ef152ed274b5a2bd57edb886e609304887a337beb8dd9f1fb6bb2575 WHIRLPOOL 7173e3f053861a50e874cfc692827b96565d8ddd0f7cdab28dfb8a9387c73b7210df8d6588ededcb82a8e7f53fb4079705fdecac5918e9da51d726a144ca1ee5
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (Darwin)
+Version: GnuPG v2.0.22 (GNU/Linux)

-iEYEAREIAAYFAlIjKEkACgkQX3X2B8XHTonSagCfahOcP+XVNgc2SmlUCS/V80zf
-gyUAn2eTSmAdB+O8LFJArCx5Gd6LmMVS
-=dJbr
+iQEcBAEBCAAGBQJS85TKAAoJEJWyH81tNOV9h9EH/RIjElyCKZcKVp122fz0BYSF
+vb0z77Cg4qcGqHrPfV52IWCNP5aFNkamsFbTM+KCPcs+1R7e4wVO/m+SOdoEflXi
+F59uZ6QWiXYaI4RrVTK9LnzJ1BiLU4XnS6H7y3Qq6iv33IpGiW9eC+oOhhrq76sd
+Xvx9BRHPyHBwaRO6LZs5gB9C8mPoQP++R6L8L/zbUL5NE5En4NCZTrXV/YyYrr97
+vSU7inMagez86GLwDLj1LFPZqk1sbJU7487sSnaSmXV0SChVBqUy0fWshigJfiTq
+KCP5hFMTc3R561fWvEtVUgF/oU+PGAXGHidQ/sTkGaQ2ATU7wFasHUh6ga9mxQ8=
+=tStL
 -----END PGP SIGNATURE-----
--- a/dev-java/bcprov/bcprov-1.50.ebuild
+++ b/dev-java/bcprov/bcprov-1.50.ebuild
@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/bcprov-1.50.ebuild,v 1.1 2014/02/06 13:58:56 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}-jdk15on-${PV/./}"
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Needs further investigation.
+# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256
+RESTRICT="test"
+
+# The src_unpack find needs a new find
+# https://bugs.gentoo.org/show_bug.cgi?id=182276
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( >=sys-apps/findutils-4.3 )
+	app-arch/unzip
+	test? ( dev-java/junit:4 )"
+RDEPEND=">=virtual/jre-1.5"
+
+IUSE="userland_GNU"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+java_prepare() {
+	mkdir "${S}"/classes || die
+
+	if use test ; then
+		java-pkg_jar-from --build-only junit-4
+	fi
+}
+
+src_compile() {
+	find . -name "*.java" > "${T}"/src.list
+
+	local cp
+	if use test ; then
+		cp="-cp junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
+
+	cd "${S}"/classes || die
+
+	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
+}
+
+src_test() {
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests
+
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
--- a/dev-java/velocity/ChangeLog
+++ b/dev-java/velocity/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for dev-java/velocity
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.46 2012/01/29 11:20:15 sera Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.47 2014/02/07 00:09:55 radhermit Exp $
+
+*velocity-1.7 (07 Feb 2014)
+
+  07 Feb 2014; Tim Harder <radhermit@gentoo.org> +velocity-1.7.ebuild:
+  Version bump.

  29 Jan 2012; Ralph Sennhauser <sera@gentoo.org> -velocity-1.5.ebuild,
  -velocity-1.5-r1.ebuild:
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@ -1,5 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX velocity-1.4-versioned_jar.patch 2237 SHA256 18fd6dad922d571a63e2a5fe2f036455ab4aea3a0c7224eba84ac8c6576baa09 SHA512 89539216bef674889c10cb11e3af424792aaab73a19ebe1c0fc776342fcae5eb46d3d5ad8a8fa8edd799fb1b61b45981bae887d2881863d5296969a5077b6a9d WHIRLPOOL c2612a2274194216389dbf118a59a0df6d87ca082d0e284e5495d9e60e87e5044df5065316a0492a3e2a4ca3af1bd92c72c70e7054f02b8b7de905a2b7a61eea
 DIST velocity-1.6.3.tar.gz 5773231 SHA256 63b42ecd8b03a3dabb6a0cc7086844dc0af1066847fb442824b4e0e0fb622e1e SHA512 d93c037da04375d63cb9c475cccb0d58c1d075d806de2d0b5b262e3dca8c592106c751ba0fb1c9d65abd29a5d75a4e1da16c395bc790933a25cd6663374f506c WHIRLPOOL c69beafb0c59728fc96b2a33e91627be1473a3639dbf7c24b3c5cc721e43567cd40b9a9a1d2810e0755b384e28408fa33a61120d75130a62675c22dca3ba2131
+DIST velocity-1.7.tar.gz 5882643 SHA256 6cabbc45ead01b32e9833db31b1726f2e34f5ff6a03346df9822e70909d06766 SHA512 542c9cc0efa118693bf1c952ac4b0c7c3d0229ef804afaa4f0f1c01ad40b0112055c21df7f800c302bf173d58461a864b29b9bc4b9174029d9748f88f2fcf9ab WHIRLPOOL 59e44fb361162be0f07917f2a137a01cb26551da64896a8b7f3a747e328e6ec72d7a32d620aefddce160617b36132047d932a253dcf8e2afd40ae6712f462be9
 EBUILD velocity-1.6.3.ebuild 2093 SHA256 331e52caef4b64836924a3fdc34e533e88bba933f4e4065e0fdf5cfd6dd6fdc5 SHA512 de1afff0fd78dc14b40bb8ecab40f31dcf4b19ecc94d58994d867f6fc7c52a6768d4199bfb7be32f5c87c256d317528d56acbd0f6db2eb771c35e3ba98a78a72 WHIRLPOOL 8733545a70f49b5d04b169d98ca4bdc231c9ea407dd6ae88a7198ff0519771bfc79e153a56c689e102efebe34dff067835ab68681c92546022e50b924b7f177e
-MISC ChangeLog 6130 SHA256 f7cb67ceff04440afaae844d6ad0660481eea722d182cacbde958a0a221f28cd SHA512 7ea22b26b392f879e6a2c043878d5ce5b1885c451899a24282f16debd66d26531eb22f883ac2ad34b7fb9886226a5a5e610afa89557412137f8fb8560bb1d50e WHIRLPOOL 8c4a9699d39f149cddcc38e579a1e4368f07fb62bd97e644f5ca7ab8e08ddce1b453ad1b663943e271f0bdc0c7b6a99b1e6935d3d9c46d709fa2ebdaef36a717
+EBUILD velocity-1.7.ebuild 1923 SHA256 49bef52e2937c0866961900857ade5f3febb00cce5c54297a0152150689987ff SHA512 da182090654fde555ccbb356fbd98604cca85bf1300165541f10680223b42e88f4c3c27a578bcf203039b497f4f17e1f00e7b07c7010f1e2af8679124457a333 WHIRLPOOL 4ecec7375f3063d628e09bd58647343e792f281b8b55ff3107c2c9c514c064f3c9543625d30c605bdde96acd8a67f22b9465f44dafa974d7fd38907a74830f85
+MISC ChangeLog 6252 SHA256 42fc433ec2b06a9cc6075fb5824eacc8ce97917c2bb0c3d38ac3cd9919fc2172 SHA512 1cc14c55280ca5d83bf662dfa3450f95f0724339757eb383b737b521c67e2dbbb7db94469bfe4176ec8060f2ea4d628398add7e467e073bf7d30e7be7cc29291 WHIRLPOOL ddc3ff137f16224cce1f35d126ecbbf6c7ccf418daec7c00589a8a8a3c29ee3b127583f3e44d9262b9dbd71f7994cc68c3cd71bc6d452ec4e40ec53ae8c26459
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJS9CRYAAoJEEqz6FtPBkyjpVoIAK/P7yEhPEqkHtwIQ6rNdQ9J
+//XlSUR32bu3Q+PXqZLThykTxW0gagRFkcXKO0edzRg+7cRwKt9//MBGdFt6gqsq
+6zoLd4YJI8yLOFzPzN770VD4H2oTIxkByLbWyxv0UFT4+wVmuaNWnIKhk1aYNsIO
+7/CxPT3gnkK8EKwRB1Smr6M8eB9zKuCOKKb3uc5DqxbfPpkXuNJFUZ7zzocb+Xht
+QXIGccK/SjIR47zO1V6fXJjlVITuhovd/EX4eF/j+rnd2VPidAb4DfHjiyHoiRqi
+aYCLwFO9eNeZh2t6+q23PH9LrQDLxY/seDmcrae5QOfFU0c8kvah6mz7CW0KKf4=
+=FdzJ
+-----END PGP SIGNATURE-----
--- a/dev-java/velocity/velocity-1.7.ebuild
+++ b/dev-java/velocity/velocity-1.7.ebuild
@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.7.ebuild,v 1.1 2014/02/07 00:09:55 radhermit Exp $
+
+EAPI=5
+JAVA_PKG_IUSE="examples doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A Java-based template engine for easy creation/rendering of documents that format and present data."
+HOMEPAGE="http://velocity.apache.org"
+SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="test"
+
+CDEPEND="
+	dev-java/commons-collections:0
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/jdom:1.0
+	dev-java/log4j:0
+	dev-java/avalon-logkit:2.0
+	dev-java/jakarta-oro:2.0
+	java-virtuals/servlet-api:2.3
+	dev-java/werken-xpath:0
+	dev-java/ant-core:0
+"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit:0
+		dev-java/ant-antlr:0
+		dev-db/hsqldb:0
+	)
+"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.4"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+	commons-collections
+	commons-lang-2.1
+	commons-logging
+	jdom-1.0
+	log4j
+	avalon-logkit-2.0
+	jakarta-oro-2.0
+	servlet-api-2.3
+	werken-xpath
+	ant-core
+"
+
+# One test fails. see #219668
+RESTRICT="test"
+
+java_prepare() {
+	rm -v *.jar lib/test/*.jar lib/*.jar || die
+}
+
+src_compile () {
+	cd "${S}"/build
+	eant jar -Dskip-download=true #prebuilt javadocs
+}
+
+src_test() {
+	mkdir -p bin/test-lib || die
+	cd bin/test-lib || die
+	java-pkg_jar-from junit,hsqldb
+	java-pkg_jar-from --virtual servlet-api-2.3
+	cd "${S}"/build
+	ANT_TASKS="ant-junit ant-antlr" eant test -Dskip-download=true
+}
+
+src_install () {
+	java-pkg_newjar bin/*.jar
+
+	dodoc NOTICE README.txt
+	# has other stuff besides api too
+	use doc && java-pkg_dohtml -r docs/*
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/java/*
+}
--- a/dev-libs/hammer/ChangeLog
+++ b/dev-libs/hammer/ChangeLog
@ -0,0 +1,10 @@
+# ChangeLog for dev-libs/hammer
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/hammer/ChangeLog,v 1.1 2014/02/06 23:37:24 lejonet Exp $
+
+*hammer-9999 (06 Feb 2014)
+
+  06 Feb 2014; <lejonet@gentoo.org> +hammer-9999.ebuild, +metadata.xml:
+  New ebuild for hammer, a parser library with several backends. Ebuild written
+  by me.
+
--- a/dev-libs/hammer/Manifest
+++ b/dev-libs/hammer/Manifest
@ -0,0 +1,3 @@
+EBUILD hammer-9999.ebuild 885 SHA256 19e0b75d5b6a5cd0f36e2c44eec3dc7e660cd7a7201059d6f8813d2f8ebec617 SHA512 c11d7ffaeda4a9d3c3474361f79b8a80ba81809b70c3c3557c3e7b81a725fdd9e0ac1a6733ed02902c20297cae93ec69cf425a49c2f4ba9e55ac0d87804be8fe WHIRLPOOL 3841e5ed3a663d17d56ca4f76d9a5795e10335e443afcf2e84e1e8b69ab56f0e578257abc93daaabdc49194d273425718cb0ea7e40729ec521240d70f36c87d3
+MISC ChangeLog 394 SHA256 1eaeb1131b861ef1b0e36c61626326cf0494fa683ce0c7799bbf2909e6a7b8ec SHA512 369cc7cb095f80049a460bbb0b4f0bae271d9b766206aa2fb296e9f3e717e1fcda2707ca32a1341d5108cbe56ac6782a087d9b7e8c8317d17140777a9b2827f4 WHIRLPOOL cc7994bed2930df9de82e25a89489d14362bb33205d76fa2334efd3a512155214afd6fa225f87cf937eaca09101da5a3b7a2325728cff3ce05e7ad3f479bb4e0
+MISC metadata.xml 655 SHA256 5eacc729fa6a7931ce8dc0f99c1e5c40ac209cfd3754d2f6f1d522b72c891e78 SHA512 1f3bdf84e54a832097a3345ba521c4195048f784ff0c237efe90e126358767801570b638fe55c2a4b91c383bb7a64a2619a770de5fa83d5a9bddc88248cb541a WHIRLPOOL 42d0e3979a1656f44c80078ad6d833489696a0e39ac85a0ea8c172b48d0c1b374a11ad35faf9fd27b53edf8b8d72aaeca18a465cd3e5dfeaebe29b5ddaa4efbb
--- a/dev-libs/hammer/hammer-9999.ebuild
+++ b/dev-libs/hammer/hammer-9999.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/hammer/hammer-9999.ebuild,v 1.1 2014/02/06 23:37:24 lejonet Exp $
+
+EAPI="5"
+
+inherit eutils toolchain-funcs scons-utils git-2
+
+DESCRIPTION="Hammer is a parsing library, which is bit-oriented and features several parsing backends"
+HOMEPAGE="https://github.com/UpstandingHackers/hammer"
+SRC_URI=""
+EGIT_REPO_URI="git://github.com/UpstandingHackers/hammer.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+DEPEND="dev-util/scons
+>=dev-libs/glib-2.29"
+RDEPEND=""
+
+src_prepare() {
+	tc-export AR CC CXX RANLIB
+}
+
+src_configure() {
+	myesconsargs="bindings=cpp"
+}
+
+src_compile() {
+	escons prefix="/usr"
+}
+
+src_test() {
+	escons test
+}
+
+src_install() {
+	escons prefix="${D}/usr" install
+	dodoc -r README.md NOTES HACKING TODO examples/
+}
--- a/dev-libs/hammer/metadata.xml
+++ b/dev-libs/hammer/metadata.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>lejonet@gentoo.org</email>
+		<name>Daniel Kuehn</name>
+	</maintainer>
+	<longdescription>
+	Hammer is a parsing library. Like many modern parsing libraries, it 
+	provides a parser combinator interface for writing grammars as 
+	inline domain-specific languages, but Hammer also provides a variety 
+	of parsing backends. It's also bit-oriented rather than 
+	character-oriented, making it ideal for parsing binary data such as 
+	images, network packets, audio, and executables.
+	</longdescription>
+</pkgmetadata>
--- a/dev-libs/libgdata/ChangeLog
+++ b/dev-libs/libgdata/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libgdata
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/ChangeLog,v 1.70 2013/12/08 18:01:35 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/ChangeLog,v 1.71 2014/02/06 23:52:20 eva Exp $
+
+*libgdata-0.14.1 (06 Feb 2014)
+
+  06 Feb 2014; Gilles Dartiguelongue <eva@gentoo.org> -libgdata-0.13.4.ebuild,
+  +libgdata-0.14.1.ebuild:
+  Version bump. Cleanup old revision.

  08 Dec 2013; Pacho Ramos <pacho@gentoo.org> libgdata-0.14.0.ebuild:
  x86 stable, bug #478252
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@ -4,18 +4,18 @@ Hash: SHA256
 AUX libgdata-0.8.1-empty-names.patch 5173 SHA256 c7f1f7d380775e7b7e8756f58fb221bb04aec77de4e95b3b9f5f70bb7e0d7add SHA512 a332197998582a78f172065e7228ec893bcf36d2521fb2000e969d86d8c95fc3baf453f044952c2fcb9e5454f2b081704ccbf8dc188668175a0ad907ae81496b WHIRLPOOL f9b4f3a6df5358552487f32927beb476c2a5e9dfe9cc0d4d508f549bb7597fbd41a1dd8ffe0c5d9fb52dbcdcce5937357fd768603a3c86c90869ba5b363a402b
 AUX libgdata-0.8.1-gdata-symbols.patch 1060 SHA256 ffdcf7b030eb2a620ef04b410d4f82dd40cb1dbbaf712378757163d70d6f1b34 SHA512 07e7b645248b9d0a497c2903b24cbef6b0adcf25431b7a171e011c97482208a87e59d4964128c14cc7c36f14705cf8ac41d4708fa7f58c927549389f444a9cfa WHIRLPOOL 5a51c4aceb69e750fce158e4f1252dc11fc18a3e2ccf1457d84e72a1e49142336f7608f9166261b24b1aa4de6a3ac4496e22bec328307e55419fe08ea935c4ff
 AUX libgdata-0.8.1-validate-ssl.patch 1896 SHA256 f4c082641d86aedaf287853dc3200d63c8d9138f7c6df9c3ad49809f66f5da14 SHA512 391b4562a2e2e73a6f494225f1208b0653643f2fe4e73172017823c89f1d3a577b5e2b6de6e40e795206ba5c0705f9f6cbfbf5000000293d30210da20a7971cb WHIRLPOOL 5671a55f68c15aa8af4ee35b4b3aaf30999da7b8df5d8ab20128640b7e4cf729799e6b647a187072964c583ffc0d026f25ab6f1d4e9f13539b1cd6c2616dce87
-DIST libgdata-0.13.4.tar.xz 1331592 SHA256 ae405145bb6a2109488b7123206b469b141f17317066471dd485b4ea50499c83 SHA512 a9914d64ac36a37e616791c92e211dc32985dd688b427d5a118a0cc9749e36386e7d63a908e82fd8dbbc70c6082056b232f40a2eb2b338271f0c7a42761ff99c WHIRLPOOL 1a403b28ecde115498dbdb802095abe11a28d8512da6da53874c10923e7c446c3c2706843fc89a0372c5107a844946de807a44df794061cbf4b1f8447a65e1bf
 DIST libgdata-0.14.0.tar.xz 1358056 SHA256 5d415241ae4ca5a2d952bf7f3e9a372be6bb0537b24d83a05e5fc94948d292e9 SHA512 64bb2e81e6c092e4460a1a3f6e94d1456dcb171bafb5a32b779fe42d39452653118693d5eb9e858015dd6f3bad8a81df572a1c213f2b38d25f0a3a2dd51c46ab WHIRLPOOL b79b2382fc568a06caa7dc01fdae3c55b57e5fd8414cb5fa28a49b1ff1605ef33ff6ece1e0f675c4a25cbba5694a048d6f72427136cd886df40e00841f095366
+DIST libgdata-0.14.1.tar.xz 1465468 SHA256 68bbb2cb70028d79edfaec17184389275044fd58bf881e36df2663e7e191ff1a SHA512 5c0d3b0b7fc52184d8614bb34225c783ddd603ebdad3ac75d218e04ec6f471c66d86687f0aef038949d1238228b7e22e8e0768845adb0103a0ffe14125b58ad8 WHIRLPOOL 20d8a6244c4152730a460cbe088725a44fa9fee9f02bf6a5c589919de78083f0246c8640faa9912fb1a7d3da3e7634df6ded02ca63fa5a98e4151b34de5411eb
 DIST libgdata-0.8.1.tar.bz2 1201616 SHA256 080be3e677e6098d0f1bbcbaf8e474b4b94fad8a0d07b5a2969c3ab95b68d0b9 SHA512 61d65ceae7b82a497ba4c2c70a0486a108ae8dec9f0d7885fac8d33dd6a4f4d1eff068e39fb2ec5fed69f349de4d393adceca0ee242f2b4cb6045dbd48743643 WHIRLPOOL 0551ddcb3d9abb3e3633ffcb98e67036d5bdb914d3e95405b7c5568b471784548d02d3f4b0c4df4f76d2396a2be6400d564afc10527c2aa5ada9f812609ab8b0
-EBUILD libgdata-0.13.4.ebuild 1980 SHA256 01b2fc33d6e94922f4ac381b572f924d8787c7429455bc123e20c35f16d017af SHA512 f9d25d380198f02552f6b4e1fe07108564d326808b8bd1fd59b304ed0f60c4c8d05fff8eb5056c2994204029876002a3ea47048ebed58213f2d7e8a67464648c WHIRLPOOL d8b9b4c061881de1d761a67acdf282c7a8e2d9e53759344e88b3b875a2b3f4a3bf945a1af7c7c1471d5e703c2c0e177774627c9a7149cea5c5ea72db1c64aeab
 EBUILD libgdata-0.14.0.ebuild 1980 SHA256 7bc5aa7e8a3fe98279da4b108f44bc11ffd66bff570fa6e86d5b6cdf5db6ef86 SHA512 7b13ae7f88e1a17e6d1b1d02c0510c044b9847d0879bc2733a20e39af03bc671636896ec1e1f83ef444e5254a85c26cd6df709b83bce94815acf6be473b9454a WHIRLPOOL 439f4302ca58b8d8292f9c209b140006f71991e540a5cb8c6b4773cf214e6901ebd50625d8b04e5e2cfb0272c05b6eaea59e798ed314b3c3304afb40a4cf2be7
+EBUILD libgdata-0.14.1.ebuild 1925 SHA256 e3fbbc7d2f4e46ee7b795bcd400803a17cc4f1f1691782009c7ab2d20698f411 SHA512 02e6d6c31bd586424f7fbd343fb924542e5569c3d033d71bdaf788de74df5b8d45f345cf91fa5b42f0aed3c9eb7e8de07d1da7d76eea7cbfda893f235ff362b3 WHIRLPOOL a765f55c2eb225edf2c547e0fa2d3aa0d596d610c864ac53c392b7c550842f25ea93ce171e011116c211c2fc3aeab737d06408b535250cd901a454f71dbed435
 EBUILD libgdata-0.8.1-r2.ebuild 2136 SHA256 15a222f97fffb3ebd0e534e7765a1422d3f7ccdec711e85a3bf0e74dc78a8570 SHA512 1a974f20e540c5016bc41ae7794796029e759797c258568fcc145b8c9a1014a74a3b1ee8303aa9139f95309e63c6d6149247baa5d50cedc397eab8d0a520576d WHIRLPOOL 8166a582985efe815d3531b32c04e30d3b0d941c2d195902cede702c4518ec6962361b6e0522cf6def0145cde98397ccaec251ca30a535c0e6fa3e74ee6858c2
-MISC ChangeLog 10479 SHA256 530f3c2d20c268cb146bb65f8b2e80aa8964b5560c6372c6498adb6acd9d6827 SHA512 36d9a380595cfc988324329edaea1b2b3b9ec1b573f78b044f23a7e972251252a7519dc2c021d2ef7c20715103759b980fc5fb3850510baf3e64d39ca64b34c1 WHIRLPOOL a3aadde6c83ffccd3d441f2fa09d52b76ac9a3a5b8733232471b7c4e1fff7d0e073875d908ef7a62bef4761db6d83c92a678f5426ba0accd1f8f5f046ab45e73
+MISC ChangeLog 10654 SHA256 982d7f4e6876c54a4984cd37bdeecf971a3f45b6096471bd47e07cea6c355dc0 SHA512 84aaba571f2e3e396d65a8d5a1ddab89ef1db1ab85f9a7a3ce16267c2e207dd85af8a0ba77db632c5d690d5fb9f5622bd8b357c42fc78f059e91f4a57bc076a8 WHIRLPOOL 020921ce177fd005bf4ad3052d75b0f6a3de2c88f7b5dde66761c896063f3f96c8fa5da0ca7d4ad9496a99b6c6e76ce1e960d7c4acb6cd572c7bb326b2782ee9
 MISC metadata.xml 235 SHA256 528500a122db5bc942917e89b99a9702c661777abd9c67040bfe7bf99d94bf36 SHA512 30bfa33b83835e6e1d74cf8025b2647dfed17b29a77b82e71390edd455b48a386c738462a33010e71ba343c1568bdc3b191dd7a0cb94f3fa9cde9923e650721a WHIRLPOOL 4c7e24efcb3f2238ef614bd0f875ba2ad6d581905c482ae5d87c7bb45312be539ae4bea72e5ec1de86211e98b9a9e523683ca246d90fca349791b56e3418936c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iEYEAREIAAYFAlKktAAACgkQCaWpQKGI+9Q5EQCfY3pCiVbooLq+xPzI0X4E7W99
-U4EAnjn8WIluM4Ea7ejQkh8+YjAHsZEc
-=ajmy
+iEYEAREIAAYFAlL0IDUACgkQ1fmVwcYIWAYITgCgtjWT3bjTdePIkX89vD/S9+NO
+dMUAnjYRDpXkHC/kbAY+JVr/+k/VEtFA
+=vO6d
 -----END PGP SIGNATURE-----
--- a/dev-libs/libgdata/libgdata-0.14.1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.14.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.13.4.ebuild,v 1.3 2013/08/30 22:42:28 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.14.1.ebuild,v 1.1 2014/02/06 23:52:20 eva Exp $

 EAPI="5"
 GCONF_DEBUG="yes"
@ -28,8 +28,7 @@ RDEPEND="
 	>=x11-libs/gdk-pixbuf-2.14:2
 	gnome? (
 		app-crypt/gcr:=
-		>=net-libs/gnome-online-accounts-3.2
-		>=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] )
+		>=net-libs/gnome-online-accounts-3.2 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
 "
 DEPEND="${RDEPEND}
--- a/dev-libs/libgpg-error/ChangeLog
+++ b/dev-libs/libgpg-error/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/libgpg-error
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/ChangeLog,v 1.102 2014/02/06 00:22:51 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/ChangeLog,v 1.103 2014/02/06 08:34:16 mgorny Exp $
+
+  06 Feb 2014; Michał Górny <mgorny@gentoo.org> libgpg-error-1.12-r1.ebuild:
+  Use MULTILIB_CHOST_TOOLS instead of inlining it.

 *libgpg-error-1.12-r1 (06 Feb 2014)

--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@ -8,18 +8,26 @@ DIST libgpg-error-1.12.tar.bz2 489266 SHA256 cafc9ed6a87c53a35175d5a1220a96ca386
 EBUILD libgpg-error-1.10-r1.ebuild 1273 SHA256 8ce5bd18a304032d63a321aad92110afd1cf6ff999346a810add23eb1bd2f077 SHA512 bda6d0fed15d92750da0c662e3dabf4e49743282789d82fe84278417a224302d4a63d3368e1976d33ef42dccbe6a75d1b49e930cdd1a895dc2461130164a9827 WHIRLPOOL 4cd0d606a4fe500b05cfed4eeaba8136127e9f524a6bf0f37f0c9f25262c26fd2f3235ecbf9ce340824f02b244ba0ab827c3f8f84e2a30a80b388eb22137f7e2
 EBUILD libgpg-error-1.10.ebuild 1201 SHA256 d318f83a8e95550663327ca7b345bf7165b9bbd5a072456f9522a249f079a3b7 SHA512 217d0f91951204fb1bfb8a0d5b04e46cf44b2f271c5530348ba89a373f5cabfd5fec819c142c491014d098b834f289602dc45ba33fd6799b18f9383107bdda35 WHIRLPOOL 903eac9c10b9bc0566fdf090cc6fce1fbcdf27b9a51c66bff9f34ed841fe653e320d765bd8875002b02ebb807a6824e1dc2688ffad4a7742cae4c4bd0b02f770
 EBUILD libgpg-error-1.11.ebuild 1200 SHA256 64b05f95d08b037ca0d70db37672ef67aa6a60148f9ca3ac9a75199a3b88703d SHA512 9d2577d2d739a5bd22ae5d167fd2554fb9693baae3a95add98e8fa0af17161e35fb28b6bc07b62be2a9b63d1d7d2a903dfeb43758d8b57160dc69c1044947a08 WHIRLPOOL 5b134fac581e7119d848c5c3bff0a48b51ca1d71ad73df05bc5a65c7862b53aa1e35143fa22f5759015fb9888fbfd0af9fd4635959b7f7229962b14a69790dca
-EBUILD libgpg-error-1.12-r1.ebuild 1725 SHA256 2b6b97cb97f032e8b4baaa4f7c1e08ecad10a58cc48184fd30cb6c7cc91654da SHA512 03e6c1f10a870949f56397369c04efb729f3bc83115551025e597de383274df68a8c2471a31d12a572a792f37c35ddc86e444bd8def3f0cd0ca99b7f244506a2 WHIRLPOOL 525c396e7af08d20263dea7627dbff197e0950681de760efa1dbf513959440e61cd5f38979dd7118bbdb5532ff5136e1db32353791d13adc21511c474820c419
+EBUILD libgpg-error-1.12-r1.ebuild 1580 SHA256 4c44b79c26b98008a4be98bd81840b453526ce446f5692459126a2dac2dc25cf SHA512 3cf01fe899697b558f70e7b474fa09a0ae5edbf5f09b3e8cc1ee0244f0dc371983d6344fe97527c7b2ac4528ad99ea493b62a414e6e9007856a14b1b150a2d1a WHIRLPOOL c84bf4766b91b42ade92e8d70236b39b7209ce231c068aea31cc3375172c8a752346d92b62e2c58697b60bacf8b752bf04b0d04aeacc07b8b23c5f6c0af8c151
 EBUILD libgpg-error-1.12.ebuild 1162 SHA256 e79c470e7c51a3506a19838ba6b07e926a6a85157217d11ce4b799f8d24e15ae SHA512 cea74d197312cb867653066fb1a9cea5478f65c1a607dfb179e6707f3ba749b7d69485cbe095ec7f369bd0e9a642857be9a7150261ac3cde812e2120cd9b568d WHIRLPOOL 6aa7b09f8a696b13ada945e94864006c61748b03b4c9656dcfdac69878893680e9f944e48c0053ac1ee52a28b71deac62042f6c551b3c72c1a9c3acd93eb83bb
-MISC ChangeLog 13406 SHA256 b3fad5617dbc604594849da3be602b3f7657ebff49f4da0ad8a8f7f68351b4bf SHA512 543ec9b2845b27a8ca65ace54bc09ba9b6d0562b8296dbaef26406550e630ad28582c805c52d9bb0dfb4404e0f38f50331d13ddfa464768b315c2df20e7a031e WHIRLPOOL c3fd17ecb74d4de77902efb9df4c09d9e5f3582714feda446552609ffa5b189f6775500633173d8888715e6a1526734d3e549d9ed8266ae947f62b8b34210a37
+MISC ChangeLog 13534 SHA256 aac8657307e5c289d418e89bcff0a57332919dcae9f6f46181ec93ff34497ad6 SHA512 2fb029b053520b2b33fdd6a3b1c765f89ce896fd4074a3bc9830790f32b77dd4e9a9033727d3948a79f8e3967ac1790a7384a466b1f3e8a423fbfe2515946e5f WHIRLPOOL 91bb82a8ba69165de811f76cae6c76b54030db0380a24011c9bf1bc12d28ad251616235acbb24f06245657aaf678076c5fe5fc1ad1a1d596871b3d0bf245ba80
 MISC metadata.xml 235 SHA256 457ae31679e09fa587eb1ce494f8bed85d9057e2a1c2b72462b4c02186067e26 SHA512 49cfc0288e90fe1a8a71517d5964b727212b84603afc37faec0101ca947631e288aba3e1c84b7b33b4e24509d0e798fe9d2d6aba1a1209c16cadc8b7b18d9908 WHIRLPOOL de990675240b800437b9549239a7a2f4707bff47793a70a03828ff1af0b43d237f2284d426cf284f156fd15beab1ad59961d0033e2542d309878fe6f6864e423
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iQEcBAEBCAAGBQJS8tXeAAoJEEqz6FtPBkyjWoMIAJqnAlioRwQHohQHnHGfHAIx
-syeXTwQ7+qMBCSexC3yB11GMhdQ2mSo4TtYf80b976aQiRlBrdHOv+Ikz4c+/Pif
-B759+3w/E3/mHY+Dlgf/sO2LdjnagR2ylXBCvwpbhqhH3xLQ2PsiWHkmNcLx7dI6
-/UbqjprmCwPmy8LFFGu8ub+GJxBQH9K7DJqciMYFMDQxzWYrvEMI1bGcl5INj82n
-UyV8WkJxxAPVDI4Vb0k651SGlL3y2MLmvfna4gOqtJuPwRXhCAmGrSNAYQpUHWVs
-j5Ih2afrPuu/lxNcuBxS8S9GVvJqulEv/6SCq99Vvz3biR60Qyd6CrHjuZtptUE=
-=7+89
+iQJ8BAEBCABmBQJS80kJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOGg0P/3qune3BIIY2IPICClHgL1N4
+RRJz8zrKmAw6MOG/iz9drsjxdmCI2idQmCelN9V44R3zyVVeTWuCu74ADLosDALO
+gfP1wE7gd2J5MNdrQrVSaZNHx3MEZkgBt0E3ubybvopFH/IP+2og333kdPFc9hxe
+AeE78zzndmhKJOpl1WxFAGbmznwcBHR+bwC86U+WEZZfezYUioozTySv670FYtXH
+EHLmlav2GfMoeldAoRBp+zVrWU4HKRUf05oFG4FqSkcLpe6saGSo9/wtbU8nXL2
+aFVY9LImlY4WYLUcIiD4aBOqZRgVrosie1uekhEJanivbsfc4WXLRQYX9YcfA2G5
+U2J92AbSaYIfN4N8e2crZ7qByWBw/8g+eEdxoPRX0MOO4SmU5d3I4AaP0Xz13HHP
+02Xjj15Sou9GE11OW+5354oxijTvBKAG/q8p89uL6784GsYopmqa71gdSsuJC++d
+2R/+I/ZVRah/NKDS8C7ALPUj86M3ZbeWsnJrT5ibjTfBT49CMlhy2jhNtZ8IOrpO
+gqfqDLjBLr4n3MxNCxLa9PZyfZDQ0hMFtoUlpxeQHWkG4m7zUgeh4+qBvuMROHt2
+cV7N/Q9s4ZHJ+/fk/oDbC31lUuJHUHi0v+6lQcBso+GOEDlt36FzBPLwrfaU0lqV
+26INBGMT+lUS3rggK75/
+=jjMQ
 -----END PGP SIGNATURE-----
--- a/dev-libs/libgpg-error/libgpg-error-1.12-r1.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.12-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/libgpg-error-1.12-r1.ebuild,v 1.1 2014/02/06 00:22:51 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/libgpg-error-1.12-r1.ebuild,v 1.2 2014/02/06 08:34:16 mgorny Exp $

 EAPI=5

@ -23,6 +23,10 @@ RDEPEND="nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"

+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gpg-error-config
+)
+
 src_prepare() {
 	epatch_user
 	elibtoolize
@ -43,14 +47,6 @@ multilib_src_configure() {
 		econf "${myeconfargs[@]}"
 }

-multilib_src_install() {
-	default
-	mv "${ED}"/usr/bin/{,"${CHOST}"-}gpg-error-config || die
-	if multilib_build_binaries; then
-		dosym "${CHOST}"-gpg-error-config /usr/bin/gpg-error-config
-	fi
-}
-
 multilib_src_install_all() {
 	einstalldocs

--- a/dev-libs/libgweather/ChangeLog
+++ b/dev-libs/libgweather/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libgweather
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/ChangeLog,v 1.101 2013/12/24 15:54:19 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/ChangeLog,v 1.102 2014/02/06 22:47:18 eva Exp $
+
+*libgweather-3.10.2 (06 Feb 2014)
+
+  06 Feb 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +libgweather-3.10.2.ebuild:
+  Version bump.

 *libgweather-3.10.1 (24 Dec 2013)

--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@ -4,16 +4,18 @@ Hash: SHA256
 AUX libgweather-2.30.0-fix-automagic-python-support.patch 838 SHA256 d6e1462c5a7d57908bb378dcec65ed8ec1bba8ac19883d67801a696b73157597 SHA512 9312d4da603b595c7a08eb908a70c1b92f1ecf901f16eeebdb17800441bb895437b48a1781dc8ca4dc840f76ddaef2da5c7fbcb500165dfe18996dcd43f10695 WHIRLPOOL e1c7022c397b3c3237c877b7a0889fdde72215cbc8cd07c0187753d6aace784aeaf07dca33c6b9cc6602aa2d6a90db0e3fed1c1412c433bcf9224d6b68caa139
 DIST libgweather-2.30.3.tar.bz2 7449487 SHA256 b835374661423f37c46aa8e37368ae24a68856f117b7c21e475a21efdba5264c SHA512 4cbed97a65d02dfdb015fced22cc58d681cd508473add0fc9060206e2736e2c97aa80d3a70923a6e46e0f8de566baffbd56bb86faa875fa565ae52630a05a071 WHIRLPOOL fc000d21f5772f3852f1de5eaf7ebab42f3deabc30ac1a96f12b40a2ba9c864afdf9d0fe01809cdbcd0749b9bd5e37a5c177df199bf5847b2c5ec6cf1cd9cdb0
 DIST libgweather-3.10.1.tar.xz 3956132 SHA256 ae8e785f6798b4fe4cf1461c57faf1c0625716ccb92ea927e091840a1205cfc7 SHA512 6468abc20dff44d1116d7f17534a97933762a1fb1818f443b23dc0265d520a08a68eb3e82e89fc11d01a1fbc8b38cf797c0822b6752a3643fd6a0374601a6bc1 WHIRLPOOL 1f82ff43f875346337a1e7a5ab8ba9216269d5dd71e27bb8cd2b706d8d2f1f89c324e8931d6989fc61ab33bf27ef62592673f0ce3defabb896be25cedf452753
+DIST libgweather-3.10.2.tar.xz 3970388 SHA256 454d8d681114f7f9522df2710b63f33198d0d7ca6f0726eef7fcf72e1b580005 SHA512 0de26323522a9902b8a4c4c0b773005543fa8fd6d639e70a89487015a4653e10aec5baa792d9475a0c10dd09d55e7417a896cea738b7274fbb740429c61b8297 WHIRLPOOL a7054bfd9a3e966cd1bf2abc6d148c3b412340c8c1b275587a2d21730d6e69f1b8b3f84e224e6e57b06eb60752c9d55db1ee49ea095a855aff26c7cb46704e3f
 DIST libgweather-3.8.3.tar.xz 3860628 SHA256 3ecf2666389de2bff6a69976470f7cbdfbac2e774ecf8fe47f60832788cf11c0 SHA512 78b61745b8991c4124066e94796e070eb2aa8256889911f997363f5baddc84c54183d7b9dc19e2f7e5fbc61623f96ea8064dbe22d349314ffa663f0d8a454213 WHIRLPOOL 71443b32dba75055995fe127236fb1823aec5434168ceb5a6f80fd1dcf03ba0e8620bf3e17bc14d4c7e02925ecc77ca61c981d1a6db760ccc39337e5dc2bfc6e
 EBUILD libgweather-2.30.3.ebuild 1658 SHA256 81c563f8aeb4555a2a6deacbc52a167dc3e8fb0befad03d200629a5f84e90d7d SHA512 ed4d691266c1f17d1eadd293c9eef9cc2591ace2ec8042c805e33bae29d46d5e8444d2d65cb2d8c3dd51c0f33b4fa3053074f78facfa2af0a3bdebf7c63513b7 WHIRLPOOL 6ca66c8aef4d4540e3d63a94e7450eb02cc50824042af405d9b44af30fd38f0300d0de463be4100fedcfcfdab5d3debc58d3026e28c053acd741ca02284728fb
 EBUILD libgweather-3.10.1.ebuild 1477 SHA256 56755d6f9e7fa9a171e91d2c5fcc467af6faf49ab7691c40a5fa05d87b17609c SHA512 d05f948a401be26580086dba04b6f2c05fa5417df60a85e031ed4229cdd606a1af28bcc4ed207e85f3bf2da57304ee9459dd4ea3a8b9d11ad6934df6e8b5ef31 WHIRLPOOL 70491722e6c2b8a18388e0a62ebc35af067ec4e75da2509022f4d0c0c036ffdad8e46d358c41d5060a7f0f2c6c6a810a30bb0c60ff82f643d2db136160d7a784
+EBUILD libgweather-3.10.2.ebuild 1475 SHA256 75677987b5d08c25d3f130d41474eca597666cb0d8a15c22038356f29db1ee00 SHA512 f1e046cc5f682f49e47092d84cf4a26ce5245e32e0e561163c179ed9ff651be48e4a722b6935f99193016d9241c4de56d573e4dbc2188a71466e17dc072bc5a0 WHIRLPOOL d535441c61f497f61d5a015b400d5d510fb545abc2b23a56cf0f94946b48f008390671303ff38db64a8c03d818c64c8b06ee89ea05229991dbc26d3f6d30cb77
 EBUILD libgweather-3.8.3.ebuild 1272 SHA256 d561c55cf3797317b97c05ba1861300707dd87071b43f066aa3bb83ba05f9df3 SHA512 ea92d4f7a1f2a2efce1616fb8a83355d0894e6d04a9bf1fbd5717bb65611aa3785faff3f94d748950037687e9cd587d904b33483a379eaa54eebd767c364e5d8 WHIRLPOOL aa4aff9713c995b726c436dc1a163498b179ebed80ee9e7948b990869a90f2387c0ab1d98279bf88c72f17252fe4c1dadb73224a28103c01c1c5c332b18770bb
-MISC ChangeLog 14463 SHA256 db983574dfddf6e73deb17c51d94ff1ee73802bfc535b465705be4245515efa4 SHA512 dde53a0a24d0dbb2672af0f5556ec3cc5752413f1c410eef06e5235718db93efdf2ceda34ea2c2a7639a554709449871109c19a7e3e0300f99c6bb94602006e0 WHIRLPOOL 3a744798a20d97f97c9a62a3a777b6c7075d1b6eb015227929143913eb2fd3deb2f2275ec21bccc3a5cc511f227ec275a34dff42e60e57d540456fa4c0985b58
+MISC ChangeLog 14597 SHA256 29f90ed3925d274db446a4ba3491c679ca2669e943094687a1754bc04101c1f7 SHA512 38d8218e9fdcbd0808d0b044211b17a4eb69223e043c7bf9ccbf6016f03554b1acf36d3acbfc5d5b79a1dc17a14a122200f0821da9fa2cb6914b5dc56b444a01 WHIRLPOOL 3c66419006e27b3c0c1bebd456ceb80422da98ed3f67df60967500819c0f2811d5d70584eacc9edf55f86eda9fca4606256d0552594c764398db277dd36e9982
 MISC metadata.xml 255 SHA256 46fe560312c5a99fbd5a22a133b1f29a8c05a832b5d368809d39467e2a03ca00 SHA512 ba171878fa6c0faf41fcf9171e47e8a40871e57adfe816afa1aff814520af6e739a3cd48940ed9c9e99e660004e4d7c24f635b0f60b768c45f13b40a25e4bf00 WHIRLPOOL dbcd3a1f9de18ce3229431938eb17033710ada6827899a3b9e35f8bccf6eab41330c4b548e1f47764523a5be12add795b279c564c1d8698dde760b6cecc0d4fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iEYEAREIAAYFAlK5riwACgkQCaWpQKGI+9SHNwCggQMqUxyd6yoU8sT3vFLkwAag
-8CYAn1uiL8L4MKDddK3D8Xb2GPQsYTrV
-=nrNc
+iEYEAREIAAYFAlL0EPcACgkQ1fmVwcYIWAaBAQCdFwxyPs6YlfMTFQyikeYAAnTA
+AfIAn00Mgu0i5pVp8Dk4W7arGTf9F4f3
+=vNEf
 -----END PGP SIGNATURE-----
--- a/dev-libs/libgweather/libgweather-3.10.2.ebuild
+++ b/dev-libs/libgweather/libgweather-3.10.2.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-3.10.2.ebuild,v 1.1 2014/02/06 22:47:18 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Library to access weather information from online services"
+HOMEPAGE="https://wiki.gnome.org/LibGWeather"
+
+LICENSE="GPL-2+"
+SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
+IUSE="glade +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+	>=x11-libs/gtk+-2.90.0:3[introspection?]
+	>=dev-libs/glib-2.35.1:2
+	>=net-libs/libsoup-2.34:2.4
+	>=dev-libs/libxml2-2.6.0
+	>=sys-libs/timezone-data-2010k
+
+	glade? ( >=dev-util/glade-3.16:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-applets-2.22.0
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.50
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS"
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
--- a/dev-libs/libyaml/ChangeLog
+++ b/dev-libs/libyaml/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libyaml
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/ChangeLog,v 1.35 2013/08/08 22:53:43 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/ChangeLog,v 1.36 2014/02/07 07:23:45 radhermit Exp $
+
+*libyaml-0.1.5 (07 Feb 2014)
+
+  07 Feb 2014; Tim Harder <radhermit@gentoo.org> +libyaml-0.1.5.ebuild:
+  Version bump.

  08 Aug 2013; Tim Harder <radhermit@gentoo.org> metadata.xml:
  Add myself as maintainer.
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@ -2,17 +2,19 @@
 Hash: SHA256

 DIST yaml-0.1.4.tar.gz 471759 SHA256 7bf81554ae5ab2d9b6977da398ea789722e0db75b86bffdaeb4e66d961de6a37 SHA512 5864412b462f30e36550a1dcf52f66da9035aa17ee367bd41d0ba74d6809e281ea00c0bb78f9c2c7e08d4689f8ff6220d684dbe8dcd83cc172282c58d695d784 WHIRLPOOL 9fd9b478134cfafa43566dff6ba9d699cd750904563b3a73247fd1f45ff7a3e932d789208a71e654b7e10de85b468d402cfaca1d2d06e4e7db07fa1c748590a2
+DIST yaml-0.1.5.tar.gz 504897 SHA256 fa87ee8fb7b936ec04457bc044cd561155e1000a4d25029867752e543c2d3bef SHA512 be80c85360663dbf64b1adf60f725c08ff5589379858b22c089b1fa33b29083898d651bb260c16a14128425ca4a26dc7701fafb12937632bf75f9b15615a260c WHIRLPOOL 63849ec19aff5e0c08e2d1e1cf4fb1ff652b1c33f85b2c75958f7c10a87dddc6f2c1a9cb993d878bbe5b34fb9ab3adb63f9e5e48578f9b142ace43e47e37cfe9
 EBUILD libyaml-0.1.4.ebuild 1129 SHA256 f34e592304eb9087a685e02fc9edb9b51cd90c1351410058cd1bfb686f0b2358 SHA512 7b2f49eb9c31db3871bf0d75dacde2171f0cdef7199ce2c1b693a6d9d95c735b01ef0f5f0b1ec160fa1d48a0bcf7dbca1f65bc2ce71ee8b2561c436c538f4cd0 WHIRLPOOL 04063fd484750cc95bd8057fe896ea7da28c16d3c28f879366347953b69b0085681a5c169366336a177f9167b581cb18865cc0e9404db6469be4f2f8edce08ae
-MISC ChangeLog 4008 SHA256 bcf02711a4c2683310bf102890e75695827f1c52c4c8145ad27870adfdb4bc0e SHA512 156367fe0692e4e992d01a74d139659720b0109ca21a5cc79811e62204167d5d2b76d34c9894c66727111c28aa9c73684129e2bce77f0c44ad08908baa46ec89 WHIRLPOOL a351a50350bdb0a6b724ff6fbc1bb4e11f00cf8d76de7a869aca4af55589c06322c542ee0b3a20098695ce8f4b72ea1842a44ec44ce3ce70a9d72a73338e5155
+EBUILD libyaml-0.1.5.ebuild 1140 SHA256 2d06454e57d4783825cfdeaf914d16e79394dd82ed86e6ec23efbdbf6bee5f52 SHA512 c97de04c6c6b6ce10e783ed3d2c3debac4567b399d496d7abc65b5f9c004469789e18cfa0ef0252dc97fd6b8495b02afb141ec414f83ec88d4df670ec6eef140 WHIRLPOOL 1652586427e9f317bd948e1d148175a792dae26cabc60f47915ce3594bc766229f7da9e23739579f6525a122ea98e3255c89b82ee6e29758b2d30d570b2ab47a
+MISC ChangeLog 4127 SHA256 d0bb1c0a137f7be779537864981fcd628c64f0b1bd0a6536af7dee589c1df646 SHA512 4197e9ff70a34fdf8fe2a3b37318d09d97758a10892c1ef4823d7c60989c76425243805d3c1b4d4a98421e4d76e86b40b19147145972d69d92a9f43a0b00c441 WHIRLPOOL f2cebbce1aeaa2bf9e0080a0a19629acdd55c84a957603d748d4b6c95d05e22ee9952cd6d92707dce68119b9a59d55d68c29ba624e7ccb2de87a4098fdc6dec4
 MISC metadata.xml 379 SHA256 80b7e3c654145df8a1dd27023af6315cfe9fb048fdff476855b5893979ff26d3 SHA512 391119b16ca85eae2f0196bf33ff94d761058d3d6b6317e8a728e989a436fc33492d2c21317134fca9a68196fd4412a4fe062e621021601fba0745fa7a9ff211 WHIRLPOOL b4f1677863f39ea6478910494915fd3b5426cd3316a75d6ee9c7d1c503c654af0f7b1e7dbadf9916e6ace02c313429b745cb00e09a356b11792a03de43c38fef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)

-iQEcBAEBCAAGBQJSBCF4AAoJEEqz6FtPBkyjZvEIAJi3Q2qbzkFYRgIuQ1MKsqRz
-Zc1tpAKF8lBYyxbYU+7azGGRfA9Rw8aX+jJIN8WzePiY5vwf/NdU0096KJPjdEyz
-Zefuu8olVkRnmOWBCNee5pqdY7DSaceWqrTXIu3n7z4h6ZMJutYoMEHT3gWpnXtO
-ULq6dnvxmAmPVMpAjJBP1Zs/OAUgxpQ2FKDBrUMnk14TCsdHaG6nD3q+ldGau4l2
-71G3AzGJ3FDodc3EnZed51J4KVSQlc/S0c4DZ0yHUyFv3Mb7clz8LxL1MhdEVCdu
-s3tgYt94KGYWurjvXcTdasGMXeMZYDu5NjuS0zmbMsgyMHBZjcDnXzqeoL5ntCQ=
-=DdEe
+iQEcBAEBCAAGBQJS9IoHAAoJEEqz6FtPBkyjcS8H/jK3xALAUVF7NpVBpFNE3uai
+aPbyXh1m7h9KBjoF4nfWoIQV4vSQ5kJO5VIGaZulr1r91xLgqeRS24EiomyR0kir
+Y3EZ3bgfLBC1+h37XigYXffj0Mjapg98LJPKQgxHBCRrBI+t3yB82FuWSqXyqXww
+xvBAt8Fe8CG0iqUg2PQHN7WtebDXbobZ9Vh6yVw9K6/qTbxOQsj3AOJrGd9XFek7
+FYkwlgiezwQgw0vfff9MUSp3ZgMgwoouF4rulsQxSP30Zbf3IvoqZB/KZGitGu8c
+3dybHADj6GJITH1NKGxbs8NVCfAa+uqVP3q9G857yTFMZpRaudbSPXUaLMIneZQ=
+=AP3u
 -----END PGP SIGNATURE-----
--- a/dev-libs/libyaml/libyaml-0.1.5.ebuild
+++ b/dev-libs/libyaml/libyaml-0.1.5.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.1.5.ebuild,v 1.1 2014/02/07 07:23:45 radhermit Exp $
+
+EAPI=5
+
+inherit autotools-utils eutils libtool
+
+MY_P="${P/lib}"
+
+DESCRIPTION="YAML 1.1 parser and emitter written in C"
+HOMEPAGE="http://pyyaml.org/wiki/LibYAML"
+SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test static-libs"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="README"
+
+src_prepare() {
+	# conditionally remove tests
+	if ! use test; then
+		sed -i -e 's: tests::g' Makefile* || die
+	fi
+	elibtoolize  # for FreeMiNT
+}
+
+src_install() {
+	autotools-utils_src_install
+	use doc && dohtml -r doc/html/.
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		insinto /usr/share/doc/${PF}/examples
+		doins tests/example-*.c
+	fi
+}
--- a/dev-lisp/cmucl/ChangeLog
+++ b/dev-lisp/cmucl/ChangeLog
@ -1,6 +1,13 @@
 # ChangeLog for dev-lisp/cmucl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.42 2013/05/12 11:06:44 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.43 2014/02/06 12:57:26 grozin Exp $
+
+*cmucl-20e (06 Feb 2014)
+
+  06 Feb 2014; Andrey Grozin <grozin@gentoo.org> +cmucl-20e.ebuild,
+  +files/20e-customize-lisp-implementation-version.patch,
+  +files/20e-execstack-fixes.patch:
+  Version bump

  12 May 2013; Patrick Lauer <patrick@gentoo.org> cmucl-20d-r3.ebuild:
  Fix inherit
--- a/dev-lisp/cmucl/Manifest
+++ b/dev-lisp/cmucl/Manifest
@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 19c/README.Gentoo 848 SHA256 99dae09d2159ddf599a39cdc21168c300dd3c56d7ca454565f08076fb83ae064 SHA512 0ac72a4a1149ee20913de7f0ce76dcb642150b5da7244fe78de032f2beb114d1e2974e6015951003f57565beccad5e067b8485e9518aff8937cc2008f9a614ea WHIRLPOOL c517cda6ae96340503489d51d95169ca4f90b64498d6239ec95d0e989a1870694c93b2ff820280f0782024762edef85b30b3b1aad0664bedf308c26d95e1d41f
 AUX 19c/cmucl.sh 2701 SHA256 61c4084a280e44c86b0d2e915ba79151c44b3934ed894d2256402d850b78dc25 SHA512 d06312b7c93cd21569f5cc83de3a4f133502c747a604feecdb10b0a1285acd06da2d4341e8c080525cd1e13f74de12379cff4f7edebb1680cd1ed33201fd7a1f WHIRLPOOL 5671fa96d2da870f502501ec00fef2b23bcc0ecf83098e1194ea6969956b224712f92e9549796298524f0f4b58677f67eeee5aaa86735c015292e27155e5af54
 AUX 19c/herald-save.lisp-gentoo.patch 830 SHA256 cd6b45f4b981dafd00ca86fd5a76313adc21ffd8d9b30aaadd72819eb40b7a8e SHA512 a97ed14d0f7e96d6e61c3c1206b2d6207712fb20ccd752982ae12e945bbddb8cce6968a0f69e4dcff10d92ac602e5ace899f1c92024a89190bd6f6dae226bc1f WHIRLPOOL 0a92f1f93838c1dce6f276e5820b6d038d7dcdc0ab93cc1bd38d63fd36df5ca396a0a1b16ca2fb28330c155b10b98e6cba0f99ebe2c226094947c53f3aa738cc
@ -13,6 +16,8 @@ AUX 20b-nositeinit-build.patch 772 SHA256 ab3a1bc613e390097dd08148b3d887aa8c92ea
 AUX 20b-patch001.patch 3858 SHA256 d466a5bd4a4d961c9c161b356d647b2030c8f4ca8c672b958ed568214f196eae SHA512 1708ccedea8dcdea7c1ad0dfc09252b7ec5e863885d67401e2ae44ae74c32dfc3b99860016404e4ca44e4c5e0dbbcf71c9cf20b98554527797a45ca03e8fb6e1 WHIRLPOOL 1dd31ba99c854a8832b7c5699e70cf74fbf3de7d311e878b74c36b46205f08a7af19e2c76ab59372ce791f6d5a860a2d9fc63c3c128fc21f616535fe50e6abb0
 AUX 20d-customize-lisp-implementation-version.patch 683 SHA256 81c421f80c06c567d2ae0812c8e0e66ad86631662adfd8891ae36152328eae63 SHA512 77acf6d31d8a932075b61e90b42b2c74648ad29ef3cf2f98e69a44f957672a935ea88a541815c19bf71ba5e64c587d27878288038178a7ad3d96144a26b1bb2b WHIRLPOOL 54cbca06348c4a0b4d8efe7b502e3834102640aa3cf9a0817a39a2d9dfac5e1234ff22260c9cd29864acd1a7bdf156b64f9feb2e87fad9205ce7164c697e5ab9
 AUX 20d-execstack-fixes.patch 3990 SHA256 f507d48eef3ae55e9f38ef96964d2179a3a328837420e866be4509c5fdde9131 SHA512 bb32dfffa6b737af8be924f194112863b64010b00b30caf92c023a16ac1d2884f51ee724b57cdeb2786f10aad6bd0054a835c94f03b911eca4648c2e5927ce3b WHIRLPOOL aaf48fbbb369e7742e06a3bfb79d887e916e892d66a185edbffc23774d1e8c0f73d76fe784d2f36080e7e6fe9d5cd8fdd8c5b6c22b0143db6a10da2a642724f0
+AUX 20e-customize-lisp-implementation-version.patch 683 SHA256 81c421f80c06c567d2ae0812c8e0e66ad86631662adfd8891ae36152328eae63 SHA512 77acf6d31d8a932075b61e90b42b2c74648ad29ef3cf2f98e69a44f957672a935ea88a541815c19bf71ba5e64c587d27878288038178a7ad3d96144a26b1bb2b WHIRLPOOL 54cbca06348c4a0b4d8efe7b502e3834102640aa3cf9a0817a39a2d9dfac5e1234ff22260c9cd29864acd1a7bdf156b64f9feb2e87fad9205ce7164c697e5ab9
+AUX 20e-execstack-fixes.patch 3990 SHA256 f507d48eef3ae55e9f38ef96964d2179a3a328837420e866be4509c5fdde9131 SHA512 bb32dfffa6b737af8be924f194112863b64010b00b30caf92c023a16ac1d2884f51ee724b57cdeb2786f10aad6bd0054a835c94f03b911eca4648c2e5927ce3b WHIRLPOOL aaf48fbbb369e7742e06a3bfb79d887e916e892d66a185edbffc23774d1e8c0f73d76fe784d2f36080e7e6fe9d5cd8fdd8c5b6c22b0143db6a10da2a642724f0
 AUX cmuclrc 305 SHA256 4f1f050f8dcbf261c9ee33075d5546a43fd14f7f0cd0ad486b175081bd4b27d2 SHA512 36ae348795f27a7aae2e1cf10376606b9a6898b4c4f0e6da692b3e60bed21e2825ac766a51fb648f1365b238046efd155e80d70421ff65ecffe5b68342895740 WHIRLPOOL ffeea73a1a69dfd43a3d4cc86e8e6b63f447fec0c6fd6f6f80ae2b6feee2bb1683b67f18b7364a311bfbac9056c73cf3813e455a1eb459884bda0794daff57be
 AUX fix-man-and-doc-installation.patch 1671 SHA256 77b9844670345e4c79510969b2676db1b0a366ed0f1e5c07ac74c477cdf65819 SHA512 d8998ad6ccb9899bb5e08270ed7508c42e81348f91d3eebff81ff9fa2c05adad9dc2a63fbc76dba916efffdb04912d56b75d807e62158246385090919f44bc54 WHIRLPOOL 400212676ea4ada6cff3b3be9a01d309345819be5c29c36ce5c593446a1948299491710ffc4b6cffd70b846252b8437c31cf7f6032a3729143e7714b58db15bf
 AUX site-init.lisp.in 1839 SHA256 6164e40b50a0a0e7175089f0b55d549b8f24ef602c1c0c41f9433f5c61c512e7 SHA512 374e5acf970b1bd26d2318b678cba509296f2356a4672648f8522387c216288e8f43b514004b0d0c98da5d03a5db10435d5f42f57db88c916691eb4ae93f126a WHIRLPOOL 4c4fb508d7546dea9d75dcff3239c56f8c3b3ed249f3f7fd71f9a2a60dbafc57f0b172d2cd2c6efdca5441e8c30ee3f49c829b3db64bf9ab9db5d4526726f8cc
@ -21,10 +26,12 @@ DIST cmucl-19d-x86-linux.tar.bz2 7600189 SHA256 5d459213f37dac8f633377d1c64901d1
 DIST cmucl-20a-x86-linux.tar.bz2 16390027 SHA256 920db6d07427fae919b1b936fea88d242bb664d5e1fbbce3b8ee6bbe98744d1a SHA512 a8cab981eac1b490a164aa9eafc804aaec0c4fbbe454c3d9e7d974d951213023692340c7e6a3cc25878e179bc61a809471ebc80178a5fe44649ebcc9a44a1c9f WHIRLPOOL 81aed3ebccdca5fea5e8acfe5fb5467bfa2fb00a374883ca6f2d6cbaf8199236f611bc9d1af70fd8acf5394d8fdea791e1b5998c96e14822b3c349b3a2673597
 DIST cmucl-20b-x86-linux.tar.bz2 17612706 SHA256 b6c9e1c25abb69fbe08892e3e58e7dc24accb8c0e5a37a7685bfccaf67c800e8 SHA512 367957f99f1191b1b41e93c7a01263c8a9711a0b3404f82024322301b9599f1ae5635c3f6f96b25dc03b993cf7fe27bff48adc5ecdff6ef427b91cb3fbe795df WHIRLPOOL 039974764cf9140451d844729f61259563e58a6a6f430c58db3da0b2b80a0d88a0d5359dee33ff79b8f4095f35006da319a303d721238eace6daa957f73c49d4
 DIST cmucl-20d-x86-linux.tar.bz2 18081545 SHA256 de33346953241946283e8bb9ac5447f288a01b0d205c911eb001dac8675e6860 SHA512 7e2136764f00e6a2f1929fb21902254a96eb890e77ad8da55c0e20ff252899088267936cf47be1711a055e840eaf18889c63a246ba61541fc6fac027481b6a85 WHIRLPOOL 8f9e5bfeb1598077b383ed9c4adbbc3ab48fe634d126e21ba1f9e8dd5850e09d9a835da7b1727ef951b95cac5de40e095536bc276f8368a9246becb4559cd5bb
+DIST cmucl-20e-x86-linux.tar.bz2 18861880 SHA256 94dc1c0ddcaa915f83cdc23462a4cc3c4af98d64fe42e79d7c5232225b149480 SHA512 1eee852b2a11733d0fac2c046137ccd099370bf208be71becc03710e832510b288768f557e326b1ce95cba16490413142e607fd71346e20e5f8592b51d86b0fe WHIRLPOOL 765476aeb037b782380b33fb8e7ae137bb38544547b427c54c23661122552108e8940413c55003c31ba05b4729bb18f99f5b462742cbd9c1c7426f0c04e26863
 DIST cmucl-src-19d.tar.bz2 3780254 SHA256 027a86d3e2729e14cb8101d088716a61fb62b5197af66a4f80457f13134514bf SHA512 d2b156d8d3761300e03d92e5e308d02021ed82763f8efe7f9cfd01ba9ce67f4be192d637bdbdd87a3986ca4077c7dad09f062e58a473016302553604624488ec WHIRLPOOL 5b307b6eea3b5c286ccdb905bf58ae602dd3cb08984355729789595ef0995144d44dd1b0ce500b448b720a5d9956e0728a6f9e0d12b5ecb290986efca3fcd661
 DIST cmucl-src-20a.tar.bz2 6203135 SHA256 a1821808fb2906a3f6fc7229fd7bc558b0896a08d2a227d1b9e726db09c3777d SHA512 a209762f612f0a34a3189d72cfdaaa2c3a395dd4b28b136b5cf59def4e90c3afbe1c4ef50413eae3dde1577c02833faa632d434c088d880a5a4bdc8fc259f375 WHIRLPOOL eb30df377e07110cd794ee5e804f6459a28c73eb67f3621992c7796a52b01e4b224c511b777591fb00fb3ee52d3d17075b719bec05a169c72549112baf492834
 DIST cmucl-src-20b.tar.bz2 5834128 SHA256 42dcb9851e692b18d1f544bcdcb3ae18704cc9726ba42780c9677bac700cf5ab SHA512 c2ea1ebe075a61748d921559e9cfc6cb0effb857fbcbf17b5769f04426cecb76da54bedb5ab25a9bc55d26423952b9d337f2f008cdccba1c451847888203c8f9 WHIRLPOOL 51199883878e486b38d06a3ca0fc4a41935610979c905536db1ec8eca8eb276a61e5aacd874903587afaa82c8d431c66a4d4234400f12911b1d4522b9967d069
 DIST cmucl-src-20d.tar.bz2 6080407 SHA256 68ec1cdd03ce8b2d805ae935a9973400a49bdd39ad360908dcd0ff794d318aae SHA512 44caf37f76078f0f1594125eaa98605f61c53995509883e4c13e97dc20252ca420afb719d279598ce517ee15d8e410583c8ebe612fa2a6ac825448a149a96c75 WHIRLPOOL e8633b9ebce06c1d9a7c62a365153abc0220c210555f1221b94302d8cb7ce91190b43f64b00fb5c39a08bf31566e3fe2131d197c046d48cea480a079982540cb
+DIST cmucl-src-20e.tar.bz2 6147575 SHA256 b18fd27b67321a0c00f2019bbb18557f239062ba947080149ed42e30f72ae7cd SHA512 d04f6ac7335572198d37d5df00934edfc82495294446cc5420dada4f2df44009f0983b438d6f10ce5bb02e46fd89df985da5eee3e91a6a75d98e9f86240c0dcc WHIRLPOOL babb020bacf474e1cea4bc865ba7352686ff5d92d01dd4d44d121b101ac328da6cd3e63798a2086ce29ba260fdbefc26f5f7d496ecb0af9566cb1cbdbb3846bf
 DIST cmucl_19c-release-20051115-1.diff.gz 1506111 SHA256 65ef4018294b6fed388c39643782e6e611ee87bdb944c639da648522a4c2d336 SHA512 2c90eecd1f7cef7b0f6abd0081543e4994139f45337985adfff7ac8863171359d7052e20140aaf4b7bc82675ea4a40b28027c09518ee90f48f11c2bf4eaa732c WHIRLPOOL 847d53c3886a1d1420fe7762dfa753981544a9857678f09326ea163debd0e9ae92e7158f930e21501da7c30618103c3199212fbc468c8bdd28fbd97b1f1d82b7
 DIST cmucl_19c-release-20051115.orig.tar.gz 4654304 SHA256 4eebac35decc23449f4cf79996c31ea674df7136e08b829210d352c5d20d2407 SHA512 ab228806e692671caeca66fd1a96c3650b3645693889c421352e919ff4df09f4a288cb384daee150a9eae30add7f86acff0fac3bebd651fea328cd34af476659 WHIRLPOOL 577ab1aaecf9d2adda04d501c2fa2ebe21274da7f037fed253d484032c3f5ffce05d722e768742667ae0feb898580e5e42f3d35ec6caf7c7449383a5cacca43a
 EBUILD cmucl-19c.ebuild 4639 SHA256 2af213fce271a3363605859ef32600d9d8eaad45ed089cecdf997845c9dda78a SHA512 834969290fffbcc5301dbd0e5e690d4425a3274eb921d9a4bc98a4ef0410be16a121a3f7cd80541665ac57d6a834d322c3159cb80819bd5ef56005f675d55029 WHIRLPOOL fc6737dbc513e6bad577d9bdceb89c24f8fb16b67a02d538c87989646d9859c2bf935f53f7451f9477310faf9de94f9a6d54da4871b204f0d2fd0c2ea497cca2
@ -32,5 +39,25 @@ EBUILD cmucl-19d_p2.ebuild 1824 SHA256 1e8abae1a959fbae88ea7451df34eb53b84d4f801
 EBUILD cmucl-20a.ebuild 2251 SHA256 25656df47ac8f04229cf54ccbe6ee365bc965db7cd604b54b894e81b3e2699e0 SHA512 a8684437676d3bd7c8cc43dfeecdc141ec5406281efc07efaf2ccede864712ac5b2670bb9f577019611a8e496c9e76b28a4678c340b2b3d93b829ca4aef34441 WHIRLPOOL 6a0934405b724f5146d063ca049c9101256648f84c4d19b29492ccb63dcb8a762cf83fcf43f74e468d172faf0e2c33332a97d8b227b2f8de3050bbe3ac4cfd7f
 EBUILD cmucl-20b_p001.ebuild 2902 SHA256 ff1f19f0b907b1238cf67f57b5c37e055a9dd30c664f41f73b03dcbbfb004cff SHA512 91952e9c9a89864c27ec87dbefa286d538fb28c5ae08fe8ba30bc4c2564ff54623a89f1b82edbb24745df11c413871839372bfded5a358203a0e90f25f732dca WHIRLPOOL 1e021c5f7e86bd73cefdbfd8087a4d8484de79dc23b9ee5a5dfe50d6919207cacbc4780c91b3a20a87876b3c3b2cd7abed9c66925d159e98ec26b5e677d010ea
 EBUILD cmucl-20d-r3.ebuild 2834 SHA256 949ce578086d7c01bcbc82764fbd2defe407cf18cd6552a80e427de2c75e9d7b SHA512 aa97c400f094817fb050a92d74585629a24fccd329703244d1d1e0f5f5fb294722b4683d44ea422500a4a3c4489d8456c92b2b595c3e70af3b9c7cd323610a44 WHIRLPOOL d8baf89a8f52e59235a68b044600881104ac1e5b81a5935603e5bef67ae058e3703d82c1ee52b5afb769e46377b0a8fe638f78f00c0544e21ea84024c8b44f6f
-MISC ChangeLog 8355 SHA256 9ea43bd1908f152e1808c14bb8c03750c0a129b4c7ffa3870a57e54d13a37a12 SHA512 d58aca2b5d3a48223f04ac57246abe765b6ce70e8adc7dc5dbd2ef498699f191477a24347d6232485f2f0dd81161f4dc71ad056ff010c12fd8e9d7dc2f935258 WHIRLPOOL d0622471e9e164426d524c8e19e252f9a82896cbcd83de1e7755868af2ea6473e24099025073bdb9362c36c7e1ae0e9bb5927005c888b32bf9ba58f0bca7e90b
+EBUILD cmucl-20e.ebuild 2831 SHA256 92931cad026bd734589c1cc78d35985543fd171a2303d0a6a8f2ea4779fb9c0a SHA512 9627ca4ca59b081ca96e0682f2f68eea6f442d974343f40eecc60d89fdc477e7ba51d300831050f757af836ccd53cc321058b9becd4d4baa622ed829b264a654 WHIRLPOOL 4e7a88ecf9940dd124c4f5ff62b771c8eedb30f822b8558022755d7db58fbc01a2710141260b310a30ab3a8e5873919b693f1a590b8cb2ce5cd1f3c77ae1e030
+MISC ChangeLog 8558 SHA256 cde8b454ecb8a617f3b64f945d408e954142efa1d8e9c6cb3e3aea206997a4e3 SHA512 d85cf46858bcf301370482840e9e224f6c7d0eb66d10078f465599e1fef5891ac9dd2abd8928523e3645f023c4caaf2f145fb7f33f62e2e54c9aa436b010f69b WHIRLPOOL 61665ec3197b0e7584116a6fc6e77aa24e6d4ec1bd586a3c3de3c149e855fb3dcea337e83106d360a0e35c0f2bdccc5d7a35daf6b95353416c45cb9b70c8bf4b
 MISC metadata.xml 1361 SHA256 f4b7f1014988c330913565e96209b71c5a765e28237c66f72cc0fb5d93b06b68 SHA512 bf5584cf3bc4f5057a7eddb34650372fbe5125520f8318c11078bcd1cec545b69fc7a6f4fa7b2f3bd0d58872b7a8793103b2348d9f0dcc02b331f4cc29086713 WHIRLPOOL a6e766d0b50ba219a3bc7d2fa6e72919eb2d259b9485f4c13df1170e10d15e1f5046e19ae1dfb54a3ba1403644c72667bb1917ac2f558ed32d4d1f99610130a4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQJ8BAEBCABmBQJS84TcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MKeUP/jOKKpq66wccKPdA9/IINIYC
+7tFcRSqZF4Srvjcf7GWvdPy5YlwvnxeapAg5tluwquQ0gUjxB8TWusswiln6AxEO
+OC4dRKWNk8Ms1ZuVKrN5AlCS9Y+B4zAMh8f+vvu3hbUJ98thObNbWn3/p7/pmvAI
+0L5/n1DYsjFcFvzQcfTWN/jMwfDGA2gwWt5bCYETTSQPncAHN3oBBos7nZnnWvQY
+AjmBcryzgptiyLjeW1yS+f9r79b1kqQ2Jv+U1D8Ge99jNzWCZ+2A0Q5XrEkB/zGt
+QAgaX6Y5Vi2rqv9QW89G1Cjw7MT6PrfmFOkDvuj0Y1nmo2cnZ8ikZd+GVKkx0GON
+99jzLcOO+9Ble/rcAQVMP3ERFYke1+XquTpWBL4+y3bBerhWNDhM59inI31oi6c0
+VVxmBcAOd07NJV571RX9mLlj4VL2n0M9JHXxJyFUR3gK3Rd6mgIZQFXrCfWOMQ4J
+cjo5rzdsjW3ftnwfMDQnRaWoeP/05QQenLlOGWqnYSzRwDbfNBpp+bmIqJNK1MsV
+3J4fMbgVZJA2yA47EZ/rvgBBH23IA9Laifs0ZNzahJ1mZFgFh9PAfueIvQtC+Wrl
+eo1EVDvE9CjZMFfFtTIP59NIkOzM2sM69kWBFdz9Lik6H7nsgEicsuZB/JZCWM/Z
+yhUpIUxYIYJ+kBO4X+ix
+=xq90
+-----END PGP SIGNATURE-----
--- a/dev-lisp/cmucl/cmucl-20e.ebuild
+++ b/dev-lisp/cmucl/cmucl-20e.ebuild
@ -0,0 +1,98 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20e.ebuild,v 1.1 2014/02/06 12:57:26 grozin Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs multilib
+
+MY_PV=${PV:0:3}
+
+DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://www.cons.org/cmucl/"
+SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
+	http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="X source sse2"
+
+CDEPEND=">=dev-lisp/asdf-2.33-r3:=
+		 x11-libs/motif:0"
+DEPEND="${CDEPEND}
+		sys-devel/bc"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}"
+
+TARGET=linux-4
+
+src_prepare() {
+	epatch "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
+	epatch "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
+
+	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die
+}
+
+src_compile() {
+	local cmufpu cmuopts
+
+	if use sse2; then
+		cmufpu=sse2
+	else
+		cmufpu=x87
+	fi
+
+	if use X; then
+		cmuopts="-f ${cmufpu}"
+	else
+		cmuopts="-u -f ${cmufpu}"
+	fi
+
+	local buildimage="bin/lisp -core lib/cmucl/lib/lisp-${cmufpu}.core -noinit -nositeinit -batch"
+
+	env CC="$(tc-getCC)" bin/build.sh -v "-gentoo-${PR}" -C "" -o "${buildimage}" ${cmuopts} || die "Cannot build the compiler"
+
+	# Compile up the asdf and defsystem modules
+	${TARGET}/lisp/lisp -noinit -nositeinit -batch << EOF || die
+(in-package :cl-user)
+(setf (ext:search-list "target:")
+	  '("$TARGET/" "src/"))
+(setf (ext:search-list "modules:")
+	  '("target:contrib/"))
+
+(compile-file "modules:asdf/asdf")
+(compile-file "modules:defsystem/defsystem")
+EOF
+}
+
+src_install() {
+	env MANDIR=share/man/man1 DOCDIR=share/doc/${PF} \
+		bin/make-dist.sh -S -g -G root -O root ${TARGET} ${MY_PV} x86 linux \
+		|| die "Cannot build installation archive"
+	# Necessary otherwise tar will fail
+	dodir /usr
+	pushd "${D}"/usr > /dev/null
+	tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.tar.gz \
+		|| die "Cannot install main system"
+	if use X ; then
+		tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.extra.tar.gz \
+			|| die "Cannot install extra files"
+	fi
+	if use source; then
+		# Necessary otherwise tar will fail
+		dodir /usr/share/common-lisp/source/${PN}
+		cd "${D}"/usr/share/common-lisp/source/${PN}
+		tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \
+			|| die "Cannot install sources"
+	fi
+	popd > /dev/null
+
+	# Install site config file
+	sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \
+		< "${FILESDIR}"/site-init.lisp.in \
+		> "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \
+		|| die "Cannot fix site-init.lisp"
+	insinto /etc/common-lisp
+	doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc"
+}
--- a/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch
+++ b/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch
@ -0,0 +1,16 @@
+diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp
+--- cmucl.orig/src/code/misc.lisp	2011-10-25 05:31:39.000000000 +0200
+++ cmucl/src/code/misc.lisp	2012-01-31 21:46:49.441273068 +0100
+@@ -187,8 +187,10 @@
+ 
+ (defun lisp-implementation-version ()
+   "Returns a string describing the implementation version."
+-  (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version
+-	  #+unicode _" Unicode" #-unicode ""))
+  (format nil "~X~A~A"
+          c:byte-fasl-file-version
+          #+unicode "-unicode" #-unicode ""
+          *lisp-implementation-version*))
+ 
+ (defun machine-instance ()
+   "Returns a string giving the name of the local machine."
--- a/dev-lisp/cmucl/files/20e-execstack-fixes.patch
+++ b/dev-lisp/cmucl/files/20e-execstack-fixes.patch
@ -0,0 +1,118 @@
+diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S
+--- work.old/src/lisp/alpha-assem.S	2003-03-06 11:13:09.000000000 -0300
+++ work/src/lisp/alpha-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -297,3 +297,7 @@
+ function_end_breakpoint_end:
+ 
+ 
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S
+--- work.old/src/lisp/amd64-assem.S	2004-07-27 19:03:53.000000000 -0300
+++ work/src/lisp/amd64-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -1051,3 +1051,7 @@
+ 	.end
+ 
+ #endif /* LINKAGE_TABLE */
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c
+--- work.old/src/lisp/backtrace.c	2009-06-11 13:04:01.000000000 -0300
+++ work/src/lisp/backtrace.c	2010-05-10 00:06:22.000000000 -0300
+@@ -3,6 +3,8 @@
+  * Simple backtrace facility.  More or less from Rob's lisp version.
+  */
+ 
+#include "os-common.h"
+
+ #include <stdio.h>
+ #include <signal.h>
+ #include "lisp.h"
+diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S
+--- work.old/src/lisp/hppa-assem.S	2002-08-23 14:05:35.000000000 -0300
+++ work/src/lisp/hppa-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -460,3 +460,7 @@
+ 
+ 	.export	function_end_breakpoint_end
+ function_end_breakpoint_end
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S
+--- work.old/src/lisp/linux-stubs.S	2005-08-17 00:40:16.000000000 -0300
+++ work/src/lisp/linux-stubs.S	2010-05-10 00:06:34.000000000 -0300
+@@ -995,3 +995,7 @@
+ /*  doe(yperr_string) */
+ /*  doe(ypprot_err) */
+ #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c
+--- work.old/src/lisp/lisp.c	2009-07-13 16:41:54.000000000 -0300
+++ work/src/lisp/lisp.c	2010-05-10 00:05:55.000000000 -0300
+@@ -5,6 +5,9 @@
+  *
+  */
+ 
+#include "os-common.h"
+#include <time.h>
+
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <limits.h>
+diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S
+--- work.old/src/lisp/mips-assem.S	2002-08-23 14:01:02.000000000 -0300
+++ work/src/lisp/mips-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -402,3 +402,7 @@
+ 	move	v0, a1
+ 	j	_restore_state
+ 	.end	save_state
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h
+--- work.old/src/lisp/os-common.h	1969-12-31 21:00:00.000000000 -0300
+++ work/src/lisp/os-common.h	2010-05-10 00:06:22.000000000 -0300
+@@ -0,0 +1 @@
+char* convert_lisp_string(char *c_string, void *lisp_string, int len);
+diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S
+--- work.old/src/lisp/ppc-assem.S	2006-02-25 01:35:58.000000000 -0300
+++ work/src/lisp/ppc-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -721,3 +721,7 @@
+ 	SET_SIZE(fpu_restore)
+ 	
+ #endif
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S
+--- work.old/src/lisp/sparc-assem.S	2003-10-23 23:57:00.000000000 -0300
+++ work/src/lisp/sparc-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -837,3 +837,7 @@
+  * End:
+  */						
+ 		
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S
+--- work.old/src/lisp/x86-assem.S	2008-12-24 02:36:40.000000000 -0200
+++ work/src/lisp/x86-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -798,3 +798,7 @@
+ ENDFUNC(undefined_foreign_symbol_trap)
+ 
+ #endif /* LINKAGE_TABLE */
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
--- a/dev-python/bokeh/ChangeLog
+++ b/dev-python/bokeh/ChangeLog
@ -0,0 +1,9 @@
+# ChangeLog for dev-python/bokeh
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bokeh/ChangeLog,v 1.1 2014/02/06 20:02:28 bicatali Exp $
+
+*bokeh-0.4 (06 Feb 2014)
+
+  06 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> +bokeh-0.4.ebuild,
+  +metadata.xml:
+  Initial import
--- a/dev-python/bokeh/Manifest
+++ b/dev-python/bokeh/Manifest
@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST bokeh-0.4.tar.gz 29824351 SHA256 cc95ebbac25f00929f0d7d58d8d5f4ced6d1fc541f16d2b37e410613671447e6 SHA512 8627f689fdfa7eec226d80db887f7a9fabd12770adab8a679bac188d0f5965a0d4d832a247e77b3bbfc959126cf57bddefc03b1b2e56aed60c8ab8d38efb9657 WHIRLPOOL ea3bf7b3d16c456be2cb21f1d3ce9c6d40cb46cb37e1c6b689b5889ffaa2b468d68218a4ac65ba7f0b8cf1637acb6052a09e3efe22a937a071d0cc73a2673bff
+EBUILD bokeh-0.4.ebuild 2018 SHA256 336e75ae3b927dbf87a4f17a1b042b2932304f579b98506d4af72e89fc94a6c8 SHA512 c91545e627d6c477d3161c4e4a58d2a5582195be24b2d7b3779d32b5f42a327015847c0a2d795dc1820cff4aafdcb86925737f6f55390cb5ee8a08bc24665245 WHIRLPOOL 3fbeb501c4667e34ecdd1e2c932076695ef3c84ee6fd662dda20e93efbc18cb9040bbca49079d1176996234a76cd2e2a8139e7594dfdae9486cb5b8a0b69a409
+MISC ChangeLog 341 SHA256 e72352a68a40c02b0f4ff7ad0b8f4bf7ccb1e67d647253c23f6a69759965b40a SHA512 403b93f61684a32a26bf230e996b8215556ff300ba868090d453fdcd1d63b162f4012d0aa406596407b569fb79297e8953a481c7035e0772de14587db53098bc WHIRLPOOL 3c88358e6818d54a36f9f98844f4bbffd2f2cc7fa27af91a1e14529738600d78eff303b38dc5ed9085460ab12f2d63dd3b67f831355cabdec02f7ca0ee1c2dd6
+MISC metadata.xml 513 SHA256 bb8b7dd8d96692ceacf69f9b37cfc7fc3da7ce4c074a5385f38e446f5936b016 SHA512 2abac41ecd482c872fa1b119a095ec3e59457a21f4a5635b917f383ffde39150aed7131e81f44410f5398bf8a3d778766b701854728c4302b79a654eb8f0834d WHIRLPOOL 77e3b84e442f8c6d233061ee822004adfaf2307856116e0f548220b10a2756789d04821666f08398aa7cda1c23c272f1ed32716b1c221fb001d173cebbb8e409
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlLz6lYACgkQ1ycZbhPLE2Cx4ACfd+YefQy7KVxmbtUT3oUr4mzp
+0p4An04X9T2nskLob+2pmyFqJg4mU2mz
+=gA5k
+-----END PGP SIGNATURE-----
--- a/dev-python/bokeh/bokeh-0.4.ebuild
+++ b/dev-python/bokeh/bokeh-0.4.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bokeh/bokeh-0.4.ebuild,v 1.1 2014/02/06 20:02:28 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Statistical and interactive HTML plots for Python"
+HOMEPAGE="http://bokeh.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/chaco-4.4[$(python_gen_usedep 'python2_7')]
+	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/gevent-0.13.8[$(python_gen_usedep 'python2_7')]
+	>=dev-python/gevent-websocket-0.3.6[$(python_gen_usedep 'python2_7')]
+	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.23[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-0.18[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.11[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	>=dev-python/pystache-0.5.3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013b[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-2.7.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/traits-4.4[$(python_gen_usedep 'python2_7')]
+	>=dev-python/werkzeug-0.9.1[${PYTHON_USEDEP}]
+	>=virtual/python-argparse-1[${PYTHON_USEDEP}]
+"
+
+# testing server: needs websocket not in portage yet
+#			>=dev-python/websocket[${PYTHON_USEDEP}]
+DEPEND="${RDEPEND}
+	test? (
+			>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+			>=dev-python/colorama-0.2.7[${PYTHON_USEDEP}]
+		  )
+"
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	# exclude server tests for now
+	nosetests -v \
+		-e multiuser_auth_test \
+		-e wsmanager_test \
+		-e usermodel_test \
+		|| die
+}
--- a/dev-python/bokeh/metadata.xml
+++ b/dev-python/bokeh/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<longdescription lang="en">
+  Bokeh is a Python interactive visualization library for large
+  datasets that natively uses the latest web technologies. Its goal is
+  to provide elegant, concise construction of novel graphics in the
+  style of Protovis/D3, while delivering high-performance
+  interactivity over large data to thin clients.
+</longdescription>
+</pkgmetadata>
--- a/dev-python/mysql-python/ChangeLog
+++ b/dev-python/mysql-python/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-python/mysql-python
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/ChangeLog,v 1.93 2014/01/15 12:41:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/ChangeLog,v 1.94 2014/02/06 09:27:32 jer Exp $
+
+  06 Feb 2014; Jeroen Roovers <jer@gentoo.org> mysql-python-1.2.3-r1.ebuild:
+  Stable for HPPA (bug #482056).

  15 Jan 2014; Agostino Sarubbo <ago@gentoo.org> mysql-python-1.2.3-r1.ebuild:
  Stable for sparc, wrt bug #482056
--- a/dev-python/mysql-python/Manifest
+++ b/dev-python/mysql-python/Manifest
@ -2,24 +2,14 @@
 Hash: SHA256

 DIST MySQL-python-1.2.3.tar.gz 70305 SHA256 7de66fbbf923634e7c965aeaefa74642ba75ae20ee1cefcefc3009595b7a7e6e SHA512 8c1c88ccf833744ac1f78673cb306cafe7f9bfc85ab2ce6dee1024b86571c17f006e3ab8452dba3527976f39aca64757b2d961c30ef4ac61c9a27e60a5f1abf5 WHIRLPOOL 31e294d658d80b876e54d9825252b0fcffd369a8c80926c78b5830401125761ecfc2d0faa49669d8a404228fc6395ef2bcf7c614d47c13e6a2438e66af36dcd6
-EBUILD mysql-python-1.2.3-r1.ebuild 1006 SHA256 3eac503fd19fa779faa6a8fb3644f05b1bdd55541ff1bc306937d4d987592ef5 SHA512 fdd5ef4adbc3caac52ba76b992ebf5708a81a478ef5e512829944bb9125e5a66e80443e89926020d5e5fe898fe13da6048d55b5636fc20033166b8568031cbd4 WHIRLPOOL 8f10aaad960b552dcfd28acc32456ca041635797bce01026e7fb0225a31f91c844581ff7441f373c7500b4b024e7d301b7aa93dcdf6f66aa200e0dfb87129d5c
+EBUILD mysql-python-1.2.3-r1.ebuild 1005 SHA256 1ede52e4145f111ca0318a2753dd2e819b64840823bb885a1f768e13f55ef81a SHA512 d381654a311a5914c1bdcf594f9447a9daa58e53d428b1e4b4db4692d1b6bf513523d54b2dd520cadd5909076445790f7d9c41d09b51105be651a2c330f31b77 WHIRLPOOL 2a7ac1686331567a07c959f763be971c20904eecc4d13890bb2ce2326aae436d89bea2d9c42919724d3c76515686b0319fed15cf11b729d76620390b6352d317
 EBUILD mysql-python-1.2.3.ebuild 1056 SHA256 1b8555a8e77ea4d0bfc2954bceb125591d939cd1e50f868fcabe39d0ee2dd63e SHA512 c38c239248fd9df85ff197d60fc6213df0670e8b17ce71fd49e6ec6f460e0e2df3e0a7880fb261a6dad273480056e2250d736d9d78b763e168bf817469794dfb WHIRLPOOL 1115658de5b617710cc70d240c80612f03366bf34bf5ef26b136ae668e613edd69fb81e6c2fc7c6851ec5a6742ab0ab4a23da3e19fa4311bf60befc884fb9208
-MISC ChangeLog 11526 SHA256 28dfbab6bed9a63a1fe8e47b609d60c3e1495473a4ec3751f31c83dd1f03221d SHA512 b36e84e2fd067aaf4e05eb7979f8a30ea8da6bcf0743c3524d6813bd5c7fd2bd9ce160132aa1fa35a9e20e7a89663ffe76fa41747432eba784d89577a31d5484 WHIRLPOOL 0249bbd8a427f8dafd0a952227c22e9f8001a7763cc1a81432c32b967a3625088d981dd7d1bf2ca6808de840815da995d9b5e9c37f4beef66f8347a4a0ccae56
+MISC ChangeLog 11637 SHA256 ebf26a956de8b35de3a28b86390bc0932195abd58ea1bb1aeb230b47ed25d37d SHA512 6868c9ae25f10fba67e304471794f88974892477d86c53e7772878e8f63e3fc07f3151213f98b7190ef8646225a3e9c607d404188829180fe97c6d8163f7f2f5 WHIRLPOOL 806567e624c03b347c972cea7cb045707c4cb5f52b79096c5f63281a41c6239c2aeef4b7d04970562d0ed2e91e8fc1992e35465526c0d27f489b8775ee306772
 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iQIcBAEBCAAGBQJS1oH/AAoJELp701BxlEWfeSgQAJpyIYvFmmX3MEY5Jhknfeta
-dJD2VgCjHBjibcUBMjUTeQEzgolK8oSVhCWF4O6asPwRQRe8uyOjUpwg19yAfQY+
-Z+EhUV1S+89V0NADpz70fvPIR+843j7F9JBHbVzSuhxLhRdzUzcJF3A5Kv6ViB/u
-h0eEuLgciTSRvAl59sOO3olK+vnMkDf5nLm72DvJBAaMria8MhHkYljFsy8uvvV0
-lEPGjJ1m3RBMn2BZqrWwhl5XK+X9RjJHxD3/5K/HYIOvFK0rRzSD0q2LlbNXYhuj
-x35mZsyovpAJLgIsyriEQPicUTL0HsEdgGm2KZoxkApAjT6eexWcf7LCjzGAwRg8
-VQ17Woi806aYsUPUHjczLnYxdO8vZrH0jsHy3h2+RwUEEJ8SoMzPBblSIhOxR096
-SYTpj/E2+Ww9chPpWqo/z01GndMqzKhLLH7Rdd/iNWc2t07U44WM+BBvdES2ffo6
-upzxP09y/dUreptO/a5ku+Y/yO2FwuTlw/Slsqp8I2AMQ89Fj0xrVpfQyfvjmUpq
-8sEN6Tp4TMkz0DS+v6Fw1wOlxlTLNiB015o9yhaAr4aep6xbciyevupl3v4NmE/d
-8YTv01PukMMClKnayevCyU+9/aMVbqND5zvRdD21/JX+SZitfw/TvAMZB9rEt3xx
-tkmIjKzKE7MXEAE9NoZQ
-=oURZ
+iEYEAREIAAYFAlLzVYYACgkQVWmRsqeSphMjjQCeP9c1IFOlbwe5TWKszfphIGnB
+1zMAn1SXFg9Wjpdwa9PDNVEXdJyPRNoa
+=hyXR
 -----END PGP SIGNATURE-----
--- a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild,v 1.11 2014/01/15 12:41:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild,v 1.12 2014/02/06 09:27:32 jer Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/mysql-python/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="virtual/mysql"
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@ -1,6 +1,18 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.218 2014/01/18 12:16:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.221 2014/02/06 12:08:28 jer Exp $
+
+  06 Feb 2014; Jeroen Roovers <jer@gentoo.org> numpy-1.8.0-r1.ebuild:
+  Stable for HPPA (bug #500484).
+
+  06 Feb 2014; Justin Lecher <jlec@gentoo.org> numpy-1.6.2-r2.ebuild:
+  Drop testing arches back to testing
+
+*numpy-1.8.0-r1 (06 Feb 2014)
+
+  06 Feb 2014; Justin Lecher <jlec@gentoo.org>
+  +files/numpy-1.8.0-f2py-insecure-temporary.patch, +numpy-1.8.0-r1.ebuild:
+  Backport fix for sec bug, #500484

  18 Jan 2014; Mike Frysinger <vapier@gentoo.org> numpy-1.7.1.ebuild,
  numpy-1.8.0.ebuild:
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@ -6,6 +6,7 @@ AUX numpy-1.6.2-distutils.patch 20000 SHA256 779c0b03ee25b294f203729e954eed02022
 AUX numpy-1.6.2-test-pareto.patch 1857 SHA256 6e5d42323fdd76ad8e4c7d9dfd313f27e5b301f9ec3a98810779f6e6524e9675 SHA512 342576c546839ed601d32542947b52684b208c89a9fa93176f7d2b1ca77bd7c1179ea2513f094a59a55d01d686cda2b9e2cc07ca386e4c4146fdcc6f980b7235 WHIRLPOOL fae26d2cea2d28b9a569fbf4195401b4b342e25468cf7e3d0750adb306a61d22ed88d1903f8f382740f2a7d76e5c277bb6fd9b622530fe16d14aba0266828583
 AUX numpy-1.7.0-atlas.patch 845 SHA256 fe1097351178aab9fe7fbf4dde87a2e177c53989b6080bb5b2a9059fd596d83f SHA512 a9c4a8b9a11c58462cfc13beec8e5f4045a302c833e792cd42b35d5a0cfb497b594d3cfe8ea51108f447bcdc22308f74bd9dea108de1e6491e3adc761be7dd42 WHIRLPOOL b815cded5082740c8941a6c976345465e1815a926c2bfb8bdb940096f4e928a7065dbbcc3a9b195584dbca0612c725d6a4a6b260fabd50f8ad9af7c29cb9fdab
 AUX numpy-1.7.1-distutils-python33.patch 20008 SHA256 5a5f191321b794fea110610246ccbaf985c790e184ce6df6928af0686cc43acd SHA512 a97db2d74d8be34a84d7aafc992379ecfff1303f1b2ea21689a31183b8c433d02a8c86f4c529ada24451188c3dc6895f83cd06cc7a1ad59a732ec94878875a52 WHIRLPOOL efbdf5c8658cc6038ea8881e493c7653a71d185864a1103d20f157f853641f7a52a70bdec3932ed70ceb6d8fc568fe6c7273e03bba8213e262e9d0d7d83d9a10
+AUX numpy-1.8.0-f2py-insecure-temporary.patch 7243 SHA256 4215b023f3d03b506f9c757c532cf9a6188cb218b4f3c97aea83376f121d1ab0 SHA512 b3c70726f443c41520a77ae80f937d5e990754d9afcc1120e41841f70759c5c5352fe0a47adbada3ce84384a3b8fefdcab8a763c9082af38d7dd85b163679657 WHIRLPOOL 3d8be22202ff6fb7dc47229a2e13ba02b1e2df86bfdd7a3dee22592e20999284219c48881dde23829720cc0dd31a2c79a55faa5df3c3dc5aa552c163d4f64e3e
 AUX numpy-1.8.0-no-hardcode-blas.patch 1153 SHA256 ad79d788189db97178b73f019a47c502bb9297ae7a1b248da878f3f91ab8af3b SHA512 baa29a0c981ede608d890e776026961fb71156eb7804f702623bce775e3b6ce3bb28ced252d9c6fe991429b690b3eef8468d703f79247820527648d6484d23f3 WHIRLPOOL 38db4618b8fe505b711270b9050c56c1541c2fc3094b02ef6a45e776d56f54fd82b79ddc1b65721e0ac08949c6b9354da8c6ae0437b77e3b474ca941d44de9bb
 DIST numpy-1.6.0-html.zip 9242421 SHA256 555cfd5899ee54d129169fb70e418c2593d5377ea963d50c812f25bb182261e0 SHA512 b3a7df5b3bb4d307b9184ffa7a0f7a8d919a70f642d9be3d1b3d9c837516385423cc05ba114310e03e124fc80033216035ff389a7f56b74ac1a849c975dbdc8c WHIRLPOOL 6edeecf637e5ca23c906e51dd4933bb6ab4beb3014a9c2cc6d59459d76dd8bf617ea6e3c1d5d5a15af17022549812d358a37840b8d47841d14e156fb6b319600
 DIST numpy-1.6.0-ref.pdf 6106335 SHA256 cbeea9b1395e0576bbd256c5de11886c63321d434785c6777df7bdd50109ba9f SHA512 ff00333beae3d886cf96cd72687f68dd0f226c88c390824c3f0cfc18a50ea6b8d6e12035eda76e10a97d58e7bc9b48b6dff7e0447b6045cc4e40fff3225721ec WHIRLPOOL 3ccb0373f0ef0f22a0a1ad967cecc1c7fd8e663d9c4437cfd31bf42a23d121619d89bcfcbb25091609cfdc20f13b551f6d904b1d13b4da6104dfca094734ca19
@ -19,25 +20,16 @@ DIST numpy-ref-1.7.0.pdf 5161456 SHA256 0581709ef96441953404bc1369d70117b83359af
 DIST numpy-ref-1.8.0.pdf 5324229 SHA256 49ecb1d768eb48598439cc63058f830ca3522fe1cfeba1a321086e9820ae8911 SHA512 d89314215c4adefa487b3e46b2babeda7739ee193fef821846d4df0089fabf2167b47dd2990b6bd423432f75238547548924622c6f3b9a90a36d578450001eb2 WHIRLPOOL 3bb12c719cbe4734014774f1bfc3f98af544ee2c407adb2e3ee988e2b1035ad0ef711eaa68168656be7b034df2db76c8789daa2940a048b4a6cb3af0bb0eca68
 DIST numpy-user-1.7.0.pdf 404104 SHA256 0c8dc1d53cc057a66139039dbaaf65499687cf64e72af5852eb96d9c3cd3ab18 SHA512 20cec2f9742c0604d9db9f2e74e7c8fda1782c081c27437a07c2d8cb7f36be6df3e50e5ddf8cc10a076905b2be2b6927af15d0574e3bee2961cf14aaca55ad78 WHIRLPOOL 792c4ccd155ddbb82d8a93959c218bcc001532a6b3c42626bef64c96eb865601f5ee328d1a1627f1656e0b22085c89ede39d7f94183841e1069d183589542ffe
 DIST numpy-user-1.8.0.pdf 408447 SHA256 a8c30360f9e46c63cfdf48fa594971d94d68ce59ece08c13d4acde8b14032cfe SHA512 10293dba45377c6f1024125a49810b01e388eb33a3e8ed75b8ec39c2b93e53878cbe62e6b7adbf1e957dc47ef253e20304afa7d86d798fb5198887cbe618131f WHIRLPOOL 70cc5a5e97a919bb027f92ac87127fb1bc08d06e2a131c4b413837e76d8feab9b65d7dc9e95b6e797d057efb6abf0d2b3e7562ee3cd140b1ff1418bad5475335
-EBUILD numpy-1.6.2-r2.ebuild 4041 SHA256 a19790520f8f2e72424a19fcfb0eb6e6b92f824c65e5d0e0c4186c3623d4468c SHA512 63ebe9d2113905b9da0f567d29a607106ea34bd5bece980684be2cd4e7963af67c33d5e96be210fc5c2befbfcdc2e99358940e05b1c558ca068d6e5b41d5c2e9 WHIRLPOOL 188c736341018499da86161ac3f4dad5bd3387c385dd1fa5b27fd0b465f1ce8335079a305ce93932616bb41f1172721d9d97a7e2cab79cc2c7519cdec6774a7f
+EBUILD numpy-1.6.2-r2.ebuild 4039 SHA256 16b7da807f3453939b7d131b49a551b73a13bef9951a3fc192dea8321fee8a35 SHA512 7fd45786ce18c5472f52bca626dc68ba1bef0e2dd30dbf0aef8a80dc839dfe469f26b0beea3facda4a7152ceadf6fc33d6ef62d23900d218dadc64c75a1f2701 WHIRLPOOL acf899382eab3cb85403c097c1df765f48b49b5903de1f36bd216b8cf4c6bcaddd6be51e15e183bc4d6d96ba927cd17162df2140245164c8543b26fbd7cba089
 EBUILD numpy-1.7.1.ebuild 4023 SHA256 d42c28ce42b8f2ff050154ff92e374a632e536bb6c45e668103351b48f360e44 SHA512 16ae348159b79049f5a5485c047ed3c442196406c9f7bdf57bf1e30e8bd87599c0606480520a8fad54ecf0233c09ae7a488b11d31113629db3182671bd56b35c WHIRLPOOL 12dcbc39670bd489107adc19aa054fb07e67b316ba3cac65308a89b15265e7343702f4b857c2a87c4d6765965d663afbdef86a2fe29a42907d610cad6532aee1
+EBUILD numpy-1.8.0-r1.ebuild 4010 SHA256 904a62080cc6425ac6ff5ddb62cb6fc96927e1db76a2481386e6b57872fa4cdd SHA512 a28a722d9e798c6a1d07d299d29f5801ab4e044cdd6ca6ed91e8fe292009b18678aedfe1d987de895974dace0e7cfa5e766a86df044c6ce46e157ce9432ee50f WHIRLPOOL 980b009033fc47628d7bda96f2e32d22e3e4a77cce9e575069ea72a07aecd1b7bdcc6a94fd78a6bb3789d8fdcb925693c8c8593c7ca2e07430665a40a8b44826
 EBUILD numpy-1.8.0.ebuild 3961 SHA256 cae3cfcd25b225bc7599edbb67e284630bbb22adfeef88be18fcd11b249d5474 SHA512 4aa9976d94d424c0ff9c97fd993a6d72ee91de109e8c2854ffb813fe53a177508be0b7ce80ed740f00506f043dd5029755d671400230da292afbd7a01f5375d0 WHIRLPOOL 5c461337ab3fb15c6e292f7a7f57e30adb6426727d83549e7b41629fbbde57cccb69d12e9c771fe3c81079e9c3f265a348c58a77d30e7f858dc10aad30c5c44c
-MISC ChangeLog 30412 SHA256 85e87259fc346b3fd9091acfc5bdad419949e30551b6adbc03298aacf5792915 SHA512 fcab054314250c8d048d04eb7aa00c92c1877d1b4bb724d474600758a4aae6aaa08a62df8aadf9b8b223a79bb0ebee7aad2b55abbe3e8547e882660fbe259413 WHIRLPOOL 3604429e1f752cfeaf23b6f7170c858499c2d2297cc4624c34307286ac72f29fb1618ecf5fde0c11c1ea18eb2643e57c678d84899742ff6671e26957c4b72498
+MISC ChangeLog 30813 SHA256 adb65ba2d856743fffe17e75614009e279ce97e78098648ee4ad85303c85a3bc SHA512 ef7b8ba21143f6de963f63f9014fa80d08e3d47ec9a8c17b3721fffe7fbc482480bb62fc902c2651c71a0848d927e3dfd2563dafea1fa4f371178af759227dc9 WHIRLPOOL 4ff2d653df8bad706f97a1fd21b50c2840668469cbaa77dd2e916761bf62b93aec75c8e12b77ace074bed82c6adedd91b824e125ac77b9db972dbeef8d5c694f
 MISC metadata.xml 678 SHA256 184af17845835a595a8b2ee396a6f55baa7234a7b91ebddcf957a5d69c0b01d0 SHA512 6dbcd40d6722b481caf27183618012f3df43fd6fc22f8ddd6f1a3e9e42bc1240f56573616ef32fe8c3ea52addc42172940b3d7c5fa0938b854baeb96daa53d88 WHIRLPOOL e9b5f50c2b2d34745b255d05f65c6762c34fe34a2f097633621479ce909a1e120322cbcd0ded383fae6511240a14a7e9db4f47592715e2919d1c4d615f9bd24d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iQIcBAEBCAAGBQJS2nCEAAoJEPGu1DbS6WIAh6EQAIx/bEbUZZupq6r0uDE8tAKa
-zPwMddXxvHY7ETcjVF/7IlB45gX9dOaXy+54TCTqhuk63uw2BNOryYGKeh7oFgYu
-tWFS8+kAJkvz7bL2MR3WzOgZ9H+HT4WSA83sFI2FkrtwBeRLbgfLYC8+QbhL+ZM6
-UW0gIvMF6J5mJZ4xrO5DrIuxZnXO1BQTOOAAihXZ96qp8QJfupjaGiFiK/CU0Boc
-3Ll9oslylApZ/6dnpTWabUdJ53W+Svv7AOb+BbhRJQ4LMFJEBkdmer5LEnyspxcp
-igGDik5Kf4RyNIwLBQbCOsm7rWtHIUEji6IgCH4qytLNZzaAGrbBEV3qfR+Mtjsr
-XRV7qJu5kSSCQXkyLBN8xppNctHLxPsxnWOzaWpRWvQ0WwVm8JdKOqCCOZvC4KFZ
-FGTkgzF3JwbUchakimydPibBgjAN+XcjyIjIxFe33zYSdz/QMnjKixmzX/eKw6Ds
-gMaiwIdOxOCWKF3fuC2ghNfe3ciGqU5sre71l3Y3K0fMkRFyxg0QCGlTQIc6jR8Z
-zDZyaegZvGolUFIUxws59u9auJhi4RRpR4hHrY89heUnYUGwB/txtqsq5cr1COWm
-qbThXra8dieXBvruBXuSjOK8sKPgnUMubM4M8w2d3j0tX952DcgB/07lOF6CpS2v
-gxOj3ee7KqS/ySd2PtIB
-=w6m0
+iEYEAREIAAYFAlLzez0ACgkQVWmRsqeSphPFwQCcDPvHrSBcZPwr3oCZsA057ZPP
+dfEAnjQ7qFGpVSk0ctzDyupC0yYVUB7L
+=eS8u
 -----END PGP SIGNATURE-----
--- a/dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch
+++ b/dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch
@ -0,0 +1,214 @@
+ numpy/core/tests/test_memmap.py     | 34 ++++++++++++++++------------------
+ numpy/core/tests/test_multiarray.py |  9 +++------
+ numpy/f2py/__init__.py              | 22 +++++++++++-----------
+ numpy/f2py/f2py2e.py                |  4 ++--
+ numpy/lib/tests/test_io.py          | 24 ++++++++++++++++--------
+ 5 files changed, 48 insertions(+), 45 deletions(-)
+
+diff --git a/numpy/core/tests/test_memmap.py b/numpy/core/tests/test_memmap.py
+index 6de6319..10e7a08 100644
+--- a/numpy/core/tests/test_memmap.py
+++ b/numpy/core/tests/test_memmap.py
+@@ -1,7 +1,7 @@
+ from __future__ import division, absolute_import, print_function
+ 
+ import sys
+-from tempfile import NamedTemporaryFile, TemporaryFile, mktemp
+from tempfile import NamedTemporaryFile, TemporaryFile
+ import os
+ 
+ from numpy import memmap
+@@ -33,12 +33,11 @@ class TestMemmap(TestCase):
+         assert_array_equal(self.data, newfp)
+ 
+     def test_open_with_filename(self):
+-        tmpname = mktemp('', 'mmap')
+-        fp = memmap(tmpname, dtype=self.dtype, mode='w+',
+-                       shape=self.shape)
+-        fp[:] = self.data[:]
+-        del fp
+-        os.unlink(tmpname)
+        with NamedTemporaryFile() as tmp:
+            fp = memmap(tmp.name, dtype=self.dtype, mode='w+',
+                        shape=self.shape)
+            fp[:] = self.data[:]
+            del fp
+ 
+     def test_unnamed_file(self):
+         with TemporaryFile() as f:
+@@ -55,17 +54,16 @@ class TestMemmap(TestCase):
+         del fp
+ 
+     def test_filename(self):
+-        tmpname = mktemp('', 'mmap')
+-        fp = memmap(tmpname, dtype=self.dtype, mode='w+',
+-                       shape=self.shape)
+-        abspath = os.path.abspath(tmpname)
+-        fp[:] = self.data[:]
+-        self.assertEqual(abspath, fp.filename)
+-        b = fp[:1]
+-        self.assertEqual(abspath, b.filename)
+-        del b
+-        del fp
+-        os.unlink(tmpname)
+        with NamedTemporaryFile() as tmp:
+            fp = memmap(tmp.name, dtype=self.dtype, mode='w+',
+                        shape=self.shape)
+            abspath = os.path.abspath(tmp.name)
+            fp[:] = self.data[:]
+            self.assertEqual(abspath, fp.filename)
+            b = fp[:1]
+            self.assertEqual(abspath, b.filename)
+            del b
+            del fp
+ 
+     def test_filename_fileobj(self):
+         fp = memmap(self.tmpfp, dtype=self.dtype, mode="w+",
+diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
+index a0c4bcf..37b9931 100644
+--- a/numpy/core/tests/test_multiarray.py
+++ b/numpy/core/tests/test_multiarray.py
+@@ -2051,12 +2051,11 @@ class TestIO(object):
+         self.x = rand(shape) + rand(shape).astype(np.complex)*1j
+         self.x[0,:, 1] = [nan, inf, -inf, nan]
+         self.dtype = self.x.dtype
+-        self.filename = tempfile.mktemp()
+        self.file = tempfile.NamedTemporaryFile()
+        self.filename = self.file.name
+ 
+     def tearDown(self):
+-        if os.path.isfile(self.filename):
+-            os.unlink(self.filename)
+-            #tmp_file.close()
+        self.file.close()
+ 
+     def test_bool_fromstring(self):
+         v = np.array([True, False, True, False], dtype=np.bool_)
+@@ -2084,7 +2083,6 @@ class TestIO(object):
+         y = np.fromfile(f, dtype=self.dtype)
+         f.close()
+         assert_array_equal(y, self.x.flat)
+-        os.unlink(self.filename)
+ 
+     def test_roundtrip_filename(self):
+         self.x.tofile(self.filename)
+@@ -2217,7 +2215,6 @@ class TestIO(object):
+         s = f.read()
+         f.close()
+         assert_equal(s, '1.51,2.0,3.51,4.0')
+-        os.unlink(self.filename)
+ 
+     def test_tofile_format(self):
+         x = np.array([1.51, 2, 3.51, 4], dtype=float)
+diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py
+index ccdbd4e..fcfd185 100644
+--- a/numpy/f2py/__init__.py
+++ b/numpy/f2py/__init__.py
+@@ -28,20 +28,20 @@ def compile(source,
+     from numpy.distutils.exec_command import exec_command
+     import tempfile
+     if source_fn is None:
+-        fname = os.path.join(tempfile.mktemp()+'.f')
+        f = tempfile.NamedTemporaryFile(suffix='.f')
+     else:
+-        fname = source_fn
+-
+-    f = open(fname, 'w')
+-    f.write(source)
+-    f.close()
+-
+-    args = ' -c -m %s %s %s'%(modulename, fname, extra_args)
+-    c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' %(sys.executable, args)
+-    s, o = exec_command(c)
+-    if source_fn is None:
+-        try: os.remove(fname)
+-        except OSError: pass
+        f = open(source_fn, 'w')
+
+    try:
+        f.write(source)
+        f.flush()
+
+        args = ' -c -m %s %s %s'%(modulename, f.name, extra_args)
+        c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' % \
+                (sys.executable, args)
+        s, o = exec_command(c)
+    finally:
+        f.close()
+     return s
+ 
+ from numpy.testing import Tester
+diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py
+old mode 100755
+new mode 100644
+index 011b430..b264ea3
+--- a/numpy/f2py/f2py2e.py
+++ b/numpy/f2py/f2py2e.py
+@@ -91,7 +91,7 @@ Options:
+                    --lower is assumed with -h key, and --no-lower without -h key.
+ 
+   --build-dir <dirname>  All f2py generated files are created in <dirname>.
+-                   Default is tempfile.mktemp().
+                   Default is tempfile.mkdtemp().
+ 
+   --overwrite-signature  Overwrite existing signature file.
+ 
+@@ -428,7 +428,7 @@ def run_compile():
+         del sys.argv[i]
+     else:
+         remove_build_dir = 1
+-        build_dir = os.path.join(tempfile.mktemp())
+        build_dir = tempfile.mkdtemp()
+ 
+     _reg1 = re.compile(r'[-][-]link[-]')
+     sysinfo_flags = [_m for _m in sys.argv[1:] if _reg1.match(_m)]
+diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py
+index fdd78b2..caffada 100644
+--- a/numpy/lib/tests/test_io.py
+++ b/numpy/lib/tests/test_io.py
+@@ -4,7 +4,9 @@ import sys
+ import gzip
+ import os
+ import threading
+-from tempfile import mkstemp, mktemp, NamedTemporaryFile
+import shutil
+import contextlib
+from tempfile import mkstemp, mkdtemp, NamedTemporaryFile
+ import time
+ import warnings
+ import gc
+@@ -21,6 +23,12 @@ from numpy.ma.testutils import (TestCase, assert_equal, assert_array_equal,
+     assert_raises, run_module_suite)
+ from numpy.testing import assert_warns, assert_, build_err_msg
+ 
+@contextlib.contextmanager
+def tempdir(change_dir=False):
+    tmpdir = mkdtemp()
+    yield tmpdir
+    shutil.rmtree(tmpdir)
+
+ 
+ class TextIO(BytesIO):
+     """Helper IO class.
+@@ -145,14 +153,14 @@ class TestSavezLoad(RoundtripTest, TestCase):
+     @np.testing.dec.slow
+     def test_big_arrays(self):
+         L = (1 << 31) + 100000
+-        tmp = mktemp(suffix='.npz')
+         a = np.empty(L, dtype=np.uint8)
+-        np.savez(tmp, a=a)
+-        del a
+-        npfile = np.load(tmp)
+-        a = npfile['a']
+-        npfile.close()
+-        os.remove(tmp)
+        with tempdir() as tmpdir:
+            tmp = open(os.path.join(tmpdir, "file.npz"), "w")
+            np.savez(tmp, a=a)
+            del a
+            npfile = np.load(tmp)
+            a = npfile['a']
+            npfile.close()
+ 
+     def test_multiple_arrays(self):
+         a = np.array([[1, 2], [3, 4]], float)
--- a/dev-python/numpy/numpy-1.6.2-r2.ebuild
+++ b/dev-python/numpy/numpy-1.6.2-r2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2-r2.ebuild,v 1.18 2013/09/17 05:46:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2-r2.ebuild,v 1.19 2014/02/06 09:47:45 jlec Exp $

 EAPI=5

@ -23,7 +23,7 @@ SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"

 RDEPEND="
--- a/dev-python/numpy/numpy-1.8.0-r1.ebuild
+++ b/dev-python/numpy/numpy-1.8.0-r1.ebuild
@ -0,0 +1,146 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.8.0-r1.ebuild,v 1.2 2014/02/06 12:08:28 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
+
+DOC_PV="${PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://numpy.scipy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${P}/${PN}-user-${DOC_PV}.pdf
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	lapack? ( virtual/pkgconfig )
+	test? ( >=dev-python/nose-0.10[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| sort | uniq | tr '\n' ','
+}
+
+python_prepare_all() {
+	epatch \
+		"${FILESDIR}"/${P}-no-hardcode-blas.patch \
+		"${FILESDIR}"/${P}-f2py-insecure-temporary.patch
+
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		# make sure _dotblas.so gets built
+		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+		cat >> site.cfg <<-EOF
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	if use lapack; then
+		append-fflags -fPIC
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+	docinto f2py
+	dodoc numpy/f2py/docs/*.txt
+	doman numpy/f2py/f2py.1
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/*
+		insinto /usr/share/doc/${PF}
+		doins "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+	fi
+}
--- a/dev-python/pyfits/ChangeLog
+++ b/dev-python/pyfits/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyfits
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.42 2014/02/05 23:15:46 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.43 2014/02/06 19:47:28 bicatali Exp $
+
+  06 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/pyfits-3.0.8-debundle_zlib.patch, -pyfits-3.1.2.ebuild,
+  pyfits-2.4.0.ebuild, pyfits-3.2.ebuild:
+  Renamed conflicting binaries to *-pyfits, removed old, thanks Joseph Booker,
+  bug # 500460

 *pyfits-3.2 (05 Feb 2014)

--- a/dev-python/pyfits/Manifest
+++ b/dev-python/pyfits/Manifest
@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256

-AUX pyfits-3.0.8-debundle_zlib.patch 1554 SHA256 751bccc866f4a4f0b781aacf8318b60aad4c6ba18ff729e7390b5fa04d9dc735 SHA512 790ac30039c1724731e6628b3607d7a3dee0456ba6a43a52d356f31d4a3d312e4e32ec0b8b3cca8c5dc63b10c09663702b767ead6754570fbb4e6be372288420 WHIRLPOOL 54fd2ba170b8fa00503a924dcbb79fca346988be72c00aaf86817e6097160d896ef949a61fb65561ec42343c39de4f369851572ca48833517bce83f04c8b529b
 AUX pyfits-3.2-unbundle-cfitsio.patch 2663 SHA256 ea5e95e50efca6a736bacddd631f104725e44ccf3dba98d9f192cb4af40ed302 SHA512 88497e25186b18c7a6389b16988323f93b66906568f404b0e626f17d317eb757567cf7516b083e62faf4cc7375e562bc6791733ef894e236885dc45b607d08e6 WHIRLPOOL 1476f015e607e6d3da75b56ea6e1e5fbd0786bdedec9514cc9d6e0520bd840da1653f8760b35fff1a545886fe1957e1ecd55c4238f0f0a1c604f6bba00f729ba
 DIST pyfits-2.4.0.tar.gz 284236 SHA256 40c21106b86ad01264780409ecb2c8102e80c3eaf2085224f370fc7b3b07ea22 SHA512 cdbcf8b4e178cde8723eb9386a52e59c9d66462479491d0b0ae1d436c91cc476748c00e837477acf9a46791cd4a7517ff649434c33c225ba8a396148e4485fa1 WHIRLPOOL 2c22a63bd180ad68bf3001d539c403147eecc01dc5537f9c1b0be582c79dd87297f91f33809dec6c9f5906396d409af5b4495ef0b68fe6cc03d816a51a286e50
-DIST pyfits-3.1.2.tar.gz 790908 SHA256 f0e41b5c2db37d97ccb05d2057ece8fd1d18804722707114b5cd34beb736d2f0 SHA512 a73a2dabe2148b538aa12e685dc2fdd3d7c46c0e971e6d2e9793d41de8e30aad3171c955fc403a00717462987b0fb32b5b67ccd5baedf147ad21b419db512b53 WHIRLPOOL b5ca58c106fc13db0fc2d707946736e7d26576efea7d2dcd9606afdbee6020c582da618efa13397ddcfa56596b08a8ade5ac78b0a4326288132924bbc72655a1
 DIST pyfits-3.2.tar.gz 1606650 SHA256 1e049191f64f396e67603c507b63e7c0fc442eafddddc35a6e10244ad16dae42 SHA512 0942dd327608c22e828d227a1126f360df19456ba26914afa57a1a847a4dfec90954224f48e782dc458cda6d7a045beed0d9c0b750ebcebe4a56dc3b54f86494 WHIRLPOOL e07d476d9ba193cc94d51a5dd59231ea7368c80b7f2462f1154c55f4d426bf2e7ea1f8b174457747a25e0f983ccfae96a0c8c009a181dab4eb3b12d33e21bb46
-EBUILD pyfits-2.4.0.ebuild 970 SHA256 47677eee2228c54c3bbdc8c4859248df458e71e713f95b6d2fb8866bff9f0e33 SHA512 afa3d7d12d6e2bed972fcf94e04f907f93912def6d3e7d5f402624b4ed5a570f51273cac424264ca5cdd9979f783d2235f410978ace0c2162c1611b5db089817 WHIRLPOOL 8497cab85ca0476aa80d5fd82eeb127c9fb88c33ebb32a86bad2e9d914dfd48573d0828364d07e0e1e67d62a497cc2f8f982fc21b3178f384aab67843a56fde7
-EBUILD pyfits-3.1.2.ebuild 911 SHA256 65b370f67e9b85e8da05d6b6569031c1dcb61c3874c56fd1081b689f1093ff04 SHA512 108bd9f3e7865e03922c107c265da9c2e8618dee0055ff506c0d6b39d74c21699cc4c5f7f18d4d3a18e7f0aab0c9b86c8ea4a3f6d7c5d8ffd7971827f755a270 WHIRLPOOL a83b80b7c2866b315b35b3fbb596276aa86ffdf862eae53394627034534670b91b12e640fba3013000a449e92bf66664bc99ced81878d4557da02c844559be2c
-EBUILD pyfits-3.2.ebuild 1307 SHA256 46c6548435b9efc7889d558eb853caa15fb117d95694c6e258ca7cd5488321aa SHA512 ce2a9991a6641199fe5c08fd194868896c93733fe99fb755e02b84c47150abb1f2be265a6120f52b5a2e7bc2d1d53cc4e6379de2e47ffbdd57808f55e539f5e0 WHIRLPOOL 7b61cdef1fcabd75688a94730f153102ec68b1789d6a064f5f2828d81e332e00acf3fa00c8d29593bf8d90934109b793d8edc51ef51203d867635899646294f7
-MISC ChangeLog 6056 SHA256 bbe15fd7062b79ed5c24802b04bd476cfb2eadda6f24f77c53cb683ec97fc635 SHA512 c850c92b420c1c64b5da5e8e788977b5bcd623beed0093efbe22f494cb502094ae82728e8167809ec3b3a0bd7e7d989b98b9e86e61089c8dbc474f2fcac233e1 WHIRLPOOL e97a6fe79392610e21f4700060299365e18b0f7699341f928b3533ac447193c4fe6f6064493efb3c223c0458094c181b818f75725b04f2334e865d0697eff1e6
+EBUILD pyfits-2.4.0.ebuild 1106 SHA256 4ee21cdaefb7b2674bee45dd9b07b1c210a0e557ffd23c157caa6047567792ae SHA512 e022e62be54fc7f29101cd0018bb4cdd96ad8a7fecc694aad3ba3ec6c7a14f0ec7af67bfe1a23474cdb326a23d4224370b1e35b84a1e322582a9b8541d58a5c7 WHIRLPOOL 83e0b33e3d20df842b616e8da14e86cca2fe574c5533e2ca6b2a9173603ba543cbd8eaaf14dadb9fd841587ddd53b1f3fadc3438e9d740354a3b086a35281e6a
+EBUILD pyfits-3.2.ebuild 1455 SHA256 aaa0e5388ee2fcae7171145df73c4109950816482abef41b401b4b97100fdc97 SHA512 f191f203a441c7e570d86e4ecf4b335839b1aa4fd1acfcfa1fc4de51adc9140be01098595d95233c23af27b1f9fd59b0e95e57828466d9fbeea28ec3c97f69c2 WHIRLPOOL f6c65ce996e9f125c59c53799403ea05c78cb9585a15d70d249d9eac6e951b91c1a53aed583b19920bf4628323be0bc2027426f28c4df2552dc1350294a18e1f
+MISC ChangeLog 6313 SHA256 061b137cd470ec6f106f18154200f9773b3818b1b84ec0568dc835c00683653f SHA512 b19340677dc481e7fd6de0a4e83cc52b793323e8348e4cdb939976429144fe58538ee3376ed022548bf4c283c145f6b6e5741989678d97977e3134cb5c3c2133 WHIRLPOOL f58232e8d65315beb90edcfbb50ad8d88c63ae02780f1d20452e73d396c3af2752eea8ed1f967aba797141637ef51bea92715b8ad26a1ae3b0f8413780b64dba
 MISC metadata.xml 442 SHA256 850ab3e12e4663642d3d25837785bf8cb4bfa1e007d1c0a00a586e43946b4c80 SHA512 40d9f3f2f49cb36e7905c62a5d4201baeefcc0db1098531de6cd9e005392b1ab73fa01d2d0fd390c13a89408c59a62e59a576685171970d906b7a470a5462176 WHIRLPOOL 13a968a5e2f1f67f064fb86cb98170304b75ba81833873a97ffc0330fa205ba8ce416698d9a3e38955521ab4edd86a9698147da9ad550612674b3d822bde5dfa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)

-iEYEAREIAAYFAlLyxicACgkQ1ycZbhPLE2DM2wCgsYwwjiMqYvve65jCmz+Di+sm
-3IoAnjBaCxid2+hR4kS3mp7lON47+8Pl
-=bnsG
+iEYEAREIAAYFAlLz5toACgkQ1ycZbhPLE2AUJwCcDKmdDZGGKXDFIcRP96wUw8MY
+qqAAn34isqlGVImQj/WFcbJxpYDXybd0
+=L1Ai
 -----END PGP SIGNATURE-----
--- a/Show more
+++ b/Show more