From 3cbaff955fef2d9d1dcb12f3d614b293cc33c5dc Mon Sep 17 00:00:00 2001
From: root <root@sandbox.local.calculate.ru>
Date: Tue, 22 Nov 2016 13:26:24 +0300
Subject: [PATCH] Sync with portage [Tue Nov 22 13:26:24 MSK 2016].

---
 dev-lang/ruby/Manifest                        |   2 +
 dev-lang/ruby/ruby-2.3.3.ebuild               | 243 ++++++++++++++++++
 dev-libs/libpfm/Manifest                      |   1 +
 dev-libs/libpfm/libpfm-4.8.0.ebuild           |  36 +++
 media-gfx/librecad/Manifest                   |   5 +-
 media-gfx/librecad/librecad-2.0.5.ebuild      |  38 ---
 media-gfx/librecad/librecad-2.0.6.ebuild      |  38 ---
 media-gfx/librecad/librecad-2.0.7.ebuild      |  38 ---
 ...cad-2.0.8.ebuild => librecad-2.1.3.ebuild} |  19 +-
 metadata/dtd/timestamp.chk                    |   2 +-
 metadata/glsa/timestamp.chk                   |   2 +-
 metadata/md5-cache/dev-lang/ruby-2.3.3        |  14 +
 metadata/md5-cache/dev-libs/libpfm-4.8.0      |  11 +
 metadata/md5-cache/media-gfx/librecad-2.0.5   |  13 -
 metadata/md5-cache/media-gfx/librecad-2.0.6   |  13 -
 metadata/md5-cache/media-gfx/librecad-2.0.7   |  13 -
 .../{librecad-2.0.8 => librecad-2.1.3}        |   8 +-
 metadata/md5-cache/www-client/seamonkey-2.40  |   2 +-
 metadata/md5-cache/www-servers/puma-3.6.1     |  14 +
 metadata/news/timestamp.chk                   |   2 +-
 metadata/timestamp                            |   2 +-
 metadata/timestamp.chk                        |   2 +-
 metadata/timestamp.x                          |   2 +-
 metadata/xml-schema/timestamp.chk             |   2 +-
 www-client/seamonkey/seamonkey-2.40.ebuild    |   2 +-
 www-servers/puma/Manifest                     |   1 +
 www-servers/puma/puma-3.6.1.ebuild            |  59 +++++
 27 files changed, 406 insertions(+), 178 deletions(-)
 create mode 100644 dev-lang/ruby/ruby-2.3.3.ebuild
 create mode 100644 dev-libs/libpfm/libpfm-4.8.0.ebuild
 delete mode 100644 media-gfx/librecad/librecad-2.0.5.ebuild
 delete mode 100644 media-gfx/librecad/librecad-2.0.6.ebuild
 delete mode 100644 media-gfx/librecad/librecad-2.0.7.ebuild
 rename media-gfx/librecad/{librecad-2.0.8.ebuild => librecad-2.1.3.ebuild} (77%)
 create mode 100644 metadata/md5-cache/dev-lang/ruby-2.3.3
 create mode 100644 metadata/md5-cache/dev-libs/libpfm-4.8.0
 delete mode 100644 metadata/md5-cache/media-gfx/librecad-2.0.5
 delete mode 100644 metadata/md5-cache/media-gfx/librecad-2.0.6
 delete mode 100644 metadata/md5-cache/media-gfx/librecad-2.0.7
 rename metadata/md5-cache/media-gfx/{librecad-2.0.8 => librecad-2.1.3} (75%)
 create mode 100644 metadata/md5-cache/www-servers/puma-3.6.1
 create mode 100644 www-servers/puma/puma-3.6.1.ebuild

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index ee34d7047bf2..5bba2b00eb3b 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -5,6 +5,7 @@ DIST ruby-2.2.5.tar.xz 10457620 SHA256 f86feaa0a578e8da0924ced3ec68b25b50d69fc9a
 DIST ruby-2.2.6.tar.xz 10487776 SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 SHA512 a2cfde1c6df4df6b996f8d86c52b255fd43b469f8b9f0d7a81ce5f4de949a67025d8bead4ce61f03263eb6a8378b156b843f97b429208afaa1d3bfd0a7af4ef4 WHIRLPOOL 77b01fbd54f77196bca93d0120474436dcdc2e8d437cf70ca1382ed38c58cf05c27e9896cb4b2afd61ea2862ce6b864d707cd4682e17dfc7912d4a74da2b741e
 DIST ruby-2.3.1.tar.xz 11407048 SHA256 6725b5534d5a3a21ec4f14d6d7b9921a0d00d08acb88fd04cd50b47b70496338 SHA512 e9d89aeefb1b1e72cee9d3d414b27c793cf09ff3ed5e0ea5277a2b6ae1cae9fdbf6b404a84b42c0c6835754eb04674fc4f1470fbfedabeee3f57e518f13db633 WHIRLPOOL ddfad0f36d61e75209bdc69da0ec549a3443ecb3ed8e1347bb3d0b54ec34073eb05fc8bb78843d59b8b65ec92b8df47f001f5f28f00f685bd2ab60b1ce557558
 DIST ruby-2.3.2.tar.xz 11420276 SHA256 5c78f311045ce48160092160444dec2744941a5e37d7865032978bd5bf392f0c SHA512 f2e602281cbcfad81b8197b9555bf637a1ef34f51dbc7548e5e0c5996ab1b7db5bd9eeb902128d37eed90f39b559c569aa75f2b29fe5f65085be65a63206fd72 WHIRLPOOL a8206b08b27c45e237069804d03d2250f561c588dfbb65aeb4e3f394b8d843d08abddc65fbf56b4f943dcc25cc2a60b3967cc1a50af4fdce4b8eb5eb1ebe5b95
