Sync with portage [Fri Apr 1 11:05:20 MSK 2016].

2016-04-01 11:05:21 +03:00 · 2016-04-01 11:05:21 +03:00 · 1a49189fe8
commit 1a49189fe8
parent 5b96f3d2bd
715 changed files with 7127 additions and 12214 deletions
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@ -242,3 +242,13 @@

  Package-Manager: portage-2.2.28

+  31 Mar 2016; Sam Jorna <wraeth@gentoo.org> collectd-5.5.1-r2.ebuild:
+  Fix REQUIRED_USE
+
+  REQUIRED_USE of "udev" is only required when smart plugin was selected by
+  the user (forgotten "?").
+
+  Closes: https://github.com/gentoo/gentoo/pull/1171
+  Package-Manager: portage-2.2.28
+  Signed-off-by: Sam Jorna <wraeth@gentoo.org>
+
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@ -7,7 +7,7 @@ AUX collectd.confd-r1 1749 SHA256 60d9cb2af9efcbec56d7ffe6664622bc6270620942e458
 AUX collectd.initd-r1 2132 SHA256 c47b37de040c9aa59a4cbd4205dd02cf80237092815cc0cb0c8ed9a0c9b499e0 SHA512 898acecc65008e033c6c358f6a4f555eff849b6d5bfd77019dd0dd4a94eae6b59600f6559860f4995f1fec3c206e2357c70eac67d6a5402d7b9440d054fdfb78 WHIRLPOOL f2a3963b7448e3ad27439cf21a000c7d234e68fdc998523e825ab8da5e8f6abe567893362a59d40c8453083e8681cecd147439ec4798781a504ff4c7920c0a1c
 AUX collectd.logrotate 115 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e WHIRLPOOL ba884cecfc7fc41e1fc8661d5e92c4519718ebddc4d919dd94d2183f377076efdad19f460ace810e1505cd2005bd64addf34306841993af9d754df633709a003
 DIST collectd-5.5.1.tar.bz2 1797852 SHA256 f9c5d526e1f0429a7db1ccd90bdf9e23923a2fd43b7285cfda8f0341e5c0bc3f SHA512 1935809571b8f0e0870399385312a5687f441d11e08a0c7d1337384b3790c3436ba84f89226aad979584045cc13bdf88f1350a0f49c94bcd0dbcf12ae4704dae WHIRLPOOL 3efeeb9262344a8a1c0aa068e64f5d45ff536d1fc1399b4599143a6e47740d5a33aedf482dbf9110cc5f0345d624fbe71ff00fc6f7afeee891326617f7979e41
-EBUILD collectd-5.5.1-r2.ebuild 17266 SHA256 3998218c484cfcd27d0d0fa690b0dc0ff4f611c906839aa4402a80e218c73438 SHA512 266094b2712141dd6664d50df0ee30302d40c85f0b329b6278e3c6d46a37d3c259ff36a516aa4de1f4f54d26583ef8ac066955d29e8dbb2005b4de224252a27c WHIRLPOOL 1aed17865049dc1d47d2a4d90394ce292f39d38187d7b3fbfa6eec77f77e9ccae25fe505c5126fea7314a12280e39c5d2177fa9d84b1ff10c30ec6843ef4b8f0
-MISC ChangeLog 8529 SHA256 c1beec03dd260173eacbefcda9af19b45678ff4d01dabd240175f528bbe3556c SHA512 f889f8b9fd54e3fcdcc42f05a2c96db2cb9ccced0fe36cfab1fe547b5868843199ba2ec8aa2fe5bab9702cfe60367098b8fd65087ff56860a0fd92ed34f214ed WHIRLPOOL d644d93b3947667ff31c1cafd923def75020e7e90115506c1ca9bc8d80886261720b9a6922f26af9675c0c306f4403b593b817013ed89f4ecd8d60338f3aa9a3
+EBUILD collectd-5.5.1-r2.ebuild 17267 SHA256 0df686aac2b59f9988c5521e9a1259cf4b695dffc7c138f3857ea2678f3690d1 SHA512 4705c1e3c4960b7072c682f7570c1a06061c70d3019f1616cf04ea32f8301c34192a675510b8f311c4d27fe0f0a87c9a7c148063e878373a8c7642082a4b065b WHIRLPOOL a2623839d915bbf452c0aa9979a89e4901f3086d8825746f15ee2b55277292dcfc16d74fe1564609b9b20d06916b197202330882ecfb875eb4939e7b234d4598
+MISC ChangeLog 8860 SHA256 6176825e0fe3e969d6a515d80bb5a7d91acf1d2903dc15046dc6d5521ad4f4ce SHA512 2b2c1294afdcbe5bb1090ec65a70cff528cbb83851a47d50571979338b4b4a96ee855449ce0a01e6e5119570e400afdd08fdc1ae4972c438a34d850f7f297160 WHIRLPOOL 28ce27bf1a64d64534b08235704be8b6d718a1d2282333d18758cc2d94d96524aea073b022e41a9df13e6d1862b02b942f5b6905d025617a80ccabcfaee3926e
 MISC ChangeLog-2015 14362 SHA256 1859e1b9ca3e7493396d72b51c984fdd2be019a1247e7005a41fe1a05f578894 SHA512 2434c3cfe30fbbcdc9a9e0e6d0f2c881d13e58d1bab2f47738ca0654a3a56b5d488ff1f542c1fd011e5349df810dcdc98c80559e91f39b4457ba626e633205dd WHIRLPOOL ce50c9de205ef7b86cd799d1d9f2bc4d0623fbfee511dd7e4a3a1f4d289eb567ff0026866c7b38428b285b88eabde060d77403db71f9455c865ae01c4c3623b9
 MISC metadata.xml 18947 SHA256 ae142c3657f31f653d0a5bcaf24e9bcdf699caa2691b84db798986d905069b9f SHA512 4ca231b4d12056a49c885522fac9244ac3dc7487fd103f8f0a1ebefef29a51d5acff0da995fae6aa3ef0aa815d8c899eff4715f29535b9fcee05921b0679a633 WHIRLPOOL d6f3669bd1f1c16d6f5dae55e2f4f50b7d4eb2b484f3689db1369d51b0fa7b1b71f910eac4bb7bd1e45cf9480968d22174d1fe2e5510283fa5286bae90f27f4a
--- a/app-admin/collectd/collectd-5.5.1-r2.ebuild
+++ b/app-admin/collectd/collectd-5.5.1-r2.ebuild
@ -140,7 +140,7 @@ REQUIRED_USE="
 	collectd_plugins_genericjmx?		( java )
 	collectd_plugins_java?			( java )
 	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )
