Merge updates from master

app-admin/s-tui/Manifest

@@ -1 +1,2 @@
 DIST s-tui-1.0.2.tar.gz 2607552 BLAKE2B 8ed54c44aeab0ccf5806e8fa1cb566b23d9f27f82a281882b36de85c4800515385c558da59b1ba8f039da15d08696865d5ac201c85c1b74316a7757fc2f02125 SHA512 7b475a4be69b702bd0a916e5c4fbec2dc9976e5033d6afb24af0583eba62292d5f7ab26779e1b55d8adaa113c32984a15311d050e9457d791778734b9236d530
+DIST s-tui-1.1.1.tar.gz 2608558 BLAKE2B df3211e948acae7ad6b93bdd770cd0aae695da39e4746231f0aed7904dc35b480982ada249ab3dbc387b18dbf40029f2d8db23d71d764a141abe814c5c8117e6 SHA512 71de8fbdad7ebcf9e0ef84b35276315b6c23782c1e24cec1cabb5397e768aa2d5c3f0d3945e1693625b06c52dc1c4ceb7290f6262bf6cddca7afecdcff059bae

app-admin/s-tui/s-tui-1.1.1.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Stress-Terminal UI monitoring tool"
+HOMEPAGE="https://amanusk.github.io/s-tui/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/amanusk/${PN}.git"
+	EGIT_SUBMODULES=()
+else
+	# Pypi source doesn't include tests
+	SRC_URI="https://github.com/amanusk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/psutil-5.6.0[${PYTHON_USEDEP}]
+	>=dev-python/urwid-2.0.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "Stress options in program menu" app-benchmarks/stress
+}

app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild

