gentoo resync : 20.03.2022

5 files changed, 51 insertions, 289 deletions

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 5d66851e7ec2..38176cf195bd 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,15 +1,13 @@
 AUX all-gentoo-1.js 1008 BLAKE2B 50418db37f55b9b9e53049abb95af79a5ee5137df9aab3ef6d1791e51a0c2f35d78b390982c5c20f4a57acebfaa013139276d0343cd4733a925510c8a5567c69 SHA512 5d1c9331db3c988f79be7756b57254bb3d2cb56cf10c7e79878d9968f882713cdcca0013d3507c4d69fcc7e99164a27b05ffbbb5ce78ee86b91ecce366a997c4
 AUX seamonkey-2.53.10.2-ownertab.patch 11007 BLAKE2B 43b5c09e07750c1d9a1e6ebeb112d6ad0d097b4b6b0e0766dfff0cdee7a36e73484a739be270f9ebf70393dbef90897beb9fca49597b0596fc4bef1c0b2bd988 SHA512 b2add9876cf1e183784c65902470c86f393af95d2c108f8e4c510e0837dd562d5f9a8445e1d9611d838fdc880ad03c7dd542d4c8446aac6e53d44cadc06b91c6
-AUX seamonkey-2.53.7-ownertab.patch 10144 BLAKE2B fd30a83ede6f2d284ac6f308bc1dbc298961e468cc7e353cec95f13b0db8b5722494075dfd73b261348c9affb187b203a7598e7f62a062fbdcf87a62561f723b SHA512 227882f698918d160e01df47516af90bbfa13b206d5ddf6184b5b44ecc2b940e7424955001a4759a24529cd63150e5ef922c4e605d577b0201be6fce81c7c9ea
 AUX seamonkey.desktop 307 BLAKE2B 81aaa9a69dc60ae0872ebdfe796d3a6afbd4bd15c1c83c14abc06579c15bed2e48114e3fb374bab0ba7d9d4de28109b215601a2d6bd56af3aa9e82a4d0baaa91 SHA512 081d8ec12e9e2035fc8020238803ab9df98dac4350ce90a29e9e65a38efa13bb14cba0fbc2e68a2a857c5046142c68ecc8ab4535da4f284c0e04a3879afc429f
 DIST seamonkey-2.53.10.2-patches-01.tar.gz 77910 BLAKE2B 9f75470936c15a6c6be27a4751f0ed32dbd7629017b1f142250ef80ecf1adfc6fc7d88c3d1e4a44efaee93b9e15d0171910582ac4a7abcae65fa26bdb6950469 SHA512 ddb0984aaa5e16ced69dad59bb812fbc3ba14c3de96edfea8778ff5450f4f520657031470b80492226fc273fedb7195361c9f56352a53d381061a1171e830d5b
 DIST seamonkey-2.53.10.2.source-l10n.tar.xz 13616204 BLAKE2B 75e3efd51fa4628b3853c2fc86357d1a44addd11ea5409ee10fcce5114fb2a92a9f70af24e3e5fb955a15f8568149cd4c7af67a321716313ad71c474a3caeb2a SHA512 9796ac45203e91d1531ed88239ff8771cd666027a1dbf41885b3626ec03e4289854704cac53a56a68f3df9dd82232321cafde24b5f1c49b22722812bf8781a36
 DIST seamonkey-2.53.10.2.source.tar.xz 284350364 BLAKE2B 15ff60b5728b84c00831d4dccde7600648889d56ecbe034708390cd83d096f760157d84f5df266ede2d4388302b0df83684397c276e1a0f6d1dfe3e799265ca1 SHA512 59233c2bfc0cf3c9e290e1165fea4cd285cabb339f66dbad7bdbe0b7fd9b2acbc37c385b775d2a3d045d1a6648012488cc018eb3f879139c2a582e7d37e01d7a