-	collectd_plugins_smart			( udev )"
+	collectd_plugins_smart?			( udev )"

 PATCHES=(
 	"${FILESDIR}"/${PN}-4.10.3-werror.patch
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@ -77,3 +77,8 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  30 Mar 2016; Mike Frysinger <vapier@gentoo.org> -bzip2-1.0.6.ebuild,
+  -bzip2-1.0.6-r1.ebuild, -bzip2-1.0.6-r2.ebuild, -bzip2-1.0.6-r3.ebuild,
+  -bzip2-1.0.6-r4.ebuild, -files/bzip2-1.0.2-progress.patch:
+  drop old <1.0.6-r6 versions
+
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@ -9,6 +9,6 @@ AUX bzip2-1.0.6-saneso.patch 439 SHA256 8345a9fcfce28a459a12126748ac27480a384e80
 DIST bzip2-1.0.6.tar.gz 782025 SHA256 a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 WHIRLPOOL 8e92c24f77c3711f5103a26d6fefbe61fe49a7d1e46879d259d46347c606ca956b7228ab011aa88007db771f86a500d4954057c7f9c70bd8380ca6c9430bd81e
 EBUILD bzip2-1.0.6-r6.ebuild 3029 SHA256 14c3315a08784f2a8970886520800cf3df88c5f926dbcee86745d1dc4864515c SHA512 75e730dfd3d0b662295c1941cb5eac1bb44f74c4174deba2b89071fd12227030f26bae5888f2128266ea03b573b61bfa7dd905befbf0307d6dee019cb076d4cc WHIRLPOOL 5060a3f83dc8a5b25269ead8cfaad3d7bc70d1b7c8bd03243b32583cc7cf39da8df51bfbb278b009516d453cd9db8a9f3f8aed5463c3b36da513c5184cf0986e
 EBUILD bzip2-1.0.6-r7.ebuild 3128 SHA256 cd6443a6710b5fd0941183cc700038554d1e61abf75e7daca174abee254e97b1 SHA512 f94e3d915005a95f720798a31fc44522c52ceda3f9902698864714323438cd191fee1a4da445337b8229665aefdf796faaa2c3683db373273eead16bfb385033 WHIRLPOOL b93b0e1348d340bfb162ab0ad5fb0925c670ae9bced08eab9b441aba11e344d5aaea10b6df5594187247c431d4ae0571a2b98aaa6a9a113ec6b1a7f28d02efd1
-MISC ChangeLog 3090 SHA256 529e45fcedbe3f6331814601a7f404527a98affe3bf021e3b0f1c6dfa21cb50c SHA512 7fc40b55440be644945a01a349414ce20148eeae30eebe85e271b4ace6be67a153957f75fee7d2fcb1cc788e50a3a07928c4d71c1bdd27ba3e0568645ad2e036 WHIRLPOOL aae0b0dbcff115595f068eedf07da740e42b70cd1c061b53cb58c447257271332fb49359291d54000c3bd9c781df023ab453f4c80b4a35eea267bc11061a7ef1
+MISC ChangeLog 3327 SHA256 ff3fbf9f057bf052308473129e072024e3d015f1ddeff8845961256ed38b49fc SHA512 182cba5df782bbbb95b519dd010db81fbe54f7b5c0880126a39c81556eeb708b561328f6c556b3d862770a3d956a89b5de44c47a0759ec102745916b53d201aa WHIRLPOOL 068849bc574c36f1428974eafae864615eb97b947cbe5df04d6814d8ea0a1165fadaf48065f607adac8eeec70388c61fbda57b5fb52405ec41714b4a0403edd2
 MISC ChangeLog-2015 18677 SHA256 b21e44cabf4e85755a407d69b76a5887bb6634f4ff1597f93d7c6cf67c92f7d6 SHA512 c32fbab48cf636d137ada557532fd70d62fc907be097001f4d4e86bde2e765654bf3aae56d4fb97d6a8e98a1501abc58e665291666d655b926ff5ca4a09a6efc WHIRLPOOL 5a4e135b0a86975c193d7984869e7d7d5b57ffa56ed4895f7557541945b8b60cbec65ea1482b3bfc4f96727cc3b3dccf0b74f00c78244a74cdf2c43d550daf2d
 MISC metadata.xml 332 SHA256 6167ecfa860cfcb3d79a8191ca49affd1b7bbbe399fa9857865a5268861a504a SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0 WHIRLPOOL ea4e55d4bc5f7518feef174952bee5e77c59f7eaf79e1b27b74e57ec042a121b477e15ca4f0669c5688b377e31010a7d2c6fccd59e5e2f060621a5beaf4d7674
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@ -129,3 +129,10 @@
  RepoMan-Options: --include-arches="ppc64"
  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>

+  31 Mar 2016; Agostino Sarubbo <ago@gentoo.org> libarchive-3.1.2-r3.ebuild:
+  ia64 stable wrt bug #578498
+
+  Package-Manager: portage-2.2.26
+  RepoMan-Options: --include-arches="ia64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@ -3,8 +3,8 @@ AUX libarchive-3.1.2-outofsource.patch 1190 SHA256 125ff7b77c245aa6e81e6dcd0f6f9
 DIST libarchive-3.1.2.tar.gz 4527540 SHA256 eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e SHA512 1f3c2a675031f93c7d42ae2ed06742b0b1e2236ff57d9117791d62fb8ae77d6cafffbcb5d45b5bd98daa908bd18c576cf82e01a9b1eba699705e23eff3688114 WHIRLPOOL b90f336afb5264be91fb17d7dae3d5697e3f84e24d276af1d5ac076fe15ef6f5756488f09506fabe470473becb5449cd1f34865309dcf8a914e6e83506e8695f
 EBUILD libarchive-3.1.2-r1.ebuild 2493 SHA256 768556d2c75f7f4a341057d61c37fcae5a93898864196a0d3bf5b23620320d48 SHA512 64301bd3e1e6d7b900875944d076a5d1afc557f17797fdaa2c63920f76025d9712a71292176701f8cce3d979717a72e7e2266e337a6b0a9dd0324dd9d81f1674 WHIRLPOOL 6f6486c07f20514f6eedf25349da4f8e0a882a279146478e1db9acc19428f9df02a4275beaf6cab8349fb8424261f6e460b9ed534fdbef529aad4eb6e681df5f
 EBUILD libarchive-3.1.2-r2.ebuild 2569 SHA256 c3acdf62e9641933d65546095826cb5eb280530a508be423c3bbf6f84f123d24 SHA512 d67b914b5d0af4f76a569a519800f5011f53f795052bcfa10111cbd5aca3daff67ebaf70a46b0b0409defe844f90961f53ca2856894c58f4b8826ff35f5fab7d WHIRLPOOL 2aaec88faa82a91167a6f5b403eaf33bc3a1ce873debdc2b3af15d93abc49fc4314c93bbb32f3f250c856a4a8396fc5a92aeb40de6f9ed03e0340de6861a3121
-EBUILD libarchive-3.1.2-r3.ebuild 3347 SHA256 7a1cab210fb0807351f440e02313eb31f632adffd84db7adf0fb96bda2be843c SHA512 d633cd72ff922e7c3be1ca63154952eae75ad2d4387b69b65ffa20aa65eff2135cf45535d5cec288712e528af3862b44aa0cf39b110d0f9bec0817e2d5dc1895 WHIRLPOOL e8b5250bd67dbc172fb67e58997891cc49450a62a33f31bcfd536130ad063955d968ec504b32f6c1666537e237d0435e332ac0a5547d420de52f2cf12450246a
+EBUILD libarchive-3.1.2-r3.ebuild 3346 SHA256 1ccf7ffc37de5bb0a62012c49cc6af7e46df9eeb5a37e0ae6b18004dbff7524a SHA512 d12ca119b6c18fa9d48ff06f5adea6a7099c0f16f1077e7c6f738089dde973b5ef60ce1e5e71e8f594d6d9bb20f47c450a610afd6f261f60fa7f5a6b0900728e WHIRLPOOL f2ea684a0c4f2b595ff2a104fe0c10797a308d5e1438cc85e737e1e38753f073058ba72850dc9e35183f21aad0099a7f05d8bc497d0a96f8406d8964b19ff700
 EBUILD libarchive-3.1.2-r4.ebuild 3354 SHA256 f7583168e9eb680ecce9d01f5c7eca197c0090bef6f0893cba6b113a0c9a5517 SHA512 99258dc625135c4671e5b27e61dc7d234dfd9dc200670f506249409e9d694988c4bcd809d1997a4298ab364b41a47ca4c5cd287677f83805ec670d8190d2f3df WHIRLPOOL 42daa9db36beb77e2aa0479dcd5afc36a491f8992d652bfac86b27450baa29b24bbcad4a12d974e499849ce0b409fac876157a630870fd27cf94d143493a296e
-MISC ChangeLog 4620 SHA256 a0f42d96d2ceeb896fd105e86f31afe3fe874ba9b75dc1e895ee47a8f6020e91 SHA512 c7ad59bbe6c39bf6741de19e2249176242de857aa87122477414bd4c9984bd90e850f6fab74f67e30abed3c8adbbc14e61fa2fb3bc33cc35afb67dc47677c489 WHIRLPOOL 66df1a9e927dedd7c1a7f6116b11efba4d670f245f70f4ecad231d2222b6c51e70ae48e2975fdf49b0944547ea42b622e8f1d6a883681c24ae6ede351a6fec5f
+MISC ChangeLog 4857 SHA256 17b28360932f50b5f882af5a997f48f73d33728eb2c6d347bfe2fab94faf22ad SHA512 2a1927e760ccbdd7e9e2d9b92b8b30e9bf4fbfbbdddeafd8ac1f15773279c385c05487d3bff170402a1071d958dc7610f55ce2a1829b9d4275904365cb1afe36 WHIRLPOOL a34dd810ef455d5e453b102b982f750950285da34311d69de5c2814c57b76a1ef09a159802fe465a0f77de44a5324ea034da0a2a916b18a286b29d6d6440df50
 MISC ChangeLog-2015 35658 SHA256 5d6739081fe3df492178d0522b91f02761d0956ffe6cff8ea716b93519bd0310 SHA512 28edd8ebd92704e8e6388c261b82cbac5ffc33185c8b8666b44cc06b75186036c7e04cde6c7637411f717590aa41350dd588932c1474ceda1c5b9ad23828b02d WHIRLPOOL c7d02fd3c18ecff0ecd32d7865080c096e9469e07b3810c74c5d8894044e8df4088cc8ef8d898d3452cb86d760f59715bb41f58286b8cd4292fb2d8699f8202f
 MISC metadata.xml 1405 SHA256 ccb5ede48f1af58764431fa7a2fbb97e783acbe1a3ec6d2adc15ba516f853b14 SHA512 bc622903a89bb53b80428659f90e6454a52810ff60b8134378d0b365449b8a3f23af1a9d95920993f0473deba24c7ecb55b152cda76d2d6ad052d5dfbe64399c WHIRLPOOL 0aeb27a8fc50a530c51b3682f802976fa37e3e9ea0b527bf6f32ab589028d9b98cb6ebef39723d643e8e2fe385b7f7148b6dbde7da68aa50dce6c8f9f6fc02fa
--- a/app-arch/libarchive/libarchive-3.1.2-r3.ebuild
+++ b/app-arch/libarchive/libarchive-3.1.2-r3.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"

 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl +lzma lzo nettle static-libs xattr +zlib"

 RDEPEND="
--- a/app-arch/xz-utils/ChangeLog
+++ b/app-arch/xz-utils/ChangeLog
@ -136,3 +136,20 @@
  RepoMan-Options: --include-arches="ia64"
  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>

+  30 Mar 2016; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.8.ebuild,
+  xz-utils-5.2.0.ebuild, xz-utils-5.2.1-r1.ebuild, xz-utils-5.2.2.ebuild,
+  xz-utils-9999.ebuild:
+  toolchain-funcs.eclass: gen_usr_ldscript: integrate multilib_is_native_abi
+  support #479448
+
+  Many ebuilds have started checking multilib_is_native_abi to see if they
+  should call gen_usr_ldscript.  Since that logic always makes sense, add
+  it directly to the gen_usr_ldscript function.
+
+  30 Mar 2016; Mike Frysinger <vapier@gentoo.org> xz-utils-5.2.2.ebuild:
+  mark 5.2.2 m68k/s390/sh stable
+
+  30 Mar 2016; Mike Frysinger <vapier@gentoo.org> -xz-utils-5.0.8.ebuild,
+  -xz-utils-5.2.0.ebuild, -xz-utils-5.2.1-r1.ebuild:
+  drop old <5.2.2 versions
+
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@ -1,6 +1,6 @@
 DIST xz-5.2.2.tar.gz 1464228 SHA256 73df4d5d34f0468bd57d09f2d8af363e95ed6cc3a4a86129d2f2c366259902a2 SHA512 8d6249f93c5c43e1c8eeb21f93b22330fd54575e20bbb4af3d06721192d9f0ca3351878964c9640238ac410b7dd9f16329793c7be7355c7ca0db92c6db6ab813 WHIRLPOOL 7707f10908a57b5780cdb9dda6bac2674f4c5e3350660ea61539b4df5ecc7dbeeb03f05a9b32873d28a14343f9c6491d68095769d3b283018e8139a95bf5f369
 EBUILD xz-utils-5.2.2.ebuild 2164 SHA256 4cb332f9aa6ab78a6e6eb3ee06d0fd492b0a737a97d176fd6a81408d36c0963d SHA512 fa2cff77f81192a13b11257cccf971b89df2bceb526b8e75c7c4f3a66a77397610b64912ac809b64c9ee2af92ef77abef44131fbd1b41e66d806075dae05a0d7 WHIRLPOOL 9d21b9f2e6ec17277e74d0e9efc437aa3a5806f39221c7084f54b1280b62e8c448e54d6090a0a47b7f495f120fbaacc2e5c993428796effb7931011f494196b0
 EBUILD xz-utils-9999.ebuild 2166 SHA256 e1cc036008d90d5aae5a4e2b599725b0726ec16256016f0779fdcb6feced0e13 SHA512 4cce17eef008974975072b0a2b2398f4bbf847879c44569693de1e03f43ef8851d5487f0cfb68c5d2b8f6df74873388289482a354ff0a0e075c44cfd58657bfb WHIRLPOOL bd85dcc1845a71b1f5fb932d6b0a9db18a7158ba904fbd5476d508ea7670693ba078734c15eee32b0c1097735a284a07731fe1efa111e9194232fa208bbdabee
-MISC ChangeLog 4722 SHA256 81c61d799f70e22ee189bb5a9d28e9f62cc10b65653999128c489a1800f1a87d SHA512 694ad4ac552e2168030b9bb8797233789e85fd2c8c76de787875926d6ab6e10e439738d5afe51819bbb41344c609208590a150b521af4b77c22911f792d55901 WHIRLPOOL 9cec9d5e621ac1b00d0f872fa10f442e9bb409a0d6bc0ab8ccb360b4cba28d1236cf38fd467dbca6b9089b85fb3f367ad06545c6c18973bb01eb80c43a4d087d
+MISC ChangeLog 5449 SHA256 d69f1208f895f611b314ae8f3de4e8b1c5dfbb4cc867b567c73da35f2c88b67f SHA512 e2aaaca806d48530574a0a816ac82186853c5c2a7b66b500f9de5832d2a68cc99f39d6352c3cd61ba1ff561e9cf845bca286962c9b59c12fe62148dde9fbccfc WHIRLPOOL e3ff1142f59e816cecdec9444b50824748719e3c1900375bd5c93c269e3d1da4d0b40a4ca7a3ae5c76a7a15895a53f2134b9f9f5864c5869646ca50ad03f1032
 MISC ChangeLog-2015 12969 SHA256 63686500ae830d3f1e9d0b1982c440a6e9dcb429e55d039e06ef5504482a8cf1 SHA512 acfb4e9cb443c31446c0499cdb0fafe13ffcac18e3b62b24df487096310468a5f6d4d7913a2d321cb6e9d6109467241d89a565d3c85a385be06899930aa99f0d WHIRLPOOL adefa045fb20f45aaa9abe710b74887bb7aa002331664cedc61ea4a9bcf810dba09ef1da62fcbe202a06f6b3a8aadc78c1001b1acc7af95c70e880ae614687e1
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@ -25,4 +25,4 @@ EBUILD amanda-3.3.7.ebuild 16037 SHA256 e671e6a3207f53780024a590abc928d25abd73c9
 EBUILD amanda-3.3.9.ebuild 16047 SHA256 eda9ea22e58f070211cb1ad49a42d537ae0a3cf2d8aede3dac291b0fcca22959 SHA512 8dd2f1a09d25cf035b085df3c0288097e6873e89aec30a4a7f258934e3fd2c8baba8d314dc9e08089d249dd96f13eba26c950e7a89e39dd075076dd2ba91a5c9 WHIRLPOOL 6c5298733ba12284d62488baff10a83f6e289c7b93d649e33f9cffd4776eab535c0ccb637ac98fcfbcd1e6bf347a0b718f37d448e46f2b2b264be2f5c6a41500
 MISC ChangeLog 3691 SHA256 8651cf33488db9037d9bdd15796a084b8b173b24828ca16fef184ed255bd936a SHA512 405acd60cdeeafe1e55cb566837b71b984511fbd526d0d56f50473eb21b38b6ba155fdc782775d627c37e182a6df6971ad0e2d91391ec8c4c5bfd4107b414ba6 WHIRLPOOL 2d482168e0be9a2e641f3f84e51db232a92ed766775d59a7e438ffc35bdef974b18d20ff1ea4bffdcc1e26469b057f0569fe5bfce1f5d1f78f25b6ea89a49257
 MISC ChangeLog-2015 29730 SHA256 88035835a53c6f684fac73efcfcfab0b929f27fc9d31cba1cf0af35d94c3e5b7 SHA512 1b4e399131cd7254aa9810591b1f7995e090bf3d7158eb294f2026a9f6c8c9c6d4b0faeb467cda34897de2a3453449c4db5cf6a085c648cc368eeaa335a9c47a WHIRLPOOL 7805794488bc08ca51b19295ff968cee8b05740211323974dd8833f077f5d9b2ad0d7d6941d0a4e963df2056015db6f5765500474148d598b712f3a5bab2c8d5
-MISC metadata.xml 1009 SHA256 eecdc7af78aec3e19d037af28c69c5f798c80e00b457e2bc8504a27c3de2f5c2 SHA512 7c7b94d86d8c341cba2b4b09db254acb97bc10977b01c0259826a3fb491a9b223deac4b82aca529b787e319e2148d14a50bbb37b998e45b5c414f5ca1b8f6ce8 WHIRLPOOL 72d365cba04255bd9abcc32b5a149eb14d83fde26ff249ea005089b7f003daea0111afd8bed2a2cac57a6a064871098c19814fecdc2c9f0fe061d2681dd6fc99
+MISC metadata.xml 1042 SHA256 170c4482f93edc2629f1dc31b8448c08f9296433efc9acce689655f2bcc8e1d1 SHA512 c02e2297f94e6523c00764b57ec086ad433d40aca059e2f6919e58254d659c14cb95dd11676ee9ac6c94613f8cf8b50784a962a23682372ad68774b9ff54ebcb WHIRLPOOL 326a5027bbf58af55eeddc8deaf4096add56a43ec4afc831a881de12b4fc016ce1477c51b201503fd9a4ab8b391d0cb56d9ef6d4e6b9823596b07be1ffadc40b
--- a/app-backup/amanda/metadata.xml
+++ b/app-backup/amanda/metadata.xml
@ -8,6 +8,7 @@
 	</maintainer>
 	<maintainer type="person">
 		<email>lists@xunil.at</email>
+		<name>Stefan Weichinger</name>
 		<description>Proxied developer. Please CC on bugs.</description>
 		<name>Stefan G. Weichinger</name>
 	</maintainer>
--- a/app-cdr/burn-cd/ChangeLog
+++ b/app-cdr/burn-cd/ChangeLog
@ -66,3 +66,17 @@

  Bug: 575810

+*burn-cd-1.8.1 (31 Mar 2016)
+
+  31 Mar 2016; Sam Jorna <wraeth@gentoo.org> +burn-cd-1.8.1.ebuild,
+  metadata.xml:
+  version bump + updated metadata.xml
+
+  Closes: https://github.com/gentoo/gentoo/pull/1168
+  Signed-off-by: Sam Jorna <wraeth@gentoo.org>
+
+  31 Mar 2016; Sam Jorna <wraeth@gentoo.org> metadata.xml:
+  fix bad metadata description
+
+  Package-Manager: portage-2.2.28
+
--- a/app-cdr/burn-cd/Manifest
+++ b/app-cdr/burn-cd/Manifest
@ -4,6 +4,6 @@ DIST burn-cd-1.8.1.tar.gz 153586 SHA256 8445937d904cf36e690764b1956e6736d4729cf6
 EBUILD burn-cd-1.7.4.ebuild 472 SHA256 ed22bc2271c47e26f13e2255a441666b0b7faa379da8223538d934b709b6285e SHA512 239870b13cfcb98575b889b40e923ee6ef9ed653cd449470b5a8ceae152b9f9e6ecc16239c66bb3fbea46f98f2ef3377d29edc1769980c9f632d9f347c64eedf WHIRLPOOL 099d50e02e699ff9b9f7e61a89b36318ddf2dd71ef89839abb0eb90f2c124b74a515175708840dc6a794678a2e5b8086dec85884673cd9fa37d746c249c9cc96
 EBUILD burn-cd-1.8.0-r1.ebuild 588 SHA256 17c73215b4aa56388c557abe9a7385d9723b15720f697f4246a65ed83c98d052 SHA512 b848ca0bf41dc68dccc41f6f970c202f56e1d05b53915e7f8b00623c69b8377eed7ec79c744799cd1f919903d9f574fbb07d5d5593e6b14bceb09cd3d82efc90 WHIRLPOOL 7ec04070dc998b987332eae504a7cb9542c12ee2c9aef12fa9ae1a3e550a1139662abe5ee3386c0ba75f7819f8b5aa4b855b1ead1b9b2c532310cf54dcec1514
 EBUILD burn-cd-1.8.1.ebuild 596 SHA256 369c973d4e088e66a04df9b1b2880e1133c01173e71cb605f61516671f5f645e SHA512 2080bd3cc9252b3af95c98be07513854cdc0d64f2162106ed4882418ad288b5c9827cf318af0ee194e4fa8de9380fd918d9596f16cd6a7fd409b261c30ad22e8 WHIRLPOOL e2d0f29864e0e92e3af28357f998ff7ec504cc8b523abf8afdcbc0a972d8fbc80a029d7df2e941fb6d0a14dc0bf371e1cdd4bddad303a14540d219010e557424
-MISC ChangeLog 2513 SHA256 3d1cd48e559fdbc58f3038ea4132aa39ed7da6f0538f3e008c55813a96c19815 SHA512 8a41607e1494fd11b87f994bfbafacd1414891baf2eba9e40f133eae0a8b403f9d1b5e8dc19fd43683cfb6aab72c4e471569a3573a4dbe13d869e4109f1eb0ff WHIRLPOOL 9d7f8248bccc793dce68893d68b968a37eee3c14047562ac4828f110cc2a15f805031a42f10bfddafcdd7f4fd6eb8bde5d94f5577b73c0d0d39bd6184bc503c4
+MISC ChangeLog 2893 SHA256 e722316d3884e4bb62f55d43c6da15dcd5343b20c9b29160a94b358c844b699f SHA512 2f06be264c571189bc3cc7c711c27c9a1664728fc27fa00a7b0bca0fa6524145d53cc360aa2a4eac58cf4108b93e0d7c677b4a7bd28b8d23d21c1d04f32bec27 WHIRLPOOL e2f48caa4e120ba2aebb7f7ac9fd59f01e2a148c67096ab22bd8cf97d2303838c477ca8ead9c8fdee09df56a350d5f81bbd0f829d3849541c07248c11277d079
 MISC ChangeLog-2015 922 SHA256 be2304f0d1fa7283c8b5aa18b87fa86c2f157bd203ee34f16e941daaee586ed9 SHA512 f4023aa48b583224880e74d831ca03efacb77a14973a16f7e398af89c810ade8bc2824d1f30ac1fbc64acf3ac15ed5152f51cababf6d2388ca9c87720c4afd8c WHIRLPOOL 9da9e1b595daec917caf5aca026d227335ba88c40281c9de2bbd9c0187e39b8d56655bec4765222233a23e66e3e5d1f9ea5def3f1968e93880463a95ad44cd4e
-MISC metadata.xml 596 SHA256 e4b15ca9c98922b78a7edb4542a831e9861e84a7c17ed596b06ed2cc17071e03 SHA512 810c17397e3f4b4d9f5adc5df03e5adf299aa24e67866970f0e1d6040df9e2fd9ac34c79ea85310a0086faed6225479388c8fe4fbb503a6a215d48b2383c1101 WHIRLPOOL cf206ebcc614cc84bbe3271488b5b6d51f132267d95fd1332f2809ac2fcf3bdc35623ba69c58e010ac7b9255a18563ddeff7219fdb0e141fa8528f8adae957ba
+MISC metadata.xml 597 SHA256 cbe275fd2036c3499d62ca4bbebdb532dd4cd6c02fe49b17c3abfc6b871b69ab SHA512 c9449686c758f9b2b0d814af0f81fee34913d61ffb81b5b3d4737866ae26d5b27f42a9c07bce8813284ce34d5d4d122b10c5b3f3686c0a299a9c516617e0ab7e WHIRLPOOL 48631edfba39420cd41651ded3f019a6749e4a02a1b72d4e93b9207bb2f3eff7c7fe7d43b76f4b0f5896de28d828dc8688e6add6c2d7249332d20e87f09380c9
--- a/app-cdr/burn-cd/metadata.xml
+++ b/app-cdr/burn-cd/metadata.xml
@ -4,7 +4,7 @@
 <maintainer type="person">
 	<email>canutethegreat@gmail.com</email>
 	<name>Ronald Farrer</name>
-	<description>Proxy-maintainer; ADD or CC him for bugs</description>
+	<description>Proxy-maintainer; set to assignee on bugs</description>
 </maintainer>
 <maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@ -278,3 +278,8 @@

  Package-Manager: portage-2.2.28-prefix

+  31 Mar 2016; Fabian Groffen <grobian@gentoo.org> gnupg-2.1.11-r1.ebuild:
+  apply same compile for to 2.1 as for 2.0, bug #577254
+
+  Package-Manager: portage-2.2.27
+
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@ -17,9 +17,9 @@ EBUILD gnupg-2.0.26-r3.ebuild 4783 SHA256 d6365bc7b30ce6847407eaeadeb37fbcc9ec05
 EBUILD gnupg-2.0.28.ebuild 4852 SHA256 3712443f59e251d0333af85b17a65c9022c7995da4ad397cb906291f3b8ca18d SHA512 ee9cd4d8fcd9fd6dd2e94267b6c787169e0660cbec952e90814eb4f11f6f25a318318c380234e511484eebabf49d06ba82e1ef8839d05e6b9a8cbd5e61ab84d5 WHIRLPOOL 904953bfd1cac67cd86fcf150abee3167d4c41cd175c2adbdd7806f2644149c5712b9925a936e80e1f1af2f9ca9ef5de1bb2c83aa68f3b316311b7de66211da3
 EBUILD gnupg-2.0.29-r1.ebuild 4978 SHA256 7524b83ab9efaa9ea9cb54590ef2070d2f0a12e4063848703ae352913834a3b4 SHA512 3b177c3aa5949aa51a43c698dbd7bcdc208d152759acb2fd04b4c96a9fb2b31a608b06f5782f56a4cff1a03616c5947cbb8ef59eff948cbed9be220e7985f0e4 WHIRLPOOL b21df882aa93a645acaea838fdfc68e658408bbe0ab52e577b6f4ee65eb8e8dbc126d0a35f022edf9d239269c22fd82d68b239b8419397709d05532aa4f256e6
 EBUILD gnupg-2.1.10-r1.ebuild 5286 SHA256 055899ca2933d3290ac8ebc84c9394d5feddd6fe408abc8873c8309b4a53d3b4 SHA512 ec363e557295e6e1d39a27c007c355a4a67002dd76765d9b844b84f6a89a3840514fa2097f1786f01fd03eb560054475a9554707eb2cd2cb1d13140ecbb6f0c6 WHIRLPOOL 3bf8134a3069221ebd2b576218681edd260df4acf7980c671ab6f1a4ec434f4605b5003c6153db696d3ae8a7a23af5ca14f77e63e2fae6a3276ec058983f8058
-EBUILD gnupg-2.1.11-r1.ebuild 4912 SHA256 e0872b9c5b40a1cb6e474f9be70b9d312c7a15da826ccd41d6ac70cd12e4040a SHA512 14c4afcfa16c57a797d3c208a799c2efa6466f647d7bbca4e9cec9d6252291ddd3001d9da51c1b5f53a8d0a464209f8b522c0fde5b3611fcd8a43565a4df6d32 WHIRLPOOL 47bfd2efc6fe9bc59f473dfdd6c909db0f25ff474e8798ac54a991c0675235e437c390f322c0d369c4866418ad6369be395943c6e47d58022deaff5916fbdda6
+EBUILD gnupg-2.1.11-r1.ebuild 4917 SHA256 43f08ece323e1340138c670235dfcd8e20cef587c5636272fea6f7d685fb7b43 SHA512 68f068e1709fec9576e475387c5757930f847d7d122f4021a9f140bc62cc2f6f8f8579275100a426580e4cb162bc583cdb95f705a5e0b99f7d0b7fc3c5f81632 WHIRLPOOL e141312356a9466d9adaaba982d4c7714d80d1ab35b99f9079a385d67aa8dcd327f9c6811058184791829b48a8a9dcc02191561130b00098f9564e612f933ff7
 EBUILD gnupg-2.1.11.ebuild 4866 SHA256 dc0a3810023409fb5caddbbb9643335b909279b1f5e82dd83a87dde9e07f0434 SHA512 fbee861b1382f30cd3061d1f84d06f9dfab58be89bf590d27ae14fe92821289e6f18015a4401182d4d7688d60858f802ced92265d5d8ec009b002bb7e5f285e6 WHIRLPOOL bfdb4c923d1c941e7414ee339783eeb50dc6fc5803e9e22303b091b0d7a8457525275867abfc44cb4a8524929dc0e22b9c2a92f60dbeb7105c9c05426c150185
 EBUILD gnupg-2.1.9-r1.ebuild 4802 SHA256 178dc0238a24005e7453234f10835725296ba791d0ba3084d9d629b9ad81679b SHA512 77c3c11d29a9511cb1a762bd157e2e0f098d48be663581d686e799d35a9427a4d80428ddc5085585967d37c3900fa979b0301eecf795cd359a136e2fe9a84a28 WHIRLPOOL a40e745382b287d7d720ad21ca4d9fdbc0440fbe9cf52ca55c1ac4de629966a016b97e025606c87d44b6ae93609d6574a238d4382a7078d64f672ac90f0dd2cd
-MISC ChangeLog 8476 SHA256 beab8ae860523cd041314edbfeff37383b9ff4379d9620c2542a4110db01ae25 SHA512 cd1927ece05eed924e10ef68513503327c906c52eca02a6b29cc55d10777556479a93f59adfc1f2dea4ab27fb19f119eee44e8b146deeb50ba33b4db585f0666 WHIRLPOOL 728170da866fef3a92ba0687aeadc567f85323a83cfbddeb149bb7a07fab92c3dd0acf7118e674b7842a973ad7ba74256dfbe55663252b16e2c8f6b1cd7a2667
+MISC ChangeLog 8643 SHA256 a7c74e8b6cad9707fb49080a532ca5f7cfeba2d5be905255be1daaa7698a91a2 SHA512 a5995fd4252f8c2114d6378227037eda74c04237275c14d594de00e16266a69fa90d206b32b35aa2dd73d9f8cafb99c255d97755159841dccf2bb433ec79eda7 WHIRLPOOL 8d0e18dbae8d674cea26484120772f0d3045ebd93e24ef9a3411d466377583d1af0b0b3f7bfa87d59ac9ce2a983bf1d32348558989380778f720835bbb49433f
 MISC ChangeLog-2015 89046 SHA256 295a825284cc7d9b7148c77733782937402db7e07fd7fbf0a9f44861d2018ce7 SHA512 9920db843f9cc1863f3529ac2022f591de8f0b930f82b64ca2859d542af679de3dcc733e5b55b8de060df9bf01ce68cd1828d0c179b1f9f05093cd6566efddc6 WHIRLPOOL d21dbe313d4c1b0e50012e0cc05560d13b712875514dbbea2f56be40ce85c99db8a7693a0f4492dd631119d37cbc796546fe5b62f5d6a6baf598d0a94c0ac0a3
 MISC metadata.xml 1125 SHA256 79d6932281ccc81bcff2db2f1822052a5e16327843f9beedd33426833e52d6ee SHA512 2b36f119da1d90737acfd01bd04dd5f922d3f17f25c3e0e702a604e4389b256cab13aa101199592d991a6a74b74096afe7dbbdd24f567cb24398388099f6e8fa WHIRLPOOL fcc5551be6521818b5b89f553ae9b0d37a813edab86dc53c0caf42886b4daa06998ffab09d98a3eb993b8ccf8f97285d9a790d9966970b35e253bde1b142c161
--- a/app-crypt/gnupg/gnupg-2.1.11-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.11-r1.ebuild
@ -88,7 +88,8 @@ src_configure() {
 	fi

 	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h

 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
--- a/app-emulation/fuse-utils/Manifest
+++ b/app-emulation/fuse-utils/Manifest
@ -2,4 +2,4 @@ DIST fuse-utils-1.1.1.tar.gz 505766 SHA256 7c36c0b42805661a06c21aede3461ffc8ccdb
 EBUILD fuse-utils-1.1.1.ebuild 814 SHA256 66713ebd365bcf09f6bf376a56dc0893f12f7dca0781ce1d7e385a75e1e0c23b SHA512 959d59b9d171b7b592f42fca473b7ed60db0dd8857f8a34dc1bddd847b84439384cf4cc9a11f080fb0b347a1c8ad7e2d8fc76ba66fcd0e172915274672c14026 WHIRLPOOL 8782cdecfa60381ef81a7eb56996bf84d95b508bcdc87d98d265115046da59b47fbbac3c16a8fdb43312b063ddc682e9b1c242948f2be8e8436b6fa2e4cdc3b8
 MISC ChangeLog 2441 SHA256 8a8ab9b1b5528cff13c81d4ff76964fffed13d80575a2b81bd5d2689fe91c171 SHA512 f28c6f5fcc391e65bfc2868351e6f865bf28292367af24b3b0fc68873cf1f0eaab32ebc1ccdff979fa7b4bdce834cc37ccc3ce8fa6c5a3e6d266e87223cf0aa7 WHIRLPOOL 9f571d200f80834ed41ee1df365ec323a367f10d799846f28086081721ff2180f9af069fa3591c729b7f97110145aa69c8b421fd481586ee3d7e48cdd962f5fe
 MISC ChangeLog-2015 2790 SHA256 01815f23760e80570d47d637b592d82fcc702dec91ae8dd64636fdce8ee96e27 SHA512 45575b1afd12f7b79657909a7ecd5d8e5e350c5861aac3306e06156b6b927cd41de1eb5ac3cf6ad0b504efefe62f4ce888b5125e07074e7dd8251a0a759d6105 WHIRLPOOL b963cfa5f444b33d110f22ebfdaf604f2508c3725916f25adc2f85d22c09f8a7615462755c8effbb0d740caf501fb12be4137f2198c2de750d03f31c09f8de9f
-MISC metadata.xml 844 SHA256 4b98ce05d20be8ad8833bd9e23155449bd17b5d9dd474f4572a1006f6e5d442d SHA512 59c08abea37fdefd7c451b025ad19e188abab5c9ec566a3c5d1eab484a64186829ece3a251410d08d949ab04df8055c487d3bf686ccb8ac05972526de5afe8be WHIRLPOOL e058ec838d07506fc802d67da8d190a5b4fe038b3b8a0d64637d20fc614a21fd4503edede5c4df42542b9d379f625f51ac27c6040d02cf6383362b2ad9013d9b
+MISC metadata.xml 852 SHA256 0dcf9f164511cb96f9663c27ba1934a82dd56ac81398f2fdc39c00993810a3b1 SHA512 daa7ba4df86b783cf856a357bd7e4ff18c7b5fb77535dae9f98cefc378457c0b2988f033ff0355bfd126d7700734e3a81e028f134cb4f3a1344fbe27751ac6c6 WHIRLPOOL 13acbe3f97be012e4b2a3281a88f918e366661698b81acf4cfe898df200d71aa892a06d793eba25d31c1acb3766da81dee5ba74124c54a0cdb2b2fcf75346253
--- a/app-emulation/fuse-utils/metadata.xml
+++ b/app-emulation/fuse-utils/metadata.xml
@ -8,12 +8,12 @@
 	</maintainer>
 	<maintainer type="person">
 		<email>jmfo1982@yahoo.es</email>
-		<description>Proxied Maintainer. Please assign on bugs.</description>
 		<name>José Manuel Ferrer Ortiz</name>
+		<description>Proxied Maintainer. Please assign on bugs.</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<name>Proxy Maintainers Project</name>
 	</maintainer>
 	<use>
 		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto of some
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@ -6,4 +6,4 @@ EBUILD fuse-1.0.0.ebuild 2370 SHA256 acfc1d059486417166b3e81771ce695108bd17cc448
 EBUILD fuse-1.1.1.ebuild 2414 SHA256 9ea2983adc21c6297aed31ae44d114796fe0ebe313bbe9d93f3d1af86fe4e566 SHA512 9b3f4c35b128ba8d84342a40f808a246654887ce897be60107856428d70a33df2817d2718c41f84bb5caef3c837145d90d365ba60eb3f3567b2352345dcd0514 WHIRLPOOL f92d1561f51b3110bab86089da29997cb6925821bb90b638c0fdd4f82c907d399067111e3c7ccbf0a0e7f4b900e5704ac4d09a4a4e5072ec63e29a33c22c762e
 MISC ChangeLog 2543 SHA256 915420f0d1305c210623f18259a5ce32f18a212394db799c0061d4851c7d474d SHA512 faf1bd85a3932be38c79c7ae67b37c77c5291e0956c42a201a134411552410d1b1a4de24ef448f56d87c2880781db8a5371af5487bb4df4bb0ed25c501a2759d WHIRLPOOL e63c6737ff915af5f4b521009aab201277c858055d9d0f1ccb097dcbf94508d947fc527f29c8cffbd504ff7849a15f582e58a4f22d57352e1f5cde403326b3e9
 MISC ChangeLog-2015 5896 SHA256 3ad7bc9f088d3e9ddfc157a9d7619f503e26acea51ce41859f9908e23d8d2888 SHA512 e84cf8adf0bd49f3f7d618ddd01b0e28a6aeb5b2ccbb3d8f1486f96673c38703cf19084253c46cd484e50186b798777b3018b9dccec34ca8ad7235080c649469 WHIRLPOOL 552d95fa16d5b3949ac213fc7e11072478167befd82dc30a17dc928e5bc6539571780b3066417d8b7829bd987de994c0ae1709486669da5f96983075ed9d7c1b
-MISC metadata.xml 704 SHA256 25493b7c8fd997953e6f56f3d06d0b8ac4f7b9f61a04b50401a277293d280695 SHA512 da035d1f3e416f0b2bee73889f2d68ba7d836362afcf50bfc488c8c313fe0208e4a6627e82f9cbcdf89db7e9fff064b38b318ffc4cb5fdef5bf1ad1c85707df8 WHIRLPOOL ea947a008fb69c4ff30adcca89ed46757eb14b4ac91eee5b80b12ab9b00d0dc22277156af2df70b3c96874e57afad4d9483d74ee7d256cb7e1aa751516669dda
+MISC metadata.xml 712 SHA256 c0a6e460534dc72b8049d84c78647e2a825ac65c7ff45d275979f20cc7b77e2f SHA512 d94afc3c9d5c3dcb5ca7eae56fa88efbac0455443a99776a5d6414ba7f0f70c7570e858fcb0ece057ee3acbe0351ea6913fcc5b0181a50493cf18e3916a25b9d WHIRLPOOL bb3c8737774e10a0a4aaa5ef970522883e79d8b3c5763366f06f59b6df67d666cc5934b0246edaf641203ff6abf749aea6f4beabf56478afc3d19a3ab30552a2
--- a/app-emulation/fuse/metadata.xml
+++ b/app-emulation/fuse/metadata.xml
@ -13,7 +13,7 @@
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<name>Proxy Maintainers Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fuse-emulator</remote-id>
--- a/app-emulation/libspectrum/Manifest
+++ b/app-emulation/libspectrum/Manifest
@ -4,4 +4,4 @@ EBUILD libspectrum-1.0.0.ebuild 993 SHA256 6721fc017915e38daee68dc9f5162108ac37d
 EBUILD libspectrum-1.1.1.ebuild 993 SHA256 6eb7c328172c132e55dbedb6e6ed4aba295370738139563e6f9d3b1a3d884eb0 SHA512 bc9b0f744dc33bc4d59228aef6cbc3fce25af66f207611ab37b467a94836d11e691614108dd3ec5483bbb6d8250398ad46c62fc6ead357afa26588efc329d246 WHIRLPOOL de2f56098882e96c40165d9f5fc6426e3e2363ed727a78f2559af56157e2879fd6f5cb0bf263cb886495871ee0bf7e31c4da8104f2328b2246bb6931681437f6
 MISC ChangeLog 2603 SHA256 2f29a0b1d8dda1dbe61c2cc99b87f62cc0ab3323c3b03fc94e32d0c925b0f26d SHA512 b9c88bc263cb6e9409ef48474485c947d57d7ea22ab26a746ad8febece85f20dd8510a61e1b7f820f9dece7f981cb5fea8201b80c3039843ad16074b876151b0 WHIRLPOOL cc5ea8e6b38572def6d70e56812a2c9429d3f2c5203bd2e959472c46c5d3785eadccdca1ba98d24576875face8727b8d75c033a2bb1f16bec1f12ba43b68faf0
 MISC ChangeLog-2015 5685 SHA256 cabec307c782bd8af05cee1678ff9899364645a38427e6d05ea12d6ff9ddfccd SHA512 09db28cbe220e96688e024f5b178906870d17a3592bba3b21d41805b55ee6a6e160d02fd895ddc21bf39e34dbe0205d0d8ca7619f188c0d187c00b06790653d3 WHIRLPOOL d33daf9ac27ca8f6f4d5bc646872cdf2319d166a449e9a4a4a3b606a3cccb16c88453edb5b7d2de50c8541e71b5573d29245f272f1e83e440429601309ee9c9f
-MISC metadata.xml 1158 SHA256 338677740798d0bb046e845effb306ada70baf1904c890804d002adfe6f5ad7f SHA512 afba13b69e482a66e0989b220982974ebc559d51431286a03f568b090fe47c92174eb9e8ae27c42d71ffcc617feff5a280ebfcd5c24e3eab53dde36cc8cea3ee WHIRLPOOL ea400d5df60f8970f6173c80eff749f846ebe8357b0e7ab986cc19707647733cc83ea8f777be65fe8c91b6d02f0023fee15d2d77cf887380cbb3904a3b75865f
+MISC metadata.xml 1166 SHA256 c5d8c29448d4e89a8295650fb889c5a10a305c5af39535b7ad4a3e2d6c6b2c87 SHA512 42447efe1efc6729a4ac86176e32d3d4c8bb469821bc5303512a5a971da2bb5dbc0fc8b1171ffa0fe61bdab062085498d58cf20952dd9e200f6ed49afcb8313b WHIRLPOOL a65a4ccc0afb6a61b721f6cc300daceb91fefa9457e337f092ddfd5b72783d67aad840a77615aabc7a22d59159a9d87d4ba1fbb2eaff4d93a9cd0ef4e83ba164
--- a/app-emulation/libspectrum/metadata.xml
+++ b/app-emulation/libspectrum/metadata.xml
@ -8,12 +8,12 @@
 	</maintainer>
 	<maintainer type="person">
 		<email>jmfo1982@yahoo.es</email>
-		<description>Proxied Maintainer. Please CC on bugs.</description>
 		<name>José Manuel Ferrer Ortiz</name>
+		<description>Proxied Maintainer. Please CC on bugs.</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<name>Proxy Maintainers Project</name>
 	</maintainer>
 	<longdescription>
 libspectrum is a library designed to make the input and output of some ZX
--- a/app-emulation/winetricks/ChangeLog
+++ b/app-emulation/winetricks/ChangeLog
@ -105,3 +105,24 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+*winetricks-20160329 (30 Mar 2016)
+
+  30 Mar 2016; NP-Hardass <NP-Hardass@gentoo.org> +winetricks-20160329.ebuild,
+  winetricks-99999999.ebuild:
+  Version bump to 20160329.
+
+  Also bump to EAPI 6 across versions, in addition to minor
+  formatting/wording tweaks.
+
+  Package-Manager: portage-2.2.28
+
+  30 Mar 2016; NP-Hardass <NP-Hardass@gentoo.org> -winetricks-20160109.ebuild:
+  Remove old versions.
+
+  Package-Manager: portage-2.2.28
+
+  30 Mar 2016; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+  Add Chiitoo to metadata.xml
+
+  Package-Manager: portage-2.2.26
+
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@ -2,6 +2,6 @@ DIST winetricks-20160329.tar.gz 170236 SHA256 a2a6f93e5242c22dd284710d26d6c98169
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 SHA256 dded8c294cc5c2e71e4a5d1531ab165178cf3d2d1d890d0656368c2e499bfeb9 SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a WHIRLPOOL 268da9e06712a678fbbcfff8eac1fca364b5e46f0a9c48a591eb88f03260b1a55f203eb2908bfe1f0a534b77c866127ff6f7049b0e43fe8abeaaa26fe55de75b
 EBUILD winetricks-20160329.ebuild 1839 SHA256 fef53db19752c8f1dcaec2cb7c355e90613d3034341169279c8226fe2ae1edde SHA512 4a80e24e53f36a55b9d043ad6565a214cb9873e0bbd51ae224f347c9e7d6216fe0e44c7357806e9c50a993e1c8e7ffdb745f1411a021fa6d17347ec330a5f663 WHIRLPOOL 3f4b1f2560497ccd9e3c05fc2d7582ed90a113ceac641905e82a052ec7ebd8bca458d0682ec2ab74a78a719029d0beb010703fafa1efad6dd73a718dcd05acc4
 EBUILD winetricks-99999999.ebuild 1837 SHA256 ba0d14e70546f96eb7a71fc59ab2e16c98c2cc68df5dee5d5e30cbc60e638201 SHA512 36e734e2abb4c6b58e77faffe2f632fd31a5abaa79b5e444010ac98f19e309af4b07a715a1d05a2a1956b0e176338abb5074e829dd790ab52e9adef0a8edd9bd WHIRLPOOL 3857d478eca1f07f54bba5df7ab8695a6fb8d65c6f5e7112eb786c6b7d2ac6f290d07aa7cac3ac25d95f50861db5d71bdcb200efb3697a7e6e60dc553cb42055
-MISC ChangeLog 3679 SHA256 869402f229c7ec5de486ef715e3f20506522c1ebe5aa5d28b81dd2e194c9f3d6 SHA512 3c4eb4be6ffba232889e50fa0e38bab7ed55d6fd5ab4c603d88a0ac2767e553b89d30acb80ee3fd727fa7f39a1f9540f22c6101fddf107e4ced4921ec856c97f WHIRLPOOL 0c0ddbbe85c7fe60190f7c42ee2e0c6beb3ba519deffb3f2c0c0e434793e1138ae2bc24f508b643e1177dba8b3771879e51e26ea135c57d05868e081eb9ee8a4
+MISC ChangeLog 4246 SHA256 759f7dc3b70f7ad3b887a211d2432ed837ed17fbe2abf83ac90fbfd0715a9d6f SHA512 5985d3a4f22970e6c8b85cc1209dad99b51534abb07182a035c1491c73ae30f204cf017347e2309e9958e2fd559a18f47ef080dd0a02d5200341cb7bd16f7e7e WHIRLPOOL 0aecf3ab6eb149ccbb90a62200c6d3eec7e2d350fc11d093474444923ecb984f9bc930f5456bf9c4ee6657adb6cb9e7373da92905292b21541fda804648caf64
 MISC ChangeLog-2015 7705 SHA256 85e49ccc477724b50d0a6463ba21ec5b5c9b9c98f30c10f60b6a6df9bb76b898 SHA512 4a68dfe95bf60ab83873af11025c9d66e2a1801b5f7b58bd96baf0a0ff44144b2a77c8b0edca49d2384bd5fb4ebc982d7a8db61430acd346925abca57f0149e9 WHIRLPOOL 0799bf2386eb0c9754d79d61eb590bdfb3526253d8a0078c08d86cda8c61169ce88c4081f7ccc7a79b28c4f724c78176c1129cf56fb37472c3c7c7b7d0e5d126
 MISC metadata.xml 847 SHA256 ced2745519dee924ca19fe79e5610d99d323dc24b45ecbf74d7453c96f9490d8 SHA512 54a9b20cf84169fdad35f89857cf5bd7d17906a53c760079f789653f89d5dece00fb8bfd8014d1603159cfd72fe0b9d93b1e28c0c788b522c642f224d7d22f10 WHIRLPOOL a8a5571d8e8ef8d39e81690656256e14baf1e81419ff37603dd92bf04122612e0a9f1e1124d48b9d0e630e76012ed7084ca2cb763444349e2be208c29abc22de
--- a/app-misc/anki/ChangeLog
+++ b/app-misc/anki/ChangeLog
@ -88,3 +88,10 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+*anki-2.0.34 (31 Mar 2016)
+
+  31 Mar 2016; Patrick Lauer <patrick@gentoo.org> +anki-2.0.34.ebuild:
+  Bump
+
+  Package-Manager: portage-2.2.28
+
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@ -1,7 +1,9 @@
 DIST anki-2.0.31.tgz 3329290 SHA256 4b969629255b00db9a9eb8a2fd70271cc41c92c47752eb1c78e8609ff025be2f SHA512 3e6e29247d83b026ece6974007c848822360a812838dbb718cf3f1423fc9d015236b027944cd99f3b419e0fe4fe6cb2390d185f00646af727ec8e76f4aa3cbb8 WHIRLPOOL 42b1ecf2cc856c15ad1fe690d45e8051a8b79ef0b850e701a6a8a510a56cc4e6711bf4c8acc8ae9add7a3c761788005979c9a6398a71e1b28c9821043d5f6053
 DIST anki-2.0.33.tgz 3376646 SHA256 b9fe2c35a68e90f3fa31f5c67f3447a7e1033d1c909baa381a1525ce5e71b9b4 SHA512 ac2df1ac94e5aa4cc04c17d41b8f96788b5f321860bc20b4a167d5ee0161ca4f7f586fda08ac9910a706ec3e7d1bd692d2e74f3de56997c9ce480122396e0d6d WHIRLPOOL fdddc9c51f2226373bdf5c6547a3b643b94aac37d68cf1e1430ee9355d4f5b11ae3e4cca218d65e7a76a0921f8d2e3e0676c2022aef4e49998e596531ce93848
+DIST anki-2.0.34.tgz 3411136 SHA256 ce70f10efb7deabb5cf5e6e003a3ee0b22a2d37ed24ac6c4d8f4e079b8ae5ff8 SHA512 289e937be7174b24b5213166d5d434a265ebef313815dbe105de6e21c83c6cf0cba93000e489b050fc5a04fc80bac25a71e7a42adad55bf2a1a2a246890dacdd WHIRLPOOL 3b3f2f9292b917dbde23825d75f2dde1219c3992538f29fea11a5c3bb6223abbf86a8593c50c0ee6d2ab783a23c38c5358c768a280a1cfbf6af01097e5070da2
 EBUILD anki-2.0.31.ebuild 1517 SHA256 4c1e6000057606916e5d305c01d96daaf606fcc03ddc491e58bac88b8b45b422 SHA512 3d59229f1bea607fd09639f554753fd91dd9079097f6ae19f083b3ac3795fea3634e72b94dd420980e8308da113142630e33517fb91d00ff29ea14234bbdbade WHIRLPOOL d4633a4886da4d5c5dc96aa6eb64ae45a61a939f28f7820d0d23c5f27ee4853dcd467f7775d2449c3ce24e50a112cc417513f7d4a86cbffc33b4a70f820ffdd8
 EBUILD anki-2.0.33.ebuild 1263 SHA256 6741ddcb74d696775761782a4c4ec1687cbba4ae1207455a6b103d5cd04d6861 SHA512 eab8551210e27f80bcd15dceb0f49b50ae38c65614e7f4bb71e61f33a0169bac33848ffd91d6759851ac7344ed093c7b7c7815f60d9a62ff57902b4235d84d09 WHIRLPOOL 39a45dcc3eabc81aac47a2e600fe41e6e72159497680d802105a9007eb2faa3567409ff1b7136f6604217d3883d7d17caee5847a1fde4d415140c17f847cdfc5
-MISC ChangeLog 3050 SHA256 460da65a5aa4a22467b7ab9e5a20db007a4f3dd743367feb7143a12ec376f614 SHA512 70e1f1b9a1ba4635e1eada61958430c6013e72f9fbe1305a6742ece0898825dcc1961b55350ddcbe44401be9c5c80fd86c62c88985735c38cd9fe140f65cfa21 WHIRLPOOL 986a2c1baa51216c38ca8d9902052ecfecf9977a03b5eeb937ee0a4719f231699c936ebc48692921b717a1194c753e18f838f14c69a9eb3f699a7c6184777b16
+EBUILD anki-2.0.34.ebuild 1265 SHA256 ef163daf0c4a597c9887fb3428bc7047fe6b1c5a7d6e5391aab1f07d06ced02b SHA512 4f73f5c3a2334ceb0d2fced5e7086b1141f14194be421de6ba93c88674268b73e7b78d3e6a523ec50a89ae6bc4f5c7bf7a3e09b119d2acde8a7e7795cbc2a417 WHIRLPOOL 40fd7fc4ba423f10e0388b3d939887ee74dcb8fd1f9cf90fa44220a2e3b1600fd55245054363733d6cb66011af8f717e4a49df33d9a48ad5ccca64838145536c
+MISC ChangeLog 3192 SHA256 4b108ee8afe95e885f0ad5cfb90c50db99b549155862468151861f3d908638d6 SHA512 ea4dda2a07b08329b196ff79c494b9917a52c5c87557e160f9dbd36f1b086687620891ab11256d6158aade104a89e0738996dc2d3d2498db169a2ccdb80b35da WHIRLPOOL 5a41ea9831fc903c5c7fbd7dde890149e272785aab1b5d434e89904fd625dce4f4fcb6d82275d69c7302f219f05928d2eb19a23da2b0b928064f312000541216
 MISC ChangeLog-2015 13597 SHA256 f169f73f5e36840c9b281c98f2d420597ea86866573b224c12c87f054be9c23b SHA512 8a148eca4be6552c783d903eea48cab5ea7f6a4bca1b9c9f3d80a3fe80f989855943069c99a7f361d3ee85b98d2f8f94d4a751fc7a456292fe7ffa02105cce22 WHIRLPOOL fd93017f71140b91cad14d2a30d2c1dd30e355c95db551c03e64aae79dced66f3ad4fd12e54ae8516c87b4a8ff85f074cb23bd8b5eb545c9dc5b7dbe9a1bc43c
 MISC metadata.xml 780 SHA256 5581e6cbeda1725f6de0f6d58e3d15b2d5ca37fe70027e74e82a0f49827690ef SHA512 6628f1e87e140d132e934d7bbac6f67fa8fa222186df47a3dc6bd92447d9ed6cbed338080d6a0652a725291b374b4f38c8fb4178cf0e51746c6e3cb318c43ac5 WHIRLPOOL df821aef881b1bbd7cfde11a63b1f8919584413dc096297cd7db9a92761c6758a926a44fa6f43d7396351cde3d3315eb5bb8f1042e7a075834021736637f8820
--- a/app-misc/anki/anki-2.0.34.ebuild
+++ b/app-misc/anki/anki-2.0.34.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-single-r1
+
+DESCRIPTION="A spaced-repetition memory training program (flash cards)"
+HOMEPAGE="http://ichi2.net/anki/"
+SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="latex +recording +sound"
+
+RDEPEND="${PYTHON_DEPS}
+	 dev-python/PyQt4[X,svg,webkit]
+	 >=dev-python/httplib2-0.7.4
+	 dev-python/beautifulsoup:python-2
+	 dev-python/send2trash
+	 recording? ( media-sound/lame
+				  >=dev-python/pyaudio-0.2.4 )
+	 sound? ( media-video/mplayer )
+	 latex? ( app-text/texlive
+			  app-text/dvipng )"
+DEPEND=""
+
+pkg_setup(){
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	rm -r thirdparty || die
+	sed -i -e "s/updates=True/updates=False/" \
+		aqt/profiles.py || die
+}
+
+# Nothing to configure or compile
+src_configure() {
+	true;
+}
+
+src_compile() {
+	true;
+}
+
+src_install() {
+	doicon ${PN}.png
+	domenu ${PN}.desktop
+	doman ${PN}.1
+
+	dodoc README README.development
+	python_domodule aqt anki
+	python_doscript anki/anki
+
+	# Localization files go into the anki directory:
+	python_moduleinto anki
+	python_domodule locale
+}
--- a/app-misc/vit/ChangeLog
+++ b/app-misc/vit/ChangeLog
@ -15,3 +15,9 @@

  Package-Manager: portage-2.2.27

+  31 Mar 2016; Michael Palimaka <kensington@gentoo.org> vit-1.2.ebuild,
+  vit-9999.ebuild:
+  add missing dependencies
+
+  Package-Manager: portage-2.2.28
+
--- a/app-misc/vit/Manifest
+++ b/app-misc/vit/Manifest
@ -1,6 +1,6 @@
 AUX vit-allow-nonsudo-install.patch 978 SHA256 280add74e4c57264bcac1b48fa75f60093a2a8abcb98af43818a265125947b64 SHA512 11b50594481934dd33a5f59bf04c61c7a347e517f1f0408be8c7463731490bf49c0c823c4b9ac1b951ac1f7e66d531f2d0df74ee12c3d25f47a299a2b16da628 WHIRLPOOL 9cb3859752e9af3eb379492e9213f1955a9f17f315d3d92afbebbb9ada9673a9cf37396bd48819a5ea05f112964f087de6f97b47532e9fd0290b3b8093bac4f2
 AUX vit-fix-man-installs.patch 739 SHA256 4d70541ce26a70b07480d1f5055b8c5f04e6777d88b3048552abd20d6f0241b8 SHA512 9b1795690ba090bf0487b35da28f3563f5bae4a8133d85f469a9b0104a84588d8948b98a2935b83c9c321fcffcf5a44027500eb87a736de4b254374f142dc572 WHIRLPOOL 492203fbc0dde0fbf651f9538beba6baea18e52fad918e50e0b681f0aa76681ca63cb79a04e2a3b6dbbd0140b3785206a1d4ddafcb1ee9655b4bf501b8a3ac78
-EBUILD vit-1.2.ebuild 758 SHA256 804212ecd5488c889a307f29ad0b9f6a5b0197ff9235786cca035a2baac0e328 SHA512 aafd2e0988607e4ce3fd1e2ed16d1943995b2f3e237c037fa477f8c0c9f0b5db25845c899188aa01cfdd6c0ad3b2738f51ac8b456e8f85c8d532471f37e5f194 WHIRLPOOL 82fd7c0b6d99b88950bf4795964212e3072bf000cad51f7b30c2704b7e3f3a1cca7e97cf445ba37c314edfaceb2a234011148591ee9f7f832750fc3bd884148a
-EBUILD vit-9999.ebuild 758 SHA256 804212ecd5488c889a307f29ad0b9f6a5b0197ff9235786cca035a2baac0e328 SHA512 aafd2e0988607e4ce3fd1e2ed16d1943995b2f3e237c037fa477f8c0c9f0b5db25845c899188aa01cfdd6c0ad3b2738f51ac8b456e8f85c8d532471f37e5f194 WHIRLPOOL 82fd7c0b6d99b88950bf4795964212e3072bf000cad51f7b30c2704b7e3f3a1cca7e97cf445ba37c314edfaceb2a234011148591ee9f7f832750fc3bd884148a
-MISC ChangeLog 541 SHA256 5c942764f4d8b0ff7719bcf97d886a15dd2476fb46f3a599b74db6e82ee1c8b2 SHA512 4623876ae7b2b3e4da9857888f48e9e7647b1788cc7d4e555e1d0ad7be8e2904aecbe47a0e77f8f555bf8d47f8999c007b9a86989a65c5559458e3a7bdaa32e2 WHIRLPOOL d9725ca88b724feeacb902ac4264bf47e442736c2bd98026ca8a3f8deb4509b4c8e99d120db93352610ebc8052cb446c79f995a77d2c02afd0024148dd476b40
+EBUILD vit-1.2.ebuild 788 SHA256 a6f2c34048199f9c0bf343ac802355770028dd0f1d0e89035d35224edc5f7688 SHA512 6a4d68c783c3dd6e5245ce429b4b442fc3be039bdf541c8954930dd47457879c655a3e18d76c6b9ec27b608c0947df23809cfbbd26ed69fee305179414cce044 WHIRLPOOL 3a823bf6d250c43eaa11c5deeef82192e5f9e9ca9451d8507ad8bcc55d789a54390d6e158c6b3284bc78cd466878ca54d0628a9972e4e37b5f7bbd420996c824
+EBUILD vit-9999.ebuild 788 SHA256 a6f2c34048199f9c0bf343ac802355770028dd0f1d0e89035d35224edc5f7688 SHA512 6a4d68c783c3dd6e5245ce429b4b442fc3be039bdf541c8954930dd47457879c655a3e18d76c6b9ec27b608c0947df23809cfbbd26ed69fee305179414cce044 WHIRLPOOL 3a823bf6d250c43eaa11c5deeef82192e5f9e9ca9451d8507ad8bcc55d789a54390d6e158c6b3284bc78cd466878ca54d0628a9972e4e37b5f7bbd420996c824
+MISC ChangeLog 695 SHA256 1a1800252b882882a3047d7e5b7d9c26cd2cf2caf2896de85a6809f0382094ed SHA512 89fb04cd1d7d3ae66b9c57d586cae56c29cfd1d55e1e459ca60345b3e2ac8debdc330fd83e27c2b1fac716389395a4e932be3d590adafe44c4e582c528f5825e WHIRLPOOL 3e4b88396004b1d58ea441f30ef7088ef06ade2ecbeef5a5c8b868549749742745e9da95048e5110d28e51fc3a1e99e0e51f4008587af13727635799baa8a56f
 MISC metadata.xml 379 SHA256 58ca2f21215f0b9037b8cb587a3e0e52d2d825262fbf99e2c140b5d4fb2c99b0 SHA512 128de3026710cd328707f464e15a63f4be7cdb13b1d3b61ac6e47b1322d152f9d0b3f3f9a4417f1c34d1a065c5c627cc76dbe9ad28527060569f4a288500a9bf WHIRLPOOL 828b6f37fe960171947147d287ce5eec9fcbba0dbc5de4c14e80ffc0d432e207c000b21835ee228b257f5b4f328bd2a7e16459afab9ef742177d026f35d4d6cd
--- a/app-misc/vit/vit-1.2.ebuild
+++ b/app-misc/vit/vit-1.2.ebuild
@ -21,9 +21,11 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE=""

-DEPEND=""
-RDEPEND="${DEPEND}
+DEPEND="
+	app-misc/task
+	dev-lang/perl
 	dev-perl/Curses"
+RDEPEND="${DEPEND}"

 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-allow-nonsudo-install.patch \
--- a/app-misc/vit/vit-9999.ebuild
+++ b/app-misc/vit/vit-9999.ebuild
@ -21,9 +21,11 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE=""

-DEPEND=""
-RDEPEND="${DEPEND}
+DEPEND="
+	app-misc/task
+	dev-lang/perl
 	dev-perl/Curses"
+RDEPEND="${DEPEND}"

 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-allow-nonsudo-install.patch \
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@ -582,3 +582,50 @@
  RepoMan-Options: --include-arches="ia64"
  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>

+*postgresql-9.5.2 (31 Mar 2016)
+*postgresql-9.4.7 (31 Mar 2016)
+*postgresql-9.3.12 (31 Mar 2016)
+*postgresql-9.2.16 (31 Mar 2016)
+*postgresql-9.1.21 (31 Mar 2016)
+
+  31 Mar 2016; Aaron W. Swenson <titanofold@gentoo.org>
+  +postgresql-9.1.21.ebuild, +postgresql-9.2.16.ebuild,
+  +postgresql-9.3.12.ebuild, +postgresql-9.4.7.ebuild,
+  +postgresql-9.5.2.ebuild, postgresql-9999.ebuild:
+  Security Update
+
+  Fixes security bug 578680.
+
+  See http://www.postgresql.org/about/news/1656/ for complete release
+  announcement.
+
+  Closes security hole CVE-2016-2193, where a query plan might get reused for
+  more than one ROLE in the same session.
+
+  Fixes CVE-2016-3065, a server crash bug triggered by using pageinspect with
+  BRIN index pages.
+
+  Additionally, support for Python 3.5 was added for PostgreSQL 9.5.
+
+  Bug: 578680, 574646
+
+  Package-Manager: portage-2.2.26
+
+  31 Mar 2016; Agostino Sarubbo <ago@gentoo.org> postgresql-9.1.21.ebuild,
+  postgresql-9.2.16.ebuild, postgresql-9.3.12.ebuild, postgresql-9.4.7.ebuild,
+  postgresql-9.5.2.ebuild:
+  amd64 stable wrt bug #578680
+
+  Package-Manager: portage-2.2.26
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
+  31 Mar 2016; Agostino Sarubbo <ago@gentoo.org> postgresql-9.1.21.ebuild,
+  postgresql-9.2.16.ebuild, postgresql-9.3.12.ebuild, postgresql-9.4.7.ebuild,
+  postgresql-9.5.2.ebuild:
+  x86 stable wrt bug #578680
+
+  Package-Manager: portage-2.2.26
+  RepoMan-Options: --include-arches="x86"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@ -17,26 +17,36 @@ AUX postgresql.service 1768 SHA256 a5882f4f4b8d391a1226c5dc514df83342107c94880e3
 DIST postgresql-9.0.23.tar.bz2 15045569 SHA256 3dbcbe19c814139a3f4be8bc6b49db804753cbc49979f345083e835c52b4d7de SHA512 db8fe64a5a5a1caae97e792ee5b8bcc375c6d6e10ef9c35f1003f174745568854dc5a7a58dbaf46794dcd35dee5a13f6eb1ba356f9618134b601b7759c753c9f WHIRLPOOL 5177facff628271a0d57d1f2925cfc04796020492c4102f0b0c6fa34149da9ddd9ccb0a38629e320521fe82163bdd4aa56f74af3a887ff4389cd9f62e921c53a
 DIST postgresql-9.1.19.tar.bz2 15843978 SHA256 cbd5057451147dd63a1e764176a4e17a7795773be1e4266ea9faa951064c0ec6 SHA512 23dd4108556edcc667f599c5663356a1106bc239a1c5337d153c13a1e1871d52316825b84802bbc1d79612dfa4c9c77f4c4b96d59d23d7338988bdf370e956d4 WHIRLPOOL 6845fd8071032e987ab65a642ca04adbc8b464332bac8c346f01e011411947aa4341ea596fd910342124fcbae4cc25410c25ab695894b0b68d20441df5424722
 DIST postgresql-9.1.20.tar.bz2 15844360 SHA256 6d1e6c4334c265a85f0f96407b7a9aafff0f26cb62db2d8d03a32ba0c2872937 SHA512 ebec6aae593058276dda2404812d89f3df637ceac24d96de1a774da03cf58ea9ce44819e18549040b6f6d811f2c8203462e13788df7158d45a0fe9dfb72d0fd9 WHIRLPOOL de990c029949c8ef372d3440c4cbb870739bf5b83c438ba2b012004cabcb077bab1258b2115ceb239eafefe73f282ea729384085e3f682240cb40ed662f350e5
+DIST postgresql-9.1.21.tar.bz2 15850128 SHA256 d66ee9076f3149a4cab4be3c6f47e13bc047138d17dfcb531ad01f78cfdeb393 SHA512 75a96ce2c080b2e657b6f591e18c4778635a9f8c74870bbe7c99cb82bf1dfaad124942214ab6e3079b565c41b7fc77af1a4a49672e7ddba075374402c8832a5b WHIRLPOOL 4de012763b985d1fa675e151d68988f4dd4de4ae8860d67fab3818666b3e135849465a0a41bc1f073eb4d679415fb18871f8156c99376c7860c51258e607771e
 DIST postgresql-9.2.14.tar.bz2 16451398 SHA256 54c20b3f320a48c38487f2711e98b2fa3f9ce4305905a294ad0449e8b4fb292e SHA512 268015d9e397ee62eebbbc9abf1ee25d0d4aa6bf5943b404009b3aab31f485b8523353c679beed34cc00304b9d4c7aca9de0ba841d9841dbf885d05d1a5692a1 WHIRLPOOL 4f6d5d6989a67d14082ddb215411b55d0dc0be29772e6a593b4df133489ff4a7e6c265d0830adba64d4c6be47e17a949cbc21d6570dceb9362399649af2be88e
 DIST postgresql-9.2.15.tar.bz2 16480973 SHA256 7ced4807589899e83c64dd0803cf1f9782b6a20077ab545c66e868ef26543e60 SHA512 4a0e52beaffc9f0b004c761a5ca107a019d6265877d36cd7be46912807da6fa6824ce469c8d59fb24092440646d3f0872b8aa62941b4b3ba657edc2f5678b2b1 WHIRLPOOL 58607fcd1adc474f6a78741527b4192e30ac8e87d83a80fa71b6660ac1665a9ab5ee062ae19c919b288df607854ab55866e00e0228ffc6bd1b71dd59c18d83bd
+DIST postgresql-9.2.16.tar.bz2 16490199 SHA256 d2164cb8706bf828161871c195299841c5be1fbd9bc85d7866704e54f0741b11 SHA512 0f0b317473b4b42ae4261993c704a7c6cd28c7e6bd83e77a81850695655baa473d7d52e97441ee5500d646d405c84145a54f42b9bae89a0ddfebb0418d608820 WHIRLPOOL 8dfdca52555889d20e857ecc01ee75a14fd18bb7fa1ac50f5d54415a423d62223d0d389d43b143ae927446946aaff06b68cbf8214e26e2f432c39a50c0296b08
 DIST postgresql-9.3.10.tar.bz2 16995860 SHA256 e5444f0f76aff98a251400b7c28bc361d65e3d72d8d6cb9bb5d8361a69541531 SHA512 6b048fd1d0b38f72bab6ea70e40f10e7b805b94fc4c6fd865e0ec5e86da3c54043f20059dbf716d29eb4ca787dc50da561b1c7b48ab9f3096ebc651300855672 WHIRLPOOL b8ea15a04d18535662832d444b556aedffaa8c954b52dcd42d548f53f93b8a9dbfbe9298f63c26d44c8b757e8c10d76711c303cd83c84d9c86bf23c2837e74ce
 DIST postgresql-9.3.11.tar.bz2 17047707 SHA256 3d222a90c941d3a6c02c7c749fc9eb54ff20a1166570459d09c5476743496a21 SHA512 8da91e11e0a6502c185931b6e47ba8e583d3360009f26ad703552be9a216b2c37a688894d4ea867c529c4135b6c36da26e9d7ef52a411b0c68ad50a53ff3cdb3 WHIRLPOOL cc1251553ec902dc1998c2bad11460206064c0d55140601b96293d98774f9622d38fa49f758e2f69ed6cb27ee14dd0a20f6ec41f655a4793b255168dfd430815
+DIST postgresql-9.3.12.tar.bz2 17052755 SHA256 f3339ea23f86d07f3730adc878b2e5d433087ff44aad65a5ec9c22c32b112e67 SHA512 d88cb167ca78bd8588e3ff9b3f13b77f661e3ddec7e5b726cc0a46512db2584b15ce5f691fe7e4ab84855f102cb88014245921a38f5da41ad19e762a88968883 WHIRLPOOL 8738e18f8534f70ddbfa7c0c0ae1ab585330cb9df2d2da3a3e5f5c15a2e5070aebd38124b7295214e0105c482a79011d00c8cbe2a9061edc90bfd5ed07000dcb
 DIST postgresql-9.4.5.tar.bz2 17660960 SHA256 b87c50c66b6ea42a9712b5f6284794fabad0616e6ae420cf0f10523be6d94a39 SHA512 01ad4b5a097efa70f74a9e96b764c32953a9df57d6bf81b893a1e552475f6aba0381580dcd1f27b2c443ce89fecc429eeeb0219af60a0b2f84798f76eb1757f5 WHIRLPOOL 8ea0e9a40cefa53568071f2137bac996898f9bd486cfb5cfcf8bb49590816833f37878f10caabffb9d3127e047f00c916b8830594a485ebe16fb9fe6fc834c95
 DIST postgresql-9.4.6.tar.bz2 17734946 SHA256 cbce1f4d01a6142c5d8bebe125623c5198ec04f363da7dd3d3b3a4100b4140a6 SHA512 03e2c68ec7fb40b4886885136692e96ed5d7e50ead8ebd094ede402eeb8ed94a791357e8eff2776a2e4a537ced3d900e032779a33c1fbd920588d89f8b6705ee WHIRLPOOL d25073985dc9974064175bf8b90f7a18368882c8d62fdb403183121452624bfb50c10c181bdc4b6a076d515dc29e081cf913793653f04ced98a48640dab9b3ff
+DIST postgresql-9.4.7.tar.bz2 17746987 SHA256 cc795e6c35b30e697e5891e3056376af685f848a4e67fab1702e74a2385f81e0 SHA512 e61d74a4a9caeb7d4a3fb9509b37aaeb5bd563d61d20739edd777ec990c92011286a7485f275178f9f8c1ebb8c84a98290e2b5351b11e0f9a1baa781f323e374 WHIRLPOOL 2ae25affc35e12fd250161585bc5cf318930d9864c9fccbf44c9bd697933aa75860467256b811501947c0fad8c6cdc0622889e9991904a4db9fda2d19efa2b37
 DIST postgresql-9.5.1.tar.bz2 18441638 SHA256 6b309d8506a39773a752ff074f47656e5424576ea090b04a24fe1725958c5bd2 SHA512 fcb2b3bde51c4152b3a72764de1f9b4e607cb591571ed5bc1187b2c6938c33e21bdd512694a969a03c046e4889a129bb0e75fa676d55a1a1e77142da1e984192 WHIRLPOOL 2fdbae2c58ce4255b514055ada220b25269a01719c202e1d1ae86d408fd56b523f1a4e16ef5abd675b0fbf0675c1eabca7d0f5f2e8fdb9cdc3a3d98e7b755aeb
+DIST postgresql-9.5.2.tar.bz2 18446616 SHA256 f8d132e464506b551ef498719f18cfe9d777709c7a1589dc360afc0b20e47c41 SHA512 ba31dddee8a960a4b1a97394eae5ea7efaa5e74e21c755882efcef90404676c6052dff55f40b585932e4f752cbcda5ceac0e29d601ea6651cfbab7a49190381a WHIRLPOOL 0b9abe3a5b3933485e5d0b2c08daa20d421e5920ae5b4640b36971463915d7e7b2767575564d80bb5dfa3a353c646c9c4ca8e483dfd64df39370774e76fa1cee
 EBUILD postgresql-9.0.23-r1.ebuild 11214 SHA256 72f6960f6837a0d3a21ad160a97f6e427ffe2059c63aa082bd2e3f3068a0f7f3 SHA512 2dc469b0ca2de30d56afb05432915d3bd6e35a1b004cd1eee26b277bb3e2f7b812cbbed1f4bd94c98ab7c8be5ed486c9ca9ad2994c2c4176c7f2720209e0a171 WHIRLPOOL 7d72c03811942b32d822ec92f93b7f0af1ad83f4a402484c4d0bdc0d29da2aa7d872a623ac076a00ce02e3dfe0a7879233e1622982bd456c271a09b78ab50da5
 EBUILD postgresql-9.1.19-r1.ebuild 11402 SHA256 92ee07679c85046bf1aedbccd9ce5b1c6d4703ab4b38d9ea0609b10234f3c5e9 SHA512 a1155a159cd9e3283b7f9059862bd7600d6cbc6cd777bc6ae5e68d42cc780052c43bbc90c9b7bfb48a427930d4bf539e73ef25ca5f0588592f43d8749ee67cb4 WHIRLPOOL ce1fa0ae086f2a35b403e1bacb20751fa294158fd67e1cda2b3b0680857795430cee53150fa050907ef96054d119caae17c7b562031afb60ae95b8772cfe26c7
 EBUILD postgresql-9.1.20.ebuild 11402 SHA256 92ee07679c85046bf1aedbccd9ce5b1c6d4703ab4b38d9ea0609b10234f3c5e9 SHA512 a1155a159cd9e3283b7f9059862bd7600d6cbc6cd777bc6ae5e68d42cc780052c43bbc90c9b7bfb48a427930d4bf539e73ef25ca5f0588592f43d8749ee67cb4 WHIRLPOOL ce1fa0ae086f2a35b403e1bacb20751fa294158fd67e1cda2b3b0680857795430cee53150fa050907ef96054d119caae17c7b562031afb60ae95b8772cfe26c7
+EBUILD postgresql-9.1.21.ebuild 11409 SHA256 c25edb519dcb627e4e0b7c7b14bbe4db26436236dc190a2b33335ebe6ba220da SHA512 901b36d83abd127b40a75d99718d89c18eeff363d413df0a3fe4d97dc2544b8a360232233b5450033e1fcb684ea78f329693d5cda99f3587df3a09ef6692d86f WHIRLPOOL 1cf24d1648bab7d6701261db0f39b3c18a12059318baad04e1def95a63732aa09e27e6f6983cc4a58a158531700a643afa141274c41769ca8e3c4117e5c1f3db
 EBUILD postgresql-9.2.14-r1.ebuild 11742 SHA256 1c300308abd01b31c0ef1832f985d47630ad5831f7657bab3389792f9ae84a29 SHA512 af9ec932db8fc91483df0423157e2a5e685def3b2b138ec15da43c6c728827fcefb99c91fe81b1f7e951da1eb5ac851127d6d0d05a42931a487df23a8cf95b39 WHIRLPOOL 22b9ad25229c077f1be8dd9bdc339f673e8d66fbf96c15318b6bb468bb581471984d1ccb7674372a4da948364459ab325dd6c8a121dfba2194e5f6ef82a19b3f
 EBUILD postgresql-9.2.15.ebuild 11742 SHA256 1c300308abd01b31c0ef1832f985d47630ad5831f7657bab3389792f9ae84a29 SHA512 af9ec932db8fc91483df0423157e2a5e685def3b2b138ec15da43c6c728827fcefb99c91fe81b1f7e951da1eb5ac851127d6d0d05a42931a487df23a8cf95b39 WHIRLPOOL 22b9ad25229c077f1be8dd9bdc339f673e8d66fbf96c15318b6bb468bb581471984d1ccb7674372a4da948364459ab325dd6c8a121dfba2194e5f6ef82a19b3f
+EBUILD postgresql-9.2.16.ebuild 11749 SHA256 1210cf6da0bbff15b07da6ae76191b83f9a204c55ad059f1ce81bcfbbd7bec9b SHA512 c818fa61d546ab9ac2558dd9d8cf6322228b55c896625c7e2f55db79f613b5188027dc4212279cd59835df09a3f0290028bb6846d5ab449739d26b7a495c708e WHIRLPOOL 3543f9c3c9a04ee6580ac2bfe071fc300f91cbe47a44309ff5c0a7f7e687589b2cfe72f88c5004fd686954e88f19ca17726b6faaca0675e99048dc81a15d0c39
 EBUILD postgresql-9.3.10-r1.ebuild 11746 SHA256 27fdf90544b996073bb14a0066c326e9023cfca6bfe822f9c4c580e18907eea5 SHA512 67c53ae83455c1b6a0d7afc0a76b868eab8356163649cbbbeb1652f3f4f5925c7a49e11a7cbca9e64fce1ae8ec6dd2686f8deab749aba3fca68dd7583f5e99a0 WHIRLPOOL b47a66c6bde3f1452134ea51e125eeb517007aa3b34617b476891cd040bce1bbba865e926e47c6009b3cceea70f4c34aa6715365e2cd4bf43b91811e1d7f1403
 EBUILD postgresql-9.3.10-r2.ebuild 12002 SHA256 f376b07d4bb0c2487556dd99e2d31746fc9c49ef94cd64066e252b6c9f6b7191 SHA512 9b1e541436a05926bdaf4dadd76b40c21ecfaf893ab5e16bdace582f67ef5d7d9a7ed4094f500613b269ff95473b3dd09255b5aebafc0a9b7b6a1c5eafe9097a WHIRLPOOL a9d0ec360c7fa9bec859e3f998f33cb1d5472210f3d7f7774cf9bd4456c1b8b2a33c91f8490bc2f366f52171cac18853989fac53c6c03be9baf61b61bc469e21
 EBUILD postgresql-9.3.11.ebuild 11997 SHA256 afe118d2bd662d0c50a6f1d240d09cdbd04e2d9f301ba71072cd6512a42748b5 SHA512 2c6fbf76c73e277ca3c7318344b71d013b23781b17f9a256991afc63e522d93889ff685206671d825e513979b316863226454245567501af3ee9eda9a427729d WHIRLPOOL b93970ce29f6c0e99abf67d1a32547e1428c237de1f933fd80504304085f9dfe4d990d7112eb2c6a46674779160fcff277a158e3b4e81747ec6e586906579555
+EBUILD postgresql-9.3.12.ebuild 12004 SHA256 cdd7a86c12a013e1625f234092431ba812c11c1dcdbdccc38f3df4ff0b73316a SHA512 f6891fa8d5cf7679fe5e298c20f6e8fd82439367eec25c9de491a88124fcf04c5efd36f611c7af1e6306d599b27989aa4fceefc53e7f6501cb1dd0378e23c0d1 WHIRLPOOL c3eb8cb775dbcbe29ced515182a06ac006edb448d564c5e688a7ac015c08c544c94d6c58ad8abc6fc3166984f086efd626e1913d3c301f20f7204a3b7415de84
 EBUILD postgresql-9.4.5-r1.ebuild 12557 SHA256 f503fab2615fc3fcc48c67d7a0ee47d1f571fa6471f318dfa25966e4103793d4 SHA512 ee070aa1c4492735a61b3cef9eb7986da7cfc16c5a76474afba733d0bdd0740d4ffdd9976cb258ccea33b68f27a15ed009cb4e9994d2ccbad95fa41c14d5ec7a WHIRLPOOL 63de869d1c4a08151bb430970f2f396a999e9e76936076eb497703baaeb6702516d34e070888d2b5aeb1cf8588b3664bede1e4f8f9cd48e3124404fcb4eb1909
 EBUILD postgresql-9.4.5-r2.ebuild 12813 SHA256 aad9955a9acc194013c602411c4f41e6ae49e0413acaad622696c1bc244491d7 SHA512 86fe4e97c60a2bbbb9b541f0a1fde1071037035bb29ebb9e4144b3951673518ee02a802a2e7577f5a2de8ea68fb9be17d415858b00d13468f97f5af463405997 WHIRLPOOL ebce64af30cd542b6adb94cbabbc6e2a614e95f8517a9e70c893f4bbd55d9a8dfb1b2df38f00c3f94bb844bdf39943deb52b595b363a8eb2ad493fe2352bfa1d
 EBUILD postgresql-9.4.6.ebuild 12808 SHA256 8d7b22ff1ddf34e6d6ec97c59284b2b492b843d39df1fbbff2f2a3d1c628f1ab SHA512 18eae4cd1e6e594b8e4fce656d4a79d62658a17b837f22109c48b0e04e0d15bc8205820b935c1e64eb70f15ce6e2226214ea9d62f0bbadbb87ad3305bef0db56 WHIRLPOOL 8e52aa14a10f0cbfcf67b77a2ed6bbff899fa23ccc4cee0a65464a7195e9186ecd3e0936c848bf5a1bb65bd236a5c4e39f35b2e351d0f1f221facb33f827e410
+EBUILD postgresql-9.4.7.ebuild 12815 SHA256 d028280d290e6c0c864e776e6d1aa0185d1f0b5e8e8fe36a24fc1e6c559f47f4 SHA512 94d9880b4fb9ddd2c0eed9692f76de0f63435232da669236f4d379888ad2d46032327713b806ad37678d7a96fa72a42d594686629282615c74116f4825e0c66e WHIRLPOOL 8df83f335fa1f9d25b22a2d95ba5d427850519419ae39d0cbc9caeb329ea3f27b074f739d604af47065a891180ecf2e428c590f2773bc547a18f1c2a4d777c0e
 EBUILD postgresql-9.5.1.ebuild 12816 SHA256 1ef97a520bd7c83e13f141a0de18e5baf510731aa1c3af280eeedbf14faadd87 SHA512 92991b7aa73752696c7c745acb8e3150b8da3ba2d0017a2c99ff3ef941fd43d514d15d771e6e3cb2272288d4b97aa74576790e1ba3b7dec4417ba520b69372fd WHIRLPOOL b9fa1c41959181f9afd3c319a2aeb8631d20677df12fd48fd2aba1ea04c965d6e74d86872eaa937abd3af27adb4bfc9f4acb633ac737420d97da5652011010a7
-EBUILD postgresql-9999.ebuild 11247 SHA256 9053b0ba73ad8d1ddaaab84cb07e383d7597a26131aab4d10524d3742562c8e8 SHA512 88d2b5db41ffff09d4ea5757640578bac6e1c36dbca09c021a495d1f124b3c40a91d8dfef5c30c8acf129fa2884ca9bf6fa3c2c00c12d0f8328cf20f1d610262 WHIRLPOOL 2caea3d44142a06c532f8c82b6b43069c10d6d9223f8373d574b9364f06cbc1759fe7fabf3e8231d1bb931137991dd8bd6aad51a0593e4913b5719a8954f2b2a
-MISC ChangeLog 19856 SHA256 a3e14f7d5cb70bdd2803e075fec4385c4fb71197a312ef4cfaccd85ba4f7fea3 SHA512 dc0ec8be0956599ba9aecbb5ae2f23ccaa6f621161aac03b1bfb6b75816eaf3ce4b6b9842ac7550f389c751c8c229a80280b95b75c4fdf2f9fed5a062c3d5a07 WHIRLPOOL f9b9c135544c1fe5185595cf5f84f974296fb4a93018671ee7bf6be30e7a4c1958317fd5fab5a541009bf6317a50feb225fccaa03c97d892c19721fe03756c1a
+EBUILD postgresql-9.5.2.ebuild 12826 SHA256 6a78cbbbe707dee15edf7326adc69db825d1ac9ef333c1ed3715bd8bf434c3ea SHA512 6bb31b6911c23afde9e8709e658d4a6d41bf05cb9b770d73ecf10ca8d7262e920af245dc05afefe1e66de35c769357f6a75a533b6c6e130ca022cbe31682a184 WHIRLPOOL 55acb7b34d2a07f1928a3237e2b0a84b54ebbcd6513cb18e85134afa79c85c1024f17a41add7ed3b48584ddaf952b1f78769291a7659feb16203fa2bcb983e7e
+EBUILD postgresql-9999.ebuild 11251 SHA256 fa3f6f8eb2492051cc802418e577858651146671dc28db120222d7092cb3d3c3 SHA512 5e4cc74723fdaeb33a43dfd33dea2228cf6d8ce11a5c752c2047085f7ac3771a53873decd524f21032748afd324b027b69333fac6f6f41c07bc61a22886c665c WHIRLPOOL c2e2b2abbcca8a6ad84ce0a254c8e6e1608d380f79fb5d890f72a098b173334a66e5d6aa4798b19ef4e160edce4d37afcc60f30c676e09647c0f8e713e2b8fa5
+MISC ChangeLog 21405 SHA256 4036f56bf2fb6c6a194f29e5b67802518c817117c45f121f625e45beba16aa9c SHA512 f95b73a0772afa987aaa175a6290ca57084c754d97a9e975e585c7e9ae5fe26663c7360625f15b8c7771a99509c1f53ab718796a364a6a0526affdc6fa5fa71e WHIRLPOOL 27700c30be758b83d525b35aff409857f42cef145ab5e094c76be2524ee9096e386b4af3b55df50490519a29183032cc82876dc9a25bcc2b069052340a6eb88f
 MISC ChangeLog-2015 18629 SHA256 4f6c87a86705d9d4597dcbd319d207c8b45f4dba38455f1466bdcdaffb65ba1d SHA512 2604c3af8d03fff5f293c30b5c6bbfc801c0b99fa5d20021b365795e2af50cc65c73972fb643e594720e28ccf5e873503550eeedef262375da63b29442e80c96 WHIRLPOOL 760146d15f3f656816be71d4d4b27823975ecc37c13f03766c38a0b8a3c2cabf15bec3da2c01d843859e277937815e85532a17327650dc221c4d22d01fece293
 MISC metadata.xml 751 SHA256 97274deca46bb3ef708b8fe348946d9119220d8ba34bf90c0044675a00eeb5f2 SHA512 726f30ec991194427b2dbcdf650778dbe0f169cb305d569918404d403deef397aef7ec3f1a5269c15f7ec7fc5506dc534203323379f1d0acc475eeb8d75d0cf1 WHIRLPOOL 8372aaaaa2044be729eaa5d2e620dff368f16bacd450a48b048338a51f1500fc85fe5865d68f3e06b783732e823566b6dc7b7bc4f6149893cda8e452daefc331
--- a/dev-db/postgresql/postgresql-9.1.21.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.21.ebuild
@ -0,0 +1,384 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Testing within Portage's environment is broken, and the patch no
+# longer applies cleanly.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+		 zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	epatch "${FILESDIR}/pg_ctl-exit-status.patch"
+
+	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	# Fix bug 486556 where the server would crash at start up because of
+	# an infinite loop caused by a self-referencing symlink.
+	epatch "${FILESDIR}/postgresql-9.1-tz-dir-overflow.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		$(use_with uuid ossp-uuid) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.service" | \
+			systemd_newunit - ${PN}-${SLOT}.service
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 0775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "It looks like this is your first time installing PostgreSQL. Run the"
+		elog "following command in all active shells to pick up changes to the default"
+		elog "environment:"
+		elog "    source /etc/profile"
+	fi
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
--- a/dev-db/postgresql/postgresql-9.2.16.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.16.ebuild
@ -0,0 +1,396 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+		 zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	# Fix bug 486556 where the server would crash at start up because of
+	# an infinite loop caused by a self-referencing symlink.
+	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		$(use_with uuid ossp-uuid) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init" | newinitd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.service" | \
+			systemd_newunit - ${PN}-${SLOT}.service
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 0775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "It looks like this is your first time installing PostgreSQL. Run the"
+		elog "following command in all active shells to pick up changes to the default"
+		elog "environment:"
+		elog "    source /etc/profile"
+	fi
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
--- a/dev-db/postgresql/postgresql-9.3.12.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.12.ebuild
@ -0,0 +1,401 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+		 zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	# Fix bug 486556 where the server would crash at start up because of
+	# an infinite loop caused by a self-referencing symlink.
+	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		$(use_with uuid ossp-uuid) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.service" | \
+			systemd_newunit - ${PN}-${SLOT}.service
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 0775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "It looks like this is your first time installing PostgreSQL. Run the"
+		elog "following command in all active shells to pick up changes to the default"
+		elog "environment:"
+		elog "    source /etc/profile"
+	fi
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
--- a/dev-db/postgresql/postgresql-9.4.7.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.7.ebuild
@ -0,0 +1,433 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+		 zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	# Fix bug 486556 where the server would crash at start up because of
+	# an infinite loop caused by a self-referencing symlink.
+	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.service" | \
+			systemd_newunit - ${PN}-${SLOT}.service
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 0775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "It looks like this is your first time installing PostgreSQL. Run the"
+		elog "following command in all active shells to pick up changes to the default"
+		elog "environment:"
+		elog "    source /etc/profile"
+	fi
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
--- a/dev-db/postgresql/postgresql-9.5.2.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.2.ebuild
@ -0,0 +1,433 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+		 zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	# Fix bug 486556 where the server would crash at start up because of
+	# an infinite loop caused by a self-referencing symlink.
+	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.service" | \
+			systemd_newunit - ${PN}-${SLOT}.service
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 0775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "It looks like this is your first time installing PostgreSQL. Run the"
+		elog "following command in all active shells to pick up changes to the default"
+		elog "environment:"
+		elog "    source /etc/profile"
+	fi
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI="5"

-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )

 inherit base eutils flag-o-matic git-2 linux-info multilib pam prefix \
 		python-single-r1 systemd user versionator
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@ -240,3 +240,8 @@
  RepoMan-Options: --include-arches="ia64"
  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>

+  31 Mar 2016; Steev Klimaszewski <steev@gentoo.org> sqlite-3.11.1.ebuild:
+  Stabilize arm64 wrt bug #574420
+
+  Package-Manager: portage-2.2.28
+
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@ -36,12 +36,12 @@ DIST sqlite-src-3110100.zip 9294249 SHA256 ade6aa93fd1d52dec0d8712f9ba4df59ecc6e
 EBUILD sqlite-3.10.0.ebuild 7693 SHA256 39469d5a380b0254c4418195d00df751d60d1da71bc86c8bf6fc49a13f5fd8c5 SHA512 90016ba8a1a7daa09a2d502d9a85916c7fac15d4cc65ad206037ac95bd39c0b78020ed55928b4592a749fe084a22120d52f62fc27809ca50fdb2d1ca21c46d05 WHIRLPOOL 6252d4e43d88dbfb879925e70e3db4e7c34377a0e709276e22b468013051d1582698fecd863b1e740f29cdcca43f1cf8fb2c7c81db8ab41687c1a8484cff2384
 EBUILD sqlite-3.10.2.ebuild 7693 SHA256 39469d5a380b0254c4418195d00df751d60d1da71bc86c8bf6fc49a13f5fd8c5 SHA512 90016ba8a1a7daa09a2d502d9a85916c7fac15d4cc65ad206037ac95bd39c0b78020ed55928b4592a749fe084a22120d52f62fc27809ca50fdb2d1ca21c46d05 WHIRLPOOL 6252d4e43d88dbfb879925e70e3db4e7c34377a0e709276e22b468013051d1582698fecd863b1e740f29cdcca43f1cf8fb2c7c81db8ab41687c1a8484cff2384
 EBUILD sqlite-3.11.0.ebuild 7638 SHA256 395919f7cf0a246cc42bf35554ad669817a45fed770ef3052a8fbb9bcf27bc02 SHA512 69d1fe4044a9d44569bef3cf834d97cfab4960d27ab6a2826cc66cc421912d2e0a48c5f09217302fb8ae06795659696b475c00a972b86eeee4549d4b8667a2e1 WHIRLPOOL 6232f90d98fd68254c2439a55609b9d7b57c535740ac50b15b2c1c444f8d5c4b25921b6a8a2aa5c128a510a59148a54ec8310d1a109d18cf063574338d5843b9
-EBUILD sqlite-3.11.1.ebuild 7519 SHA256 7aac47598a9dae62eed4cca2769e11017bd1086000a8bcc02e81258c80af5067 SHA512 6b87ebeea7d921a686d7210efcf87e1de78bfdaf76151dafeedbd66c47ce7e2d433bbbb04ed30b16ca4a60ade6a25df8fea42332aed2ec8e3962b43b5ad85299 WHIRLPOOL 318229cccab690ea9fa08860950680cf1595105f198f60a207a9092b791da4e337760039ab83ac8bc9137b8217aeba8d4a80d6a7f6e37ce93d54708093bdb4ef
+EBUILD sqlite-3.11.1.ebuild 7518 SHA256 de50b5c26c744cfc34ea505f429a340f365efa800370497567c73d94e1c86ff7 SHA512 f95373f37c6b85781f86480fc5214b05e309b37864a6bf1366c021b7d17b6239d3bb17ecd1b2843099646bf0f266c2bbc8c917ab7f4eb1ffd541b39a6306112b WHIRLPOOL 52336e092edb6070ed61f662ca16fdb4557a32888bd6656a68072b985e18459573f506a318afd5f329aba6320fc57436cf1476b3a7dc56a7689d4c105f2b30dc
 EBUILD sqlite-3.8.10.1.ebuild 7139 SHA256 458a229d72d32bbb4c9be6ea255f859c3d2fcbc81e6b0b60b4cd7089fc6125e3 SHA512 11b21aef09c72c2a59478a347740dbc668419a98a7de547766de4eaccbeeed00e8dc7ecaeac58dbf4069bc8f50d353d921c86e03f8d5365a91cc009273b3a038 WHIRLPOOL ac9522f482b3fe9d7a9d7d8dc910400b658ab8aeaff70c3a4b31d3c16d5332b3499fb8fd7e73280f53e2e5bc33dcf278a6f05ca5c77469c769053d684358c5be
 EBUILD sqlite-3.8.10.2.ebuild 7135 SHA256 efae2acf47b0f0df2ae8025f10f965ff79abf1245a5fe4e464fe189132d62e59 SHA512 c1833cb655a7275a1a9513b35cdbd2339ebbfbb27f7c63dcaf99abcfa4eee447fad2dea9fa262cdbdbb8e8bd8a8f107cbb0926683c2da42c25460d60f96d48f5 WHIRLPOOL d30b5c1dd26efd1c9e7d833c0eafe54b3e8c8a038dcdbc11101aac72ef11cf60e935dd293bd1f51040ac16cef77d30115ef9039adb4855f6b4b1638865201dd2
 EBUILD sqlite-3.8.11.1.ebuild 7222 SHA256 d90562112e2e3dc8028b49af22993b44d0542cc4034850f17d6ccf6b5ce99461 SHA512 67ae6a238f3f1f0e4f1cae215702a54f7d8335129ee410d344b3066a8c08d5e699ab82bd227903d9f6a3648b5077d580c42f141f41c64566468e355ef5952fa2 WHIRLPOOL ada9ca92b54f1971fbf6b0f1935a13c38918b4779df6eedfafbdfc2bb14a5bdebfdf8b4fba35908d9892bcfe98172f5e586e8ee32a14dd9451442ac2068a2eb1
 EBUILD sqlite-3.9.1.ebuild 7250 SHA256 f594c3c410e80453fd208534a4d0879f80197b2f244d74f4ec067d4041c9e601 SHA512 2875656b1b2e8550638d109ad7feddd336cb32f688de0b9e618d16706b8952c5477aadfbba3c848226e8db60ce0c0bfd28d50a92055277018f8a9ea9b46f32ff WHIRLPOOL 6f726dc945d48e1911b83379ac2f2e94cafea7132f26bff0ca1327dba57fd385349f8540494aaa84a711d8bde2d827586706d68009595213076e56dd81e1ce2d
 EBUILD sqlite-3.9.2.ebuild 7245 SHA256 56ed80adb419aa1aa4cadfac65b29b4d934736d06a4fe0b8014b9168b0a32aea SHA512 a1e316d5dc8020532630bf3dd33f9765e12233c78a1ab99bff1686427287a7615a99dca1c7bfd151704afc22134fb3592e52119acfd9ac4aaf0395dda57a5c83 WHIRLPOOL 769013dde137e876619c57d9904141ea73aa4de1b1eb05da4f06e3464dd30cb1a6a9e8eb0e197ff54d9866d6595bf5f8f0f85ae4232dce594da86e53e9abbf64
-MISC ChangeLog 8113 SHA256 2702c65d8fbd64b3ddeda1dfa3fcf05a2bb8242326b6516b2d8ec8ef8a0b760d SHA512 52882f2d9b6b1f1cabde2d8c6d4ea9acaa3d5b07ca6cd4c2e18492b87c344823afd9408093269b3510091fa55bf2b5a97186dccfc959a5a9633681a3211a3e39 WHIRLPOOL 4c2049edb200078dce7b71d7827c16fc54c957e0f7272478b474f1791987fbe89b2ad0fd26f36a361daa0a6465b3565b6c2b312f705d91a4bcc83057e70bb2ba
+MISC ChangeLog 8258 SHA256 a40921515a77e5ec584255ad370ff720ecb1caa08f35a17ae3a50309cc759982 SHA512 0631e3dd5ec77ea0ae84d7d41c47cf5e0edffe2cb118cdd0d071a53300b0c1ba89f1d6bab211bcb3a534c895e1e1e03ca58893f9bb049aef3cded0086ae3f22f WHIRLPOOL 69b3b23677b55e70c13ca636b1dabfe418b58e200a9d80846d4f1385c16c28f9debd264c792b203acc0d00e34f85cf1236ef064ceb99137c6f92649a68243958
 MISC ChangeLog-2015 77763 SHA256 c33481b0e8ff18658a72ce845ef033f46d7e2e47fd368f276485936b8249e366 SHA512 ae9ede8a42eb81bdbfd39c201aaed8a295c2eb61999d7961aed59f1d439241b57ffff0548b11317abdf2342a2e35daeb8ba98dea3fbd1904653192c3e2b3c86c WHIRLPOOL 892423e0771ee903650e396b9eb63ca76abe782ce5d3f2e1f993d0c65f3ee1b23e38a743557e09f7d11c6466ffe7c8bf7fb4a372ed58e33c1397d9c9b24f1783
 MISC metadata.xml 745 SHA256 0430582d0c0d1d5687f3e488e11f0b0c60f91fa51196df62c5ccd4a57b79912b SHA512 06ed7007e3ded9f29fadc70c583e9795a8ab5c27578159bb060b39c0cf7de6b4bca06ff0ceeab6710c50db96a44c976c52af2352ee7928211a46d5eca071b849 WHIRLPOOL 7c9f0a1ab683d8c10a5eccebdd88f1f470c72ae4b547fc0a465da4cd6c640d0b8658d9767dfd6e16bdfbb54219edc584b0c7e80ed6b4e963032b7aaeeab672d5
--- a/dev-db/sqlite/sqlite-3.11.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.11.1.ebuild
@ -20,7 +20,7 @@ SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip )

 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"

 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
