gentoo resync : 12.05.2022

3 files changed, 5 insertions, 48 deletions

diff --git a/mail-client/aerc/Manifest b/mail-client/aerc/Manifest
index 5f58eeedd71c..da9e51821c17 100644
--- a/mail-client/aerc/Manifest
+++ b/mail-client/aerc/Manifest
@@ -1,9 +1,8 @@
-AUX 0001-fix-desktop-file.patch 1041 BLAKE2B 71c394fd036e5037f2139394a5b21ff47bbab76937f76e7a49a30009e71f5bfa7bb0d9cb525d33498647861a334ff02fa69668da9974c2958dd6b69372b95f6e SHA512 efccada48ffec3d7a1585aa614388cab4f2bda9b4d4eddf72e53b3d1e5b943310d25e4ddb258170f1e47a1ceaff18b8fa8daf7241723f18501d5cfefdd5beb5b
-DIST aerc-0.8.2-deps.tar.xz 104907184 BLAKE2B d62d64bc58fab72b45db6a557ac23fb61b335a469755f4beb9510c89c17c717147dbc713f86e0c407a95de70b9426ae1aaf9edda1b90814aa596a154b258695a SHA512 2b9b7638012bb212b2bd40ce0f27db54097e9ac714c9724aa59c31c70acc888a01405f2d8180a22973901690e3743042c8d04cd8f75d3b37d95af9ffbd802a33
-DIST aerc-0.8.2.tar.gz 173468 BLAKE2B f45ae8a7a56ceaa7a0ecf21edb17d1c613d2dd505d5f3029fc0519c51d7deb4f7ccf3cfa656aff8f7609d109395adc6edc8be7f388c82ad214c182ed6a64b7db SHA512 287f628cce4eee9a308c11319d77396ff43f31b9c608dfeb1f8200935329f03c89bdba03259d22857aea6e80c4c664362006c0aee630586ed168e3049e4dfbaf
+DIST aerc-0.10.0-deps.tar.xz 117874916 BLAKE2B fc9921f245be1be740f145ab1e067c3f6dac5b26b2544e26a0cbad7b78baebcacbd79a523e9805cfeb65573b13328600f5f93faeadebce410099918304d91036 SHA512 2363026323b126797537277ad7b514a9be94f48f8c5e9fb67f216640c5ab93fb5531d8bb4018789b670c7a71eec31cafa72a005c7ad384a1e9afaa57258e02b2
+DIST aerc-0.10.0.tar.gz 209836 BLAKE2B 2d51d0d9db90e41cce76ccd3cb802218777a6463a0211eb39378542caec9d2c9468f5f6d18d27d130b1153fa19d1633a9fe93730dcb51ec1afdb92a32cfc5893 SHA512 016182847e1fb8198973aa8522d9a205a8589760d40b0177cb41a9b236277fb4aa11d2c0f14bd836be5a53f4b4d5ef65b407407e09399a2ad025fbf22d53bfbb
 DIST aerc-0.9.0-deps.tar.xz 117828944 BLAKE2B 9d5e8561ecc4cae5568655cfb8491b970a0ff8640d35f0d1ae6493ed1d59fc03051556526c2699afea5b27ddb8f25c948fdd5115695935977e5e09fffb1df02a SHA512 7f66ad4124d4da9a295aa096105e4bef2487c393e7b0299fc0da3aacb8dc87cab2b34057419a9ae4f18c3e1385725fc31bae640325b99957782f0aa3eef51e12
 DIST aerc-0.9.0.tar.gz 184022 BLAKE2B 5555523228d08361434690c6c565746408ac50061ee12fc9983c0831beac8d4badc6196a5f3186f3a7c5e63b3eaae51f9af230804e093dd87f425412c5877541 SHA512 5821a35bc9c893ac800532b24cce0dcee5113fe41cce057e3ce952c7d7e9add680cbb11b4700cc8896d852817534d979df44f1cb82d93ae5438ebed826bab7bb
