Merge updates from master

app-admin/himitsu/himitsu-0.1.ebuild

@@ -1,7 +1,7 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ "${PV}" = "9999" ]]; then
 	inherit git-r3
@@ -11,7 +11,6 @@ else
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 fi
 
-
 DESCRIPTION="Secret storage system for Unix, suitable for storing passwords, keys, ..."
 HOMEPAGE="https://git.sr.ht/~sircmpwn/himitsu"
 LICENSE="GPL-3"

app-admin/himitsu/himitsu-9999.ebuild

@@ -11,7 +11,6 @@ else
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 fi
 
-
 DESCRIPTION="Secret storage system for Unix, suitable for storing passwords, keys, ..."
 HOMEPAGE="https://git.sr.ht/~sircmpwn/himitsu"
 LICENSE="GPL-3"

dev-lang/hare/Manifest

@@ -0,0 +1 @@
+DIST hare-0_pre20220624.tar.gz 671399 BLAKE2B 4ef1d2724219367ce6ffdcf69b5c9f5bd573ddf19a12c0aafa695483c05ef2032961ea714058af9bcfecfcbb45f0ca9bfd3056dc0b388f001f4ddb8a96873233 SHA512 9e8b4b17e293f0bc23cc3913860055d62dae0d0fc700080b2bde76a65c5344bf09e5a51c92f799e9c000bd18550fe10b9a5cd6e38c52ffe7c3faca8a670188ee

dev-lang/hare/hare-0_pre20220624.ebuild

@@ -0,0 +1,33 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The Hare systems programming language"
+HOMEPAGE="https://harelang.org/"
+EGIT_COMMIT="65449ddbbbf39659bfaf84a2cb78510409a4ab7a"
+SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+LICENSE="MPL-2.0 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+DEPEND="
+	sys-devel/qbe
+	dev-lang/harec
+"
+BDEPEND="
+	app-text/scdoc
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	default
+	git-r3_src_unpack
+	mkdir "${WORKDIR}/${P}/build" || die
+}
+
+src_configure() {
+	cp config.example.mk config.mk || die
+	sed -i -e 's;^PREFIX=.*;PREFIX=/usr;' config.mk || die
+}

dev-lang/harec/Manifest

@@ -0,0 +1 @@
+DIST harec-0_pre20220624.tar.gz 164875 BLAKE2B c27d074be6095dcd44702244165051a39fb3503ae50976b152743813f88c7d9b2117b21f2123ffc337c1230cbb114e258d0bc2567fba83882336b444f0ea04af SHA512 08323ddf35ff20ff661132e8d34507e9e247e9e6bb709238c68f7e3212030591ce79374b43cb4eb77c545048c69d68082b893ed95ae8fe29d58b3a81aaf41f7f

dev-lang/harec/harec-0_pre20220624.ebuild

@@ -0,0 +1,26 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The Hare compiler"
+HOMEPAGE="https://harelang.org/"
+EGIT_COMMIT="62d4204f21332d97ad7697f628eade9137e9c3bc"
+SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}/build"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+DEPEND="sys-devel/qbe"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	default
+	git-r3_src_unpack
+	mkdir -p "${S}" || die
+}
+
+src_configure() {
+	../configure --prefix="/usr" --libdir="/usr/$(get_libdir)" || die
+}

dev-python/gevent-websocket/Manifest

@@ -0,0 +1 @@
+DIST gevent-websocket-0.10.1.tar.gz 18366 BLAKE2B bf811eeabab247f97946c971aabd3e4a5cc6034f0874bdfcfbd83ebd08a276d72f70c97694da5fbbb96c988b288d45f55970949d9f4f75bbcb62c027f13aaed2 SHA512 4f25ec1646c223b89ddbb7cf4decae72cc4baa6e872443dc05994987f509068a806c8b5e135c433d631e35b3902227f0e4c89d8071aa74e24c06b0e543e8df93

dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild

@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Websocket handler for the gevent pywsgi server"
+HOMEPAGE="https://pypi.org/project/gevent-websocket/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/gevent[${PYTHON_USEDEP}]"

dev-python/gevent-websocket/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vowstar@gmail.com</email>
+		<name>Huang Rui</name>
+	</maintainer>
+<upstream>
+	<remote-id type="pypi">gevent-websocket</remote-id>
+</upstream>
+</pkgmetadata>