--- a/dev-games/tiled/ChangeLog
+++ b/dev-games/tiled/ChangeLog
@ -104,3 +104,10 @@

  Package-Manager: portage-2.2.28

+*tiled-0.16.0 (31 Mar 2016)
+
+  31 Mar 2016; Michael Palimaka <kensington@gentoo.org> +tiled-0.16.0.ebuild:
+  version bump
+
+  Package-Manager: portage-2.2.28
+
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@ -1,5 +1,7 @@
 DIST tiled-0.15.2.tar.gz 3004096 SHA256 af662bba4d7b930717359484da4f3cae0ae004d0a9e51f0eeb04704cefd74ee1 SHA512 0c866ad6733ed37a60967f9826d632e4e72669289329b8db0799dafc99b95a18ec3c9e9b454ea925f4289b6d05e06268533858c8b02f7b43a224a64255a7c214 WHIRLPOOL c920f8cd7130fc055eb08bb550439e473a638a6a305eee1b70af59f1294ff25b0511c40707538200438e857f45f9909059792bf8b9bfe39849262c5eb6767187
+DIST tiled-0.16.0.tar.gz 4485752 SHA256 c02df78021c07c5574a8b52fcb61a02649db039724f13ecacdd18840df7490ee SHA512 4850127fd05f477b47df3d44a25e457eade4719b2d6e295eb5e220574e8b0009c7b9b9972679b5ef539ec63c8ecc56c12be6f24e1cc611714ca8d4d9769150f3 WHIRLPOOL f42aa6dd38a223ba385a69a6f7f2e2fe2e99c4a65da2c59b915b2fe2ba9a597670f7737f57c23e2a1cb9c4b058143779c110c9c9dfdf1f833e84c5491a78c253
 EBUILD tiled-0.15.2.ebuild 1296 SHA256 98d3e55a02a977a906eb92f451c23840510821ef0d450617672bcaf4b2f5f2b4 SHA512 397f69dd1ef1bded0e17c86b70842e246b4801bc08fbd839530eb1202a717bd2a8063d7c8f063526202b7abee46606d16528c8f8f3097c1b9d358b926df9dbe4 WHIRLPOOL 269efcfa00fee128dedac44d85f41cac8a8f425f373885a6ab078ba46b5167978df20fe8fafb3ea9f7b334ac8c5d68a9ca87526fd279e60ec4c9dc8a62100753