@@ -30,6 +30,18 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	default
+
+	# remove override of the libpath
+	sed -i -e '/^	target.path/d' lib/shared.pro || die
+	sed -i -e '/^	target.path/d' lib/static.pro || die
+
+	# fix prefix of lib files
+	sed -i -e 's/$$INSTALL_PREFIX/$$PREFIX/g' lib/shared.pro || die
+	sed -i -e 's/$$INSTALL_PREFIX/$$PREFIX/g' lib/static.pro || die
+}
+
 src_configure() {
 	local lib="$(get_libdir)"
 	# '^^' because we need to upcase the definition
@@ -38,5 +50,5 @@ src_configure() {
 
 src_install() {
 	einstalldocs
-	emake INSTALL_ROOT="${D}" install
+	emake INSTALL_ROOT="${ED}" install
 }

app-editors/featherpad/Manifest

@@ -0,0 +1 @@
+DIST featherpad-0.17.2.tar.gz 921192 BLAKE2B 38d0520c918dbae0b46f2a6d1a3f553f28ef0351b017600d4cc21cce61eb69bf08a80c118dfb794af3489cbb10c93d59c2b8effc049eccbd57aaefc403bddb29 SHA512 39721faa4c0b5c0920c9fdcbfaafe864b6e649145ec8b51ea1f3ca3ec038119caaf0a812362e226fd4e699d0f385508f1fb12992b2219f995b8486779d06b872

app-editors/featherpad/featherpad-0.17.2.ebuild

@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg qmake-utils
+
+MY_P="${P/featherpad/FeatherPad}"
+
+DESCRIPTION="Lightweight Qt5 Plain-Text Editor for Linux"
+HOMEPAGE="https://github.com/tsujan/FeatherPad"
+SRC_URI="https://github.com/tsujan/FeatherPad/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-text/hunspell
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+}

app-editors/featherpad/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>hansfn@gmail.com</email>
+        <name>Hans Fredrik Nordhaug</name>
+    </maintainer>
+</pkgmetadata>

app-text/komikku/komikku-0.24.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,7 @@ DEPEND="
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/pure-protobuf[${PYTHON_USEDEP}]
+		dev-python/pygobject[${PYTHON_USEDEP}]
 		dev-python/python-magic[${PYTHON_USEDEP}]
 		dev-python/unidecode[${PYTHON_USEDEP}]
 	')

app-text/komikku/komikku-0.26.1.ebuild

@@ -30,6 +30,7 @@ DEPEND="
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/pure-protobuf[${PYTHON_USEDEP}]
+		dev-python/pygobject[${PYTHON_USEDEP}]
 		dev-python/python-magic[${PYTHON_USEDEP}]
 		dev-python/unidecode[${PYTHON_USEDEP}]
 	')

dev-php/pecl-inotify/pecl-inotify-2.0.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_FILENAME="inotify-${PV}.tgz"
 
-USE_PHP="php7-2 php7-3"
+USE_PHP="php7-3"
 
 inherit php-ext-pecl-r3
 

dev-python/convertdate/Manifest

@@ -1,2 +1,2 @@
 DIST convertdate-2.3.0.tar.gz 48993 BLAKE2B d0bbb68eeb71090fc9e0d524a1ec40789d101e29b85c8d3ecc14acefa00ff749f08e74980f36a486b19c08d949a517f00dcb4abc4a8aa29d105b8873e19c470c SHA512 ec3df742f16cdaca49f519d25b6a9647e654b7dd5c3e2ef43f4ae6466dff520db5ab67f58caf066a719e6c8c16b09ed4bf7c27d256259deb7e50f19ea14603f2
-DIST convertdate-2.3.1.tar.gz 49003 BLAKE2B 92410c16b7ac2ae20d1564cb0666c89a2413ae1cc85d29a80c73d9941a712c37791702c0e0ec6b19b018e2bd5c1b7c196cdc7cdfabf362e271e8919bfcc72a71 SHA512 85ec8edc1eafcace2dc1a6a49c8c6fa21ed6119fa7020240eb395cdfd432189349c20484ade3e00f38aec37a95f3042db1bd8955d41ea01f646ec8fafeb60a5c
+DIST convertdate-2.3.1.tar.gz 49030 BLAKE2B 04f05035a8e9b325303a2dcf1d1dd391cef825825c6191cc26c0623de9a3c01086f29a3aae1c3d68e07a723179bee2781fcc9d9bc5e78fdc4b38463fdab54c47 SHA512 6a8e00fe8548b5715861903bf5a8561ad63907b3fc100ffe2e9f9a08864082e07267691f5bf983335a857310c8fdb48a306448ae4ababaee41a5a8eb515fdc2f

dev-python/pymeeus/Manifest

@@ -1,2 +1,3 @@
 DIST PyMeeus-0.3.13.tar.gz 5254730 BLAKE2B 09ed8f061e9c515c215318b613305e2f7ea1e5a2581c9caa270443a32de760dd77e09007771154177fe7e45cb7f8874351f585a5b17f4f56956e6049f68bcf87 SHA512 436eb990c47eab2eefa4d8eaa65171d4e630653c73f316d4f6097c10306aae70983fba074bfbaa44737ce2f55b4450b5c44e5a15e551f30a2c533f35a1d05965
 DIST PyMeeus-0.3.7.tar.gz 732308 BLAKE2B c8231e154ca08ba0ccc68d3634f7b3d6ec0d94980134fbb495409856d01a7588d506e142120b632e89158da16b6a635d0a33f6f270d87ec16a214d71f78bad75 SHA512 834fd3329437827a65a653b5bde9070e049a7932cac3ce06edfdfbd8efd6649b96de9ce46c032b18a7413bcf30d012f21857442e9dd2cf1f0ef23434682cf5e0
+DIST PyMeeus-0.4.2.tar.gz 5299266 BLAKE2B ff2361762f7e1c8eeb81f521dce75acbda90228133e3fc0c9aea494ff2f9b2a5b5f70c7f58e6c864f2fae025fb7dda3ce390642362fefb4d8a6ac23dc3986324 SHA512 d3f3341b1546d6a632d18916f8aefec7e4cb437693d8373a09a87d3a28525436acd7b8b6ada57d127e1449a493e5d676af985e874cb330b53f80e0bcbc91dffc

dev-python/pymeeus/pymeeus-0.4.2.ebuild

@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="PyMeeus"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of Jean Meeus astronomical routines"
+HOMEPAGE="https://github.com/architest/pymeeus"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme

net-misc/can-utils/Manifest

@@ -0,0 +1,2 @@
+DIST can-utils-2020.02.04.tar.gz 121866 BLAKE2B 64a9e0dbc2e65ef01b6709fc608daecce53592f98c002a46b15a282fff33f52d1d7b34d22ed85f1e2a2eb8a7be6e5ce69a85ba4e2ba19f251994f5022697f474 SHA512 5f12a84b82564da5a47e6dc906bf26f0e56db77ce367b5b72a2820cf18447d78a355d0173c678e33dc0e4cc07ef3a12b3a84d6b016c7ee0b1ac5a7f10daee1c8
+DIST can-utils-2020.12.0.tar.gz 132010 BLAKE2B 626c0b88973c0579728869013f48ec7de4bcd94dd98ed4ae8349a0b71ec2eb9892d267501ff7af58b34ac528f2d6e733aad795582bcc96b03d20ae0710986ea8 SHA512 b9d92b7734611deaf445708aabf4f46f7cf3ad88f46618fbae6821d308b2950da014420b194792e4d2458f396bd85f200a8d10112c10191a98624073b8502c19

net-misc/can-utils/can-utils-2020.02.04.ebuild

@@ -0,0 +1,39 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="CAN userspace utilities and tools"
+HOMEPAGE="https://github.com/linux-can/"
+SRC_URI="https://github.com/linux-can/can-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd"
+
+DEPEND=""
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+# Default src_install + newconfd and newinitd
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	if use systemd ; then
+		systemd_dounit "${FILESDIR}/slcan.service"
+		systemd_install_serviced "${FILESDIR}/slcan.service.conf"
+	else
+		newconfd "${FILESDIR}/slcand.confd" slcand
+		newinitd "${FILESDIR}/slcand.initd" slcand
+	fi
+}

net-misc/can-utils/can-utils-2020.12.0.ebuild

