gentoo resync : 28.04.2021

4 files changed, 296 insertions, 56 deletions

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index b45d0ea5bf1b..f3cc9065305e 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,11 +1,12 @@
 AUX all-gentoo-1.js 1008 BLAKE2B 50418db37f55b9b9e53049abb95af79a5ee5137df9aab3ef6d1791e51a0c2f35d78b390982c5c20f4a57acebfaa013139276d0343cd4733a925510c8a5567c69 SHA512 5d1c9331db3c988f79be7756b57254bb3d2cb56cf10c7e79878d9968f882713cdcca0013d3507c4d69fcc7e99164a27b05ffbbb5ce78ee86b91ecce366a997c4
+AUX seamonkey-2.53.7-ownertab.patch 10144 BLAKE2B fd30a83ede6f2d284ac6f308bc1dbc298961e468cc7e353cec95f13b0db8b5722494075dfd73b261348c9affb187b203a7598e7f62a062fbdcf87a62561f723b SHA512 227882f698918d160e01df47516af90bbfa13b206d5ddf6184b5b44ecc2b940e7424955001a4759a24529cd63150e5ef922c4e605d577b0201be6fce81c7c9ea
 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.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.7_beta1.source-l10n.tar.xz 13540528 BLAKE2B 535022e9edba3cfd2de208475aaaa94b464d309c739433015722aaef02064cd04e27865c3dee718caede6b665ad69bb8340f9d21c124c6fd2fd3d6c2aef6d782 SHA512 55eca32a2784f2391bd8307c48e264c8cf67908b4e3e2f147ad51c75fddbf95a67ab2285d3df9134cc75e4440e01a253dc9cfeffbd4973152940720c6bf86e76
