gentoo auto-resync : 11:01:2023 - 23:45:17

3 files changed, 7 insertions, 74 deletions

diff --git a/mail-client/aerc/Manifest b/mail-client/aerc/Manifest
index 91251b24160a..711fa250fbc4 100644
--- a/mail-client/aerc/Manifest
+++ b/mail-client/aerc/Manifest
@@ -1,9 +1,8 @@
-DIST aerc-0.11.0-deps.tar.xz 119175388 BLAKE2B daf4addd0d80ecc14485c5e7e32043a64f98936fb87f93586ec2dbb775c68232ade979c33dfeaef8495fac5a9687f5907b17b4e425de5f4609b1be2642325624 SHA512 fd779454dd551a875584879e24a910b68939e8fdf18009211c1eb4e1c7cc0eb7cff8780b1bf90f81489c199a46a10e533596589d5a5a09946fe309c7dd0cb39e
-DIST aerc-0.11.0.tar.gz 230891 BLAKE2B e598c04eebed7d8be201630546557be0820b81d90198c2c408d657bdf8135f58a3029f30f6245842ebbbdb713e61915fc7d57fc8aae05d4ecd6cedff45068a56 SHA512 141c0300e60d81b725426f98d59ee645a2c24f478359587259ec645b6a710e6d292d1b8319a9f57f94d5be2f98cd48171dc6d99b54a20e49f16ed77199a2e127
 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
+DIST aerc-0.14.0-deps.tar.xz 312747732 BLAKE2B bfba50f224132b3f21cf052788c41d15d8e86d8b050e4007dd1dc4bb4462077bd1d5f54be5382983d1600d04f09f3abe6cd3bbacb8e786749bfc8075f5313997 SHA512 ed0917373203432b85a702dd0fa6a189b8002ed3173c9eaa6c48a5cb5fd6a390ecc9ad716120f9743f60c226637a476942a80b16261e1b04e79177cdfd194d96
+DIST aerc-0.14.0.tar.gz 332575 BLAKE2B 6d133c9c4cd21da610d271c60dcbc1654a35c7a7592791572283648101de9a60cb0da7b2642fde114acdfa2108e3405f4d2fec884e0f5fa5b7fc096704e5f9ff SHA512 d12502a809c5163bc81bfa3bfbd471a03f4e8e56084e00e7bb52619a8ac6f34df78342c0e8e82d6cdfd4fe1bc0c375dd65366a442875621b20bbd040a9025831
 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-0.14.0.ebuild 1666 BLAKE2B 88d253c79cc5265b13f990d7718026932dd55cd779f0c536e38817d4e78ab7888d803cba9c5de0beded5adc0209f4ec57cc0f6871c461a31c92428f49f57f7f9 SHA512 31ceff27ab93177260967cc2600971b27fa41fe2999bca3be33136ffde9db0cc01a27435b55c627b592e7320dfb2c56c383018149ff2b4973a3b7cb1894042b3
 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.11.0.ebuild b/mail-client/aerc/aerc-0.11.0.ebuild
deleted file mode 100644
index f09b2cc25fa8..000000000000
--- a/mail-client/aerc/aerc-0.11.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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 PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install
-	einstalldocs
-}
-
-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-0.12.0.ebuild b/mail-client/aerc/aerc-0.14.0.ebuild
index 1e55250f13bc..c54807fff2de 100644
--- a/mail-client/aerc/aerc-0.12.0.ebuild
+++ b/mail-client/aerc/aerc-0.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ DEPEND="notmuch? ( net-mail/notmuch:= )"
 RDEPEND="${DEPEND}"
 BDEPEND="
 	>=app-text/scdoc-1.9.7
-	>=dev-lang/go-1.13
+	>=dev-lang/go-1.16
 "
 
 src_unpack() {
@@ -43,7 +43,8 @@ src_compile() {
 }
 
 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
 }