+DIST seamonkey-2.53.11-patches-02.tar.gz 90646 BLAKE2B 047beb0a9c73c9d85d628139d4169ce91451df71e24aa4f920d5d509c53458e19b71b9cb58254707512445639a1aaf606e96b1c0d4e9eda67240217d36501b9e SHA512 5584fd0b565c56bf2223389bdbf11ff9df424e9eeac44105f1d493d958068e0fae2235bf34ea174600f85efecc1dd06b746f7b86f99d56f375b4127a3a933684
+DIST seamonkey-2.53.11.source-l10n.tar.xz 13626448 BLAKE2B 4dc2de15273b8b5a5e2572c7275d4172151d551348bb8481006d6917faf2814b582796ec6a74cc147299a9466d5de2c3cf3305ed61c70543e7e20047de0612ed SHA512 a20f692366a000418161521a18d696880b62f2f9a8aab95d470626fcfe52798cf5da41df4ba61d2598fdf6ec0d54218988351b3c778fd189957c791442eb6d44
+DIST seamonkey-2.53.11.source.tar.xz 287567152 BLAKE2B 96f89360948169a6ac650cec331f29026ac5dea40e953422f54ff2410dab0c49f883ca650f12514db2bc458bc2d58e6e3f3b6c9e75717ed2f8818cd35529215e SHA512 5a9b1f0f638dd08654b8e0654f5a87cc269e29cfe1efe7b9707fe306398354c95018317c826f7523e33bec50cf72e1ba33a0a1eb216568f62f02bd95eb1eaf16
 DIST seamonkey-2.53.3-system_libvpx-1.8.patch.gz 3197 BLAKE2B 7a84d2184f4812eabfe3626eb6b2364f2f8c0ba24d4e53440e9d38658b89a3f1c23bdcbd623fd9aca3bfd04743e582587e9c42ba3d983cc9ec4059ea9503830a SHA512 ffc6f179f07cb9dcce2924c64bfed84a5cc724d857b32e5e349967e72022536c5192c3966e1089bab8efd91671584d6474334730ebefe1c4398f564a5f1753be
