diff --git a/app-admin/puppetserver/puppetserver-2.7.1.ebuild b/app-admin/puppetserver/puppetserver-2.7.1.ebuild
index 3e64b1e0ab4d..f8fd587639ac 100644
--- a/app-admin/puppetserver/puppetserver-2.7.1.ebuild
+++ b/app-admin/puppetserver/puppetserver-2.7.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="puppetdb"
# will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND+="
>=virtual/jdk-1.7.0
diff --git a/app-doc/root-docs/root-docs-5.34.26.ebuild b/app-doc/root-docs/root-docs-5.34.26.ebuild
index f3f95f20e5a3..17ddb7d8268f 100644
--- a/app-doc/root-docs/root-docs-5.34.26.ebuild
+++ b/app-doc/root-docs/root-docs-5.34.26.ebuild
@@ -42,6 +42,7 @@ VIRTUALX_REQUIRED="api"
DEPEND="
app-text/pandoc
dev-haskell/pandoc-citeproc[bibutils]
+ dev-texlive/texlive-fontsrecommended
dev-texlive/texlive-latex
virtual/pkgconfig
api? (
diff --git a/app-doc/root-docs/root-docs-5.34.36.ebuild b/app-doc/root-docs/root-docs-5.34.36.ebuild
index a3d056ba4cb8..76844ce5a961 100644
--- a/app-doc/root-docs/root-docs-5.34.36.ebuild
+++ b/app-doc/root-docs/root-docs-5.34.36.ebuild
@@ -42,6 +42,7 @@ VIRTUALX_REQUIRED="api"
DEPEND="
app-text/pandoc
dev-haskell/pandoc-citeproc[bibutils]
+ dev-texlive/texlive-fontsrecommended
dev-texlive/texlive-latex
virtual/pkgconfig
api? (
diff --git a/app-doc/single-unix-specification/Manifest b/app-doc/single-unix-specification/Manifest
index 1c7a9e9438b8..d6c826c493fe 100644
--- a/app-doc/single-unix-specification/Manifest
+++ b/app-doc/single-unix-specification/Manifest
@@ -1,3 +1,4 @@
DIST susv3.tar.bz2 2212995 SHA256 f7760775114833d79869f08e97a001e61609710417e64c4be4e2e784616658a1 SHA512 b1b8a79112d3f41a3d2951341cd9220566f551e5750378bba5cf786a0c381b064fa1a1cfeb6e76e9c6beb85a893cbb6f90879203e9931e9043bcb95b032def40 WHIRLPOOL 00173ff6a59e7b215f73b12a2c62b55f8655ce1564084323d8882870df050a6faa748ca7b874ee0957a9aced79c6c20f25e1627fb7b353c963a068cf84191315
DIST susv4.tar.bz2 2983431 SHA256 315657e697618f759c1e43934c08e5887b29dc7f1f75dd2aa49738efd7ac10bb SHA512 7fd005c25b97d6fd864436c6537f347edfa4ab215114296f2d2ba58aee1552502601b778dec7eb0e8baeea417929cfd72b3b9727237106125326e32a424cf575 WHIRLPOOL b57143d06c19c74996aa59b0da305e6ef0088a2237226777551c982e7f48091878a50476393fb4330e1f51f5a6ef55229940497e70f3a50acdf2efeee2a24803
DIST susv4tc1.tgz 5435884 SHA256 49c411571d0dd55d36258dea945385590f5ccb63d9d5b38050a283a41c0bcefa SHA512 7e9741bc6377beda88ade34bd965ee0098953ec6fb5ae67aaafa726a94fe570ac6fadf1675420805f176222c0d9177bc2206584cad8b73a02649d47765312d9f WHIRLPOOL 1edb2ff726b43f108209ef51bb21d88374d81486f8b4aaf50ec71cebf405ddfa53f9e55039f513ef91652f7a664868504453c2c27731d1d97b61b97867d204a0
+DIST susv4tc2.tar.bz2 3649434 SHA256 9b50e290912dff356687b7585ea2d7a7e746231e1dd4adcb20833fa54e1f4d35 SHA512 cc86b2b4860b1069cb8712ef7b5a9702510f48d6585b5414ff561f85677974c156d8cc95cf29dfdab360c13ecb884e19e2112fe5c6bc49666417c9a744a816ad WHIRLPOOL 002ad7ebb50b041d337ff135ce6f361b9ccca89d0a31687e4b169153f15268dd80c3b6d7efb0be741bda496ea61ab46e8c83c8f0631c7beffe14750cab7659ea
diff --git a/app-doc/single-unix-specification/single-unix-specification-4-r2.ebuild b/app-doc/single-unix-specification/single-unix-specification-4_p1.ebuild
similarity index 100%
rename from app-doc/single-unix-specification/single-unix-specification-4-r2.ebuild
rename to app-doc/single-unix-specification/single-unix-specification-4_p1.ebuild
diff --git a/app-doc/single-unix-specification/single-unix-specification-4_p2.ebuild b/app-doc/single-unix-specification/single-unix-specification-4_p2.ebuild
new file mode 100644
index 000000000000..5e6174c8e645
--- /dev/null
+++ b/app-doc/single-unix-specification/single-unix-specification-4_p2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="The Single UNIX Specification, Version 4, 2016 Edition"
+HOMEPAGE="https://www2.opengroup.org/ogsys/catalog/T101"
+SRC_URI="http://pubs.opengroup.org/onlinepubs/9699919799/download/susv4tc2.tar.bz2"
+
+LICENSE="sus4-copyright"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/susv4tc2"
+
+src_install() {
+ dodoc -r *
+}
diff --git a/app-misc/tmux/tmux-2.1.ebuild b/app-misc/tmux/tmux-2.1.ebuild
index 8b5246e94b06..8694d7bfdd90 100644
--- a/app-misc/tmux/tmux-2.1.ebuild
+++ b/app-misc/tmux/tmux-2.1.ebuild
@@ -28,6 +28,7 @@ CDEPEND="
DEPEND="${CDEPEND}
virtual/pkgconfig"
RDEPEND="${CDEPEND}
+ dev-libs/libevent:=
selinux? ( sec-policy/selinux-screen )
vim-syntax? (
|| (
diff --git a/app-misc/tmux/tmux-2.2.ebuild b/app-misc/tmux/tmux-2.2.ebuild
index 67a3f24a6b04..293af87efd57 100644
--- a/app-misc/tmux/tmux-2.2.ebuild
+++ b/app-misc/tmux/tmux-2.2.ebuild
@@ -28,6 +28,7 @@ CDEPEND="
DEPEND="${CDEPEND}
virtual/pkgconfig"
RDEPEND="${CDEPEND}
+ dev-libs/libevent:=
selinux? ( sec-policy/selinux-screen )
vim-syntax? (
|| (
diff --git a/app-misc/tmux/tmux-2.3.ebuild b/app-misc/tmux/tmux-2.3.ebuild
index 5fdd74109cf7..e42524ce84b8 100644
--- a/app-misc/tmux/tmux-2.3.ebuild
+++ b/app-misc/tmux/tmux-2.3.ebuild
@@ -28,6 +28,7 @@ CDEPEND="
DEPEND="${CDEPEND}
virtual/pkgconfig"
RDEPEND="${CDEPEND}
+ dev-libs/libevent:=
selinux? ( sec-policy/selinux-screen )
vim-syntax? (
|| (
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 520cae0e6b77..f402fd464fb3 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -27,6 +27,7 @@ CDEPEND="
DEPEND="${CDEPEND}
virtual/pkgconfig"
RDEPEND="${CDEPEND}
+ dev-libs/libevent:=
selinux? ( sec-policy/selinux-screen )
vim-syntax? (
|| (
diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch
new file mode 100644
index 000000000000..0124003bc1fc
--- /dev/null
+++ b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch
@@ -0,0 +1,337 @@
+--- uuid/php/uuid.c 2016-12-18 01:23:26.000000000 -0500
++++ uuid/php/uuid.c 2016-12-18 01:23:43.564329483 -0500
+@@ -41,7 +41,13 @@
+ } ctx_t;
+
+ /* context implicit destruction */
++#if PHP_VERSION_ID >= 70000
++static void ctx_destructor(zend_resource *rsrc)
++#else
++typedef long zend_long;
++
+ static void ctx_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
++#endif
+ {
+ ctx_t *ctx = (ctx_t *)rsrc->ptr;
+
+@@ -120,16 +126,23 @@
+ zval *z_ctx;
+ ctx_t *ctx;
+ uuid_rc_t rc;
++#if PHP_VERSION_ID >= 70000
++ char *param_types = "z/";
++#else
++ char *param_types = "z";
++#endif
+
+ /* parse parameters */
+- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &z_ctx) == FAILURE)
++ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx) == FAILURE)
+ RETURN_LONG((long)UUID_RC_ARG);
+
+ /* post-process and sanity check parameters */
++#if PHP_VERSION_ID < 70000
+ if (!PZVAL_IS_REF(z_ctx)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_create: parameter wasn't passed by reference");
+ RETURN_LONG((long)UUID_RC_ARG);
+ }
++#endif
+
+ /* perform operation */
+ if ((ctx = (ctx_t *)malloc(sizeof(ctx_t))) == NULL)
+@@ -138,7 +151,12 @@
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_create: %s", uuid_error(rc));
+ RETURN_LONG((long)rc);
+ }
++#if PHP_VERSION_ID >= 70000
++ zval_dtor(z_ctx);
++ ZVAL_RES(z_ctx, zend_register_resource(ctx, ctx_id));
++#else
+ ZEND_REGISTER_RESOURCE(z_ctx, ctx, ctx_id);
++#endif
+
+ RETURN_LONG((long)rc);
+ }
+@@ -158,7 +177,11 @@
+ RETURN_LONG((long)UUID_RC_ARG);
+
+ /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+ ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+ if (ctx == NULL || ctx->uuid == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_destroy: invalid context");
+ RETURN_LONG((long)UUID_RC_ARG);
+@@ -185,21 +208,32 @@
+ zval *z_clone;
+ ctx_t *clone;
+ uuid_rc_t rc;
++#if PHP_VERSION_ID >= 70000
++ char *param_types = "rz/";
++#else
++ char *param_types = "rz";
++#endif
+
+ /* parse parameters */
+- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &z_ctx, &z_clone) == FAILURE)
++ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_clone) == FAILURE)
+ RETURN_LONG((long)UUID_RC_ARG);
+
+ /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+ ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+ if (ctx == NULL || ctx->uuid == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: invalid context");
+ RETURN_LONG((long)UUID_RC_ARG);
+ }
++#if PHP_VERSION_ID < 70000
+ if (!PZVAL_IS_REF(z_clone)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: clone parameter wasn't passed by reference");
+ RETURN_LONG((long)UUID_RC_ARG);
+ }
++#endif
+
+ /* perform operation */
+ if ((clone = (ctx_t *)malloc(sizeof(ctx_t))) == NULL)
+@@ -208,7 +243,12 @@
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: %s", uuid_error(rc));
+ RETURN_LONG((long)rc);
+ }
++#if PHP_VERSION_ID >= 70000
++ zval_dtor(z_clone);
++ ZVAL_RES(z_clone, zend_register_resource(clone, ctx_id));
++#else
+ ZEND_REGISTER_RESOURCE(z_clone, clone, ctx_id);
++#endif
+
+ RETURN_LONG((long)rc);
+ }
+@@ -230,7 +271,11 @@
+ RETURN_LONG((long)UUID_RC_ARG);
+
+ /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+ ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+ if (ctx == NULL || ctx->uuid == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_load: invalid context");
+ RETURN_LONG((long)UUID_RC_ARG);
+@@ -254,7 +299,7 @@
+ zval *z_ctx;
+ ctx_t *ctx;
+ uuid_rc_t rc;
+- long z_mode;
++ zend_long z_mode;
+ unsigned long mode;
+ zval *z_ctx_ns;
+ ctx_t *ctx_ns;
+@@ -266,7 +311,11 @@
+ RETURN_LONG((long)UUID_RC_ARG);
+
+ /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+ ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+ if (ctx == NULL || ctx->uuid == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_make: invalid context");
+ RETURN_LONG((long)UUID_RC_ARG);
+@@ -281,7 +330,11 @@
+ }
+ }
+ else if (ZEND_NUM_ARGS() == 4 && ((mode & UUID_MAKE_V3) || (mode & UUID_MAKE_V5))) {
++#if PHP_VERSION_ID >= 70000
++ ctx_ns = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx_ns), ctx_name, ctx_id);
++#else
+ ZEND_FETCH_RESOURCE(ctx_ns, ctx_t *, &z_ctx_ns, -1, ctx_name, ctx_id);
++#endif
+ if (ctx_ns == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_make: invalid namespace context");
+ RETURN_LONG((long)UUID_RC_ARG);
+@@ -314,21 +367,33 @@
+ uuid_rc_t rc;
+ zval *z_result;
+ int result;
++#if PHP_VERSION_ID >= 70000
++ char *param_types = "rz/";
++#else
++ char *param_types = "rz";
++#endif
+
+ /* parse parameters */
+- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &z_ctx, &z_result) == FAILURE)
++ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_result) == FAILURE)
+ RETURN_LONG((long)UUID_RC_ARG);
+
+ /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++ zval_dtor(z_result);
++ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+ ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+ if (ctx == NULL || ctx->uuid == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_isnil: invalid context");
+ RETURN_LONG((long)UUID_RC_ARG);
+ }
++#if PHP_VERSION_ID < 70000
+ if (!PZVAL_IS_REF(z_result)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_isnil: result parameter wasn't passed by reference");
+ RETURN_LONG((long)UUID_RC_ARG);
+ }
++#endif
+
+ /* perform operation */
+ if ((rc = uuid_isnil(ctx->uuid, &result)) != UUID_RC_OK) {
+@@ -353,26 +418,42 @@
+ uuid_rc_t rc;
+ zval *z_result;
+ int result;
++#if PHP_VERSION_ID >= 70000
++ char *param_types = "rrz/";
++#else
++ char *param_types = "rrz";
++#endif
+
+ /* parse parameters */
+- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrz", &z_ctx, &z_ctx2, &z_result) == FAILURE)
++ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_ctx2, &z_result) == FAILURE)
+ RETURN_LONG((long)UUID_RC_ARG);
+
+ /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++ zval_dtor(z_result);
++ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+ ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+ if (ctx == NULL || ctx->uuid == NULL) {
+- php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context");
++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context from first parameter");
+ RETURN_LONG((long)UUID_RC_ARG);
+ }
++#if PHP_VERSION_ID >= 70000
++ ctx2 = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx2), ctx_name, ctx_id);
++#else
+ ZEND_FETCH_RESOURCE(ctx2, ctx_t *, &z_ctx2, -1, ctx_name, ctx_id);
++#endif
+- if (ctx2 == NULL || ctx2->uuid) {
+- php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context");
++ if (ctx2 == NULL || ctx2->uuid == NULL) {
++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context from second parameter");
+ RETURN_LONG((long)UUID_RC_ARG);
+ }
++#if PHP_VERSION_ID < 70000
+ if (!PZVAL_IS_REF(z_result)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: result parameter wasn't passed by reference");
+ RETURN_LONG((long)UUID_RC_ARG);
+ }
++#endif
+
+ /* perform operation */
+ if ((rc = uuid_compare(ctx->uuid, ctx2->uuid, &result)) != UUID_RC_OK) {
+@@ -392,7 +473,7 @@
+ {
+ zval *z_ctx;
+ ctx_t *ctx;
+- long z_fmt;
++ zend_long z_fmt;
+ unsigned long fmt;
+ zval *z_data;
+ uuid_rc_t rc;
+@@ -404,7 +485,11 @@
+ RETURN_LONG((long)UUID_RC_ARG);
+
+ /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+ ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+ if (ctx == NULL || ctx->uuid == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_import: invalid context");
+ RETURN_LONG((long)UUID_RC_ARG);
+@@ -428,28 +513,40 @@
+ {
+ zval *z_ctx;
+ ctx_t *ctx;
+- long z_fmt;
++ zend_long z_fmt;
+ unsigned long fmt;
+ zval *z_data;
+ uuid_rc_t rc;
+ void *data_ptr;
+ size_t data_len;
++#if PHP_VERSION_ID >= 70000
++ char *param_types = "rlz/";
++#else
++ char *param_types = "rlz";
++#endif
+
+ /* parse parameters */
+- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &z_ctx, &z_fmt, &z_data) == FAILURE)
++ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_fmt, &z_data) == FAILURE)
+ RETURN_LONG((long)UUID_RC_ARG);
+
+ /* post-process and sanity check parameters */
++#if PHP_VERSION_ID >= 70000
++ zval_dtor(z_data);
++ ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
++#else
+ ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
++#endif
+ if (ctx == NULL || ctx->uuid == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_export: invalid context");
+ RETURN_LONG((long)UUID_RC_ARG);
+ }
+ fmt = (unsigned long)z_fmt;
++#if PHP_VERSION_ID < 70000
+ if (!PZVAL_IS_REF(z_data)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_export: data parameter wasn't passed by reference");
+ RETURN_LONG((long)UUID_RC_ARG);
+ }
++#endif
+
+ /* perform operation */
+ data_ptr = NULL;
+@@ -462,7 +559,11 @@
+ data_len = strlen((char *)data_ptr);
+ else if (fmt == UUID_FMT_STR || fmt == UUID_FMT_TXT)
+ data_len--; /* PHP doesn't wish NUL-termination on strings */
++#if PHP_VERSION_ID >= 70000
++ ZVAL_STRINGL(z_data, data_ptr, data_len);
++#else
+ ZVAL_STRINGL(z_data, data_ptr, data_len, 1);
++#endif
+ free(data_ptr);
+
+ RETURN_LONG((long)rc);
+@@ -474,7 +575,7 @@
+ return error string corresponding to error return code */
+ ZEND_FUNCTION(uuid_error)
+ {
+- int z_rc;
++ zend_long z_rc;
+ uuid_rc_t rc;
+ char *error;
+
+@@ -483,7 +584,11 @@
+ rc = (uuid_rc_t)z_rc;
+ if ((error = uuid_error(rc)) == NULL)
+ RETURN_NULL();
++#if PHP_VERSION_ID >= 70000
++ RETURN_STRING(error);
++#else
+ RETURN_STRING(error, 1);
++#endif
+ }
+
+ /* API FUNCTION:
diff --git a/dev-libs/ossp-uuid/files/uuid-1.6.2-php54.patch b/dev-libs/ossp-uuid/files/uuid-1.6.2-php54.patch
new file mode 100644
index 000000000000..c00f560f1fd8
--- /dev/null
+++ b/dev-libs/ossp-uuid/files/uuid-1.6.2-php54.patch
@@ -0,0 +1,226 @@
+diff -up uuid-1.6.2/php/uuid.c.php54 uuid-1.6.2/php/uuid.c
+--- uuid-1.6.2/php/uuid.c 2007-01-01 19:35:57.000000000 +0100
++++ uuid-1.6.2/php/uuid.c 2012-11-06 16:05:03.354913764 +0100
+@@ -60,7 +60,7 @@ static int ctx_id; /* inte
+ #define ctx_name "UUID context" /* external name */
+
+ /* module initialization */
+-PHP_MINIT_FUNCTION(uuid)
++ZEND_MINIT_FUNCTION(uuid)
+ {
+ /* register resource identifier */
+ ctx_id = zend_register_list_destructors_ex(
+@@ -91,13 +91,13 @@ PHP_MINIT_FUNCTION(uuid)
+ }
+
+ /* module shutdown */
+-PHP_MSHUTDOWN_FUNCTION(uuid)
++ZEND_MSHUTDOWN_FUNCTION(uuid)
+ {
+ return SUCCESS;
+ }
+
+ /* module information */
+-PHP_MINFO_FUNCTION(uuid)
++ZEND_MINFO_FUNCTION(uuid)
+ {
+ char version[32];
+
+@@ -115,7 +115,7 @@ PHP_MINFO_FUNCTION(uuid)
+ proto rc uuid_create(ctx)
+ $rc = uuid_create(&$uuid);
+ create UUID context */
+-PHP_FUNCTION(uuid_create)
++ZEND_FUNCTION(uuid_create)
+ {
+ zval *z_ctx;
+ ctx_t *ctx;
+@@ -147,7 +147,7 @@ PHP_FUNCTION(uuid_create)
+ proto rc uuid_destroy(ctx)
+ $rc = uuid_destroy($uuid);
+ destroy UUID context */
+-PHP_FUNCTION(uuid_destroy)
++ZEND_FUNCTION(uuid_destroy)
+ {
+ zval *z_ctx;
+ ctx_t *ctx;
+@@ -178,7 +178,7 @@ PHP_FUNCTION(uuid_destroy)
+ proto rc uuid_clone(ctx, &ctx2)
+ $rc = uuid_clone($uuid, &$uuid);
+ clone UUID context */
+-PHP_FUNCTION(uuid_clone)
++ZEND_FUNCTION(uuid_clone)
+ {
+ zval *z_ctx;
+ ctx_t *ctx;
+@@ -217,7 +217,7 @@ PHP_FUNCTION(uuid_clone)
+ proto rc uuid_load(ctx, name)
+ $rc = uuid_name($uuid, $name);
+ load an existing UUID */
+-PHP_FUNCTION(uuid_load)
++ZEND_FUNCTION(uuid_load)
+ {
+ zval *z_ctx;
+ ctx_t *ctx;
+@@ -249,7 +249,7 @@ PHP_FUNCTION(uuid_load)
+ proto rc uuid_make(ctx, mode[, ..., ...])
+ $rc = uuid_make($uuid, $mode[, ..., ...]);
+ make a new UUID */
+-PHP_FUNCTION(uuid_make)
++ZEND_FUNCTION(uuid_make)
+ {
+ zval *z_ctx;
+ ctx_t *ctx;
+@@ -307,7 +307,7 @@ PHP_FUNCTION(uuid_make)
+ proto rc uuid_isnil(ctx, result)
+ $rc = uuid_isnil($uuid, &$result);
+ compare UUID for being Nil UUID */
+-PHP_FUNCTION(uuid_isnil)
++ZEND_FUNCTION(uuid_isnil)
+ {
+ zval *z_ctx;
+ ctx_t *ctx;
+@@ -344,7 +344,7 @@ PHP_FUNCTION(uuid_isnil)
+ proto rc uuid_compare(ctx, ctx2, result)
+ $rc = uuid_compare($uuid, $uuid2, &$result);
+ compare two UUIDs */
+-PHP_FUNCTION(uuid_compare)
++ZEND_FUNCTION(uuid_compare)
+ {
+ zval *z_ctx;
+ ctx_t *ctx;
+@@ -388,7 +388,7 @@ PHP_FUNCTION(uuid_compare)
+ proto rc uuid_import(ctx, fmt, data)
+ $rc = uuid_import($ctx, $fmt, $data);
+ import UUID from variable */
+-PHP_FUNCTION(uuid_import)
++ZEND_FUNCTION(uuid_import)
+ {
+ zval *z_ctx;
+ ctx_t *ctx;
+@@ -424,7 +424,7 @@ PHP_FUNCTION(uuid_import)
+ proto rc uuid_export(ctx, fmt, data)
+ $rc = uuid_error($ctx, $fmt, &$data);
+ export UUID into variable */
+-PHP_FUNCTION(uuid_export)
++ZEND_FUNCTION(uuid_export)
+ {
+ zval *z_ctx;
+ ctx_t *ctx;
+@@ -472,7 +472,7 @@ PHP_FUNCTION(uuid_export)
+ proto rc uuid_error(ctx)
+ $error = uuid_error($rc);
+ return error string corresponding to error return code */
+-PHP_FUNCTION(uuid_error)
++ZEND_FUNCTION(uuid_error)
+ {
+ int z_rc;
+ uuid_rc_t rc;
+@@ -490,24 +490,79 @@ PHP_FUNCTION(uuid_error)
+ proto int uuid_version()
+ $version = uuid_version();
+ return library version number */
+-PHP_FUNCTION(uuid_version)
++ZEND_FUNCTION(uuid_version)
+ {
+ RETURN_LONG((long)uuid_version());
+ }
+
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_create, 0)
++ ZEND_ARG_INFO(1, ctx)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_destroy, 0)
++ ZEND_ARG_INFO(0, ctx)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_clone, 0)
++ ZEND_ARG_INFO(0, ctx)
++ ZEND_ARG_INFO(1, ctx2)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_load, 0)
++ ZEND_ARG_INFO(0, ctx)
++ ZEND_ARG_INFO(0, name)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_uuid_make, 0, 0, 2)
++ ZEND_ARG_INFO(0, ctx)
++ ZEND_ARG_INFO(0, mode)
++ ZEND_ARG_INFO(0, ctxns)
++ ZEND_ARG_INFO(0, url)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_isnil, 0)
++ ZEND_ARG_INFO(0, ctx)
++ ZEND_ARG_INFO(1, result)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_compare, 0)
++ ZEND_ARG_INFO(0, ctx)
++ ZEND_ARG_INFO(0, ctx2)
++ ZEND_ARG_INFO(1, result)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_import, 0)
++ ZEND_ARG_INFO(0, ctx)
++ ZEND_ARG_INFO(0, fmt)
++ ZEND_ARG_INFO(0, data)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_export, 0)
++ ZEND_ARG_INFO(0, ctx)
++ ZEND_ARG_INFO(0, fmt)
++ ZEND_ARG_INFO(1, data)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_error, 0)
++ ZEND_ARG_INFO(0, ctx)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_uuid_version, 0)
++ZEND_END_ARG_INFO()
++
+ /* module function table */
+-static function_entry uuid_functions[] = {
+- PHP_FE(uuid_create, NULL)
+- PHP_FE(uuid_destroy, NULL)
+- PHP_FE(uuid_clone, NULL)
+- PHP_FE(uuid_load, NULL)
+- PHP_FE(uuid_make, NULL)
+- PHP_FE(uuid_isnil, NULL)
+- PHP_FE(uuid_compare, NULL)
+- PHP_FE(uuid_import, NULL)
+- PHP_FE(uuid_export, NULL)
+- PHP_FE(uuid_error, NULL)
+- PHP_FE(uuid_version, NULL)
++static zend_function_entry uuid_functions[] = {
++ ZEND_FE(uuid_create, arginfo_uuid_create)
++ ZEND_FE(uuid_destroy, NULL)
++ ZEND_FE(uuid_clone, arginfo_uuid_clone)
++ ZEND_FE(uuid_load, NULL)
++ ZEND_FE(uuid_make, NULL)
++ ZEND_FE(uuid_isnil, arginfo_uuid_isnil)
++ ZEND_FE(uuid_compare, arginfo_uuid_compare)
++ ZEND_FE(uuid_import, NULL)
++ ZEND_FE(uuid_export, arginfo_uuid_export)
++ ZEND_FE(uuid_error, NULL)
++ ZEND_FE(uuid_version, NULL)
+ { NULL, NULL, NULL }
+ };
+
+@@ -516,11 +571,11 @@ zend_module_entry uuid_module_entry = {
+ STANDARD_MODULE_HEADER,
+ "uuid",
+ uuid_functions,
+- PHP_MINIT(uuid),
+- PHP_MSHUTDOWN(uuid),
++ ZEND_MINIT(uuid),
++ ZEND_MSHUTDOWN(uuid),
+ NULL,
+ NULL,
+- PHP_MINFO(uuid),
++ ZEND_MINFO(uuid),
+ NO_VERSION_YET,
+ STANDARD_MODULE_PROPERTIES
+ };
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
new file mode 100644
index 000000000000..3435a7860440
--- /dev/null
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+MY_P="uuid-${PV}"
+
+PHP_EXT_NAME="uuid"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_S="${WORKDIR}/${MY_P}/php"
+PHP_EXT_OPTIONAL_USE="php"
+USE_PHP="php5-6 php7-0 php7-1"
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit perl-module php-ext-source-r3
+
+DESCRIPTION="An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID"
+HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"
+SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+IUSE="+cxx perl php static-libs"
+
+DEPEND="perl? ( dev-lang/perl:= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+
+ eapply \
+ "${FILESDIR}/${P}-gentoo-r1.patch" \
+ "${FILESDIR}/${P}-gentoo-perl.patch" \
+ "${FILESDIR}/${P}-hwaddr.patch" \
+ "${FILESDIR}/${P}-manfix.patch" \
+ "${FILESDIR}/${P}-uuid-preserve-m-option-status-in-v-option-handling.patch" \
+ "${FILESDIR}/${P}-fix-whatis-entries.patch" \
+ "${FILESDIR}/${P}-fix-data-uuid-from-string.patch"
+
+ if use php; then
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env ${slot}
+ eapply -p2 \
+ "${FILESDIR}/${P}-gentoo-php.patch" \
+ "${FILESDIR}/uuid-${PV}-php54.patch" \
+ "${FILESDIR}/${P}-php70.patch"
+ done
+
+ php-ext-source-r3_src_prepare
+ fi
+ #Remove call by reference which is error
+ sed -i -e 's/\&\$/\$/' -e '/?>/d' "${S}/php/uuid.php5" || die
+}
+
+src_configure() {
+ # Notes:
+ # * collides with e2fstools libs and includes if not moved around
+ # * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3
+ econf \
+ --includedir="${EPREFIX}"/usr/include/ossp \
+ --with-dce \
+ --without-pgsql \
+ --without-perl \
+ --without-php \
+ $(use_with cxx) \
+ $(use_enable static-libs static)
+
+ if use php; then
+ php-ext-source-r3_src_configure
+ fi
+}
+
+src_compile() {
+ default
+
+ if use perl; then
+ cd perl
+ # configure needs the ossp-uuid.la generated by `make` in $S
+ perl-module_src_configure
+ perl-module_src_compile
+ fi
+
+ if use php; then
+ php-ext-source-r3_src_compile
+ fi
+}
+
+src_install() {
+ local DOCS=( AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS )
+ default
+ unset DOCS #unset so that other eclasses don't try to install them and possibly fail
+ if use perl ; then
+ cd perl
+ perl-module_src_install
+ fi
+
+ if use php ; then
+ php-ext-source-r3_src_install
+ insinto /usr/share/php
+ cd "${S}/php" || die
+ newins uuid.php5 uuid.php
+ fi
+
+ use static-libs || rm -rf "${ED}"/usr/lib*/*.la
+
+ mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc
+ mv "${ED}/usr/share/man/man3"/uuid.3{,ossp}
+ mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp}
+}
+
+src_test() {
+ export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library
+ default
+
+ use perl && emake -C perl test
+}
diff --git a/dev-php/ca-bundle/Manifest b/dev-php/ca-bundle/Manifest
new file mode 100644
index 000000000000..a15ae754520b
--- /dev/null
+++ b/dev-php/ca-bundle/Manifest
@@ -0,0 +1 @@
+DIST ca-bundle-1.0.0.tar.gz 151219 SHA256 8686dea9feeb444a5c9977e0654fc03a22b34061c05d2ae180e491ed33b6b7e5 SHA512 f83fc24caddd9b1cf7fd1d22def51372fd6d1497f39a335d0507122ab960e438e9ffadafd357d3dc742cc5e052ac197de0dd670921b076277df98bcbc2c71f42 WHIRLPOOL 30404789aa177a78773cefc0e830743b8c5963d0926b2feec205e7ba462ced0e37251a1ca10f0edbd3ad9176b6a6266b722eba7dec90c9c6d0bd62c938a3904e
diff --git a/dev-php/ca-bundle/ca-bundle-1.0.0.ebuild b/dev-php/ca-bundle/ca-bundle-1.0.0.ebuild
new file mode 100644
index 000000000000..931a3856dec9
--- /dev/null
+++ b/dev-php/ca-bundle/ca-bundle-1.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Find the system CA bundle or fall back to the Mozilla one"
+HOMEPAGE="https://github.com/composer/ca-bundle"
+SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+
+src_install() {
+ insinto "/usr/share/php/Composer/CaBundle"
+ doins -r src/. "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/ca-bundle/files/autoload.php b/dev-php/ca-bundle/files/autoload.php
new file mode 100644
index 000000000000..993360676f74
--- /dev/null
+++ b/dev-php/ca-bundle/files/autoload.php
@@ -0,0 +1,8 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ Small utility library that lets you find a path to the system CA bundle,
+ and includes a fallback to the Mozilla CA bundle.
+ Originally written as part of dev-php/composer,
+ now extracted and made available as a stand-alone library.
+
+
+ composer/ca-bundle
+
+
diff --git a/dev-php/cli-prompt/Manifest b/dev-php/cli-prompt/Manifest
new file mode 100644
index 000000000000..4d50afb10918
--- /dev/null
+++ b/dev-php/cli-prompt/Manifest
@@ -0,0 +1 @@
+DIST cli-prompt-1.0.0.tar.gz 7538 SHA256 909e3a271e825d106d213700584e72333c93b8517f025079ec53717c2cc25db8 SHA512 5a1f6f999976f3b01d857890b5a06cfed377597397266b44d4aba324bedc2b9f73db5dc184ab40ee6632b43c80da99f5641366903bbc7bb7e18409cb367c8461 WHIRLPOOL aec289254cb73774aeb5ca799295c98ef82bcb8c6a67999ef0102421443bac485f66e1e517241b3df1015d1a886f96b4a8a107cd0d99698c6ebb2bc8e8cd0106
diff --git a/dev-php/cli-prompt/cli-prompt-1.0.0.ebuild b/dev-php/cli-prompt/cli-prompt-1.0.0.ebuild
new file mode 100644
index 000000000000..5ac52f1cbac6
--- /dev/null
+++ b/dev-php/cli-prompt/cli-prompt-1.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Allows you to prompt for user input on the command line"
+HOMEPAGE="https://github.com/Seldaek/cli-prompt"
+SRC_URI="https://github.com/Seldaek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+
+src_install() {
+ insinto "/usr/share/php/Seld/CliPrompt"
+ doins -r src/. "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/cli-prompt/files/autoload.php b/dev-php/cli-prompt/files/autoload.php
new file mode 100644
index 000000000000..7a1acbd38c9f
--- /dev/null
+++ b/dev-php/cli-prompt/files/autoload.php
@@ -0,0 +1,8 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ Allows you to prompt for user input on the command line,
+ and optionally hide the characters they type.
+
+
+ Seldaek/cli-prompt
+
+
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
new file mode 100644
index 000000000000..0181326fd69d
--- /dev/null
+++ b/dev-php/composer/Manifest
@@ -0,0 +1 @@
+DIST composer-1.2.2.tar.gz 1070446 SHA256 c51b4fb71a0d23e26c5be048743459eefca7c9da22a47f757a433cbb33553bb4 SHA512 43c28194f72e13e708af91b9714d028ebf67ce02d830bec0556e434e8296eae0e406e7f8ab3e836b34c3950fceb11cf255c6004e5a56bdd08c3ca0078778d70e WHIRLPOOL 5bf1ae7b2f4ffe3fc9422dd3181f7561fbaf6399cbab6fef1692283e16e9ebd388f61228777475d50bdbaf7911f782568b2a60e1ce53b7cdb6a025f4a89f41af
diff --git a/dev-php/composer/composer-1.2.2-r1.ebuild b/dev-php/composer/composer-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..a5e2f00d6146
--- /dev/null
+++ b/dev-php/composer/composer-1.2.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*[curl]
+ >=dev-php/ca-bundle-1.0.0
+ >=dev-php/cli-prompt-1.0.0
+ >=dev-php/psr-log-1.0.2
+ dev-php/fedora-autoloader
+ >=dev-php/json-schema-2.0.0
+ >=dev-php/jsonlint-1.4.0
+ >=dev-php/phar-utils-1.0.0
+ >=dev-php/semver-1.0.0
+ >=dev-php/spdx-licenses-1.0.0
+ >=dev-php/symfony-console-2.7.9
+ >=dev-php/symfony-filesystem-2.7.20
+ >=dev-php/symfony-finder-2.7.20
+ >=dev-php/symfony-process-2.8.12"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-update-paths.patch"
+)
+
+src_install() {
+ insinto "/usr/share/php/Composer/Composer"
+ doins -r src/Composer/. res LICENSE "${FILESDIR}"/autoload.php
+ dobin bin/composer
+ dodoc README.md
+}
diff --git a/dev-php/composer/files/autoload.php b/dev-php/composer/files/autoload.php
new file mode 100644
index 000000000000..5be766d60f49
--- /dev/null
+++ b/dev-php/composer/files/autoload.php
@@ -0,0 +1,25 @@
+getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
+
+ $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
+- $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
++ $this->safeCopy('/usr/share/php/Composer/Composer/LICENSE', $targetDir.'/LICENSE');
+
+ if ($this->runScripts) {
+ $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
+
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php 2016-11-03 17:43:15.000000000 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2016-11-20 18:27:43.169665101 +0100
+@@ -87,7 +87,7 @@
+
+ private function check($json)
+ {
+- $schema = json_decode(file_get_contents(__DIR__ . '/../../../../res/composer-schema.json'));
++ $schema = json_decode(file_get_contents('/usr/share/php/Composer/Composer/res/composer-schema.json'));
+ $validator = new Validator();
+ $validator->check(json_decode($json), $schema);
+
+--- ./src/Composer/Json/JsonFile.php 2016-11-04 02:51:03.844719014 +0100
++++ ./src/Composer/Json/JsonFile.php 2016-11-18 16:44:06.065969630 +0100
+@@ -156,7 +156,7 @@
+ self::validateSyntax($content, $this->path);
+ }
+
+- $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
++ $schemaFile = '/usr/share/php/Composer/Composer/res/composer-schema.json';
+ $schemaData = json_decode(file_get_contents($schemaFile));
+
+ if ($schema === self::LAX_SCHEMA) {
+
+--- ./bin/composer 2016-11-18 15:56:40.615898592 +0100
++++ ./bin/composer 2016-11-18 16:06:05.348912690 +0100
+@@ -5,7 +5,7 @@
+ echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
+ }
+
+-require __DIR__.'/../src/bootstrap.php';
++require '/usr/share/php/Composer/Composer/autoload.php';
+
+ use Composer\Console\Application;
+
diff --git a/dev-php/composer/metadata.xml b/dev-php/composer/metadata.xml
new file mode 100644
index 000000000000..cdbe7f339484
--- /dev/null
+++ b/dev-php/composer/metadata.xml
@@ -0,0 +1,23 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ Composer is a tool for dependency management in PHP.
+ It allows you to declare the libraries your project depends on
+ and it will manage (install/update) them for you.
+
+
+ composer/composer
+
+
diff --git a/dev-php/fedora-autoloader/Manifest b/dev-php/fedora-autoloader/Manifest
new file mode 100644
index 000000000000..d68fe6204795
--- /dev/null
+++ b/dev-php/fedora-autoloader/Manifest
@@ -0,0 +1 @@
+DIST fedora-autoloader-0.2.1.tar.gz 7634 SHA256 2311e97c0a78c5472d853f10022e5cd2844637e856ecf2a51ea686b3d3332576 SHA512 81501dbc0668c1cc6d6fb030e0d9ee91d31db8fa32b3348a0215dbf20a3ef1d41bc398124e1d7f0c1d5ffa8fce8c33e60a3182eaba6ba740d78b4a7f6db2aea8 WHIRLPOOL 4106d392a906110b418e47cf8bf2e78892a5e5581f21961a76859c581b0c1f5d60f15677c00ec6a8d10d94aa6210dfc5cd68208164428d77804ef4a21cc56812
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
new file mode 100644
index 000000000000..3db26adce1be
--- /dev/null
+++ b/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Fedora's Static PSR-4, PSR-0, and classmap autoloader"
+HOMEPAGE="https://github.com/php-fedora/autoloader"
+SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-lang/php:*"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-php/phpunit )"
+
+S="${WORKDIR}/autoloader-${PV}"
+
+src_install() {
+ insinto "/usr/share/php/Fedora/Autoloader"
+ doins -r src/.
+ dodoc CHANGELOG.md README.md
+}
+
+src_test() {
+ phpunit || die "test suite failed"
+}
diff --git a/dev-php/fedora-autoloader/metadata.xml b/dev-php/fedora-autoloader/metadata.xml
new file mode 100644
index 000000000000..551bb2bc4e84
--- /dev/null
+++ b/dev-php/fedora-autoloader/metadata.xml
@@ -0,0 +1,22 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ Static PSR-4, PSR-0, and classmap autoloader.
+ Includes loader for required and optional dependencies.
+
+
+ php-fedora/autoloader
+
+
diff --git a/dev-php/json-schema/Manifest b/dev-php/json-schema/Manifest
new file mode 100644
index 000000000000..6c3b3eea62ef
--- /dev/null
+++ b/dev-php/json-schema/Manifest
@@ -0,0 +1 @@
+DIST json-schema-2.0.0.tar.gz 21319 SHA256 bdbaedf8be4bb2ceb8019c651b0579a4b9723dc95e11f0aa683cfe193064e392 SHA512 8efa6ad3175b474e3c073816651d77e80e3ec7865aa6a04f8c7eff7a91831ab1eb1b0b6968d542aa6d10e1e0a1171ec05889b817713f1d740afeb31c5f124a52 WHIRLPOOL 5af244685521d57b663faf78f287a978e7b8bb89526ad8f282fb7d57490540fd483501752bc27b75d6b2de9699d2684352a0e5711fed98b5c6e9cf2f0437b0d9
diff --git a/dev-php/json-schema/files/autoload.php b/dev-php/json-schema/files/autoload.php
new file mode 100644
index 000000000000..c8a6c8a8b715
--- /dev/null
+++ b/dev-php/json-schema/files/autoload.php
@@ -0,0 +1,10 @@
+ ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+
+src_install() {
+ insinto "/usr/share/php/JsonSchema"
+ doins -r src/JsonSchema/. "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/json-schema/metadata.xml b/dev-php/json-schema/metadata.xml
new file mode 100644
index 000000000000..43b623ea5479
--- /dev/null
+++ b/dev-php/json-schema/metadata.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ A PHP Implementation for validating JSON Structures against a given Schema.
+
+
+ justinrainbow/json-schema
+
+
diff --git a/dev-php/jsonlint/Manifest b/dev-php/jsonlint/Manifest
new file mode 100644
index 000000000000..189838be97ba
--- /dev/null
+++ b/dev-php/jsonlint/Manifest
@@ -0,0 +1 @@
+DIST jsonlint-1.4.0.tar.gz 10893 SHA256 e97ff9b23037a2d6ec3d548a273c345dea097b66e72d5bb8b30e66ce765fe46d SHA512 29a23a86ece17f43a471ba8952785e820eff537ddce019935d776492a0d0ccf68c5f0e1f5f3d63b8b12efbe0acc1f7e3fa91d4b9d48bae2e1eec4f3c4b9094b1 WHIRLPOOL 90d08bbe063c61066e3a29ce391934e906ceaf9ae2e80ac67e57f94088e14f1dd27e1faf3f5331cb35c6b209a3e38f35634154cad5b9d80cd62389a0dfd99929
diff --git a/dev-php/jsonlint/files/autoload.php b/dev-php/jsonlint/files/autoload.php
new file mode 100644
index 000000000000..48ac68d82ab1
--- /dev/null
+++ b/dev-php/jsonlint/files/autoload.php
@@ -0,0 +1,8 @@
+ ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-php/phpunit )"
+
+src_prepare() {
+ default
+ if use test; then
+ cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+ sed -i -e "s:__DIR__:'${S}/src/Seld/JsonLint':" "${S}"/autoload-test.php || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/php/Seld/JsonLint"
+ doins -r src/Seld/JsonLint/. "${FILESDIR}"/autoload.php
+ dodoc README.mdown
+}
+
+src_test() {
+ phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+}
diff --git a/dev-php/jsonlint/metadata.xml b/dev-php/jsonlint/metadata.xml
new file mode 100644
index 000000000000..77828cf3c6c0
--- /dev/null
+++ b/dev-php/jsonlint/metadata.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ Json linter, port of the JavaScript jsonlint library.
+
+
+ Seldaek/jsonlint
+
+
diff --git a/dev-php/phar-utils/Manifest b/dev-php/phar-utils/Manifest
new file mode 100644
index 000000000000..cff8524d615d
--- /dev/null
+++ b/dev-php/phar-utils/Manifest
@@ -0,0 +1 @@
+DIST phar-utils-1.0.0.tar.gz 3152 SHA256 d754727a7cf75f0a2fc1c716a059096d38fbee8caa8872b14fa3a24864b02ca3 SHA512 bf3d7074a3f1101a7f03e8fb8a5bc1456674bf2f9ded6a5fc5fb2f892c1cc3c4643fab6c003851ed12ea16ce6390f482cf897beee7d7c38922b6c54c90b0934e WHIRLPOOL 246dd7d334f5b845830863268c2b600cba762022583260048b0f0871e25140955c97f91d704af48ffd0a0b301db0e38d624836ea8cbf60834dad17b0f7a13364
diff --git a/dev-php/phar-utils/files/autoload.php b/dev-php/phar-utils/files/autoload.php
new file mode 100644
index 000000000000..44f0299fd7bd
--- /dev/null
+++ b/dev-php/phar-utils/files/autoload.php
@@ -0,0 +1,8 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ PHAR file format utilities, for when PHP phars you up
+
+
+ Seldaek/phar-utils
+
+
diff --git a/dev-php/phar-utils/phar-utils-1.0.0.ebuild b/dev-php/phar-utils/phar-utils-1.0.0.ebuild
new file mode 100644
index 000000000000..41312330ee3a
--- /dev/null
+++ b/dev-php/phar-utils/phar-utils-1.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="PHAR file format utilities, for when PHP phars you up"
+HOMEPAGE="https://github.com/Seldaek/phar-utils"
+SRC_URI="https://github.com/Seldaek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*[phar]
+ dev-php/fedora-autoloader"
+
+src_install() {
+ insinto "/usr/share/php/Seld/PharUtils"
+ doins -r src/. "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/psr-log/Manifest b/dev-php/psr-log/Manifest
new file mode 100644
index 000000000000..848d6ff53659
--- /dev/null
+++ b/dev-php/psr-log/Manifest
@@ -0,0 +1 @@
+DIST psr-log-1.0.2.tar.gz 4755 SHA256 753c27183c78f667497d9926511cf4b119007d49c709009b5759715a7b6112c9 SHA512 a95cf38a92e7259d615d48cf002c4a0a0b6d6a166a345dc40e7636f913e7a787fdc35d4279741d90e04f9b564b608a138ce2e59115014da6be9d779de2a01bf8 WHIRLPOOL 7f7c1eb2cf3e0a0b7a5c041ac6737ce98d8bdffccafe37a2ad206a40bb293e7fa59a382b1a9e3039828410c2d16012c075acb798416a83e97652561e786d66f5
diff --git a/dev-php/psr-log/files/autoload.php b/dev-php/psr-log/files/autoload.php
new file mode 100644
index 000000000000..fac5a688b5a9
--- /dev/null
+++ b/dev-php/psr-log/files/autoload.php
@@ -0,0 +1,8 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ PSR-3 logger, provide a common interface for logging libraries.
+ The main goal is to allow libraries to receive a Psr\Log\LoggerInterface object
+ and write logs to it in a simple and universal way.
+
+
+ php-fig/log
+
+
diff --git a/dev-php/psr-log/psr-log-1.0.2.ebuild b/dev-php/psr-log/psr-log-1.0.2.ebuild
new file mode 100644
index 000000000000..8d743797036b
--- /dev/null
+++ b/dev-php/psr-log/psr-log-1.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Common interface for logging libraries"
+HOMEPAGE="https://github.com/php-fig/log"
+SRC_URI="https://github.com/php-fig/log/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+
+S="${WORKDIR}/log-${PV}"
+
+src_install() {
+ insinto "/usr/share/php/Psr/Log"
+ doins -r Psr/Log/. "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/semver/Manifest b/dev-php/semver/Manifest
new file mode 100644
index 000000000000..46e60c3f27c4
--- /dev/null
+++ b/dev-php/semver/Manifest
@@ -0,0 +1 @@
+DIST semver-1.0.0.tar.gz 9428 SHA256 527597180e90e2a36f173e2a669b7694ff3a4a3925cda4d5c8fa3cd3113eddf9 SHA512 7f7d529f7fb47049e65bbc47fcd4c1fa2dfef7de7441ed29d7bd81450414fbf3a4e0dfdfec0c9c019656d125e1591856a341d989b37c3aab70fbe5fa2f92f9a1 WHIRLPOOL 2bc7b6a54b34d7bebf5978210db4d89e8ff05d9724cf34658028d4a788fbc0aaaabf2248594feea67554a5885c173c738cfe7da158a05218f8d3a2eb45a354a2
diff --git a/dev-php/semver/files/autoload.php b/dev-php/semver/files/autoload.php
new file mode 100644
index 000000000000..2295f8bd9a0e
--- /dev/null
+++ b/dev-php/semver/files/autoload.php
@@ -0,0 +1,8 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ Semantic versioning utilities with the addition of version constraints parsing and checking.
+
+
+ composer/semver
+
+
diff --git a/dev-php/semver/semver-1.0.0.ebuild b/dev-php/semver/semver-1.0.0.ebuild
new file mode 100644
index 000000000000..14f38dd52af7
--- /dev/null
+++ b/dev-php/semver/semver-1.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Semantic versioning utilities, constraint parsing, and checking"
+HOMEPAGE="https://github.com/composer/semver"
+SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+
+src_install() {
+ insinto "/usr/share/php/Composer/Semver"
+ doins -r src/. "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/spdx-licenses/Manifest b/dev-php/spdx-licenses/Manifest
new file mode 100644
index 000000000000..5df1ea2e5885
--- /dev/null
+++ b/dev-php/spdx-licenses/Manifest
@@ -0,0 +1 @@
+DIST spdx-licenses-1.0.0.tar.gz 8244 SHA256 c292e3bfaa75b0e9b87b7426576a17390ca2f6df37ba002bd1d8561d0ffa4518 SHA512 1ef19555f252c5e03fe3b0376442f47bd50d894effa04bca58e7644e18fcc2a905239086d1aaf31277ce5928a7f9743e123c767e197c0fa063c015ad14851a14 WHIRLPOOL 6f69389f2fe5d55a729b10552cb2c54e8e6473fc5a9d9ace453de76f8bf6f89ae41135feeb89b833d025f8e4b25136730b4006ce0078eaceb236c5d1af52b7d2
diff --git a/dev-php/spdx-licenses/files/autoload.php b/dev-php/spdx-licenses/files/autoload.php
new file mode 100644
index 000000000000..6ebf96e7378c
--- /dev/null
+++ b/dev-php/spdx-licenses/files/autoload.php
@@ -0,0 +1,8 @@
+licenses) {
+- $jsonFile = file_get_contents(__DIR__ . '/../res/spdx-licenses.json');
++ $jsonFile = file_get_contents(__DIR__ . '/res/spdx-licenses.json');
+ $this->licenses = json_decode($jsonFile, true);
+ }
+ }
+@@ -178,7 +178,7 @@
+ private function loadExceptions()
+ {
+ if (null === $this->exceptions) {
+- $jsonFile = file_get_contents(__DIR__ . '/../res/spdx-exceptions.json');
++ $jsonFile = file_get_contents(__DIR__ . '/res/spdx-exceptions.json');
+ $this->exceptions = json_decode($jsonFile, true);
+ }
+ }
diff --git a/dev-php/spdx-licenses/metadata.xml b/dev-php/spdx-licenses/metadata.xml
new file mode 100644
index 000000000000..6cb602111427
--- /dev/null
+++ b/dev-php/spdx-licenses/metadata.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ Tools for working with the SPDX license list and validating licenses.
+
+
+ composer/spdx-licenses
+
+
diff --git a/dev-php/spdx-licenses/spdx-licenses-1.0.0.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.0.0.ebuild
new file mode 100644
index 000000000000..22331933e80c
--- /dev/null
+++ b/dev-php/spdx-licenses/spdx-licenses-1.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Tools for working with and validating SPDX licenses"
+HOMEPAGE="https://github.com/composer/spdx-licenses"
+SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-change-res-path.patch"
+)
+
+src_install() {
+ insinto "/usr/share/php/Composer/Spdx"
+ doins -r src/. res "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/symfony-config/Manifest b/dev-php/symfony-config/Manifest
new file mode 100644
index 000000000000..ed9072765d6f
--- /dev/null
+++ b/dev-php/symfony-config/Manifest
@@ -0,0 +1 @@
+DIST symfony-config-2.1.0.tar.gz 30897 SHA256 62ac4ca9d918a596773825c0f45c6f8541d6899c260b7bb8237832000e0fa0e1 SHA512 c02c1532d62f1608538ca4f672f25f254b566c5d2c12e07b4d681d67b8a4f7fa7244659cc10f3967fcee15de9f7a1f8c81c3d1ca836dee57564ed342f2133aaf WHIRLPOOL 7de9201feb1cfdca9a3342d29f8cdf57d35d3f2a4bfddada1354fd701fe0be33f66eccf1c30880902ec90e9131f54decc69c730e03e27ca14168ab6f1a1c6607
diff --git a/dev-php/symfony-config/files/autoload.php b/dev-php/symfony-config/files/autoload.php
new file mode 100644
index 000000000000..5ebdb7126c25
--- /dev/null
+++ b/dev-php/symfony-config/files/autoload.php
@@ -0,0 +1,8 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ The Config component provides several classes to help you find, load, combine,
+ autofill and validate configuration values of any kind,
+ whatever their source may be (YAML, XML, INI files, or for instance a database).
+
+
+ symfony/config
+
+
diff --git a/dev-php/symfony-config/symfony-config-2.1.0.ebuild b/dev-php/symfony-config/symfony-config-2.1.0.ebuild
new file mode 100644
index 000000000000..f4c1aa64b103
--- /dev/null
+++ b/dev-php/symfony-config/symfony-config-2.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Symfony Config Component"
+HOMEPAGE="https://github.com/symfony/config"
+SRC_URI="https://github.com/symfony/config/archive/v${PV}.tar.gz -> symfony-config-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-php/phpunit )"
+
+S="${WORKDIR}/config-${PV}"
+
+src_prepare() {
+ default
+ if use test; then
+ cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/Config"
+ doins -r . "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
+
+src_test() {
+ phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+}
diff --git a/dev-php/symfony-console/Manifest b/dev-php/symfony-console/Manifest
new file mode 100644
index 000000000000..958cbfb6aac0
--- /dev/null
+++ b/dev-php/symfony-console/Manifest
@@ -0,0 +1 @@
+DIST symfony-console-2.7.9.tar.gz 116610 SHA256 f4691b11de8e4416911041f42585d66db6ab4999cde411e6cbbe3a997e9815bb SHA512 3de7d78b92c8f0c99d3c90e83a23f6b61eecc195cf92b5c9ebea03a1dc85d2166287e619822238a2f2cd54a430b4a38c7c88be3ba74dab0b66c6104e980a088b WHIRLPOOL 6ece7a9845e00ebdcef702dfaad9b92cc7da65860353acb89f2f971d86a619096a491a4d2862c00f8601f3722062b2855195031e1223d61c1adb23edbec90e8c
diff --git a/dev-php/symfony-console/files/autoload.php b/dev-php/symfony-console/files/autoload.php
new file mode 100644
index 000000000000..14a8fabf46cb
--- /dev/null
+++ b/dev-php/symfony-console/files/autoload.php
@@ -0,0 +1,16 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ The Console component eases the creation of beautiful and testable command line interfaces.
+
+
+ symfony/console
+
+
diff --git a/dev-php/symfony-console/symfony-console-2.7.9-r1.ebuild b/dev-php/symfony-console/symfony-console-2.7.9-r1.ebuild
new file mode 100644
index 000000000000..00cad8652ca7
--- /dev/null
+++ b/dev-php/symfony-console/symfony-console-2.7.9-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Subtree split of the Symfony Console Component"
+HOMEPAGE="https://github.com/symfony/console"
+SRC_URI="https://github.com/symfony/console/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader
+ >=dev-php/psr-log-1.0.2
+ >=dev-php/symfony-event-dispatcher-2.1.0
+ >=dev-php/symfony-process-2.8.12"
+
+S="${WORKDIR}/console-${PV}"
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/Console"
+ doins -r . "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/symfony-dependency-injection/Manifest b/dev-php/symfony-dependency-injection/Manifest
new file mode 100644
index 000000000000..b3dd8dc95b88
--- /dev/null
+++ b/dev-php/symfony-dependency-injection/Manifest
@@ -0,0 +1 @@
+DIST symfony-dependency-injection-2.1.0.tar.gz 73560 SHA256 30a693b561743655daa1b58314af0102d2ae8294c73da90e4759b847659f0d4e SHA512 2e21da1eb1dfff9ba9f8cf4c0d62ff2c021e40f611bba0ba98ff0c29dff35774eb252cf04c53437b1a40065209579c48116833fa4f72a674348fd4df8a01ffa7 WHIRLPOOL 260f6ff1a432133d34bd2c6239239ffcc677e7050910447fb02d1ac4126e75fb6104b32ece5b7613142a5199a20c2b8a5fc13c6d789ea2735e261872a8b07cf4
diff --git a/dev-php/symfony-dependency-injection/files/autoload.php b/dev-php/symfony-dependency-injection/files/autoload.php
new file mode 100644
index 000000000000..4df35ec39a58
--- /dev/null
+++ b/dev-php/symfony-dependency-injection/files/autoload.php
@@ -0,0 +1,15 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ The DependencyInjection component allows you to standardize
+ and centralize the way objects are constructed in your application.
+
+
+ symfony/dependency-injection
+
+
diff --git a/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.1.0-r1.ebuild b/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..8cbabae983eb
--- /dev/null
+++ b/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.1.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Symfony DependencyInjection Component"
+HOMEPAGE="https://github.com/symfony/dependency-injection"
+SRC_URI="https://github.com/symfony/dependency-injection/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader
+ >=dev-php/symfony-config-2.1.0
+ >=dev-php/symfony-yaml-2.1.0"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-php/phpunit )"
+
+S="${WORKDIR}/dependency-injection-${PV}"
+
+src_prepare() {
+ default
+ if use test; then
+ cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/DependencyInjection"
+ doins -r . "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
+
+src_test() {
+ phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+}
diff --git a/dev-php/symfony-event-dispatcher/Manifest b/dev-php/symfony-event-dispatcher/Manifest
new file mode 100644
index 000000000000..780da77fc808
--- /dev/null
+++ b/dev-php/symfony-event-dispatcher/Manifest
@@ -0,0 +1 @@
+DIST symfony-event-dispatcher-2.1.0.tar.gz 10271 SHA256 00a086a275c25ad9ab00839d7f07f5b7e655f653d504686d6a8eed7fbce1683a SHA512 2430e0955322aa938635b34cfa151166218da51bcc7ac1ff52789fc16aef9eeaa5c504f9d03daa819f47652e5207703314c8695e5023369fe8edf88af06bc54b WHIRLPOOL e21b4c78708ffa580490ae642ea883f374d1e42668d9a0dfccc02ceaa1835552ef8971039f83b3a7c911ea6881e7c984c1baf57c693c88bac6e8091c9a074cc4
diff --git a/dev-php/symfony-event-dispatcher/files/autoload.php b/dev-php/symfony-event-dispatcher/files/autoload.php
new file mode 100644
index 000000000000..e1accd4c7a6a
--- /dev/null
+++ b/dev-php/symfony-event-dispatcher/files/autoload.php
@@ -0,0 +1,14 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ The EventDispatcher component provides tools that allow your application components
+ to communicate with each other by dispatching events and listening to them.
+
+
+ symfony/event-dispatcher
+
+
diff --git a/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.1.0-r1.ebuild b/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..7c4cc1a57005
--- /dev/null
+++ b/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.1.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Symfony EventDispatcher Component"
+HOMEPAGE="https://github.com/symfony/event-dispatcher"
+SRC_URI="https://github.com/symfony/event-dispatcher/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader
+ >=dev-php/symfony-dependency-injection-2.1.0"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-php/phpunit )"
+
+S="${WORKDIR}/event-dispatcher-${PV}"
+
+src_prepare() {
+ default
+ if use test; then
+ cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/EventDispatcher"
+ doins -r . "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
+
+src_test() {
+ phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+}
diff --git a/dev-php/symfony-filesystem/Manifest b/dev-php/symfony-filesystem/Manifest
new file mode 100644
index 000000000000..88c1b8e1cc7a
--- /dev/null
+++ b/dev-php/symfony-filesystem/Manifest
@@ -0,0 +1 @@
+DIST symfony-filesystem-2.7.20.tar.gz 13679 SHA256 b08c32bf2340bc7b107ec4fdff2d32634528655991e4331d4b4d72e68e816674 SHA512 ebab6760aa38577162da6d12f4c83bf1ef5fad961cc979986e1f23c6624d80099fe3853bd0dc8113b06d8258fe1b34a4a34fa737048fa500751a63a425018359 WHIRLPOOL a65c1de2a6b98713e8aaa23fa4d3fce13f5c4c15dddf7669f9e9474ff87db5c21397a66520ffebc3e6bdaa4252e6cc61e774c4ff746907efd5a266810f47fb07
diff --git a/dev-php/symfony-filesystem/files/autoload.php b/dev-php/symfony-filesystem/files/autoload.php
new file mode 100644
index 000000000000..8ea8655d904f
--- /dev/null
+++ b/dev-php/symfony-filesystem/files/autoload.php
@@ -0,0 +1,8 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ The Filesystem component provides basic utilities for the filesystem.
+
+
+ symfony/filesystem
+
+
diff --git a/dev-php/symfony-filesystem/symfony-filesystem-2.7.20.ebuild b/dev-php/symfony-filesystem/symfony-filesystem-2.7.20.ebuild
new file mode 100644
index 000000000000..1e8dc8042629
--- /dev/null
+++ b/dev-php/symfony-filesystem/symfony-filesystem-2.7.20.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Symfony Filesystem Component"
+HOMEPAGE="https://github.com/symfony/filesystem"
+SRC_URI="https://github.com/symfony/filesystem/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+
+S="${WORKDIR}/filesystem-${PV}"
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/Filesystem"
+ doins -r . "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/symfony-finder/Manifest b/dev-php/symfony-finder/Manifest
new file mode 100644
index 000000000000..5c3f4212dabd
--- /dev/null
+++ b/dev-php/symfony-finder/Manifest
@@ -0,0 +1 @@
+DIST symfony-finder-2.7.20.tar.gz 36139 SHA256 87d98e578e2a594fd3a1e17b43910de336f498489a1e5744c1a1f4bc047e63e0 SHA512 b12f8f5c37e983799875e5aa5ed58a200147edf1f6f3d9fc6b3dc5b0b063dd057a53e0e71342b141b29c3aa934029ea5b67d4c1085e868197ab6e4b55eb7eab5 WHIRLPOOL 2c3083fd50db96282945148dbba33902021effaffdbd9251df050b3e40cd42b69e52ce2ef5131cfbd724ee8f85bdac75149c9e4665dcb27118d3901cb60f0b13
diff --git a/dev-php/symfony-finder/files/autoload.php b/dev-php/symfony-finder/files/autoload.php
new file mode 100644
index 000000000000..f08b7856a720
--- /dev/null
+++ b/dev-php/symfony-finder/files/autoload.php
@@ -0,0 +1,8 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ The Finder component finds files and directories
+ via an intuitive fluent interface.
+
+
+ symfony/finder
+
+
diff --git a/dev-php/symfony-finder/symfony-finder-2.7.20.ebuild b/dev-php/symfony-finder/symfony-finder-2.7.20.ebuild
new file mode 100644
index 000000000000..24c73603d94f
--- /dev/null
+++ b/dev-php/symfony-finder/symfony-finder-2.7.20.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Symfony Finder Component"
+HOMEPAGE="https://github.com/symfony/finder"
+SRC_URI="https://github.com/symfony/finder/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+
+S="${WORKDIR}/finder-${PV}"
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/Finder"
+ doins -r . "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/symfony-process/Manifest b/dev-php/symfony-process/Manifest
new file mode 100644
index 000000000000..e78c78e979f9
--- /dev/null
+++ b/dev-php/symfony-process/Manifest
@@ -0,0 +1 @@
+DIST symfony-process-2.8.12.tar.gz 29787 SHA256 86cd9300ecb870a88d843363fa0a7415e0ee3b7815c94f76ccb21b901075337b SHA512 2956572f394aa58e784f7b2b3922f4c8f1d71d5eb9859b757ce5986776d3e960ffbfcee2fb55ff89c176362a5ee0276d3b71ef00ae7338be1761bd88b4116294 WHIRLPOOL 8ede35f972146645c4d75855cd9b8ea0c51a746698d952c3c6716ae0fbe138abe551f432a2bd9e2afe3945cff7ea9021bb102486fbc8c60c2528f78d083983ee
diff --git a/dev-php/symfony-process/files/autoload.php b/dev-php/symfony-process/files/autoload.php
new file mode 100644
index 000000000000..f0b5ceb02c9b
--- /dev/null
+++ b/dev-php/symfony-process/files/autoload.php
@@ -0,0 +1,9 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ The Process component executes commands in sub-processes.
+
+
+ symfony/process
+
+
diff --git a/dev-php/symfony-process/symfony-process-2.8.12.ebuild b/dev-php/symfony-process/symfony-process-2.8.12.ebuild
new file mode 100644
index 000000000000..ac64cd6c6e1a
--- /dev/null
+++ b/dev-php/symfony-process/symfony-process-2.8.12.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Symfony Process Component"
+HOMEPAGE="https://github.com/symfony/process"
+SRC_URI="https://github.com/symfony/process/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+
+S="${WORKDIR}/process-${PV}"
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/Process"
+ doins -r . "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/symfony-yaml/Manifest b/dev-php/symfony-yaml/Manifest
new file mode 100644
index 000000000000..697eebe3951c
--- /dev/null
+++ b/dev-php/symfony-yaml/Manifest
@@ -0,0 +1 @@
+DIST symfony-yaml-2.1.0.tar.gz 37056 SHA256 67df42116b2c29f87bd83fca89ae721179e0234f059de435a40ea0698a13db46 SHA512 984fbd624d4bf70ae964da60d55b6d9883642eabce54f080c04d3d12b4d64e63f036683bc12052b0958bd4575f1b693f1453b2505e5e5666ddf2fb13c40e927f WHIRLPOOL 143d5b2de57185a803172d721e381953412b772a3a31fc587a00189bfd770ae549fe621ea1e964f3d193425a1d19a24edd22d9bce4b73ddbb25b68608169c8a3
diff --git a/dev-php/symfony-yaml/files/autoload.php b/dev-php/symfony-yaml/files/autoload.php
new file mode 100644
index 000000000000..32b88aa583a0
--- /dev/null
+++ b/dev-php/symfony-yaml/files/autoload.php
@@ -0,0 +1,8 @@
+
+
+
+
+ guillaumeseren@gmail.com
+ Guillaume Seren
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ php-bugs@gentoo.org
+
+
+ The Yaml component loads and dumps YAML files.
+
+
+ symfony/yaml
+
+
diff --git a/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild b/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild
new file mode 100644
index 000000000000..468bf8f9afb0
--- /dev/null
+++ b/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Symfony YAML Component"
+HOMEPAGE="https://github.com/symfony/yaml"
+SRC_URI="https://github.com/symfony/yaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-php/phpunit )"
+
+S="${WORKDIR}/yaml-${PV}"
+
+src_prepare() {
+ default
+ if use test; then
+ cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/Yaml"
+ doins -r . "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
+
+src_test() {
+ phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+}
diff --git a/dev-python/PyRSS2Gen/metadata.xml b/dev-python/PyRSS2Gen/metadata.xml
index 2565dce86ced..7a38bb900964 100644
--- a/dev-python/PyRSS2Gen/metadata.xml
+++ b/dev-python/PyRSS2Gen/metadata.xml
@@ -1,12 +1,5 @@
-
- floppym@gentoo.org
- Mike Gilbert
-
-
- python@gentoo.org
- Python
-
+
diff --git a/dev-python/fusepy/Manifest b/dev-python/fusepy/Manifest
new file mode 100644
index 000000000000..a1e865102eed
--- /dev/null
+++ b/dev-python/fusepy/Manifest
@@ -0,0 +1 @@
+DIST fusepy-2.0.4.tar.gz 14113 SHA256 802610ab25ad04fc9ef34d024a0abe41cdcaff6a2cb8b2fb92cdda0057c09d1f SHA512 a76d6a795ea08bcfea30f783b06e263c0c31d603ade95f8ac40071fa844668c5f989111649908d26b4c2759feb48abedaf887c75f177c3639b1916b246e7d83c WHIRLPOOL 0f134aefa66d834810cb02fa527b53840ec1064ee8517934673bff26dfed8ab8d2be81f4248d7156896dbe26486e2c92611e0fb7d9b54fbe71e5770faf018399
diff --git a/dev-python/fusepy/fusepy-2.0.4.ebuild b/dev-python/fusepy/fusepy-2.0.4.ebuild
new file mode 100644
index 000000000000..86a593f1e43f
--- /dev/null
+++ b/dev-python/fusepy/fusepy-2.0.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python FUSE bindings using ctypes"
+HOMEPAGE="https://github.com/terencehonles/fusepy"
+SRC_URI="https://github.com/terencehonles/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=sys-fs/fuse-2.9.7"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/fusepy/metadata.xml b/dev-python/fusepy/metadata.xml
new file mode 100644
index 000000000000..aefaba83bc26
--- /dev/null
+++ b/dev-python/fusepy/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ python@gentoo.org
+ Python
+
+ Pika is a pure-Python implementation of the AMQP 0-9-1
+ protocol that tries to stay fairly independent of the underlying network
+ support library. Pika was developed primarily for use with RabbitMQ, but
+ should also work with other AMQP 0-9-1 brokers.
+
+
+ terencehonles/fusepy
+
+
diff --git a/dev-python/tmdb3/metadata.xml b/dev-python/tmdb3/metadata.xml
index 4934d79d1db2..de71a1dd9966 100644
--- a/dev-python/tmdb3/metadata.xml
+++ b/dev-python/tmdb3/metadata.xml
@@ -1,14 +1,7 @@
-
- floppym@gentoo.org
- Mike Gilbert
-
-
- python@gentoo.org
- Python
-
+
tmdb3
wagnerrp/pytmdb3
diff --git a/dev-python/transmissionrpc/transmissionrpc-0.11.ebuild b/dev-python/transmissionrpc/transmissionrpc-0.11.ebuild
index c0d14624a412..af5937dd55c5 100644
--- a/dev-python/transmissionrpc/transmissionrpc-0.11.ebuild
+++ b/dev-python/transmissionrpc/transmissionrpc-0.11.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
+EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
inherit distutils-r1
diff --git a/dev-python/transmissionrpc/transmissionrpc-9999.ebuild b/dev-python/transmissionrpc/transmissionrpc-9999.ebuild
index 45a5be7f5f1e..e96c86153ef5 100644
--- a/dev-python/transmissionrpc/transmissionrpc-9999.ebuild
+++ b/dev-python/transmissionrpc/transmissionrpc-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
+EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
inherit distutils-r1
diff --git a/dev-util/cligh/metadata.xml b/dev-util/cligh/metadata.xml
index bee1c11df0cf..d0604a5cc9a0 100644
--- a/dev-util/cligh/metadata.xml
+++ b/dev-util/cligh/metadata.xml
@@ -5,10 +5,6 @@
williamh@gentoo.org
William Hubbs
-
- floppym@gentoo.org
- Mike Gilbert
-
CMB/cligh
diff --git a/games-emulation/mednafen/Manifest b/games-emulation/mednafen/Manifest
index c90f08f5f611..f5e17d722e57 100644
--- a/games-emulation/mednafen/Manifest
+++ b/games-emulation/mednafen/Manifest
@@ -1 +1,2 @@
DIST mednafen-0.9.38.7.tar.bz2 3882418 SHA256 1bb3beef883a325c35d1a1ce14959c307a4c321f2ea29d4ddb216c6dd03aded8 SHA512 759c83928ef7a9e856dc7f546542ab1e7cbe944d0184a7693ce3b1466220233eb40c2b215100920920754eb5a93587bd8e2d8150e00ec9c93da1d518107e0d76 WHIRLPOOL 0cb94abdaa697558f3575c8e4d6e0a816888ace2b860797a8a947ddca3ae66e517dd044f9ce266e7a19ac6e16a56f91bc93db2bbc7a9817e5afcc75a93cb2f42
+DIST mednafen-0.9.39.2.tar.bz2 4005259 SHA256 b42470b2ddf68ce0747f5b8ba4e1d1c3047fa8c45b8e168da43f3e2461ec34cc SHA512 e6d0f571ea82c9315336a02c8b91fc4b19d160a8ded3b0499b8a59d27c6f312a2dbe554e1e10e8ebd8616f862b59fe1d1d577e41942b31ab9b587b47c63b30dc WHIRLPOOL 4aa11afffd1b14890e1d85cbb38397e2c613c8087e441a015b9d362ccbb59476077d65245efdf3ebc8e3b16b79b953ab9acb71c77476f3e362746e95a2877a4e
diff --git a/games-emulation/mednafen/files/mednafen-0.9.39.2-localedir.patch b/games-emulation/mednafen/files/mednafen-0.9.39.2-localedir.patch
new file mode 100644
index 000000000000..82ab5a688b6c
--- /dev/null
+++ b/games-emulation/mednafen/files/mednafen-0.9.39.2-localedir.patch
@@ -0,0 +1,96 @@
+--- a/include/mednafen/desa68/Makefile.am
++++ b/include/mednafen/desa68/Makefile.am
+@@ -6,7 +6,7 @@
+
+ AUTOMAKE_OPTIONS = subdir-objects
+ AM_CFLAGS = @AM_CFLAGS@ -Wno-multichar
+-DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@
++DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+ DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/intl
+
+ noinst_LIBRARIES = libdesa68.a
+--- a/include/mednafen/drivers/Makefile.am
++++ b/include/mednafen/drivers/Makefile.am
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS = subdir-objects
+-DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@ @SDL_CFLAGS@
++DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ @SDL_CFLAGS@
+ DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/intl
+
+ noinst_LIBRARIES = libmdfnsdl.a
+--- a/include/mednafen/drivers_dos/Makefile.am
++++ b/include/mednafen/drivers_dos/Makefile.am
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS = subdir-objects
+-DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@ @SDL_CFLAGS@
++DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ @SDL_CFLAGS@
+ DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/intl
+
+ noinst_LIBRARIES = libmdfndos.a
+--- a/include/mednafen/Makefile.am
++++ b/include/mednafen/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS = trio
+ AUTOMAKE_OPTIONS = subdir-objects
+-DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@ @SNDFILE_CFLAGS@
++DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ @SNDFILE_CFLAGS@
+ DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/intl
+
+ bin_PROGRAMS = mednafen
+--- a/include/mednafen/ngp/Makefile.am
++++ b/include/mednafen/ngp/Makefile.am
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS = subdir-objects
+-DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@ -fno-strict-aliasing
++DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ -fno-strict-aliasing
+ DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/intl
+
+ noinst_LIBRARIES = libngp.a
+--- a/include/mednafen/quicklz/Makefile.am
++++ b/include/mednafen/quicklz/Makefile.am
+@@ -1,6 +1,6 @@
+ AM_CFLAGS = @AM_CFLAGS@ -fno-strict-aliasing -Wno-shadow -Wno-unused-but-set-variable
+ AUTOMAKE_OPTIONS = subdir-objects
+-DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@ -fno-strict-aliasing
++DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ -fno-strict-aliasing
+ DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/intl
+
+ noinst_LIBRARIES = libmdfnquicklz.a
+--- a/include/mednafen/sexyal/Makefile.am
++++ b/include/mednafen/sexyal/Makefile.am
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS = subdir-objects
+-DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@ @SDL_CFLAGS@ @ALSA_CFLAGS@ @JACK_CFLAGS@
++DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ @SDL_CFLAGS@ @ALSA_CFLAGS@ @JACK_CFLAGS@
+ DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/intl
+
+ noinst_LIBRARIES = libsexyal.a
+--- a/include/mednafen/snes/Makefile.am
++++ b/include/mednafen/snes/Makefile.am
+@@ -1,7 +1,7 @@
+ AM_CFLAGS = @AM_CFLAGS@ @SNES_EXTRA_FLAGS@
+ AM_CXXFLAGS = @AM_CXXFLAGS@ @SNES_EXTRA_FLAGS@ @SNES_EXTRA_CXXFLAGS@
+ AUTOMAKE_OPTIONS = subdir-objects
+-DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@ -DNOMINMAX
++DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ -DNOMINMAX
+ DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/intl -I$(srcdir)/src/lib
+
+ noinst_LIBRARIES = libsnes.a
+--- a/include/mednafen/ss/Makefile.am
++++ b/include/mednafen/ss/Makefile.am
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS = subdir-objects
+-DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@
++DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+ AM_CXXFLAGS = @AM_CXXFLAGS@ @SS_EXTRA_FLAGS@ @NO_STACK_PROTECTOR_FLAGS@
+ # -Wpedantic
+ DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/intl
+--- a/include/mednafen/trio/Makefile.am
++++ b/include/mednafen/trio/Makefile.am
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS = subdir-objects
+-DEFS = -DLOCALEDIR=\"$(datadir)/locale\" @DEFS@ @TRIO_CFLAGS@ @CFLAG_VISIBILITY@
++DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ @TRIO_CFLAGS@ @CFLAG_VISIBILITY@
+ DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/intl
+
+ noinst_LIBRARIES = libtrio.a
diff --git a/games-emulation/mednafen/files/mednafen-0.9.39.2-remove-cflags.patch b/games-emulation/mednafen/files/mednafen-0.9.39.2-remove-cflags.patch
new file mode 100644
index 000000000000..31c35d7287b4
--- /dev/null
+++ b/games-emulation/mednafen/files/mednafen-0.9.39.2-remove-cflags.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,21 +88,6 @@
+ AC_CHECK_LIB([z], [zlibVersion],[], AC_MSG_ERROR([*** zlib not found!]))
+ AC_SUBST([ZLIB_LIBS], [-lz])
+
+-dnl -fno-fast-math and -fno-unsafe-math-optimizations to make sure it's disabled, as the fast-math feature on certain older
+-dnl versions of gcc produces horribly broken code(and even when it's working correctly, it can have somewhat unpredictable effects).
+-dnl
+-dnl -fno-aggressive-loop-optimizations because I don't trust gcc's aggressive loop optimizations, and there miiight be old code
+-dnl in Mednafen that would cause problems.
+-dnl
+-dnl -fomit-frame-pointer is required for some x86 inline assembly to compile.
+-dnl
+-OPTIMIZER_FLAGS=""
+-AX_CFLAGS_GCC_OPTION([-fno-fast-math], OPTIMIZER_FLAGS)
+-AX_CFLAGS_GCC_OPTION([-fno-unsafe-math-optimizations], OPTIMIZER_FLAGS)
+-AX_CFLAGS_GCC_OPTION([-fno-aggressive-loop-optimizations], OPTIMIZER_FLAGS)
+-AX_CFLAGS_GCC_OPTION([-fno-ipa-icf], OPTIMIZER_FLAGS)
+-AX_CFLAGS_GCC_OPTION([-fomit-frame-pointer], OPTIMIZER_FLAGS)
+-
+ dnl
+ dnl Aggressively try to disable PIC and PIE, as it has a significant performance overhead and will
+ dnl break some code(with compile-time failures or run-time assert()s triggering).
diff --git a/games-emulation/mednafen/files/mednafen-0.9.39.2-zlib.patch b/games-emulation/mednafen/files/mednafen-0.9.39.2-zlib.patch
new file mode 100644
index 000000000000..665c4c10ed63
--- /dev/null
+++ b/games-emulation/mednafen/files/mednafen-0.9.39.2-zlib.patch
@@ -0,0 +1,27 @@
+--- a/include/mednafen/compress/Makefile.am.inc
++++ b/include/mednafen/compress/Makefile.am.inc
+@@ -1 +1 @@
+-mednafen_SOURCES += compress/minilzo.c compress/ioapi.c compress/unzip.c compress/GZFileStream.cpp compress/ZLInflateFilter.cpp
++mednafen_SOURCES += compress/minilzo.c compress/ioapi.c compress/GZFileStream.cpp compress/ZLInflateFilter.cpp
+--- a/include/mednafen/file.cpp
++++ b/include/mednafen/file.cpp
+@@ -29,7 +29,7 @@
+ #include
+ #include
+
+-#include "compress/unzip.h"
++#include
+
+ #include "file.h"
+ #include "general.h"
+--- a/include/mednafen/Makefile.am
++++ b/include/mednafen/Makefile.am
+@@ -6,7 +6,7 @@
+ bin_PROGRAMS = mednafen
+
+ mednafen_SOURCES = debug.cpp error.cpp mempatcher.cpp settings.cpp endian.cpp mednafen.cpp git.cpp file.cpp general.cpp memory.cpp netplay.cpp state.cpp state_rewind.cpp movie.cpp player.cpp PSFLoader.cpp SSFLoader.cpp SNSFLoader.cpp SPCReader.cpp tests.cpp qtrecord.cpp Stream.cpp MemoryStream.cpp FileStream.cpp IPSPatcher.cpp
+-mednafen_LDADD = trio/libtrio.a
++mednafen_LDADD = trio/libtrio.a -lminizip
+ mednafen_DEPENDENCIES = trio/libtrio.a
+
+ if HAVE_SDL
diff --git a/games-emulation/mednafen/mednafen-0.9.39.2.ebuild b/games-emulation/mednafen/mednafen-0.9.39.2.ebuild
new file mode 100644
index 000000000000..5032a26f358a
--- /dev/null
+++ b/games-emulation/mednafen/mednafen-0.9.39.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic pax-utils
+
+DESCRIPTION="An advanced NES, GB/GBC/GBA, TurboGrafx 16/CD, NGPC and Lynx emulator"
+HOMEPAGE="http://mednafen.fobby.net/"
+SRC_URI="http://mednafen.fobby.net/releases/files/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa altivec cjk debugger jack nls pax_kernel"
+
+RDEPEND="
+ dev-libs/libcdio
+ media-libs/libsdl[sound,joystick,opengl,video]
+ media-libs/libsndfile
+ media-libs/sdl-net
+ sys-libs/zlib[minizip]
+ virtual/opengl
+ alsa? ( media-libs/alsa-lib )
+ jack? ( media-sound/jack-audio-connection-kit )
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.39.2-remove-cflags.patch
+ "${FILESDIR}"/${PN}-0.9.39.2-localedir.patch
+ "${FILESDIR}"/${PN}-0.9.39.2-zlib.patch
+)
+
+pkg_pretend() {
+ if has ccache ${FEATURES}; then
+ ewarn
+ ewarn "If you experience build failure, try turning off ccache in FEATURES."
+ ewarn
+ fi
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # very sensitive code (bug #539992)
+ strip-flags
+ append-flags -fomit-frame-pointer -fwrapv
+ econf \
+ $(use_enable alsa) \
+ $(use_enable altivec) \
+ $(use_enable cjk cjk-fonts) \
+ $(use_enable debugger) \
+ $(use_enable jack) \
+ $(use_enable nls)
+}
+
+src_install() {
+ default
+ dodoc Documentation/cheats.txt
+
+ if use pax_kernel; then
+ pax-mark m "${ED%/}"/bin/mednafen || die
+ fi
+}
diff --git a/mail-filter/postfwd/files/postfwd2.example.cf b/mail-filter/postfwd/files/postfwd2.example.cf
deleted file mode 100644
index 614f6331527a..000000000000
--- a/mail-filter/postfwd/files/postfwd2.example.cf
+++ /dev/null
@@ -1,154 +0,0 @@
-# source:
-# http://hege.li/howto/spam/etc/postfwd/postfwd.conf
-#
-# This version was included on 29 Mar 2010. Newer versions
-# may be available.
-
-###
-### Example config for postfwd 1.10pre8+
-###
-
-## Check DNS Whitelisting
-
-id=OK_DNSWL; \
- rbl=list.dnswl.org/^127/43200; \
- action=OK
-
-## Check HELO and reverse DNS
-
-id=SET_HELO; \
- helo_name=^(\[|[^.]+$|.*?[0-9.-]{8}); \
- action=set(HIT_helo=1)
-
-id=SET_NODNS; \
- client_name=^unknown$; \
- action=set(HIT_nodns=1)
-
-id=REJECT_HELO_NODNS; \
- HIT_helo==1; HIT_nodns==1; \
- action=REJECT Blocked - contact postmaster@example.net for help - Suspicious HELO [$$helo_name] and missing reverse DNS [$$client_address]
-
-## Check ZEN first for immediate blocking - less queries for other lists
-## See usage policy: http://www.spamhaus.org/organization/dnsblusage.html
-
-id=REJECT_RBL_ZEN; \
- rbl=zen.spamhaus.org; \
- action=REJECT Blocked - contact postmaster@example.net for help - DNSBL [$$dnsbltext]
-
-## Check other DNSBLs in parallel
-
-&&DNSBLS { \
- rbl=bl.spamcop.net; \
- rbl=b.barracudacentral.org; \
- rbl=bl.spameatingmonkey.net; \
- rbl=dnsbl-1.uceprotect.net; \
- rbl=psbl.surriel.com; \
- rbl=combined.njabl.org; \
- rbl=dnsbl.sorbs.net; \
- rbl=ix.dnsbl.manitu.net; \
-};
-
-id=EVAL_DNSBLS; \
- &&DNSBLS; rblcount=all; \
- action=set(HIT_rbls=$$rblcount,HIT_dtxt=$$dnsbltext)
-
-id=REJECT_RBL_MULTI; \
- HIT_rbls>=2; \
- action=REJECT Blocked - contact postmaster@example.net for help - Multiple DNSBLs [$$HIT_dtxt]
-
-## Check RHSBLs if there wasn't enough DNSBLs hit
-
-&&RHSBLS_REVERSE { \
- rhsbl_reverse_client=dynamic.rhs.mailpolice.com; \
-};
-
-&&RHSBLS_SENDER { \
- rhsbl_sender=dbl.spamhaus.org; \
- rhsbl_sender=multi.uribl.com; \
- rhsbl_sender=multi.surbl.org; \
- rhsbl_sender=rhsbl.ahbl.org; \
- rhsbl_sender=rhsbl.sorbs.net; \
- rhsbl_sender=dsn.rfc-ignorant.org; \
-};
-
-id=EVAL_RHSBLS; \
- &&RHSBLS_REVERSE; &&RHSBLS_SENDER; rhsblcount=all; \
- action=set(HIT_rhsbls=$$rhsblcount,HIT_rtxt=$$dnsbltext)
-
-id=REJECT_RHSBL_MULTI; \
- HIT_rhsbls>=2; \
- action=REJECT Blocked - contact postmaster@example.net for help - Multiple RHSBLs [$$HIT_rtxt]
-
-## See if we get any combined hits from rules before
-
-id=REJECT_RBL_RHSBL; \
- HIT_rbls>=1; HIT_rhsbls>=1; \
- action=REJECT Blocked - contact postmaster@example.net for help - RHSBL and DNSBL [$$HIT_rtxt] [$$HIT_dtxt]
-
-id=REJECT_RBL_HELO; \
- HIT_rbls>=1; HIT_helo==1; \
- action=REJECT Blocked - contact postmaster@example.net for help - DNSBL [$$HIT_dtxt] and suspicious HELO [$$helo_name]
-
-id=REJECT_RBL_NODNS; \
- HIT_rbls>=1; HIT_nodns==1; \
- action=REJECT Blocked - contact postmaster@example.net for help - DNSBL [$$HIT_dtxt] and missing reverse DNS [$$client_address]
-
-id=REJECT_RHSBL_HELO; \
- HIT_rhsbls>=1; HIT_helo==1; \
- action=REJECT Blocked - contact postmaster@example.net for help - RHSBL [$$HIT_rtxt] and suspicious HELO [$$helo_name]
-
-id=REJECT_RHSBL_NODNS; \
- HIT_rhsbls>=1; HIT_nodns==1; \
- action=REJECT Blocked - contact postmaster@example.net for help - RHSBL [$$HIT_rtxt] and missing reverse DNS [$$client_address]
-
-## Finally greylist all lesser hits.
-##
-## A more DNSBL friendly way would be to greylist everything suspicious
-## before DNS checks. Currently this requires you to setup some postfix
-## tables before postfwd is called, since greylisting can be only done last
-## in postfwd (action always exits processing).
-
-id=GREY_HELO; HIT_helo==1; action=check_postgrey
-id=GREY_NODNS; HIT_nodns==1; action=check_postgrey
-id=GREY_RBL; HIT_rbls>=1; action=check_postgrey
-id=GREY_RHSBL; HIT_rhsbls>=1; action=check_postgrey
-
-&&DNSBLS_GREY { \
- rbl=dnsbl-2.uceprotect.net; \
- rbl=dnsbl-3.uceprotect.net; \
-};
-
-id=GREY_DNSBL; &&DNSBLS_GREY; action=check_postgrey
-
-
-
-##
-## This example is free to use as per BSD license:
-##
-## Copyright (c) 2008, Henrik Krohns
-## All rights reserved.
-##
-## Redistribution and use in source and binary forms, with or without modification,
-## are permitted provided that the following conditions are met:
-##
-## * Redistributions of source code must retain the above copyright
-## notice, this list of conditions and the following disclaimer.
-## * Redistributions in binary form must reproduce the above copyright
-## notice, this list of conditions and the following disclaimer in
-## the documentation and/or other materials provided with the
-## distribution.
-## * Neither the name of the authors nor the names of his contributors
-## may be used to endorse or promote products derived from this
-## software without specific prior written permission.
-##
-## THIS SOFTWARE IS PROVIDED BY ME ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-## FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY DIRECT,
-## INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-## NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-## PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-## WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-## ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-## POSSIBILITY OF SUCH DAMAGE.
-##
-
diff --git a/mail-filter/postfwd/metadata.xml b/mail-filter/postfwd/metadata.xml
index a68d695d7c07..b3ab72eee88e 100644
--- a/mail-filter/postfwd/metadata.xml
+++ b/mail-filter/postfwd/metadata.xml
@@ -4,7 +4,6 @@
info@roessner-net.com
Christian Roessner
- Proxy-Maintainer. Assign bugs to him
mschiff@gentoo.org
diff --git a/mail-filter/rmilter/files/1.8.4-optional-memcached.patch b/mail-filter/rmilter/files/1.8.4-optional-memcached.patch
deleted file mode 100644
index 23617aa4a2ef..000000000000
--- a/mail-filter/rmilter/files/1.8.4-optional-memcached.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e12aad4..910ba55 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,6 +39,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
- OPTION(ENABLE_DEBUG "Enable debug output [default: OFF]" OFF)
- OPTION(ENABLE_OPTIMIZATION "Enable optimization [default: OFF]" OFF)
- OPTION(ENABLE_DKIM "Enable dkim signatures [default: ON]" ON)
-+OPTION(ENABLE_MEMCACHED "Enable memcached storage [default: ON]" ON)
- OPTION(WANT_SYSTEMD_UNITS "Install systemd unit files on Linux [default: OFF]" OFF)
-
- ############################# INCLUDE SECTION #############################################
-@@ -121,8 +122,8 @@ MACRO(ProcessPackage PKG_NAME)
- PATH_SUFFIXES ${PKG_LIB_SUFFIXES} lib64 lib
- PATHS ${RMILTER_DEFAULT_LIBRARY_PATHS})
- IF(NOT _lib)
-- IF(OPTIONAL)
-- MESSAGE("Cannot find library ${PKG_LIBRARY} for package ${PKG_NAME}")
-+ IF(PKG_OPTIONAL)
-+ MESSAGE(STATUS "Cannot find library ${PKG_LIBRARY} for package ${PKG_NAME}")
- ELSE()
- MESSAGE(FATAL_ERROR "Cannot find library ${PKG_LIBRARY} for package ${PKG_NAME}")
- ENDIF()
-@@ -133,8 +134,8 @@ MACRO(ProcessPackage PKG_NAME)
- PATH_SUFFIXES ${PKG_INCLUDE_SUFFIXES} "include"
- PATHS ${RMILTER_DEFAULT_INCLUDE_PATHS})
- IF(NOT _incl)
-- IF(OPTIONAL)
-- MESSAGE("Cannot find header ${PKG_INCLUDE} for package ${PKG_NAME}")
-+ IF(PKG_OPTIONAL)
-+ MESSAGE(STATUS "Cannot find header ${PKG_INCLUDE} for package ${PKG_NAME}")
- ELSE()
- MESSAGE(FATAL_ERROR "Cannot find header ${PKG_INCLUDE} for package ${PKG_NAME}")
- ENDIF()
-@@ -362,8 +363,6 @@ ProcessPackage(PCRE LIBRARY pcre INCLUDE pcre.h INCLUDE_SUFFIXES include/pcre
- ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
- ProcessPackage(LIBMILTER LIBRARY milter INCLUDE mfapi.h INCLUDE_SUFFIXES include/libmilter
- LIB_SUFFIXES lib/libmilter ROOT ${LIBMILTER_ROOT_DIR} MODULES libmilter)
--ProcessPackage(LIBMEMCACHED LIBRARY memcached INCLUDE memcached.h INCLUDE_SUFFIXES include/libmemcached
-- LIB_SUFFIXES lib/libmemcached ROOT ${LIBMEMCACHED_ROOT_DIR} MODULES libmemcached)
-
- IF(ENABLE_DKIM MATCHES "ON")
- SET(WITH_DKIM 1)
-@@ -373,6 +372,14 @@ IF(ENABLE_DKIM MATCHES "ON")
- ROOT ${OPENDKIM_ROOT_DIR} MODULES opendkim)
- ENDIF()
-
-+IF(ENABLE_MEMCACHED MATCHES "ON")
-+ SET(WITH_MEMCACHED 1)
-+ ProcessPackage(LIBMEMCACHED LIBRARY memcached
-+ INCLUDE memcached.h INCLUDE_SUFFIXES include/libmemcached
-+ LIB_SUFFIXES lib/libmemcached ROOT ${LIBMEMCACHED_ROOT_DIR}
-+ MODULES libmemcached)
-+ENDIF()
-+
- ################################ SOURCES SECTION ###########################
- ADD_SUBDIRECTORY(hiredis)
- INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/hiredis")
-diff --git a/config.h.in b/config.h.in
-index b90d422..0ab2725 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -159,6 +159,8 @@
-
- #cmakedefine WITH_SPF 1
-
-+#cmakedefine WITH_MEMCACHED 1
-+
- #cmakedefine HAVE_SENDFILE 1
- #cmakedefine HAVE_SYS_SENDFILE_H 1
-
-diff --git a/src/cache.c b/src/cache.c
-index d83b6e3..c84cafc 100644
---- a/src/cache.c
-+++ b/src/cache.c
-@@ -23,7 +23,9 @@
- */
-
- #include "config.h"
-+#ifdef WITH_MEMCACHED
- #include "libmemcached/memcached.h"
-+#endif
- #include "cfg_file.h"
- #include "cache.h"
- #include "hiredis.h"
-@@ -33,6 +35,7 @@
-
- #define DEFAULT_REDIS_PORT 6379
-
-+#ifdef WITH_MEMCACHED
- static inline bool compat_memcached_success(int rc)
- {
- return (rc == MEMCACHED_BUFFERED ||
-@@ -60,6 +63,7 @@ static inline bool compat_memcached_fatal(int rc)
- rc != MEMCACHED_SUCCESS &&
- rc != MEMCACHED_VALUE);
- }
-+#endif
-
- static struct cache_server *
- rmilter_get_server (struct config_file *cfg, enum rmilter_query_type type,
-@@ -110,6 +114,7 @@ rmilter_get_server (struct config_file *cfg, enum rmilter_query_type type,
- return serv;
- }
-
-+#ifdef WITH_MEMCACHED
- static void
- rmilter_format_libmemcached_config (struct config_file *cfg,
- struct cache_server *serv,
-@@ -128,6 +133,7 @@ rmilter_format_libmemcached_config (struct config_file *cfg,
- memcached_behavior_set (ctx, MEMCACHED_BEHAVIOR_POLL_TIMEOUT,
- cfg->memcached_connect_timeout);
- }
-+#endif
-
- bool
- rmilter_query_cache (struct config_file *cfg, enum rmilter_query_type type,
-@@ -211,6 +217,7 @@ rmilter_query_cache (struct config_file *cfg, enum rmilter_query_type type,
- }
- }
- else {
-+#ifdef WITH_MEMCACHED
- char *kval;
- size_t value_len = 0;
- uint32_t mflags;
-@@ -254,6 +261,10 @@ rmilter_query_cache (struct config_file *cfg, enum rmilter_query_type type,
- }
-
- memcached_free (mctx);
-+#else
-+ msg_err ("memcached query requested when memcached support is"
-+ " not compiled");
-+#endif
- }
- }
-
-@@ -340,6 +351,7 @@ rmilter_set_cache (struct config_file *cfg, enum rmilter_query_type type ,
- }
- }
- else {
-+#ifdef WITH_MEMCACHED
- char *kval;
- size_t value_len = 0;
- uint32_t mflags;
-@@ -373,6 +385,10 @@ rmilter_set_cache (struct config_file *cfg, enum rmilter_query_type type ,
- }
-
- memcached_free (mctx);
-+#else
-+ msg_err ("memcached query requested when memcached support is"
-+ " not compiled");
-+#endif
- }
- }
-
-@@ -448,6 +464,7 @@ rmilter_delete_cache (struct config_file *cfg, enum rmilter_query_type type ,
- }
- }
- else {
-+#ifdef WITH_MEMCACHED
- char *kval;
- size_t value_len = 0;
- uint32_t mflags;
-@@ -480,7 +497,12 @@ rmilter_delete_cache (struct config_file *cfg, enum rmilter_query_type type ,
-
- upstream_ok (&serv->up, time (NULL));
- memcached_free (mctx);
-+#else
-+ msg_err ("memcached query requested when memcached support is"
-+ " not compiled");
-+#endif
- }
-+
- }
-
- return true;
diff --git a/mail-filter/rspamd/files/rspamd.init-r1 b/mail-filter/rspamd/files/rspamd.init-r1
deleted file mode 100644
index 74e043e13fa9..000000000000
--- a/mail-filter/rspamd/files/rspamd.init-r1
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-RUNDIR=/var/run/rspamd
-PIDFILE=$RUNDIR/rspamd.pid
-
-depend() {
- need net
-}
-
-checkconfig() {
- /usr/bin/rspamadm configtest -c /etc/rspamd/rspamd.sysvinit.conf > /dev/null \
- || return 1
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting ${SVCNAME}"
-
- mkdir -m0750 -p $RUNDIR
- chown rspamd:rspamd $RUNDIR
- chmod g+s $RUNDIR
- rm -f $RUNDIR/$SVCNAME.sock
-
- start-stop-daemon --start --quiet --pidfile $PIDFILE -u rspamd -g rspamd \
- --exec /usr/bin/rspamd
- eend $?
-}
-
-stop() {
- if [ "${RC_CMD}" = "restart" ] ; then
- checkconfig || return 1
- fi
-
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE \
- --exec /usr/bin/rspamd
- eend $?
-}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f5e9a7c2789b..69313749a6ac 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Dec 2016 20:13:18 +0000
+Mon, 19 Dec 2016 05:13:19 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f5e9a7c2789b..69313749a6ac 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Dec 2016 20:13:18 +0000
+Mon, 19 Dec 2016 05:13:19 +0000
diff --git a/metadata/md5-cache/app-admin/puppetserver-2.7.1 b/metadata/md5-cache/app-admin/puppetserver-2.7.1
index 32546d76ffb0..ed2e7a132630 100644
--- a/metadata/md5-cache/app-admin/puppetserver-2.7.1
+++ b/metadata/md5-cache/app-admin/puppetserver-2.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=Puppet Server is the next-generation application for managing Puppet
EAPI=6
HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
IUSE=puppetdb
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jdk-1.7.0 app-admin/puppet-agent[puppetdb?]
SLOT=0
SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-2.7.1.tar.gz
_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87
-_md5_=bb69862223acb4199052290dd57fc9e1
+_md5_=737dac88b53f2a5f14f735ea5e2df6a0
diff --git a/metadata/md5-cache/app-doc/root-docs-5.34.26 b/metadata/md5-cache/app-doc/root-docs-5.34.26
index 63ab3a277e13..8d8288a7a475 100644
--- a/metadata/md5-cache/app-doc/root-docs-5.34.26
+++ b/metadata/md5-cache/app-doc/root-docs-5.34.26
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-text/pandoc dev-haskell/pandoc-citeproc[bibutils] dev-texlive/texlive-latex virtual/pkgconfig api? ( media-fonts/dejavu ~sci-physics/root-5.34.26[X,graphviz,opengl] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-text/pandoc dev-haskell/pandoc-citeproc[bibutils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latex virtual/pkgconfig api? ( media-fonts/dejavu ~sci-physics/root-5.34.26[X,graphviz,opengl] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Documentation for ROOT Data Analysis Framework
EAPI=5
HOMEPAGE=https://root.cern.ch
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
SLOT=0
SRC_URI=https://root.cern.ch/download/root_v5.34.26.source.tar.gz math? ( http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v4.2.0.pdf https://root.cern.ch/download/doc/RooFit_Users_Manual_2.91-33.pdf http://root.cern.ch/drupal/sites/default/files/roofit_quickstart_3.00.pdf ) api? ( https://root.cern.ch/sites/all/themes/newsflash/images/blue/root-banner.png https://root.cern.ch/sites/all/themes/newsflash/images/info.png )
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 virtualx 86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=666194ecc171effae2f99c8ea0419e67
+_md5_=a5a11d107411c69a9cc72f119a9a6119
diff --git a/metadata/md5-cache/app-doc/root-docs-5.34.36 b/metadata/md5-cache/app-doc/root-docs-5.34.36
index 73bdb68e87b0..8316efb9f50b 100644
--- a/metadata/md5-cache/app-doc/root-docs-5.34.36
+++ b/metadata/md5-cache/app-doc/root-docs-5.34.36
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-text/pandoc dev-haskell/pandoc-citeproc[bibutils] dev-texlive/texlive-latex virtual/pkgconfig api? ( media-fonts/dejavu ~sci-physics/root-5.34.36[X,graphviz,opengl] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-text/pandoc dev-haskell/pandoc-citeproc[bibutils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latex virtual/pkgconfig api? ( media-fonts/dejavu ~sci-physics/root-5.34.36[X,graphviz,opengl] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Documentation for ROOT Data Analysis Framework
EAPI=5
HOMEPAGE=https://root.cern.ch
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
SLOT=0
SRC_URI=https://root.cern.ch/download/root_v5.34.36.source.tar.gz math? ( http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v4.2.0.pdf https://root.cern.ch/download/doc/RooFit_Users_Manual_2.91-33.pdf http://root.cern.ch/drupal/sites/default/files/roofit_quickstart_3.00.pdf ) api? ( https://root.cern.ch/sites/all/themes/newsflash/images/blue/root-banner.png https://root.cern.ch/sites/all/themes/newsflash/images/info.png )
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 virtualx 86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=6d4e5e4a4f3485f3332d1d87a12decc6
+_md5_=b28df039bd31aa1448e1169e8e9a05a7
diff --git a/metadata/md5-cache/app-doc/single-unix-specification-4-r2 b/metadata/md5-cache/app-doc/single-unix-specification-4_p1
similarity index 100%
rename from metadata/md5-cache/app-doc/single-unix-specification-4-r2
rename to metadata/md5-cache/app-doc/single-unix-specification-4_p1
diff --git a/metadata/md5-cache/app-doc/single-unix-specification-4_p2 b/metadata/md5-cache/app-doc/single-unix-specification-4_p2
new file mode 100644
index 000000000000..126abe6da16f
--- /dev/null
+++ b/metadata/md5-cache/app-doc/single-unix-specification-4_p2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=The Single UNIX Specification, Version 4, 2016 Edition
+EAPI=6
+HOMEPAGE=https://www2.opengroup.org/ogsys/catalog/T101
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=sus4-copyright
+SLOT=4
+SRC_URI=http://pubs.opengroup.org/onlinepubs/9699919799/download/susv4tc2.tar.bz2
+_md5_=1d7eb1f33619d0fc7667588e2fc2631e
diff --git a/metadata/md5-cache/app-misc/tmux-2.1 b/metadata/md5-cache/app-misc/tmux-2.1
index 26a0aa881bdb..3abafb4be2f6 100644
--- a/metadata/md5-cache/app-misc/tmux-2.1
+++ b/metadata/md5-cache/app-misc/tmux-2.1
@@ -6,8 +6,8 @@ HOMEPAGE=http://tmux.github.io/
IUSE=debug selinux vim-syntax kernel_FreeBSD kernel_linux
KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=ISC
-RDEPEND=|| ( =dev-libs/libevent-2.0* >=dev-libs/libevent-2.1.5-r4 ) kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) sys-libs/ncurses:0= selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+RDEPEND=|| ( =dev-libs/libevent-2.0* >=dev-libs/libevent-2.1.5-r4 ) kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) sys-libs/ncurses:0= dev-libs/libevent:= selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
SLOT=0
SRC_URI=https://github.com/tmux/tmux/releases/download/2.1/tmux-2.1.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=deadaf1324e33a5b29ad213a003dc8b7
+_md5_=4fe0ecb3a666788fe08981ab8afafcf0
diff --git a/metadata/md5-cache/app-misc/tmux-2.2 b/metadata/md5-cache/app-misc/tmux-2.2
index 0b4b012c35ed..a67029580e7e 100644
--- a/metadata/md5-cache/app-misc/tmux-2.2
+++ b/metadata/md5-cache/app-misc/tmux-2.2
@@ -6,8 +6,8 @@ HOMEPAGE=http://tmux.github.io/
IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=ISC
-RDEPEND=|| ( =dev-libs/libevent-2.0* >=dev-libs/libevent-2.1.5-r4 ) utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) sys-libs/ncurses:0= selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+RDEPEND=|| ( =dev-libs/libevent-2.0* >=dev-libs/libevent-2.1.5-r4 ) utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) sys-libs/ncurses:0= dev-libs/libevent:= selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
SLOT=0
SRC_URI=https://github.com/tmux/tmux/releases/download/2.2/tmux-2.2.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ea73db14bd03ecc0c71dbb592480e6bf
+_md5_=b81552a1c7386ff52597bf284e85fd90
diff --git a/metadata/md5-cache/app-misc/tmux-2.3 b/metadata/md5-cache/app-misc/tmux-2.3
index 75c563de028a..1966234b6054 100644
--- a/metadata/md5-cache/app-misc/tmux-2.3
+++ b/metadata/md5-cache/app-misc/tmux-2.3
@@ -6,8 +6,8 @@ HOMEPAGE=http://tmux.github.io/
IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=ISC
-RDEPEND=|| ( =dev-libs/libevent-2.0* >=dev-libs/libevent-2.1.5-r4 ) utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) sys-libs/ncurses:0= selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+RDEPEND=|| ( =dev-libs/libevent-2.0* >=dev-libs/libevent-2.1.5-r4 ) utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) sys-libs/ncurses:0= dev-libs/libevent:= selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
SLOT=0
SRC_URI=https://github.com/tmux/tmux/releases/download/2.3/tmux-2.3.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=78d3658993555b485da97074e6c81794
+_md5_=8523191e0079d7987c31afb30edcac38
diff --git a/metadata/md5-cache/app-misc/tmux-9999 b/metadata/md5-cache/app-misc/tmux-9999
index b70fa218eb46..c59ca9e8071a 100644
--- a/metadata/md5-cache/app-misc/tmux-9999
+++ b/metadata/md5-cache/app-misc/tmux-9999
@@ -5,8 +5,8 @@ EAPI=6
HOMEPAGE=http://tmux.github.io/
IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
LICENSE=ISC
-RDEPEND=>=dev-libs/libevent-2.0.10 utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) sys-libs/ncurses:0= selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+RDEPEND=>=dev-libs/libevent-2.0.10 utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) sys-libs/ncurses:0= dev-libs/libevent:= selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
SLOT=0
SRC_URI=https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b vim-syntax? ( https://raw.githubusercontent.com/keith/tmux.vim/95f6126c187667cc7f9c573c45c3b356cf69f4ca/syntax/tmux.vim -> tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca )
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 git-r3 e928b84a9f6f1d9076d1d27687876dc6 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b235c87ba90cdf5f5f991ca8f8bccade
+_md5_=d2e2ce7a16aed964e997b0b6805a432e
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
new file mode 100644
index 000000000000..24dc95169004
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=perl? ( dev-lang/perl:= ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) )
+DESCRIPTION=An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID
+EAPI=6
+HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/
+IUSE=+cxx perl php static-libs php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
+LICENSE=ISC
+RDEPEND=perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) )
+REQUIRED_USE=php? ( || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 ) )
+SLOT=0
+SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 php-ext-source-r3 a30f64f44cd0439913e37281006faaca toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_md5_=7e91d48d8c6b99d66acfee3faa2078fd
diff --git a/metadata/md5-cache/dev-php/ca-bundle-1.0.0 b/metadata/md5-cache/dev-php/ca-bundle-1.0.0
new file mode 100644
index 000000000000..cf04ecc479f6
--- /dev/null
+++ b/metadata/md5-cache/dev-php/ca-bundle-1.0.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Find the system CA bundle or fall back to the Mozilla one
+EAPI=6
+HOMEPAGE=https://github.com/composer/ca-bundle
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+SLOT=0
+SRC_URI=https://github.com/composer/ca-bundle/archive/1.0.0.tar.gz -> ca-bundle-1.0.0.tar.gz
+_md5_=6a852742a25513166080940c22a72aeb
diff --git a/metadata/md5-cache/dev-php/cli-prompt-1.0.0 b/metadata/md5-cache/dev-php/cli-prompt-1.0.0
new file mode 100644
index 000000000000..105e887b3369
--- /dev/null
+++ b/metadata/md5-cache/dev-php/cli-prompt-1.0.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Allows you to prompt for user input on the command line
+EAPI=6
+HOMEPAGE=https://github.com/Seldaek/cli-prompt
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+SLOT=0
+SRC_URI=https://github.com/Seldaek/cli-prompt/archive/1.0.0.tar.gz -> cli-prompt-1.0.0.tar.gz
+_md5_=cc67a69105b2945ce0d78cc0a974ea60
diff --git a/metadata/md5-cache/dev-php/composer-1.2.2-r1 b/metadata/md5-cache/dev-php/composer-1.2.2-r1
new file mode 100644
index 000000000000..3badb58b01e6
--- /dev/null
+++ b/metadata/md5-cache/dev-php/composer-1.2.2-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Dependency Manager for PHP
+EAPI=6
+HOMEPAGE=https://github.com/composer/composer
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.0.0 >=dev-php/cli-prompt-1.0.0 >=dev-php/psr-log-1.0.2 dev-php/fedora-autoloader >=dev-php/json-schema-2.0.0 >=dev-php/jsonlint-1.4.0 >=dev-php/phar-utils-1.0.0 >=dev-php/semver-1.0.0 >=dev-php/spdx-licenses-1.0.0 >=dev-php/symfony-console-2.7.9 >=dev-php/symfony-filesystem-2.7.20 >=dev-php/symfony-finder-2.7.20 >=dev-php/symfony-process-2.8.12
+SLOT=0
+SRC_URI=https://github.com/composer/composer/archive/1.2.2.tar.gz -> composer-1.2.2.tar.gz
+_md5_=977359f909ba5ec36e5efc5c9f3c4fb0
diff --git a/metadata/md5-cache/dev-php/fedora-autoloader-0.2.1 b/metadata/md5-cache/dev-php/fedora-autoloader-0.2.1
new file mode 100644
index 000000000000..3491e8c8aeb7
--- /dev/null
+++ b/metadata/md5-cache/dev-php/fedora-autoloader-0.2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install test
+DEPEND=test? ( dev-lang/php:* dev-php/phpunit )
+DESCRIPTION=Fedora's Static PSR-4, PSR-0, and classmap autoloader
+EAPI=6
+HOMEPAGE=https://github.com/php-fedora/autoloader
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*
+SLOT=0
+SRC_URI=https://github.com/php-fedora/autoloader/archive/0.2.1.tar.gz -> fedora-autoloader-0.2.1.tar.gz
+_md5_=c76a69948c0b1df0d1d5e312b3f07af9
diff --git a/metadata/md5-cache/dev-php/json-schema-2.0.0 b/metadata/md5-cache/dev-php/json-schema-2.0.0
new file mode 100644
index 000000000000..86da0c05e54a
--- /dev/null
+++ b/metadata/md5-cache/dev-php/json-schema-2.0.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=PHP implementation of JSON schema
+EAPI=6
+HOMEPAGE=https://github.com/justinrainbow/json-schema
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+SLOT=0
+SRC_URI=https://github.com/justinrainbow/json-schema/archive/2.0.0.tar.gz -> json-schema-2.0.0.tar.gz
+_md5_=23320a15965100f6a7e131e92a991a97
diff --git a/metadata/md5-cache/dev-php/jsonlint-1.4.0 b/metadata/md5-cache/dev-php/jsonlint-1.4.0
new file mode 100644
index 000000000000..da73b4cd52c2
--- /dev/null
+++ b/metadata/md5-cache/dev-php/jsonlint-1.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare test
+DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader dev-php/phpunit )
+DESCRIPTION=JSON Lint for PHP
+EAPI=6
+HOMEPAGE=https://github.com/Seldaek/jsonlint
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Seldaek/jsonlint/archive/1.4.0.tar.gz -> jsonlint-1.4.0.tar.gz
+_md5_=c819bced078f65fc6bc3347558028c35
diff --git a/metadata/md5-cache/dev-php/phar-utils-1.0.0 b/metadata/md5-cache/dev-php/phar-utils-1.0.0
new file mode 100644
index 000000000000..e8f347353eb0
--- /dev/null
+++ b/metadata/md5-cache/dev-php/phar-utils-1.0.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=PHAR file format utilities, for when PHP phars you up
+EAPI=6
+HOMEPAGE=https://github.com/Seldaek/phar-utils
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*[phar] dev-php/fedora-autoloader
+SLOT=0
+SRC_URI=https://github.com/Seldaek/phar-utils/archive/1.0.0.tar.gz -> phar-utils-1.0.0.tar.gz
+_md5_=cdc9e299e4ac49890aa1366d7e656314
diff --git a/metadata/md5-cache/dev-php/psr-log-1.0.2 b/metadata/md5-cache/dev-php/psr-log-1.0.2
new file mode 100644
index 000000000000..a52075b86734
--- /dev/null
+++ b/metadata/md5-cache/dev-php/psr-log-1.0.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Common interface for logging libraries
+EAPI=6
+HOMEPAGE=https://github.com/php-fig/log
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+SLOT=0
+SRC_URI=https://github.com/php-fig/log/archive/1.0.2.tar.gz -> psr-log-1.0.2.tar.gz
+_md5_=408936a52f1bf153cda5217afcd084d2
diff --git a/metadata/md5-cache/dev-php/semver-1.0.0 b/metadata/md5-cache/dev-php/semver-1.0.0
new file mode 100644
index 000000000000..12fa9cb91bbe
--- /dev/null
+++ b/metadata/md5-cache/dev-php/semver-1.0.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Semantic versioning utilities, constraint parsing, and checking
+EAPI=6
+HOMEPAGE=https://github.com/composer/semver
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+SLOT=0
+SRC_URI=https://github.com/composer/semver/archive/1.0.0.tar.gz -> semver-1.0.0.tar.gz
+_md5_=837dcdd0ce1b74c201478912285a86d2
diff --git a/metadata/md5-cache/dev-php/spdx-licenses-1.0.0 b/metadata/md5-cache/dev-php/spdx-licenses-1.0.0
new file mode 100644
index 000000000000..a74a1402d8cb
--- /dev/null
+++ b/metadata/md5-cache/dev-php/spdx-licenses-1.0.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Tools for working with and validating SPDX licenses
+EAPI=6
+HOMEPAGE=https://github.com/composer/spdx-licenses
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+SLOT=0
+SRC_URI=https://github.com/composer/spdx-licenses/archive/1.0.0.tar.gz -> spdx-licenses-1.0.0.tar.gz
+_md5_=446dce4ec33803213fee6835d5240c2e
diff --git a/metadata/md5-cache/dev-php/symfony-config-2.1.0 b/metadata/md5-cache/dev-php/symfony-config-2.1.0
new file mode 100644
index 000000000000..b42f222f7f10
--- /dev/null
+++ b/metadata/md5-cache/dev-php/symfony-config-2.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare test
+DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader dev-php/phpunit )
+DESCRIPTION=Symfony Config Component
+EAPI=6
+HOMEPAGE=https://github.com/symfony/config
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+SLOT=0
+SRC_URI=https://github.com/symfony/config/archive/v2.1.0.tar.gz -> symfony-config-2.1.0.tar.gz
+_md5_=8287a6c9f8477e8471119cf62972788e
diff --git a/metadata/md5-cache/dev-php/symfony-console-2.7.9-r1 b/metadata/md5-cache/dev-php/symfony-console-2.7.9-r1
new file mode 100644
index 000000000000..6cb665fd00bc
--- /dev/null
+++ b/metadata/md5-cache/dev-php/symfony-console-2.7.9-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Subtree split of the Symfony Console Component
+EAPI=6
+HOMEPAGE=https://github.com/symfony/console
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/psr-log-1.0.2 >=dev-php/symfony-event-dispatcher-2.1.0 >=dev-php/symfony-process-2.8.12
+SLOT=0
+SRC_URI=https://github.com/symfony/console/archive/v2.7.9.tar.gz -> symfony-console-2.7.9.tar.gz
+_md5_=b7099f5c220099a2ce08b887e3925bde
diff --git a/metadata/md5-cache/dev-php/symfony-dependency-injection-2.1.0-r1 b/metadata/md5-cache/dev-php/symfony-dependency-injection-2.1.0-r1
new file mode 100644
index 000000000000..5e27e2550ba7
--- /dev/null
+++ b/metadata/md5-cache/dev-php/symfony-dependency-injection-2.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare test
+DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader >=dev-php/symfony-config-2.1.0 >=dev-php/symfony-yaml-2.1.0 dev-php/phpunit )
+DESCRIPTION=Symfony DependencyInjection Component
+EAPI=6
+HOMEPAGE=https://github.com/symfony/dependency-injection
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/symfony-config-2.1.0 >=dev-php/symfony-yaml-2.1.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/symfony/dependency-injection/archive/v2.1.0.tar.gz -> symfony-dependency-injection-2.1.0.tar.gz
+_md5_=0d6e0ef1486304ef3d7197bc78c89646
diff --git a/metadata/md5-cache/dev-php/symfony-event-dispatcher-2.1.0-r1 b/metadata/md5-cache/dev-php/symfony-event-dispatcher-2.1.0-r1
new file mode 100644
index 000000000000..c1000df34c9c
--- /dev/null
+++ b/metadata/md5-cache/dev-php/symfony-event-dispatcher-2.1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare test
+DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader >=dev-php/symfony-dependency-injection-2.1.0 dev-php/phpunit )
+DESCRIPTION=Symfony EventDispatcher Component
+EAPI=6
+HOMEPAGE=https://github.com/symfony/event-dispatcher
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/symfony-dependency-injection-2.1.0
+SLOT=0
+SRC_URI=https://github.com/symfony/event-dispatcher/archive/v2.1.0.tar.gz -> symfony-event-dispatcher-2.1.0.tar.gz
+_md5_=34bcd1d0163c84a5eb80335b6b68fb19
diff --git a/metadata/md5-cache/dev-php/symfony-filesystem-2.7.20 b/metadata/md5-cache/dev-php/symfony-filesystem-2.7.20
new file mode 100644
index 000000000000..c96f9586280f
--- /dev/null
+++ b/metadata/md5-cache/dev-php/symfony-filesystem-2.7.20
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Symfony Filesystem Component
+EAPI=6
+HOMEPAGE=https://github.com/symfony/filesystem
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+SLOT=0
+SRC_URI=https://github.com/symfony/filesystem/archive/v2.7.20.tar.gz -> symfony-filesystem-2.7.20.tar.gz
+_md5_=8abdef6df8f392ca5de9b71a66b2b44e
diff --git a/metadata/md5-cache/dev-php/symfony-finder-2.7.20 b/metadata/md5-cache/dev-php/symfony-finder-2.7.20
new file mode 100644
index 000000000000..bde5c93708ab
--- /dev/null
+++ b/metadata/md5-cache/dev-php/symfony-finder-2.7.20
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Symfony Finder Component
+EAPI=6
+HOMEPAGE=https://github.com/symfony/finder
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+SLOT=0
+SRC_URI=https://github.com/symfony/finder/archive/v2.7.20.tar.gz -> symfony-finder-2.7.20.tar.gz
+_md5_=c1285093d2e9797211e2b7481fd26f48
diff --git a/metadata/md5-cache/dev-php/symfony-process-2.8.12 b/metadata/md5-cache/dev-php/symfony-process-2.8.12
new file mode 100644
index 000000000000..a46ed3d6b9b8
--- /dev/null
+++ b/metadata/md5-cache/dev-php/symfony-process-2.8.12
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Symfony Process Component
+EAPI=6
+HOMEPAGE=https://github.com/symfony/process
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+SLOT=0
+SRC_URI=https://github.com/symfony/process/archive/v2.8.12.tar.gz -> symfony-process-2.8.12.tar.gz
+_md5_=d9c5b6d94f8593c9f1dba3d4338482a2
diff --git a/metadata/md5-cache/dev-php/symfony-yaml-2.1.0 b/metadata/md5-cache/dev-php/symfony-yaml-2.1.0
new file mode 100644
index 000000000000..2ff09c0d8f4d
--- /dev/null
+++ b/metadata/md5-cache/dev-php/symfony-yaml-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare test
+DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader dev-php/phpunit )
+DESCRIPTION=Symfony YAML Component
+EAPI=6
+HOMEPAGE=https://github.com/symfony/yaml
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/symfony/yaml/archive/v2.1.0.tar.gz -> symfony-yaml-2.1.0.tar.gz
+_md5_=24745a9e9b6adf765537f32a94c7f8d7
diff --git a/metadata/md5-cache/dev-python/fusepy-2.0.4 b/metadata/md5-cache/dev-python/fusepy-2.0.4
new file mode 100644
index 000000000000..d27e4589d717
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fusepy-2.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-fs/fuse-2.9.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python FUSE bindings using ctypes
+EAPI=6
+HOMEPAGE=https://github.com/terencehonles/fusepy
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=sys-fs/fuse-2.9.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/terencehonles/fusepy/archive/v2.0.4.tar.gz -> fusepy-2.0.4.tar.gz
+_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=7e403cc1326836e3d3d49be364adde44
diff --git a/metadata/md5-cache/dev-python/transmissionrpc-0.11 b/metadata/md5-cache/dev-python/transmissionrpc-0.11
index ab8bc30226e1..83a334fb2915 100644
--- a/metadata/md5-cache/dev-python/transmissionrpc-0.11
+++ b/metadata/md5-cache/dev-python/transmissionrpc-0.11
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/six-1.1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=>=dev-python/six-1.1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
DESCRIPTION=Python module that implements the Transmission bittorrent client RPC protocol
-EAPI=5
+EAPI=6
HOMEPAGE=https://bitbucket.org/blueluna/transmissionrpc
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
KEYWORDS=~amd64 ~x86
LICENSE=MIT
-RDEPEND=>=dev-python/six-1.1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=>=dev-python/six-1.1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://pypi/t/transmissionrpc/transmissionrpc-0.11.tar.gz https://bitbucket.org/blueluna/transmissionrpc/src/release-0.10/test/data/ubuntu-12.04.2-alternate-amd64.iso.torrent
-_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0a3d71c4ba022878c2fa82ba589136d1
+_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=0820d5b25de0f81b78d8dba3a112aa18
diff --git a/metadata/md5-cache/dev-python/transmissionrpc-9999 b/metadata/md5-cache/dev-python/transmissionrpc-9999
index 2cf679b9aaea..c8baed2000f6 100644
--- a/metadata/md5-cache/dev-python/transmissionrpc-9999
+++ b/metadata/md5-cache/dev-python/transmissionrpc-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/six-1.1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-vcs/mercurial
+DEPEND=>=dev-python/six-1.1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-vcs/mercurial
DESCRIPTION=Python module that implements the Transmission bittorrent client RPC protocol
-EAPI=5
+EAPI=6
HOMEPAGE=https://bitbucket.org/blueluna/transmissionrpc
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
LICENSE=MIT
-RDEPEND=>=dev-python/six-1.1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=>=dev-python/six-1.1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils b83a2420b796f7c6eff682679d08fe25 mercurial 66da6d1ccacd123e28d2c64821052a9a multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a27a56ea03b1919f100fe3ffb801694d
+_md5_=1885813cc4d2a54433d0929b9cb944c8
diff --git a/metadata/md5-cache/games-emulation/mednafen-0.9.39.2 b/metadata/md5-cache/games-emulation/mednafen-0.9.39.2
new file mode 100644
index 000000000000..f060705a3fa6
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/mednafen-0.9.39.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=dev-libs/libcdio media-libs/libsdl[sound,joystick,opengl,video] media-libs/libsndfile media-libs/sdl-net sys-libs/zlib[minizip] virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=An advanced NES, GB/GBC/GBA, TurboGrafx 16/CD, NGPC and Lynx emulator
+EAPI=6
+HOMEPAGE=http://mednafen.fobby.net/
+IUSE=alsa altivec cjk debugger jack nls pax_kernel
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libcdio media-libs/libsdl[sound,joystick,opengl,video] media-libs/libsndfile media-libs/sdl-net sys-libs/zlib[minizip] virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=http://mednafen.fobby.net/releases/files/mednafen-0.9.39.2.tar.bz2
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_md5_=5032b5ea340b7b953dd45dd72377b674
diff --git a/metadata/md5-cache/net-dns/unbound-1.5.10 b/metadata/md5-cache/net-dns/unbound-1.5.10
index 8df87184f9d0..fa906015477e 100644
--- a/metadata/md5-cache/net-dns/unbound-1.5.10
+++ b/metadata/md5-cache/net-dns/unbound-1.5.10
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) virtual/pkgconfig
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) virtual/pkgconfig
DESCRIPTION=A validating, recursive and caching DNS resolver
EAPI=5
HOMEPAGE=http://unbound.net/
IUSE=debug dnstap +ecdsa gost libressl python selinux static-libs test threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
LICENSE=BSD GPL-2
-RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://unbound.net/downloads/unbound-1.5.10.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 python-single-r1 19a74c6b5c191723a997dc7e0cc6bb09 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87
-_md5_=3532a38667015500ea723ffec0894b91
+_md5_=5bad6a72526baaa5e878b8f0bfdd3287
diff --git a/metadata/md5-cache/net-dns/unbound-1.6.0 b/metadata/md5-cache/net-dns/unbound-1.6.0
new file mode 100644
index 000000000000..9784922a1d3e
--- /dev/null
+++ b/metadata/md5-cache/net-dns/unbound-1.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) virtual/pkgconfig
+DESCRIPTION=A validating, recursive and caching DNS resolver
+EAPI=5
+HOMEPAGE=http://unbound.net/
+IUSE=debug dnstap +ecdsa gost libressl python selinux static-libs test threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=BSD GPL-2
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://unbound.net/downloads/unbound-1.6.0.tar.gz
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 python-single-r1 19a74c6b5c191723a997dc7e0cc6bb09 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87
+_md5_=c8a80a03e5a132acfdb83aa44c613622
diff --git a/metadata/md5-cache/net-misc/libreswan-3.17 b/metadata/md5-cache/net-misc/libreswan-3.17
index c59322c9041f..dafdb1efbc23 100644
--- a/metadata/md5-cache/net-misc/libreswan-3.17
+++ b/metadata/md5-cache/net-misc/libreswan-3.17
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst
-DEPEND=dev-libs/gmp:0= dev-libs/libevent dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig virtual/pkgconfig
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=IPsec implementation for Linux, fork of Openswan
EAPI=6
HOMEPAGE=https://libreswan.org/
IUSE=caps curl dnssec ldap pam
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-misc/strongswan
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-misc/strongswan
SLOT=0
SRC_URI=https://download.libreswan.org/libreswan-3.17.tar.gz
_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=cdefdeea29918f0dd669ee4d584c95a7
+_md5_=66979336392c9707130a4c623a6b5dd2
diff --git a/metadata/md5-cache/net-misc/libreswan-3.18 b/metadata/md5-cache/net-misc/libreswan-3.18
index 14a9c20aace4..f8ebcc01fbbe 100644
--- a/metadata/md5-cache/net-misc/libreswan-3.18
+++ b/metadata/md5-cache/net-misc/libreswan-3.18
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=dev-libs/gmp:0= dev-libs/libevent dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:0= ) app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig virtual/pkgconfig
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:0= ) app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=IPsec implementation for Linux, fork of Openswan
EAPI=6
HOMEPAGE=https://libreswan.org/
IUSE=caps curl dnssec ldap pam systemd
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-misc/strongswan
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-misc/strongswan
SLOT=0
SRC_URI=https://download.libreswan.org/libreswan-3.18.tar.gz
_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=b633715434ac29f15599a565125b203e
+_md5_=4e37f2c16893514d692a2e66cb5f5230
diff --git a/metadata/md5-cache/net-misc/libreswan-9999 b/metadata/md5-cache/net-misc/libreswan-9999
index ba700c721cfa..b040ce09209b 100644
--- a/metadata/md5-cache/net-misc/libreswan-9999
+++ b/metadata/md5-cache/net-misc/libreswan-9999
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=dev-libs/gmp:0= dev-libs/libevent dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:0= ) app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:0= ) app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1
DESCRIPTION=IPsec implementation for Linux, fork of Openswan
EAPI=6
HOMEPAGE=https://libreswan.org/
IUSE=caps curl dnssec ldap pam systemd
LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-misc/strongswan
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-misc/strongswan
SLOT=0
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 git-r3 e928b84a9f6f1d9076d1d27687876dc6 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=b633715434ac29f15599a565125b203e
+_md5_=4e37f2c16893514d692a2e66cb5f5230
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.13 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.13
index 44dc2b28f63f..de95694616f7 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.13
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.13
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install prepare setup test
DEPEND=>=sys-kernel/linux-headers-2.6 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Tools for Linux Kernel Stream Control Transmission Protocol implementation
EAPI=5
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 )
REQUIRED_USE=kernel_linux
SLOT=0
SRC_URI=mirror://sourceforge/lksctp/lksctp-tools-1.0.13.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=f8a6a65f33d7068a6854414d330755a7
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=51343306312a16dbec511a39ee50754d
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.16 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.16
index 43cac4f85d1b..6fa2b8312663 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.16
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.16
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install prepare setup test
DEPEND=>=sys-kernel/linux-headers-2.6 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Tools for Linux Kernel Stream Control Transmission Protocol implementation
EAPI=5
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 )
REQUIRED_USE=kernel_linux
SLOT=0
SRC_URI=mirror://sourceforge/lksctp/lksctp-tools-1.0.16.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=55d1a57f6a9d3d5993d122c58d967238
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=158b3fe2b6b7f029a52272eb714e6b6a
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.17 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.17
index 8494a7c44912..15eeddd74990 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.17
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.17
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install prepare setup test
DEPEND=>=sys-kernel/linux-headers-2.6 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Tools for Linux Kernel Stream Control Transmission Protocol implementation
EAPI=5
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 )
REQUIRED_USE=kernel_linux
SLOT=0
SRC_URI=mirror://sourceforge/lksctp/lksctp-tools-1.0.17.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=27975fb414ab3d4fa45eac0360d7335e
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=19b5b1bb9c2bbfe0893919b66c082cbe
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p8 b/metadata/md5-cache/net-misc/ntp-4.2.8_p8
index 6fb2f79837a5..35e0ff078c02 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p8
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p8
@@ -1,5 +1,5 @@
DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) virtual/pkgconfig virtual/pkgconfig
+DEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=Network Time Protocol suite/programs
EAPI=5
HOMEPAGE=http://www.ntp.org/
@@ -7,8 +7,8 @@ IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp
KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint
LICENSE=HPND BSD ISC
PDEPEND=openntpd? ( net-misc/openntpd )
-RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax )
+RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax )
SLOT=0
SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p8.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p8-manpages.tar.xz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87
-_md5_=6e9f0371701417e5b12f7b2810a9315c
+_md5_=026fc63ac157318e6d55ff119589c921
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p9 b/metadata/md5-cache/net-misc/ntp-4.2.8_p9
index bc2672202784..3997492aa753 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p9
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p9
@@ -1,5 +1,5 @@
DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) virtual/pkgconfig virtual/pkgconfig
+DEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=Network Time Protocol suite/programs
EAPI=5
HOMEPAGE=http://www.ntp.org/
@@ -7,8 +7,8 @@ IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp
KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint
LICENSE=HPND BSD ISC
PDEPEND=openntpd? ( net-misc/openntpd )
-RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax )
+RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax )
SLOT=0
SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p9.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p9-manpages.tar.xz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87
-_md5_=d72c82c25ffdae3c556ae57c14eea3fd
+_md5_=1e7d7078463a0c21f4f8204ca1d01f88
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index ee756058ddd9..ad4d60c7b548 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -10,4 +10,4 @@ RDEPEND=>=sys-apps/util-linux-2.27.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
REQUIRED_USE=importd? ( curl gcrypt lzma )
SLOT=0/2
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 git-r3 e928b84a9f6f1d9076d1d27687876dc6 libtool 4890219c51da247200223277f993e054 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 73058269b3e70e34e084fa3981282338 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=75dc7866709a3e86d2775912a7af16df
+_md5_=85ed570cd4961ca8ea5ec539a5b664a5
diff --git a/metadata/md5-cache/sys-block/hpacucli-9.40.12.0 b/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
index 3ed7ea9bcd5f..552a04bb979f 100644
--- a/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
+++ b/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/rpm2targz-9.0.0.3g
DESCRIPTION=HP Array Configuration Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)
EAPI=6
HOMEPAGE=http://h18000.www1.hp.com/products/servers/linux/documentation.html
-KEYWORDS=-* amd64 ~x86
+KEYWORDS=-* amd64 x86
LICENSE=hp-proliant-essentials
RDEPEND=sys-apps/coreutils sys-process/procps >=sys-apps/util-linux-2.20.1
SLOT=0
SRC_URI=amd64? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p1257348637/v80070/hpacucli-9.40-12.0.x86_64.rpm ) x86? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p414707558/v80071/hpacucli-9.40-12.0.i386.rpm )
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f rpm 3e120fdd74b358f9fb42b825a6558f61 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c8f85c0d2a2f9a8ef93b9327aa158d6a
+_md5_=aae4413b948154153c3f52c7131ddbde
diff --git a/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1 b/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
index 5e6c1b580dd6..5b47e1a3783d 100644
--- a/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
+++ b/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/rpm2targz-9.0.0.3g
DESCRIPTION=HPE Smart Storage Administrator (HPE SSA) CLI (HPSSACLI, formerly HPACUCLI)
EAPI=6
HOMEPAGE=http://h20564.www2.hpe.com/hpsc/swd/public/detail?swItemId=MTX_04bffb688a73438598fef81ddd
-KEYWORDS=-* amd64 ~x86
+KEYWORDS=-* amd64 x86
LICENSE=hpe
RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 ) >=sys-libs/libunwind-0.99 >=sys-process/procps-3.3.6
SLOT=0
SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/x86_64/current/hpssacli-2.40-13.0.x86_64.rpm ) x86? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/i686/current/hpssacli-2.40-13.0.i386.rpm )
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f rpm 3e120fdd74b358f9fb42b825a6558f61 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=408246223de1abb2d3c44493ca870941
+_md5_=59197b6abf8cc99d137df7bbd9e3f6d3
diff --git a/metadata/md5-cache/sys-block/storcli-1.19.04 b/metadata/md5-cache/sys-block/storcli-1.19.04
index 8cce560da9d0..2d3b19a4b2f4 100644
--- a/metadata/md5-cache/sys-block/storcli-1.19.04
+++ b/metadata/md5-cache/sys-block/storcli-1.19.04
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare unpack
DESCRIPTION=MegaRAID StorCLI (successor of the MegaCLI)
EAPI=6
HOMEPAGE=http://www.avagotech.com/support/download-search?dnd-keyword=storcli
-KEYWORDS=-* amd64 ~x86
+KEYWORDS=-* amd64 x86
LICENSE=Avago LSI BSD
SLOT=0/6.11
SRC_URI=http://docs.avagotech.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.19.04_StorCLI.zip -> storcli-1.19.04.zip
_eclasses_=pax-utils 4c2654a34ebe732e85fda354f6ee642f
-_md5_=4cf070459f42aa436ad6d03d7775f043
+_md5_=48df3813e4fcb1064b56ec35ab55e3f0
diff --git a/metadata/md5-cache/sys-kernel/dracut-044-r1 b/metadata/md5-cache/sys-kernel/dracut-044-r1
index ceca7f9a5fcd..babd22005d18 100644
--- a/metadata/md5-cache/sys-kernel/dracut-044-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-044-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Generic initramfs generation tool
EAPI=5
HOMEPAGE=https://dracut.wiki.kernel.org
IUSE=debug selinux systemd
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-arch/cpio >=app-shells/bash-4.0 >sys-apps/kmod-5[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sys-libs/libselinux sys-libs/libsepol sec-policy/selinux-dracut )
RESTRICT=test
SLOT=0
SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-044.tar.xz
_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils b83a2420b796f7c6eff682679d08fe25 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fe0fe98a5c19f4d85e3b1eb49d8450b8
+_md5_=76a9d6e0f4f4429109ec1b026a0c91e3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.69 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.69
new file mode 100644
index 000000000000..3a8e445d3303
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.69
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.12 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.12.69
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-68.base.tar.xz mirror://gentoo/genpatches-3.12-68.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-68.experimental.tar.xz )
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 kernel-2 8f1d31dfe46471aa29c5cb8a7c9f6264 multilib 165fc17c38d1b11dac2008280dab6e80 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=86d8576e09ab7bc6e5df69003b56fad6
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.68 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.69
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.12.68
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.12.69
index 1e2869a9bd7b..fb467805efdb 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.68
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.69
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=GPL-2 freedist
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
RESTRICT=binchecks strip
-SLOT=3.12.68
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.12.68.xz mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz
+SLOT=3.12.69
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.12.69.xz mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 kernel-2 8f1d31dfe46471aa29c5cb8a7c9f6264 multilib 165fc17c38d1b11dac2008280dab6e80 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=c8237d05e015cb2231ac8424e6ca7565
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f5e9a7c2789b..69313749a6ac 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Dec 2016 20:13:18 +0000
+Mon, 19 Dec 2016 05:13:19 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 412285d01e7c..777ce29eecd4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Dec 18 20:09:33 UTC 2016
+Mon Dec 19 05:09:32 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
deleted file mode 100644
index 1ee42c52d2be..000000000000
--- a/metadata/timestamp.chk
+++ /dev/null
@@ -1 +0,0 @@
-Sun, 18 Dec 2016 20:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d548607b35e2..806d78055770 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1482091801 Sun 18 Dec 2016 08:10:01 PM UTC
+1482108301 Mon 19 Dec 2016 12:45:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f5e9a7c2789b..69313749a6ac 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Dec 2016 20:13:18 +0000
+Mon, 19 Dec 2016 05:13:19 +0000
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 52db21f07324..29f4bce61ae7 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -3,3 +3,4 @@ DIST unbound-1.5.10.tar.gz 4941299 SHA256 a39b8b4fcca2a2b35a2daa53fe35150cc3f090
DIST unbound-1.5.7.tar.gz 4859573 SHA256 4b2088e5aa81a2d48f6337c30c1cf7e99b2e2dc4f92e463b3bee626eee731ca8 SHA512 7fc000364139519ed837ef9883f2e8a684b5ac19f2d3343626ab0a4c3459a7c3ccf2c79e9d992d82b123c6a38245fc286994365b427145d218e0b3c645c4dc4f WHIRLPOOL 9b2d18f09f46bed5da9818f5df0acbcc6d4a166943bbdb617494081614aa9b75a03ed0425679f40265f70e34ed66e01302182ec4050f0bb1f034fa5db28340f3
DIST unbound-1.5.8.tar.gz 4895649 SHA256 33567a20f73e288f8daa4ec021fbb30fe1824b346b34f12677ad77899ecd09be SHA512 0c296a2e5489fae0fdf0ca2ea11ed72f00498c8499f38f308ff32078665d980a2d5a80ee0e106273dc13a146611a238553857c5f301fe9622072382c06b8434a WHIRLPOOL ca977c88e5dcca80d11a3cf769e002f61b8c6145dea2a79a9d0c142396ff2f19b3452546627ced79e9af74fed3ac2ff72ca9f6fc2395e477076959fef77bd3b1
DIST unbound-1.5.9.tar.gz 4924965 SHA256 01328cfac99ab5b8c47115151896a244979e442e284eb962c0ea84b7782b6990 SHA512 a0f43a22d2c357b78482e5049fd77b100966964d861536169bd79379c02b96651e52c47f3f5001ac8e1ca474d41f784395adb44b61157487723f9f15287c97f4 WHIRLPOOL ccfeadbff8a450d431286d09b9c5bbcb40f53878ff33a3c36200485b5863279779bed55c1307586f59e5ccd7594f038e3b991bff401546b4969d564aa230b37d
+DIST unbound-1.6.0.tar.gz 5063253 SHA256 6b7db874e6debda742fee8869d722e5a17faf1086e93c911b8564532aeeffab7 SHA512 c92adee98ef759d033ac39784796e936e292f0671a42ad455411b82a9ba552744e4a0de432ee4ac05609dc0b429b70d5ce8169c20d3d65f4acf5afc5e02822ac WHIRLPOOL fc70f054718016df9c3fa502f25f44b57195d602ae0c53eb90fca5630ef96aa231f0e0b4c1bc3dfd012ee6c18c9dbd4e83f3aedc717adefd213f254105725870
diff --git a/net-dns/unbound/unbound-1.5.10.ebuild b/net-dns/unbound/unbound-1.5.10.ebuild
index 9d02d2e86964..41a6d5949ce6 100644
--- a/net-dns/unbound/unbound-1.5.10.ebuild
+++ b/net-dns/unbound/unbound-1.5.10.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
# is fixed.
CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
- >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}]
+ >=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
dnstap? (
diff --git a/net-dns/unbound/unbound-1.6.0.ebuild b/net-dns/unbound/unbound-1.6.0.ebuild
new file mode 100644
index 000000000000..b06288a256bf
--- /dev/null
+++ b/net-dns/unbound/unbound-1.6.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="http://unbound.net/"
+SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug dnstap +ecdsa gost libressl python selinux static-libs test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+ >=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+ libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ dnstap? (
+ dev-libs/fstrm[${MULTILIB_USEDEP}]
+ >=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+ )
+ ecdsa? (
+ !libressl? ( dev-libs/openssl:0[-bindist] )
+ )
+ python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${CDEPEND}
+ python? ( dev-lang/swig )
+ test? (
+ net-dns/ldns-utils[examples]
+ dev-util/splint
+ app-text/wdiff
+ )"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+ net-dns/dnssec-root"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ enewgroup unbound
+ enewuser unbound -1 -1 /etc/unbound unbound
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # To avoid below error messages, set 'trust-anchor-file' to same value in
+ # 'auto-trust-anchor-file'.
+ # [23109:0] error: Could not open autotrust file for writing,
+ # /etc/dnssec/root-anchors.txt: Permission denied
+ epatch "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+
+ # required for the python part
+ multilib_copy_sources
+}
+
+src_configure() {
+ [[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ econf \
+ $(use_enable debug) \
+ $(use_enable gost) \
+ $(use_enable dnstap) \
+ $(use_enable ecdsa) \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_with python pythonmodule) \
+ $(multilib_native_use_with python pyunbound) \
+ $(use_with threads pthreads) \
+ --disable-flto \
+ --disable-rpath \
+ --with-libevent="${EPREFIX}"/usr \
+ --with-pidfile="${EPREFIX}"/var/run/unbound.pid \
+ --with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+ --with-ssl="${EPREFIX}"/usr \
+ --with-libexpat="${EPREFIX}"/usr
+
+ # http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+ # $(use_enable debug lock-checks) \
+ # $(use_enable debug alloc-checks) \
+ # $(use_enable debug alloc-lite) \
+ # $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --modules
+ use python && python_optimize
+
+ newinitd "${FILESDIR}"/unbound.initd unbound
+ newconfd "${FILESDIR}"/unbound.confd unbound
+
+ systemd_dounit "${FILESDIR}"/unbound.service
+ systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+ systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+ dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+ # bug #315519
+ dodoc contrib/unbound_munin_
+
+ docinto selinux
+ dodoc contrib/selinux/*
+
+ exeinto /usr/share/${PN}
+ doexe contrib/update-anchor.sh
+}
diff --git a/net-misc/flexget/metadata.xml b/net-misc/flexget/metadata.xml
index 851d3e21be08..2fc6355e0d08 100644
--- a/net-misc/flexget/metadata.xml
+++ b/net-misc/flexget/metadata.xml
@@ -1,10 +1,7 @@
-
- floppym@gentoo.org
- Mike Gilbert
-
+
diff --git a/net-misc/libreswan/libreswan-3.17.ebuild b/net-misc/libreswan/libreswan-3.17.ebuild
index f1cdc86431ee..9cae013c203c 100644
--- a/net-misc/libreswan/libreswan-3.17.ebuild
+++ b/net-misc/libreswan/libreswan-3.17.ebuild
@@ -23,7 +23,7 @@ IUSE="caps curl dnssec ldap pam"
COMMON_DEPEND="
dev-libs/gmp:0=
- dev-libs/libevent
+ dev-libs/libevent:0=
dev-libs/nspr
caps? ( sys-libs/libcap-ng )
curl? ( net-misc/curl )
diff --git a/net-misc/libreswan/libreswan-3.18.ebuild b/net-misc/libreswan/libreswan-3.18.ebuild
index 499660655c49..71e3301281df 100644
--- a/net-misc/libreswan/libreswan-3.18.ebuild
+++ b/net-misc/libreswan/libreswan-3.18.ebuild
@@ -23,7 +23,7 @@ IUSE="caps curl dnssec ldap pam systemd"
COMMON_DEPEND="
dev-libs/gmp:0=
- dev-libs/libevent
+ dev-libs/libevent:0=
dev-libs/nspr
caps? ( sys-libs/libcap-ng )
curl? ( net-misc/curl )
diff --git a/net-misc/libreswan/libreswan-9999.ebuild b/net-misc/libreswan/libreswan-9999.ebuild
index 499660655c49..71e3301281df 100644
--- a/net-misc/libreswan/libreswan-9999.ebuild
+++ b/net-misc/libreswan/libreswan-9999.ebuild
@@ -23,7 +23,7 @@ IUSE="caps curl dnssec ldap pam systemd"
COMMON_DEPEND="
dev-libs/gmp:0=
- dev-libs/libevent
+ dev-libs/libevent:0=
dev-libs/nspr
caps? ( sys-libs/libcap-ng )
curl? ( net-misc/curl )
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.13.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.13.ebuild
index 1b0f576b62ef..6d1e24c56655 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.13.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.13.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils multilib flag-o-matic autotools autotools-utils
+inherit eutils multilib flag-o-matic autotools autotools-utils linux-info
DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
HOMEPAGE="http://lksctp.sourceforge.net/"
@@ -21,6 +21,9 @@ RDEPEND=""
REQUIRED_USE="kernel_linux"
+CONFIG_CHECK="~IP_SCTP"
+WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
+
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.0.8-prefix.patch #181602
epatch "${FILESDIR}"/${P}-build.patch
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
index 1ccb9b7dce92..8e916c902b71 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils multilib flag-o-matic autotools autotools-utils
+inherit eutils multilib flag-o-matic autotools autotools-utils linux-info
DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
HOMEPAGE="http://lksctp.sourceforge.net/"
@@ -21,6 +21,9 @@ RDEPEND=""
REQUIRED_USE="kernel_linux"
+CONFIG_CHECK="~IP_SCTP"
+WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
+
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.0.8-prefix.patch #181602
eautoreconf
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
index 2d6ad050d3c0..fedd06cc6c17 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils multilib flag-o-matic autotools autotools-utils
+inherit eutils multilib flag-o-matic autotools autotools-utils linux-info
DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
HOMEPAGE="http://lksctp.sourceforge.net/"
@@ -21,6 +21,9 @@ RDEPEND=""
REQUIRED_USE="kernel_linux"
+CONFIG_CHECK="~IP_SCTP"
+WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
+
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.0.8-prefix.patch #181602
eautoreconf
diff --git a/net-misc/netctl/metadata.xml b/net-misc/netctl/metadata.xml
index a604eb0048a1..18e140956483 100644
--- a/net-misc/netctl/metadata.xml
+++ b/net-misc/netctl/metadata.xml
@@ -1,10 +1,6 @@
-
- floppym@gentoo.org
- Mike Gilbert
-
hwoarang@gentoo.org
Markos Chandras
diff --git a/net-misc/ntp/ntp-4.2.8_p8.ebuild b/net-misc/ntp/ntp-4.2.8_p8.ebuild
index b82171ee7e7c..ccb745f001ee 100644
--- a/net-misc/ntp/ntp-4.2.8_p8.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p8.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
- >=dev-libs/libevent-2.0.9[threads?]
+ >=dev-libs/libevent-2.0.9:=[threads?]
kernel_linux? ( caps? ( sys-libs/libcap ) )
zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
!openntpd? ( !net-misc/openntpd )
diff --git a/net-misc/ntp/ntp-4.2.8_p9.ebuild b/net-misc/ntp/ntp-4.2.8_p9.ebuild
index 76cfd867b4be..4d311859b78b 100644
--- a/net-misc/ntp/ntp-4.2.8_p9.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p9.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~
IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
- >=dev-libs/libevent-2.0.9[threads?]
+ >=dev-libs/libevent-2.0.9:=[threads?]
kernel_linux? ( caps? ( sys-libs/libcap ) )
zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
!openntpd? ( !net-misc/openntpd )
diff --git a/sys-apps/systemd/files/233-systemd-user-pam.patch b/sys-apps/systemd/files/233-systemd-user-pam.patch
new file mode 100644
index 000000000000..eb2223e52f27
--- /dev/null
+++ b/sys-apps/systemd/files/233-systemd-user-pam.patch
@@ -0,0 +1,16 @@
+--- a/src/login/systemd-user.m4
++++ b/src/login/systemd-user.m4
+@@ -2,11 +2,7 @@
+ #
+ # Used by systemd --user instances.
+
+-account required pam_unix.so
+-m4_ifdef(`HAVE_SELINUX',
+-session required pam_selinux.so close
+-session required pam_selinux.so nottys open
+-)m4_dnl
+-session required pam_loginuid.so
++account include system-auth
++session include system-auth
+ session optional pam_keyinit.so force revoke
+ session optional pam_systemd.so
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index cf316ac25078..fd6a46faec39 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -156,7 +156,7 @@ src_prepare() {
PATCHES+=(
"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
"${FILESDIR}/228-noclean-tmp.patch"
- "${FILESDIR}/232-systemd-user-pam.patch"
+ "${FILESDIR}/233-systemd-user-pam.patch"
)
fi
diff --git a/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild b/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild
index 84092fc3c590..ce3100c87b9d 100644
--- a/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild
+++ b/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
LICENSE="hp-proliant-essentials"
SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
IUSE=""
DEPEND=""
diff --git a/sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild b/sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild
index 1c2551da41bf..3e00d8487b6d 100644
--- a/sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild
+++ b/sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="hpe"
SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
IUSE=""
DEPEND=""
diff --git a/sys-block/storcli/storcli-1.19.04.ebuild b/sys-block/storcli/storcli-1.19.04.ebuild
index 4e059c1a68ae..3d59f4a8e891 100644
--- a/sys-block/storcli/storcli-1.19.04.ebuild
+++ b/sys-block/storcli/storcli-1.19.04.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://docs.avagotech.com/docs-and-downloads/docs-and-downloads/raid-co
LICENSE="Avago LSI BSD"
SLOT="0/6.11"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
IUSE=""
RDEPEND=""
diff --git a/sys-kernel/dracut/dracut-044-r1.ebuild b/sys-kernel/dracut/dracut-044-r1.ebuild
index c873fd671dcf..bc24acbb2369 100644
--- a/sys-kernel/dracut/dracut-044-r1.ebuild
+++ b/sys-kernel/dracut/dracut-044-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://dracut.wiki.kernel.org"
SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug selinux systemd"
RESTRICT="test"
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 636cd8a42f31..aa90c34be4af 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -16,6 +16,9 @@ DIST genpatches-3.12-63.extras.tar.xz 18232 SHA256 64c0a576b6a5986b4387686bc0a7c
DIST genpatches-3.12-66.base.tar.xz 1844776 SHA256 17fa905b1cfe3e845ec47f6c517727154c36b25479a574ff3424af6761306f40 SHA512 0b42060eab396eaeba2e5da38dc67660d8d8687a016ad417d6cb78618464f0e75206e7f3996c0535f0993d0c2bc80631ae859b2d9e5e9646448cf3a65c8cf44a WHIRLPOOL 9ec54c043419d52ee771173df0173d3eba4bdc7205f22e41021b695e637eb598097f7c80256906d49d5a799a9cbc378ed45389cae51b79f717b01065f813fff0
DIST genpatches-3.12-66.experimental.tar.xz 46536 SHA256 d35f0563107c6469abd12a933f21f19a7b60f79a044149206d3c58f1472f168b SHA512 b9b75b10534aef49b83eb5fcdc9861fe6d5287ded738cf1d79ef44b15fb87c0abeeeea5078646f421987d8798182cdff20d82c60f5b012b7395345daec14c3c9 WHIRLPOOL a68d75e9efe3367d6820c201c0b94af010e05d1906408ee133bad2697b938f195845755b68fbca3a7ed84d8c0d4c94a1c10587bc19ce32865dac59c2fc746467
DIST genpatches-3.12-66.extras.tar.xz 18464 SHA256 612f1d0841c9a27eaf726854ca214698ac3e8270d42648f4b875f750c15503fb SHA512 c9bc7bfb5363f473daee773e1e06611150478d0dbff1305624c727a5c14b7fdf2177740bee360f466f1e8acb33a3e1af12b8aff05404b297d55d8932c16651ba WHIRLPOOL 245aebec8b402ca29b52c310214a9486d93eb82faff5561828ba00501a3bf78bc67972acba93c04992b33ca7253434cd39067781d6306eff2a45c26d730996c2
+DIST genpatches-3.12-68.base.tar.xz 1852508 SHA256 4c87922b89d247d43c4013bf733939b17e77e6da840669acd8173fabce9d3bf5 SHA512 894d38201ce130db08983292746b1772e7a35492eca797bf0445170a7b82101e0c12434b6463d637663aebaf1bc1c3662842a4fa5e1cbc30c8b9c6bbf60d3176 WHIRLPOOL 5651903d1e970097a26fa80820886455f095a51aa1e07063696d942c2286d9d27666630ba2dd0574859d605bfc2dcafaa46996b50952138c71a59c4d2d797852
+DIST genpatches-3.12-68.experimental.tar.xz 46524 SHA256 26f8e12be87a4844c9d499c44353696ca231347033787cd76ac0c7ef50f3f7ec SHA512 443abf84ba240167ce7c417eb9fc215b5d6ccbc94212d1c0a5f5aa6788321db69a4f239dc4a8a61dc572b4640b5257f05150dae32400b5f7ff9219ddce8a206c WHIRLPOOL 4c1f56cd8fa24c1cbdea7e32230e31e51ab309a5cff6b8752a3980f8067fc9988eda94e0331367a7bbd01f135d0957aba3d463907274c9879909dad556117cc6
+DIST genpatches-3.12-68.extras.tar.xz 18452 SHA256 6c1d7324bfddf099e94c00f8886296cff4d8327fd7addba5c9a4346107564b0f SHA512 4a49ed8b2f0d0035d1423075b6ed98b4eeba01e77b7a0a6e3f52a9b1729be12e8772c1a23153a5601086998ac8a7e32807f93df942541014a658e9f7972b0005 WHIRLPOOL 59c4515cd8390334ff4cd12e68dfcfee474e9de1762a87ee6a3376151949f9851afaa7a3a24554070aba49dd6d4d344ea864fe722a904e470e419d9c5d5acb9a
DIST genpatches-3.14-65.base.tar.xz 1118344 SHA256 fdbaf042acdacca6c02b602638980ec661cbce979600391e94cca031d45ef6f2 SHA512 28bb3f51b5d0b45bc18d54fc04eb975a7c61bf5c28539cc6a6466bc22611ec3b91ecf5b9f79053082e3907e0980c2d97a1e22eb25e75157e4dc54ccf1d9a16bc WHIRLPOOL f776e32318fe8e4c468cacc907aa32554b74dac0f5a1ce785acb80a40b52643977c283b469d6d5ba895ead477f246e409a99d6e686cd3686b4b6ecaff4a97ef0
DIST genpatches-3.14-65.experimental.tar.xz 60300 SHA256 f0e047dc68af01750fc2b2cfb76694cecb391e4de657810b2de2a9092bbb0eeb SHA512 c2125a73aba4fe51c1efc6a73a86088964bff398c2409e256148d0f13e8106b56e6c8137e0943332be2524b3230f522e0b76b265d20ef075d852a5a3ca21edf0 WHIRLPOOL 5042375ab3541e65f609deb48a03d186b53d583b4512c27ece06130c0ac4fcebeb8256bf9cb38276720e8fc6610dc8663819ec5acd3bdcc57232a1d2082f25b5
DIST genpatches-3.14-65.extras.tar.xz 18256 SHA256 9220e49d4a95d876373ec40fae2e026bcd76efb5e33106bf2350026120b28244 SHA512 2699115a2a176a34570b1045f1ca6f5f23e46eb974c9c4953607919f7e5668e1b317b197cd39aa375347460110e9c67231b0315eddb9ed4d8fb631b453f802bf WHIRLPOOL ecb98ae1bca845efbd5dc32bfba31268bef55c73ad35092796c8c4d3661a72341e1a179833ef76d701ede477b9d436a2c45c16ca9b2bc23bec413e0186848285
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.69.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.69.ebuild
new file mode 100644
index 000000000000..2f00b70b0566
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.12.69.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="68"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 3558e3162ce9..0b29fa6ffdfe 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -9,7 +9,7 @@ DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f1
DIST linux-4.8.tar.xz 91966856 SHA256 3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a SHA512 a48a065f21e1c7c4de4cf8ca47b8b8d9a70f86b64e7cfa6e01be490f78895745b9c8790734b1d22182cf1f930fb87eaaa84e62ec8cc1f64ac4be9b949e7c0358 WHIRLPOOL 3888c8c07db0c069f827245d4d7306087f78f7d03e8240eb1fcd13622cd5dbe1c17cd8ed7dc11513f77f3efd5dbd84e2b48e82bdb9b9bfd2242fd62ae32812d5
DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
DIST patch-3.10.104.xz 1334560 SHA256 608f95c32091f45736bbb5011ef5d2fb98743ea373eeadfd31b5de0363b631af SHA512 9d59cd51fdcd25b43eaacfc14b7119a62f55076873f1e35dd9bae89f81de30cef580ba9df5698b7e8ffc68790ae13fa2254f2a7a528849c3143c3cc2ea6ec3ea WHIRLPOOL 151679a249e3f3f833c3203079a61b2299f80617fb560fcda1b9521acef5fe713cceb75009c336c76b497eec715cbfe0a11501c95e3130816aebbb51993169f0
-DIST patch-3.12.68.xz 1687188 SHA256 74886f69bc64d6410b95c7fd6dd0b1ce5714e03453054ffef388d341e337c9fc SHA512 b98e6ee8b5c0ecd56d5ca71d48706d7b7569e5dcdfe455079ca7079d3314155910cd2b08a934e34102a0a0972d7b42491848124e1da4fccd811d15a0da726a3e WHIRLPOOL 156ab185641b919f076c8e03ed73a5868243d59e80adc617f832932424c9bc34dc47aba1a7710859a5ef6edc08360d16e325df88df259c7d01e0f4f5e19cecb9
+DIST patch-3.12.69.xz 1692660 SHA256 b0223790f71f31ef54189838bfd881aea910754de8708baf95db9bb91edf3202 SHA512 89e609adc11a51f95077495220d828b76eeeb65618242d37286d42dee14cf4f558d7d4d57a7b572862529da16a2189659ec725c6b03292a18cffccf363bf1893 WHIRLPOOL 3a105ce9f6a951c5ae14f0bdea45d1198fbf7bccc228d838f6a23cbfc67763cba133cc5f25ef1dbbfe617d9495da2aaa7a46392f5fb15863fe258e5824ecb508
DIST patch-3.16.39.xz 1374928 SHA256 fc3d19e5b3628aac93ca662082fb2e2461288fef57f27171ab80167d72787762 SHA512 b82109c62574270a461df8cca9873ec67ead7cd975d79ca3db6078b815cec176ef7ee8ff75f064305b5dee18aa4f231165978aab20cc07e217b28f0f8a980e91 WHIRLPOOL 892023a234760e13bc5f93656e1176b9ea324431850fa35fe184fb684d0dd5c738bcebd1c9618bb97218c1276ec4bef4c3fd6ed3e217d283b142171d534a5cbc
DIST patch-3.18.45.xz 1061080 SHA256 fe0515a810781063e59585641f747356e96888b492c475cfd6fc9f9c8e7b6c03 SHA512 9d0567a936a677a2887f493ce9c5f536106e4e7d7a064eef24e720e39c1c3287fd9af7ff5503222eb8aea4ab9f95528c79c510a85ee1324767349be77ebe3175 WHIRLPOOL 47949493b3721009c2f81ddce2a432c62804fe16ab4ff085003666e6b1e09d1c79e95c1573af57a7b190e88c3ba12a4578312b233dff15409eb85c593cec37de
DIST patch-3.2.84.xz 1649140 SHA256 6ba37e79fc13c7c62ac368258731fe6111f194b5ae279f742b042aaf2ca73eb9 SHA512 0ac685d6a2434cefaf4e099aeb39d5bf5dced6cf5be1140225e14e960744e8b78faf64957cdda6c53b6e01b9578a3bad8b9f745e9cb2a89b89aa7400223b913f WHIRLPOOL df6fb1421189b47d300ef7bc77ce61b245860d30e901bc7d918463c78ed5452e7d0668a8e30eb0d84238b714b7454c3026769e2000dc1378074e0cadc402cca4
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.12.68.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.12.69.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.12.68.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.12.69.ebuild