Merge updates from master

dev-lang/hare/hare-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,12 +8,11 @@ if [[ "${PV}" = 9999 ]]; then
 	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare"
 	SLOT="0"
 else
-	EGIT_COMMIT="82213191adc25137c704df4786a71bce40b6079f"
+	EGIT_COMMIT="29fbde4fe95db7da3ee54882f3a29a10aea53b8d"
 	MY_P="${PN}-${EGIT_COMMIT}"
 	SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 	SLOT="0/${PV}"
-
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 fi
 
@@ -22,12 +21,10 @@ HOMEPAGE="https://harelang.org/"
 LICENSE="MPL-2.0 GPL-3"
 
 DEPEND="
-	sys-devel/qbe
-	>=dev-lang/harec-0_pre20220702
-"
-BDEPEND="
-	app-text/scdoc
+	~dev-lang/harec-9999
+	~sys-devel/qbe-9999
 "
+BDEPEND="app-text/scdoc"
 RDEPEND="${DEPEND}"
 
 # hare and haredoc are built by hare
@@ -44,14 +41,12 @@ src_configure() {
 
 	cp configs/linux.mk config.mk || die
 	sed -i \
-		-e 's;=aarch64-;=;' \
-		-e 's;=riscv64-;=;' \
 		-e "s;^ARCH =.*;ARCH = ${target_arch};" \
-		-e 's;^PREFIX =.*;PREFIX = /usr;' \
 		-e 's;^AS =;AS ?=;' \
 		-e 's;^LD =;LD ?=;' \
-		-e 's;^AR =;AR ?=;' \
 		config.mk || die
-
-	sed -i 's; $(DESTDIR)$(LOCALSRCDIR);;' Makefile || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 }

dev-lang/harec/harec-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,13 +6,11 @@ EAPI=8
 if [[ "${PV}" = "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/harec"
-	S="${WORKDIR}/${P}/build"
 else
-	EGIT_COMMIT="dac4cd7c49c8d0539e8aefda4a812dff522c86a9"
+	EGIT_COMMIT="770566a51aa972c320b545d2292626057aabe831"
 	MY_P="${PN}-${EGIT_COMMIT}"
 	SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}/build"
-
+	S="${WORKDIR}/${MY_P}"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 fi
 
@@ -21,23 +19,17 @@ HOMEPAGE="https://harelang.org/"
 LICENSE="GPL-3"
 SLOT="0"
 
-DEPEND=">=sys-devel/qbe-1.1"
+# sys-devel/qbe-1.1-r1 won't build a proper binary.
+DEPEND="~sys-devel/qbe-9999"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	default
-
-	[[ "${PV}" = "9999" ]] && git-r3_src_unpack
-
-	mkdir "${S}" || die
-}
-
 src_prepare() {
 	default
 
-	sed -i 's; -Werror ; ;' ../config.sh || die
+	cp configs/linux.mk config.mk || die
+	sed -i 's/-Werror//' config.mk || die
 }
 
-src_configure() {
-	../configure --prefix="/usr" --libdir="/usr/$(get_libdir)" || die
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 }

dev-python/tweepy/tweepy-4.14.0.ebuild

@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_11 )
 
 inherit distutils-r1
@@ -26,6 +27,7 @@ DEPEND="
 		dev-python/aiohttp[${PYTHON_USEDEP}]
 		dev-python/async-lru[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		<dev-python/urllib3-2.0.0[${PYTHON_USEDEP}]
 		dev-python/vcrpy[${PYTHON_USEDEP}]
 	)
 "

net-client/lagrange/Manifest