-DIST seamonkey-2.53.3-system_libvpx-1.8.patch.xz 3128 BLAKE2B f73802d2715a11964a4b4d34b582a2999ab42cff9ed005c5ca8c002ae745a973fbb682c3e568f6727a7fe93dc2d7a5ba3367adc4e1d256b8ab0cf8d940fceb8a SHA512 80b87c260445af181d1a0d39de9f95ac7c93f76e12328c1799e8607f50ca9e2a20bc4f15de3f32efbbabb444fd5352612b2629fee61875fa0acd6d050df338a2
-DIST seamonkey-2.53.9.1.source-l10n.tar.xz 13615680 BLAKE2B ce5baea8c004219af74d25671272b2a4104018e35f54adee46bacd8eadbc9c44a53c7ab8f6382402a16dd4353068e0e6144158d3ec874105a5c03ac89a15af7a SHA512 c0dd469a12a4acc7e84793a56615fa109e00c638ed71fe0b51b3125750ed115bf921dbc6e8a4b391bb5cfccd679cdcbdfe9b23e619590c0f22c62489566d459f
-DIST seamonkey-2.53.9.1.source.tar.xz 285481656 BLAKE2B c96107de40c83515fff49d4bf409a13f3a712daf19b466044d6eff244159ebe6d37b7dfc16e6dc0676be344378e9838f7c1d055064bc63ba36a92844e54bfd33 SHA512 67c0645a2b8c4ddafc148da80166d6cff9ceafbeee0683fc4099e69720c4bb725a4165643db37abf0a0545e170e30e811eb0ad198f5c7cd4196294624b86775f
-DIST seamonkey-2.53.9_beta1-patches-01.tar.xz 43328 BLAKE2B 66869b0ebb3259da19148473311b00cb2b2ca762f6ae7003b5374c51f53e6d58fecdf00084d9c43c62023b14666b08efa6138fb28642cc11272851d799f8d0ad SHA512 38b8759da9230d745ab5c8cf1f3964762893e88174f20f3a0458a3196297845fb0876bdb330fac21a24a2661c2b319c8bfb0a7d6e8e47048ced1955500291638
-EBUILD seamonkey-2.53.10.2.ebuild 16853 BLAKE2B bfe87ac4a4cc2c7d6fd8d9c467735d7bc05d0dc06aa98bc17a41124a5dcc78f55c5cf3ad9e4775cd3681ba6d51dab3e916112c94e0c040244a263fd2fb4f9b5b SHA512 5cf0f88382d3f58c8e37ee5d2cee0ce423820724051183f1bb2e17a1f7f57a3d70fc80d056fd0e629948b512e6832c9c42fc2fd5a44c6016b73cac1290a85d40
-EBUILD seamonkey-2.53.9.1-r1.ebuild 16839 BLAKE2B 7be0a0f1de1f2eae92f0336ff80a5f0f7c0cc1e53d678e68da85fe571f8a260e2e11073788bcec960169403555487abaf4a0126e48b7827d870d4a8fedea78ee SHA512 290a3bf30729499e0cc7e908a17a8d77907858e3e36582d614941e805642b57f2a9dd06084797e76693fc6a78da6c7068a9ffb88c2f7146e3991bc14ab6fa0d5
-MISC metadata.xml 1945 BLAKE2B cbe3e22610ab3a24e8a61285a5fc40dc82593b19e5036c0ce0465ec856c2012e699147f27874c3afe19bae458a4eaacd0566809a57e7ce0e48e03fde56602e23 SHA512 09a349791ca3f959340730c4b7dd9b6bcff0045a7c4ecc24bebb0c3759e844ea49ef5b0c8b3acc6f8d3c583c43a188500eecee811369ad3a6d601c6fb12a4f83
+EBUILD seamonkey-2.53.10.2.ebuild 16852 BLAKE2B fb86b2a5402b8f4a464cd7a9b3a280b741e4e684bc76d0b50c1a1f72f1a817af74606226edf55ffa8e9eada2bfe7826f3ec41257c3f8a0d9b02e460c4a9ad343 SHA512 82b20b4750606018ec92b8d05a734d1b77ce43671493f9c32da0d87d940d8b5f96701b8691a23803eeb63ce6aaf58e646e078cdd6f3e4ee12c57331918e818d8
+EBUILD seamonkey-2.53.11.ebuild 16884 BLAKE2B a0ccc7ff087de4dfc485885f14f9b92e80e5db63a68820c1560062f46264a8e87668b4550d7d35b0152f40148086c6e839ae4b89e667796d23184129f46abf2b SHA512 8559f71dcd02ed9193b7af9b041353304267035ad0de850f40c327cd8c49ab36e410f317f6d44a60661add114c48ef7771f7d720e0008f4a7d0af7a715ac17eb
+MISC metadata.xml 2063 BLAKE2B 63147188d96d8806b65c4ed5e51ea52bae24e696dde2c5914bc8868f26b8af4eede153e207cbab74e4a1388f6405124a75944f7a83d032226bee8ef921ff72db SHA512 57b21b5cbcae4303e2651de60aa29d7e06697b04c2f5128107ffc7271f2c1d3b83f21b12fc7b2c661bbf95806b9ded3bcfe88e7d802cee5eb1d6cf04e1b346cd
diff --git a/www-client/seamonkey/files/seamonkey-2.53.7-ownertab.patch b/www-client/seamonkey/files/seamonkey-2.53.7-ownertab.patch
deleted file mode 100644
index c0ae11ff076b..000000000000
--- a/www-client/seamonkey/files/seamonkey-2.53.7-ownertab.patch
+++ /dev/null
@@ -1,236 +0,0 @@
---- 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/metadata.xml b/www-client/seamonkey/metadata.xml
index f3fa056f0caa..dc1f1e09bd66 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo-bugs@habets-dobben.nl</email>
+		<name>Myckel Habets</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>mozilla@gentoo.org</email>
 		<name>Gentoo Mozilla Team</name>
diff --git a/www-client/seamonkey/seamonkey-2.53.10.2.ebuild b/www-client/seamonkey/seamonkey-2.53.10.2.ebuild
index d79808ae9be3..673e5cd126b2 100644
--- a/www-client/seamonkey/seamonkey-2.53.10.2.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.10.2.ebuild
@@ -52,7 +52,7 @@ SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,png,sqlite} )
 IUSE="+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack
 lto pulseaudio +roaming selinux startup-notification test wifi"
 IUSE+=" ${SYSTEM_IUSE[@]}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RESTRICT="!test? ( test )"
 
