Merge updates from master

app-shells/fish-history-merge/fish-history-merge-0_pre20201121.ebuild

@@ -4,7 +4,7 @@
 EAPI="7"
 COMMIT="7e415b8ab843a64313708273cf659efbf471ad39"
 
-DESCRIPTION="This is a fish plugin that modifies built-in up-or-search command to merge the command history"
+DESCRIPTION="Plugin that modifies built-in up-or-search command to merge the command history"
 HOMEPAGE="https://github.com/2m/fish-history-merge"
 SRC_URI="https://github.com/2m/fish-history-merge/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 

profiles/updates/1Q-2021

@@ -3,4 +3,5 @@ move sci-geosciences/geographiclib sci-geosciences/GeographicLib
 move x11-libs/kimageannotator media-libs/kimageannotator
 move x11-libs/kcolorpicker media-libs/kcolorpicker
 move media-video/jellyfin-mpv-shim media-video/jellyfin-desktop
-move gui-apps/paperdesktop gui-apps/paperde
+move gui-apps/paperdesktop gui-apps/paperde
+move sci-libs/chaco sci-mathematics/chaco

profiles/updates/4Q-2020

@@ -2,3 +2,4 @@ move x11-themes/sweet-gtk-theme x11-themes/sweet-dark-gtk-theme
 move app-text/git-delta dev-util/git-delta
 move dev-libs/wren dev-lang/wren
 move app-editors/atom app-editors/atom-bin
+move x11-terms/terminus x11-terms/terminus-bin

sci-mathematics/chaco/chaco-2.2.ebuild

@@ -13,14 +13,10 @@ KEYWORDS="~amd64 ~x86"
 PATCHES=( "${FILESDIR}/makefile.patch" )
 S="${WORKDIR}/Chaco-${PV}"
 
-#src_prepare() {
-#	eapply_user
-#}
-
 src_install() {
-	pushd code
+	pushd code || die
 	emake
-	popd
+	popd || die
 	dobin "exec/chaco"
 	dodoc -r doc/.
 }

sys-fs/dwarfs/dwarfs-0.5.4.ebuild

@@ -17,6 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE="python +jemalloc test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 PYTHON_REQ_USE="python"

x11-terms/terminus-bin/Manifest

@@ -0,0 +1,2 @@
+DIST terminus-bin-1.0.136.tar.gz 98170177 BLAKE2B 71c8ae6db336c2ea5eaf463ff877941865f46bc502f50a98cf32243ae73000bc25a598fbadcf03b5dbf04bf4ea5da02356770c6cb7e7d210c7eaa2c3370026b8 SHA512 24e9cdcb0c0cb573796ae95318c2baa8a3b0fdd5f46aab4239b8a6d48885507f43e32c97615487f8e94f8007302d1d79a8363da83bd71ed8f3f5eac5065cf016
+DIST terminus-icons.tar.gz 29662 BLAKE2B 156f1a41d230cd895fcd58528ed86980249a01486cd43b7fa0dfe6cab6de228cf107f4725ad25d01ffe48fefba8734bd7ec0183da1324750b481e9bef6e2497e SHA512 03eef1909ce7da01ce7c058f57b5a2c792eacdd623532208568f312ecf0717dfde43790f2daa2a97ab0de9e137b0989c9c63a5ca8e71b0fcffdf67c63703fa26

x11-terms/terminus-bin/terminus-bin-1.0.136.ebuild

@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+MY_P="terminus-${PV}"
+
+DESCRIPTION="A terminal for a more modern age"
+HOMEPAGE="https://eugeny.github.io/terminus/"
+SRC_URI="
+	https://github.com/Eugeny/terminus/releases/download/v${PV}/${MY_P}-linux.tar.gz -> ${P}.tar.gz
+	https://github.com/ScardracS/icons/releases/download/release/terminus-icons.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="alsa cups X"
+
+S="${WORKDIR}/${MY_P}-linux"
+
+DEPEND="
+	app-accessibility/at-spi2-atk
+	app-accessibility/at-spi2-core
+	dev-libs/atk
+	dev-libs/nss
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	X? (
+		media-libs/mesa
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+
+		x11-libs/libdrm
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+		x11-libs/libxkbcommon
+		x11-libs/libXrandr
+		x11-libs/libxshmfence
+		x11-libs/pango
+	)
+"
+
+QA_PREBUILT="/opt/terminus/*"
+
+src_prepare(){
+	default
+}
+
+src_install(){
+	insinto /opt/"${PN}"
+	doins -r "${S}"/*
+	dosym ../../opt/"${PN}"/terminus "${EPREFIX}"/usr/bin/terminus
+	fperms +x /opt/"${PN}"/terminus
+	make_desktop_entry /opt/${PN}/terminus Terminus terminus Utility
+	doicon ../terminus.svg
+	doicon ../terminus.ico
+	for i in {16,24,32,48,64,72,96,128,512}; do
+		doicon -s "${i}" ../terminus-"${i}".png
+	done
+}

x11-terms/terminus/Manifest

@@ -1,2 +0,0 @@
-DIST terminus-1.0.135-linux.tar.gz 98751022 BLAKE2B 956a664b70918e0774caa0590a05acc689d9814507969568de8b468a3fad6784f1d2b19c29131d9cf13fde39db0b815e669fe4a6a29a6d78e212c098aeb58bbf SHA512 00957d136c16d12b1e5c0b8422cd743a8084305543f7c9e017ee1b19c57383d47c41da06004482ac4d2c97708aeea2e861f2e580f48cf13f8eb2afeac7ea047d
-DIST terminus-icons.tar.gz 29662 BLAKE2B 156f1a41d230cd895fcd58528ed86980249a01486cd43b7fa0dfe6cab6de228cf107f4725ad25d01ffe48fefba8734bd7ec0183da1324750b481e9bef6e2497e SHA512 03eef1909ce7da01ce7c058f57b5a2c792eacdd623532208568f312ecf0717dfde43790f2daa2a97ab0de9e137b0989c9c63a5ca8e71b0fcffdf67c63703fa26

x11-terms/terminus/terminus-1.0.135.ebuild

@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A terminal for a more modern age"
-
-HOMEPAGE="https://eugeny.github.io/terminus/"
-SRC_URI="https://github.com/Eugeny/${PN}/releases/download/v${PV}/${P}-linux.tar.gz https://github.com/ScardracS/icons/releases/download/release/${PN}-icons.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-inherit desktop xdg
-
-S=""${WORKDIR}"/"${P}"-linux"
-
-DEPEND="net-print/cups" # Requested by electron
-
-src_prepare(){
-	default
-
-	# Remove useless license files.
-	rm LICENSE.electron.txt LICENSES.electron.html
-}
-
-src_install(){
-	insinto /opt/"${PN}"
-	doins -r "${S}"/*
-	dosym ../../opt/"${PN}"/terminus "${EPREFIX}"/usr/bin/terminus
-	fperms +x /opt/"${PN}"/terminus
-	make_desktop_entry /opt/terminus/terminus terminus terminus Utility
-	doicon ../terminus.svg
-	doicon ../terminus.ico
-	for i in {16,24,32,48,64,72,96,128,512}; do
-		doicon -s "${i}" ../terminus-"${i}".png
-	done
-}