[gentoo-commits] repo/gentoo:master commit in: mail-client/aerc/

["William Hubbs" <williamh@gentoo.org>]

commit:     5dabe985439ca22a82850d7132f191cf88e70d74
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 20 04:04:06 2022 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 04:06:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dabe985

mail-client/aerc: revbump to fix notmuch support

Closes: https://bugs.gentoo.org/871090
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 mail-client/aerc/{aerc-9999.ebuild => aerc-0.12.0-r1.ebuild} | 10 ++++++----
 mail-client/aerc/aerc-9999.ebuild                            | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/mail-client/aerc/aerc-9999.ebuild b/mail-client/aerc/aerc-0.12.0-r1.ebuild
similarity index 87%
copy from mail-client/aerc/aerc-9999.ebuild
copy to mail-client/aerc/aerc-0.12.0-r1.ebuild
index 6b95381472cd..b83c27212713 100644
--- a/mail-client/aerc/aerc-9999.ebuild
+++ b/mail-client/aerc/aerc-0.12.0-r1.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() {

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() {