dev-python/sqlalchemy-migrate/Manifest

@@ -0,0 +1 @@
+DIST sqlalchemy-migrate-0.13.0.tar.gz 131424 BLAKE2B 925ee05144360c469d714342005c8b79dc0f1ef7c07ec641c00ec39e4aa18046b3afa7524f4e5afeb292cf78b2b85bac714f44102e0daf799ce09f0af40f3047 SHA512 1ca826a5d80c1373ffc4b2366dfb6d5dd24204964462873451c97d8ff4d75fc6c63f663c4769b7f6cc00002f6a98d425f41d759e5c010b4b81a8b74ffbb102b6

dev-python/sqlalchemy-migrate/files/sqlalchemy-migrate-0.13-disable-sphinx-exts.patch

@@ -0,0 +1,13 @@
+intersphinx: prevent resource downloads at build time\
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -28,8 +28,7 @@ sys.path.append(os.path.dirname(os.path.abspath('.')))
+ 
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.autodoc',
+-              'sphinx.ext.intersphinx']
++extensions = ['sphinx.ext.autodoc']
+ 
+ # link to sqlalchemy docs
+ intersphinx_mapping = {

dev-python/sqlalchemy-migrate/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vowstar@gmail.com</email>
+		<name>Huang Rui</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sqlalchemy-migrate</remote-id>
+	</upstream>
+</pkgmetadata>

dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild

@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="SQLAlchemy Schema Migration Tools"
+HOMEPAGE="https://pypi.org/project/sqlalchemy-migrate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/sqlalchemy-0.9.6[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+		dev-python/sqlparse[${PYTHON_USEDEP}]
+		>=dev-python/tempita-0.4[${PYTHON_USEDEP}]"
+# Testsuite requires a missing dep and errors with poor report output
+
+PATCHES=( "${FILESDIR}/${PN}-0.13-disable-sphinx-exts.patch" )
+
+python_compile_all() {
+	if use doc; then
+		einfo ""; einfo "The build seeks to import modules from an installed state of the package"
+		einfo "simply ignore all warnings / errors of failure to import module migrate.<module>"; einfo ""
+		emake -C doc/source html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/_build/html/. )
+	distutils-r1_python_install_all
+}

gui-apps/hiprompt-gtk-py/Manifest

@@ -0,0 +1 @@
+DIST hiprompt-gtk-py-0_pre20220624.tar.gz 17669 BLAKE2B 90ec17475a058f1eb1fcac59c9994e99a2b80fa34ac185f3b05f579c30cec3b4f98f60dcc121df457af5ea0569614d5d16a14f197a26e7601889c95965930cf4 SHA512 e5ea9ee81ec524764549ed15b64df17b607e7d1ef7f6b0d59980d94bf1dfd079a32a5b8d9de7b6e562e304e3a905e1a6bea7eb94c84d06dd1125e04f2b0c2c37

gui-apps/hiprompt-gtk-py/hiprompt-gtk-py-0_pre20220624.ebuild

@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit meson python-single-r1 xdg
+
+DESCRIPTION="GTK+ Himitsu prompter for Wayland"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/hiprompt-gtk-py"
+EGIT_COMMIT="f74499302bdd6558d4644c25e15c9b5c482270ea"
+SRC_URI="https://git.sr.ht/~sircmpwn/hiprompt-gtk-py/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
+	x11-libs/gtk+:3[introspection]
+	>=gui-libs/gtk-layer-shell-0.5.0
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i "s;@PYTHON@;/usr/bin/${EPYTHON};g" hiprompt_gtk/hiprompt-gtk.in || die
+}

gui-apps/hiprompt-gtk-py/hiprompt-gtk-py-9999.ebuild

@@ -1,9 +1,9 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit git-r3 meson python-single-r1 xdg
 
 DESCRIPTION="GTK+ Himitsu prompter for Wayland"
@@ -11,6 +11,7 @@ HOMEPAGE="https://git.sr.ht/~sircmpwn/hiprompt-gtk-py"
 EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hiprompt-gtk-py"
 LICENSE="GPL-3"
 SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}

net-print/hpuld/hpuld-1.00.39.15.00.23.ebuild