-DIST seamonkey-2.53.7_beta1.source.tar.xz 283721976 BLAKE2B baf95f81f1cb167d8414b8671c92f477ef38af0631745f44bc8bda93a1618f26a8b4ffd786525ba0a3092325941c1745c09aaa6c7882318d2d492c437bfd23fb SHA512 6e1fad11e71a100fce66ba193beb56369725812bd26455386c9a5a5c6ad8254ccb63d70fe4d5dd9844b7c29656ae9ee99ee46a3b6648ca67d1170cf9e71c239f
-EBUILD seamonkey-2.53.6.ebuild 16702 BLAKE2B 45fcbb8369324a98cc1382ff975664d672561c695c2cfd0b0e17d67197d546fb733aa74b59be51baa82bf0fc2329fb8fdc69e933495657a8c7bfb97cc6ceefc7 SHA512 6af5513259f49ce716b4f2b19c3dbc65666215f0bf9d47825f75ac911c6130760ce1b886eafcce891c906bff2937f3fdc6fec36e1fc9d8df3e3f4cd0cee31cbd
-EBUILD seamonkey-2.53.7_beta1.ebuild 16745 BLAKE2B 09195625d126331d9cd8b0f6de0cc5c3d415ec20d4d80d9ddc17ce9084f5206607988097b18caa4f406d7563030b38ae595e1646bdc980121d82cc2748082afe SHA512 41a654ce32012024a21929261c99be1da9f7e24b0dea99892538bcb6a90f7f4e6b27744e24faa171c7125afed7e09aad7912d9ff6d6504e0580fde44ffe7ce86
+DIST seamonkey-2.53.7.1.source-l10n.tar.xz 13540652 BLAKE2B a42471ee8d2c4c57158291a9770aa6759a620e4b9a38a1bedcf17495332924839d65f1a12dce3c7452137fd6d176c576ec0da639f20be29621b10406c0e9bd4f SHA512 d4bde45e0dfdbd1eb316ef3f3d2e611a1a3314a1144ad7075f96ad35c961bc07fd82bbfd7959aa9bee0034cbf081427670d7da3eb3b3aac85b5db7aab92b32a5
+DIST seamonkey-2.53.7.1.source.tar.xz 283452108 BLAKE2B 4f0a73c5d57c708e4b5d5af6ddee1c9515b6bf401b0181da17c03cdeee1afb9d120c0157cdf2a07e8fa6495462e8bbb4b85e3e6646dbbead123934c565732926 SHA512 21f52b2668b8cb31670a80f3fbcd04d714527545ddd36fa5782999be398428cfeac989da4e3e7e049202249d43c71228ebc8640dd0b594150c8cff0b587caf7e
+DIST seamonkey-2.53.7.source-l10n.tar.xz 13540652 BLAKE2B a42471ee8d2c4c57158291a9770aa6759a620e4b9a38a1bedcf17495332924839d65f1a12dce3c7452137fd6d176c576ec0da639f20be29621b10406c0e9bd4f SHA512 d4bde45e0dfdbd1eb316ef3f3d2e611a1a3314a1144ad7075f96ad35c961bc07fd82bbfd7959aa9bee0034cbf081427670d7da3eb3b3aac85b5db7aab92b32a5
+DIST seamonkey-2.53.7.source.tar.xz 283282204 BLAKE2B a0e239381b6f1dbd41042ab1daf1ed986d6ea9f6fb68cb38b41e05e579937d1754f4293f1d3b9ded7ce6f05f3ca8cd292addfd06fe6405777c440ded2804d4c1 SHA512 175bf010f5279f07e0cccaf2d8caf4d6e0368de035aba7b5bc4c5da301de19aa7fc8c0125b2ee3d1c1a859e94c8f7985c977bafe48cd6f453d609270891887e5
+EBUILD seamonkey-2.53.7.1.ebuild 16911 BLAKE2B 20340af7ed5f9df85d29c3eac01d3838c24d1f41a47e0c644b1a312e95f5fa9f4a9e28bb6d413253124baee5f7fca5109a837c1012c8d758a280b8faddb3d557 SHA512 bdd9af9a6ba09879864b60ffc5fb201c280b3491c6f9f62abd236f5e0fc420a9b0f6172b49c38833127095119b6c823cb98cb0039510f6b07a834edf2101186d
+EBUILD seamonkey-2.53.7.ebuild 16802 BLAKE2B d1a5cc51af9b561a02f9e3666e12ba6c7656009614b06eb4d2a0132f3333b8a2cdd4868ca719cc9fd83f7c87b195ea450c08718bca6105bb3dde74f30eded7d0 SHA512 f1c54faca5ecd8766f1f1b99df439baa475237c51fa7a2ea2890f7207895125c008d54746abadeb256582e6727e5c3d7709a7ceb69235cf4583727255cbc6cc4
 MISC metadata.xml 1931 BLAKE2B 3cb5bb9f57b5b669b2c9c0d90616bd04928483f51bf0c0909e63836e069f6a87cfd0a2f37b8753abe8976a11219c7daa577ac0d9ee6f2335eec7c375614333ee SHA512 9ee6b67335f7a66a8ad1d211f257042fe9b741432691502be8b39d71888a1f783310fb1049757cb5059c530aa3b6e0c1d6b94f86feaf74fd096168c21611f524
