gentoo auto-resync : 04:05:2024 - 00:00:19

3 files changed, 79 insertions, 5 deletions

diff --git a/mail-client/aerc/Manifest b/mail-client/aerc/Manifest
index d7db02f52df2..52fee3c320bd 100644
--- a/mail-client/aerc/Manifest
+++ b/mail-client/aerc/Manifest
@@ -4,8 +4,11 @@ DIST aerc-0.15.2-deps.tar.xz 46530556 BLAKE2B 7ea7fa49dcb38e9fe54e224092cb3aa896
 DIST aerc-0.15.2.tar.gz 331263 BLAKE2B 9426fb0b857374913e1da0712e2acab3f155c78b02b5855aac51d460519c31cb768f669da089122402c5e2e555b356334cf755b8ba2dbf9c9c41f3e54c4ef3ff SHA512 8744c6c5ea45fc8ad2ab46367e92d3859fab962843db4329c7655b0afe7b72dbea21dae588d44eab314a31da89d15e5b6543224699556aed31e0b3b9c7b0ddbc
 DIST aerc-0.16.0-deps.tar.xz 47250564 BLAKE2B 27c3d7b8276ef4b56f14b187ed707ce1e7ad8d2c265a94775da82f04e585b3b6661e6760e38b3d81c8ce0fe15de49e37cd9eec9e97528ee0a7ed3dc94d278adb SHA512 fb8b43dbc7586e0ff0e58117ee04cffdd7f03988530a8d4f05f2adefc7c4f22db9eea1a693f26df8f1ca71490f7e39f6900ceaf8ac735f48bf51937e0afd8ac4
 DIST aerc-0.16.0.tar.gz 387833 BLAKE2B b001ea88f07aafba115ffa08f176f4c96f219c86fcaee1aee2eca7d9d7469d861b74376dffc4e5bc2c3110020cc350df64758386e10548b6c1ef95362fcc1181 SHA512 8196424915f8f6dc80bad0f936e34b7f51298665af3579ae8c06699a4f1caf962258185a432909911920ec1eb089c9f178c9086c54c0e799a44e1e0dac907fd8
+DIST aerc-0.17.0-deps.tar.xz 17227844 BLAKE2B b6222043e437ace7ab97c27109711ebe9bd306f08caee83b2236c8c08d653f7dcc0f99f6a2e54c4541c5f4423bfa7099381a7f6cb4a58ff8b647ce964ccd0411 SHA512 8fea417f0c731859496108e4fac052180cb4efc707d61de9b2c55217146aba88a7703cdc4f456e2937df083bfa548e766bc59e3becf7b481e441fc4fc603bf5a
+DIST aerc-0.17.0.tar.gz 419228 BLAKE2B 6426f4b4f685ef18d8325eb67a2a06678f8da4d0768e8706362935ebc78b53d6fe3417a8b26d0785c7174d867c538a043bd283d92e70e8f52fd0a0b859739571 SHA512 6648123c37da36f932825e7caec268765bf285124a4473055b86ac48cfa937a250b03d2404764c2c93a978bb56dc9279550e5bf66aa0ff09f90525c5ead7c062
 EBUILD aerc-0.14.0.ebuild 1666 BLAKE2B 88d253c79cc5265b13f990d7718026932dd55cd779f0c536e38817d4e78ab7888d803cba9c5de0beded5adc0209f4ec57cc0f6871c461a31c92428f49f57f7f9 SHA512 31ceff27ab93177260967cc2600971b27fa41fe2999bca3be33136ffde9db0cc01a27435b55c627b592e7320dfb2c56c383018149ff2b4973a3b7cb1894042b3
 EBUILD aerc-0.15.2.ebuild 1666 BLAKE2B 88d253c79cc5265b13f990d7718026932dd55cd779f0c536e38817d4e78ab7888d803cba9c5de0beded5adc0209f4ec57cc0f6871c461a31c92428f49f57f7f9 SHA512 31ceff27ab93177260967cc2600971b27fa41fe2999bca3be33136ffde9db0cc01a27435b55c627b592e7320dfb2c56c383018149ff2b4973a3b7cb1894042b3
 EBUILD aerc-0.16.0.ebuild 1666 BLAKE2B 88d253c79cc5265b13f990d7718026932dd55cd779f0c536e38817d4e78ab7888d803cba9c5de0beded5adc0209f4ec57cc0f6871c461a31c92428f49f57f7f9 SHA512 31ceff27ab93177260967cc2600971b27fa41fe2999bca3be33136ffde9db0cc01a27435b55c627b592e7320dfb2c56c383018149ff2b4973a3b7cb1894042b3