+DIST ruby-2.3.3.tar.xz 11444164 SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc SHA512 73dd6ed896ff52d953b153b2cab359c87953ea77521878f1ee16c1e217cc46bcb253100debe61ba631e6ffa0bc773e592d603a374508ed5189a311136ccd8d20 WHIRLPOOL aa368a2d0f067ac9d0c6fed62c0e1bdfac0d49c473cd49be9b2774ed3097b76286d091a0887528227f36307b8c1217a2493c5c48fb462db52a3e23cb251a7f79
 DIST ruby-patches-2.0.0_p648.tar.bz2 3341 SHA256 7d82403fed6216baed59ac1fbba888e2b9a4a9cb742ffd01531753bae07ab6b8 SHA512 40d07275a391df3e0a7a0c2705913c8120a548e223032dc39993f8f873c8d0639646cf728dc95f1400352a13766623ac6d69a1b1ff03183df6fabf32946dd7a6 WHIRLPOOL ed7ea6b1c1fd3570ea85b885f7455d8273cff2a9db2540c9e89faca867bd5eed2b4de52c7d21a96bb33ae0beedce113c68bb6c8cee4688650ff5169bd9c265fd
 DIST ruby-patches-2.1.10.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
 DIST ruby-patches-2.1.9.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
@@ -12,3 +13,4 @@ DIST ruby-patches-2.2.5.tar.bz2 2272 SHA256 f54373704ce8df732490e8d1e7e35188503f
 DIST ruby-patches-2.2.6.tar.bz2 2272 SHA256 f54373704ce8df732490e8d1e7e35188503faacc5278fe0ab0d8c07bdc762fed SHA512 ed8bff8f730ccb114e62784d29541f276b2821d9eb121a9772dc4aabc139b688f2b14f5f27710098a8cd751c62d31b46170b427ad54dc4f6490c003450ae1583 WHIRLPOOL 8598c9284252c1e7cc9f9019c5f468ce5ab8b4ae013e71c631cd00cc8bfde068b041f1bc6851bb2962982a1e46cbde0ddc51c186ea41638a7881c587c658e603
 DIST ruby-patches-2.3.1.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64
 DIST ruby-patches-2.3.2.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64
