commit: e8e61d1ca2b10174dbf3d203ee5df12749a19397
Author: Jesús P Rey (Chuso) <git <AT> chuso <DOT> net>
AuthorDate: Sun Aug 25 06:26:01 2024 +0000
Commit: Jesús P Rey <gentoo <AT> chuso <DOT> net>
CommitDate: Wed Aug 28 15:25:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e8e61d1c
net-im/mautrix-whatsapp: 0.10.9 version bump.
Old versions not working anymore, so removing them.
Also changed log path from /var/log/mautrix to /var/log/mautrix/whatsapp for
consistency with net-im/mautrix-signal and also because that was always the plan
and a /var/log/mautrix/whatsapp directory was being created for that purpose but
never used because of mistakes in the ebuild.
Signed-off-by: Jesús P Rey (Chuso) <git <AT> chuso.net>
net-im/mautrix-whatsapp/Manifest | 6 +--
.../mautrix-whatsapp/files/mautrix-whatsapp.initd | 4 +-
.../mautrix-whatsapp-0.10.7.ebuild | 63 ----------------------
....10.0.ebuild => mautrix-whatsapp-0.10.9.ebuild} | 2 +-
4 files changed, 5 insertions(+), 70 deletions(-)
diff --git a/net-im/mautrix-whatsapp/Manifest b/net-im/mautrix-whatsapp/Manifest
index f8f165f94..d84d21ff5 100644
--- a/net-im/mautrix-whatsapp/Manifest
+++ b/net-im/mautrix-whatsapp/Manifest
@@ -1,4 +1,2 @@
-DIST mautrix-whatsapp-0.10.0-deps.tar.xz 44605336 BLAKE2B
631844436ca1fb408a1dbd074d613f5b21c789bc7af931336204c4c104a0e7f039ddddc7c94c651211e12253bcf63b72a899f4b2bb554eed6f778a1e747dd762
SHA512
fb06e5d121c2e1d2ed67ca21973a37187d0f79d5cc1206bc8aa7a031503967932254e430db00ee95645770eea7509f0ec9ab24fa3fe6a26bb5fb28149873a584
-DIST mautrix-whatsapp-0.10.0.gh.tar.gz 152560 BLAKE2B
b455c54fec79c0d56b61d441291a3f5ae1ab55db3f23e69d2fd5c11cc0bcbd69d5d8f14cd44c6a252d1f72c37af0d67ac959cc3a9163fe772d3d530d4f5f2af0
SHA512
0906b1e01f26d25adf337a012e73fa28bf9961a30add61ae7a22aaf903ce28d50e00c34124ed6703c9be86a38c3e29d638c2fa969013608ee38034cc01b5882f
-DIST mautrix-whatsapp-0.10.7-deps.tar.xz 42991792 BLAKE2B
73265c85603bf913405df0ed010e30faa308e834d1017b144c6052c0346b116e4543e50589427876a4d42f4286fa15450f2553afd0dbb6277d118547af378978
SHA512
f2ab8e41fb942e2a17ff9d9859b6c5d8b247f9fb0bd3bbefcb42abf3e37c496f61dabdbd06139ddc9cbaf1e3d75bf294d26693759dcad86f6fb6859c637ba67e
-DIST mautrix-whatsapp-0.10.7.gh.tar.gz 159078 BLAKE2B
9e85517e95da8ee4011aaffd51be6440a36dad2b742addce8445781555756df3ba2bb540ce3c2b9e613371eca4e7e021ae08273e39a41e57b54ca0430219bed1
SHA512
b0d3d572bbd29e5b4391662fd3fa1e6849d9f51a094257072883ec2797972defbfc3e22ab6fa0354b634045974bbe8a6d090699330c3ace1021f944757a766f3
+DIST mautrix-whatsapp-0.10.9-deps.tar.xz 43772080 BLAKE2B
a2ce5900a7825eaa4294b04b5973f7dbe8df77d0495884f8bff0621c974621ca324f93318e295523453c2b9243ea600d43516a80f07d337c6507cc61b8904276
SHA512
1d6d9c699e14c98a340945d0fbcef065ce8d1b749fba4d4edea394f47f80616edde31f5421721f79b7a135450574d51a150c316c5155967fe06b76fb1512b4bb
+DIST mautrix-whatsapp-0.10.9.gh.tar.gz 159599 BLAKE2B
f757d353957506b5a7f71da748c0e2d3e8eecac6026914561e7da9c0488a6604355760dca40c59f01a69261ebcd8e1d9eb7c90e376119df7b9762864c6487e85
SHA512
6b9909fdce95accc15f948fe55e35df19923bfd4b4630ec267ae9948b8c3625c7323b75837a723de9c45b65e3f4da4684cb2ee079734d9a26c0008f173f95737
diff --git a/net-im/mautrix-whatsapp/files/mautrix-whatsapp.initd
b/net-im/mautrix-whatsapp/files/mautrix-whatsapp.initd
index f06e9948f..9d191494e 100644
--- a/net-im/mautrix-whatsapp/files/mautrix-whatsapp.initd
+++ b/net-im/mautrix-whatsapp/files/mautrix-whatsapp.initd
@@ -12,8 +12,8 @@ command_args="-c /etc/mautrix/${module}.yaml -r
/var/lib/mautrix/whatsapp/regist
command_background=true
command_user="mautrix-whatsapp:mautrix"
-output_log="/var/log/mautrix/mautrix-whatsapp_daemon.log"
-error_log="/var/log/mautrix/mautrix-whatsapp_daemon.log"
+output_log="/var/log/mautrix/whatsapp/daemon.log"
+error_log="/var/log/mautrix/whatsapp/daemon.log"
depend() {
need net
diff --git a/net-im/mautrix-whatsapp/mautrix-whatsapp-0.10.7.ebuild
b/net-im/mautrix-whatsapp/mautrix-whatsapp-0.10.7.ebuild
deleted file mode 100644
index 1871f9e0f..000000000
--- a/net-im/mautrix-whatsapp/mautrix-whatsapp-0.10.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module optfeature systemd
-
-DESCRIPTION="A Matrix-WhatsApp puppeting bridge "
-HOMEPAGE="https://github.com/mautrix/whatsapp/";
-SRC_URI="https://github.com/mautrix/whatsapp/archive/v${PV}.tar.gz ->
${P}.gh.tar.gz
- https://distfiles.chuso.net/distfiles/${P}-deps.tar.xz";
-S="${WORKDIR}/whatsapp-${PV}"
-
-LICENSE="AGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="crypt"
-
-DEPEND="crypt? ( dev-libs/olm )"
-
-RDEPEND="
- ${DEPEND}
- acct-user/${PN}
-"
-
-src_compile() {
- ego build $(use crypt || echo '-tags nocrypto')
-}
-
-src_install() {
- dobin "${PN}"
-
- keepdir /var/log/mautrix/${PN/mautrix-/}
- fowners -R root:mautrix /var/log/mautrix
- fperms -R 770 /var/log/mautrix
- sed -i -e "s_\./logs_/var/log/mautrix_" "example-config.yaml" || die
-
- insinto "/etc/mautrix"
- newins "example-config.yaml" "${PN/-/_}.yaml"
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- fowners -R root:mautrix /etc/mautrix
- fperms -R 770 /etc/mautrix
-}
-
-pkg_postinst() {
- optfeature "sending GIFs" media-video/ffmpeg
-
- elog "Before you can use ${PN}, you must configure it correctly"
- elog "The configuration file is located at
\"/etc/mautrix/${PN/-/_}.yaml\""
- elog "When done, run the following command: emerge --config
${CATEGORY}/${PN}"
- elog "Then, you must register the bridge with your homeserver"
- elog "Refer 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"
-}
-
-pkg_config() {
- su - "${PN}" -s /bin/sh -c \
- "/usr/bin/${PN} -c /etc/mautrix/${PN/-/_}.yaml -g -r
/var/lib/${PN/-/\/}/registration.yaml"
-}
diff --git a/net-im/mautrix-whatsapp/mautrix-whatsapp-0.10.0.ebuild
b/net-im/mautrix-whatsapp/mautrix-whatsapp-0.10.9.ebuild
similarity index 95%
rename from net-im/mautrix-whatsapp/mautrix-whatsapp-0.10.0.ebuild
rename to net-im/mautrix-whatsapp/mautrix-whatsapp-0.10.9.ebuild
index 1871f9e0f..1dd31bc2b 100644
--- a/net-im/mautrix-whatsapp/mautrix-whatsapp-0.10.0.ebuild
+++ b/net-im/mautrix-whatsapp/mautrix-whatsapp-0.10.9.ebuild
@@ -33,7 +33,7 @@ src_install() {
keepdir /var/log/mautrix/${PN/mautrix-/}
fowners -R root:mautrix /var/log/mautrix
fperms -R 770 /var/log/mautrix
- sed -i -e "s_\./logs_/var/log/mautrix_" "example-config.yaml" || die
+ sed -i -e "s_\./logs_/var/log/mautrix/whatsapp_" "example-config.yaml"
|| die
insinto "/etc/mautrix"
newins "example-config.yaml" "${PN/-/_}.yaml"
