gentoo resync : 22.01.2021

3 files changed, 3 insertions, 62 deletions

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 358b0e9fe608..d6a9fb579e20 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,14 +1,13 @@
 AUX all-gentoo-1.js 1008 BLAKE2B 50418db37f55b9b9e53049abb95af79a5ee5137df9aab3ef6d1791e51a0c2f35d78b390982c5c20f4a57acebfaa013139276d0343cd4733a925510c8a5567c69 SHA512 5d1c9331db3c988f79be7756b57254bb3d2cb56cf10c7e79878d9968f882713cdcca0013d3507c4d69fcc7e99164a27b05ffbbb5ce78ee86b91ecce366a997c4
-AUX seamonkey-2.53.6_beta1-confvars_use_posix_sh.patch 1459 BLAKE2B 057ff24962656a6e072eb5ea0f6b33e25436cf6c492ca83cfad01fcd603baffdacc1fc3b1d7422a67ed401d0dac30cc68d04a23dad7cbf14fbc2bbdb7606f491 SHA512 31018b9f536cf6b0b9af359856e4826690dea064ba61d503cc205782eb306301a35e1a4419ee4ab643f3eefd828a72f3d6fec2cc6a1760eedfc02d7ed3dc2502
 AUX seamonkey.desktop 307 BLAKE2B 81aaa9a69dc60ae0872ebdfe796d3a6afbd4bd15c1c83c14abc06579c15bed2e48114e3fb374bab0ba7d9d4de28109b215601a2d6bd56af3aa9e82a4d0baaa91 SHA512 081d8ec12e9e2035fc8020238803ab9df98dac4350ce90a29e9e65a38efa13bb14cba0fbc2e68a2a857c5046142c68ecc8ab4535da4f284c0e04a3879afc429f
 DIST seamonkey-2.53.3-system_libvpx-1.8.patch.xz 3128 BLAKE2B f73802d2715a11964a4b4d34b582a2999ab42cff9ed005c5ca8c002ae745a973fbb682c3e568f6727a7fe93dc2d7a5ba3367adc4e1d256b8ab0cf8d940fceb8a SHA512 80b87c260445af181d1a0d39de9f95ac7c93f76e12328c1799e8607f50ca9e2a20bc4f15de3f32efbbabb444fd5352612b2629fee61875fa0acd6d050df338a2
 DIST seamonkey-2.53.5.1-rust148-packed_simd.patch 45781 BLAKE2B f028f56c68d03ee5231457dd233fe046cae7170d808a3db1c27a7c11f5cc97539df22ab1c05f305fed918d0a8a9ad2be53a9972b42607811ea2e60e3b56d6015 SHA512 74eec456b7aa872d682962b7585f74705b4ad4cbd27cfa11f5c6c2dfef303706dac414e72df882ba106df31305db79ff73158cdeba960bf74cad962e02fa3931
 DIST seamonkey-2.53.5.1.source-l10n.tar.xz 12108000 BLAKE2B f8e3b3bcdadf92decaa2cffacac937a6c219017a205385136e98fa6fa13d5176dc000ee00ac910951d1e623c82241b1ed3d0b0b6754c5c5e0d2cf315c9bd097a SHA512 6532465d0ffbe2f36e5db0b54a801bf3b5d5481a1f39933620bea641e7faf8fcc0a04f5ff1e72272f119954835663e6d1fdb3d0595468a2fbb336b71d0290ce6
 DIST seamonkey-2.53.5.1.source.tar.xz 285624492 BLAKE2B 1785872f9b5e3fdd92cc9d9b53f503e923451af116cc8c0581b6e61cf542d8fff7a4139f57c6d3db55865caa2f1292eaaa8125fe05ca1e18cc0ee02376c5644a SHA512 6ee8a1c5b81ede02cabcfc7b650805bab661b2898fd0f6d7c0ae1f99da19930efb69f25ce7374888cac6333e669ec79d72705fec69cfe617054b9daacd31297c
 DIST seamonkey-2.53.5_beta1-patches-02.tar.xz 44096 BLAKE2B e0c31af11b3bf88f572703403f186bda71af0c26cd52a99b773dfd765961c430f2d516bba266871b28e5848d5c0f9e9df1a074b05f4b5da7323fd9042c25054e SHA512 434e4cad74d659f46a051207bf43087ad780e40c29b465a9c4c8e7366e9d8b197da20e5ffbafadb8ddb3f1754ad81b75f3d7a899adadd3bb8a7b83e501cfaf9a