diff --git a/www-client/seamonkey/seamonkey-2.53.9.1-r1.ebuild b/www-client/seamonkey/seamonkey-2.53.11.ebuild
index 7a9ab4122774..f320a3cdd924 100644
--- a/www-client/seamonkey/seamonkey-2.53.9.1-r1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.11.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WANT_AUTOCONF="2.1"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
 
 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
@@ -21,6 +21,7 @@ MOZ_PV="${MOZ_PV/_beta/b}"
 MOZ_PV="${MOZ_PV/_rc/rc}"
 MOZ_P="${P}"
 MY_MOZ_P="${PN}-${MOZ_PV}"
+PATCH="${PN}-2.53.11-patches-02"
 
 if [[ ${PV} == *_pre* ]] ; then
 	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
@@ -29,7 +30,9 @@ else
 fi
 
 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"
+	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz
+	https://github.com/BioMike/gentoo-${PN}-patches/archive/refs/tags/${PV}-r1.tar.gz -> ${PATCH}.tar.gz"
+
 S="${WORKDIR}/${MY_MOZ_P}"
 
 MOZ_GENERATE_LANGPACKS=1
@@ -39,25 +42,16 @@ inherit autotools check-reqs desktop edos2unix flag-o-matic mozcoreconf-v6 mozli
 DESCRIPTION="Seamonkey Web Browser"
 HOMEPAGE="https://www.seamonkey-project.org/"
 
-PATCH="${PN}-2.53.9_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,png,sqlite} )
 IUSE="+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack
-lto pulseaudio +roaming selinux startup-notification test wifi"
+lto pulseaudio selinux startup-notification test wifi"
 IUSE+=" ${SYSTEM_IUSE[@]}"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RESTRICT="!test? ( test )"
 
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
 BDEPEND="
 	app-arch/unzip
 	app-arch/zip
@@ -65,12 +59,13 @@ BDEPEND="
 	dev-lang/perl
 	>=sys-devel/binutils-2.16.1
 	virtual/pkgconfig
-	<virtual/rust-1.56.0
-	amd64? ( ${ASM_DEPEND} )
+	>=virtual/rust-1.58.1
+	amd64? ( >=dev-lang/yasm-1.1 )
 	lto? ( sys-devel/binutils[gold] )
-	x86? ( ${ASM_DEPEND} )
+	x86? ( >=dev-lang/yasm-1.1 )
 "
 COMMON_DEPEND="
+	app-arch/bzip2
 	>=app-text/hunspell-1.5.4:=
 	dev-libs/atk
 	>=dev-libs/glib-2.26:2
@@ -83,7 +78,6 @@ COMMON_DEPEND="
 	>=sys-libs/zlib-1.2.3
 	>=x11-libs/cairo-1.10[X]
 	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
 	>=x11-libs/gtk+-3.4.0:3
 	x11-libs/libX11
 	x11-libs/libXcomposite
@@ -92,6 +86,7 @@ COMMON_DEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXrender
 	x11-libs/libXt
+	x11-libs/libxcb:=
 	>=x11-libs/pango-1.22.0
 	>=x11-libs/pixman-0.19.2
 	media-video/ffmpeg
@@ -121,7 +116,7 @@ COMMON_DEPEND="
 	system-libevent? ( >=dev-libs/libevent-2.0:0= )
 	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
 	system-png? ( >=media-libs/libpng-1.6.31:0=[apng] )