@@ -4,6 +4,7 @@
 EAPI="8"
 
 MY_PV="$(ver_rs 4 _)"
+SANE_CONF_DIR="/etc/sane.d"
 
 DESCRIPTION="HP Unified Linux Driver (for samsung hardware)"
 HOMEPAGE="https://support.hp.com"
@@ -63,6 +64,9 @@ src_install() {
 	sed -i "s#\"\$INSTDIR_CUPS_FILTERS\"#\"${D}/\$INSTDIR_CUPS_FILTERS\"#g" noarch/printer.pkg || die
 	sed -i "s#\"\$INSTDIR_CUPS_PPD\"#\"${D}/\$INSTDIR_CUPS_PPD\"#g" noarch/printer-script.pkg || die
 	sed -i "s#\"\$INSTDIR_LSB_PPD\"#\"${D}/\$INSTDIR_LSB_PPD\"#g" noarch/printer-script.pkg || die
+	# Not use rpm and dpkg
+	sed -i "s#which rpm#which not_found_command_${PN}#g" noarch/package_utils || die
+	sed -i "s#which dpkg#which not_found_command_${PN}#g" noarch/package_utils || die
 
 	# Fix scanner install path
 	sed -i "s#SANE_DIR=/usr/lib\${LIBSFX}/sane#SANE_DIR=${D}/usr/lib\${LIBSFX}/sane#g" noarch/scanner.pkg || die
@@ -76,25 +80,13 @@ src_install() {
 	mkdir -p "${D}"/etc/hotplug/usb || die
 
 	if use scanner ; then
-		local SCDIR="/etc/sane.d"
+		echo "# Add support for the HP-ULD specific backend.  Needs net-print/hpuld installed." > "${S}"/"${PN}".conf || die
-
+		echo "smfp" > "${S}"/"${PN}".conf || die
-		if [ -f ${SCDIR}/dll.conf ] ; then
+		insinto ${SANE_CONF_DIR}/dll.d
-			mkdir -p ${D}/${SCDIR} || die
+		doins "${S}"/"${PN}".conf
-			cat ${SCDIR}/dll.conf > ${D}/${SCDIR}/dll.conf || die
-			if ! grep -q '^smfp$' ${D}/${SCDIR}/dll.conf ; then
-				echo "# Add support for the HP-ULD specific backend.  Needs net-print/hpuld installed." >> ${D}/${SCDIR}/dll.conf || die
-				echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-			fi
-			if grep -q '^geniusvp2' ${D}/${SCDIR}/dll.conf ; then
-				# Comment out geniusvp2 backend
-				sed -i 's/geniusvp2/#geniusvp2/' > ${D}/${SCDIR}/dll.conf || die
-			fi
-		else
-			echo "smfp" >> ${D}/${SCDIR}/dll.conf || die
-		fi
-		chmod 664 ${D}/${SCDIR}/dll.conf
 
 		sh ./install.sh || die
+		fperms 644 /etc/sane.d/smfp-hewlett-packard.conf
 	else
 		sh ./install-printer.sh || die
 	fi
@@ -103,8 +95,8 @@ src_install() {
 pkg_postinst() {
 	if use scanner ; then
 		ewarn "If you want to use the scanner,"
-		ewarn "make sure the smfp is listed in /etc/sane.d/dll.conf."
+		ewarn "make sure the smfp is listed in ${SANE_CONF_DIR}/dll.d/"${PN}".conf."
-		ewarn "If the geniusvp2 is listed in /etc/sane.d/dll.conf,"
+		ewarn "If the geniusvp2 is listed in ${SANE_CONF_DIR}/dll.conf,"
 		ewarn "please comment out it."
 
 		ewarn "You should restart cupsd service after installed $P."
@@ -115,9 +107,8 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if use scanner ; then
-		ewarn "After you removed $P,"
+		ewarn "You should restart cupsd service after removed $P."
-		ewarn "if the smfp is listed in /etc/sane.d/dll.conf"
+		ewarn "OpenRC: rc-service cupsd restart"
-		ewarn "you should remove it to keep clean."
+		ewarn "systemd: systemctl restart cups.service"
-		ewarn "If you are just reinstalling, ignore this message."
 	fi
 }

net-print/hpuld/metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>vowstar@gmail.com</email>