Sync with portage [Sat Aug 27 00:37:27 MSK 2016].

8 years ago · d2afec4d1b
parent bdf600ecc9
commit d2afec4d1b
75 changed files with 2017 additions and 23 deletions
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@ -4,3 +4,4 @@ DIST puppetdb-4.1.0.tar.gz 22315267 SHA256 c06320f4befd5422308af38f44d76986c14b5
 DIST puppetdb-4.1.2.tar.gz 22313557 SHA256 d0752931e57ed7c524e4de2f0aa68aa13986db9aeb1a059782d65c063c028773 SHA512 fa53493ea0af7b2441de4572b836289346d0f8d7cd6b6fecabaccca6b21f6686dcee0dc1280c38001347b3e3214b11512ae402587385114c654a7c1a9bbfb670 WHIRLPOOL 8fee8fe966d8b848f8b6fbfc05f176313c32e3c0e112520571ee9eba98e6895732787d455ca70cf3cbe8d8ac8d8fbd34dc50c6b794b2d85b90b93bf62dd047b2
 DIST puppetdb-4.2.0.tar.gz 22410191 SHA256 cd5e62c826bb13fbfe5a5ceae24c41a1e8f7bb1bb33c191efa50ba010e82b52c SHA512 75391761d8d72edc33417bd0157191c38c5a1ef7db72ad39c1858c973d678e2455ba403737c94457c20199393c78d83da547d2e703025b5ae6c743f36d13a532 WHIRLPOOL 4ac8fe28b189b84174ae5221c7074fe2425f3d1d6e25fcc1cdc1f123e1eb60eccf98549d4a12442cb7578361c58c7b1b1ac791e452a39dae669a2dd38c4c158e
 DIST puppetdb-4.2.1.tar.gz 22408841 SHA256 3d9ee12a3713046d57b6b1eb8cfd36643037cb06ac7e9573f00490a40e337666 SHA512 93fd8fbfd0f142f9da761e54ee578be163ab9d8e70cf278c7e2c1b981a7bd03dd0aa9d1a6909d36ee2e5e1d42ab227984749e584b2c32083ba0ef36d23c607b2 WHIRLPOOL ae54f063352aa50ffe1431940cc8db69562fda62e23050532e8a0786905dfc5e0829862fced827961bd103a3bf3f3601c6fda556b31f93da42529b45d039c217
+DIST puppetdb-4.2.2.tar.gz 22423081 SHA256 21f02707e6c7a544e95897ffbb4bfa755cdeed04fbc75220b7e63b353e8f385a SHA512 fde6a37eef88dd484c7654935ba059be6ac0bc088b60c1689ce61f5fd89c0fa1eb898460b973f422f457fe8eeaed073e19d0d8420b7ac5075164d180dca690da WHIRLPOOL 3b84daffda9e64cd34d07c78c91a5f4bc41a3687fcfb1bcd90d7451520e0081fd37d5d6989d3534cc7c7f9f506f4a47847da3aaa9cfb82d027c67ceabde02208
--- a/app-admin/puppetdb/puppetdb-4.2.2.ebuild
+++ b/app-admin/puppetdb/puppetdb-4.2.2.ebuild
@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.7.0"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppetdb
+	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/export
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/import
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym /opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@ -1,5 +1,6 @@
 DIST mariadb-10.0.25.tar.gz 57459461 SHA256 4540832c18112a332f61f4eeb57140890c4e2188ae12b312f4e2e8a0363553e4 SHA512 7d07834dcd5a89ac276c0a85ca3ab99c630cc3768d3576ac7c1038698e3633803ae0ec0f27619c271ccd79371885f6b3f2a67d36b17ecf76432ba90760fbb96d WHIRLPOOL 011400ec5d2fc99d4426315cb5190cf2888d65f47535bfa7cc0c97b89915a029ec76d956dbc4635a18bcd42bc84905da08ea73c6c75eb9e955385b5f586c737c
 DIST mariadb-10.0.26.tar.gz 57621647 SHA256 578538d9b51f455cbd0cb021f523284a45480b4bba853b4a79f3497c49ec40c0 SHA512 7291a91cc0e17bcedbba6e93cf05679f3119efcd588b249beb423e9ac5152d1c0add9321a4dc0a59ac94ca16d5d733983234a64b7b555183b6312a045dc8991c WHIRLPOOL c09aba18191c476920fa2b39558ed5e64df1e77029ed913ffc2f34299402b89b03a3fefc711295cb58db346e84d8865fb8dabe78daa47e996c257dd9ea4a5d84
+DIST mariadb-10.0.27.tar.gz 63258508 SHA256 bdf3a0c25aa2bc7a22a47e994eb7c8aa782624810eb3156038cc62bc9085c0cd SHA512 c3aa415b7fc766dce34c99795cfcfa424a8d7eb7ee19497f1a61cad7c708914b94d66eabb104dff364b2db77d07471ce810d708ec541efb1bed7291ca1ce7364 WHIRLPOOL 9a90edc10d482140da818bee7598dd1b468076091478fb63e19f475d8a3af6e059f04d85851b701b6e305b9912aefa7bbfa0b0045c075db8d9f16c30944da584
 DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d
 DIST mariadb-10.1.13.tar.gz 55272572 SHA256 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d SHA512 fdaa35f1a93e2a124339f3a4a85d7247c223ffec2cd7ed36f029f63a76bd348b8f41f491e5b2f81f53bed82ed79bc89b62dd6966d5a946910299070ece667b5e WHIRLPOOL 0ff2891af910380749be8b31bdacec02777cc4f2b474172b3257cecc10b900222c3c089515c9fd4621ea75ea58179b1f1336b7c26185ec43282df0ce661e621d
 DIST mariadb-10.1.14.tar.gz 55341017 SHA256 18e71974a059a268a3f28281599607344d548714ade823d575576121f76ada13 SHA512 dad8f296320f95b2ab2f3a9e888c1829df63229cb8c76161ad004c6c1a1a488f0db7918e3e655de04281dc65aab71f6e5d9ecab75e6071521799631355cfeadf WHIRLPOOL 6788513c58e1b0875dba4a2f661a161e6d7a355503ff018c75cc298b8b2609e2d720a1c572904214aebc34aa71e394bb5eb1df8f6808ecf39b84aa72656b5a6a
