gentoo auto-resync : 20:09:2022 - 11:23:36

4 files changed, 77 insertions, 5 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index e33aced81439..2e9b2a83e6d1 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/aerc/Manifest b/mail-client/aerc/Manifest
index 8118fed32d45..91251b24160a 100644
--- a/mail-client/aerc/Manifest
+++ b/mail-client/aerc/Manifest
@@ -3,6 +3,7 @@ DIST aerc-0.11.0.tar.gz 230891 BLAKE2B e598c04eebed7d8be201630546557be0820b81d90
 DIST aerc-0.12.0-deps.tar.xz 304180452 BLAKE2B 14f7d7e1a06bfd2b8692a4451623f657af919ac497d6119bf7fe5e6a8524b3bc25de4208566d7d92a74c267270021a13ccf6db05dee50a1d2c980e5e07b560df SHA512 d19d26f8ae62330f451261cace7ea0fc2a4af94c252f732bf9388d673b769b96c5d29640b992cc77a2cfaa8acaee628714206f01dd075e2788537b875bca8c63
 DIST aerc-0.12.0.tar.gz 293215 BLAKE2B e7e7c156c464ae49eabe7b6ba3e79c3bbca240ace0a3323f8a740a5b872dbbf329127e4edf1395139588e3f0142280f24ef9783c25d3e00176359f82767b439a SHA512 3624a3e0583a1509e2400c9c2e73cbba505841b52fc222224b1ec3c6f3ff7bf44d7ff9e3b1cb25e7c0c522e9748572d2c4b37958de8c0ffb2d0e220de941c5db
 EBUILD aerc-0.11.0.ebuild 1582 BLAKE2B 052bdc4cbf3628078260b09d2a6569a84dc8152d37720bfd3f7eb1c3a83b03f3f9f4d6dffcb1bc0b88dc6c2cc04f26c8e616a28d3278fcb13472e3ee8cbfe301 SHA512 d84a1a7bb0381e960757c3f45001e0a35e5dc5afaeabc520e6dae7aafd88820e49232787b40b5c5c1775899e7b50a9b37914abe0749840c5ba708ecaea6b1b75
+EBUILD aerc-0.12.0-r1.ebuild 1666 BLAKE2B 1da397572d495008341ab6f8e8e181697c533eb84086b56cb30c1d2705f9464b3f39048b6dbe28531f90dff3659089c13cfe7386c2836777e36a37b5992fde32 SHA512 39907403ab9ad247fdb5ba093cb58b879371e5cd076939da5ffb229551bd931b943ffc7a3c6c3bfa1b67ac4fafda872e9be8060ace3ea8c5e86a9ed996b7cdff
 EBUILD aerc-0.12.0.ebuild 1601 BLAKE2B 00b4364dd3cbf82078efcbc6db3ca02e8df91bc4cc329697454d4e7e7d3b33321e3cc2e81bdb04e87e066ab60a7189e9b736ac906ccc5414fcfa98a9a808c475 SHA512 5d0160c52de9feb4f7d3b392dfacdca452eca5daa1f8ad014d30a07679e5da2021f8ae1b0d63080e05b5a2b4aec5b5edee200391c8e4ac7e45cc4c1417f8a565
-EBUILD aerc-9999.ebuild 1591 BLAKE2B 69c3172236b25cc6d5094c0c57a4682a1e7eb58822fd4238b4c39c8443f3d1dee49e5258590130f3aae9f6b81dd2ad0d1ff3a5b78edbe1c52b23546ce8769cd2 SHA512 27691108108eaaee603da8ea813bb69eed42b11152885cef9017872d56e34e1e75fe4ac1a48c550b3f62f8e2dde64b32202e03260dee4851dee5d2563ab7392f
+EBUILD aerc-9999.ebuild 1666 BLAKE2B 1da397572d495008341ab6f8e8e181697c533eb84086b56cb30c1d2705f9464b3f39048b6dbe28531f90dff3659089c13cfe7386c2836777e36a37b5992fde32 SHA512 39907403ab9ad247fdb5ba093cb58b879371e5cd076939da5ffb229551bd931b943ffc7a3c6c3bfa1b67ac4fafda872e9be8060ace3ea8c5e86a9ed996b7cdff
 MISC metadata.xml 668 BLAKE2B e3ca26a3f36e9a2248b9777c824ae699d6560a427f95aedf2a062e212b1cc8c0fb8dd6adae8623853bcf450b391d34890dbbb50a4d2a68897f7edf1c415e20b6 SHA512 9fb14a603f11d2c986a8b2be55fe4cf0c16c32e8310b96b7e1f66a03b0de4551a67c31e73a16ee06a10a0a490783da4abaa2f9064db473d990adfa71b747bf79
diff --git a/mail-client/aerc/aerc-0.12.0-r1.ebuild b/mail-client/aerc/aerc-0.12.0-r1.ebuild
new file mode 100644
index 000000000000..b83c27212713
--- /dev/null
+++ b/mail-client/aerc/aerc-0.12.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2019-2022 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"
+
+DEPEND="notmuch? ( net-mail/notmuch:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=app-text/scdoc-1.9.7
+	>=dev-lang/go-1.13
+"
+
+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 6b95381472cd..b83c27212713 100644
--- a/mail-client/aerc/aerc-9999.ebuild
+++ b/mail-client/aerc/aerc-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	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.gz"
+	SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 	KEYWORDS="~amd64 ~ppc64"
 fi
 
@@ -37,14 +37,16 @@ src_unpack() {
 }
 
 src_compile() {
-	LDFLAGS= \
-	emake GOFLAGS="-mod=vendor $(usex notmuch "-tags=notmuch" "")" \
+	unset LDFLAGS
+	emake GOFLAGS="$(usex notmuch "-tags=notmuch" "")" \
 		PREFIX="${EPREFIX}/usr" VERSION=${PV}  all
 }
 
 src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install
+	emake GOFLAGS="$(usex notmuch "-tags=notmuch" "")" \
+		DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" VERSION="${PV}" install
 	einstalldocs
+dodoc CHANGELOG.md
 }
 
 pkg_postinst() {