diff --git a/dev-lang/hare/hare-9999.ebuild b/dev-lang/hare/hare-9999.ebuild index 4330b9e1bb..208f3b7ac4 100644 --- a/dev-lang/hare/hare-9999.ebuild +++ b/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 } diff --git a/dev-lang/harec/harec-9999.ebuild b/dev-lang/harec/harec-9999.ebuild index 6425368069..0abae65c87 100644 --- a/dev-lang/harec/harec-9999.ebuild +++ b/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 } diff --git a/dev-python/tweepy/tweepy-4.14.0.ebuild b/dev-python/tweepy/tweepy-4.14.0.ebuild index 870232b321..058545c023 100644 --- a/dev-python/tweepy/tweepy-4.14.0.ebuild +++ b/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}] + ${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 + +} diff --git a/sci-biology/cmdock/cmdock-0.2.0-r1.ebuild b/sci-biology/cmdock/cmdock-0.2.0-r1.ebuild index f46747447a..09ab9cc5cc 100644 --- a/sci-biology/cmdock/cmdock-0.2.0-r1.ebuild +++ b/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 }