diff --git a/www-client/seamonkey/files/seamonkey-2.53.7-ownertab.patch b/www-client/seamonkey/files/seamonkey-2.53.7-ownertab.patch
new file mode 100644
index 000000000000..c0ae11ff076b
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-2.53.7-ownertab.patch
@@ -0,0 +1,236 @@
+--- seamonkey-2.53.7/comm/suite/app/profile/suite-prefs.js
++++ seamonkey-2.53.7/comm/suite/app/profile/suite-prefs.js
+@@ -225,16 +225,17 @@ pref("browser.tabs.autoHide", false);
+ pref("browser.tabs.forceHide", false);
+ pref("browser.tabs.closeWindowWithLastTab", true);
+ pref("browser.tabs.warnOnClose", true);
+ pref("browser.tabs.warnOnCloseOther", true);
+ pref("browser.tabs.warnOnOpen", true);
+ pref("browser.tabs.maxOpenBeforeWarn", 15);
+ pref("browser.tabs.insertRelatedAfterCurrent", true);
+ pref("browser.tabs.insertAllTabsAfterCurrent", false);
++pref("browser.tabs.selectOwnerOnClose", true);
+ 
+ // For future use
+ pref("browser.tabs.loadBookmarksInBackground", false);
+ 
+ // how many browsers can be saved in the DOM (by the tabbed browser)
+ pref("browser.tabs.max_tabs_undo", 3);
+ // should popups by saved in the DOM (by the tabbed browser)
+ pref("browser.tabs.cache_popups", false);
+--- seamonkey-2.53.7/comm/suite/base/content/utilityOverlay.js
++++ seamonkey-2.53.7/comm/suite/base/content/utilityOverlay.js
+@@ -1624,21 +1624,23 @@ function openLinkIn(url, where, params)
+     // forces tab to be focused
+     loadInBackground = true;
+     // fall through
+   case "tabshifted":
+     loadInBackground = !loadInBackground;
+     // fall through
+   case "tab":
+     var browser = w.getBrowser();
++    var owner = loadInBackground ? null : browser.selectedTab;
+     var tab = browser.addTab(url, {
+                 referrerURI: aReferrerURI,
+                 referrerPolicy: aReferrerPolicy,
+                 charset: aCharset,
+                 postData: aPostData,
++                ownerTab: owner,
+                 allowThirdPartyFixup: aAllowThirdPartyFixup,
+                 relatedToCurrent: aRelatedToCurrent,
+                 allowMixedContent: aAllowMixedContent,
+                 noReferrer: aNoReferrer,
+                 userContextId: aUserContextId,
+                 originPrincipal: aPrincipal,
+                 triggeringPrincipal: aTriggeringPrincipal,
+               });
+--- seamonkey-2.53.7/comm/suite/browser/tabbrowser.xml
++++ seamonkey-2.53.7/comm/suite/browser/tabbrowser.xml
+@@ -1151,16 +1151,28 @@
+             newBrowser.docShellIsActive = this.mCurrentTab.linkedBrowser.docShellIsActive;
+             if (this.mCurrentBrowser) {
+               this.mCurrentBrowser.droppedLinkHandler = null;
+               this.mCurrentBrowser.docShellIsActive = false;
+               this.mCurrentBrowser.removeAttribute("primary");
+               this.finder.mListeners.forEach(l => this.mCurrentBrowser.finder.removeResultListener(l));
+             }
+ 
++            var oldTab = this.mCurrentTab;
++
++            // Preview mode should not reset the owner
++            if (!this._previewMode && !oldTab.selected)
++              oldTab.owner = null;
++
++            let lastRelatedTab = this.mLastRelatedIndex ? this.tabs[this.mLastRelatedIndex] : null;
++            if (lastRelatedTab) {
++              if (!lastRelatedTab.selected)
++                lastRelatedTab.owner = null;
++            }
++
+             newBrowser.setAttribute("primary", "true");
+             this.mCurrentBrowser = newBrowser;
+             this.mCurrentTab = this.selectedTab;
+             this.mCurrentTab.removeAttribute("unread");
+             this.finder.mListeners.forEach(l => this.mCurrentBrowser.finder.addResultListener(l));
+ 
+             var tabListener = this.mTabListeners[this.tabContainer.selectedIndex];
+ 
+@@ -1445,16 +1457,19 @@
+                 opener: null,
+               };
+             }
+ 
+             params.focusNewTab = params.inBackground != null ?
+                 !params.inBackground :
+                 !Services.prefs.getBoolPref("browser.tabs.loadInBackground");
+ 
++            if (params.focusNewTab)
++              params.ownerTab = this.selectedTab;
++
+             return this.addTab(aURI, params);
+          ]]>
+         </body>
+       </method>
+ 
+       <method name="loadTabs">
+         <parameter name="aURIs"/>
+         <parameter name="aLoadInBackground"/>
+@@ -1556,43 +1571,49 @@
+         <parameter name="aPostData"/>
+         <parameter name="aFocusNewTab"/>
+         <parameter name="aAllowThirdPartyFixup"/>
+         <body>
+           <![CDATA[
+             var aTriggeringPrincipal;
+             var aReferrerPolicy;
+             var aFromExternal;
++            var aOwner;
+             var aRelatedToCurrent;
+             var aAllowMixedContent;
+             var aNoReferrer;
+             var aUserContextId;
+             var aOriginPrincipal;
+             var aOpener;
+             if (arguments.length == 2 &&
+                 arguments[1] != null &&
+                 typeof arguments[1] == "object" &&
+                 !(arguments[1] instanceof Ci.nsIURI)) {
+               let params = arguments[1];
+               aTriggeringPrincipal  = params.triggeringPrincipal;
+               aReferrerURI          = params.referrerURI;
+               aReferrerPolicy       = params.referrerPolicy;
+               aCharset              = params.charset;
+               aPostData             = params.postData;
++              aOwner                = params.ownerTab;
+               aFocusNewTab          = params.focusNewTab;
+               aAllowThirdPartyFixup = params.allowThirdPartyFixup;
+               aFromExternal         = params.fromExternal;
+               aRelatedToCurrent     = params.relatedToCurrent;
+               aAllowMixedContent    = params.allowMixedContent;
+               aNoReferrer           = params.noReferrer;
+               aUserContextId        = params.userContextId;
+               aOriginPrincipal      = params.originPrincipal;
+               aOpener               = params.opener;
+             }
+ 
++            // if we're adding tabs, we're past interrupt mode, ditch the owner
++            if (this.mCurrentTab.owner)
++              this.mCurrentTab.owner = null;
++
+             this._browsers = null; // invalidate cache
+ 
+             var t = this.referenceTab.cloneNode(true);
+ 
+             var blank = !aURI || aURI == "about:blank";
+ 
+             if (!blank)
+               t.setAttribute("label", aURI);
+@@ -1640,16 +1661,20 @@
+ 
+             // We start our browsers out as inactive.
+             b.docShellIsActive = false;
+ 
+             this.mStrip.collapsed = false;
+ 
+             Services.prefs.setBoolPref("browser.tabs.forceHide", false);
+ 
++            // If this new tab is owned by another, assert that relationship
++            if (aOwner)
++              t.owner = aOwner;
++
+             // wire up a progress listener for the new browser object.
+             var position = this.tabs.length - 1;
+             var tabListener = this.mTabProgressListener(t, b, blank);
+             const filter = Cc["@mozilla.org/appshell/component/browser-status-filter;1"]
+                              .createInstance(Ci.nsIWebProgress);
+             filter.addProgressListener(tabListener, Ci.nsIWebProgress.NOTIFY_ALL);
+             b.webProgress.addProgressListener(filter, Ci.nsIWebProgress.NOTIFY_ALL);
+             this.mTabListeners[position] = tabListener;
+@@ -1689,16 +1714,20 @@
+             // aReferrerURI is null or undefined if the tab is opened from
+             // an external application or bookmark, i.e. somewhere other
+             // than the current tab.
+             if ((aRelatedToCurrent || aReferrerURI ||
+                  Services.prefs.getBoolPref("browser.tabs.insertAllTabsAfterCurrent")) &&
+                 Services.prefs.getBoolPref("browser.tabs.insertRelatedAfterCurrent")) {
+               var lastRelatedIndex = this.mLastRelatedIndex ||
+                                      this.tabContainer.selectedIndex;
++              if (this.mLastRelatedIndex)
++                  this.tabs[this.mLastRelatedIndex].owner = null;
++              else
++                  t.owner = this.selectedTab;
+               this.moveTabTo(t, ++lastRelatedIndex);
+               this.mLastRelatedIndex = lastRelatedIndex;
+             }
+ 
+             if (aFocusNewTab) {
+               var parentTab = this.selectedTab;
+               this.selectedTab = t;
+               this.mPreviousTab = parentTab;
+@@ -2007,16 +2036,23 @@
+             oldBrowser.webProgress.removeProgressListener(filter);
+             filter.removeProgressListener(this.mTabListeners[index]);
+             this.mTabFilters.splice(index, 1);
+             this.mTabListeners.splice(index, 1);
+ 
+             // We are no longer the primary content area
+             oldBrowser.removeAttribute("primary");
+ 
++            // Remove this tab as the owner of any other tabs, since it's going away.
++            for (let tab of this.tabs) {
++              if ("owner" in tab && tab.owner == aTab)
++                // |tab| is a child of the tab we're removing, make it an orphan
++                tab.owner = null;
++            }
++
+             // Now select the new tab before nuking the old one.
+             var currentIndex = this.tabContainer.selectedIndex;
+ 
+             var newIndex = -1;
+             if (currentIndex > index)
+               newIndex = currentIndex - 1;
+             else if (currentIndex < index)
+               newIndex = currentIndex;
+@@ -2033,17 +2069,21 @@
+             this._browsers = null;
+ 
+             // Clean up before/afterselected attributes before removing the tab
+             aTab._selected = false;
+             aTab.remove();
+ 
+             // When the current tab is removed select a new tab
+             // and fire select events on tabpanels and tabs
+-            if (this.mPreviousTab && (aTab == this.mCurrentTab))
++            if (aTab.owner && !aTab.owner.hidden && !aTab.owner.closing &&
++                Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")) {
++              this.selectedTab = aTab.owner;
++            }
++            else if (this.mPreviousTab && (aTab == this.mCurrentTab))
+               this.selectedTab = this.mPreviousTab;
+             else {
+               this.tabContainer.selectedIndex = newIndex;
+ 
+               // We need to explicitly clear this, because updateCurrentBrowser
+               // doesn't get called for a background tab
+               this.mPreviousTab = null;
+             }
diff --git a/www-client/seamonkey/seamonkey-2.53.6.ebuild b/www-client/seamonkey/seamonkey-2.53.7.1.ebuild
index d1fd0ce5575d..79cd3a849a6e 100644
--- a/www-client/seamonkey/seamonkey-2.53.6.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.7.1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 WANT_AUTOCONF="2.1"
 
 PYTHON_COMPAT=( python3_{7..9} )
@@ -27,53 +28,48 @@ else
 	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
 fi
 
-S="${WORKDIR}/${MY_MOZ_P}"
 SRC_URI="${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
 	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz"
+S="${WORKDIR}/${MY_MOZ_P}"
 
 MOZ_GENERATE_LANGPACKS=1
 MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
-inherit autotools check-reqs flag-o-matic mozcoreconf-v6 mozextension mozlinguas-v2 pax-utils toolchain-funcs xdg-utils
-
-PATCH="${PN}-2.53.6_beta1-patches-01"
+inherit autotools check-reqs desktop flag-o-matic mozcoreconf-v6 mozextension mozlinguas-v2 pax-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="Seamonkey Web Browser"
-HOMEPAGE="http://www.seamonkey-project.org"
-KEYWORDS="amd64 ~ppc64 x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,sqlite} )
-IUSE="+chatzilla +crypt dbus debug +gmp-autoupdate +ipc jack lto minimal
-neon pulseaudio +roaming selinux startup-notification ${SYSTEM_IUSE[@]} test
-wifi"
-RESTRICT="!test? ( test )"
+HOMEPAGE="https://www.seamonkey-project.org/"
 
+PATCH="${PN}-2.53.6_beta1-patches-01"
 SRC_URI+="
 	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
 	system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.3-system_libvpx-1.8.patch.xz )
 "
 
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,sqlite} )
+IUSE="+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack
+lto minimal pulseaudio +roaming selinux startup-notification test wifi"
+IUSE+=" ${SYSTEM_IUSE[@]}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RESTRICT="!test? ( test )"
+
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
-# Convert to BDEPEND once the ebuild goes EAPI-7
-DEPEND="
+BDEPEND="
 	app-arch/unzip
 	app-arch/zip