-EBUILD aerc-0.8.2-r1.ebuild 1634 BLAKE2B cc6db1bb7db04e410b3987f25be8809f459da599c27e0e4994e8db79ebbbddaf7a2f2a5496c96cbf55b5453258247f0acce7094d9c34797f359669e1ffc6b75f SHA512 9fb1253e2696704af5562294da8874f6c3a9bce44f023654f9253be081be3399d29bd000f54514badd6e62e9c507f53b65aa8dbd88075d5685c1790eb6f52ff1
+EBUILD aerc-0.10.0.ebuild 1582 BLAKE2B 052bdc4cbf3628078260b09d2a6569a84dc8152d37720bfd3f7eb1c3a83b03f3f9f4d6dffcb1bc0b88dc6c2cc04f26c8e616a28d3278fcb13472e3ee8cbfe301 SHA512 d84a1a7bb0381e960757c3f45001e0a35e5dc5afaeabc520e6dae7aafd88820e49232787b40b5c5c1775899e7b50a9b37914abe0749840c5ba708ecaea6b1b75
 EBUILD aerc-0.9.0.ebuild 1582 BLAKE2B 052bdc4cbf3628078260b09d2a6569a84dc8152d37720bfd3f7eb1c3a83b03f3f9f4d6dffcb1bc0b88dc6c2cc04f26c8e616a28d3278fcb13472e3ee8cbfe301 SHA512 d84a1a7bb0381e960757c3f45001e0a35e5dc5afaeabc520e6dae7aafd88820e49232787b40b5c5c1775899e7b50a9b37914abe0749840c5ba708ecaea6b1b75
 EBUILD aerc-9999.ebuild 1590 BLAKE2B 75534338e15c843859e7fdaa87071721dff1e558cceb0a19c7ebf55f68f2df36570f65060064f0deeb688e4ec20bcb122d71205b2a99b1773738b06238456d4c SHA512 a7de96b3c2971ada14cc396fb7be9aa0e2f6f9f0f8b1a55d835dce2cc3e6b62c1f06ee9dcacee7d038aa93547fb564023f9e1e9964cd8669788435a5393b547e
 MISC metadata.xml 592 BLAKE2B cfb9d7189a946d676ffb7ced582643bbec68c925980044aea34789bb8e597b1581e2cacc59b168e12fcfc245800df108c02ce1605c4085b5b188ad32f9f50b43 SHA512 6f8de3ef87f27a7734244064c1ba0a6dcd3c203d5d4e020284debbffb356f1d947dd0be26bdc957a97924656c6bfcd2cc02696a529467d91bd08b67d00e5c641
diff --git a/mail-client/aerc/aerc-0.8.2-r1.ebuild b/mail-client/aerc/aerc-0.10.0.ebuild
index 08e35a40f8ee..f09b2cc25fa8 100644
--- a/mail-client/aerc/aerc-0.8.2-r1.ebuild
+++ b/mail-client/aerc/aerc-0.10.0.ebuild
@@ -27,10 +27,6 @@ BDEPEND="
 	>=dev-lang/go-1.13
 "
 
-PATCHES=(
-	"${FILESDIR}"/0001-fix-desktop-file.patch
-)
-
 src_unpack() {
 	if [[ ${PV} == *9999 ]]; then
 		git-r3_src_unpack
@@ -41,9 +37,9 @@ src_unpack() {
 }
 
 src_compile() {
-	LDFLAGS= \
+	unset LDFLAGS
 	emake GOFLAGS="$(usex notmuch "-tags=notmuch" "")" \
-		PREFIX="${EPREFIX}/usr"VERSION=${PV}  all
+		PREFIX="${EPREFIX}/usr" VERSION=${PV}  all
 }
 
 src_install() {
diff --git a/mail-client/aerc/files/0001-fix-desktop-file.patch b/mail-client/aerc/files/0001-fix-desktop-file.patch
deleted file mode 100644
index 935e98034fbc..000000000000
--- a/mail-client/aerc/files/0001-fix-desktop-file.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 39f7819cfe26f00921cb653a5d34974ce7af8d55 Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Sun, 27 Feb 2022 11:15:54 -0600
-Subject: [PATCH aerc] fix desktop file
-
-This was reported to me by a user of Gentoo (I'm a maintainer there) in
-the following bug.
-
-Bug: https://bugs.gentoo.org/834145
-Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
----
- contrib/aerc.desktop | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/contrib/aerc.desktop b/contrib/aerc.desktop
-index 235da5a..ddd43ae 100644
---- a/contrib/aerc.desktop
-+++ b/contrib/aerc.desktop
-@@ -13,6 +13,8 @@ Type=Application
- Icon=utilities-terminal
- Terminal=true
- Exec=aerc %u
-+Actions=compose;
-+MimeType=x-scheme-handler/mailto;
- 
- [Desktop Action compose]
- Name=Compose mail
-@@ -20,7 +22,4 @@ Name=Compose mail
- # enable as default mailto: handler using
- # xdg-mime default aerc.desktop x-scheme-handler/mailto
- Exec=aerc %u
--MimeType=x-scheme-handler/mailto;
--Type=Application
- Icon=utilities-terminal
--Terminal=true
--- 
-2.34.1
-