+DIST ruby-patches-2.3.3.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64
diff --git a/dev-lang/ruby/ruby-2.3.3.ebuild b/dev-lang/ruby/ruby-2.3.3.ebuild
new file mode 100644
index 000000000000..e65a661e1acc
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.3.3.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#PATCHSET=1
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_P="${PN}-$(get_version_component_range 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+RUBYVERSION=2.3.0
+
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
+		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm )
+	jemalloc? ( dev-libs/jemalloc )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	ncurses? ( sys-libs/ncurses:0= )
+	readline?  ( sys-libs/readline:0= )
+	dev-libs/libyaml
+	virtual/libffi
+	sys-libs/zlib
+	>=app-eselect/eselect-ruby-20151229
+	!<dev-ruby/rdoc-3.9.4
+	!<dev-ruby/rubygems-1.8.10-r1"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/did_you_mean-1.0.0[ruby_targets_ruby23]
+	>=dev-ruby/minitest-5.8.3[ruby_targets_ruby23]
+	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23]
+	>=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23]
+	>=dev-ruby/rake-10.4.2[ruby_targets_ruby23]
+	>=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby23]
+	>=dev-ruby/json-1.8.3[ruby_targets_ruby23]
+	rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700. Use explicit version numbers to ensure rm fails when they
+	# change so we can update dependencies accordingly.
+	rm -f gems/{did_you_mean-1.0.0,minitest-5.8.3,net-telnet-0.1.1,power_assert-0.2.6,rake-10.4.2,test-unit-3.1.5}.gem || die
+
+	# Fix a hardcoded lib path in configure script
+	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+		configure.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules= myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+	# SuperH needs this
+	use sh && append-flags -mieee
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use readline ; then
+		modules="${modules},readline"
+	fi
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use ncurses ; then
+		modules="${modules},curses"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--docdir=${EPREFIX}/usr/share/doc/${P} \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_enable jemalloc jemalloc) \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 V=1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake V=1 DESTDIR="${D}" install || die "make install failed"
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${D}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	fi
+
+	dodoc ChangeLog NEWS doc/NEWS* README* || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(19|20|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index 03a78ae80a13..1b1e8408ed3c 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -1,2 +1,3 @@
 DIST libpfm-4.4.0.tar.gz 649910 SHA256 8351ff4bbab4e4cbf6f17f76dd18698ef3a7dff766ea0cfa1a6d60bce36f7c9c SHA512 e7f9b50d0c71c08697283d043231234b39695fda6796ad1e2c48fdd67e2936a3cf5d864b5e1b9c68a34f1d726f2b273eb1267adec3060085f3a51e9886f5704a WHIRLPOOL 9f1f1cbb2e56a3269b9f88c81273e69976d95e6557e1f1e08ade249cacbb6368e422e77c38d19603e28892683c37270e176f8854bfdfb6646b935c3e024d332f
 DIST libpfm-4.6.0.tar.gz 767447 SHA256 5ab1e5b0472550f9037a8800834f6bc3b927690070f69fac0b67284b4b05fd5f SHA512 73bd11bd0c11c0ec2fa71935c967f36431a00b548b8b47575e00e8cc3e1f8ef3fc2d449d493f51a198eaba5b1629cdf79330cbe2a8ca8867e15fddbfdbf571dc WHIRLPOOL e6d9747ef22f82b47e5a63da73e178869eddda36fdbc0094de957297ef2a646085a1b2527e8592ae719b18ecc2de903fa451a1acd2dcaf57be4e1f3e7e4848cf
+DIST libpfm-4.8.0.tar.gz 828853 SHA256 9193787a73201b4254e3669243fd71d15a9550486920861912090a09f366cf68 SHA512 a06f3713c70fb4fe694154057604ae42627ad764486a3d3e28b0ef2e46fdd0a0431ec1a3c52ebc711ae174a1fbd7b3ddd0c736a568f57d4606ecf8064ff38228 WHIRLPOOL 3e6faf2a36d0e4f8bcfaa468c41c61c5f668b3fab8e899f0ea45cc04add3a069dec1fb774da4faa9b6933680e6f1eb6c160561482400f48c19abafd5f7edc261
diff --git a/dev-libs/libpfm/libpfm-4.8.0.ebuild b/dev-libs/libpfm/libpfm-4.8.0.ebuild
new file mode 100644
index 000000000000..3f9897083ef1
--- /dev/null
+++ b/dev-libs/libpfm/libpfm-4.8.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Hardware-based performance monitoring interface for Linux"
+HOMEPAGE="http://perfmon2.sourceforge.net"
+SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0/4"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e "s:SLDFLAGS=:SLDFLAGS=\$(LDFLAGS) :g" \
+		-i lib/Makefile || die
+	sed -e "s:LIBDIR=\$(PREFIX)/lib:LIBDIR=\$(PREFIX)/$(get_libdir):g" \
+		-i config.mk || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	emake DESTDIR="${D}" LDCONFIG=true PREFIX="${EPREFIX}/usr"  install
+	use static-libs || find "${ED}" -name '*.a' -exec rm -f '{}' +
+	dodoc README
+}
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 654dd1a3f0b7..cc4f479ec31d 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,7 +1,4 @@
 DIST librecad-2.0.3.zip 16590256 SHA256 4221348541c46c6e9698c1fa3471a14a81376e022a009a164a7f0d0035da4643 SHA512 c40952ae967d83197645bef65dac6e050ddeacf536401b2b99cd18d753462af086ac2a410c6746a92c094ad76fd9177a900c21531ed7b7fcdf1e4b0f7f070e00 WHIRLPOOL c2e1d33b17b7a47ffd9b3795ad292b22cb1225aceacf052494745243630b0537e21701930b9433ea235c462d65581efc2b5ccda3b37712d4ab639ab9bcc6a97d
