10 files changed, 15 insertions, 11 deletions
diff --git a/dev-python/html2text/html2text-2019.9.26.ebuild b/dev-python/html2text/html2text-2019.9.26.ebuild
index d79e5a231b48..8cb53b668f84 100644
--- a/dev-python/html2text/html2text-2019.9.26.ebuild
+++ b/dev-python/html2text/html2text-2019.9.26.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # pkg_resources is used for entry points
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-vcs/git/git-2.24.0_rc2.ebuild b/dev-vcs/git/git-2.24.0_rc2.ebuild
index 314b0f442847..9e71c152786e 100644
--- a/dev-vcs/git/git-2.24.0_rc2.ebuild
+++ b/dev-vcs/git/git-2.24.0_rc2.ebuild
@@ -550,7 +550,7 @@ src_install() {
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+		dosym ../gitweb /usr/share/${PN}/gitweb
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 314b0f442847..9e71c152786e 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -550,7 +550,7 @@ src_install() {
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+		dosym ../gitweb /usr/share/${PN}/gitweb
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 314b0f442847..9e71c152786e 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -550,7 +550,7 @@ src_install() {
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+		dosym ../gitweb /usr/share/${PN}/gitweb
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 314b0f442847..9e71c152786e 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -550,7 +550,7 @@ src_install() {
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+		dosym ../gitweb /usr/share/${PN}/gitweb
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 314b0f442847..9e71c152786e 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -550,7 +550,7 @@ src_install() {
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+		dosym ../gitweb /usr/share/${PN}/gitweb
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index e600b02b9649..d0956082f816 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -155,20 +155,24 @@ esac
 case ${RUBY_FAKEGEM_RECIPE_TEST} in
 	rake)
 		IUSE+=" test"
+		RESTRICT+=" !test? ( test )"
 		ruby_add_bdepend "test? ( dev-ruby/rake )"
 		;;
 	rspec)
 		IUSE+=" test"
+		RESTRICT+=" !test? ( test )"
 		# Also require a new enough rspec-core version that installs the
 		# rspec-2 wrapper.
 		ruby_add_bdepend "test? ( dev-ruby/rspec:2 >=dev-ruby/rspec-core-2.14.8-r2 )"
 		;;
 	rspec3)
 		IUSE+=" test"
+		RESTRICT+=" !test? ( test )"
 		ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
 		;;
 	cucumber)
 		IUSE+=" test"
+		RESTRICT+=" !test? ( test )"
 		ruby_add_bdepend "test? ( dev-util/cucumber )"
 		;;
 	*)
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 30188ae78c36..ac238de93e5d 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
 	dev-qt/qtxml:5
-	=net-libs/libtorrent-rasterbar-1.1*:0=
+	>=net-libs/libtorrent-rasterbar-1.2.0:0=
 	sys-libs/zlib
 	dbus? ( dev-qt/qtdbus:5 )
 	X? (
diff --git a/sci-electronics/ngspice/ngspice-31.ebuild b/sci-electronics/ngspice/ngspice-31.ebuild
index b29be4149ffc..d51fbae4f135 100644
--- a/sci-electronics/ngspice/ngspice-31.ebuild
+++ b/sci-electronics/ngspice/ngspice-31.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD GPL-2"
 
 SLOT="0"
 IUSE="X debug deprecated doc examples fftw openmp +readline +shared tcl"
+RESTRICT="!test? ( test )"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x64-macos"
 
 DEPEND="sys-libs/ncurses:0=
diff --git a/sci-geosciences/gpxsee/gpxsee-7.17.ebuild b/sci-geosciences/gpxsee/gpxsee-7.17.ebuild
index 3b81f7fe5b94..b7ebc18f0f55 100644
--- a/sci-geosciences/gpxsee/gpxsee-7.17.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-7.17.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="cs da de en es fi fr nb pl pt_BR pt_PT ru sv tr"
-inherit qmake-utils l10n xdg
+inherit desktop qmake-utils l10n xdg
 
 MY_PN="GPXSee"
 MY_P="${MY_PN}-${PV}"
@@ -59,10 +59,8 @@ src_install() {
 		[ -f "${lang}" ] && doins "${lang}"
 	done
 
-	insinto /usr/share/applications
-	doins pkg/${PN}.desktop
+	domenu pkg/${PN}.desktop
 	insinto /usr/share/mime/packages
 	doins pkg/${PN}.xml
-	insinto /usr/share/pixmaps
-	doins icons/${PN}.png
+	doicon icons/${PN}.png
 }