gentoo auto-resync : 26:04:2023 - 06:14:16

4 files changed, 96 insertions, 13 deletions

diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest
index 053956c698cf..6eabc3d08839 100644
--- a/net-irc/soju/Manifest
+++ b/net-irc/soju/Manifest
@@ -1,9 +1,10 @@
 AUX soju-0.6.0-fix-dup-upstream-connections.patch 1719 BLAKE2B 5046c883c828deb7fc97b73091e4cb185f83c96e31731806820e7fce82738c5b95d1eec22effbda1d1f249dc8b443e44f5c73f87a1771027ebef22633db36a74 SHA512 4a97368524bdaa66d2250cbc75db5e82e23de54e02d1daf3886e9ec9c376d5962210913de2e7e9358dba702869afdbc99026b2480d523be6ac107564488dd725
 AUX soju.initd 574 BLAKE2B 4f80e6b9e5bb004477be832e5b9123cd0b68c1432434aa142a0c083300e778f414207951949e58e08fb061fc49d8e03adc91979b4b74d1bf46012ad8fc1e6678 SHA512 abb615ea1b406bc1c9a4dc3712740be9b95945bdff2ddb6200551b540b426befe3d3a6b4d5b42a796c6282edc2b692adf2ede4d259822de6611685122693bcdc
-DIST soju-0.5.2-deps.tar.xz 144017976 BLAKE2B 09be5c159d8c5a12bef9fe52e1d7d4883e3a3ebc8f1131fadd33808588413db9d318eb4be589f9e088d4d6257b47b8c5fa61373a872bae3b9f6570a390312972 SHA512 4f33185ee8fb7a1969ea5c2de82d9ecd7f5f7795f890ec35d87c557e973a53f93c22ecccc1b02ba47dc52d1d6528b7e18fe43fc88cb77ab4615bafe5c70ae8bd
-DIST soju-0.5.2.tar.gz 141911 BLAKE2B 3fb9455a55d8fc0a1da17303156f43cc989f601d0dc837b795a32fa4be14a45571edbc2067159990fd72c75a44c71b52a579ed01572aae43c39ebaf143d502e1 SHA512 2ee9abf9d989a6cc361350bcaa94ff78bf45119c507142d6200684c79c4e1418d0f895931d0889a6f9f15f07d7b5969e2d34ae235034f3a53f04e2bf997dc85f
 DIST soju-0.6.0-deps.tar.xz 146900140 BLAKE2B 0ecf3844694a6d2dbb8f90fbb44c87e6918c4502960356cbf7c7f12103ba2134257b9d0bfcce673352c256b9aa367368c280991069913f3764f916af731d4d21 SHA512 ccaf6cde616114a8afb9f7c2f41a816c458f685d7895cbb47a36135e5f1b12e39580ce81973ee9a5d61f3efb603e71f40820abd515dfb9bbbb539163f140cd25
 DIST soju-0.6.0.tar.gz 161364 BLAKE2B c8dcf2d8355f90e362f5f1cd5f5f2bb2ab84dce0dbbd07be3d3b492d944f5d8aa35d93038e2d1134f285e248c8bd8b4e83eab27a959bcefcc38198a3de24a4cd SHA512 99e80a82c3ceda6567524bb4b7aab74095b0c4b18d1f268b84e4173770f3ded26bba5092f3adf105c90c28bffd86001801c0bad9f57fd2a3302bb816b77ac423