@@ -1,4 +1,4 @@
-DIST lagrange-1.17.4.tar.gz 10209579 BLAKE2B 742813cece2773935cc591d8c5bf6cf86e2f6f021de0f1fd716e23e99f39efd8147dd09224ba530177f96b560425643d202b2d49a478277b9abbee4cde4b2aca SHA512 772c19b7507de6f86c2d46479f625b132e1a3f97d1efd6fbdf9ad6c74d30b3f17626b0953ff0f3d79af2e457ef2c47f486316a19f4f014aae5807466ad6044d3
-DIST lagrange-1.17.4.tar.gz.sig 488 BLAKE2B 9fe3d74f57cec32e6a70241df39b2ae10e2088b5a561b8f66ecad7baa59939243eeeda29cf4189ec06dcf2a23a2855b38b59e78fc27786bf32fdb732a6a2ab54 SHA512 db17353e4736f4215c33df6fc60ec1289c01d3a3e1d689c8fe5fb9a37afbe4568be9f1ed0640620942192381d2a2093095d0e148f3ad98ba503c3b278ade5922
 DIST lagrange-1.17.5.tar.gz 10213173 BLAKE2B 174d5d5065ecabf8fa4f5b7c2e5fe874349029ccec5b21e34fe43365ab6039dd512293274891f1acd0dcc031baa337841dd06c3afbd9832ba51ea8ff6140ef6e SHA512 64c145899c1cf48403af5c06b2ba529d8b8da9fa3ecb7aa2fb402c67a0e3ebb7011eff1fe5bb5f4f6e40edc70f13ec15719d8a8763f3a5809a49c45a6f75f6da
 DIST lagrange-1.17.5.tar.gz.sig 488 BLAKE2B 109f8250e40a83b2b1de7a0b1edc84278427e3ea19a244de61d360da7cff43e8ea3f77c6a5eeff220da3f3441a7f9bafea6513056bf409d3cb231f266fcacc21 SHA512 f0b338e676852cfface46b68d3b2b8622003ca269f47ffb93ffdf2dfd0159da0c9e4b7c118370207c8c887d71653e51df2065040b810c4a2115e612573400ee0
+DIST lagrange-1.17.6.tar.gz 10212490 BLAKE2B 1e1569fbdbfbec23af0e15ce44311851686e629a7e2a10365abdcdea91dc81edb2a8c6a28dd32c1049c169d2e6604216da6c8ddfa57b0e534265f2b1a5b1404b SHA512 d5f03d995557c676b9b540315c1cfb636f72382928d98a3e6f8d516295658a656a253fdc05327fe78b5a7d30121677a257e4fbfa0bcaa6b4bc2cf9ef617d8f32
+DIST lagrange-1.17.6.tar.gz.sig 488 BLAKE2B 497e27ed3b22dbc8a39859d81a515bca05352fb9b9a47e24752264053963c23e635623124dc2b7b4b21dcdfdbf1324e0eb8295fb8cda99efa4df9ef5f758eea1 SHA512 6d51665ce18c6bf488ad62822d8df648b1a0d6e1a512a304599642bfabb116f020beb71529c02b573a32e8fb276238c31f345016865882541adf374ccac36005

net-client/lagrange/lagrange-1.17.6.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ RDEPEND="
 		media-libs/libsdl2[X?,sound(+),video(+)]
 	)
 	!gui? ( >=dev-libs/sealcurses-2.0.18_pre20230206:= )
-	mp3? ( media-sound/mpg123 )
+	mp3? ( media-sound/mpg123-base )
 	webp? ( media-libs/libwebp:= )
 "
 DEPEND="${RDEPEND}

net-im/heisenbridge/Manifest

@@ -1,2 +1 @@
-DIST heisenbridge-1.14.5.gh.tar.gz 68042 BLAKE2B e959762bfe1180b2bd66f71bca04c8eccafd61551a1cb6664acf4d5bf8b835488511178e1bbad2b59c45c38ba913e8ee010e4c6fe390b8ca29715f853de01d16 SHA512 eaee99415796b898caed6f31207081fd70a5d7d437c722bfd3e54924c20cfabff854b0f4a8118320375d29c42f045dc67bd4c5ccaea247bc3e22d71f75f616dc
 DIST heisenbridge-1.14.6.gh.tar.gz 68513 BLAKE2B ae0a588c90f4dac36ab04665c67c8e9ca7b16fd66dfa3d5cc577a65eb638b23c69a49771323761bb3a7404200fbd72e221a46a964ab0700acf8d03d55a2fa04e SHA512 6e89679f87b4774c035981360b155590c0bd238e575be5673a447a4b348d85ef9f4c7557d6ebaed27a2e6f7823322a0641959f252e8e3c33559e5b68ccf6f252