+	>=dev-lang/nasm-2.13
 	dev-lang/perl
 	sys-apps/findutils
 	>=sys-devel/binutils-2.16.1
 	virtual/pkgconfig
 	>=virtual/rust-1.34.0
-	amd64? (
-		${ASM_DEPEND}
-	)
+	amd64? ( ${ASM_DEPEND} )
 	lto? ( sys-devel/binutils[gold] )
-	x86? (
-		${ASM_DEPEND}
-	)
+	x86? ( ${ASM_DEPEND} )
 "
-
 COMMON_DEPEND="
 	>=app-text/hunspell-1.5.4:=
 	dev-libs/atk
@@ -134,20 +130,17 @@ COMMON_DEPEND="
 		)
 	)
 "
-RDEPEND="
-	${COMMON_DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-mozilla )
 "
-DEPEND+="${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}
 	amd64? ( virtual/opengl )
 	x86? ( virtual/opengl )
 "
 
 # allow GMP_PLUGIN_LIST to be set in an eclass or
 # overridden in the enviromnent (advanced hackers only)
-if [[ -z ${GMP_PLUGIN_LIST} ]] ; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
+[[ -z ${GMP_PLUGIN_LIST} ]] && GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
 
 BUILD_OBJ_DIR="${S}/seamonk"
 
