diff --git a/app-emulation/vagrant/vagrant-1.8.1.ebuild b/app-emulation/vagrant/vagrant-1.8.1.ebuild
index 50fcdce82b90f..766211ac390d6 100644
--- a/app-emulation/vagrant/vagrant-1.8.1.ebuild
+++ b/app-emulation/vagrant/vagrant-1.8.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI="5"
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
@@ -30,7 +30,7 @@ ruby_add_rdepend "
 	>=dev-ruby/bundler-1.5.2 <=dev-ruby/bundler-1.10.6
 	>=dev-ruby/childprocess-0.5.0
 	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/i18n-0.6.0 <dev-ruby/i18n-0.8.0
+	>=dev-ruby/i18n-0.6.0:* <dev-ruby/i18n-0.8.0:*
 	>=dev-ruby/listen-3.0.2
 	>=dev-ruby/hashicorp-checkpoint-0.1.1
 	>=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11
@@ -39,7 +39,7 @@ ruby_add_rdepend "
 	>=dev-ruby/net-scp-1.1.0
 	>=dev-ruby/rest-client-1.6.0 <dev-ruby/rest-client-2.0
 	>=dev-ruby/nokogiri-1.6.3.1
-	>=dev-ruby/mime-types-2.6.2 <dev-ruby/mime-types-3
+	>=dev-ruby/mime-types-2.6.2:* <dev-ruby/mime-types-3:*
 "
 
 ruby_add_bdepend "
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 90f2b61decccf..2d5667c978b8e 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -1,3 +1,4 @@
 DIST minissdpd-1.2.20141204.tar.gz 26978 SHA256 f35b14ef9b165bd6b5c44cebc3adbfad92e899d3424c54aea008c5541315abb7 SHA512 73089b616e12ae3ce391f0fa84a6fb09ed61011493d523bd212f02437f59fe8c028127f2839a6b791479d7b821a9ed6786be661ff4b3dc0064f1fbc9b1f9c299 WHIRLPOOL 026e9b10f49bb8a0441178e3b290a5669d982715e5828c73231bdff1366b5ea4d3b92f3e4b412a30b7e9627597b88cadc1b64ef38945bf690712fdabeea390db
 DIST minissdpd-1.3.20150527.tar.gz 31025 SHA256 18d966e01f94c481937d233f69b1a4c60e12e0d6e9e991086142b3f8c44de8bb SHA512 31c6b267ead8c1b3e12681de404de818d80e578151deb6515c5f4a0cf35dadd93de7058d51d371c4e0921549d9ee31d20acabd5baf78df3908262c2547a8e837 WHIRLPOOL b0e83276a92f2e9dc328be706d0a41c84605ba23a553aabc5498167a9122138f2097a6d36f08f75fcbf763d984a682c52479466d267ed889943e2c4d83476ad2
 DIST minissdpd-1.3.tar.gz 30326 SHA256 86476b581efa7640c7e9695dd7e43ccafa26c77e77fd0176d79bc5e8ad117196 SHA512 d05ceaf4151eef10cca8fc5685cff1778d7ef47da8e33ebe4c14977fce4ffb0cfbc6fe6e7f21e7e61c59fe876c722d41060154ec2118b4f24e15e167b46a65fa WHIRLPOOL ee91ec1ab1d16823e1f67dc63aa0ca6d8946b9e66a5003deee131b14a888095acfc345522f3c5e5aea01e0e76844f172703841e5ae65080e182dcacf483f0ad0
+DIST minissdpd-1.5.20160119.tar.gz 34711 SHA256 22a346530db3f119ce23bf90d92e950cc151287a12ece51078497b2ab113107c SHA512 ece65dd47ed5062d76fc46fb0c04254cc14620e141b68865e6760b60aecca403a22e070944d3d69cd07b3e093c0aff04f7344a24a7c9b0d8420f23a2434e3bcc WHIRLPOOL 9f430c72c1a36def77337006c14e954ee145a3447a447f685b2f6a918b95afa40d810b6b9de89e903dd07050bd96183a1b91e7f6ae35bc5f8fc7d96a0dcd3f63
diff --git a/net-misc/minissdpd/minissdpd-1.5.20160119.ebuild b/net-misc/minissdpd/minissdpd-1.5.20160119.ebuild
new file mode 100644
index 0000000000000..97b95d3b1c1b5
--- /dev/null
+++ b/net-misc/minissdpd/minissdpd-1.5.20160119.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils toolchain-funcs
+
+DESCRIPTION="MiniSSDP Daemon"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+HOMEPAGE="http://miniupnp.free.fr/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="|| ( net-misc/miniupnpd net-libs/miniupnpc )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2-remove-initd.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	einstall PREFIX="${D}"
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	dodoc Changelog.txt README
+	doman minissdpd.1
+}
diff --git a/sci-libs/plplot/plplot-5.11.1-r1.ebuild b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
index bed1a23dc9ec8..737d78f20587f 100644
--- a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
@@ -232,7 +232,7 @@ src_configure() {
 }
 
 src_test() {
-	virtx cmake-utils_src_test virtualmake
+	virtx cmake-utils_src_test
 }
 
 src_install() {