@@ -0,0 +1,39 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="CAN userspace utilities and tools"
+HOMEPAGE="https://github.com/linux-can/"
+SRC_URI="https://github.com/linux-can/can-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd"
+
+DEPEND=""
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+# Default src_install + newconfd and newinitd
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	if use systemd ; then
+		systemd_dounit "${FILESDIR}/slcan.service"
+		systemd_install_serviced "${FILESDIR}/slcan.service.conf"
+	else
+		newconfd "${FILESDIR}/slcand.confd" slcand
+		newinitd "${FILESDIR}/slcand.initd" slcand
+	fi
+}

net-misc/can-utils/can-utils-9999-r3.ebuild

@@ -0,0 +1,39 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/linux-can/${PN}.git"
+EGIT_BRANCH="master"
+
+inherit autotools git-r3 systemd
+
+DESCRIPTION="CAN userspace utilities and tools"
+HOMEPAGE="https://github.com/linux-can/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd"
+
+DEPEND=""
+
+src_prepare() {
+	eautoreconf
+}
+
+# Default src_install + newconfd and newinitd
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	if use systemd ; then
+		systemd_dounit "${FILESDIR}/slcan.service"
+		systemd_install_serviced "${FILESDIR}/slcan.service.conf"
+	else
+		newconfd "${FILESDIR}/slcand.confd" slcand
+		newinitd "${FILESDIR}/slcand.initd" slcand
+	fi
+}

net-misc/can-utils/files/slcan.service

@@ -0,0 +1,19 @@
+[Unit]
+Description=Userspace daemon for serial line CAN interface driver SLCAN
+
+[Service]
+Environment=can_speed=S5
+Environment=tty_baud=460800
+Environment=tty_device=ttyUSB0
+Environment=can_device=can0
+
+
+ExecStartPre=/sbin/modprobe slcan
+ExecStartPre=/bin/stty -F /dev/${tty_device} ${tty_baud} line 0 cs8 -onlcr -echo raw min 100 time 2
+ExecStartPre=/bin/sh -c 'echo -e -n "C\rF\r${can_speed}\rO\r" > /dev/${tty_device}'
+
+ExecStart=/usr/bin/slcand -F ${tty_device} ${can_device}
+ExecStartPost=/bin/sleep 1
+ExecStartPost=/bin/ip link set can0 txqueuelen 1000 up
+
+ExecStopPost=/sbin/modprobe -r slcan

net-misc/can-utils/files/slcan.service.conf

@@ -0,0 +1,18 @@
+# This file contains the configuration for the slcan daemon
+
+
+
+# The `stty' command includes support for speeds of 57600, 115200,
+# 230400, 460800, 500000, 576000, 921600, 1000000, 1152000, 1500000,
+# 2000000, 2500000, 3000000, 3500000, or 4000000
+
+# 921600 baud for S6
+# 460800 baud for S5
+
+# Case sensitive speed setting
+
+[Service]
+Environment=can_speed=S5
+Environment=tty_baud=460800
+Environment=tty_device=ttyUSB0
+Environment=can_device=can0

net-misc/can-utils/files/slcand.confd

@@ -0,0 +1,18 @@
+# /etc/conf.d/slcand
+# This file contains the configuration for the slcan daemon
+
+
+
+# The `stty' command includes support for speeds of 57600, 115200,
+# 230400, 460800, 500000, 576000, 921600, 1000000, 1152000, 1500000,
+# 2000000, 2500000, 3000000, 3500000, or 4000000
+
+# 921600 baud for S6
+# 460800 baud for S5
+
+# Case sensitive speed setting
+
+can_speed="S5"
+tty_baud="460800"
+tty_device="ttyUSB0"
+can_device="can0"

net-misc/can-utils/files/slcand.initd

@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 2013 Brunvoll AS
+
+
+start() {
+
+	if [ -z "${can_speed}" -o -z "${tty_baud}" -o -z "${tty_device}" -o -z "${can_device}" ]; then
+		eerror "CAN speed, CAN device, tty_baud or tty_device not set"
+		return 1
+	fi
+
+	if ! grep -q slcan /proc/modules; then
+		einfo "Loading module slcan"
+		modprobe slcan || return 1
+	fi
+
+	ebegin "Creating can0 at speed ${can_speed} on device ${tty_device}"		
+	einfo "Setting baudrate of ${tty_device} to ${tty_baud}"
+	stty -F /dev/${tty_device} ${tty_baud} line 0 cs8 -onlcr -echo raw min 100 time 2
+	sleep 1
+	einfo "Set bitrate of slcan on ${tty_device} to ${can_speed}: "
+	echo -e -n "C\rF\r${can_speed}\rO\r" > /dev/${tty_device}
+	sleep 1
+	einfo "Starting slcand"
+	start-stop-daemon --start --background --make-pidfile \
+					  --pidfile /var/run/slcand.pid \
+					  --exec /usr/bin/slcand -- ${tty_device} ${can_device}
+	sleep 1
+	ifconfig ${can_device} up
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping slcand"
+	start-stop-daemon --stop --quiet --pidfile /var/run/slcand.pid
+	sleep 1
+	rmmod slcan
+	eend $?
+}

net-misc/can-utils/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>hansfn@gmail.com</email>
+        <name>Hans Fredrik Nordhaug</name>
+    </maintainer>
+</pkgmetadata>