-EBUILD aerc-9999.ebuild 1666 BLAKE2B 1da397572d495008341ab6f8e8e181697c533eb84086b56cb30c1d2705f9464b3f39048b6dbe28531f90dff3659089c13cfe7386c2836777e36a37b5992fde32 SHA512 39907403ab9ad247fdb5ba093cb58b879371e5cd076939da5ffb229551bd931b943ffc7a3c6c3bfa1b67ac4fafda872e9be8060ace3ea8c5e86a9ed996b7cdff
+EBUILD aerc-0.17.0.ebuild 1693 BLAKE2B 2f6569b119ddeb12b970382e911aec732c29cf38a2646a951a2f63f159e3dbfdf27df57a0d42cac6736fb5b878b3e3dc3479d6d12b86001b6ea0e706b6eae3cb SHA512 c126d1004aa6faa7417b638e743dc6223847430dba216b006d88d40d47d25c56d869cff79a0fdcdea8fd4f58f11620d8f6d695b2a2868b2bfb2f41b80e5eef24
+EBUILD aerc-9999.ebuild 1669 BLAKE2B 8833a1b1cea87848049cb2109f94acd8a2653f1afc4b7f33af1fe3e55582cdf33f7e434b6e677fb7b454f1d400e94b51247fb62a83e2c559ff9976c2115b8919 SHA512 3b64c6ce1d768b806006fb3a13263800e62193c444c62273e72c0c3657b91b54f3297978521e35da263d54ab47727277a7db3937c9a7fd0ce768d943d5d87178
 MISC metadata.xml 668 BLAKE2B e3ca26a3f36e9a2248b9777c824ae699d6560a427f95aedf2a062e212b1cc8c0fb8dd6adae8623853bcf450b391d34890dbbb50a4d2a68897f7edf1c415e20b6 SHA512 9fb14a603f11d2c986a8b2be55fe4cf0c16c32e8310b96b7e1f66a03b0de4551a67c31e73a16ee06a10a0a490783da4abaa2f9064db473d990adfa71b747bf79
diff --git a/mail-client/aerc/aerc-0.17.0.ebuild b/mail-client/aerc/aerc-0.17.0.ebuild
new file mode 100644
index 000000000000..79f2c7bfe772
--- /dev/null
+++ b/mail-client/aerc/aerc-0.17.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module xdg
+
+DESCRIPTION="Email client for your terminal"
+HOMEPAGE="https://aerc-mail.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~rjarry/aerc"
+else
+	SRC_URI="https://git.sr.ht/~rjarry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/mail-client/${PN}/${P}-deps.tar.xz"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+IUSE="notmuch"
+
+DEPEND="notmuch? ( net-mail/notmuch:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=app-text/scdoc-1.11.3
+	>=dev-lang/go-1.18
+"
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_compile() {
+	unset LDFLAGS
+	emake GOFLAGS="$(usex notmuch "-tags=notmuch" "")" \
+		PREFIX="${EPREFIX}/usr" VERSION=${PV}  all
+}
+
+src_install() {
+	emake GOFLAGS="$(usex notmuch "-tags=notmuch" "")" \
+		DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" VERSION="${PV}" install
+	einstalldocs
+	dodoc CHANGELOG.md
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "If you want to allow your users to activate html email"
+		elog "processing via w3m as shown in the tutorial, make sure you"
+		elog "emerge net-proxy/dante and www-client/w3m"
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test $v -lt 0.3.0-r1; then
+			elog "The dependencies on net-proxy/dante and www-client/w3m"
+			elog "have been removed since they are optional."
+			elog "Please emerge them before the next --depclean if you"
+			elog "need to use them."
+		fi
+	done
+	xdg_pkg_postinst
+}
diff --git a/mail-client/aerc/aerc-9999.ebuild b/mail-client/aerc/aerc-9999.ebuild
index b83c27212713..aca521b0a3fd 100644
--- a/mail-client/aerc/aerc-9999.ebuild
+++ b/mail-client/aerc/aerc-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 inherit go-module xdg
 
 DESCRIPTION="Email client for your terminal"
@@ -23,8 +24,8 @@ IUSE="notmuch"
 DEPEND="notmuch? ( net-mail/notmuch:= )"
 RDEPEND="${DEPEND}"
 BDEPEND="
-	>=app-text/scdoc-1.9.7
-	>=dev-lang/go-1.13
+	>=app-text/scdoc-1.11.3
+	>=dev-lang/go-1.18
 "
 
 src_unpack() {
@@ -46,7 +47,7 @@ src_install() {
 	emake GOFLAGS="$(usex notmuch "-tags=notmuch" "")" \
 		DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" VERSION="${PV}" install
 	einstalldocs
-dodoc CHANGELOG.md
+	dodoc CHANGELOG.md
 }
 
 pkg_postinst() {