gentoo auto-resync : 06:11:2022 - 21:20:35

5 files changed, 51 insertions, 4 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 4d485a6ccfaa..f46e3c8ac62c 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/clawsker/Manifest b/mail-client/clawsker/Manifest
index 91702f94d279..a31afdfd5b44 100644
--- a/mail-client/clawsker/Manifest
+++ b/mail-client/clawsker/Manifest
@@ -1,6 +1,8 @@
 AUX clawsker-remove-get_screen_height-test.patch 406 BLAKE2B cd3d32b4dc42a6a690a806687a8e4661519373005562247469fb332b46f2dc9e089a746d3bde5f8d3e6f7e51edf1d45451ae172c59938f03f97b660a745aeed0 SHA512 ef47a518add2179140dfd76b7798e9d687644b065399761e70c2cae4777a43303152725cc47341a1c0a4f606c1b330939a2bfd27b6acd8fa6e6a27c5bf5c6cc2
 DIST clawsker-1.3.4.tar.xz 172024 BLAKE2B db44d823f930e9a9d5519e060dc9ab3c7ac8c4d851a7e57e7832c1bb476a5640cc58ee97c390df8d98d0366634a5c10638cd7e2c24528cb7dfc0bfc35b71c0f5 SHA512 467e28ba768e2b18d704bf230157225e5f1f9becfe405f12563e1f65403e9eaa8e06e58d743f3d7712554cdaf59634e51dc1eecb57fbbd9fb23561b86c3cd975
 DIST clawsker-1.3.5.tar.xz 173700 BLAKE2B 6fd90c3b1834a3726383377db67027f5155a8a4ed4ae16ee3c48f46984098e396c832ba73788b0b1f536fa839db697d4338d5afe824de9af4ce89b45fae34f04 SHA512 e6387134be258c3475a9f77c864ae549d37a076e17fa754c01610365f5343b84d375d71430a9acb83143e1b48cf22be0b5290953ef9afc6386928deab1cdeaf0
+DIST clawsker-1.3.7.tar.xz 180816 BLAKE2B 5e63b5400627490669cbbf3158ccffce461d21b89b43b7d61fb4e87e9a3afa4e1444c47c20d302a6876db8115b4ad9092683c7713ea2158c3bf3e642ccedabfd SHA512 911108d2241f6f1d5a4ac3bd43980e61bfccf43ee025c03b6235085b2b357dc5230f21bffcc9a4c1546da008e7717efe45d3d7e0b4a2b3a542323d269893bcac
 EBUILD clawsker-1.3.4.ebuild 694 BLAKE2B 92efab0a002da4e6702d5f52744167f316c80d1329a424317a6e4bd6bf72784c29840747b2d8d02b29469e45fab579ec909c4240a5084c263be1c1fb06bc4078 SHA512 cb396b67fdafa1d521dcfe6fa157d6e08efe98fc311f7b114541e47e91cfd64c5821a6cef5ba2decfb91452f37cb92a703d92ef51ebf815e10c45a49b2a5a2c1
 EBUILD clawsker-1.3.5.ebuild 758 BLAKE2B a94555b1fd4da19a968717f6738036cb97a3dbc244cb52b47d3da70b5f312fc91b2ccd10af505697506652a6992de33d16116350e6ec4c54e7ba12d5e94959cb SHA512 bf160291bd7966f4f4dd49e943c27de47d1c3b85ab674ae56197eadb30659fd53a35bc7e0edd5a8fa3e7a4500cc8b6c80c18169b4dfb359101554d6423699102
+EBUILD clawsker-1.3.7.ebuild 758 BLAKE2B a94555b1fd4da19a968717f6738036cb97a3dbc244cb52b47d3da70b5f312fc91b2ccd10af505697506652a6992de33d16116350e6ec4c54e7ba12d5e94959cb SHA512 bf160291bd7966f4f4dd49e943c27de47d1c3b85ab674ae56197eadb30659fd53a35bc7e0edd5a8fa3e7a4500cc8b6c80c18169b4dfb359101554d6423699102
 MISC metadata.xml 259 BLAKE2B b686159b165bb65001fec330015f34ab32825ba2b95bda35f433702b2a1b687120ce9de3a181683886cbb3ec13863099e02593f009eee89b0bb1125dae93bcbd SHA512 191845ae8df52119a9934c6fd23f5b9ce8d2c77df29c750790d3ea8b6af37355b69b5b24fdeae3bffe7f5ce4f8997e7211008dd1f36e7de0ebda3a87353c0dd6