+DIST seamonkey-2.53.6.source-l10n.tar.xz 13520676 BLAKE2B cae6fad22f30c0e685ef3829e4a67f09420a1114e259e71a998819e7bf33ecf7428959aa99bb4299482e5d149fe85575e8f4ea5ba254dae0fe10e2a634be2aa5 SHA512 aabbe7a93c2a78ad5dde819265540ea7516f0bc1cbc876a64b81969697e6389467d3ea682a02d15ebdd182a5d0c5ae122ecce9ce18874910ab968ee7664fe501
+DIST seamonkey-2.53.6.source.tar.xz 283905464 BLAKE2B 77ecb3df1b4f0a8f2fd4fa1899d3f4459d3630fc7f0dacd050ba53709d9db5af1ab49c465ba6ef264036aaac834897c0f035c1ca49a3ab34250eb4f3b244d220 SHA512 1854862b5b4781e21cb14bdb6be95e219195459202f55cde3800594174307a9ff23e8b29304494489e947a2749765cdb75ca56633f2fcff8afaf277da972a573
 DIST seamonkey-2.53.6_beta1-patches-01.tar.xz 44160 BLAKE2B f6a959a983e726cd919ab5004b27cd496a78cd58759168d6dd64e155059c7b52f269bc42143ddb69a1e8880c72779257216d942a1abc58800491fde9eaaea061 SHA512 710e668209f76f2ca4112923c61219e435123791dfcfcb202af1f7975436d17f13ab025722e9725f219e9de9d024091514d23c71a851d68f750c11ea8d56c2b9
-DIST seamonkey-2.53.6_beta1.source-l10n.tar.xz 13520676 BLAKE2B cae6fad22f30c0e685ef3829e4a67f09420a1114e259e71a998819e7bf33ecf7428959aa99bb4299482e5d149fe85575e8f4ea5ba254dae0fe10e2a634be2aa5 SHA512 aabbe7a93c2a78ad5dde819265540ea7516f0bc1cbc876a64b81969697e6389467d3ea682a02d15ebdd182a5d0c5ae122ecce9ce18874910ab968ee7664fe501
-DIST seamonkey-2.53.6_beta1.source.tar.xz 284481888 BLAKE2B ea8d1b72cd2ef919a633f8dcbccd5c2787ed124bd6bc28ad7a3742e753a4b9667716a1551ebef37f026b6d9cd931964a96ad442c5ca826db1e224899a367113c SHA512 f990f0e4b10e3aefd25848aee3c2368accf7527226409e8f6838fd2aa9464ac9459f9249c6169dd02b35b3e977565f5a1eec84f4a506758a56109bea8096cd10
 EBUILD seamonkey-2.53.5.1.ebuild 16674 BLAKE2B f984187931a806f8deceaf3ffedf2097b4b8d4a80a425aac09ca5fb1b6e19de078bfb01d92b23614d0f4b9d7379af5f96df4309b05818209024d3d6b6d5fe4ff SHA512 af7ecf1a2c54788addee4840bac84a7c2641075ea212de6c770dda407177b1b661d2e9ce829be0be1efe72c597caef7fa6e2104f8a94a5ea90ead1230f122151