-MISC ChangeLog 3343 SHA256 96e4b688ce2aeb694341c3ebc0b2de9c9b14490b1a4943281bb3a65c0b54c6eb SHA512 750f7d8a3f07be990de4f7111a5b1d3e7e2e9bfd3194ed250d52fa07482c0539cbce169bac06984db3bf1729255476a8bafabe2811e538299f6b0815aae8c27d WHIRLPOOL 3aba56049e85ea79ddae9626608d15fe904dccac129e3b2b20fbb1034f11f7da199dff4200aed93bdd532f072711c3b64c3f1b53b06a06c31d08781763b51df4
+EBUILD tiled-0.16.0.ebuild 1316 SHA256 e6c1e3aa11c5cd77943a38cf53015cb5d076774e699939ef44e26b8185594a1e SHA512 c454d5926525c9dbff63536fbc2ddc02df1d05bd1936dbc9f3cf7da70202e485cb0613a8983329928a373f2dd157f1e1ddf8b70bd484140b660af021a144f49a WHIRLPOOL e834488826ca90066f618aa3ca5ab35f0b47ca12378bc9d9e7ea1ec5e36dc194b72950794a33eaa8d154620974ab6a65238033ea78c646d1d8e583ec7bb51737
+MISC ChangeLog 3501 SHA256 6acc36a084ada8f56692a71a3669d0370e9f64a0cd3c7473b614000be9e3ea5e SHA512 85468f1668ef2ab26cea98336160628b83f4ffe6328bb7979ed909a80ef247e33b58d05e758011e46897cf02d16f7d4c3920ec9ab856f2771dae1e0f49b7b0e4 WHIRLPOOL c45e821480ed0cd173eac7a9c81876adbd98c2ba5a79dcea0d000f47f2d44b36f409c52c03f299734b52555e3117941d6b63b9bc4af8006e095772a4a68ddc4b
 MISC ChangeLog-2015 1944 SHA256 929acd5cc66b771842c29859d4fe9a41f23b3fd0d4f7401f53ec4190b89c3a2a SHA512 6d227e68ad33b08d51861d90654f26dbc096a7c9df1f928b450d5932c757f473d9e042eb6e7466be5b4bb03d3f5e1adad5a07beb13325b09dc525767a65bb0d3 WHIRLPOOL f47e1b3b6be3478176bc92bbf5f8d262d570d47318b5c558458701c2638966bd35adfad699949f929283250d2f5ef069ca7ce25e3b97d584bb13b077aafad011
 MISC metadata.xml 347 SHA256 c92029ecd58d4e60e3122dc61a597074b6354a13be009730220d867605b62d7f SHA512 a900a4bf6ae9db5e10126de70bf046d779acbf2d2291840eff2685e6f3b1a8d688a48a6fbb527d7ee4b0867278aed6127cecbdbb5a2e45ec13eb94514984fbe8 WHIRLPOOL c9fdebf0282f010a7caf8682668aceba6f7980339a4b1916983685b90dab402e23f855234c02976b33335ad6454bdeadd11f0f44e6252a402acd9273fa0f796e
--- a/dev-games/tiled/tiled-0.16.0.ebuild
+++ b/dev-games/tiled/tiled-0.16.0.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit fdo-mime gnome2-utils multilib python-single-r1 qmake-utils
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="http://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	dodoc AUTHORS COPYING NEWS README.md
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
--- a/dev-go/go-crypto/ChangeLog
+++ b/dev-go/go-crypto/ChangeLog
@ -82,3 +82,19 @@

  Package-Manager: portage-2.2.27

+  31 Mar 2016; Zac Medico <zmedico@gentoo.org> go-crypto-0_pre20160126.ebuild:
+  fix tests for bug 577908
+
+  Package-Manager: portage-2.2.28
+
+  31 Mar 2016; Zac Medico <zmedico@gentoo.org> go-crypto-0_pre20160126.ebuild:
+  src_test: add missing die
+
+  Package-Manager: portage-2.2.28
+
+  31 Mar 2016; Patrick Lauer <patrick@gentoo.org>
+  go-crypto-0_pre20160126.ebuild:
+  Whitespace
+
+  Package-Manager: portage-2.2.28
+
--- a/dev-go/go-crypto/Manifest
+++ b/dev-go/go-crypto/Manifest
@ -1,8 +1,8 @@
 DIST go-crypto-0_pre20150808.tar.gz 876947 SHA256 9ff25a17515c6c7ff0d13fb076ba7a1df868ce30fca105277b3f0356ce801518 SHA512 86826102ff7242259d79a31e543a03192d6b68a06635b46ebac349111bb8451605df1ad9b249c08d75895c38fb4ebbbfc716d40c8c981485395164e87db5a519 WHIRLPOOL 5e1a0372d0a2f493e68c213ce866237cab316c1bf712f2c58a95c16c6864c48ea795e5a6e1346aad7459f666802170aeb0db8f781423fb1d8e252e5bced2e435
 DIST go-crypto-0_pre20160126.tar.gz 902001 SHA256 c1efa4d05d59ef64db60e872fd80afe4e0060cf4cd6924bb51940ef98b45e4ff SHA512 168129ab9581b7348fb3285e045d99a0a837ac7bd65bf9f5e7a220fffbb9e2abf76da5f521c66eea7179eba0ad8da68d6f41cd9624ea40a9da25a18838427846 WHIRLPOOL dbe3067085b5a08c4dd2e13385691aadeda35336c479140684fdb2b08de27ab9447b63cf404c14b9a69520c585a09051f21374c81101599671be091b24fc92d5
 EBUILD go-crypto-0_pre20150808.ebuild 1378 SHA256 d4977e46df7faff31de56ed950726aa1b512b3d83d688ccbdb1c814ea5a284be SHA512 eefc55ed7cb5257ab8eb286886fcdedfa123bc88e1b60169c81e41bdd6da1a6955bb6a6dada6382625bd7ab8c3f793db5eb746741f67f12914d5f10a61abd9ed WHIRLPOOL 227e9808b0d64d2b933f57a4869daaeb1a34a99f6795186e7a82736fb68d6329ff6d16a57c39452daa50a3dc76c15785a79b77783599b3b0d32121224152ef6c
-EBUILD go-crypto-0_pre20160126.ebuild 1378 SHA256 48227de0d91024331ed2a7775369ad139e35a55b557e010c282fca7e554c79e7 SHA512 291e1c306fe34f950e1db91a7aa30b37730e0a41f8e628b415869e1ec4828fb94bee3cf66b5d6a4b0f8dbe03ce1d3a370a5266cf7c64473bfd76c607082c34b6 WHIRLPOOL 01cc0f90ff48c89910d4edddb0d45a928b3b34fcd03beee3ffebd58aaee624cb566842fdf09dfc8681fc0d7db6cd4c776d1853d1bbca8bd2ebe0e5b96389a64d
+EBUILD go-crypto-0_pre20160126.ebuild 1688 SHA256 3ea708c6ea1036e68d4265687376e6ed4ef79006f3c16cbeea736d4db3648265 SHA512 11a198a0410bca601b123150e42ac37fd96aaa8664b35319034e5599fba93398ef91a8870962ac7175c636a72c5fbe5209bbef13dfb283b95561148e98cd92c2 WHIRLPOOL a3941fce2e6a805c02ddfde57381a14bfb5ad37292eb2eeb5f8a563c62d555139cf11c2bdba78fb36c1752f3cba0245917a6aea8f92976ee891f230adfbbab67
 EBUILD go-crypto-9999.ebuild 1070 SHA256 2902f31eb93ee9a5f1e52151c2ed15f6534ee53ecf369352544276529243f537 SHA512 a29bfcd19d6e361416665ddbd9af57b3be89b7ec67c5febcf65e7bebe64f6680df4a043654d5900aa9623611f84969f2897208089b7c21b0aa2e1d3357d0b039 WHIRLPOOL 8b6b794f72ce35f2ca76a57519c63f6e367dac602a3833a835c41153ec516bcaba6aa34fbb1447c4a3b683de45694901e8fba55bb9b909a2e39c41dc81a8a8f3