-EBUILD soju-0.5.2.ebuild 1138 BLAKE2B 0df0955221e399dcd6be6e5a879b24248d4e19bc506264ab773a0157495821d3ef93fe7d034add51ad52fece451158d982487079dd1120d299b612065f9abb39 SHA512 e0b2e472a88c6c1ed73a97f1e05c2a4e953134ff51c902bf5f44b36c0ffb8be33d70e548eb2281448902c25667dcef1a4ce66eefddde0ec0f3a156dcafcd7d30
+DIST soju-0.6.1-deps.tar.xz 147239188 BLAKE2B c76cce444d78f6e1efa92835211af6b3e955f1960103e9b62e8a46f69015ba269ec3142822f726c67ab2d695d44395e7029991b5e229ca46a66d61144b345e3b SHA512 c02cc46c22cc396f7ee56a94376674ec0cc543e7105278c4649ae8d0a0df9d73bbdb0d94add0b402be02fb37511b60a2f03aeebbfe9382928e2bb99221da345d
+DIST soju-0.6.1.tar.gz 161536 BLAKE2B 3e61f13a2f711c9a1a280c158113fd75da53525c32cf8d04cf5459f25e55286e090fbf64c844e19bdf60780a9db37ee45976714500b12e92023330a426706c23 SHA512 12c939a050bf7276ee9e8fec05285533907a2787530ebe113a6be012cbfbcaac3c5cb5c42c3791618136cd45df6c9fb5739bcbec068650bf0d7ea2995443c0bf
+EBUILD soju-0.6.0-r1.ebuild 1516 BLAKE2B 990073441046534a453ab51778acdd01d8dda1e4a103a2efb3d130a379b214560c6b84151112dab0fa77c7dbb2e879112f5cf48adccc9bf1c1e9a8e235484903 SHA512 77374e2cec031421a493688ca8938c62101fde2af7f4aa2f066e99795595f25e796b4b6a086150cb992e5e1cd9ce1b6479f582159b8569932c7847f2bc49ec2b
 EBUILD soju-0.6.0.ebuild 1300 BLAKE2B 5fa2a135b40ff43953cca17a3e93abe2c6e8498dda6f58ef518e944c75c48365a062520b889c4dff7f7713f271e0aebf64c340422ef153ac0fcafc100d2c76d0 SHA512 209606a16721b47096e0b771cee7cca9011ea9bc990f363c6f8cd3886012ddf659e0cab29cd9820cdcc7c340e26701647dba8e8a2fcca43a33373999b254ceae
-MISC metadata.xml 514 BLAKE2B 4c6429dfb045fe512fe8972fa8818782e946e066a162e78dddac4c0941990837978f88fcba84f8e452c5813cbaa63406d2740da714fd1129ec7b3bef1114ca50 SHA512 a3ec0be51131755fda583df4bfb02aee058b83d347d41b526e728f2bae859c5100df8fdb20f694407c8da581aabb31e7497c596680125ff12e58983e6499950c
+EBUILD soju-0.6.1.ebuild 1440 BLAKE2B 91798531aba57643d84880fea175b4bd41de1bc3165c9a92da61afc9c98970ea7bac1805c089014c466739d65087f53a0fd313d71c69c7df76b9c10d1f5345ea SHA512 77989483e71eef644efd60f9ae8bb5b91c4ca7b0e16bd5712b10e734232d02e67728516f5687aa2e06b54a35ac295d89627ee27bdf259a33afa910f2299815ef
+MISC metadata.xml 626 BLAKE2B 74d9ed6f3cd4b712587aa8824b562b4e26da2403a5f27e338296e514721187143790b027cb229dd8712c999bbb0fc9130207b0a419bd3bdd3062e2f4594767af SHA512 37c75e5842ce0582407266c5778dd8cc30bc6f028802a0d70cf793a7ca0d4a32d6a0c734fa89643b1c582162e0691ac20c231d636b8e7cca0911e9bc1b27eaab
diff --git a/net-irc/soju/metadata.xml b/net-irc/soju/metadata.xml
index df600cfb1ced..7f2f852dba69 100644
--- a/net-irc/soju/metadata.xml
+++ b/net-irc/soju/metadata.xml
@@ -12,4 +12,8 @@
     <upstream>
       <remote-id type="sourcehut">~emersion/soju</remote-id>
     </upstream>
+    <use>
+      <flag name="moderncsqlite">Use moderncsqlite, a cgo-free port of
+      SQLite</flag>
+    </use>
 </pkgmetadata>