--- a/dev-db/mariadb/mariadb-10.0.27.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.27.ebuild
@ -0,0 +1,208 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+MY_EXTRAS_VER="20160629-1442Z"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+PATCHES=(
+	"${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
+	"${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.26.patch"
+	"${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
+	"${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch"
+)
+COMMON_DEPEND="
+	!bindist? ( >=sys-libs/readline-4.1:0=	)
+	server? (
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( virtual/pam:0= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+	${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
+"
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+	/usr/include/mysql/private/probes_mysql_nodtrace.h
+	/usr/include/mysql/private/probes_mysql_dtrace.h )
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	mysql-multilib-r1_pkg_setup
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+	mysql-multilib-r1_pkg_preinst
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+	mysql-multilib-r1_src_prepare
+}
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+			-DWITH_JEMALLOC=$(usex jemalloc system)
+			-DWITH_PCRE=system
+	)
+	if use server ; then
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			MYSQL_CMAKE_NATIVE_DEFINES+=(
+				-DWITHOUT_FEDERATED=1
+				-DWITHOUT_FEDERATEDX=1 )
+		fi
+
+		MYSQL_CMAKE_NATIVE_DEFINES+=(
+			$(mysql-cmake_use_plugin oqgraph OQGRAPH)
+			$(mysql-cmake_use_plugin sphinx SPHINX)
+			$(mysql-cmake_use_plugin tokudb TOKUDB)
+			$(mysql-cmake_use_plugin pam AUTH_PAM)
+			-DWITHOUT_CASSANDRA=0
+			$(mysql-cmake_use_plugin extraengine SEQUENCE)
+			$(mysql-cmake_use_plugin extraengine SPIDER)
+			$(mysql-cmake_use_plugin extraengine CONNECT)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			-DWITHOUT_MROONGA=1
+		)
+	fi
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if use server ; then
+
+		# Bug #213475 - MySQL _will_ object strenously if your machine is named
+		# localhost. Also causes weird failures.
+		[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might run out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql main.bootstrap
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock
+		# main.mysql_client_test_comp:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+
+#main.bootstrap \
+#		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+#			main.mysql_client_test_comp \
+#			binlog.binlog_statement_insert_delayed main.information_schema \
+#			main.mysqld--help \
+#			archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+#			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+#				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+#		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}" || die
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd || die
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@ -1,2 +1,3 @@
 DIST mysql-extras-20160307-1854Z.tar.bz2 298005 SHA256 a6516841d24670a1802e28fd66d4f540b16367396e6b2f687b8429b8e6a5d865 SHA512 d90081bd910dfffe6e1ac250465c0dbd9968edbdfe08f25f213ec328028fbb6fdb016816846c7fcee9202b9b93f4868edaff44ee04a0554cc93c6ecbf088db8f WHIRLPOOL f971804db83f42d717da318deeb647c1b294fa0967db7073e7f83d0fa15476d68089201430aaa882d90d5223a41a1a1668cfbe82bb897dcf864925e3da715c10
 DIST percona-server-5.6.31-77.0.tar.gz 55086290 SHA256 955fefc5a0a69b2cd44db64378678a773fb98e1260f68a067836473862c89fe7 SHA512 b166f3765052336b593bf2a3c3d0fa998d4ab413b2d86a494d6ef52689e04b7b681c95d434c67bb4536a818a8bebeaf27b519f274ba1ce8c447d36f7346858ee WHIRLPOOL f9ab27930c9727e9e70d992a7425ab5f2fdd575ebbe9c7b7436f9e72aff86bef65030a4b44afe5afda027aa8cd0f11d6a1303a8c262a0e60e12665d0dacb1676
+DIST percona-server-5.6.32-78.0.tar.gz 55120585 SHA256 b3f9191dd8660ba4f825c5fa8fa470e66417335ad8455e31bbc2d5f2cac1a923 SHA512 958cc27351c507410fe2a0a7a126ec36a25d1ced19ec6b2a4996a011c65c4f0e42d6a3235e21511f38677762dd8e0efe436fee67a5bf3db64b2c8b25520c43e5 WHIRLPOOL ef821cf1f9a5e3377bda96159d04f179f8ee9e8ef75ccfaed3512626ec51baf197e425b9fe39a300e7898824d7e76187d22314c07b1535bd7e7e00626fde2923
--- a/dev-db/percona-server/metadata.xml
+++ b/dev-db/percona-server/metadata.xml
@ -11,6 +11,7 @@
  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
  <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
  <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
+  <flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
  <flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
  <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
  <flag name="server">Build the server program</flag>
--- a/dev-db/percona-server/percona-server-5.6.32.78.0.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.32.78.0.ebuild
@ -0,0 +1,216 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+MY_EXTRAS_VER="20160307-1854Z"
+SUBSLOT="18"
+PYTHON_COMPAT=( python2_7 )
+inherit linux-info python-any-r1 mysql-multilib-r1
+
+IUSE="numa pam tokudb tokudb-backup-plugin"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+HOMEPAGE="http://www.percona.com/software/percona-server"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+COMMON_DEPEND="numa? ( sys-process/numactl:= )
+	server? ( pam? ( virtual/pam:0= ) )
+	tokudb? ( app-arch/snappy )
+	tokudb-backup-plugin? ( dev-util/valgrind )
+	"
+
+DEPEND="${COMMON_DEPEND}
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	test? ( $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]') )"
+RDEPEND="${COMMON_DEPEND}"
+
+REQUIRED_USE="tokudb? ( jemalloc ) tokudb-backup-plugin? ( tokudb )"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
+	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
+	"${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.6.20.patch
+	"${MY_PATCH_DIR}"/20006_all_cmake_elib-percona-5.6.29.patch
+	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
+	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink.patch
+	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
+	"${MY_PATCH_DIR}"/20018_all_percona-server-5.6.25-without-clientlibs-tools.patch
+)
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+pkg_pretend() {
+	mysql-multilib-r1_pkg_pretend
+
+	if use numa; then
+		local CONFIG_CHECK="~NUMA"
+
+		local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
+		WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
+
+		check_extra_config
+	fi
+}
+
+python_check_deps() {
+	has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITH_NUMA=$(usex numa)
+			-DWITH_PAM=$(usex pam)
+			$(mysql-cmake_use_plugin tokudb TOKUDB)
+	)
+	if use tokudb ; then
+		# TokuDB Backup plugin requires valgrind unconditionally
+		MYSQL_CMAKE_NATIVE_DEFINES+=(
+			$(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1)
+		)
+	fi
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='extraengine perl openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild percona-server-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ $UID -eq 0 ]]; then
+		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	# Silence repoman, this is only valid in tests
+	if use test ; then
+		addpredict /this-dir-does-not-exist/t9.MYI
+	fi
+
+	# Run CTest (test-units)
+	cmake-utils_src_test
+	retstatus_unit=$?
+	[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+	# Enable parallel testing, auto will try to detect number of cores
+	# You may set this by hand.
+	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+	# create directories because mysqladmin might right out of order
+	mkdir -p "${T}"/var-tests{,/log}
+
+	# These are failing in Percona 5.6 for now and are believed to be
+	# false positives:
+	#
+	# main.information_schema, binlog.binlog_statement_insert_delayed,
+	# main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter
+	# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt
+	# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers
+	# engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate
+	# engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8
+	# engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate
+	# fails due to USE=-latin1 / utf8 default
+	#
+	# main.mysql_client_test:
+	# segfaults at random under Portage only, suspect resource limits.
+	#
+	# main.percona_bug1289599
+	# Looks to be a syntax error in the test file itself
+	#
+	# main.variables main.myisam main.merge_recover
+	# fails due to ulimit not able to open enough files (needs 5000)
+	#
+	# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+	# Called with bad parameters should be reported upstream
+	#
+
+	local t
+
+	for t in main.mysql_client_test \
+		binlog.binlog_statement_insert_delayed main.information_schema \
+		main.mysqld--help-notwin binlog.binlog_mysqlbinlog_filter \
+		perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
+		funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
+		main.variables main.myisam main.merge_recover \
+		engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate \
+		engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
+		engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
+		main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
+			mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	if use numa && use kernel_linux ; then
+		# bug 584880
+		if ! linux_config_exists || ! linux_chkconfig_present NUMA ; then
+			for t in sys_vars.innodb_buffer_pool_populate_basic ; do
+				mysql-multilib-r1_disable_test "$t" "Test $t requires system with NUMA support"
+			done
+		fi
+	fi
+
+	if ! use extraengine ; then
+		# bug 401673, 530766
+		for t in federated.federated_plugin ; do
+			mysql-multilib-r1_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
+		done
+	fi
+
+	# Run mysql tests
+	pushd "${TESTDIR}" || die
+
+	# Set file limits higher so tests run
+	ulimit -n 3000
+	python_setup
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+		--testcase-timeout=30 --reorder
+	retstatus_tests=$?
+	[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+
+	popd || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	if [[ -n "$failures" ]]; then
+		has usersandbox $FEATURES && eerror "Some tests may have failed due to FEATURES=usersandbox"
+		die "Test failures: $failures"
+	fi
+
+	einfo "Tests successfully completed"
+}
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@ -1,3 +1,4 @@
 DIST openssl-0.9.8zh.tar.gz 3818524 SHA256 f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6 WHIRLPOOL 8ed3362e6aed89cd6ae02438bc3fb58ff3a91afb8a2d401d1d66c1ee4fd96f4befb50558131dd03a60fc15b588172fc1ede5d56bb1f68e184453bfe3b34f9abf
 DIST openssl-1.0.2g.tar.gz 5266102 SHA256 b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33 SHA512 4d96b6c8a232203483d6e8bee81da01ba10977bfbac92f25304a36dec9ea584b7ef917bc45e097cc7dbe681d71a4570d649c22244c178393ae91fab48323f735 WHIRLPOOL aedbd82af0a550e8329a84312fae492f3bb3cb04af763fc9ef532099b2b2e61a55e4a7cfb06085f045740e2b692bbdb3ecb8bf5ca82f46325c3caf22d2317ffb
 DIST openssl-1.0.2h.tar.gz 5274412 SHA256 1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 SHA512 780601f6f3f32f42b6d7bbc4c593db39a3575f9db80294a10a68b2b0bb79448d9bd529ca700b9977354cbdfc65887c76af0aa7b90d3ee421f74ab53e6f15c303 WHIRLPOOL 41b6cf0c08b547f1432dc8167a4c7835da0b6907f8932969e0a352fab8bdbb4d8f612a5bf431e415d93ff1c8238652b2ee3ce0bd935cc2f59e8ea4f40fe6b5d6
+DIST openssl-1.1.0.tar.gz 5146831 SHA256 f5c69ff9ac1472c80b868efc1c1c0d8dcfc746d29ebe563de2365dd56dbd8c82 SHA512 6a99d391be7708fdc4eb097d27cea4ce79dc83cc7f52d353af1e222773e586405c0848557d7404716b92b23b775abed45e73c66fe9128f4bd7c09864e79317b0 WHIRLPOOL 9d38954c65073a8d02caa6aa00b1efc197391b38b341662f0d9967ce883f52eed8c3be84ebd6ecc89c494f725218bfd2bef395891a20b40c8dcdf6b31fba2131
--- a/dev-libs/openssl/files/openssl-1.1.0-ldflags.patch
+++ b/dev-libs/openssl/files/openssl-1.1.0-ldflags.patch
@ -0,0 +1,11 @@
+--- openssl-1.1.0-pre4/Makefile.shared
+++ openssl-1.1.0-pre4/Makefile.shared
+@@ -175,7 +175,7 @@
+ 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
+ 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+ 	$(DO_GNU_SO_COMMON)
+-DO_GNU_APP=LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,-rpath,$(LIBRPATH)"
+DO_GNU_APP=LDFLAGS="$(CFLAGS) $(LDFLAGS)"
+ 
+ #This is rather special.  It's a special target with which one can link
+ #applications without bothering with any features that have anything to
--- a/dev-libs/openssl/openssl-1.1.0.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0.ebuild
@ -0,0 +1,242 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+asm bindist rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-ldflags.patch #327421
+	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
+)
+
+src_prepare() {
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		epatch "${PATCHES[@]}"
+		epatch_user #332661
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PF}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# show the actual commands in the log
+	sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	echoit \
+	./${config} \
+		${sslout} \
+		--api=1.1.0 \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		disable-deprecated \
+		$(use_ssl !bindist ec) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	# Fix quoting for sed
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+		-e 's:\\:\\\\:g' \
+	)
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+	dohtml -r doc/*
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
--- a/dev-ml/ocaml-redis/Manifest
+++ b/dev-ml/ocaml-redis/Manifest
@ -1,2 +1,3 @@
 DIST ocaml-redis-0.3.0.tar.gz 69120 SHA256 8ff583321aea5398af98688eb84d3c3581aba0df1d2c34b437e2ba5e70585e3d SHA512 84e57763d23b309adc7d112ff5c3b79307f4d3077ed177166b57d09b249062466c48b269bddf647438af760981c909e26296669a80778198832bf79151b29e2b WHIRLPOOL 57cf2a1644ebd93d15b8b9432de040026a7c0cbf9542405198bdf0a6b180cbc469005ca44cd9da1a010682df88b9e608dbcb366315fd47a2b8f91b4306ec8e32
 DIST ocaml-redis-0.3.1.tar.gz 69758 SHA256 5004f1d2c19ba1a8aae8b3096d04fbbbcab4bc3f6c50171cd8d1202c2d2a01e7 SHA512 a3cfa270dacda997330583a685dfc4c5748623e782bf54bf109736b8f95b0c3d6ce0d3fcbfaa73f92e5f03a547700b29cfdc6fb85864972cc55da951a84b28a2 WHIRLPOOL 0e033a7df950e7d6979c40de451170563015aa80331ecf36c0bf8340a9ed69a0618770889fc290681be8e6acd1c38b174385a5c8839293bd55194af92ad70059
+DIST ocaml-redis-0.3.2.tar.gz 71229 SHA256 c6ef7acc2a383d3a7422e74f162b2dcdc39a8e631503f58a0c4f6133e4de30e1 SHA512 e834574c2892551516c6709b241e393a3ad990f50ae8105a39b3e54bf3e44fe69a48da13cbd15019b298491af4bede6178fce6a580e8d9323dac926380127618 WHIRLPOOL 3aeceda3fc018d01e6fd1456f6b9479b8cba1526cc44acba79177a50abcc5401fd1f1d0fc7eaa6a2757771804b1b8e20118e64cf415eb9a7e373ea4f079f0601
--- a/dev-ml/ocaml-redis/ocaml-redis-0.3.2.ebuild
+++ b/dev-ml/ocaml-redis/ocaml-redis-0.3.2.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Redis bindings for OCaml"
+HOMEPAGE="http://0xffea.github.io/ocaml-redis/"
+SRC_URI="https://github.com/0xffea/ocaml-redis/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+lwt"
+
+RDEPEND="
+	dev-ml/ocaml-re:=
+	dev-ml/uuidm:=
+	lwt? ( dev-ml/lwt:= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit )"
+
+src_configure() {
+	oasis_configure_opts="$(use_enable lwt)" oasis_src_configure
+}
--- a/dev-python/batinfo/batinfo-0.3.ebuild
+++ b/dev-python/batinfo/batinfo-0.3.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""

 RDEPEND=""
--- a/dev-ros/collada_parser/Manifest
+++ b/dev-ros/collada_parser/Manifest
@ -1 +1,2 @@
 DIST robot_model-1.12.3.tar.gz 1292139 SHA256 4b2bf070e4d07450fd9977a62c260e8abb40645ff9fcf5f5781f505a8b61b194 SHA512 eae18db87bdd7fc867868493f54f1812358f1a301c88fc7eae611fa75bc2418165b5cb2f5c5839f3cb644d4c1f560f85d84b635ffbecaa631c78a3176d1fb6db WHIRLPOOL c555faee5282942db894866a08aa3a675c6db618fce2acdd1f67d622cf1c0a8e5747f5f9a5217b4fc83997f9bb9125f1c7f2ca6b77e9fd75244f121b48a77f66
+DIST robot_model-1.12.4.tar.gz 1293354 SHA256 e40bd4519fd4010bcde0cb179611a19c04c3a32073830a675090671b4cea0ee5 SHA512 f78bfd9a72d795e301836a7946d87250f4c8be2082593f7a0fb282831152bc8125885f30408ff99823c4dd1d606060b71695c1cc3097dee8870efe0fe862ab0d WHIRLPOOL cff984eec217cd4615f1bf316eaa255f0d7f2c531fede6d4764edd57a11277980b0aad87bee4af7e89b2fc56394c7d457a0bb50b103b22afc4f5f449824293e9
--- a/dev-ros/collada_parser/collada_parser-1.12.4.ebuild
+++ b/dev-ros/collada_parser/collada_parser-1.12.4.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin flag-o-matic
+
+DESCRIPTION="C++ parser for the Collada robot description format"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	>=dev-ros/urdf_parser_plugin-1.12.3-r1
+	dev-ros/roscpp
+	dev-ros/class_loader
+	dev-libs/urdfdom_headers
+	dev-libs/collada-dom
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/urdfdom1.patch" )
+
+src_configure() {
+	append-cxxflags -std=gnu++11
+	ros-catkin_src_configure
+}
--- a/dev-ros/collada_urdf/Manifest
+++ b/dev-ros/collada_urdf/Manifest
@ -1 +1,2 @@
 DIST robot_model-1.12.3.tar.gz 1292139 SHA256 4b2bf070e4d07450fd9977a62c260e8abb40645ff9fcf5f5781f505a8b61b194 SHA512 eae18db87bdd7fc867868493f54f1812358f1a301c88fc7eae611fa75bc2418165b5cb2f5c5839f3cb644d4c1f560f85d84b635ffbecaa631c78a3176d1fb6db WHIRLPOOL c555faee5282942db894866a08aa3a675c6db618fce2acdd1f67d622cf1c0a8e5747f5f9a5217b4fc83997f9bb9125f1c7f2ca6b77e9fd75244f121b48a77f66
+DIST robot_model-1.12.4.tar.gz 1293354 SHA256 e40bd4519fd4010bcde0cb179611a19c04c3a32073830a675090671b4cea0ee5 SHA512 f78bfd9a72d795e301836a7946d87250f4c8be2082593f7a0fb282831152bc8125885f30408ff99823c4dd1d606060b71695c1cc3097dee8870efe0fe862ab0d WHIRLPOOL cff984eec217cd4615f1bf316eaa255f0d7f2c531fede6d4764edd57a11277980b0aad87bee4af7e89b2fc56394c7d457a0bb50b103b22afc4f5f449824293e9
--- a/dev-ros/collada_urdf/collada_urdf-1.12.4.ebuild
+++ b/dev-ros/collada_urdf/collada_urdf-1.12.4.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin flag-o-matic
+
+DESCRIPTION="Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/angles
+	dev-ros/collada_parser
+	dev-ros/resource_retriever
+	>=dev-ros/urdf-1.12.3-r1
+	dev-ros/geometric_shapes
+	dev-ros/tf
+	media-libs/assimp
+	dev-libs/tinyxml
+	dev-libs/collada-dom
+	>=dev-libs/urdfdom-1:=
+	dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/urdfdom1.patch" )
+
+src_configure() {
+	append-cppflags `pkg-config --cflags eigen3`
+	append-cxxflags -std=gnu++11
+	ros-catkin_src_configure
+}
--- a/dev-ros/geometric_shapes/Manifest
+++ b/dev-ros/geometric_shapes/Manifest
@ -1,3 +1,4 @@
 DIST geometric_shapes-0.4.3.tar.gz 57689 SHA256 9030b7713ca397852f7d0d19caf18ddd7c93ff0236c19e31d01e72e655bc407b SHA512 77cf3d4d9603f29357bd26d3e4fcec077589f25292f467204bedc072c10ac3dc3869f2491697d6f3a6f23149dcc3973b7fa4f50b94c0e6f3f4ee92b8319ed12e WHIRLPOOL 92acf4d7056c03fcd9479e47c9747856fd1d67f846aaf0d48e84967c5f8cb1a1a7318276306e2324af6a9efa4586de06fe740b6b171824e39edd89e750faff4c
 DIST geometric_shapes-0.4.4.tar.gz 57894 SHA256 4d600890b72d0b20b2fbcc9ded06464a37c871317445ec32d3858bd719b0aa02 SHA512 414864fae6808342f6ca1fc50afe165d585f483698585454396b135a2e12aca998d785edf6526b02d3a58ac27e1e7651e8ece71e32860d49d7dc5f6e06bb892d WHIRLPOOL bdd540bbd13ac17cd60fd39f7ba33e829f76e188b65c530d2b7031aa835b3fdd190fda88f5362fca727ec88c9dca5520756040d9a73d3b38183b511395f8b59c
 DIST geometric_shapes-0.5.0.tar.gz 56795 SHA256 a4d53a982e388b6d188602dc67bab8971cd145e6e724a07274e53c12f512e379 SHA512 3062c63668243ea262b3fabf7964deab53b36edfc1016e86c5bfcf1853a49232a1c3ddfa9935b7cc69e4bcd545befc703299424d58a2dc2188c361bdfd70b581 WHIRLPOOL 077c39229d415222880a9e7e0266aed38049b8cbc2d8e26e3d6f7c7957d092a84ead5ee1a35b37e453127773028169c299b202872b94b301b0bbb23250f8757b
+DIST geometric_shapes-0.5.1.tar.gz 57055 SHA256 b6e94edd138c77be3be50d5b8fcaa3591d56983bcee72dbadeb7b97ccde16ad1 SHA512 40e5047f53dcc1d60174cbadffcca646fee8abf139dff8bb52c227e245ddebbb617b3b82e52dc493796f1cb376a2e3864b1c58c040987bb334b5f7f4e6461cc6 WHIRLPOOL e6192f30733af2909e3eb8dc00c0d1f8db630bbb62b88e146f24aa97787f6fdea770919949ad0396e628eee6ff69c4421b064461bc3de412b3309ca6a1961bd3
--- a/dev-ros/geometric_shapes/geometric_shapes-0.5.1.ebuild
+++ b/dev-ros/geometric_shapes/geometric_shapes-0.5.1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Generic definitions of geometric shapes and bodies"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	media-libs/qhull
+	media-libs/assimp
+	sci-libs/octomap
+	dev-ros/random_numbers
+	dev-ros/resource_retriever
+	dev-ros/eigen_stl_containers
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest dev-ros/rosunit )
+"
--- a/dev-ros/joint_state_publisher/Manifest
+++ b/dev-ros/joint_state_publisher/Manifest
@ -4,3 +4,4 @@ DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417
 DIST robot_model-1.12.0.tar.gz 1292282 SHA256 942edd173fde0efd3c7dab03a30cc1b96b9aa513ed914f00b45f603476ec46fe SHA512 6faf6219788d6cbd6765ff1cb55e7cbc1f3bc414f3f83ac0d46ff7a8617cfe477871104eef846c9a47ffb09c69a948d080e199d455d1269fe043ed11a7d1e335 WHIRLPOOL c487eaea77598b8663d3239142864da9b2dd02d8f6ec321e9beb88ec31fa03d90d77e1fcd7bc0ea7b9afda168a4c46ee4f27b4f8867e70ef9f7ab3d3e00a9e3e
 DIST robot_model-1.12.2.tar.gz 1291779 SHA256 49543ae6f31a2e0f02730e00b926a1a0d3b7e97aa98e1ce27ff3bfd1114806f9 SHA512 39c7c893047ea5e21e9598e3e0b8ca3d2f8a256d1d06ddf419f953bffafb73199f8865f872416ec9c0570cf6cad180d5e1498af13033d1c42b54a640b14e9020 WHIRLPOOL 08b387d4aeca0f97315ad33f2f3efc7ac2323a05ca7ea3cb9e3bd36be858be454882508553a9bd4ad42d0650e43d31fd4e90800fff719877172f5ffc7efd5048
 DIST robot_model-1.12.3.tar.gz 1292139 SHA256 4b2bf070e4d07450fd9977a62c260e8abb40645ff9fcf5f5781f505a8b61b194 SHA512 eae18db87bdd7fc867868493f54f1812358f1a301c88fc7eae611fa75bc2418165b5cb2f5c5839f3cb644d4c1f560f85d84b635ffbecaa631c78a3176d1fb6db WHIRLPOOL c555faee5282942db894866a08aa3a675c6db618fce2acdd1f67d622cf1c0a8e5747f5f9a5217b4fc83997f9bb9125f1c7f2ca6b77e9fd75244f121b48a77f66
+DIST robot_model-1.12.4.tar.gz 1293354 SHA256 e40bd4519fd4010bcde0cb179611a19c04c3a32073830a675090671b4cea0ee5 SHA512 f78bfd9a72d795e301836a7946d87250f4c8be2082593f7a0fb282831152bc8125885f30408ff99823c4dd1d606060b71695c1cc3097dee8870efe0fe862ab0d WHIRLPOOL cff984eec217cd4615f1bf316eaa255f0d7f2c531fede6d4764edd57a11277980b0aad87bee4af7e89b2fc56394c7d457a0bb50b103b22afc4f5f449824293e9
--- a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.4.ebuild
+++ b/dev-ros/joint_state_publisher/joint_state_publisher-1.12.4.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
--- a/dev-ros/kdl_parser/Manifest
+++ b/dev-ros/kdl_parser/Manifest
@ -1 +1,2 @@
 DIST robot_model-1.12.3.tar.gz 1292139 SHA256 4b2bf070e4d07450fd9977a62c260e8abb40645ff9fcf5f5781f505a8b61b194 SHA512 eae18db87bdd7fc867868493f54f1812358f1a301c88fc7eae611fa75bc2418165b5cb2f5c5839f3cb644d4c1f560f85d84b635ffbecaa631c78a3176d1fb6db WHIRLPOOL c555faee5282942db894866a08aa3a675c6db618fce2acdd1f67d622cf1c0a8e5747f5f9a5217b4fc83997f9bb9125f1c7f2ca6b77e9fd75244f121b48a77f66
+DIST robot_model-1.12.4.tar.gz 1293354 SHA256 e40bd4519fd4010bcde0cb179611a19c04c3a32073830a675090671b4cea0ee5 SHA512 f78bfd9a72d795e301836a7946d87250f4c8be2082593f7a0fb282831152bc8125885f30408ff99823c4dd1d606060b71695c1cc3097dee8870efe0fe862ab0d WHIRLPOOL cff984eec217cd4615f1bf316eaa255f0d7f2c531fede6d4764edd57a11277980b0aad87bee4af7e89b2fc56394c7d457a0bb50b103b22afc4f5f449824293e9
--- a/dev-ros/kdl_parser/kdl_parser-1.12.4.ebuild
+++ b/dev-ros/kdl_parser/kdl_parser-1.12.4.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin flag-o-matic
+
+DESCRIPTION="Constructs a KDL tree from an XML robot representation in URDF"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/roscpp
+	dev-ros/rosconsole
+	>=dev-ros/urdf-1.12.3-r1
+	sci-libs/orocos_kdl
+	dev-libs/tinyxml
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/urdfdom1.patch" )
+
+src_configure() {
+	append-cxxflags -std=gnu++11
+	ros-catkin_src_configure
+}
--- a/dev-ros/kdl_parser_py/Manifest
+++ b/dev-ros/kdl_parser_py/Manifest
@ -3,3 +3,4 @@ DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417
 DIST robot_model-1.12.0.tar.gz 1292282 SHA256 942edd173fde0efd3c7dab03a30cc1b96b9aa513ed914f00b45f603476ec46fe SHA512 6faf6219788d6cbd6765ff1cb55e7cbc1f3bc414f3f83ac0d46ff7a8617cfe477871104eef846c9a47ffb09c69a948d080e199d455d1269fe043ed11a7d1e335 WHIRLPOOL c487eaea77598b8663d3239142864da9b2dd02d8f6ec321e9beb88ec31fa03d90d77e1fcd7bc0ea7b9afda168a4c46ee4f27b4f8867e70ef9f7ab3d3e00a9e3e
 DIST robot_model-1.12.2.tar.gz 1291779 SHA256 49543ae6f31a2e0f02730e00b926a1a0d3b7e97aa98e1ce27ff3bfd1114806f9 SHA512 39c7c893047ea5e21e9598e3e0b8ca3d2f8a256d1d06ddf419f953bffafb73199f8865f872416ec9c0570cf6cad180d5e1498af13033d1c42b54a640b14e9020 WHIRLPOOL 08b387d4aeca0f97315ad33f2f3efc7ac2323a05ca7ea3cb9e3bd36be858be454882508553a9bd4ad42d0650e43d31fd4e90800fff719877172f5ffc7efd5048
 DIST robot_model-1.12.3.tar.gz 1292139 SHA256 4b2bf070e4d07450fd9977a62c260e8abb40645ff9fcf5f5781f505a8b61b194 SHA512 eae18db87bdd7fc867868493f54f1812358f1a301c88fc7eae611fa75bc2418165b5cb2f5c5839f3cb644d4c1f560f85d84b635ffbecaa631c78a3176d1fb6db WHIRLPOOL c555faee5282942db894866a08aa3a675c6db618fce2acdd1f67d622cf1c0a8e5747f5f9a5217b4fc83997f9bb9125f1c7f2ca6b77e9fd75244f121b48a77f66
+DIST robot_model-1.12.4.tar.gz 1293354 SHA256 e40bd4519fd4010bcde0cb179611a19c04c3a32073830a675090671b4cea0ee5 SHA512 f78bfd9a72d795e301836a7946d87250f4c8be2082593f7a0fb282831152bc8125885f30408ff99823c4dd1d606060b71695c1cc3097dee8870efe0fe862ab0d WHIRLPOOL cff984eec217cd4615f1bf316eaa255f0d7f2c531fede6d4764edd57a11277980b0aad87bee4af7e89b2fc56394c7d457a0bb50b103b22afc4f5f449824293e9
--- a/dev-ros/kdl_parser_py/kdl_parser_py-1.12.4.ebuild
+++ b/dev-ros/kdl_parser_py/kdl_parser_py-1.12.4.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Python tools to construct a KDL tree from an XML robot representation in URDF"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/urdf[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
--- a/dev-ros/urdf/Manifest
+++ b/dev-ros/urdf/Manifest
@ -1 +1,2 @@
 DIST robot_model-1.12.3.tar.gz 1292139 SHA256 4b2bf070e4d07450fd9977a62c260e8abb40645ff9fcf5f5781f505a8b61b194 SHA512 eae18db87bdd7fc867868493f54f1812358f1a301c88fc7eae611fa75bc2418165b5cb2f5c5839f3cb644d4c1f560f85d84b635ffbecaa631c78a3176d1fb6db WHIRLPOOL c555faee5282942db894866a08aa3a675c6db618fce2acdd1f67d622cf1c0a8e5747f5f9a5217b4fc83997f9bb9125f1c7f2ca6b77e9fd75244f121b48a77f66
+DIST robot_model-1.12.4.tar.gz 1293354 SHA256 e40bd4519fd4010bcde0cb179611a19c04c3a32073830a675090671b4cea0ee5 SHA512 f78bfd9a72d795e301836a7946d87250f4c8be2082593f7a0fb282831152bc8125885f30408ff99823c4dd1d606060b71695c1cc3097dee8870efe0fe862ab0d WHIRLPOOL cff984eec217cd4615f1bf316eaa255f0d7f2c531fede6d4764edd57a11277980b0aad87bee4af7e89b2fc56394c7d457a0bb50b103b22afc4f5f449824293e9
--- a/dev-ros/urdf/urdf-1.12.4.ebuild
+++ b/dev-ros/urdf/urdf-1.12.4.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin flag-o-matic
+
+DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	>=dev-libs/urdfdom-1
+	dev-libs/urdfdom_headers
+	>=dev-ros/urdf_parser_plugin-1.12.3-r1
+	dev-ros/pluginlib
+	dev-ros/rosconsole_bridge
+	dev-ros/roscpp
+	dev-libs/tinyxml
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}/urdfdom1.patch" )
+
+src_configure() {
+	append-cxxflags -std=c++11
+	ros-catkin_src_configure
+}
--- a/dev-ros/urdf_parser_plugin/Manifest
+++ b/dev-ros/urdf_parser_plugin/Manifest
@ -1 +1,2 @@
 DIST robot_model-1.12.3.tar.gz 1292139 SHA256 4b2bf070e4d07450fd9977a62c260e8abb40645ff9fcf5f5781f505a8b61b194 SHA512 eae18db87bdd7fc867868493f54f1812358f1a301c88fc7eae611fa75bc2418165b5cb2f5c5839f3cb644d4c1f560f85d84b635ffbecaa631c78a3176d1fb6db WHIRLPOOL c555faee5282942db894866a08aa3a675c6db618fce2acdd1f67d622cf1c0a8e5747f5f9a5217b4fc83997f9bb9125f1c7f2ca6b77e9fd75244f121b48a77f66
+DIST robot_model-1.12.4.tar.gz 1293354 SHA256 e40bd4519fd4010bcde0cb179611a19c04c3a32073830a675090671b4cea0ee5 SHA512 f78bfd9a72d795e301836a7946d87250f4c8be2082593f7a0fb282831152bc8125885f30408ff99823c4dd1d606060b71695c1cc3097dee8870efe0fe862ab0d WHIRLPOOL cff984eec217cd4615f1bf316eaa255f0d7f2c531fede6d4764edd57a11277980b0aad87bee4af7e89b2fc56394c7d457a0bb50b103b22afc4f5f449824293e9
--- a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.12.4.ebuild
+++ b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.12.4.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ base class for URDF parsers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/urdfdom_headers"
+DEPEND="${RDEPEND}"
--- a/dev-vcs/bfg/bfg-1.12.13.ebuild
+++ b/dev-vcs/bfg/bfg-1.12.13.ebuild
@ -18,6 +18,11 @@ RDEPEND=">=virtual/jre-1.6"

 S=${WORKDIR}

+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
 src_unpack() { :; }
 src_compile() { :; }

--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@ -4,3 +4,4 @@ DIST ffmpeg-3.0.1.tar.bz2 8879122 SHA256 f7f7052c120f494dd501f96becff9b5a4ae10cf
 DIST ffmpeg-3.0.2.tar.bz2 8883140 SHA256 30e3c77c2f4c358ed087869455a7496cbd7753a5e1b98d20ba49c1004009fd36 SHA512 67697334899b57efd6cfaebca1bb7450635034af34daae1caf77c57239116a7d2854eef3da967d3d1be4b89f346c79e970dc221543ab6181088172460807bc91 WHIRLPOOL f8aab8adb24a420bd6435454a84bc4a8e5068dea82a8282b4037470a9c9131f41d476dea0fdd9b659e9f91f2a835b19cc2bd9d70aa81bcbe861ec32ce954903a
 DIST ffmpeg-3.1.1.tar.bz2 9327512 SHA256 a5bca50a90a37b983eaa17c483a387189175f37ca678ae7e51d43e7610b4b3b4 SHA512 b5b4b2d518affa708b05f72201d5ac20446c88b5fb4dd8586cdc29d1132c678be94898e4f5ad27bef4ac987557305838133f45e94ff55d65f22a76f4f312888a WHIRLPOOL cb4cd3505a3b35f41023f6a87e3d724eed14e9c6e786bdc84d9e9c5c24d37ec0590ab130858107cd05c0522ceedd8e2d899b05a58d7cc52e384faaffe805dc13
 DIST ffmpeg-3.1.2.tar.bz2 9331621 SHA256 62eb8d810b93c1ffc23739c0824a91eabfe5e7be81fab34ce740736a110b70f7 SHA512 c12985310043aab49af5985fa0a6d6cbcd698bb1495066d6b262f449cd90943b072efa7eb3158b48bf3f96c80f06d68ca790271a5fd445d941333a8f540555bf WHIRLPOOL 1373de966e5fa5503b7b53ceaff99dce1c3d4b37f3c617aa520f8e7bc1d5b2f4c3453e37d96fbfb4af8628df797f56476f826fce05c241ce3ef19d20f5dedfe8
+DIST ffmpeg-3.1.3.tar.bz2 9333069 SHA256 58bc89c65dd114d874efbf76f76368d03b5e407f0a3f42d5b40801c280968a38 SHA512 2c17414b11ea54bc5360e54651daa1c21c4138da86a13900214c5f0209305c6315f9ee81deedffae90f61b2684295e9050a87b3c64d34193ee1695f5ae1a7d96 WHIRLPOOL b60f3a7d97a63ce201e744a9213437621dbcff6a216dc09ff9b863f0a2ca672b177f9d61a809f84393af711cd1cfe91c08b9d14b2d2a6c36b32294351b3bace8
--- a/media-video/ffmpeg/ffmpeg-3.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.1.3.ebuild
@ -0,0 +1,462 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=55.57.57
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
+		samba:libsmbclient sdl:ffplay sdl vaapi vdpau X:xlib xcb:libxcb
+		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		zvbi:libzvbi
+		# libavfilter options
+		bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
+		rubberband:librubberband zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	faac:libfaac kvazaar:libkvazaar nvenc:nvenc
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa doc +encode jack oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp )
+MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+IUSE="${IUSE}
+	${ARM_CPU_FEATURES[@]%:*}
+	${MIPS_CPU_FEATURES[@]%:*}
+	${PPC_CPU_FEATURES[@]%:*}
+	${X86_CPU_FEATURES[@]%:*}
+"
+
+CPU_REQUIRED_USE="
+	${X86_CPU_REQUIRED_USE}
+"
+
+# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
+# $(tc-arch).
+CPU_FEATURES_MAP="
+	arm:ARM
+	arm64:ARM
+	mips:MIPS
+	ppc:PPC
+	ppc64:PPC
+	x86:X86
+	amd64:X86
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		nvenc? ( media-video/nvidia_video_sdk )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		!xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zimg? ( media-libs/zimg[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( sys-apps/texinfo )
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
+	test? ( net-misc/wget sys-devel/bc )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+		X? ( !xcb? ( gpl ) )
+	)
+"
+REQUIRED_USE="
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	encode? ( faac? ( bindist ) )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+		if use faac ; then
+			myconf+=( --enable-nonfree )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use xcb || ffuse+=( X:x11grab )
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in ${CPU_FEATURES_MAP} ; do
+		if [ "$(tc-arch)" = "${i%:*}" ] ; then
+			local var="${i#*:}_CPU_FEATURES[@]"
+			for j in ${!var} ; do
+				use ${j%:*} || myconf+=( --disable-${j#*:} )
+			done
+		fi
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Fri, 26 Aug 2016 12:10:37 +0000
+Fri, 26 Aug 2016 20:40:35 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Fri, 26 Aug 2016 12:10:37 +0000
+Fri, 26 Aug 2016 20:40:35 +0000
--- a/metadata/md5-cache/app-admin/puppetdb-4.2.2
+++ b/metadata/md5-cache/app-admin/puppetdb-4.2.2
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=PuppetDB collects data generated by Puppet.
+EAPI=5
+HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.7.0
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-4.2.2.tar.gz
+_eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	c66cbe7502fe1161066eb947d15b79f6
+_md5_=e31784d6226a5bd74da4ef362b47501b
--- a/metadata/md5-cache/dev-db/mariadb-10.0.27
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.27
@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) !bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= jdbc? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0: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(-)?,static-libs?] ) libressl? ( dev-libs/libressl: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(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3: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(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=6
+HOMEPAGE=http://mariadb.org/
+IUSE=bindist jdbc odbc oqgraph pam sphinx tokudb xml elibc_FreeBSD jdbc 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.6[embedded=,static=] virtual/libmysqlclient:0/18[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(-)?,static-libs=]
+RDEPEND=!bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0: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(-)?,static-libs?] ) libressl? ( dev-libs/libressl: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(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3: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(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
+REQUIRED_USE=server? ( tokudb? ( jemalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.27/source/mariadb-10.0.27.tar.gz mirror://gentoo/mysql-extras-20160629-1442Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20160629-1442Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20160629-1442Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20160629-1442Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20160629-1442Z.tar.bz2
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	mysql-multilib-r1	59a1cf51b0453c5d5f18ca865eb02f45	prefix	99dcca42e6528d8fe3c214bf5731aaf2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	c66cbe7502fe1161066eb947d15b79f6	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e3a0c557254c3bc2007680a45b4274f5
--- a/metadata/md5-cache/dev-db/percona-server-5.6.32.78.0
+++ b/metadata/md5-cache/dev-db/percona-server-5.6.32.78.0
@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=numa? ( sys-process/numactl:= ) server? ( pam? ( virtual/pam:0= ) ) tokudb? ( app-arch/snappy ) tokudb-backup-plugin? ( dev-util/valgrind ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysql-python[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0: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(-)?,static-libs?] ) libressl? ( dev-libs/libressl: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(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3: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(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL from the Percona team
+EAPI=6
+HOMEPAGE=http://www.percona.com/software/percona-server
+IUSE=numa pam tokudb tokudb-backup-plugin 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.6[embedded=,static=] virtual/libmysqlclient:0/18[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(-)?,static-libs=]
+RDEPEND=numa? ( sys-process/numactl:= ) server? ( pam? ( virtual/pam:0= ) ) tokudb? ( app-arch/snappy ) tokudb-backup-plugin? ( dev-util/valgrind ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0: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(-)?,static-libs?] ) libressl? ( dev-libs/libressl: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(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3: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(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
+REQUIRED_USE=tokudb? ( jemalloc ) tokudb-backup-plugin? ( tokudb ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+RESTRICT=libressl? ( test )
+SLOT=0/18
+SRC_URI=http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.32-78.0/source/tarball/percona-server-5.6.32-78.0.tar.gz mirror://gentoo/mysql-extras-20160307-1854Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20160307-1854Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20160307-1854Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20160307-1854Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20160307-1854Z.tar.bz2
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	mysql-multilib-r1	59a1cf51b0453c5d5f18ca865eb02f45	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	c66cbe7502fe1161066eb947d15b79f6	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=9c377cf8f004f6dd1b544b90bf329a2e
--- a/metadata/md5-cache/dev-libs/openssl-1.1.0
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.0
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,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-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=5
+HOMEPAGE=http://www.openssl.org/
+IUSE=+asm bindist rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,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(-)?] )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.0.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=e5db5f00637291f84ce8d12682d96c10
--- a/metadata/md5-cache/dev-ml/ocaml-redis-0.3.2
+++ b/metadata/md5-cache/dev-ml/ocaml-redis-0.3.2
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-ml/ocaml-re:= dev-ml/uuidm:= lwt? ( dev-ml/lwt:= ) test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] || ( dev-ml/ocamlbuild <dev-lang/ocaml-4.02.3-r1 )
+DESCRIPTION=Redis bindings for OCaml
+EAPI=5
+HOMEPAGE=http://0xffea.github.io/ocaml-redis/
+IUSE=+lwt +ocamlopt debug doc test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ml/ocaml-re:= dev-ml/uuidm:= lwt? ( dev-ml/lwt:= ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/0.3.2
+SRC_URI=https://github.com/0xffea/ocaml-redis/archive/0.3.2.tar.gz -> ocaml-redis-0.3.2.tar.gz
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	multilib	d062ae4ba2fc40a19c11de2ad89b6616	oasis	cc6dfb8b0c04cedd9840ff2ec5e38539	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=1edbc0a7911e9bfb6f2ea702e43f9ece
--- a/metadata/md5-cache/dev-python/batinfo-0.3
+++ b/metadata/md5-cache/dev-python/batinfo-0.3
@ -4,11 +4,11 @@ DESCRIPTION=A simple Python lib to retreive battery information
 EAPI=6
 HOMEPAGE=https://github.com/nicolargo/batinfo http://pypi.python.org/pypi/batinfo
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/batinfo/batinfo-0.3.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=665f0a4848679b0207871b833cb5f366
+_md5_=c49a19e9630f31b0eb129562416a53f3
--- a/metadata/md5-cache/dev-ros/collada_parser-1.12.4
+++ b/metadata/md5-cache/dev-ros/collada_parser-1.12.4
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
+DESCRIPTION=C++ parser for the Collada robot description format
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/collada_parser
+IUSE=test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom dev-util/catkin dev-python/empy
+SLOT=0
+SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=32d5c83c77935f1ccaa5816764ff2531
--- a/metadata/md5-cache/dev-ros/collada_urdf-1.12.4
+++ b/metadata/md5-cache/dev-ros/collada_urdf-1.12.4
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever >=dev-ros/urdf-1.12.3-r1 dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom >=dev-libs/urdfdom-1:= dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
+DESCRIPTION=Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/collada_urdf
+IUSE=test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever >=dev-ros/urdf-1.12.3-r1 dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom >=dev-libs/urdfdom-1:= dev-cpp/eigen:3 dev-util/catkin dev-python/empy
+SLOT=0
+SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f0e62f6012615fe0578f5fc0a0e543ff
--- a/metadata/md5-cache/dev-ros/geometric_shapes-0.5.1
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-0.5.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
+DESCRIPTION=Generic definitions of geometric shapes and bodies
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/geometric_shapes
+IUSE=test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
+SLOT=0
+SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.5.1.tar.gz -> geometric_shapes-0.5.1.tar.gz
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a95f675d11141626d3fd65c9eef12071
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.4
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.4
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/joint_state_publisher
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=6bf01faa75003c950056429b58f809dd
--- a/metadata/md5-cache/dev-ros/kdl_parser-1.12.4
+++ b/metadata/md5-cache/dev-ros/kdl_parser-1.12.4
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.12.3-r1 sci-libs/orocos_kdl dev-libs/tinyxml test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Constructs a KDL tree from an XML robot representation in URDF
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/kdl_parser
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.12.3-r1 sci-libs/orocos_kdl dev-libs/tinyxml dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=4ebc0bd4ee99d2dcdbc73c26a9d6eead
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.4
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.4
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/kdl_parser_py
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=257afbc2ad6edbd765e52ab9cf0b30a2
--- a/metadata/md5-cache/dev-ros/urdf-1.12.4
+++ b/metadata/md5-cache/dev-ros/urdf-1.12.4
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] >=dev-libs/urdfdom-1 dev-libs/urdfdom_headers >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/pluginlib dev-ros/rosconsole_bridge dev-ros/roscpp dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=C++ parser for the Unified Robot Description Format (URDF)
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/urdf
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] >=dev-libs/urdfdom-1 dev-libs/urdfdom_headers >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/pluginlib dev-ros/rosconsole_bridge dev-ros/roscpp dev-libs/tinyxml dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=4c949fcde39b63086172b219dfa051e9
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.4
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.4
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/urdfdom_headers sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
+DESCRIPTION=C++ base class for URDF parsers
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/urdf_parser_plugin
+IUSE=test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/urdfdom_headers dev-util/catkin dev-python/empy
+SLOT=0
+SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=396b9ec9d3cf798a70764760740d8e1b
--- a/metadata/md5-cache/dev-vcs/bfg-1.12.13
+++ b/metadata/md5-cache/dev-vcs/bfg-1.12.13
@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/com/madgag/bfg/1.12.13/bfg-1.12.13.jar
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=91d9948bb661efb171f882c3bd6ab189
+_md5_=1642b1b2fd701ad9a6f7e96b56d9bf1c
--- a/metadata/md5-cache/media-video/ffmpeg-3.1.3
+++ b/metadata/md5-cache/media-video/ffmpeg-3.1.3
--- a/metadata/md5-cache/net-im/openfire-4.0.3
+++ b/metadata/md5-cache/net-im/openfire-4.0.3
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=net-im/jabber-base ~dev-java/ant-contrib-1.0_beta2 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
+DESCRIPTION=Openfire (formerly wildfire) real time collaboration (RTC) server
+EAPI=5
+HOMEPAGE=http://www.igniterealtime.org/projects/openfire/
+IUSE=doc elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_4_0_3.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=59be046bbf379ba8d458671e6a101c41
--- a/metadata/md5-cache/ros-meta/robot_model-1.12.4
+++ b/metadata/md5-cache/ros-meta/robot_model-1.12.4
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/collada_parser dev-ros/collada_urdf dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/urdf dev-ros/urdf_parser_plugin sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
+DESCRIPTION=Packages for modeling various aspects of robot information
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/robot_model
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/collada_parser dev-ros/collada_urdf dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/urdf dev-ros/urdf_parser_plugin dev-util/catkin dev-python/empy
+SLOT=0
+SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e32cd7cc3d36958c4e199835605dc96e
--- a/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2-r1
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install setup
+DEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2* virtual/pkgconfig
+DESCRIPTION=CPU load flames for GKrellM 2
+EAPI=6
+HOMEPAGE=http://people.freenet.de/thomas-steinke
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
+SLOT=0
+SRC_URI=ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/gkrellfire-0.4.2.tgz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gkrellm-plugin	0d8a7ae1368b3384fb89d1cbcb650415	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=6bb80701d0950195cd7272e8f69f2a8a
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Fri, 26 Aug 2016 12:10:37 +0000
+Fri, 26 Aug 2016 20:40:35 +0000
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@ -2167,6 +2167,10 @@
      <email>robbat2@gentoo.org</email>
      <name>Robin Johnson</name>
    </member>
+    <member>
+      <email>whissi@gentoo.org</email>
+      <name>Thomas Deutschmann</name>
+    </member>
  </project>
  <project>
    <email>mythtv@gentoo.org</email>
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Fri Aug 26 12:09:42 UTC 2016
+Fri Aug 26 20:39:40 UTC 2016
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Fri, 26 Aug 2016 12:30:01 +0000
+Fri, 26 Aug 2016 21:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1472213401 Fri 26 Aug 2016 12:10:01 PM UTC
+1472244001 Fri 26 Aug 2016 08:40:01 PM UTC
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@ -1 +1 @@
-Fri, 26 Aug 2016 12:10:37 +0000
+Fri, 26 Aug 2016 20:40:35 +0000
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@ -1 +1,2 @@
 DIST openfire_src_4_0_2.tar.gz 98972324 SHA256 62e7a8a735431d45f5ad72a8ae9603743277372702e782ea514323bfd80a4efb SHA512 444762fec588d4b205c0d6247098861b246eb3f74061dfe47314a33daeb57e228e62132efac3d50fbffd31bd779ba986d0b59afe375d27f3f2923cecbd4f873a WHIRLPOOL 3259e09f1bf422415b0722bff96524be6831ee8d104b91b15fc2b8b25569da5e5f4920ad08080c4e44f1d9c74049c8b0344bbe534b0c3809483745e2452d08e9
+DIST openfire_src_4_0_3.tar.gz 99135040 SHA256 2eae0ac43826e0e084363c8640fa26ac6ec1369aa354bd2bdb268c2f801b2e55 SHA512 d610ac3d20f1d369f4ad5a695dccec6f5523d65675f6cc78cc6728ea03ee860668dae4fbfe13bf627df1f3e34b72306894f06d63cd3e32a93d3b47211e07a631 WHIRLPOOL 0887e71b4090fdd0c4236054b3df3791dc30da978bb45e3742459f0f3aed60d9402a9586d4a71038185edbf4c3dfb59fd79387cd3e7ce0e0038dca351f7be734
--- a/net-im/openfire/openfire-4.0.3.ebuild
+++ b/net-im/openfire/openfire-4.0.3.ebuild
@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-ant-2 systemd
+
+MY_P=${PN}_src_${PV//./_}
+DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
+HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
+SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND="net-im/jabber-base
+	~dev-java/ant-contrib-1.0_beta2
+	>=virtual/jdk-1.7"
+
+S=${WORKDIR}/${PN}_src
+
+pkg_setup() {
+	if [[ -f /etc/env.d/98openfire ]]; then
+		einfo "This is an upgrade"
+		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
+		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
+		ewarn "they can be downloaded via Admin Console or at"
+		ewarn "    ${HOMEPAGE}"
+	else
+		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
+		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
+		ewarn "For more info see bug #139708"
+		sleep 11
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_compile() {
+	# Jikes doesn't support -source 1.5
+	java-pkg_filter-compiler jikes
+
+	ANT_TASKS="ant-contrib"
+	eant -f build/build.xml openfire plugins $(use_doc)
+
+	# delete nativeAuth prebuilt libs:
+	#    uses outdated unmaintained libshaj, does not support amd64
+	rm -rfv target/openfire/resources/nativeAuth || die
+}
+
+src_install() {
+	dodir /opt/openfire
+
+	newinitd "${FILESDIR}"/openfire-initd openfire
+	newconfd "${FILESDIR}"/openfire-confd openfire
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodir /opt/openfire/conf
+	insinto /opt/openfire/conf
+	newins target/openfire/conf/openfire.xml openfire.xml.sample
+	newins target/openfire/conf/security.xml security.xml.sample
+
+	dodir /opt/openfire/logs
+	keepdir /opt/openfire/logs
+
+	dodir /opt/openfire/lib
+	insinto /opt/openfire/lib
+	doins target/openfire/lib/*
+
+	dodir /opt/openfire/plugins
+	insinto /opt/openfire/plugins
+	doins -r target/openfire/plugins/*
+
+	dodir /opt/openfire/resources
+	insinto /opt/openfire/resources
+	doins -r target/openfire/resources/*
+
+	if use doc; then
+		dohtml -r documentation/docs/*
+	fi
+	dodoc documentation/dist/*
+
+	#Protect ssl key on upgrade
+	dodir /etc/env.d/
+	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
+}
+
+pkg_postinst() {
+	local src
+	local dst
+
+	# http://community.igniterealtime.org/thread/52289
+	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
+	do
+		src="${dst}".sample
+		if [[ -f "${dst}" ]]; then
+			einfo "Leaving old '${dst}'"
+		else
+			einfo "Created default '${dst}'. Please edit."
+			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
+			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
+		fi
+	done
+	chown -R jabber:jabber "${ROOT}"/opt/openfire
+}
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@ -77,10 +77,6 @@ dev-python/restkit cli
 # work on alpha. Mask USE flag for layman accordingly
 app-portage/layman -g-sorcery

-# Brian Evans <grknight@gentoo.org> (17 Sep 2015)
-# Mask new USE flags for percona-server which are not available on alpha
-dev-db/percona-server tokudb tokudb-backup-plugin
-
 # Tobias Klausmann <klausman@gentoo.org> (16 Sep 2015)
 # Mask USE=sssd for sudo because sys-auth/sssd is relatively big and doesn't
 # compile on alpha. The version specified does not have the USE flag, but that
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@ -18,6 +18,10 @@

 #--- END OF EXAMPLES ---

+# Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
+# Enable numa support on supported architectures
+dev-db/percona-server -numa
+
 # Brian Evans <grknight@gentoo.org> (23 Aug 2016)
 # It's only supported on amd64
 dev-db/percona-server -tokudb -tokudb-backup-plugin
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

+# Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
+# Enable numa support on supported architectures
+dev-db/percona-server -numa
+
 # Gilles Dartiguelongue <eva@gentoo.org> (23 Aug 2016)
 # Missing keywords on media-libs/grilo - bug #521972
 media-sound/rhythmbox upnp-av
@ -53,10 +57,6 @@ dev-qt/qtchooser test
 # Requires dev-python/ipython which triggers a long dep chain
 dev-python/restkit cli

-# Brian Evans <grknight@gentoo.org> (17 Sep 2015)
-# Mask new USE flags for percona-server which are not available on ia64
-dev-db/percona-server tokudb tokudb-backup-plugin
-
 # Brian Evans <grknight@gentoo.org> (14 Sep 2015)
 # Mask new USE flags for mariadb which all arches do not yet have dependencies
 >=dev-db/mariadb-10.1.0 innodb-snappy
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

+# Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
+# Enable numa support on supported architectures
+dev-db/percona-server -numa
+
 # Pacho Ramos <pacho@gentoo.org> (21 Aug 2016)
 # gnat-gpl is being removed, bug #514074
 mail-client/alpine topal
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@ -71,10 +71,6 @@ net-mail/dovecot lz4
 # Requires dev-python/ipython which triggers a long dep chain
 dev-python/restkit cli

-# Brian Evans <grknight@gentoo.org> (17 Sep 2015)
-# Mask new USE flags for percona-server which are not available on sparc
-dev-db/percona-server tokudb tokudb-backup-plugin
-
 # Brian Evans <grknight@gentoo.org> (14 Sep 2015)
 # Mask new USE flags for mariadb which all arches do not yet have dependencies
 >=dev-db/mariadb-10.1.0 innodb-snappy
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@ -4,6 +4,10 @@

 # This file requires >=portage-2.1.1

+# Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
+# Enable numa support on supported architectures
+dev-db/percona-server -numa
+
 # Brian Evans <grknight@gentoo.org> (18 Aug 2016)
 # Allow jdbc on this arch
 dev-db/mariadb -jdbc
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@ -5,6 +5,10 @@
 # This file requires >=portage-2.1.1
 # New entries go on top.

+# Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
+# It's only supported on amd64, ia64, powerpc and x86
+dev-db/percona-server numa
+
 # Brian Evans <grknight@gentoo.org> (23 Aug 2016)
 # It's only supported on amd64
 dev-db/percona-server tokudb tokudb-backup-plugin
--- a/profiles/default/bsd/fbsd/package.use.mask
+++ b/profiles/default/bsd/fbsd/package.use.mask
@ -2,6 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

+# Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
+# libressl:  dev-libs/libressl is a base package on FreeBSD
+# jemalloc:  dev-libs/jemalloc is not keyworded on FreeBSD
+# systemtap: dev-util/systemtap is not keyworded on FreeBSD and is also
+#            a linux specialized tool
+dev-db/percona-server jemalloc libressl systemtap
+
 # Thomas Deutschmann <whissi@gentoo.org> (23 Aug 2016)
 # libressl: dev-libs/libressl is a base package on FreeBSD
 # luajit:   dev-lang/luajit not keyworded on FreeBSD
--- a/profiles/package.mask
+++ b/profiles/package.mask
@ -30,6 +30,10 @@

 #--- END OF EXAMPLES ---

+# Lars Wendler <polynomial-c@gentoo.org> (26 Aug 2016)
+# Masked while being tested and reverse deps aren't fully compatible
+=dev-libs/openssl-1.1*
+
 # Michael Palimaka <kensington@gentoo.org> (24 Aug 2016)
 # No longer produced by upstream and no longer used by anything.
 # Masked for removal in 30 days.
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@ -1390,6 +1390,7 @@ dev-db/percona-server:extraengine - Add support for alternative storage engines
 dev-db/percona-server:jemalloc - Use dev-libs/jemalloc for allocations.
 dev-db/percona-server:latin1 - Use LATIN1 encoding instead of UTF8
 dev-db/percona-server:libressl - Enable SSL connections and crypto functions using dev-libs/libressl
+dev-db/percona-server:numa - Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)
 dev-db/percona-server:openssl - Enable SSL connections and crypto functions using dev-libs/openssl
 dev-db/percona-server:profiling - Add support for statement profiling (requires USE=community).
 dev-db/percona-server:server - Build the server program
--- a/ros-meta/robot_model/Manifest
+++ b/ros-meta/robot_model/Manifest
@ -4,3 +4,4 @@ DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417
 DIST robot_model-1.12.0.tar.gz 1292282 SHA256 942edd173fde0efd3c7dab03a30cc1b96b9aa513ed914f00b45f603476ec46fe SHA512 6faf6219788d6cbd6765ff1cb55e7cbc1f3bc414f3f83ac0d46ff7a8617cfe477871104eef846c9a47ffb09c69a948d080e199d455d1269fe043ed11a7d1e335 WHIRLPOOL c487eaea77598b8663d3239142864da9b2dd02d8f6ec321e9beb88ec31fa03d90d77e1fcd7bc0ea7b9afda168a4c46ee4f27b4f8867e70ef9f7ab3d3e00a9e3e
 DIST robot_model-1.12.2.tar.gz 1291779 SHA256 49543ae6f31a2e0f02730e00b926a1a0d3b7e97aa98e1ce27ff3bfd1114806f9 SHA512 39c7c893047ea5e21e9598e3e0b8ca3d2f8a256d1d06ddf419f953bffafb73199f8865f872416ec9c0570cf6cad180d5e1498af13033d1c42b54a640b14e9020 WHIRLPOOL 08b387d4aeca0f97315ad33f2f3efc7ac2323a05ca7ea3cb9e3bd36be858be454882508553a9bd4ad42d0650e43d31fd4e90800fff719877172f5ffc7efd5048
 DIST robot_model-1.12.3.tar.gz 1292139 SHA256 4b2bf070e4d07450fd9977a62c260e8abb40645ff9fcf5f5781f505a8b61b194 SHA512 eae18db87bdd7fc867868493f54f1812358f1a301c88fc7eae611fa75bc2418165b5cb2f5c5839f3cb644d4c1f560f85d84b635ffbecaa631c78a3176d1fb6db WHIRLPOOL c555faee5282942db894866a08aa3a675c6db618fce2acdd1f67d622cf1c0a8e5747f5f9a5217b4fc83997f9bb9125f1c7f2ca6b77e9fd75244f121b48a77f66
+DIST robot_model-1.12.4.tar.gz 1293354 SHA256 e40bd4519fd4010bcde0cb179611a19c04c3a32073830a675090671b4cea0ee5 SHA512 f78bfd9a72d795e301836a7946d87250f4c8be2082593f7a0fb282831152bc8125885f30408ff99823c4dd1d606060b71695c1cc3097dee8870efe0fe862ab0d WHIRLPOOL cff984eec217cd4615f1bf316eaa255f0d7f2c531fede6d4764edd57a11277980b0aad87bee4af7e89b2fc56394c7d457a0bb50b103b22afc4f5f449824293e9
--- a/ros-meta/robot_model/robot_model-1.12.4.ebuild
+++ b/ros-meta/robot_model/robot_model-1.12.4.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Packages for modeling various aspects of robot information"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/collada_parser
+	dev-ros/collada_urdf
+	dev-ros/joint_state_publisher
+	dev-ros/kdl_parser
+	dev-ros/kdl_parser_py
+	dev-ros/urdf
+	dev-ros/urdf_parser_plugin
+"
+DEPEND="${RDEPEND}"
--- a/x11-plugins/gkrellfire/files/fix-CC-CFLAGS-LDFLAGS-handling.patch
+++ b/x11-plugins/gkrellfire/files/fix-CC-CFLAGS-LDFLAGS-handling.patch
@ -0,0 +1,69 @@
+From 822bb45acf93b63e59071903aad842a3dd92a915 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Fri, 26 Aug 2016 08:43:12 -0400
+Subject: [PATCH 1/1] Rewrite the Makefile to fix CC, CFLAGS, and LDFLAGS
+ support.
+
+The existing Makefile did not allow the user to set CC, CFLAGS, or
+LDFLAGS (or at least, they were ignored). This was fixed somewhat
+easily by deleting most of the Makefile, and by appending the
+necessary flags to CFLAGS and LDFLAGS. The installation target didn't
+do the right thing anyway, so it has been removed.
+
+The resulting Makefile is probably only useful on Gentoo, but upstream
+is long gone so maybe that's not a problem.
+
+Gentoo-Bug: 335033
+---
+ Makefile | 34 +++++-----------------------------
+ 1 file changed, 5 insertions(+), 29 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7916cab..43a0527 100644
+--- a/Makefile
+++ b/Makefile
+@@ -1,36 +1,12 @@
+ GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+ GTK_LIB = `pkg-config gtk+-2.0 --libs`
+ 
+-INSTALLDIR = /usr/lib/gkrellm2/plugins
+-
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
+CFLAGS += -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+-LFLAGS = -shared
+-
+-CC = gcc
+-
+-OBJS = gkrellfire.o
+-
+-all: gkrellfire.so
+-
+-%.o: %.c
+-	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
+LDFLAGS += -shared
+ 
+-
+-gkrellfire.so: $(OBJS)
+-	$(CC) $(CFLAGS) $(OBJS) -o gkrellfire.so $(LFLAGS) $(LIBS)
+gkrellfire.so: gkrellfire.o
+	$(CC) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LIBS)
+ 
+ clean:
+-	rm -f *.o core *.so* *.bak *~
+-
+-gkrellfire.o: gkrellfire.c
+-
+-install:
+-	if [ -d $(INSTALLDIR) ] ; then \
+-		install -c -s -m 644 gkrellfire.so $(INSTALLDIR) ; \
+-	else \
+-		install -D -c -s -m 644 gkrellfire.so $(INSTALLDIR)/gkrellfire.so ; \
+-	fi
+-
+-uninstall:
+-	rm -f $(INSTALLDIR)/gkrellfire.so
+	rm -f gkrellfire.*o
+-- 
+2.7.3
+
--- a/x11-plugins/gkrellfire/gkrellfire-0.4.2-r1.ebuild
+++ b/x11-plugins/gkrellfire/gkrellfire-0.4.2-r1.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="CPU load flames for GKrellM 2"
+HOMEPAGE="http://people.freenet.de/thomas-steinke"
+SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-admin/gkrellm[X]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/fix-CC-CFLAGS-LDFLAGS-handling.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}