-DIST librecad-2.0.5.zip 16743868 SHA256 00fba891ccf90328f122c081e9a55f5cf6a908932b92b4414f4ee3b186b48f87 SHA512 afacc5dd833d8a9daba0e9a93f9578f066ada6dff3de4676d8604bbfbce6fba5615c75f498b9ee242b3a7bfcb2746b97a3fbd6b97526990b4ad39757344e3cc5 WHIRLPOOL 5b79ebecec469083a5b13b3e71b76fd116baf935d09c04e979efd583ec58fd17a3bef9e707b3603bba3256527a845f9be4a10271daeaec3fee09ce7fe82fca36
-DIST librecad-2.0.6.zip 17401781 SHA256 09a58f9a4b578eb7381f299414344f82c6e320156c20b3ff1e9e1ae5f2770a30 SHA512 0f8452674659adc943d87aa3d70763682b3e5e7c82530afee98d50dfa4977e8f2e0efcd224087eed68a51727a234d58b8740b00ed0941b6af78dc2938ed15241 WHIRLPOOL 6bb40ae33f28b5ad6adfc91334741d3fe50c6a7f42b0e253554bfacd8f4e7152a495b9e62b8760f28de8c69c77aed73750e094db96d2757fad7cd58ed3200897
-DIST librecad-2.0.7.zip 17457197 SHA256 36d2fa1c60324bb743f0ddde0b9da1dc6b57a370422de714adef27a0cd32d9d2 SHA512 afbe094dd565e2b058c5b1c28e88b76b883d1b9f20f60047e5a7771ec5d353e6a3e73abee8e4d7ac5f916ead7fb15719cf7bab034d670f7d7f54ca394d314803 WHIRLPOOL 5d196be5e54e4ceb7f2650015f35bf6ba77440b7a81d51f68a9a15408d399779f5c61289a5adaacbf1538735f7f0761152371291bab8bc8c8fb8109c3e1ddfc3
-DIST librecad-2.0.8.zip 23469997 SHA256 3f3affbff85fd16746a0e551777c4f234d2b03384d04edf9483d36db1c7144a3 SHA512 d0dd1fdcaafbb7b83a8d0791e132633e9a72648d7d8d7ffdfc02bb092348472a05917df7ea1f2096404afabc92d586b75f6cafa3bc54da535bcaf005c96ed8a7 WHIRLPOOL 14ae2c433345b5081c92426913744d57f2fa4a97621fb55143995365381d5fbed6c8ad6a1f3a6d215dc4791e3493259b3e09801bfb288a85de7db87f010aae49
 DIST librecad-2.0.9.zip 25524745 SHA256 3fd92e8249642462d41d688446393ee5e79f68b7b0d9878388c6c194af2cb43a SHA512 e2029389b2ced67a94d9411cb2f49f524ac12542409bc7829a043af9611dd51544fc431e364f4dcfb1a8b645b2bc6eb86fc74294726a65ee687f69bd7eb8f700 WHIRLPOOL 20aaa38cd92547bae6cee4b696f5b7f3699438481c5051af6112c6b1661ffb018509ff1fdcfb4591e8828c8ffcfcc5a3002c594dbcf95beba93e9768c5133c02
 DIST librecad-2.1.1.zip 26085717 SHA256 a5d27119ff137611c090fb174890ed1312c56897fb1482327d676da148fbd7dc SHA512 82b27e75fddae798da0e30e0c560d3769dfddab936e33a3585fd3e871eccf88e51c28d5ed938a530cb65c2e2ecfc593772ca83a2d23dd29126aa8225595f3d01 WHIRLPOOL 50ac34d0bdf1cd55ee6f7a959c1c1430197ac8acb7739755887b726349e39c9a1fe32ef25cab285aeaf649057701256f6210750c986ddb67ed3f338c80e300ed