-	system-sqlite? ( >=dev-db/sqlite-3.33.0:3[secure-delete,debug=] )
+	system-sqlite? ( >=dev-db/sqlite-3.36.0:3[secure-delete,debug=] )
 	wifi? (
 		kernel_linux? (
 			>=dev-libs/dbus-glib-0.72
@@ -146,11 +141,21 @@ BUILD_OBJ_DIR="${S}/seamonk"
 
 pkg_setup() {
 	if [[ ${PV} == *_beta* ]] || [[ ${PV} == *_pre* ]] ; then
+		ewarn
 		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
 		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
 		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
 	fi
 
+	if use crypt ; then
+		ewarn
+		ewarn "Enigmail has dropped support for Seamonkey in early 2019. If you are still"
+		ewarn "using it, consider yourself lucky, but also consider to start migrating away"
+		ewarn "from it. The crypt USE flag and its x11-plugins/enigmail dependency will be"
+		ewarn "removed in the near future."
+		ewarn
+	fi
+
 	moz_pkgsetup
 }
 
@@ -185,10 +190,7 @@ src_unpack() {
 
 src_prepare() {
 	# Apply our patches
-	eapply "${WORKDIR}"/mozilla
-
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=1623054
-	eapply "${FILESDIR}/${PN}-2.53.7-ownertab.patch"
+	eapply "${WORKDIR}"/gentoo-${PN}-patches-${PV}-r1/${PN}
 
 	# Shell scripts sometimes contain DOS line endings; bug 391889
 	grep -rlZ --include="*.sh" $'\r$' . |
@@ -197,8 +199,7 @@ src_prepare() {
 		edos2unix "${file}"
 	done
 
-	use system-libvpx \
-		&& eapply -p2 "${WORKDIR}/${PN}-2.53.3-system_libvpx-1.8.patch"
+	use system-libvpx && eapply -p2 "${WORKDIR}"/gentoo-${PN}-patches-${PV}-r1/USE_flag/1009_seamonkey-2.53.3-system_libvpx-1.8.patch
 
 	# Allow user to apply any additional patches without modifing ebuild
 	eapply_user
@@ -237,7 +238,6 @@ src_prepare() {
 }
 
 src_configure() {
-	MEXTENSIONS="default"
 	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
 	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
 	# get your own set of keys.
@@ -277,10 +277,10 @@ src_configure() {
 
 	mozconfig_use_enable debug
 	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
+	if use debug ; then
 		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	else
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
 	fi
 
 	mozconfig_use_enable startup-notification
@@ -296,11 +296,11 @@ 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="${ESYSROOT}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${ESYSROOT}"/usr
+	mozconfig_annotate '' --x-includes="${ESYSROOT}"/usr/include --x-libraries="${ESYSROOT}"/usr/$(get_libdir)
 	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+		mozconfig_annotate '' --with-system-libevent="${ESYSROOT}"/usr
 	fi
 	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
 	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
@@ -386,16 +386,11 @@ src_configure() {
 	# Linking fails without this due to memory exhaustion
 	use x86 && append-ldflags "-Wl,--no-keep-memory"
 
-	if ! use roaming ; then
-		MEXTENSIONS+=",-sroaming"
-	fi
-
 	# Setup api key for location services
 	printf '%s' "${_google_api_key}" > "${S}"/google-api-key
 	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
 	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
 
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
 	mozconfig_use_enable chatzilla irc
 	mozconfig_annotate '' --enable-dominspector
 
@@ -406,8 +401,8 @@ src_configure() {
 	mozconfig_annotate '' --disable-elf-hack
 
 	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig || die
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig || die
 
 	mozlinguas_mozconfig
 
@@ -500,7 +495,7 @@ src_install() {
 	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
 
 	if use chatzilla ; then
-		emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
+		local 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}/extensions/${emid}.xpi ]] ; then
@@ -522,13 +517,12 @@ src_install() {
 
 	# revdep-rebuild entry
 	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN} || die
 	doins "${T}"/11${PN}
-
 }
 
 pkg_preinst() {
-	SEAMONKEY_PLUGINS_DIR="${ROOT}/usr/$(get_libdir)/${PN}/plugins"
+	SEAMONKEY_PLUGINS_DIR="${EROOT}/usr/$(get_libdir)/${PN}/plugins"
 
 	if [[ -L "${SEAMONKEY_PLUGINS_DIR}" ]] ; then
 		rm "${SEAMONKEY_PLUGINS_DIR}" || die
@@ -543,7 +537,9 @@ pkg_postinst() {
 		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
 		elog "installing into new profiles:"
 		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do
+			elog "\t ${plugin}" ;
+		 done
 	fi
 
 	if use chatzilla ; then