diff --git a/net-irc/soju/soju-0.6.0-r1.ebuild b/net-irc/soju/soju-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..f95f3178e06c
--- /dev/null
+++ b/net-irc/soju/soju-0.6.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="soju is a user-friendly IRC bouncer"
+HOMEPAGE="https://soju.im/"
+SRC_URI="https://git.sr.ht/~emersion/${PN}/refs/download/v${PV}/${P}.tar.gz"
+SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="moderncsqlite +sqlite pam"
+REQUIRED_USE="?? ( moderncsqlite sqlite )"
+
+BDEPEND="
+	app-text/scdoc
+"
+RDEPEND="
+	acct-user/soju
+	acct-group/soju
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.0-fix-dup-upstream-connections.patch
+)
+
+src_compile() {
+	if use sqlite; then
+		GOFLAGS+=" -tags=libsqlite3"
+	elif use moderncsqlite; then
+		GOFLAGS+=" -tags=moderncsqlite"
+	else
+		GOFLAGS+=" -tags=nosqlite"
+	fi
+	use pam && GOFLAGS+=" -tags=pam"
+
+	ego build ${GOFLAGS} ./cmd/soju
+	ego build ${GOFLAGS} ./cmd/sojudb
+	ego build ${GOFLAGS} ./cmd/sojuctl
+
+	scdoc <doc/soju.1.scd >doc/soju.1 || die
+}
+
+src_install() {
+	dobin soju
+	dobin sojudb
+	dobin sojuctl
+
+	doman doc/soju.1
+	systemd_dounit contrib/soju.service
+	keepdir /etc/soju
+	insinto /etc/soju
+	newins config.in config
+	newinitd "${FILESDIR}"/soju.initd soju
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "${PN} requires a user database for authenticating clients."
+	elog "As the soju user, create a database using:"
+	elog "$ sojudb -config ${EROOT}/etc/soju/config create-user <username> [-admin]"
+}
diff --git a/net-irc/soju/soju-0.5.2.ebuild b/net-irc/soju/soju-0.6.1.ebuild
index 08e925cb0a65..99a1a193b5e5 100644
--- a/net-irc/soju/soju-0.5.2.ebuild
+++ b/net-irc/soju/soju-0.6.1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-inherit go-module
+inherit go-module systemd
 
 DESCRIPTION="soju is a user-friendly IRC bouncer"
 HOMEPAGE="https://soju.im/"
 SRC_URI="https://git.sr.ht/~emersion/${PN}/refs/download/v${PV}/${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE="sqlite"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="moderncsqlite +sqlite pam"
+REQUIRED_USE="?? ( moderncsqlite sqlite )"
 
 BDEPEND="
 	app-text/scdoc
@@ -26,19 +26,29 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_compile() {
-	GOFLAGS+=" -tags=$(usex sqlite libsqlite3 nosqlite)"
+	if use sqlite; then
+		GOFLAGS+=" -tags=libsqlite3"
+	elif use moderncsqlite; then
+		GOFLAGS+=" -tags=moderncsqlite"
+	else
+		GOFLAGS+=" -tags=nosqlite"
+	fi
+	use pam && GOFLAGS+=" -tags=pam"
 
 	ego build ${GOFLAGS} ./cmd/soju
+	ego build ${GOFLAGS} ./cmd/sojudb
 	ego build ${GOFLAGS} ./cmd/sojuctl
 
-	scdoc <doc/soju.1.scd >doc/soju.1
+	scdoc <doc/soju.1.scd >doc/soju.1 || die
 }
 
 src_install() {
 	dobin soju
+	dobin sojudb
 	dobin sojuctl
 
 	doman doc/soju.1
+	systemd_dounit contrib/soju.service
 	keepdir /etc/soju
 	insinto /etc/soju
 	newins config.in config
@@ -49,5 +59,5 @@ src_install() {
 pkg_postinst() {
 	elog "${PN} requires a user database for authenticating clients."
 	elog "As the soju user, create a database using:"
-	elog "$ sojuctl -config ${EROOT}/etc/soju/config create-user <username> [-admin]"
+	elog "$ sojudb -config ${EROOT}/etc/soju/config create-user <username> [-admin]"
 }