+DIST librecad-2.1.3.zip 26086377 SHA256 f05af030c71192109c1472c6fd24696fcb564b2eb83ff9789b88bec2e93c10a3 SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009 WHIRLPOOL a0209b3513fd5f10e608795e34267d5efc7338996ba6cc485cbd9084200cb87fb8b51ab3f224520fc8c693c5ac3db8d049dde68011e8005922ad9c761625971c
diff --git a/media-gfx/librecad/librecad-2.0.5.ebuild b/media-gfx/librecad/librecad-2.0.5.ebuild
deleted file mode 100644
index 55dcce597545..000000000000
--- a/media-gfx/librecad/librecad-2.0.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc tools"
-
-DEPEND="
-	dev-cpp/muParser
-	dev-qt/qtgui:4
-	dev-qt/qthelp:4
-	dev-qt/qtsvg:4
-	dev-libs/boost
-	media-libs/freetype
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_install() {
-	dobin unix/librecad
-	use tools && dobin unix/ttf2lff
-	insinto /usr/share/${PN}
-	doins -r unix/resources/*
-	use doc && dohtml -r librecad/support/doc/*
-	doicon librecad/res/main/${PN}.png
-	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}
diff --git a/media-gfx/librecad/librecad-2.0.6.ebuild b/media-gfx/librecad/librecad-2.0.6.ebuild
deleted file mode 100644
index 55dcce597545..000000000000
--- a/media-gfx/librecad/librecad-2.0.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc tools"
-
-DEPEND="
-	dev-cpp/muParser
-	dev-qt/qtgui:4
-	dev-qt/qthelp:4
-	dev-qt/qtsvg:4
-	dev-libs/boost
-	media-libs/freetype
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_install() {
-	dobin unix/librecad
-	use tools && dobin unix/ttf2lff
-	insinto /usr/share/${PN}
-	doins -r unix/resources/*
-	use doc && dohtml -r librecad/support/doc/*
-	doicon librecad/res/main/${PN}.png
-	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}
diff --git a/media-gfx/librecad/librecad-2.0.7.ebuild b/media-gfx/librecad/librecad-2.0.7.ebuild
deleted file mode 100644
index 2379ae99bbf8..000000000000
--- a/media-gfx/librecad/librecad-2.0.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc tools"
-
-DEPEND="
-	dev-cpp/muParser
-	dev-qt/qtgui:4
-	dev-qt/qthelp:4
-	dev-qt/qtsvg:4
-	dev-libs/boost
-	media-libs/freetype
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_install() {
-	dobin unix/librecad
-	use tools && dobin unix/ttf2lff
-	insinto /usr/share/${PN}
-	doins -r unix/resources/*
-	use doc && dohtml -r librecad/support/doc/*
-	doicon librecad/res/main/${PN}.png
-	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}
diff --git a/media-gfx/librecad/librecad-2.0.8.ebuild b/media-gfx/librecad/librecad-2.1.3.ebuild
similarity index 77%
rename from media-gfx/librecad/librecad-2.0.8.ebuild
rename to media-gfx/librecad/librecad-2.1.3.ebuild
index f2f38129f6bb..323b447f62a9 100644
--- a/media-gfx/librecad/librecad-2.0.8.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -33,21 +33,24 @@ DEPEND="
 		dev-qt/qtwidgets:5
 		dev-qt/qtxml:5
 	)
-	dev-libs/boost
+	dev-libs/boost:=
 	dev-cpp/muParser
-	media-libs/freetype"
+	media-libs/freetype:2"
 
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/LibreCAD-${PV}"
 
 src_prepare() {
+# 	epatch "${FILESDIR}/iota-fix-2.1.1.patch"
+
 	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
-	use 3d || sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+	if ! use 3d; then
+		sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+	fi
 }
 
 src_configure() {
-	if use qt4
-	then
+	if use qt4; then
 		eqmake4 -r
 	else
 		eqmake5 -r
@@ -59,9 +62,9 @@ src_install() {
 	use tools && dobin unix/ttf2lff
 	insinto /usr/share/${PN}
 	doins -r unix/resources/*
-	use doc && dohtml -r librecad/support/doc/*
+	use doc && insinto html && dodoc -r librecad/support/doc/*
 	insinto /usr/share/appdata
 	doins unix/appdata/librecad.appdata.xml
-	doicon librecad/res/main/"${PN}".png
+	doicon librecad/res/main/${PN}.png
 	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
 }
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 6b4ffb70b0ec..2e4b42b8c0bf 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 22 Nov 2016 05:43:25 +0000
+Tue, 22 Nov 2016 08:43:15 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 12c7c71d56d8..2e4b42b8c0bf 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 22 Nov 2016 05:43:26 +0000
+Tue, 22 Nov 2016 08:43:15 +0000
diff --git a/metadata/md5-cache/dev-lang/ruby-2.3.3 b/metadata/md5-cache/dev-lang/ruby-2.3.3
new file mode 100644
index 000000000000..f7b70447b200
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-2.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=An object-oriented scripting language
+EAPI=5
+HOMEPAGE=http://www.ruby-lang.org/
+IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=|| ( Ruby-BSD BSD-2 )
+PDEPEND=>=dev-ruby/did_you_mean-1.0.0[ruby_targets_ruby23] >=dev-ruby/minitest-5.8.3[ruby_targets_ruby23] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23] >=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23] >=dev-ruby/rake-10.4.2[ruby_targets_ruby23] >=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23] virtual/rubygems[ruby_targets_ruby23] >=dev-ruby/json-1.8.3[ruby_targets_ruby23] rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] ) xemacs? ( app-xemacs/ruby-modes )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
+SLOT=2.3
+SRC_URI=mirror://ruby/2.3/ruby-2.3.3.tar.xz https://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-2.3.3.tar.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=6bc060634caf23a758fd50178bfd2bcd
diff --git a/metadata/md5-cache/dev-libs/libpfm-4.8.0 b/metadata/md5-cache/dev-libs/libpfm-4.8.0
new file mode 100644
index 000000000000..4e7d90169360
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpfm-4.8.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Hardware-based performance monitoring interface for Linux
+EAPI=5
+HOMEPAGE=http://perfmon2.sourceforge.net
+IUSE=static-libs
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2 MIT
+SLOT=0/4
+SRC_URI=mirror://sourceforge/perfmon2/libpfm4/libpfm-4.8.0.tar.gz
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=0be7a86b5d760c2712368487a4a1e088
diff --git a/metadata/md5-cache/media-gfx/librecad-2.0.5 b/metadata/md5-cache/media-gfx/librecad-2.0.5
deleted file mode 100644
index a379a79b351f..000000000000
--- a/metadata/md5-cache/media-gfx/librecad-2.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-cpp/muParser dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsvg:4 dev-libs/boost media-libs/freetype
-DESCRIPTION=Generic 2D CAD program
-EAPI=5
-HOMEPAGE=http://www.librecad.org/
-IUSE=debug doc tools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/muParser dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsvg:4 dev-libs/boost media-libs/freetype
-SLOT=0
-SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.0.5.zip -> librecad-2.0.5.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=563906aa970a849ca190dc789f08f44e
diff --git a/metadata/md5-cache/media-gfx/librecad-2.0.6 b/metadata/md5-cache/media-gfx/librecad-2.0.6
deleted file mode 100644
index 0830e8d3b993..000000000000
--- a/metadata/md5-cache/media-gfx/librecad-2.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-cpp/muParser dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsvg:4 dev-libs/boost media-libs/freetype
-DESCRIPTION=Generic 2D CAD program
-EAPI=5
-HOMEPAGE=http://www.librecad.org/
-IUSE=debug doc tools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/muParser dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsvg:4 dev-libs/boost media-libs/freetype
-SLOT=0
-SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.0.6.zip -> librecad-2.0.6.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=563906aa970a849ca190dc789f08f44e
diff --git a/metadata/md5-cache/media-gfx/librecad-2.0.7 b/metadata/md5-cache/media-gfx/librecad-2.0.7
deleted file mode 100644
index 968b97d77785..000000000000
--- a/metadata/md5-cache/media-gfx/librecad-2.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-cpp/muParser dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsvg:4 dev-libs/boost media-libs/freetype
-DESCRIPTION=Generic 2D CAD program
-EAPI=5
-HOMEPAGE=http://www.librecad.org/
-IUSE=debug doc tools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/muParser dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsvg:4 dev-libs/boost media-libs/freetype
-SLOT=0
-SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.0.7.zip -> librecad-2.0.7.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f21c2c254832f3d555f877d8a0bce248
diff --git a/metadata/md5-cache/media-gfx/librecad-2.0.8 b/metadata/md5-cache/media-gfx/librecad-2.1.3
similarity index 75%
rename from metadata/md5-cache/media-gfx/librecad-2.0.8
rename to metadata/md5-cache/media-gfx/librecad-2.1.3
index 42abddd460c1..a36996724708 100644
--- a/metadata/md5-cache/media-gfx/librecad-2.0.8
+++ b/metadata/md5-cache/media-gfx/librecad-2.1.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qthelp:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost dev-cpp/muParser media-libs/freetype
+DEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qthelp:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost:= dev-cpp/muParser media-libs/freetype:2
 DESCRIPTION=Generic 2D CAD program
 EAPI=5
 HOMEPAGE=http://www.librecad.org/
 IUSE=3d debug doc tools qt4 +qt5
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qthelp:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost dev-cpp/muParser media-libs/freetype
+RDEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qthelp:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost:= dev-cpp/muParser media-libs/freetype:2
 REQUIRED_USE=|| ( qt4 qt5 )
 SLOT=0
-SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.0.8.zip -> librecad-2.0.8.zip
+SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.1.3.zip -> librecad-2.1.3.zip
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=61ad866e8f59b497925b36bcf9b0e75d
+_md5_=746092102c4cd487ec03a003ee95c219
diff --git a/metadata/md5-cache/www-client/seamonkey-2.40 b/metadata/md5-cache/www-client/seamonkey-2.40
index ca373df21b64..2d5d2bbed822 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.40
+++ b/metadata/md5-cache/www-client/seamonkey-2.40
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( gstreamer gstreamer-0 )
 SLOT=0
 SRC_URI=linguas_be? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.be.langpack.xpi -> seamonkey-2.40-be.xpi ) linguas_ca? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.ca.langpack.xpi -> seamonkey-2.40-ca.xpi ) linguas_cs? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.cs.langpack.xpi -> seamonkey-2.40-cs.xpi ) linguas_de? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.de.langpack.xpi -> seamonkey-2.40-de.xpi ) linguas_en_GB? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.en-GB.langpack.xpi -> seamonkey-2.40-en-GB.xpi ) linguas_es_AR? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.es-AR.langpack.xpi -> seamonkey-2.40-es-AR.xpi ) linguas_es_ES? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.es-ES.langpack.xpi -> seamonkey-2.40-es-ES.xpi ) linguas_fi? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.fi.langpack.xpi -> seamonkey-2.40-fi.xpi ) linguas_fr? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.fr.langpack.xpi -> seamonkey-2.40-fr.xpi ) linguas_gl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.gl.langpack.xpi -> seamonkey-2.40-gl.xpi ) linguas_hu? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.hu.langpack.xpi -> seamonkey-2.40-hu.xpi ) linguas_it? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.it.langpack.xpi -> seamonkey-2.40-it.xpi ) linguas_ja? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.ja.langpack.xpi -> seamonkey-2.40-ja.xpi ) linguas_lt? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.lt.langpack.xpi -> seamonkey-2.40-lt.xpi ) linguas_nb_NO? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.nb-NO.langpack.xpi -> seamonkey-2.40-nb-NO.xpi ) linguas_nl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.nl.langpack.xpi -> seamonkey-2.40-nl.xpi ) linguas_pl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.pl.langpack.xpi -> seamonkey-2.40-pl.xpi ) linguas_pt_PT? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.pt-PT.langpack.xpi -> seamonkey-2.40-pt-PT.xpi ) linguas_ru? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.ru.langpack.xpi -> seamonkey-2.40-ru.xpi ) linguas_sk? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.sk.langpack.xpi -> seamonkey-2.40-sk.xpi ) linguas_sv_SE? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.sv-SE.langpack.xpi -> seamonkey-2.40-sv-SE.xpi ) linguas_tr? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.tr.langpack.xpi -> seamonkey-2.40-tr.xpi ) linguas_uk? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.uk.langpack.xpi -> seamonkey-2.40-uk.xpi ) linguas_zh_CN? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.zh-CN.langpack.xpi -> seamonkey-2.40-zh-CN.xpi ) linguas_zh_TW? ( https://archive.mozilla.org/pub/seamonkey/releases/2.40/langpack/seamonkey-2.40.zh-TW.langpack.xpi -> seamonkey-2.40-zh-TW.xpi ) https://archive.mozilla.org/pub/seamonkey/releases/2.40/source/seamonkey-2.40.source.tar.xz -> seamonkey-2.40.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-42.0-patches-0.4.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-42.0-patches-0.4.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-42.0-patches-0.4.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.33-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/mozilla-graphite2-1.3.5-upgrade_patches.tar.xz crypt? ( https://www.enigmail.net/download/source/enigmail-1.8.2.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	mozconfig-v6.42	813e24f18091ce90358551dfc8291765	mozcoreconf-v3	4102c889d5bb6814824e927e31e7d2e4	mozextension	3d8ee4835f89ff39d4666656aa603433	mozlinguas	7c13d94b1f9d99210d4020c540b8f8c9	multilib	165fc17c38d1b11dac2008280dab6e80	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6ee9783172c5864fe08b678e57ffcd57
+_md5_=ba077c8c8a57d4908021314385a3a8f7
diff --git a/metadata/md5-cache/www-servers/puma-3.6.1 b/metadata/md5-cache/www-servers/puma-3.6.1
new file mode 100644
index 000000000000..8733cacf57b3
--- /dev/null
+++ b/metadata/md5-cache/www-servers/puma-3.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] test? ( dev-ruby/rack[ruby_targets_ruby21] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby21] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] test? ( dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] test? ( dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
+EAPI=5
+HOMEPAGE=http://puma.io/
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-libs/openssl:0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=3
+SRC_URI=https://github.com/puma/puma/archive/v3.6.1.tar.gz -> puma-3.6.1.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=814a3a13ec3d89c5468722b373849b82
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 12c7c71d56d8..2e4b42b8c0bf 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 22 Nov 2016 05:43:26 +0000
+Tue, 22 Nov 2016 08:43:15 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 0b332f2b480b..40842788352f 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Nov 22 05:39:34 UTC 2016
+Tue Nov 22 08:39:26 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a620eaedc610..5523c184dcfb 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 22 Nov 2016 06:00:01 +0000
+Tue, 22 Nov 2016 10:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f2971fba4ca1..e3de49767353 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1479793201 Tue 22 Nov 2016 05:40:01 AM UTC
+1479804001 Tue 22 Nov 2016 08:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 6b4ffb70b0ec..2e4b42b8c0bf 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 22 Nov 2016 05:43:25 +0000
+Tue, 22 Nov 2016 08:43:15 +0000
diff --git a/www-client/seamonkey/seamonkey-2.40.ebuild b/www-client/seamonkey/seamonkey-2.40.ebuild
index 30c04aa493ad..34befd257bb9 100644
--- a/www-client/seamonkey/seamonkey-2.40.ebuild
+++ b/www-client/seamonkey/seamonkey-2.40.ebuild
@@ -277,7 +277,7 @@ src_install() {
 	if ! use gmp-autoupdate ; then
 		for plugin in gmp-gmpopenh264 ; do
 			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-				"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+				"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
 				|| die
 		done
 	fi
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 71a027ae0782..63f0d5f03e18 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,3 +1,4 @@
 DIST puma-3.1.0.tar.gz 145272 SHA256 b0d7c342ebd398d5cdebb25923ecb8b3f100ff2f4e92fe60218968b9ed5834ff SHA512 b91446ce001107cfda689e4e7af3dbfb10bac9943ec3260c8830c1c4f962552c73113ba0f1aac453066716a84febb442908b5ffcd4f6fda1ecff7c9022898c12 WHIRLPOOL 266fadcbbe86cf94b792a86326e73f79266832c0d7cc2f03ceaab6cdaa87d7702723127dd14688cd1d00c516ac818229e72adbe42533ee61182b92eb0369e87a
 DIST puma-3.1.1.tar.gz 145563 SHA256 ffcbae245e0a3a7f0418a9beb3e0e0a602203de15467dec93375fb3b4612ed6d SHA512 ed478abb90c52a721ed2d050a514720d19de299ce08d416c184bd497118d506d2b66ec50c1484ad7bb405bd0201c02d04da3c41758e8c111f5a9520cd147cafa WHIRLPOOL 4c19d3f1c55c5402d93e4e4359097b12bef017031faa7f3b03807ef6b372cd1bf4bb60ec697599d9c8a998936d09b1eafa414aac0d0e7cacbd0c13c1b40590ba
 DIST puma-3.6.0.tar.gz 151226 SHA256 6183a100cb9bfb2e7d9582254042defd86cb420095d3d440c98cea64d3d15c21 SHA512 b4f25117535d6d9290fb4b33574de79b83f325d18b35eef5a50bfd1719b775bf18c8e4b31df71db38c58992123bb398d03ae26161b960d1f064bb4b9d0161dc7 WHIRLPOOL cbeec7388d06eff1bd50f005564810f788b113291b4c9acb28e5345330b236771608b81b6ffa53e7e1199cd772eea5524cd74926e3ab71eccac217ec6b574079
+DIST puma-3.6.1.tar.gz 152236 SHA256 902516bc6d61592fe880b671893b8cb1f93867ad3e7365aa114982f0bc6faaa5 SHA512 5dc6bb18f5b01a1b98adf56aa2d79394a0a7424013e05f694c5780c254ff451a9c4c5f4c05cd4468851bac77ffe69f752c5ce73c6c1b3bb42fcc0f434bd9acff WHIRLPOOL 2380968b320c41208e600bdaad1830c8a5501f5c4cad6ad7b4511aef284dd1e00ba27779675fc7f779c8cfd07e75baefaca480d2a1c99ac96d6f71bc5f4039ce
diff --git a/www-servers/puma/puma-3.6.1.ebuild b/www-servers/puma/puma-3.6.1.ebuild
new file mode 100644
index 000000000000..a518cf4a276c
--- /dev/null
+++ b/www-servers/puma/puma-3.6.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
+HOMEPAGE="http://puma.io/"
+SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
+RDEPEND+=" dev-libs/openssl:0"
+
+ruby_add_bdepend "virtual/ruby-ssl
+	test? ( dev-ruby/rack >=dev-ruby/minitest-5.8:5 >=dev-ruby/test-unit-3.0:2 )"
+
+all_ruby_prepare() {
+	# Avoid test failing inconsistently
+	sed -i -e '/phased_restart_via_pumactl/,/^  end/ s:^:#:' test/test_integration.rb || die
+
+	# Avoid test we did not run previously that is failing
+	rm -f test/test_cli.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
+		-e 's/localhost/127.0.0.1/' test/shell/* || die
+	sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/puma_http11 extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/puma_http11
+	cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
+}
+
+each_ruby_test() {
+	einfo "Running test suite"
+	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.8'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
+
+	einfo "Running integration tests"
+	pushd test/shell
+	sh run.sh || die
+	popd
+}