@@ -191,9 +184,14 @@ src_unpack() {
 }
 
 src_prepare() {
+	rm "${WORKDIR}/mozilla/6009_musl_sandbox_membarrier.patch" || die
+
 	# Apply our patches
 	eapply "${WORKDIR}"/mozilla
 
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=1623054
+	eapply "${FILESDIR}/${PN}-2.53.7-ownertab.patch"
+
 	# Shell scripts sometimes contain DOS line endings; bug 391889
 	grep -rlZ --include="*.sh" $'\r$' . |
 	while read -r -d $'\0' file ; do
@@ -300,14 +298,14 @@ src_configure() {
 	fi
 
 	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX%/}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX%/}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX%/}"/usr/include --x-libraries="${SYSROOT}${EPREFIX%/}"/usr/$(get_libdir)
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
 	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX%/}"/usr
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
 	fi
-	mozconfig_annotate '' --prefix="${EPREFIX%/}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX%/}"/usr/$(get_libdir)
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
 	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
 	mozconfig_annotate '' --disable-crashreporter
 	mozconfig_annotate 'Gentoo default' --with-system-png
@@ -350,7 +348,7 @@ src_configure() {
 	mozconfig_use_with system-av1
 
 	# Modifications to better support ARM, bug 553364
-	if use neon ; then
+	if use cpu_flags_arm_neon ; then
 		mozconfig_annotate '' --with-fpu=neon
 		mozconfig_annotate '' --with-thumb=yes
 		mozconfig_annotate '' --with-thumb-interwork=no
@@ -358,8 +356,7 @@ src_configure() {
 	if [[ ${CHOST} == armv* ]] ; then
 		mozconfig_annotate '' --with-float-abi=hard
 		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				media/libvpx/moz.build || die
+			sed -i -e "s|softfp|hard|" media/libvpx/moz.build || die
 		fi
 	fi
 
@@ -436,7 +433,7 @@ src_configure() {
 	export MOZ_NOSPAM=1
 
 	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 	emake V=1 -f client.mk configure
 	#./mach configure || die
 }
@@ -451,7 +448,7 @@ src_compile() {
 
 src_install() {
 	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX%/}/usr/share/myspell\""
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
 
 	local emid
 	cd "${BUILD_OBJ_DIR}" || die
@@ -481,7 +478,7 @@ src_install() {
 		done
 	fi
 
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 	emake DESTDIR="${D}" install
 	MOZ_P="${MY_MOZ_P}" mozlinguas_src_install
 
@@ -497,18 +494,18 @@ src_install() {
 	domenu "${T}"/${PN}.desktop
 
 	# Required in order to use plugins and even run seamonkey on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
 
 	if use minimal ; then
-		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
+		rm -r "${ED}"/usr/include "${ED}/${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || die
 	fi
 
 	if use chatzilla ; then
 		emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
 
 		# remove the en_US-only xpi file so a version with all requested locales can be installed
-		if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]] ; then
-			rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+		if [[ -e "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]] ; then
+			rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
 		fi
 
 		# merge the extra locales into the main extension
@@ -555,3 +552,7 @@ pkg_postinst() {
 		elog "the Add-on manager."
 	fi
 }
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/www-client/seamonkey/seamonkey-2.53.7_beta1.ebuild b/www-client/seamonkey/seamonkey-2.53.7.ebuild
index 24e958206839..a71a636282ed 100644
--- a/www-client/seamonkey/seamonkey-2.53.7_beta1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.7.ebuild
@@ -48,9 +48,10 @@ SRC_URI+="
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
 SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,sqlite} )
-IUSE="+chatzilla +crypt dbus debug +gmp-autoupdate +ipc jack lto minimal neon
-pulseaudio +roaming selinux startup-notification ${SYSTEM_IUSE[@]} test wifi"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack
+lto minimal pulseaudio +roaming selinux startup-notification test wifi"
+IUSE+=" ${SYSTEM_IUSE[@]}"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RESTRICT="!test? ( test )"
 
@@ -59,6 +60,7 @@ ASM_DEPEND=">=dev-lang/yasm-1.1"
 BDEPEND="
 	app-arch/unzip
 	app-arch/zip
+	>=dev-lang/nasm-2.13
 	dev-lang/perl
 	sys-apps/findutils
 	>=sys-devel/binutils-2.16.1
@@ -343,7 +345,7 @@ src_configure() {
 	mozconfig_use_with system-av1
 
 	# Modifications to better support ARM, bug 553364
-	if use neon ; then
+	if use cpu_flags_arm_neon ; then
 		mozconfig_annotate '' --with-fpu=neon
 		mozconfig_annotate '' --with-thumb=yes
 		mozconfig_annotate '' --with-thumb-interwork=no