diff --git a/mail-client/clawsker/clawsker-1.3.7.ebuild b/mail-client/clawsker/clawsker-1.3.7.ebuild
new file mode 100644
index 000000000000..c1de50a794d3
--- /dev/null
+++ b/mail-client/clawsker/clawsker-1.3.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg
+
+DESCRIPTION="Applet to edit Claws Mail's hidden preferences"
+HOMEPAGE="https://www.claws-mail.org/clawsker.php"
+SRC_URI="https://www.claws-mail.org/tools/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Gtk3
+	dev-perl/Locale-gettext
+	>=dev-perl/File-Which-1.210
+	mail-client/claws-mail
+"
+BDEPEND="test? ( dev-perl/Test-Exception )"
+
+PATCHES=(
+	# TODO: add Test::NeedsDisplay Perl package and remove this patch (bug #841707)
+	"${FILESDIR}/${PN}-remove-get_screen_height-test.patch"
+)
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr
+}
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 02de42940075..2dd27c055a0f 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -8,5 +8,5 @@ DIST mutt-gentoo-2.2.7-patches-r0.tar.xz 23180 BLAKE2B 227c160387354ec5881e9e944
 DIST mutt-gentoo-2.2.8-patches-r0.tar.xz 23192 BLAKE2B f5e3baf4ae5fe54afc30f6449581646120b92cdaff6bdffbe936c65072b4dc013520fbc864d05fceefc0e3e2c6be34b01bca7aa3bdc933f14c8048d3aa886cb6 SHA512 82b31fed5e55f58a8cfa5f02b0c9ee170d66d2bfb09c0f59763c3070fd2358c265a4a0ede3b552c91f4e13c7ab7d87eadec9d2f245943a629361d8b98d8c1cbd
 EBUILD mutt-2.2.3.ebuild 8135 BLAKE2B 68fb82b9521a1526cbf80a35ef9523f457034ca655f28a724f763eae507b13316ff0a65df38e00cd9cb21f319d354190690f6831197f3a76e642cff6b1b6b53f SHA512 ba86d3bf6f40b0c5c3aa31d96ebccdef53a31f687880ed1a279b76bc51a15a08aec6e622a4cc678d966c9e49c4638961eb3d2025437cf008cd792f8bc7fb6c20
 EBUILD mutt-2.2.7.ebuild 8141 BLAKE2B a61865e9fcfc9ca8f997c9875fa97681b15f58abc64e4578c76a77d9299b99aece6d1ca6fea6731ee7785e5f508df8a671d479d1e09552d52c9d130ed5932312 SHA512 e22c5c4053ac0d0c612a5d8329a629f11075a358f4a7160ae40f8972e92c6bd568a3e7d9bfc8101ece97d185f1490d674aa44f1a139481682ca904a2d698a721
-EBUILD mutt-2.2.8.ebuild 8128 BLAKE2B ea9e597f8d2141e9e1f827007ca5f6ccfc0e1245b604975375f04187fa3d43eefee7874f027768155a7f2cd7e0f2d4e5169b60239fca85c404e893731839434f SHA512 0b0158ec15ebcc942c67019d49e3f4aab702077da122237fe31b40288e7c800fc5d8dc2dccaec928f5718ec162e957725a8b335bca31db1033992a8557fd2fdd
+EBUILD mutt-2.2.8.ebuild 8447 BLAKE2B e3050b67cfba3c215dd420208f76cbc2744ff8de59e37b83cbafba909372e1e3986e80d833eec9107905ba61cf57384c97931e86ee15f3456dc2e6b61ccfa4d8 SHA512 10a9421885ad635b091779b3fd1890e7d9a3e669976424c09763f9ed44e16f686517cf1781386e42b7b6beb5f8f6bff9d2aca5cce2cca51ec6ba1b9cd01085ed
 MISC metadata.xml 1413 BLAKE2B b48f350744607d739c38cc54e42abce66e485f1f65fafaa5f4a668f07da70fff0f917f1d67cab621c9e267052fdb958476292fe5222738e7bca59502f560078c SHA512 c9b4c3a9ac62c04be1ef8dc894754334f35fb79d6365360212805e9f9f2c2dca18e1d03c76bb887e81b4fbb2199fdf8fe4341ebc2059f5961184562ee549df65
diff --git a/mail-client/mutt/mutt-2.2.8.ebuild b/mail-client/mutt/mutt-2.2.8.ebuild
index 06bb916b3761..2f770033de52 100644
--- a/mail-client/mutt/mutt-2.2.8.ebuild
+++ b/mail-client/mutt/mutt-2.2.8.ebuild
@@ -99,16 +99,27 @@ src_prepare() {
 			main.c || die "Failed to add bug instructions"
 	fi
 
-	local upatches=
 	# allow user patches
-	eapply_user && upatches=" with user patches"
+	eapply_user
 
 	# patch version string for bug reports
 	local patchset=
 	use vanilla || patchset=", ${PATCHSET}"
-	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}"')"|' \
 		muttlib.c || die "failed patching in Gentoo version"
 
+	# bug 864753: avoid warning about missing tools, currently the order
+	# is lynx, w3m, elinks, so remove lynx or w3m when not installed,
+	# elinks should be there via dep.
+	if use doc ; then
+		if ! has_version www-client/lynx ; then
+			sed -i -e '/lynx/d' doc/Makefile.am || die
+		fi
+		if ! has_version www-client/w3m ; then
+			sed -i -e '/w3m/d' doc/Makefile.am || die
+		fi
+	fi
+
 	# many patches touch the buildsystem, we always need this
 	AT_M4DIR="m4" eautoreconf