gentoo auto-resync : 08:08:2024 - 12:38:45

3 files changed, 82 insertions, 3 deletions

diff --git a/mail-client/aerc/Manifest b/mail-client/aerc/Manifest
index 02a8cfb2f034..cf2db59b80bb 100644
--- a/mail-client/aerc/Manifest
+++ b/mail-client/aerc/Manifest
@@ -8,10 +8,13 @@ DIST aerc-0.17.0-deps.tar.xz 17227844 BLAKE2B b6222043e437ace7ab97c27109711ebe9b
 DIST aerc-0.17.0.tar.gz 419228 BLAKE2B 6426f4b4f685ef18d8325eb67a2a06678f8da4d0768e8706362935ebc78b53d6fe3417a8b26d0785c7174d867c538a043bd283d92e70e8f52fd0a0b859739571 SHA512 6648123c37da36f932825e7caec268765bf285124a4473055b86ac48cfa937a250b03d2404764c2c93a978bb56dc9279550e5bf66aa0ff09f90525c5ead7c062
 DIST aerc-0.18.1-deps.tar.xz 19518312 BLAKE2B cf504bc945f2ea20351829f8fea49d0c057e420916b9ed7d73ce8bc60be7f4a64bb73655470caa66a7b8cc25f204236c775934bc52e417716f8538786e1f473c SHA512 8b8c487b73c96036e61648007b06e67af6c6b608810c36e0f92dc64bec7228a1a9782ab452de3ba1063ce693558a554d683cb2fc5f41e84700b9f31e8ff51f55
 DIST aerc-0.18.1.tar.gz 447293 BLAKE2B 4284611f510c47003f895e82bea5bcb6959b08de47cfd88c5dcda455190b94d5855a2f1a514f99b4120a25ffd2b53323de9dd5f960f81214edfc1fb6eafeb2f9 SHA512 38429da656e82cbf63ebfcce655644d4bb7b390c22a2bf93e0bd77448f20a5513aa7dad687e9188ebc222edecc488cee025362e5fa3abd484d1b574261c93c98
+DIST aerc-0.18.2-deps.tar.xz 19518064 BLAKE2B efc0b54852e96f1a4eaa3c6d0846df022f36670167d1b0042ae443a1216a8b42ae11624eabbac56956c5fa164fe4494942dd9dbabd37d8b4fde1823162b0ea34 SHA512 f2b3204912c7a81fe5e533fe22e293c59f28192cf05f517a4205b0e92337994157f7f9f031fc33c5a8ace67003afc44606b6faca0c9c26b13d9639934ab39ee3
+DIST aerc-0.18.2.tar.gz 447348 BLAKE2B e5979dfe6a0d5c9335eae758c085dc0fd9d45298a537a41e6e3999407395e3ad936e9917c2140d47fcd295cbfc4e8233c4621830b399d70fab0a0c3fa8878315 SHA512 accce8bf2d5e90bffa615e58c68cb187e2eb0ede64bbebe69735c1367c51f286d2dfa505f6b0c67a5958f32afacb9903b1c12e397e64e49403807b78d3bad25c
 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-0.17.0.ebuild 1693 BLAKE2B 2f6569b119ddeb12b970382e911aec732c29cf38a2646a951a2f63f159e3dbfdf27df57a0d42cac6736fb5b878b3e3dc3479d6d12b86001b6ea0e706b6eae3cb SHA512 c126d1004aa6faa7417b638e743dc6223847430dba216b006d88d40d47d25c56d869cff79a0fdcdea8fd4f58f11620d8f6d695b2a2868b2bfb2f41b80e5eef24
 EBUILD aerc-0.18.1.ebuild 1698 BLAKE2B 95f2be99acc47d7de187d3128247619ff4c995cb003a42dd3f7d167ea7755eeee2609956dbc56bbe622180c63816a6effa50197ef0205b9da6411608fe7ca2ca SHA512 e7bfe221218a68c81ab41482c14f3fa3da36a0cde8452cc0d7fca99c8a510d733d54e6e46c2b461d9bada665c2b67ccd29bb6cedcd92fed36109dcc3a8c9d67e
-EBUILD aerc-9999.ebuild 1698 BLAKE2B 95f2be99acc47d7de187d3128247619ff4c995cb003a42dd3f7d167ea7755eeee2609956dbc56bbe622180c63816a6effa50197ef0205b9da6411608fe7ca2ca SHA512 e7bfe221218a68c81ab41482c14f3fa3da36a0cde8452cc0d7fca99c8a510d733d54e6e46c2b461d9bada665c2b67ccd29bb6cedcd92fed36109dcc3a8c9d67e
+EBUILD aerc-0.18.2.ebuild 1738 BLAKE2B 63d2556f96c10280139a155d3713cd7b01705baa3f57a96d1d23d5307fb8f0f1c97ab5075120d733e5ba871d9f7fe23d19240f5013086f0d406cb66555ae94c9 SHA512 931ca606a8e17bddc5a0c5664a85f5ad3c83cfa219b7e78ca413a7203f78be7025506889a9db26f926899514c7e7b09d48b4b174d2775debcb10cec130fdde2a
+EBUILD aerc-9999.ebuild 1738 BLAKE2B 63d2556f96c10280139a155d3713cd7b01705baa3f57a96d1d23d5307fb8f0f1c97ab5075120d733e5ba871d9f7fe23d19240f5013086f0d406cb66555ae94c9 SHA512 931ca606a8e17bddc5a0c5664a85f5ad3c83cfa219b7e78ca413a7203f78be7025506889a9db26f926899514c7e7b09d48b4b174d2775debcb10cec130fdde2a
 MISC metadata.xml 668 BLAKE2B e3ca26a3f36e9a2248b9777c824ae699d6560a427f95aedf2a062e212b1cc8c0fb8dd6adae8623853bcf450b391d34890dbbb50a4d2a68897f7edf1c415e20b6 SHA512 9fb14a603f11d2c986a8b2be55fe4cf0c16c32e8310b96b7e1f66a03b0de4551a67c31e73a16ee06a10a0a490783da4abaa2f9064db473d990adfa71b747bf79
diff --git a/mail-client/aerc/aerc-0.18.2.ebuild b/mail-client/aerc/aerc-0.18.2.ebuild
new file mode 100644
index 000000000000..b90908cbf150
--- /dev/null
+++ b/mail-client/aerc/aerc-0.18.2.ebuild
@@ -0,0 +1,75 @@
+# 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/~williamh/dist/${P}-deps.tar.xz"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+IUSE="notmuch"
+
+COMMON_DEPEND="notmuch? ( net-mail/notmuch:= )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_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
+}
+
+src_test() {
+	emake tests
+}
+
+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 51bfaed44158..b90908cbf150 100644
--- a/mail-client/aerc/aerc-9999.ebuild
+++ b/mail-client/aerc/aerc-9999.ebuild
@@ -21,8 +21,9 @@ LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 IUSE="notmuch"
 
-DEPEND="notmuch? ( net-mail/notmuch:= )"
-RDEPEND="${DEPEND}"
+COMMON_DEPEND="notmuch? ( net-mail/notmuch:= )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
 BDEPEND="
 	>=app-text/scdoc-1.11.3
 	>=dev-lang/go-1.18