-MISC ChangeLog 2889 SHA256 d6872f6f08bac61a1ca7fc73e47d35cc8bb4911f24d8271405c411c8d174ddc4 SHA512 446cdd97d8f877fc21046b6ef788cdd9c383735b1cc7c810bd8d834235f02c3e85942937161197ed49edd58fc2987e326650b001c7a82edc442c956a42d0d736 WHIRLPOOL a346b16a5f0513e7043bc49148be3c9215680b82a0bcb87ef24e914d719d634f6e2d87f45a9a9423d428fb025ed1df5fe888a145d79ba2887dbc0ca789b5f906
+MISC ChangeLog 3307 SHA256 97aa71ca91c029fb3eef2dd316a7ebf06f0aaae6da2fec2e57b838ee1ee89fcc SHA512 8ef52f1c2552a5c6ad978f94883ebcbd79bb29df6c1adf5a0ab9ed548c4006479a895fce2841a0f70e5ac453cf08984bffbce4e6f682ab612780c1c29a63f5e9 WHIRLPOOL 20119e20cee1676e53400d6dc58892cf3b51cdce94321f95fe671370d75625394aa41e1a07ff2f70bbb419c34d8f8f543972a289d138b8428bf347d058c7be53
 MISC ChangeLog-2015 1803 SHA256 6f5b35412260ae03aa0cb53972a7e0e09b19b2b37a02077101bdbbe7e8cf71d6 SHA512 ad08a20aa68a014c513bde286a15b3145870e10857974abbf6c7f8959f403117ead2f7adac455cec2c28a9ec3c85c699a8e5e350898495a5a23cf13eda665c46 WHIRLPOOL ec9ce05ab73582a5be34e9fc88fd9a56292a9d90d612bccdb8ab5f723fc4b799bd0217756bcb1de25629f50d7c77e3e193a751dbddfcc4969b01514aaedbe49c
 MISC metadata.xml 304 SHA256 da25dafd864b318140af787016293dc39a9d4be7f31423029282fcfb74608cd1 SHA512 1e30936f145a4bac0db6816b1ab4ee6b5c38864774023e99d9724caf50e9039798d8675d41aa939c339d99ef59ccc2485bf3b5e3077f1e60d8b850bb607807b9 WHIRLPOOL 6090367e448effc2a08c619059bab7425ba7eb4f2cf93b7138a2b26ebec9b0820886f66a3cf0652c29b03144d2ce5f0c829df04f7c261685beef156dabd0f9a6