-EBUILD seamonkey-2.53.6_beta1.ebuild 15995 BLAKE2B 864544077e69dca9619acce07d0f3f9109e89d70074bdf7eb215c3bde156f0b03a3da042ece19798ab5e1b906318e55e6f85a0088367653f6974d6dc83a35d9a SHA512 f9333e71d93f2b18dea32e6b365d13a347a9900cd3297951f29d6c99e8bf2f2ca758375a79f152d43d6e462eab5fac58b743e08f8d3d9593f6801caae0bbc308
+EBUILD seamonkey-2.53.6.ebuild 15939 BLAKE2B c1edb05384fa5bc315aa3c755f5c42ef5b6ae5e736169f8db707b5aa635d0cbf31d61770ab04d2d2b06b56064982d67e90e735ffd328f080c1602d124205bce0 SHA512 7ee3f301cf30c0c93003327c4c70865a688722f9f747950d596de00e87023344ddf00f89984f5cfef352f96f74d83007305f556271297e5e302420078f340fe5
 MISC metadata.xml 1903 BLAKE2B 24d0d1914eb2965b065dca44093fd7162a735190082874f1230f090ba1f5c7728531a5e5c5bbec6e23036d51a1d71fc0d95d19ebca3fd68e82261e981b7fe402 SHA512 98c0c07a83d496ff6ab274787d6d76379fbfdd352bb58177f20dc53055ef6d426819cf67860b5e6d57941c9cd3d6f439365d135c7235cecb8d654733b0bb2799
diff --git a/www-client/seamonkey/files/seamonkey-2.53.6_beta1-confvars_use_posix_sh.patch b/www-client/seamonkey/files/seamonkey-2.53.6_beta1-confvars_use_posix_sh.patch
deleted file mode 100644
index a2be4a20e106..000000000000
--- a/www-client/seamonkey/files/seamonkey-2.53.6_beta1-confvars_use_posix_sh.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-
-# HG changeset patch
-# User Tom Prince <mozilla@hocat.ca>
-# Date 1516732239 25200
-# Node ID 5fad234e2e846377d9361f8ea500556dbf523da8
-# Parent  266495d41b7376f67e1999b769205bc6ca8e40bf
-Bug 1399679: Use posix shell in comm-confvars.sh; r=me
-
---- a/comm/comm-confvars.sh
-+++ b/comm/comm-confvars.sh
-@@ -1,24 +1,26 @@
- #!/bin/sh
- 
--if [[ "$MOZ_BUILD_APP" == *comm* ]]
--then
--  # we are building with comm/ as the subdirectory
--  # $srcdir is the mozilla repo, comm is in the subdir
--  moztopsrcdir=$srcdir
--  commtopsrcdir=$srcdir/comm
-+case "$MOZ_BUILD_APP" in
-+  *comm*)
-+    # we are building with comm/ as the subdirectory
-+    # $srcdir is the mozilla repo, comm is in the subdir
-+    moztopsrcdir=$srcdir
-+    commtopsrcdir=$srcdir/comm
- 
--  mozreltopsrcdir=.
--  commreltopsrcdir=comm
-+    mozreltopsrcdir=.
-+    commreltopsrcdir=comm
- 
--  commtopobjdir=$_objdir/comm
--else
--  # we are building with mozilla/ as the subdirectory
--  # $srcdir is still the mozilla repo, so use the parent for comm
--  moztopsrcdir=$srcdir
--  commtopsrcdir=$srcdir/..
-+    commtopobjdir=$_objdir/comm
-+    ;;
-+  *)
-+    # we are building with mozilla/ as the subdirectory
-+    # $srcdir is still the mozilla repo, so use the parent for comm
-+    moztopsrcdir=$srcdir
-+    commtopsrcdir=$srcdir/..
- 
--  mozreltopsrcdir=mozilla
--  commreltopsrcdir=.
-+    mozreltopsrcdir=mozilla
-+    commreltopsrcdir=.
- 
--  commtopobjdir=$_objdir
--fi
-+    commtopobjdir=$_objdir
-+    ;;
-+esac
-
diff --git a/www-client/seamonkey/seamonkey-2.53.6_beta1.ebuild b/www-client/seamonkey/seamonkey-2.53.6.ebuild
index 497d3aca8964..f2fc86ef1b5a 100644
--- a/www-client/seamonkey/seamonkey-2.53.6_beta1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.6.ebuild
@@ -183,8 +183,6 @@ src_prepare() {
 	# Apply our patches
 	eapply "${WORKDIR}"/mozilla
 
-	eapply "${FILESDIR}/${P}-confvars_use_posix_sh.patch"
-
 	# Shell scripts sometimes contain DOS line endings; bug 391889
 	grep -rlZ --include="*.sh" $'\r$' . |
 	while read -r -d $'\0' file ; do