net-im/heisenbridge/heisenbridge-1.14.5.ebuild

@@ -1,60 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="A bouncer-style Matrix IRC bridge"
-HOMEPAGE="https://github.com/hifi/heisenbridge/"
-SRC_URI="https://github.com/hifi/heisenbridge/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/${PN}
-	dev-python/irc[${PYTHON_USEDEP}]
-	dev-python/mautrix[${PYTHON_USEDEP}]
-	dev-python/python-socks[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/heisenbridge-1.14.1-qanotice.patch"
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	newinitd "${FILESDIR}/heisenbridge.initd" "${PN}"
-	newconfd "${FILESDIR}/heisenbridge.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	einfo
-	elog "Before you can use ${PN}, you must configure it correctly"
-	elog "The configuration file is located at /etc/conf.d/${PN}"
-	elog "Then, you must generate the registration file using the following command"
-	elog "If you are using synapse:"
-	elog "/usr/bin/python -m ${PN} -c /var/lib/${PN}/registration.yaml --generate https://example.com"
-	elog "If you are using Dendrite, Conduit or others:"
-	elog "/usr/bin/python -m ${PN} -c /var/lib/${PN}/registration.yaml --generate-compat https://example.com"
-	elog "Notice the URL at the end, replace it with your homeserver's URL"
-	elog "Then, you must register the bridge with your homeserver"
-	elog "Refer to your homeserver's documentation for instructions"
-	elog "The registration file is located at /var/lib/${PN}/registration.yaml"
-	elog "Finally, you may start the ${PN} daemon"
-	einfo
-
-}

net-im/heisenbridge/heisenbridge-1.14.6-r1.ebuild

@@ -0,0 +1,68 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="A bouncer-style Matrix IRC bridge"
+HOMEPAGE="https://github.com/hifi/heisenbridge/"
+SRC_URI="https://github.com/hifi/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-user/heisenbridge
+	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
+	dev-python/async-timeout[${PYTHON_USEDEP}]
+	dev-python/irc[${PYTHON_USEDEP}]
+	dev-python/mautrix[${PYTHON_USEDEP}]
+	dev-python/python-socks[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/heisenbridge-1.14.1-qanotice.patch"
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	echo ${PV} > ${PN}/version.txt || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	newinitd "${FILESDIR}"/heisenbridge.initd ${PN}
+	newconfd "${FILESDIR}"/heisenbridge.confd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	[[ -f /var/lib/${PN}/registration.yaml ]] && return 0
+
+	einfo
+	elog "Before you can use ${PN}, you have to configure it correctly."
+	elog "The configuration file is located at /etc/conf.d/${PN}"
+	elog
+	elog "Then, you must generate the registration file using the following command:"
+	elog "* If you are using Synapse:"
+	elog "\t${PN} -c /var/lib/${PN}/registration.yaml --generate https://example.com"
+	elog "* If you are using Dendrite, Conduit or others:"
+	elog "\t${PN} -c /var/lib/${PN}/registration.yaml --generate-compat https://example.com"
+	elog
+	elog "Notice the URL at the end, replace it with your homeserver's URL."
+	elog "Then, you must register the bridge with your homeserver."
+	elog "Refer to your homeserver's documentation for instructions."
+	elog "The registration file is located at /var/lib/${PN}/registration.yaml"
+	elog "Finally, you may start the ${PN} daemon."
+	einfo
+
+}

sci-biology/cmdock/cmdock-0.2.0-r1.ebuild

@@ -65,6 +65,13 @@ python_check_deps() {
 	python_has_version "dev-python/insipid-sphinx-theme[${PYTHON_USEDEP}]"
 }
 
+pkg_setup() {
+	if use doc || use test; then
+		python-any-r1_pkg_setup
+	fi
+	return 0
+}
+
 foreach_wrapper_job() {
 	sed -e "s:@PREFIX@:${INSTALL_PREFIX}:g" -i "${1}" || die
 }