--- a/dev-go/go-crypto/go-crypto-0_pre20160126.ebuild
+++ b/dev-go/go-crypto/go-crypto-0_pre20160126.ebuild
@ -44,5 +44,13 @@ src_compile() {
 	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
 	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
 	export GOROOT="${T}/goroot"
-	golang-build_src_compile
+	# Exclude $(get_golibdir_gopath) from GOPATH, for bug 577908 which may
+	# or may not manifest, depending on what libraries are installed.
+	export GOPATH="${WORKDIR}/${P}"
+	go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_test() {
+	# Exclude $(get_golibdir_gopath) from GOPATH
+	go test -v -work -x "${EGO_PN}" || die
 }
--- a/dev-go/go-tools/ChangeLog
+++ b/dev-go/go-tools/ChangeLog
@ -160,3 +160,8 @@

  Package-Manager: portage-2.2.27

+  31 Mar 2016; Zac Medico <zmedico@gentoo.org> go-tools-0_pre20160220.ebuild:
+  fix tests for bug 577912
+
+  Package-Manager: portage-2.2.28
+
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@ -6,8 +6,8 @@ DIST go-tools-0_pre20160220.tar.gz 1827046 SHA256 395190b159e918204f67dee0b8f08f
 EBUILD go-tools-0_pre20150823-r1.ebuild 3224 SHA256 25012075e8d8f71af68a0aea7adba947fe6ef89d9878122e969af28bbdc5446c SHA512 8a0e3cb62526cfa63a21a691c120e0f52c6ca56d9ae5f084cb18dc889a132b4a56b043e926e783f8c27b0903b6ed8f35b8e4ecbc749be3324b14e9292d49ee21 WHIRLPOOL 2744d2459c75f4678ba893db91bb53f2c22fad31096d803e89485277b544f0b5d7ecc8a9af7135742c18e5fb6ebd501d25a7479e8e105c253ebd5906e65e7c95
 EBUILD go-tools-0_pre20150902.ebuild 3077 SHA256 51e33d342a37d3bd413838ca5a5a3b332372b11f8a6384cd2f0f4e8459240cd4 SHA512 ea147308fbbb5a56bcb2f43efe59640cf251131596397eba6e19a43c867180cbc84791f967e66d9c5105123ecc0793f26510fcb51f47f67580d540b7a8c95e42 WHIRLPOOL e9bca94bd61015dbf5bcd9f73270a46a6a4d6bf5cd5df5a2ba1093a1bdf16b90ea85ab9f2202b76658189a62af21b673e0b70c4fb82210646a7ca109c5b08b6f
 EBUILD go-tools-0_pre20160121.ebuild 3473 SHA256 b84bb32858a56ca178f11a0a9af2f5cff60174c55e3ea98384eded07eea388a3 SHA512 e73bdd9ef57b8cc748e9675b2a6127864ab06d5e07f773f9ac9efbe47a6f0b76261ce56a975d5e7d5ff1bc66d4d3a0a894127e94f0c75a0e593637d58a310137 WHIRLPOOL 383949af190e52b63db2a5ae4fe4ce4f2269e4916f4eb3046532b8fdd71828bd96418977678823369c9b8a2ddcabfdbbff842b04be5bae9a3eaf969f0370ca8e
-EBUILD go-tools-0_pre20160220.ebuild 3688 SHA256 1abac691c8ba4b9cf34d1f4d0f8f21ff39dc49878b6d1fcf65687165cfd02099 SHA512 173ea3e31be6abf2b54233be0977261a8fc673a8af3277054d07dc56f02dd33132635e9d93806deafeef878601790c4ee0e1f38baf9b9f22057c543976463dbf WHIRLPOOL 522a214b26e23ecda612dce2bffded8ca64710375452a53bcee24eb8d054e7595ca93aeb5116da81e25ba3017e26373d1703b608da23e87fac1ddc276b89b675
+EBUILD go-tools-0_pre20160220.ebuild 3359 SHA256 06dbb10d7c281641f95808df1d16b86f7d5022e5fe05bc2367150a13dda7fb87 SHA512 2fae6f22fd2fa07283d29eabcbefbf1a0758aba4a6948450aec17262aab1087ad3fd0e7b8beb5660d3ad07b4015447c29c8273b6ff1b220efce731cb85c0db9f WHIRLPOOL d844e440a838463b251e70434a7f5abed16da7825777ef07c36b33bf6ad85b1a55fc6441f446a2abda7f0345863d573bfb46fb71198ef4dd77b6203ce49f305e
 EBUILD go-tools-9999.ebuild 3224 SHA256 25012075e8d8f71af68a0aea7adba947fe6ef89d9878122e969af28bbdc5446c SHA512 8a0e3cb62526cfa63a21a691c120e0f52c6ca56d9ae5f084cb18dc889a132b4a56b043e926e783f8c27b0903b6ed8f35b8e4ecbc749be3324b14e9292d49ee21 WHIRLPOOL 2744d2459c75f4678ba893db91bb53f2c22fad31096d803e89485277b544f0b5d7ecc8a9af7135742c18e5fb6ebd501d25a7479e8e105c253ebd5906e65e7c95
-MISC ChangeLog 5258 SHA256 082f2d2f98f4a833a7e172df63eb8d6563cac9b56449c3f1f0342c2f4c1082f7 SHA512 e9eb7bf83047197bfc47fbfb33f09e40f7cdfed321f35e6257d93e5586ad024b7b78293c75fd21267714a56fd5a34631c67332c23a43cfb6496995014c120516 WHIRLPOOL 32acc0271c3a436a56d4808c6484ea7f7d001604c16fb69e03586bfea87434228cb72921f9071fae91c5a9f361b95e4fb215e87f40172d92eb40cef614b829df
+MISC ChangeLog 5399 SHA256 eab1c244c00f8471321b7171ccad8698a2b0b4087033e70c29beeba182c78815 SHA512 ccf9988b8eaefe72a0217112386d986bda5d6b1384cbeff7e8d72a6b769a79b94bf76d6bccb093a413d57eeb4187d706f37a574b3b7718c89424e6a560a11f77 WHIRLPOOL dd7d68c0f0f053ddc8c3de5939ead8fce13381ea72c2487de283466d0ae9ede7b563266912c1c7e7b9ffd1a8bbba555a3bcd4acecdf27365a979def78ee3c04f
 MISC ChangeLog-2015 2369 SHA256 14258ca172d652c0995e17b092a5500488cf92ba8d314a04f5b061f453b89506 SHA512 acd831144e3af1d4f3bb50bdf2b8740dbc3cc42e075d02bfd5e5a0e37e87b1db1bcf3285e11ce75e706e1b50810ae9fd9d871b7cfb7cf76de9948345dbb89c3e WHIRLPOOL f55e1861afe776e4465ad3241a18e80707c9314d8c12d0c7850bd63436d2d96a814be8ce034d1fd7500fa5d1e99c51f02612114b4130e2008bf5e9d8ba3631c8
 MISC metadata.xml 303 SHA256 01ea0278ff904ca5a73070e2c910eb16b11d57af71c06a91a7e196c69d9d8dfc SHA512 cdcd8e3342ce58c499a670fa5ad75301d6f90dc6275b745d796dc8c0470005bfb37ccb6193c935f0d12cc6d4b9b9959b4fee7bdc7e660bef944d925c22393ccf WHIRLPOOL 3da34040d96518e217b429a0ae063724c22fbcbb9b8a166c8268f9aaeb05709c304424b4c42e53ba4fbb75e7951c115a4f7b86da8aa7eea3afe1feb28d5bbafb
--- a/dev-go/go-tools/go-tools-0_pre20160220.ebuild
+++ b/dev-go/go-tools/go-tools-0_pre20160220.ebuild
@ -33,14 +33,10 @@ src_prepare() {
 	sed -e 's:TestWeb(:_\0:' \
 		-e 's:TestWebIndex(:_\0:' \
 		-i src/${go_src}/cmd/godoc/godoc_test.go || die
-	sed -e 's:TestGuru(:_\0:' \
-		-i src/${go_src}/cmd/guru/guru_test.go || die
 	sed -e 's:TestVet(:_\0:' \
 		-e 's:TestDivergentPackagesExamples(:_\0:' \
 		-e 's:TestIncompleteExamples(:_\0:' \
 		-i src/${go_src}/cmd/vet/vet_test.go || die
-	sed -e 's:TestImport(:_\0:' \
-		-i src/${go_src}/go/gcimporter/gcimporter_test.go || die
 	sed -e 's:TestImportStdLib(:_\0:' \
 		-i src/${go_src}/go/gcimporter15/gcimporter_test.go || die
 	sed -e 's:TestImportStdLib(:_\0:' \
@ -50,21 +46,17 @@ src_prepare() {
 	sed -e 's:TestStdlib(:_\0:' \
 		-i src/${go_src}/go/ssa/stdlib_test.go || die
 	sed -e 's:TestGorootTest(:_\0:' \
-		-e 's:TestFoo(:_\0:' \
 		-e 's:TestTestmainPackage(:_\0:' \
 		-i src/${go_src}/go/ssa/interp/interp_test.go || die
 	sed -e 's:TestBar(:_\0:' \
 		-e 's:TestFoo(:_\0:' \
 		-i src/${go_src}/go/ssa/interp/testdata/a_test.go || die
-	sed -e 's:TestCheck(:_\0:' \
-		-i src/${go_src}/go/types/check_test.go || die
 	sed -e 's:TestStdlib(:_\0:' \
 		-e 's:TestStdFixed(:_\0:' \
 		-e 's:TestStdKen(:_\0:' \
 		-i src/${go_src}/go/types/stdlib_test.go || die
-	sed -e 's:TestRepoRootForImportPath(:_\0:' \
-		-i src/${go_src}/go/vcs/vcs_test.go || die
-	sed -e 's:TestFindImportInternal(:_\0:' \
+	sed -e 's:TestFindImportVendor(:_\0:' \
+		-e 's:TestProcessVendor(:_\0:' \
 		-i src/${go_src}/imports/fix_test.go || die

 	# Add favicon to the godoc web interface (bug 551030)
--- a/dev-java/jlex/Manifest
+++ b/dev-java/jlex/Manifest
@ -1,6 +1,5 @@
 DIST jlex-1.2.6.tar.bz2 45868 SHA256 8367edecc3f31f0f55d6b1d92146d6ca9eeaf76de5eb0ff8614a0a2e38e4a2b5 SHA512 ebe16f87fe5b524de5c31651b0d5a0c282fdac99814c8f432a850a394657da4016880fba0f7418c8c42a989e78145d39188c3e68b79ed64fa1911d5680b00b9c WHIRLPOOL 43c51ca8b3ce452329bc7681f34bfb7304a0c9f6f2bf1d83eb8d048bed8863d7f037c38444146234160345692bcd3a3838279ffe7746e3919c37710edf156d9f
-EBUILD jlex-1.2.6-r1.ebuild 764 SHA256 350b7cd6a1550ab27107eacdd2172c76c178559eaf536dad57de410f32ab3ef9 SHA512 fd40eba62ba39b0c5c84e53be1e7be6589748d7c4a3113a6f97fdb06e3ba9a28471d3848c4f4fc94c89b7663087b8e061fd426f3191975987da4e2124695d52e WHIRLPOOL 4649571c109c72578f273dd50447410eca4c5643e64e40edcc1082d5ba1ffc33c395b90fe3dcc26bf9e70cb2ca87c71ac4dcf490658c9a65281662a24222926c
-EBUILD jlex-1.2.6-r2.ebuild 826 SHA256 4b4dc1a4ef5224401c6231c8f1b00926c87b9e993fd7c337d18023ca78fc1e21 SHA512 2157eeaf436ab90c10dc1ddbaf82eb99bf74eda2aaafd6a07687ea53776d024df626cd3cded9e668f39c8a681be0935bd5b175d8c7ad2a37bcf7b4859180dd12 WHIRLPOOL 8533101d4d1f19049bcace57e624cab1197c0e681d07c0de91e755e7fd9226b79ce673fdd46390b2499195131cadb0232c0bbac38f49dc3a7d77db2dc9562f13
+EBUILD jlex-1.2.6-r2.ebuild 877 SHA256 38205a309e9bee1259e7b1a2d840bfa61ac6f2c490da180413bb38ce181c6c78 SHA512 ccc663dbd881519758dda9a7765c851907628aab408ed32ebd1383729cef873f5b12bdaeb65920f2ffb69e524e8b6d2e1e1911bfb8fe4fb011772c34c758977d WHIRLPOOL 9c0d704b0c10d0df39c4bdde5fbaef8bf151dea563066f8f0da4344ec85a6d3147685ffef2e61034644fc6317601253c7f53fa63459fa779f1110da5056af9e5
 MISC ChangeLog 2638 SHA256 4438d724ff2e5d4c0b600f898846f32a814ac757e1725bce1fb0fab3595f9228 SHA512 4898ce3067fb1d38bdb343618a2825e6f4123f138f86b359b9ae632dfa26740721abb6e81ba2e61ed0db4d51f2f79a93eb5e6aa9af69efb33f87b6c1c6b81a99 WHIRLPOOL 5820e5856bb836e34039e390896ede8ef419c65576aae18af2aa6ed7d39f017046b500e1e8a9dc9ad7cb410fe5c169528f87d5f5106ac0a8e62b89bbd420c453
 MISC ChangeLog-2015 1955 SHA256 cfb8711b5f6c95d4f5fac74f77ed06f632091897d5fe013145f840ef0357afd1 SHA512 31f60fd58162fa0cacf68d25632a550322ff5d1681e5f56f4382e817bce12cd2ab96fdccf06e4fcda206ff7cede23bdcde9db6ee2e6b27d122e9f985b38c799c WHIRLPOOL 507cd90cf32f65dedb7fdcc1b1963715308ce7c65aecaeb9be7e45550d9e201311eca5fcfae19cdfdb3b57397a4caff0798bb340bcd5f9a824c1d432444db079
 MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
--- a/dev-java/jlex/jlex-1.2.6-r1.ebuild
+++ b/dev-java/jlex/jlex-1.2.6-r1.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2
-
-DESCRIPTION="JLex: a lexical analyzer generator for Java"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="http://www.cs.princeton.edu/~appel/modern/java/JLex/"
-KEYWORDS="amd64 x86"
-LICENSE="jlex"
-SLOT="0"
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-IUSE=""
-
-src_compile() {
-	ejavac -nowarn Main.java
-}
-
-src_install() {
-	dodoc README Bugs
-
-	if use doc ; then
-		dohtml manual.html
-		dodoc sample.lex
-	fi
-
-	mkdir JLex && mv *.class JLex/
-	jar cf jlex.jar JLex/ || die "failed to jar"
-	java-pkg_dojar jlex.jar
-
-	if use source ; then
-		rm JLex/*
-		cp Main.java JLex
-		java-pkg_dosrc JLex
-	fi
-}
--- a/dev-java/jlex/jlex-1.2.6-r2.ebuild
+++ b/dev-java/jlex/jlex-1.2.6-r2.ebuild
@ -11,13 +11,19 @@ inherit java-pkg-2
 DESCRIPTION="JLex: a lexical analyzer generator for Java"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 HOMEPAGE="http://www.cs.princeton.edu/~appel/modern/java/JLex/"
-KEYWORDS="~amd64 ~x86"
+
+KEYWORDS="amd64 x86"
 LICENSE="jlex"
 SLOT="0"
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
 IUSE=""

+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
 src_compile() {
 	ejavac -nowarn Main.java
 }
@ -25,17 +31,19 @@ src_compile() {
 src_install() {
 	dodoc README Bugs

-	if use doc ; then
+	if use doc; then
 		dohtml manual.html
 		dodoc sample.lex
 	fi

-	mkdir JLex && mv *.class JLex/
+	mkdir JLex || die
+	mv *.class JLex/ || die
 	jar cf jlex.jar JLex/ || die "failed to jar"
-	java-pkg_dojar jlex.jar
-	java-pkg_dolauncher jlex --main JLex.Main jlex.jar

-	if use source ; then
+	java-pkg_dojar "${PN}.jar"
+	java-pkg_dolauncher "${PN}" --main JLex.Main "${PN}.jar"
+
+	if use source; then
 		rm JLex/*
 		cp Main.java JLex
 		java-pkg_dosrc JLex
--- a/dev-java/joda-convert/ChangeLog
+++ b/dev-java/joda-convert/ChangeLog
@ -64,3 +64,16 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  31 Mar 2016; Patrice Clement <monsieurp@gentoo.org>
+  joda-convert-1.3.1.ebuild:
+  Stable for amd64. Retroactively mark stable for the remaining arches using
+  the ALLARCHES policy.
+
+  Package-Manager: portage-2.2.26
+
+  31 Mar 2016; Patrice Clement <monsieurp@gentoo.org>
+  joda-convert-1.3.1.ebuild:
+  Add back ppc64.
+
+  Package-Manager: portage-2.2.26
+
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@ -1,6 +1,6 @@
 AUX joda-convert-1.3.1-build.xml 10459 SHA256 f8d10e8045681e688424de6f2db9d703cba1cca7906cd7d263f3e6ed49e7cf6a SHA512 cfeec9e9ee537814eaa3277037e45878a71b80cd73705bce560cf24d1c0d20033dadd030dcc447b1be5ad742fa97637f57931cab96ca7e21d6b79c7897d7f0ce WHIRLPOOL 69b1790299d38202d3bdb790f40a0eac92453b58b223532c4cbd0e1878a51fa99b27b3e7bbe7734181b6c8e90e2e9f25ecd5ce98f239924215b9665c8858022e
 DIST joda-convert-1.3.1-dist.tar.gz 131288 SHA256 f73decd925a63ff23f010c2e0f894662ccce087eece4027dc0353574a7d2e537 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451 WHIRLPOOL 1ed3df81cd70bfa52bd82b74d5a4e412d46ca54ca250e2d24a0ba6d0711ee29cb82696b9d3e24dc1f43d563506d8334a76646a3902513c2ba221b91f6e79583b
-EBUILD joda-convert-1.3.1.ebuild 932 SHA256 164757614f6206425f3e588eaad3252ec456afca9d16f2804937291a35b9695a SHA512 85bbc0aa05756686c37360e3508448f2a1a302f45ec745902c07a20378d0da90b535332539fd6a11ec3f01517973900b57b6f28ebaf37460b885a985675c6790 WHIRLPOOL 204e8ca5ed47ee7680724fa637afa0059e86ff90739888ee1d101a463044c4db83d37a3a60c15d30763104f79ac18ccee5e682419554daf74bb9e80460bdb1ad
-MISC ChangeLog 2481 SHA256 10ad23ad6e63975668811a3d007dcaecaaea64a47028e543fbfff7c4e9c06759 SHA512 100310d2424e10888b1fcc71b03e8c4a11de60cb5bc9bae229f3d7374778c51f23bccd7039c47a71bda271e6e89e64291a9c99d70acece65bff9c502460e2968 WHIRLPOOL 84dac03371bdf19a98daa22f0deeb38647e0bf3fb4415b2d1d910d59ca5b399509642b8b9a72b4771540502612f95ecf6227832d8bfbfefed71b4105490ac9e6
+EBUILD joda-convert-1.3.1.ebuild 936 SHA256 aef7732a4f625e2fa1ff7e52597b8ecd9ef35f766fc8928b820555d158bba846 SHA512 c6c906e0b241f7aaa20416542730370f8142bbe5a1735388ab8fd31fd5d204395421a010538cd713a151d645a6789d88d6b92125a80c54c596e5a6ef60d77006 WHIRLPOOL cb51099d4f90d610c6dc78f8e0b734d0afbc74cb7aa1581ed6d2a097c7b1551f9bc13fd52c9c2ec3f32a22d6dfc371afc795cb886e50bd499cb629e506aec8de
+MISC ChangeLog 2838 SHA256 c998ccd4a54a004a9973dd5383e9144dbc8f3d53361455b2a5e4bdc54ebf0386 SHA512 5fdc6118c579f96968718e840353424707a746b889a33f22298537e7efddcaf26266ec1386ab5d5a428fac691e3f7390a84428a3e4b5362252d098ffa7b22035 WHIRLPOOL 5bdb3abd211cc5a59188022ba057457bcf8aa9de53bd108096342f0a542403930b577e4b3fb2b239b8dfb5c2c154d4613d18e2c77efd4fcf0a8721139903dbc2
 MISC ChangeLog-2015 1412 SHA256 12db7be006df64189d3c90c4ccd68ac158de902a08a899fc445531afb5f835ca SHA512 169713a636b522e137eb1a575c183a4d8ca8087d721fd5061bad183c89f2f7152867441cf865786b2b89cf831561fa7ffe581d96c1fcfd5a611889f17a43dc61 WHIRLPOOL 4445cd4837a81a98fcfdee3b6b7187fcbe1e8569997451a278f423e7639671f45647b8e56d518d691ef12fee088ac3f2ff84f89695e5ecd0b953c8a0a794669b
 MISC metadata.xml 318 SHA256 9471af4a7a8aefe485c697fd7d62c144a86ad778ec7e6f5141090b9a119f9acc SHA512 13ce055f2cf64b4b5f7f6b780c98cfae6bcae0792d5bee30633cb465ab49045fc77da1337042d672bcb1c74cb3a1dc0e26b1d6c5e38f17d3a79152b423a97030 WHIRLPOOL f9cf362e6c42010bcadc7eee1bebca81c0a492caeb5e34e5a70903d670b8a4ba303ff24ac990169e1452b75ce7f33f55635e25b57356cd2247529f495cd9d972
--- a/dev-java/joda-convert/joda-convert-1.3.1.ebuild
+++ b/dev-java/joda-convert/joda-convert-1.3.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86 ppc64"

 DEPEND=">=virtual/jdk-1.6
 	test? (
--- a/dev-java/joda-time/ChangeLog
+++ b/dev-java/joda-time/ChangeLog
@ -87,3 +87,21 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  31 Mar 2016; Patrice Clement <monsieurp@gentoo.org> joda-time-2.7.ebuild:
+  Stable for amd64. Retroactively mark stable for the remaining arches using
+  the ALLARCHES policy.
+
+  Package-Manager: portage-2.2.26
+
+  31 Mar 2016; Patrice Clement <monsieurp@gentoo.org> -files/1.5.1-ecj.patch,
+  -files/joda-time-2.2-build.xml, -files/joda-time-2.3-build.xml,
+  -joda-time-1.6.ebuild, -joda-time-2.2.ebuild, -joda-time-2.3.ebuild:
+  Clean up old.
+
+  Package-Manager: portage-2.2.26
+
+  31 Mar 2016; Patrice Clement <monsieurp@gentoo.org> joda-time-2.7.ebuild:
+  Add back ppc64.
+
+  Package-Manager: portage-2.2.26
+
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@ -1,15 +1,6 @@
-AUX 1.5.1-ecj.patch 675 SHA256 5e328c247172f6ec88de8350614a62eb501c0bc933499e48367e7d558e10f7fb SHA512 f63400950edf57ea6d060f444e69539882351e726b4296f3aa956b9dd84301799a4a922aa711664a0767f638ead0c994dcd5af8d87df2618442a7f8ee6e75974 WHIRLPOOL 25ce826182b4b91ab09bc87b94bb3fa67ad4a89a589d42316e9102c66cad26ba679368ba85978e453b0d9ead8f0539eb6b0421c7d1f2e2b74daa0cf0cc60b1b8
-AUX joda-time-2.2-build.xml 11600 SHA256 6249953e64e0cbdcf437404592919dfed5280990fa3c9b7bbfb19163a14494d3 SHA512 2244497dcccf8857823039ba942804136745ef2af924f7313a7cb8357a8ac75d837e9945c560e6a5a82ea3bcf62b9691142e1712278a4656a92e6f0557e0c945 WHIRLPOOL 942e14a6f7b24d56f77012a3a011814728999f91690dfad932d4d2244d03b2acbd7655223018d85a2f1defc5929debe626992180f573a49ebddf2213f45696c8
-AUX joda-time-2.3-build.xml 11427 SHA256 05b0b1a47ced5432022da009c8ba3008d7841b5db4fff11f4e4a41d07bb043b8 SHA512 3ad12e2d4f6130343275171cc85cc96c233de98eef500b0915091b7e3562d8acc63316c8489594b57c888a678660e83260bde747c00834d02ffdaf4f2f8894a6 WHIRLPOOL cfeb112f3f1437fa4e65cd631b9664ba36c35bda7ff1d21a7fc61486a5a7d827e27215b829dcec5dd73165039fb23a3536506415a4de3d3a88d0639020c6aa7e
 AUX joda-time-2.7-build.xml 11231 SHA256 0012657b2c03bc953ef442d829014b8e33311b36a8b406d239e032af0e632462 SHA512 c614cc2425b0cefdc5f9def196cd5014d6d65552038dd22f876bbb64ee25131ead57aa94ef967491e292cf1ddefef933d9827dd588056d58c9a311640a5af63f WHIRLPOOL 55fad18901e81b2021e5d5e8dbc6f2d1d8cb7aa59df3a7c125ef9f3427b93a10c46025e3aa9d55bd7951157d4204aa8d6f79b292cc29c9a0433a30a3505e7ae3
-DIST joda-time-1.6-src.tar.gz 1270950 SHA256 4dc645d2ef3c19eebdb388cf22d27fa1c51abcfae87f48f12e2477a91207f92f SHA512 30c1cf558b8dfce67de357dec72c6d64358639f83999eae4f637e436e2e1a4870d09fd4ff86547ece992e49d96fc5113d44cc1dceed910c4de9a65ebc1075c01 WHIRLPOOL fae630d09e01b058e95ebbbceb0f1725580171e0746135dab35f247d1455c712f4f4f6fde7e6edf2cb578cc94fae6b87c202ce581675809b054d05ebcd5c0037
-DIST joda-time-2.2-dist.tar.gz 4397101 SHA256 1cf6176f222f0155b20693dc2a9939e10c766d986d68b144e30f446772596c48 SHA512 8a67b420b4cd179bd80166c930efdf9e32b4813b431329dae7844a078c23688220130c8466993aae4a865bf01e593a8e22b992726d9a1fe64eb0b6f911197f10 WHIRLPOOL 4afb42425e72deaaf25067810538191b6fec1c8e7a214c2230ca98a445d7c5134d881d62bcc9d6b4eedd4776803dcf32a734c8d5c24acd169101a7197d924c57
-DIST joda-time-2.3-dist.tar.gz 3440289 SHA256 f27acf5361e50e0560b349aecf3211e6265b4546d3de0362583390c18cbf4c57 SHA512 b20b0c77878971af99a2e60f01ca73510d4244fc4a069d21a657c79bd3ec482494edd3945c6a98e5313e41e53ede51f1cc98a5396f97e3c3775659a982c0fa0c WHIRLPOOL 6c9c6fe1a4e06e7634a34864f85a70024ddf058c8c3d1a33d83285b1fcee57fc122ce0615e1bca0d15d0387841b91565591a533bcf61a5679a4b69c2efe2c949
 DIST joda-time-2.7-dist.tar.gz 4007765 SHA256 6f29f22ff88d39d988c600f1e274e7a59c451184d7d6d400e2ddb9e4bbb2ceeb SHA512 2a9bf91024bf20c4f1a28c87e5c6e560994ba6f7e131757c83a5ab6984ea79549e1d00452dcf767fc5cab374e531649759703acbaed724a1e49436cae0799209 WHIRLPOOL eb2f91d5bbff641495d3a7763872321718415e49c8adb864805a84a73c583ee562f145821621ffd38ce1b41a813a15f4dcf609c5130b7557ef4d5e9fed86b17f
-EBUILD joda-time-1.6.ebuild 1375 SHA256 3757e0889949af440890a8954337b385382f70f5ff9d1598816510b4c2453b4f SHA512 7f327b72cc5e0e01554405b17c9693412d9efa26a9359beff0fef848f9cf4d58b1fe85afd211b76c6ea75abb78da4a3901d9c04863a3ed7eae69b70efdaf0806 WHIRLPOOL 5d26965c242cab10bc0e3057588f3a06837f30114f45a68211d772105715797c8884bd70b7e25133154d3325d418fb052b9c0402bc11727d4e556bfcdc8b9ce8
-EBUILD joda-time-2.2.ebuild 1578 SHA256 0da64f270ee86626a62cc9fb6688049525bb30743d39a227cc81792f189d038c SHA512 560eb57477620392ab7a4eb62a655969948e6d85dcbe7b9a90ae1868a9f26adecab6636403cd7ea8c849f1b1a5d52bf45892d2c45c620c07d893f4dddfe147c6 WHIRLPOOL b2c4d33c5644c0e56e6e2f6fb53e7c3983297058ef9abf032099c7e5eb22703c7112207dbfcd2575a1aeadc4ab79b454a3c3514205903f64e87d9c2338861d94
-EBUILD joda-time-2.3.ebuild 1612 SHA256 11476ddeb8dd05a6d1fb2a7788a03a2de4d476f6ab2131576a3a5af206a187a9 SHA512 ccddc3561686c24fa24820c4fc1d1b4686d917d682fc8a458510418599357baff5fda17a5af0587a77d87a1dcdc33098a2bc1e91543c1c8f96db451e395a98cd WHIRLPOOL c0cd01af5dd60d92d1205c330a51777cc77a026bcaaafea65cad3389b6474ce6afce723a779cf9ac4ce6c2c97abeeba4e9452c984c20d56eaaa8ebcc31c93561
-EBUILD joda-time-2.7.ebuild 1899 SHA256 90fbd82a11bdab6e1c7127d84d3c95c1814716d7c39ee567d740b4dede407899 SHA512 7d18619712c1302bc6dcf08f0e055c8a5022060e1c3177fc8eb49ab25459f1c6318fd95e308c63259d7bdd1cebddf5b3ed8e24b8884fb2affbe72688d0953fc5 WHIRLPOOL b48e0e945f550f83a944b1b7822830e8205dac6b12805470cd91c8963962d2fed9c4ac0a2d9565b01baeb3259474c46c9f519a5cb37487c002928b4663076f61
-MISC ChangeLog 3395 SHA256 856b0d678d578c699fc35115cf1f1e49d4f96c643df81111d821ce3985eec5b1 SHA512 8d93a4501d31d2d2569ab42dc5640ee0471c56c7ff71afcad9af800cbd6d64afe6a27bedcea483e4e4ec87c402904c3e604691b76cc7842db3d29b1135e69b26 WHIRLPOOL bdfaa5b36881d7961fb510981367c21392d06b6bf1e7bf8fcf1d65e57256a57edf91a9f518771ed2a2606f360d3969f0282029340192c84c1e14f1e2fc1fbaeb
+EBUILD joda-time-2.7.ebuild 1920 SHA256 45d4ad788f47ffb2dc4297d287b3b4b39144562236a566de7e19d2ad4e4a86f6 SHA512 fb3e188269279d590e3250fb0a104889b1954a43fcee03fd708f0783752e41b8933b066d84e2aa0dcb9123db4e6078295e9c4bf2a7fa329635eaba8643c88c59 WHIRLPOOL c032c6a15439a3e9c546d8b95e74b54d4917d420d06f23c98191d68fb19778709f2e88b3daee5450cb55195821fc3fdfa8a23bfc8eb7d3dc8878ef0995b005e9
+MISC ChangeLog 4005 SHA256 7f9de578acc63b2d71f6c971c500ce671d824d811a53bf78613b8f4fcad8e1c1 SHA512 49c50cff797d5cd79965aff3263bb4d5afe227042ae4432affc625da71eaf2b9c4abf173404cd5f8da5760d81ecc95892796f04c6ab301198b3dad37f41560e9 WHIRLPOOL effb974aed8f2e5d5ca3e4d05efb57f32e4f7ac5cf0a47ec3684c41bc01f3aab26d06f0a06297c631b4087d68e2d21a853989790b31f9242a46b7a487d7bbc50
 MISC ChangeLog-2015 6634 SHA256 82a342048c0d11e22bdb616099a1dbde606b3e15678e668bf13a6c76f9b4418e SHA512 11d39759f2a670f099e83638b802ae4a3598eba0a55e2bd9bb0444cbc7f7bd662501f18975f415332dfd8ca9de2ede1d6447572c8d851453869454743a3a7528 WHIRLPOOL c5101bff8b43831151de807e6036f64a2c4b7a299572f10a4e9f5150349aa8b152705a680a0b5381d9c86a424a369274c874135f6c7b6bf84d306039d6968f0d
 MISC metadata.xml 384 SHA256 34408ffc8c822151e55e0b645b9d90c217f5d0cd75e3cfc88341d4876238b41c SHA512 441aa3d5876d8ff91b9f9d368e817bf6869266c27f7f8686e9eb47812f899f37c5fa2e65337e979dd3247932b61d84e4b4f0d7325ea2659d54221ab428c9c089 WHIRLPOOL 586556d3fae636a4904c31ca305c2e4d32bddbc3e85dc94124ec8d2e71e924c3fd59b964379a0dbedb6b7f343b34788f06626500ba57b0a0885bb504d6373f25
--- a/dev-java/joda-time/files/1.5.1-ecj.patch
+++ b/dev-java/joda-time/files/1.5.1-ecj.patch
@ -1,15 +0,0 @@
-diff -ur joda-time-1.5.1-src.old/src/test/org/joda/time/convert/MockUnknownCalendar.java joda-time-1.5.1-src/src/test/org/joda/time/convert/MockUnknownCalendar.java
--- joda-time-1.5.1-src.old/src/test/org/joda/time/convert/MockUnknownCalendar.java	2007-12-21 00:43:52.000000000 +0200
-+++ joda-time-1.5.1-src/src/test/org/joda/time/convert/MockUnknownCalendar.java	2007-12-21 00:46:42.000000000 +0200
-@@ -34,7 +34,10 @@
-     MockUnknownCalendar(TimeZone zone) {
-         this.zone = zone;
-     }
-    
-+
-+    public int compareTo(Object o) {
-+        return super.compareTo((Calendar) o);
-+    }
-     public long getTimeInMillis() {
-         return millis;
-     }
--- a/dev-java/joda-time/files/joda-time-2.2-build.xml
+++ b/dev-java/joda-time/files/joda-time-2.2-build.xml
@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/9/13 4:05 PM                        -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="joda-time-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="joda-time-2.2"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.resourceDir.1" value="."/>
-  <property name="maven.build.resourceDir.2" value="src/main/java"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="true" 
-           deprecation="false" 
-           target="1.5" 
-           verbose="true" 
-           fork="true" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="LICENSE.txt"/>
-        <include name="NOTICE.txt"/>
-      </fileset>
-    </copy>
-    <mkdir dir="${maven.build.outputDir}/."/>
-    <copy todir="${maven.build.outputDir}/.">
-      <fileset dir="${maven.build.resourceDir.2}">
-        <include name="org/joda/time/tz/data/**"/>
-        <include name="**/*.properties"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="true" 
-           deprecation="false" 
-           target="1.5" 
-           verbose="true" 
-           fork="true" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/TestAllPackages.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             encoding="UTF-8" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="true" 
-             breakiterator="false">
-      <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
-      <group title="User packages"/>
-      <group title="Implementation packages"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         manifest="src/conf/MANIFEST.MF" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/org/joda/joda-convert/1.2"/>
-    <get src="http://repo.maven.apache.org/maven2/org/joda/joda-convert/1.2/joda-convert-1.2.jar" 
-         dest="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/3.8.2"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
--- a/dev-java/joda-time/files/joda-time-2.3-build.xml
+++ b/dev-java/joda-time/files/joda-time-2.3-build.xml
@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 1/25/14 5:06 AM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="joda-time-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="joda-time-2.3"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="."/>
-  <property name="maven.build.resourceDir.1" value="src/main/java"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="true" 
-           deprecation="false" 
-           target="1.5" 
-           verbose="true" 
-           fork="true" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.0}">
-        <include name="LICENSE.txt"/>
-        <include name="NOTICE.txt"/>
-      </fileset>
-    </copy>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="**/*.properties"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="true" 
-           deprecation="false" 
-           target="1.5" 
-           verbose="true" 
-           fork="true" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/TestAllPackages.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             encoding="UTF-8" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="true" 
-             breakiterator="false">
-      <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
-      <group title="User packages"/>
-      <group title="Implementation packages"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         manifest="src/conf/MANIFEST.MF" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/org/joda/joda-convert/1.2"/>
-    <get src="http://repo.maven.apache.org/maven2/org/joda/joda-convert/1.2/joda-convert-1.2.jar" 
-         dest="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/3.8.2"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
--- a/dev-java/joda-time/joda-time-1.6.ebuild
+++ b/dev-java/joda-time/joda-time-1.6.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${P}-src"
-
-DESCRIPTION="A quality open-source replacement for the Java Date and Time classes"
-HOMEPAGE="http://joda-time.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	>=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -v *.jar || die
-	# https://sourceforge.net/tracker/index.php?func=detail&aid=1855430&group_id=97367&atid=617889
-	epatch "${FILESDIR}/1.5.1-ecj.patch"
-}
-
-# chokes on static inner class making instance of non-static inner class
-EANT_FILTER_COMPILER="jikes"
-# little trick so it doesn't try to download junit
-EANT_EXTRA_ARGS="-Djunit.ant=1 -Djunit.present=1"
-
-src_test() {
-	ANT_TASKS="ant-junit" eant -Djunit.jar="$(java-pkg_getjars junit)" test
-}
-
-src_install() {
-	java-pkg_newjar build/${P}.jar
-
-	dodoc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt ToDo.txt || die
-	use doc && java-pkg_dojavadoc build/docs
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/java/org
-}
--- a/dev-java/joda-time/joda-time-2.2.ebuild
+++ b/dev-java/joda-time/joda-time-2.2.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A quality open-source replacement for the Java Date and Time classes"
-HOMEPAGE="http://joda-time.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.5
-	dev-java/joda-convert:0
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)"
-RDEPEND=">=virtual/jre-1.5"
-
-java_prepare() {
-	rm -v *.jar || die "Failed to remove bundled jars."
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die "Failed to copy build file."
-
-	mkdir -p "${S}"/target/classes || die "Failed to create target classes directory."
-	cp -Rv "${S}"/src/tz-data/* "${S}"/target/classes/ || die "Failed to copy timezone data."
-}
-
-src_compile() {
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar)"
-
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar):$(java-pkg_getjar --build-only junit junit.jar)"
-
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	dodoc NOTICE.txt RELEASE-NOTES.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/main/java/*
-}
--- a/dev-java/joda-time/joda-time-2.3.ebuild
+++ b/dev-java/joda-time/joda-time-2.3.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-JAVA_PKG_IUSE="doc examples source test"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A quality open-source replacement for the Java Date and Time classes"
-HOMEPAGE="http://www.joda.org/joda-time/ https://github.com/JodaOrg/joda-time/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.5
-	dev-java/joda-convert:0
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)"
-RDEPEND=">=virtual/jre-1.5"
-
-java_prepare() {
-	rm -v *.jar || die "Failed to remove bundled jars."
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die "Failed to copy build file."
-
-	mkdir -p "${S}"/target/classes || die "Failed to create target classes directory."
-	cp -Rv "${S}"/src/tz-data/* "${S}"/target/classes/ || die "Failed to copy timezone data."
-}
-
-src_compile() {
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar)"
-
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar):$(java-pkg_getjar --build-only junit junit.jar)"
-
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	dodoc NOTICE.txt RELEASE-NOTES.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/main/java/*
-}
--- a/dev-java/joda-time/joda-time-2.7.ebuild
+++ b/dev-java/joda-time/joda-time-2.7.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -14,7 +14,9 @@ SRC_URI="https://github.com/JodaOrg/${PN}/releases/download/v${PV}/${P}-dist.tar

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RESTRICT="test"

 DEPEND=">=virtual/jdk-1.5
 	dev-java/joda-convert:0
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@ -181,3 +181,20 @@
  Package-Manager: portage-2.2.27
  Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

+  30 Mar 2016; David Seifert <soap@gentoo.org> boost-1.60.0.ebuild,
+  files/boost-1.48.0-disable_icu_rpath.patch,
+  files/boost-1.48.0-disable_libboost_python3.patch,
+  files/boost-1.48.0-no_strict_aliasing_python2.patch,
+  files/boost-1.48.0-python_linking.patch,
+  files/boost-1.51.0-respect_python-buildid.patch,
+  files/boost-1.51.0-support_dots_in_python-buildid.patch,
+  files/boost-1.56.0-build-auto_index-tool.patch,
+  +files/boost-1.60.0-deprecated-header-ice_not.patch:
+  Add boost::graph patch
+
+  * Modify patches such that all apply with -p1
+  * Move patches into PATCHES variable, avoid epatch
+  * Fix unquoted variable
+
+  Package-Manager: portage-2.2.28
+
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@ -22,6 +22,6 @@ EBUILD boost-1.56.0-r1.ebuild 12355 SHA256 bb59575bb6ef08a7ce38e1c9e26c8fa268e11
 EBUILD boost-1.58.0-r1.ebuild 12264 SHA256 97e28783752d9c1f309cac01b3ffd6edce3eb351cf1e70b889c05b9211adea1f SHA512 309230cc10bf81cf791cb27fa02944a3729dc39f8ad7fe53b2d0abee2c073e349a77a1a02842c4e2ca8da40df9f5cf2e8af2624884e73bc7ba1fafb59f5412a0 WHIRLPOOL fc2c49adf11226ea0b294aa855282037d8ad1c0f2d19459775cee822917dce79244a966d83f1a9ca58e00dd8ec44fd4a4584dd84f453b627c86441b182165207
 EBUILD boost-1.59.0.ebuild 12183 SHA256 5733c158846be244d80af273f8a5bdb576c830e9d00dae444d94c6238bd35c22 SHA512 6c923c82f2801018bd7054e7e1cf909d56ad026791ab92ea0dca58dde42af115903c31ab14aea9b31b07d4626381c41d123c1ae7020fb0e576583e906f67c45b WHIRLPOOL f3d1f509549b4814462737e7c16226ce5cf0ff4f22c821a4750960afc38e1c0358f421c34fb0b99156d44cade31cd884387d13c68b5e56b096dafd1f781d9c9d
 EBUILD boost-1.60.0.ebuild 12223 SHA256 d4504d1085e4c4b6426b6424faa28362917d4df2af4fb8f33fcb44968f24cfce SHA512 9704c958641dabdce2a148c416d6a637c1eac0fe424ed9b90fda80acd159c0d34f43f37707b0c9b63a132093c025d992887f09b22aef32defeb520e157a6dd45 WHIRLPOOL 6c43854da7d1cd27f1eaa40759e4ecf94ea09c26afcc3b25ab2f555b48413ca241b0590252e195975b28759969b4c9e21f7331fcfd5c7a16bfdd0f86415873e3
-MISC ChangeLog 6564 SHA256 6c4c5118f88718ae32838b117939cb6675601738a300ced0a8834969b3c39a57 SHA512 576cbf7eab835024fbdde667837d064cd3a67bb3f197f8801f79c7ec1691bc9126c6b225336d3d7bd60d6bbf7734ea723513c8b3a88719481c8ebcbe3d657f46 WHIRLPOOL eb3832902d58e7d04ccf535256ea82e2664dd77de1e2a56bd052541919fb20e3ca6ee5784f8ad99617cd052e3d706869cc2422487d9e814583ffd7d8a7bb8a4f
+MISC ChangeLog 7233 SHA256 300faa272675c63e3fe15386c3340acdc3c75782ce7b1855fe04b977781861e6 SHA512 d789c7b6bc9b7f445d21270e846769aea7bd8d95ea7029e0254d4a84eb85bb7670bc25225828407d4f207b9f24931368dd49c96e155eabaf4bc977e33ae90149 WHIRLPOOL 16c959b214edbb61601629c5894bb1d335905f0bf6e1474ce4d98911347e89231c503a0b61e68c8575c04c3a7f6fe39becb1e113ead174b6d11d4d9594486160
 MISC ChangeLog-2015 60992 SHA256 f3b1d8b8c4ad6bd080f9b3d18ccb1cc360d47864f4afc95992e171d475d682a1 SHA512 6f29b95e625e1a8a8a7ea2578f07b543329e007443f3b4926e07c913ab21336e1b1332084b090354dcd9899b6f0aa9012b92e0cb5e0457733da4a47da86a818f WHIRLPOOL e11113ea0a8eda558457c7018283f274d10df473c116da67126640d56b49107e05326e0a8a3ef4f9043a22e2fc91f151c1cbed71bfe41cac52f5467e12a7e1d8
 MISC metadata.xml 1513 SHA256 3ef28ad5d03f55180baee7ae9b92f9eb60f993e2d6079311740bb9c1735b7a7a SHA512 0fafe9f39e02d0291574c64d8b39a79c723837935e6ef34b3b0f067bf0ea004b772aab3ab8aaece0f6154b17ea478168f7a539acda9ef2555008597cb7f066bc WHIRLPOOL 28ba2db2afdffde5ae39f7faf573aa8b9d7f8073a00aef5a6e3cf23a939dea873c6a7d160957612d5cc984dc6c6a5deb77bb2cadf41056056017ced1805ab8c6
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@ -6,4 +6,4 @@ EBUILD botan-1.10.12.ebuild 4030 SHA256 259c358c95bf9824ba0981db8c61ca3fcb6a6c20
 EBUILD botan-1.11.28.ebuild 3491 SHA256 924b538e12ef9d54065dcbc4d5d39b67dc25768c36393b37228482bf44f923d8 SHA512 d6cd2b1fa725e9d07e3a2c9c234deaad394c4fb5c34baab3ee4d7f46aca53ff8286cf12dd56cfb6a9a56e3177f261117ae78870d0f5a1e2d0ef5ecc0170df4c8 WHIRLPOOL 0c4bfa628c9cf00242e315d3dcde749a4a3d5533d5f1367cb1550e477f91029a5f162f8b0368ab08e2db8d9d88d07e6315a696d7f2a58ff0cfbb7d61917ff473
 MISC ChangeLog 4818 SHA256 6d41bde5dcc84b4a40a2afa826aac92b87c3e0ce887c343f503a43965a3def56 SHA512 2499d0da75e51a4bbd0b7e9c5178877958fa16aba5247caf1487217f757ba2bc276a846e554e9eb3c7ac485e0576c27015612dfdc27caa310a7d971fdc6399d0 WHIRLPOOL 8f9ee5403446a66a1c286acd59a3d58b23927a02184970c130ff20bcd272fef9fe609b0c8f755ae2df7be8389682ef822b883458ad78c66a80e992a2241b672a
 MISC ChangeLog-2015 14001 SHA256 3965f2c6b8727a5d23738c6a204c1786dedff49d5c4ed7a0d5e310993a10dee4 SHA512 89e3c0d3264354d2b926f971a3a86df4eba9961b680e55e951d2fcb17a1c9b02dedb3d098e90502be6c1b4152e0adbd5cf55d2e56ee5904403c1d6d8b2ee1603 WHIRLPOOL 66370d148c79167a19afe2af5061ce9f7d59b36e9d490adf0ed2d6d871c24cba770a3ce077c8f3b5fe9fc8b95fae66966fce151c41f2b5db5b7df2c9361df031
-MISC metadata.xml 605 SHA256 dc2e9a9357da75f167bfe2d839821421a79f81beef5ef029472d4f50ffbba1eb SHA512 cf6ff773a7decdf5b6e84df9bcf88e6215e2452e28def49f93be7a5d51fd794847d090865ffae6d192c3eae22dd012b82ce1c082e0d8e26570978a269d23f251 WHIRLPOOL 27ed3ab9724f6f0c429669a7d76da03171c5818dcceeaa839c37fedc52c69837363059761fe37f17cc9114d71d29320bf514b1f11d76770234f489e586b799d4
+MISC metadata.xml 620 SHA256 9c09004cd1f859ecda18c9162ac1ed53ce38b3288bf173b80657b29663e02edd SHA512 9b8e939d448e28904e53a0c6b8c4d561b467a2e7bd22bae9632b8fce90f5d4a4bffd77bc86c30db8f4d9ef7c4b45d4594c1d6b4b908e8ae00a8277d2af6029e5 WHIRLPOOL 5d57394a8e87c9ad99a0874c7f6f6c4c6df7a9e1dd69098d46dd681bd2d097ea0796284c4c49943f857f01471e1e307f1b69058f730e56cd5335ec3a54f28bbc
--- a/dev-libs/botan/metadata.xml
+++ b/dev-libs/botan/metadata.xml
@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>lloyd@randombit.net</email>
-    <name>Jack Lloyd </name>
-    <description>Ebuild contributor and botan author</description>
-</maintainer>
-<maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-</maintainer>
-<maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-</maintainer>
-<use>
-	<flag name="boost">use <pkg>dev-libs/boost</pkg></flag>
-</use>
+	<maintainer type="person">
+		<email>lloyd@randombit.net</email>
+	    	<name>Jack Lloyd </name>
+    		<description>Ebuild contributor and botan author</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+		</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers Project</name>
+		</maintainer>
+	<use>
+		<flag name="boost">use <pkg>dev-libs/boost</pkg></flag>
+	</use>
 </pkgmetadata>
--- a/dev-libs/clearsilver/ChangeLog
+++ b/dev-libs/clearsilver/ChangeLog
@ -1,84 +0,0 @@
-# ChangeLog for dev-libs/clearsilver
-# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
-# (auto-generated from git log)
-
-*clearsilver-0.10.5-r2 (09 Aug 2015)
-
-  09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
-  +clearsilver-0.10.5-r2.ebuild, +files/clearsilver-0.10.5-libdir.patch,
-  +files/clearsilver-0.10.5-libz.patch,
-  +files/clearsilver-0.10.5-perl_installdir.patch, +metadata.xml:
-  proj/gentoo: Initial commit
-
-  This commit represents a new era for Gentoo:
-  Storing the gentoo-x86 tree in Git, as converted from CVS.
-
-  This commit is the start of the NEW history.
-  Any historical data is intended to be grafted onto this point.
-
-  Creation process:
-  1. Take final CVS checkout snapshot
-  2. Remove ALL ChangeLog* files
-  3. Transform all Manifests to thin
-  4. Remove empty Manifests
-  5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
-  5.1. Do not touch files with -kb/-ko keyword flags.
-
-  Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-  X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
-  tests
-  X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
-  project
-  X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
-  developer, wrote Git features for the migration
-  X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
-  cvs2svn
-  X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
-  X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
-  work in migration
-  X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
-  X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
-  the bikeshed
-
-  24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
-  Use https by default
-
-  Convert all URLs for sites supporting encrypted connections from http to
-  https
-
-  Signed-off-by: Justin Lecher <jlec@gentoo.org>
-
-  24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
-  Revert DOCTYPE SYSTEM https changes in metadata.xml
-
-  repoman does not yet accept the https version.
-  This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
-
-  Bug: https://bugs.gentoo.org/552720
-
-*clearsilver-0.10.5-r3 (01 Oct 2015)
-
-  01 Oct 2015; Patrice Clement <monsieurp@gentoo.org>
-  +clearsilver-0.10.5-r3.ebuild,
-  +files/clearsilver-0.10.5-disable-java-tests.patch:
-  Add Java support. Fixes bug 251091.
-
-  Package-Manager: portage-2.2.18
-  Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
-
-  01 Oct 2015; Patrice Clement <monsieurp@gentoo.org>
-  clearsilver-0.10.5-r3.ebuild:
-  Add Java support. Fixes bug 251091.
-
-  Package-Manager: portage-2.2.18
-  Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
-
-  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
-  Replace all herds with appropriate projects (GLEP 67)
-
-  Replace all uses of herd with appropriate project maintainers, or no
-  maintainers in case of herds requested to be disbanded.
-
-  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
-  Set appropriate maintainer types in metadata.xml (GLEP 67)
-
--- a/dev-libs/clearsilver/ChangeLog-2015
+++ b/dev-libs/clearsilver/ChangeLog-2015
@ -1,198 +0,0 @@
-# ChangeLog for dev-libs/clearsilver
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.47 2014/11/17 23:26:59 dilfridge Exp $
-
-  17 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org>
-  clearsilver-0.10.5-r2.ebuild:
-  Replace fixlocalpod with perl_delete_localpod
-
-*clearsilver-0.10.5-r2 (25 Oct 2014)
-
-  25 Oct 2014; Andreas K. Huettel <dilfridge@gentoo.org>
-  +clearsilver-0.10.5-r2.ebuild, -clearsilver-0.10.5-r1.ebuild:
-  EAPI bump; add slot operator on Perl dependency
-
-  10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
-  clearsilver-0.10.5-r1.ebuild:
-  QA: drop trailing '.' from DESCRIPTION
-
-  02 Dec 2012; Ulrich Müller <ulm@gentoo.org> clearsilver-0.10.5-r1.ebuild:
-  Update LICENSE, this is identical with the Apache-1.1 license, bug 444848.
-
-  25 Apr 2012; Justin Lecher <jlec@gentoo.org> clearsilver-0.10.5-r1.ebuild:
-  Drop unnessecary die
-
-  16 Mar 2012; Mike Gilbert <floppym@gentoo.org> clearsilver-0.10.5-r1.ebuild:
-  Python-related improvements by Arfrever. Bug 312179.
-
-  26 Mar 2011; Torsten Veller <tove@gentoo.org> -clearsilver-0.10.5.ebuild:
-  Cleanup
-
-  26 Mar 2011; Christian Faulhammer <fauli@gentoo.org>
-  clearsilver-0.10.5-r1.ebuild:
-  stable x86, bug 295895
-
-  25 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
-  clearsilver-0.10.5-r1.ebuild:
-  ppc/ppc64 stable wrt #295895
-
-  11 Mar 2011; Markos Chandras <hwoarang@gentoo.org>
-  clearsilver-0.10.5-r1.ebuild:
-  Stable on amd64 wrt bug #295895
-
-*clearsilver-0.10.5-r1 (09 Mar 2011)
-
-  09 Mar 2011; Torsten Veller <tove@gentoo.org> +clearsilver-0.10.5-r1.ebuild,
-  +files/clearsilver-0.10.5-perl_installdir.patch:
-  Move perl modules to vendor_dir (#295895)
-
-  28 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
-  Removing Julien Allanos (dju) from metadata.xml (as per #87168).
-
-  25 Jan 2008; Doug Klima <cardoe@gentoo.org> clearsilver-0.10.5.ebuild:
-  amd64 stable wrt bug #203584
-
-  29 Dec 2007; Brent Baude <ranger@gentoo.org> clearsilver-0.10.5.ebuild:
-  Marking clearsilver-0.10.5 ppc64 for bug 203584
-
-  28 Dec 2007; Markus Meier <maekke@gentoo.org> clearsilver-0.10.5.ebuild:
-  x86 stable wrt bug #203584 and quotes
-
-  28 Dec 2007; nixnut <nixnut@gentoo.org> clearsilver-0.10.5.ebuild:
-  Stable on ppc wrt bug 203584
-
-*clearsilver-0.10.5 (02 Nov 2007)
-
-  02 Nov 2007; Julien Allanos <dju@gentoo.org>
-  +files/clearsilver-0.10.5-libdir.patch,
-  +files/clearsilver-0.10.5-libz.patch, +clearsilver-0.10.5.ebuild:
-  Version bump to 0.10.5, fixing bug #191601.
-  Added user patch to fix bug #196422.
-
-  15 May 2007; Steve Dibb <beandog@gentoo.org> clearsilver-0.10.1.ebuild:
-  amd64 stable
-
-  02 Mar 2007; Peter Weller <welp@gentoo.org> clearsilver-0.10.4.ebuild:
-  Fixed on g/fbsd wrt bug #169055
-
-  14 Feb 2007; Simon Stelling <blubb@gentoo.org>
-  +files/clearsilver-0.10.4-libdir.patch, clearsilver-0.10.4.ebuild:
-  multilib-strict fixes; bug 164447
-
-  13 Feb 2007; Markus Rothe <corsair@gentoo.org> clearsilver-0.10.4.ebuild:
-  Added ~ppc64; bug #166675
-
-*clearsilver-0.10.4 (14 Dec 2006)
-
-  14 Dec 2006; <dju@gentoo.org> -clearsilver-0.10.2.ebuild,
-  +clearsilver-0.10.4.ebuild:
-  Version bump to 0.10.4, removing 0.10.2 ebuild.
-
-*clearsilver-0.10.3 (27 Sep 2006)
-
-  27 Sep 2006; Julien Allanos <dju@gentoo.org>
-  +files/0.10.3-PyObject_DEL.patch, +files/0.10.3-missing-csr.patch,
-  +files/0.10.3-static.cgi.patch, +clearsilver-0.10.3.ebuild:
-  Version bump to 0.10.3. Fixed bugs #144580, #146026 and #148863.
-
-  26 Jun 2006; Javier Villavicencio <the_paya@gentoo.org>
-  clearsilver-0.10.2.ebuild:
-  Add ~x86-fbsd keyword.
-
-*clearsilver-0.10.2 (05 Feb 2006)
-
-  05 Feb 2006; Julien Allanos <dju@gentoo.org>
-  -files/clearsilver-0.9.14-fPIC.patch,
-  -files/clearsilver-0.9.14-python24.patch, -clearsilver-0.9.14-r1.ebuild,
-  +clearsilver-0.10.2.ebuild:
-  Version bump to 0.10.2, closes bug #119159. Removed old ebuild.
-
-  12 Jan 2006; Julien Allanos <dju@gentoo.org> metadata.xml:
-  Removed upstream from metadata.xml.
-
-  12 Jan 2006; Julien Allanos <dju@gentoo.org>
-  -files/clearsilver-0.9.7-python24.patch, -files/0.9.7-python.patch,
-  -clearsilver-0.9.7.ebuild:
-  Removing old ebuild.
-
-  11 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  clearsilver-0.10.1.ebuild:
-  ppc stable, bug #118302
-
-  10 Jan 2006; Mark Loeser <halcy0n@gentoo.org> clearsilver-0.10.1.ebuild:
-  Stable on x86; bug #118302
-
-  28 Nov 2005; <mcumming@gentoo.org> clearsilver-0.10.1.ebuild,
-  clearsilver-0.9.14-r1.ebuild, clearsilver-0.9.7.ebuild:
-  Switched from perl-module to perl-app eclass
-
-  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
-  clearsilver-0.9.14-r1.ebuild:
-  Stable on ppc.
-
-  30 Aug 2005; Julien Allanos <dju@gentoo.org> clearsilver-0.9.7.ebuild,
-  clearsilver-0.9.14-r1.ebuild, clearsilver-0.10.1.ebuild:
-  Added fix for perllocal.pod, closes bug #104278.
-
-  29 Aug 2005; Julien Allanos <dju@gentoo.org> clearsilver-0.9.7.ebuild,
-  -clearsilver-0.9.14.ebuild, clearsilver-0.9.14-r1.ebuild:
-  Removed 0.9.14. Marked 0.9.14-r1 stable for x86.
-  Removed RESTRICT="no mirror" for 0.9.7 and 0.9.14-r1.
-
-*clearsilver-0.10.1 (29 Aug 2005)
-
-  29 Aug 2005; Julien Allanos <dju@gentoo.org>
-  +files/clearsilver-0.10.1-fPIC.patch, +files/configure-python24.patch,
-  metadata.xml, +clearsilver-0.10.1.ebuild:
-  Bumping clearsilver-0.10.1. Removed RESTRICT="nomirror" for this release,
-  as permitted by the licence. Added upstream contact to metadata.xml.
-
-*clearsilver-0.9.14-r1 (04 Aug 2005)
-
-  04 Aug 2005; Herbie Hopkins <herbs@gentoo.org>
-  +files/clearsilver-0.9.14-fPIC.patch,
-  files/clearsilver-0.9.14-python24.patch, +clearsilver-0.9.14-r1.ebuild:
-  Add patch to compile shared objects with -fPIC, bug #98362. Altered python24
-  patch to not hardcode lib and so be multilib-strict safe.
-
-  02 Aug 2005; Renat Lumpau <rl03@gentoo.org>
-  +files/clearsilver-0.9.7-python24.patch,
-  +files/clearsilver-0.9.14-python24.patch, clearsilver-0.9.7.ebuild,
-  clearsilver-0.9.14.ebuild:
-  Fixes bug #98588, thanks to pythonhead
-
-*clearsilver-0.9.14 (04 Jul 2005)
-
-  04 Jul 2005; Julien Allanos <dju@gentoo.org> metadata.xml, +clearsilver-0.9.14.ebuild:
-  Version bump, closing bug #71302. Disable apache 1 module and java support.
-  Cleaned up the ebuild and fixed the neo_cgi.so installation directory.
-  Assigned myself as the maintainer.
-
-  11 Apr 2005; Christian Parpart <trapni@gentoo.org>
-  clearsilver-0.9.7.ebuild:
-  adding ~amd64 keyword
-
-  08 Sep 2004; Renat Lumpau <rl03@gentoo.org> metadata.xml:
-  Fixed herd name
-
-  11 Jun 2004; Stuart Herbert <stuart@gentoo.org> clearsilver-0.9.7.ebuild:
-  Disable csharp support (bug #52195)
-  Disable ruby support (bug #53659)
-
-  26 May 2004; Stuart Herbert <stuart@gentoo.org> clearsilver-0.9.7.ebuild:
-  Added ~sparc keyword
-
-  05 May 2004; Daniel Black <dragonheart@gentoo.org> clearsilver-0.9.7.ebuild:
-  QA Fix - inherit before DESCRIPTION
-
-  29 Apr 2004; David Holm <dholm@gentoo.org> clearsilver-0.9.7.ebuild:
-  Added to ~ppc.
-
-  28 Apr 2004; Stuart Herbert <stuart@gentoo.org> clearsilver-0.9.7.ebuild:
-  Fixed the header
-
-*clearsilver-0.9.7 (25 Apr 2004)
-
-  25 Apr 2004; Stuart Herbert <stuart@gentoo.org> clearsilver-0.9.7.ebuild,
-  metadata.xml:
-  Initial import; thanks to dju` <dju@elegiac.net> for the ebuild; see bug #48818
--- a/dev-libs/clearsilver/Manifest
+++ b/dev-libs/clearsilver/Manifest
@ -1,10 +0,0 @@
-AUX clearsilver-0.10.5-disable-java-tests.patch 324 SHA256 91dbba7dc3c93c5150a7779aea356e6f6259e34655bbe405e8a0a05a88d0e9a0 SHA512 5041b6bbe56335953d8ddf58548c7fb0f34fda22cfd6da916d094969d103575bd71e8ea1ef983eec01b2b778b90031baeb19ccfed8b9c733de554696b51d8ef3 WHIRLPOOL 908f162b87dd1797cd29a9bd0a59d3e3b6001ce39fa0fb4729ae333b68ab7c7204084138fabe9f778a0a42fe6eb4b7b6e52e66279ee5840051b092a6a9f4ec3f
-AUX clearsilver-0.10.5-libdir.patch 693 SHA256 ec5e340eb9fdb94c8e05f5bdc79bc954c0560ed711dd438e0d6f863e1ab3abd2 SHA512 20bade33588affe0647de973179d932edd29452c463cc60c28bbeed243d8f6ab1223220f23ec7d98e1106d42263cf51ff0f8f389ed1e60314762d6552b822195 WHIRLPOOL 4d76fdbeccc85a575e00ccec4cc95552027b8d058315b36bc4495340ac8dbce574207ae89605245effbca633c57b185ba8bc07fb37a707f10c13f474fd0cc2b7
-AUX clearsilver-0.10.5-libz.patch 276 SHA256 51e769a619a23aff2b2a26e17954eba6cd3101f581b1807465226f55e0f42d02 SHA512 0c5ab50bd55f6a4e5d65f01e170ab17d268c3fde5615c83aef967b70973c844ad91770f30e8ec8382bed4d177685774d4a7d44c274e0e83db605e4a7148abf14 WHIRLPOOL bb4253569fa161eea75501d4a59f06b59c1c0fafb22b511824f913af8fb07adc2cf60078c6954e9ae67ac982b822676bca0b4ad6e9323e01e4bc7f3bac011b7c
-AUX clearsilver-0.10.5-perl_installdir.patch 857 SHA256 d08fc906d7cec21419166b2de962e1fc0485445552d03fc16024125094285212 SHA512 5e31edddf1f8c845bdbc3e313230825c1ee680bb65a72fe1eed21d3335c6c0bdb4a3c34342562adc1978cb8cf245e738c6a42077fe3136b45ac53191cc65da28 WHIRLPOOL e52d76e2efef619cd68f9dd646f51f86f5f8202f33d3a1d602a05c95eeb44cc4505be8ad42e96e61c682412c71f9d5557a71bebba35b001c2a07d8abac057152
-DIST clearsilver-0.10.5.tar.gz 439190 SHA256 1e9da038deafddd3d0c1c510626c28be5a0f4f17b9091d577fd30e7c5ba88680 SHA512 05a3c2140d462b8120fa41f74c09ca9246184259b6bdf147581e23e4441f700b9737f82145d8ff96996d93e37bd6a660c68f58f27370c903777a914235ea53b9 WHIRLPOOL a1ec3c88d46d4ab61f3540f62a5461679353102dbf4a0837b369a6a4d769c7f7a9934662575f75f2cf7b29aa7b9581d0dbcea6847548fae71f8998eb612146f2
-EBUILD clearsilver-0.10.5-r2.ebuild 1627 SHA256 1805421aa6ea1b13591d2c1db1ed9313e4cb312e75f2a54caf9fc26df1ae40e6 SHA512 aac13a02911cda909efacc32355af581b77a443e3fe31eac377d0ab1358249daccca07f29396cd56f24f1264c65467b603b76cfb81f8b3bae08d19bce3e5d9e2 WHIRLPOOL 549d29554ff1f3815c0bc6be87b23d708a1ba079976299df58c50b8683666f07b4c97433939b60f46515708ae793176791c23051598e908b8b9d7ebd70e6f158
-EBUILD clearsilver-0.10.5-r3.ebuild 2066 SHA256 b13480f990f15681d7e2c527d349e09be5987fde0097f05966f956cfde9ccb86 SHA512 8091b13fa7a03d11b763d0fe1f05b0f3acc73e6854d158f026d363298ce72131b9e708f35f0d00a5458c8b27732983e01d10801b6d3e6aa391a5251f3dc51bca WHIRLPOOL bba8658b67b538bf548e1cce8dac4cd02f8bd309225b99aa7bd3a646bacb480163eeb166382acdfdbef878759c2bc5f3658438451f0544bad21ff69e98ea5d51
-MISC ChangeLog 3103 SHA256 d7f2c2db1264e86516a6b48dd3a3960c5868c8e8dbdf7e61f1003723f4952c54 SHA512 3694eebb35626fbc05b3e40da5242e315ccfa572a214f1d90d1bb7169576d6b3cf7f21d7691e0ab67157f443715fa25e94b0ec6bdc9006e78510e64e0abecf19 WHIRLPOOL d3f90638c3e6d51970f0b6cae0772e2ac57d3fbfaa8f01bca35f8a62af6e3928681aab048c380309dd3d0d1e090de84d8824bfc9e7d7ec814854e7a21cbce790
-MISC ChangeLog-2015 7278 SHA256 46dbddc7236fb031adb4bd8e5cd316168296be4ab5c6dffa4570cf177ed1dcf7 SHA512 9d9b96e6b01219bea5020aab1a4390bff6fd167b74734ce7eddc86c0244a78d12bef02ce373ec96c50d30d825436b375c68f4feb9447169fece8a496e917d685 WHIRLPOOL 103e9fbce03ed76c0e3f9dcdc0f37c7e0e048c8c6b12eb6645a6b782ef344bc34ec9a89f3420cd7fa794c4a2b273aadc3f5693110dc7df614019ddd6d734e25c
-MISC metadata.xml 250 SHA256 d9fcac0092614f226b371c1819fe3a264758bfd9fedc2874c35a7b3dd6d77291 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282 WHIRLPOOL 113cbaecb7ee19172633b0ee77ecfa10f6742848fd0f5f0797b95865f291e063ce3916719af48a81a72adfdaf40a4b18815e2434f0de91e2baa63822951470f0
--- a/dev-libs/clearsilver/clearsilver-0.10.5-r2.ebuild
+++ b/dev-libs/clearsilver/clearsilver-0.10.5-r2.ebuild
@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Please note: apache, java, mono and ruby support disabled for now.
-# Fill a bug if you need it.
-#
-# dju@gentoo.org, 4th July 2005
-
-EAPI=5
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_DEPEND="python? 2"
-
-inherit autotools eutils multilib perl-app python
-
-DESCRIPTION="Clearsilver is a fast, powerful, and language-neutral HTML template system"
-HOMEPAGE="http://www.clearsilver.net/"
-SRC_URI="http://www.clearsilver.net/downloads/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="perl python zlib"
-
-DEPEND="perl? ( dev-lang/perl:= )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-DOCS=(README INSTALL)
-
-pkg_setup() {
-	if use python; then
-		DOCS+=(README.python)
-
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-perl_installdir.patch
-
-	use zlib && epatch "${FILESDIR}"/${P}-libz.patch
-
-	epatch "${FILESDIR}"/${P}-libdir.patch
-	sed -i -e "s:GENTOO_LIBDIR:$(get_libdir):" configure.in
-	eautoreconf
-
-	# Fix for Gentoo/Freebsd
-	[[ "${ARCH}" == FreeBSD ]] && touch ${S}/features.h ${S}/cgi/features.h
-}
-
-src_configure() {
-	econf \
-		$(use_enable perl) \
-		$(use_with perl perl /usr/bin/perl) \
-		$(use_enable python) \
-		$(use_with python python /usr/bin/python) \
-		$(use_enable zlib compression) \
-		"--disable-apache" \
-		"--disable-ruby" \
-		"--disable-java" \
-		"--disable-csharp"
-}
-
-src_compile() {
-	default
-}
-
-src_install () {
-	default
-
-	if use perl ; then
-		perl_delete_localpod || die "perl_delete_localpod failed"
-	fi
-}
--- a/dev-libs/clearsilver/clearsilver-0.10.5-r3.ebuild
+++ b/dev-libs/clearsilver/clearsilver-0.10.5-r3.ebuild
@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Please note: apache, mono and ruby support disabled for now.
-# Fill a bug if you need it.
-#
-# dju@gentoo.org, 4th July 2005
-
-EAPI=5
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_DEPEND="python? 2"
-
-inherit autotools eutils multilib perl-app python java-pkg-opt-2
-
-DESCRIPTION="Clearsilver is a fast, powerful, and language-neutral HTML template system"
-HOMEPAGE="http://www.clearsilver.net/"
-SRC_URI="http://www.clearsilver.net/downloads/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="perl python zlib perl java"
-
-DEPEND="perl? ( dev-lang/perl:= )
-	zlib? ( sys-libs/zlib )
-	java? ( >=virtual/jdk-1.6 )"
-
-RDEPEND="
-	java? ( >=virtual/jre-1.6 )"
-
-DOCS=(README INSTALL)
-
-pkg_setup() {
-	if use python; then
-		DOCS+=(README.python)
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	if use java; then
-		java-pkg-opt-2_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-perl_installdir.patch
-
-	use zlib && epatch "${FILESDIR}"/${P}-libz.patch
-
-	epatch "${FILESDIR}"/${P}-libdir.patch
-	sed -i -e "s:GENTOO_LIBDIR:$(get_libdir):" configure.in
-	eautoreconf
-
-	# Fix for Gentoo/Freebsd
-	[[ "${ARCH}" == FreeBSD ]] && touch ${S}/features.h ${S}/cgi/features.h
-
-	if use java; then
-		java-pkg-opt-2_src_prepare
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable perl) \
-		$(use_with perl perl /usr/bin/perl) \
-		$(use_enable python) \
-		$(use_with python python /usr/bin/python) \
-		$(use_enable zlib compression) \
-		$(use_enable java) \
-		$(use_with java java $(java-config -O)) \
-		"--disable-apache" \
-		"--disable-ruby" \
-		"--disable-csharp"
-
-	# Java tests fail. Maybe investigate why?
-	if use java; then
-		epatch "${FILESDIR}"/${P}-disable-java-tests.patch
-	fi
-}
-
-src_compile() {
-	default
-}
-
-src_install () {
-	default
-
-	if use perl; then
-		perl_delete_localpod || die "perl_delete_localpod failed"
-	fi
-
-	if use java; then
-		java-pkg_doso "java-jni/lib${PN}-jni.so"
-		java-pkg_dojar "java-jni/${PN}.jar"
-	fi
-}
--- a/dev-libs/clearsilver/files/clearsilver-0.10.5-disable-java-tests.patch
+++ b/dev-libs/clearsilver/files/clearsilver-0.10.5-disable-java-tests.patch
@ -1,11 +0,0 @@
--- java-jni/Makefile.orig	2015-10-01 16:20:55.775486000 +0000
-+++ java-jni/Makefile	2015-10-01 16:21:59.027486000 +0000
-@@ -26,7 +26,7 @@
- 
- TARGETS = org_clearsilver_HDF.h org_clearsilver_CS.h $(NEO_UTIL_SO)
- 
-all: $(TARGETS) test
-+all: $(TARGETS)
- 
- $(NEO_UTIL_JAVA_JAR): $(NEO_UTIL_JAVA_SRC)
- 	$(MKDIR) org/clearsilver
--- a/dev-libs/clearsilver/files/clearsilver-0.10.5-libdir.patch
+++ b/dev-libs/clearsilver/files/clearsilver-0.10.5-libdir.patch
@ -1,13 +0,0 @@
--- configure.in.orig   2007-02-14 13:13:10.000000000 +0100
-+++ configure.in        2007-02-14 13:18:39.000000000 +0100
-@@ -253,8 +253,8 @@
-     vers=`$python_bin -c "import sys; print sys.version[[:3]]"`
-     py_inst_dir=`$python_bin -c "import sys; print sys.exec_prefix"`
-     python_inc=$py_inst_dir/include/python$vers
-    python_lib="-L$py_inst_dir/lib/python$vers/config -lpython$vers"
-    python_site=$py_inst_dir/lib/python$vers/site-packages
-+    python_lib="-L$py_inst_dir/GENTOO_LIBDIR/python$vers/config -lpython$vers"
-+    python_site=$py_inst_dir/GENTOO_LIBDIR/python$vers/site-packages
-   else
-     for vers in $python_versions; do
-       for path in $python_search_path; do
--- a/dev-libs/clearsilver/files/clearsilver-0.10.5-libz.patch
+++ b/dev-libs/clearsilver/files/clearsilver-0.10.5-libz.patch
@ -1,10 +0,0 @@
--- python/setup.py.orig	2007-10-28 21:20:00.000000000 +0200
-+++ python/setup.py	2007-10-28 21:20:34.000000000 +0200
-@@ -122,6 +122,7 @@
-       include_dirs=INC_DIRS,
-       library_dirs=LIB_DIRS,
-       libraries=LIBRARIES,
-+      extra_link_args = ["-lz"],
-       )]
-   }
- 
--- a/dev-libs/clearsilver/files/clearsilver-0.10.5-perl_installdir.patch
+++ b/dev-libs/clearsilver/files/clearsilver-0.10.5-perl_installdir.patch
@ -1,22 +0,0 @@
-X-Bug-Debian: http://bugs.debian.org/357908
-X-Bug-Gentoo: https://bugs.gentoo.org/295895
--- b/Makefile
-+++ a/Makefile
-@@ -29,7 +29,7 @@
- 	@for mdir in $(SUBDIRS); do \
- 	  if test -d $$mdir; then \
- 	    if test -f $$mdir/Makefile.PL -a ! -f $$mdir/Makefile; then \
-	      cd $$mdir; $(PERL) Makefile.PL PREFIX=$(prefix); cd ..; \
-+	      cd $$mdir; $(PERL) Makefile.PL PREFIX=$(prefix) INSTALLDIRS=vendor; cd ..; \
- 	    fi; \
- 	    $(MAKE) -C $$mdir PREFIX=$(prefix); \
- 	  fi; \
-@@ -46,7 +46,7 @@
- 	@for mdir in $(SUBDIRS); do \
- 	  if test -d $$mdir; then \
- 	    if test -f $$mdir/Makefile.PL -a ! -f $$mdir/Makefile; then \
-	      cd $$mdir; $(PERL) Makefile.PL PREFIX=$(prefix); cd ..; \
-+	      cd $$mdir; $(PERL) Makefile.PL PREFIX=$(prefix) INSTALLDIRS=vendor; cd ..; \
- 	    fi; \
- 	    $(MAKE) -C $$mdir PREFIX=$(prefix) install; \
- 	  fi; \
--- a/dev-libs/clearsilver/metadata.xml
+++ b/dev-libs/clearsilver/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-libs/libbsd/ChangeLog
+++ b/dev-libs/libbsd/ChangeLog
@ -180,3 +180,10 @@

  Package-Manager: portage-2.2.28

+  31 Mar 2016; Agostino Sarubbo <ago@gentoo.org> libbsd-0.8.2.ebuild:
+  ia64 stable wrt bug #578498
+
+  Package-Manager: portage-2.2.26
+  RepoMan-Options: --include-arches="ia64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@ -1,5 +1,5 @@
 DIST libbsd-0.8.2.tar.xz 344292 SHA256 b2f644cae94a6e2fe109449c20ad79a0f6ee4faec2205b07eefa0020565e250a SHA512 2230d51a30a0c3a8518c7e325036d2b578c8c2b47525c2d0d5f530d28d82227ad48b50341e44521db21f99208fe7c0df7313254c90e3c92da1c8664a8cbb87c5 WHIRLPOOL 4f9b09aaa7c0775cd46bf0aaaba9e9a7f07040262739002bf3966aace3bb4d782f96b176e2c489e7d7cbc0840eecc463a414dee1b5c92414c9a821796d739290
-EBUILD libbsd-0.8.2.ebuild 1078 SHA256 5617e016c15b878a29fa9a703151fe2a0ac2000c7e3853c8aeb42d772255cdd0 SHA512 c1ca671df6a6412b759d88445d1a1e20c0a61251231df0c0bdc77f55837fd5f77afa1e9e45f1ddfd4386e4c7a0421df2f0da44a895cc53bb47f091105ef647c8 WHIRLPOOL d7eb622def7fb210a4fe17a9c0e9d8475dea3ae43775799f6d7ce05c5792cfa153a0d83ab5cba55acb2945f2cafe22d9fac36f47679620c06fbc43674b2a1d85
-MISC ChangeLog 5717 SHA256 9a1c524996f9d989a4a4fd63ce1d4c5e027219f018a210d5983dd945f51db6a5 SHA512 5fff074e12d2bc2363ce5560d69459f27b399464d0352620e8e961f20b3806dc6d64431f1e3581ed9ff47e41c7cf0e39b1338401e4e8d9a099b2d158f840a44c WHIRLPOOL 3f2794c4f53a5947463c1eb139a50985e42c4f1b6c99b2cc8b49ac70089b7f31d94df4c378c5de67fc32a8fa54c8f094c7e40ed7b1d23274333babbc82812fca
+EBUILD libbsd-0.8.2.ebuild 1077 SHA256 521217049e5eef08a05c251cabddd771ae2cd58d6c3ef7edb7c62ed18ae62035 SHA512 5aa98bdf406402ae4801635980fe913c56638a20a4e99ef6ea0d94a6a17d60efdfa91607e68f7ad139e2cee4e5942506544df0bce5c433ac1288432344c8ac9e WHIRLPOOL 9931cb17f18055da5625d9ded6030fa7c2bc46d9f5bebf2b4a8af01255e73d88df19033af2ec590d02939897fda739f8566e892a153684d8f53eb46f408ba488
+MISC ChangeLog 5947 SHA256 8b6e4691b226883b5991306affcf12958285ddd20aec28d64aa8ef5519e70240 SHA512 44fd4e9e2bda9a015daecd94e74e882514fc8f95626a87be42fe5d2337dd6e5101e664e6196fab7da724812d41146d5531cbee74e3fdc6f220bfae9cc6c9401c WHIRLPOOL f23b1ab9253e39e86d7668eb42bb70b0639354a6d82b134e82d174df92294541849081d9a933d3144c5bd74b7d4f42424725cdaae8c58064640b982140edaac5
 MISC ChangeLog-2015 5236 SHA256 5e8fd6dffc9bb76f2734a6da36bbf00792171f4167bfdb89419e08709ac4ec7d SHA512 dd4eae1cdfb9ab4eadf5ff529d291baa237612be9ea47794fefc7d86246172ef164c2bb65add1786acf651b89082ce5520aa5a0c1fd09fc70d65fba369d6bc41 WHIRLPOOL eda53a135a82ecfe31e32b9a6d03be9261f0ac14f4a1773494c2d7231de826bbaf7d4061f6827999ad79118c690bfd47d5983c7b9fb80c2a8795bfe061eeabc5
 MISC metadata.xml 276 SHA256 6bb81cdb026b199d78fb2a2327320a915a3bd241a9300bb069bd9c998521f613 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59 WHIRLPOOL d494386e01171fe51879cf968a6cebca04c22477f3b8a52bfdd17b9ee06afd99c3979396f7abf40bee698d6fbb060e2f37e083cb3ed010c018d84211a2bc7cd0
--- a/dev-libs/libbsd/libbsd-0.8.2.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz"

 LICENSE="BSD BSD-2 BSD-4 ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"

 pkg_setup() {
--- a/dev-libs/libedit/ChangeLog
+++ b/dev-libs/libedit/ChangeLog
@ -70,3 +70,16 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  30 Mar 2016; Mike Frysinger <vapier@gentoo.org>
+  libedit-20130611.3.1-r1.ebuild, libedit-20130712.3.1.ebuild:
+  toolchain-funcs.eclass: gen_usr_ldscript: integrate multilib_is_native_abi
+  support #479448
+
+  Many ebuilds have started checking multilib_is_native_abi to see if they
+  should call gen_usr_ldscript.  Since that logic always makes sense, add
+  it directly to the gen_usr_ldscript function.
+
+  30 Mar 2016; Mike Frysinger <vapier@gentoo.org>
+  -libedit-20120311.3.0-r1.ebuild, -libedit-20130611.3.1-r1.ebuild:
+  drop old <20130712.3.1 versions
+
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@ -4,6 +4,6 @@ AUX libedit-20120311-3.0-el_fn_sh_complete.patch 7724 SHA256 8fb2844923c3750c9b8
 AUX libedit-ncursesprivate.patch 497 SHA256 e1fc9f5c3ffe5e5ba4117bc6b1c615e6f3e5ef82dfcebece16aaa5d571abb8a1 SHA512 41175b20f7b925e347db008d5e8a535b8326cd2c010a67b9db3a59131fce77a7791b7940e7eea9d68e82dbd3731efaa503d4bd218d78b29f946152dd56bd9b14 WHIRLPOOL df6b644fdaa70ec62997c2bd353ad757e6aafda7c17b4926ad3044d4f1d02deb379bd84946f5cea08c63eb4ba346752949f5b0a1577bc046dbbb4c4221fdf239
 DIST libedit-20130712-3.1.tar.gz 483857 SHA256 5d9b1a9dd66f1fe28bbd98e4d8ed1a22d8da0d08d902407dcc4a0702c8d88a37 SHA512 9fb3173a65ea2cd2ffa9af0666aa3e227b7d6be26f3e84f30ea3449b0c80fc5e91b618e939f7047bf885b96689ede93733f7eba614d4fdd1a4baff3f130b432e WHIRLPOOL 550553af1cf3bbd863ef4ce86ef5fd7adf257a7f5946ad186a104c5920d0f58216c135d496d52fd2d6ad51a1fb954bb87719d731aa0eebf6980d1c15345d6034
 EBUILD libedit-20130712.3.1.ebuild 1311 SHA256 a57c682e13ff415d6556a274df8981c86f83b621cd504f2a739c7d868b03a316 SHA512 f2732595357c3f7451a29f9b152d18ae6ef0cf6e508560a633bb617acc9b4a419fbab6b1c72a887e530447ad5d7332cabb54c4eaa6e26d1fe91aa882b07aee69 WHIRLPOOL c204cb6860b5454e541cb57cf31403518b217003c5e7fa303fe644a34fecfc0070f650986438c611da45cf42ed3e51554f2359038c2e629897a971ee14eed687
-MISC ChangeLog 2774 SHA256 03f9e9031a8254212d10d05a69312e01a2a5d0724a0cf08d3d59aaf5ee598a92 SHA512 fb83bec1739726140d3b74eec32144021904263a1a2eeba22d3b174c88c23c1951304e650658843c857cc569839589e8a09ca7bb5ff7decdf187dde0eba432b4 WHIRLPOOL 0857a27d8689d1f2002ca8ee20513a4f8983505361ecc7c110ea6c93d32442c650029fa3e5832931fb32b022bfc177db4aa6286535b2d3a23af0f967487adfef
+MISC ChangeLog 3334 SHA256 34d4702268521c106b89baf446d58af2541440f39273204b1e61746508fab1fd SHA512 f1491fe54f4d1c4ca9af69393938c408253047f4f048569088407366f5190b70226f72e291802e3d26181e0b9b6316b5fe1bfc97e2f076170f0cfb06b9993852 WHIRLPOOL 3b50a31acf8dc682cc10cd72370508cb4f0b750a83e2875eccbb7ddf05c56e2fa707b41c70b2f00149d6ad248af974120057b24b0ec66559ddeade1dcc001ccb
 MISC ChangeLog-2015 12459 SHA256 8899d2e3f79b28e7461b5494c28985207b746ee7ff4ae32de57a3d0514ecb3dd SHA512 133e1e6395632f7319e393ecdc75ae7f2252c8b0e7713f02be5498ed1f0ad1bec68f1f3f9ae58e447f3d9a0647aca0d6f2f0daaec8ac01cc3c345fa440b49e0c WHIRLPOOL c07b42492f6c1745974a77f77b5c79ebfdbb0d3bec6943e978e8c998337011c77ff674a0aacf68c12ac27006efae32ea2b287623afd964f3e0654a73fc93aee7
 MISC metadata.xml 636 SHA256 ec3560e3314a6a4b29d2786e993a52e900d30f36bb2248f2842d8a4b1399db81 SHA512 c335a652424f91f1ae79f907870bcd826cee21365b594353b3c52fb7fef51f637e9a65275c11f033b6bd7b6d918733904efc320b547999ee5b88a7b36ccb9389 WHIRLPOOL 753aa219f31fcade9ab32787ec1528b2e4ac195a9058baad7612fa8c1773375701b37dc1761e9ef86107697245c51414f18ad9cc0d3484d403e205969007c1f5
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@ -153,3 +153,18 @@

  The forced upgrade has been moved to @system now.

+  30 Mar 2016; Mike Frysinger <vapier@gentoo.org> libpcre-8.35.ebuild,
+  libpcre-8.36.ebuild, libpcre-8.37-r2.ebuild, libpcre-8.38.ebuild:
+  toolchain-funcs.eclass: gen_usr_ldscript: integrate multilib_is_native_abi
+  support #479448
+
+  Many ebuilds have started checking multilib_is_native_abi to see if they
+  should call gen_usr_ldscript.  Since that logic always makes sense, add
+  it directly to the gen_usr_ldscript function.
+
+  30 Mar 2016; Mike Frysinger <vapier@gentoo.org>
+  -files/libpcre-8.37-CVE-2015-3210.patch,
+  -files/libpcre-8.37-CVE-2015-5073.patch, -libpcre-8.35.ebuild,
+  -libpcre-8.36.ebuild, -libpcre-8.37-r2.ebuild:
+  drop old 8.3[567] versions
+
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@ -3,6 +3,6 @@ DIST pcre-7.9.tar.bz2 861580 SHA256 40a13a9759f1de5b16bc2f0d47b6aa5f0ec010325646
 DIST pcre-8.38.tar.bz2 1562265 SHA256 b9e02d36e23024d6c02a2e5b25204b3a4fa6ade43e0a5f869f254f49535079df SHA512 ad3412ceee8f992787a3e7cbe0155ffba67affd4b2dfece6c4501dc8d2012f52dcc1ee1f56759362e04bbbd10ea9370b3e46f238e2f75005cb69f6c8439e52c0 WHIRLPOOL 68533f741a3faa618f4d7341bfa59aaac295ac6af6085772e4c169ad73fae38e98cace2ce2af2899a619bb05dce79859dcd175a158a73729082f7cf52107d1df
 EBUILD libpcre-7.9-r1.ebuild 1826 SHA256 59989c05d583f312a23e1a33bfa1467dd0c36b442c417df24f5349afd6f4cfdd SHA512 fbddb1c8f6e3dd65598cdb29532ee7a53b0b06f4cadb6b2a0c45d577b6b00bbdbd175d940b42585269e65b84ac542d50e4f80091e01a2d7f485c4a47be21ed5b WHIRLPOOL 75329b395c3d6d7e8982a38d8fd85f7330a6d5308aa2e804956950a428f9e44d0acc66c05460814ee4e65fb570054ce958b7f9bfa7507b3c6d21e27bffa04d89
 EBUILD libpcre-8.38.ebuild 2764 SHA256 530981f347fac64af185ee1d0ac30bfab2b63a65555503e3a2a70b2a1696467d SHA512 d1372fd1df017a9371fd08c15bf8fe6acc28e6e5ff9ffcf1605ed1a4fa07204a1d33e9ee46d1eb4b40e98079132fd280582101a5938bdbd26fb535105aa891a8 WHIRLPOOL 61daaf93e4d61b6fe06e1dab51224f33ed815fe96591ac7119ea61c20c3555beb0f8754420889432f8cf83e1c3ed66cbd8a45685d1a17581e000dad964db16ac
-MISC ChangeLog 5327 SHA256 c9be8fa8757d741542555d192b67637c40119f3658000b05d9ddfd028ce51b3b SHA512 e0e11fedc042a7d7e0d042045b7398828401973b398b90699245c2bef6ad5a2147dc87fc572f8cf9bdca59af94a0df41fec20e8a9bee7ad9b84db23668c4a711 WHIRLPOOL 1ee0e9c2897adf8cc13b5bd5e3bca7b2892369654acbbfe7378fbf3b0f0d479b96b327deba3a172207648ef68efd9062891d4834156b280611ec29d820881136
+MISC ChangeLog 5997 SHA256 cc0dbe691ffd073f6c34729b83466c1a04d7986638f83645daf0693f2e85e284 SHA512 33129245937069960e67b4ae63410c0ad97c4f121757064b8e1a0f28e4ea3d475d6226e804691840d992c6fe4161e48bccfafbbfba8b54addc17dc054419aacd WHIRLPOOL c0677944fc4eaa0656be6f9b7831b2debd4b64b5244698538adac6568cea661558b945b951130e384ab1995e72d2df907d8e8a8d86afd539f0dda3cbc54ba59f
 MISC ChangeLog-2015 35335 SHA256 dfdfc43bcff86898d74db532baf46e6d88c70a3e62e82ceab69c285934f802b5 SHA512 94411b185f75967d240777124272d04b13f3cb3e43de6f751baa9944e07086f9fa2972e4854514fb39f85d69422a07fd1ee1cc7fc587dacf54b777bdf68439ea WHIRLPOOL ec71b8c06e85b5ec0a4040def4447e6aa2589bbaf9bd4b5d7479a2b968357a2b5c4a30e7c2739bd1b4607e074cdc9d15e0f730ed1a69cb936d514056d53578e0
 MISC metadata.xml 1112 SHA256 fa2a7f9e7f1ee1c432907cbc5cc0dd23f9636b5f4c51836dbcdbf24f72975c2a SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b WHIRLPOOL 7b675f34fbd1f58f42d7ad5c4e39e1d80922474624047165b30d85ecdbbffd1246d68b0dad4d7553c0d2fc900249e3425fc04f9b3821f189b30ebb2d2615dbad
--- a/dev-libs/libpwquality/ChangeLog
+++ b/dev-libs/libpwquality/ChangeLog
@ -131,3 +131,9 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  30 Mar 2016; Mike Frysinger <vapier@gentoo.org> libpwquality-1.3.0.ebuild:
+  mark arm64/s390/sh stable
+
+  30 Mar 2016; Mike Frysinger <vapier@gentoo.org> -libpwquality-1.2.4.ebuild:
+  drop old <1.3.0 versions
+
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@ -1,5 +1,5 @@
 DIST libpwquality-1.3.0.tar.bz2 423910 SHA256 74d2ea90e103323c1f2d6a6cc9617cdae6877573eddb31aaf31a40f354cc2d2a SHA512 c3817c7a5ca962b161911b97b413a0db7c34a99ba2cd191435024abdbe060e248c0f88436f24d3992dcb1b00d34b88afb731ef1fd23efc3ad1abe56d4d7d53ea WHIRLPOOL b6451083551a13be259d1a81eb089889d9ee430c30afb2555aa2e5e7c4240febc71b152ce3c210b592a56db8988fc88a827d8e9f368c5aa478d5babf4e316b8c
 EBUILD libpwquality-1.3.0.ebuild 1917 SHA256 4f87c700c6a6cceabaffed7bc8d0d5d1c9c1e5e9ac87f91c41cb69252b3cd59a SHA512 e24384e63e912d6fef8184241d9a98d280cfa7265efcd7a5970ad4fee5872a2e9986dddbf0ac0bfb6600b1ae055a6f21ba2aaef54714080e45bbf2ca3ceffdcb WHIRLPOOL 921fa1c5b1a08fde43514555e1486cf47bd899f4fa0863e7a42141e947c465d44d31bd7b4d4af1249ac7208979cc7ec3e8b5339d7b9c1038d9af9bfa1230d518
-MISC ChangeLog 4378 SHA256 2588b8951ba5a102343e7c10b0534e3a252631f9f5f3b95b943ff0a85ca5f3da SHA512 32fc2639a9689eb0106cec964f149bc6e715018f5e36d6705eda02101d721d25dbf40f8021b5d7777960bdad371d26b12d7e9fbdbdd63f5f486c8bb37f159858 WHIRLPOOL d844f304586124a3dfcc708ede1933a347d9a26a8285b341e65fba5647e19f6d2066e4bc5a36d604cfdca24090ecfb99ef8fa3623aa25048987304fe34684b59
+MISC ChangeLog 4590 SHA256 fa1b8950540c5bff5ea5d3318e677653a587971577d01823d79885478125e12d SHA512 3aeb961bbbb626da07cc1a9f77095b782ecf0441c08c0a052b6b3266b1370ff19886392c97396a79a5f9830a718088c2c63e81041a6b86ca8c427db308a228ba WHIRLPOOL 347ed0c5962818f1ddaac904e7e53d530a3094d8229b70f28a3c4a06d98ecedcb68e289c5ae8e9eadabe3d0850f33631821534db784654bf1d532848f97b8207
 MISC ChangeLog-2015 3628 SHA256 9c7c39f5e71e19e1aa493c55b92f262445339731c2b840f342b244b99759862d SHA512 e44ce68f5a0cf02e14ac09b5ac1960446b0eecc84e846fa0f6b45b73f147183588527a2f58d5da1b6300eebab929db1740e35889cc213b28c9f5bedf6b628d86 WHIRLPOOL e8c1a56d0a8882de25903db453ff8d90162a1797b46479ce494b6b97a9c73bba1a692484d4022db4e811f61079b96a5d69369e74ce1cecc01095595711abe538
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
--- a/dev-libs/libusb-compat/ChangeLog
+++ b/dev-libs/libusb-compat/ChangeLog
@ -65,3 +65,12 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  30 Mar 2016; Mike Frysinger <vapier@gentoo.org>
+  libusb-compat-0.1.5-r2.ebuild, libusb-compat-0.1.5-r3.ebuild:
+  toolchain-funcs.eclass: gen_usr_ldscript: integrate multilib_is_native_abi
+  support #479448
+
+  Many ebuilds have started checking multilib_is_native_abi to see if they
+  should call gen_usr_ldscript.  Since that logic always makes sense, add
+  it directly to the gen_usr_ldscript function.
+
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@ -2,6 +2,6 @@ AUX libusb-0.1-ansi.patch 4461 SHA256 c54c0d3866ac9842d6a04618267d97186268305966
 DIST libusb-compat-0.1.5.tar.bz2 276769 SHA256 404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857 WHIRLPOOL 2f84934c28980bee9e8ca69d284303cdbaf4cb72cee02108825bd7366bfff7f6365db5ffee8de024eb85dee571eccc47acea6a25d6835f0fefb0ad8a77d05045
 EBUILD libusb-compat-0.1.5-r2.ebuild 1278 SHA256 8779c350ec477798d0e537aeb92cdd3c2fcd250315da78dac70654021f1986f2 SHA512 2723d426d81d27d178b5469b682be247e2ed6f71f692b97b651e6918b011bfd1db759acf9fa8e609fc6daa0f56edd8657e8382f5a9644abc585347122e9ae36f WHIRLPOOL 08653af5bed061745dd2ee14b22722d0d73881ee94456a599074b85e3c8131e3aac7865932a4f93ca6af1f9ed65cb06059aa305746477ea7719ad44162f7aac9
 EBUILD libusb-compat-0.1.5-r3.ebuild 1341 SHA256 55dc11377db8344ac6ee40f69d7d04fb97ed208b8873367f720bc3324f7c7f8d SHA512 6d128f73f6756bf24be8148d4bacd2fa25f9bd2cd25f8a637b357dc4abf604a3a22bf308130cd39c8ae009f8af1f0ec449d3c0c32791ef6f1491f9bd6dac4e3b WHIRLPOOL 824a32c9e027daca7c8f98c6fd90e6ee2ea642fe0330a8cfc9bf6034e915e0e827d589e64ac66df2ae60eb9db2c5742a177145235d49f257340bb6ea71056efb
-MISC ChangeLog 2553 SHA256 54d5d5ecaea9712ed333d41f345753e1362bc1d975798b175e01d75fea0115e6 SHA512 c442acc782641250a63c869c4c168866cb3eef60137a8dd56443035bcf48234e69ef2a5463600dd045e20ecbd2d4712c8a5ca1047e7ec5373b26c1ed8916134d WHIRLPOOL 6df7e4abaacbf0197bb34fe1134796d92a3d435412451ac726d5caf31faaacae2cdcd8ac7491f73e600482a0690a710618ec053e0f3e731c530c748cb525d4f7
+MISC ChangeLog 2961 SHA256 025535b3053d643799ab25eb729a8fbaa627b9d8f4e3d18e74c1eac6d61454d4 SHA512 8ba0c3f192a8e6cb10d84eda996efec38694e566cf783b3f77980d752dd55a853eb37cfdcafa00d995f6dc858f31c717a34d4aa24f32c581b27ca5978da2e9eb WHIRLPOOL 60fd962c5d62452b8c37fc63db3b6a349e653679933bd17cfa63dc033c4c0f0bfd64236a25af9480f4477141a14042ea032835222f149caf27968410b0aa06d2
 MISC ChangeLog-2015 7841 SHA256 bffb5ef148fe67b2f5c63ff34772eb108fc0ef565b425de26356624b024d17a2 SHA512 de7281c4e97d25aa713931a5802b61d8bd02ea5385d0cf2d38c668b4f42edb2fb718ae33c4a96116da8b712f780d3597c92481c4ab1077d5ec4906f0486ae5df WHIRLPOOL 32e380ecfc41b71ba0f3cd573df1ccf867d4d76918ddd33b53deb8e791fb7970547c39283322887087d68a684576740d1f3de7dce7813ccfa691551710c4e4de
 MISC metadata.xml 552 SHA256 937c13923fbd8f99d697d50ad5c170b5d8b5d88452783b551f266b3342ac20fd SHA512 546ff60c99c3e575534cd660384429b4b4ea8c19fac29ab4ea8e432831f4c69452e08f50b70a038b233c2bd7ccd547e65ad25716d9521c0b5573f1b7d80fc052 WHIRLPOOL 6a1344b29b8a8f23aafd5cd82ebe20a3e968805486abc8d28062ff578bb94bff1f767fad74652525e053ad02b5a7d3da573bffbfa763152ed4e2ebba43b89950
--- a/dev-libs/lzo/ChangeLog
+++ b/dev-libs/lzo/ChangeLog
@ -73,3 +73,12 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  30 Mar 2016; Mike Frysinger <vapier@gentoo.org> lzo-2.08-r1.ebuild,
+  lzo-2.09.ebuild:
+  toolchain-funcs.eclass: gen_usr_ldscript: integrate multilib_is_native_abi
+  support #479448
+
+  Many ebuilds have started checking multilib_is_native_abi to see if they
+  should call gen_usr_ldscript.  Since that logic always makes sense, add
+  it directly to the gen_usr_ldscript function.
+
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@ -3,6 +3,6 @@ DIST lzo-2.09.tar.gz 594855 SHA256 f294a7ced313063c057c504257f437c8335c41bfeed23
 EBUILD lzo-2.08-r1.ebuild 1307 SHA256 b362bef4b498ecef083f07f1192c7da9b89450b6f4f32fdaa7637abaac2adc53 SHA512 512fba99221a7bbd930d3faa838033ab7eadbee08bd5fae5ef61c71dc76ef13ba69b970156e846bdd92d2cfd68ff5a7b4a989e2bbff85017b061c0fba35cfcfe WHIRLPOOL ccfbe5d97193fbe9d0d078a31a9aaed5115844108684a42ebf2e0339b6951688ea5c7d1c05f1297bfa3d6208c804f9a4b8ad014efc9723222bc04c5ad8d7cb81
 EBUILD lzo-2.08.ebuild 1194 SHA256 2ffe069a6a076bbefa365c1de21eb12766d4ec0ace207a65937876c49f90b8b0 SHA512 78b5e8c1628dc920289b52910d09cbe2bd8970f86105ce39685199008c13dbdc33ed28c16bc8e15eeb0c2a332e39ab5e575d56219ec91339629b4dd5796ba738 WHIRLPOOL ba03b73fa715598f8acc70ae525e413ce7de93011f4913fba53f920ce6510243d8430ac79079fe2482cc162bbb8c35467cb4dcc1cab9e4a6f48abef996f4de07
 EBUILD lzo-2.09.ebuild 1307 SHA256 b362bef4b498ecef083f07f1192c7da9b89450b6f4f32fdaa7637abaac2adc53 SHA512 512fba99221a7bbd930d3faa838033ab7eadbee08bd5fae5ef61c71dc76ef13ba69b970156e846bdd92d2cfd68ff5a7b4a989e2bbff85017b061c0fba35cfcfe WHIRLPOOL ccfbe5d97193fbe9d0d078a31a9aaed5115844108684a42ebf2e0339b6951688ea5c7d1c05f1297bfa3d6208c804f9a4b8ad014efc9723222bc04c5ad8d7cb81
-MISC ChangeLog 2773 SHA256 3ba2e89c78e2e72866df27575a0029a68d945aba45a76bf31e9de4c7e817eae1 SHA512 baecdc4c78a09b7ff7cd60fdef1e4e3e18020a87c712e7f7e8abeb6ee210094868a91e34348f222e0c6e326152d60a8d0dca96f45a218a4565ba4bde87cb3c0e WHIRLPOOL 8560e92d3b40cbf0f25e7985a7ec8c19c7a506b8565f4fa609254163777674225e4993850b57a67288e995e1203b2c51e3e7c0d0f2cbdc512a01636a515cd171
+MISC ChangeLog 3156 SHA256 fda5b3a8b28498ec263310ab27c5a0e7f54bdf7216af804d5eb10677223e2566 SHA512 c362dd938b85dc04a87f2c604ed07d0aae61940a601118f3866989c75788988bce1e9b683c69663c6c05530e3caa7394ffad72d34e0cb2af96027e65381d10cb WHIRLPOOL 4335a7771b732991112c17e972650c20357e81341c3f36a8f5001249379ddd8ae29d14d92dd866ec5cead8f3e70c9971a0251c67830bf56e35e4b7a60eaddc36
 MISC ChangeLog-2015 10097 SHA256 b6cf7a85a025a7fa8fd1472684db2a6e8e8e5203218db88749ae7852c966d63e SHA512 8713adbd6e06f1d2ed51ee8350591a603f0b57f742a5f94e518b3e4f1a78f9cdf98b55e213bd7d45471fc2d7405ef01a6f078a41eb2783f2674092fdf99289e1 WHIRLPOOL 53d193223cc480fe64fa061b66942c3042553aef546813144d3af212a03c5ba8a3d40d1ead0b2bbcc8e2b19460c01dcda948a221b1360125bd8532d196258ad6
 MISC metadata.xml 273 SHA256 1c45abfe20013126d0b928f69497156bafd18c064a8d8fbe79b0b1a472a95dcd SHA512 757c1fd1bc8e01d880f4a3f86822964237e481a76c7c56d0b7e43e152b7e562c4876998b1ea78c36dcd20f9b5d677dd42034d854f0acfd9901e08e0197bd3557 WHIRLPOOL 98837e0f147985f57cb1823a6d956f0fcd73e5f44892a9982e41af704c1ba17ce748f402b9beb5f994c3d54a44fdd7ea0bd24fa0a944c31ffb4b5802e02dd9a2
--- a/dev-ml/stringext/Manifest
+++ b/dev-ml/stringext/Manifest
@ -1,6 +1,8 @@
 DIST stringext-1.4.0.tar.gz 49163 SHA256 452caddd80c85aebda74f65615aeba4045ab2496498d844ab110605c97a156a5 SHA512 5c9b64f42b1517c255376a81886b946d852fe5f4b11dee87986eb1eab856e89a79f088d2bbd7d79dfa13cce5e51649a32bfe06242d5afbf7b868085b272173bf WHIRLPOOL 15b2501095f2c6143eac33751b26f9c82e7226125c49b270fe8dff92bd51b97eede8e7865343766fa56fcffa373b591da4f8170afba46d12c413dfec0d1431eb
 DIST stringext-1.4.1.tar.gz 49181 SHA256 abcecd6f8f207804b95ea87222ac263a37d76fb3a3fe0dfd6aaa7343585ef64c SHA512 a5b364e8a7f56c5b91b2114e10fd5c534ef7c2f5737505f52fddeb61de1a90fb75fd6f2cbb1b83934d5dfd020e2be9df81ab8774126a0d8c033c45faa0d17a00 WHIRLPOOL da524dce7541b87276eb12aee8138f5fafd3f282875e7ae464524399c3447470fee92d6ea43a3bf78102a9b5232c32de49cfb8bf9a95f9dff7a04f126662babc
+DIST stringext-1.4.2.tar.gz 49194 SHA256 1f0c108785ab4d80650748779fea38837a80fcf89f2b1ce9ccbbcc300134fdec SHA512 dd35b90d68f156ec6845fbd1c9b2c479874559696ea2a964c2b78a7ded61f128066a4752670b8db3c4dc0bde82fb6bce02733615c4950256c7071ae1c43b4b69 WHIRLPOOL c338647b23d426777c07febbe8494871471ee400cd8cb543f5d18a15c817986bd72a8e9028341e049cd7eb56427e3ca38d82939dbe981c98ec05ea4444c375f3
 EBUILD stringext-1.4.0-r1.ebuild 516 SHA256 7a040e69ea5e4aeb9dd374b32b8407d671b1452430aed6a13031217d0c981be9 SHA512 a05971ca7f1ad10d0b57fa1bd82095263526c8596436cd2968a6016cba670a01e9b282809959cce1dfc0787f8034ceba2894d193971e94f0add73d144efde275 WHIRLPOOL 2b4763fac1d7960b8fb84457b4579e647899959b7662e4b8a58c5130f1417384fe0f385c6072605ca739dfefa136576d742862a653759b43d75c68d3f604d1b7
 EBUILD stringext-1.4.1.ebuild 516 SHA256 7a040e69ea5e4aeb9dd374b32b8407d671b1452430aed6a13031217d0c981be9 SHA512 a05971ca7f1ad10d0b57fa1bd82095263526c8596436cd2968a6016cba670a01e9b282809959cce1dfc0787f8034ceba2894d193971e94f0add73d144efde275 WHIRLPOOL 2b4763fac1d7960b8fb84457b4579e647899959b7662e4b8a58c5130f1417384fe0f385c6072605ca739dfefa136576d742862a653759b43d75c68d3f604d1b7
+EBUILD stringext-1.4.2.ebuild 516 SHA256 7a040e69ea5e4aeb9dd374b32b8407d671b1452430aed6a13031217d0c981be9 SHA512 a05971ca7f1ad10d0b57fa1bd82095263526c8596436cd2968a6016cba670a01e9b282809959cce1dfc0787f8034ceba2894d193971e94f0add73d144efde275 WHIRLPOOL 2b4763fac1d7960b8fb84457b4579e647899959b7662e4b8a58c5130f1417384fe0f385c6072605ca739dfefa136576d742862a653759b43d75c68d3f604d1b7
 MISC ChangeLog 1878 SHA256 0c266f875ba2631ac339f5ca5ed52482ce4d54280b76f480a0a1f9ae5b5fa42f SHA512 260ab1f6e8b383f19ea87d3ec7fb49cc590c414a50c4748e04bdf70ce77da339ae55bcc250e40bd6dd4a2b4e4138ae72ae9875d2490758589cff5fd226af34a3 WHIRLPOOL 5fb9b3ce728804accab70fa16c3a4d34f640df59fc5246148dd415aa390984756ab0dea23ba726e1f03905baebd8abed13118ef7ba9b16e96d3e9aaf07a2cb7c
 MISC metadata.xml 677 SHA256 585b17b34516c6f915e1b21aa614ab9c67970e9f97e91bde91e3639eb75f85ab SHA512 f541f0f09025cf29de7567c1f7b32512b10a241565f5a418fe83ce88f4804091a7b551500ce4cbb762a6dc3ed0efc88e7fd7601570a9070f4cb21eef27295424 WHIRLPOOL 56f41aaf8a228f6bb7ecbb2eaf0e260c4d005b4719ede3345ca01f69d91059e32b3b6af554a4ae1f677174c547ccda20b39f0f639660d3288fbd65dcb4038aca
--- a/dev-ml/stringext/stringext-1.4.2.ebuild
+++ b/dev-ml/stringext/stringext-1.4.2.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Extra string functions for OCaml"
+HOMEPAGE="https://github.com/rgrinberg/stringext"
+SRC_URI="https://github.com/rgrinberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	test? ( dev-ml/qcheck[ounit(-)] )
+	>=dev-lang/ocaml-4:=
+"
+RDEPEND="
+	>=dev-lang/ocaml-4:=
+"
+
+DOCS=( README.md )
--- a/dev-perl/Mouse/ChangeLog
+++ b/dev-perl/Mouse/ChangeLog
@ -81,3 +81,8 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  30 Mar 2016; Andreas K. Hüttel <dilfridge@gentoo.org> -Mouse-2.4.1.ebuild:
+  Remove old
+
+  Package-Manager: portage-2.2.28
+
--- a/dev-perl/Mouse/Manifest
+++ b/dev-perl/Mouse/Manifest
@ -4,6 +4,6 @@ DIST Mouse-0.97.tar.gz 229149 SHA256 dfb1f3abbc46e7646a685efa4e5804c4cf9772eb807
 DIST Mouse-v2.4.5.tar.gz 221446 SHA256 14223cf0864e307e674e39c0b109398d2fb6289d245f273177810b878cbe8db8 SHA512 555b0543a1bfda2b07c53c2f1d1a62dabfc5261dac5f22cfd227d739e52f85c669ca3570a209eff041528e32bb84ad9cc656fe35b212aea7ff6b287bad5937b9 WHIRLPOOL 1613f023b4d68ba945d9ccc1edbc9b1c94326d97de7e3d20de5724779d3bb7d718245096271b827934b6d6dd1e8bb3a0b564d89f6fd65075d61ea8108d9d8dc7
 EBUILD Mouse-0.970.0-r1.ebuild 649 SHA256 f141bd9e0a211300aefff5c48c34ad842c8b709a5f22fe4dea92b276882d9b07 SHA512 25622df8ac5999d7821ed15c2546e40688f47394364d6557ce657985d8df1d7d8d44e8415ac5fe49f1d2d984a1153ff6dfc2d1d0daa3389e66b7af39cbdaf42a WHIRLPOOL b20b4fbe743018371299fedc93708aafbcb849e7cee542b92e9a746f7df40b4e560d8e699b3896da3cd39d88d1a48cfbeafe616b897357135f98e0c31cb18e0d
 EBUILD Mouse-2.4.5.ebuild 718 SHA256 631b822be078fae06194618bf47fd09d607b23c4010d4b7eb9445c6e8ad83961 SHA512 df51c3fe37e0d21b523bc28e7c75fed4e2212d004b79ecff0befc258d4a6432ddda8936ae9b9161fa1f33c8bbde47f4c3722e88b17470e3d4e2c3672d721e2ba WHIRLPOOL 5de4ea758fd85364b572e950f1b16d6a752041d6e62437df1d861ff7e8990c7cbbb57389bca0f66cbda2759493bc9bc11bfedad13bd4a4717f67bab2e4a17862
-MISC ChangeLog 2981 SHA256 e6e024278c7aeb0638689efb7674dc98d5ec00b3083ba989a820b267382322f8 SHA512 37be09588e66767a75a97cce901d4157b1e7e0d2f1d95def26000a25f6d341ebdb75c161613b75c288f928442b7901ab3693e0d03bd18a5de20481e4efdaca51 WHIRLPOOL ede4262a2808670714b7d3a45a19793ccc8101e80565d9f0cb0e764a704d4b07654d26bb07a14d9845f7ccdca9b74b77ff2b86a322687c80c4dd90cc73a72c30
+MISC ChangeLog 3108 SHA256 471705efabf840a45e7e06aa77441cf81a88dc2de7c1a3f7ecd0398e7dbc8a45 SHA512 ee0a2667560859e82cca24ca951193a8fffe56837bb8bfb598c852f4e504234ef3b54cfa07b7e6abe6c0d25ccb209fc9a728a5a8666687f4c51aa02878bdf186 WHIRLPOOL b1008057352a468306f78ac9332038c2725cf1f71e23fede84be49f8e0127a2b58767841a6af146d5100351cd808b479f60973d095eb766fdcbf0d0f00a32b19
 MISC ChangeLog-2015 6544 SHA256 b71f3f7dfa3300be5464b653c0666e292644ef1e1d26ca83fd3616e853d1abc6 SHA512 254763c71950b6795631974f9b183186e1da5a60b02fcb50dcd99f363431616fe71253f960fbe6a6a465ed9a22cde886a99d81652aac89a5f1614ef06506bb9e WHIRLPOOL 9284116ef5ee9118237eb9fee748831491703fc81f84fb3dbfc7f4ec87f84fd2b32a3f9cd88bbe9b64c1d9cc0b13318e60a58a10e9b3921af0568a61dcdc60c0
 MISC metadata.xml 2204 SHA256 b2dabced7f4430b519e8ac8d0b5d4b242f7378b717b6186257d82cf794602bed SHA512 21958c7728fede69b40beeafb8b21ee8491fee440ee3a66a147418995f18fb15edecde6eefe8ff86f316478a7b1b81ab544bd599ed34375a61ca68e753ee4805 WHIRLPOOL ec75f3dd421bff723db175dbb85acbdb92c9a752a11a2b963ffa719f3be2ee47c3bac90fc2f8574bd59dc8cdc5a380cd80aadce8c6d5b95032dd474f50387406
--- a/dev-perl/Net-Amazon-S3/ChangeLog
+++ b/dev-perl/Net-Amazon-S3/ChangeLog
@ -72,3 +72,9 @@
  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
  Set appropriate maintainer types in metadata.xml (GLEP 67)

+  30 Mar 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  -Net-Amazon-S3-0.590.0.ebuild:
+  Remove old
+
+  Package-Manager: portage-2.2.28
+
--- a/Show more
+++ b/Show more