gentoo resync : 31.03.2018

10 files changed, 4 insertions, 762 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index b52616aede2c..f5ec439bd125 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 70b78c0a9e96..e0b431e16a9d 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,9 +2,7 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 BLAKE2B 2c4cd52a07999c5beabe
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 BLAKE2B 35fef5a5d1784941ce11ff3fed440d9c8f83ce5f9a0a8aad3f68deb470a7d82accfe7c9c93be225b458c0fc8e738ca7841d3d14abcaa201801321f3280f2b58f SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
-DIST opera-stable_52.0.2871.30_amd64.deb 55681128 BLAKE2B b587e3fb692c7e2d041c3a99bd1d667025213822b35dc9b6891a9d42da372b7f803bdb9f7c7608e682e8321af2f945c4bed99d643174591e41dc9cba4a4513c5 SHA512 612a26926c0e1380d4721d41dd534b7f4596ebf84c21d11eaeb9f4ea96b44de67e29392b8885abaf86bbc75b92fd88bad47799d4a130f5f8ce424d6895ec1c47
-DIST opera-stable_52.0.2871.37_amd64.deb 55183022 BLAKE2B 07e4fc8ba20f322664f745c33dc6e1d059c72edad1a7667a1c35337c2e60873568ababa4dc0e7f38068c1530b36eabe59857aa86fa4e58a5e00793ab33d58f05 SHA512 de122fe920ae325c11b31f361dd95e3e7d7302aafa467c047a632867a29f6a497f16f54aa052a6459d2b9626eaff4a7cbef712d896252c70c6c1e0fdf91d3952
+DIST opera-stable_52.0.2871.40_amd64.deb 55716304 BLAKE2B ed31782b03ed68ee32b6118771bd7c6311fb9651af2b7d38b9d1b377906b39738010be067c22e70c76cd703b123bfa6558368ab33a869b9987847de91d18f4ec SHA512 131bc5817b2a28729da1159257459c181e014c9a3c9c3603fe4493e74079fbc6d16c893f59f1439ea7a0ad43b120e7ac757c677f82c3b5ea179bad9d81096f17
 EBUILD opera-12.16_p1860-r1.ebuild 6115 BLAKE2B 6805a42231575003626bfc50af74664b53d007cc53cf99a215c764b85d68c1ce824a68c909b56c5b96bbcfda0f0d1caa6e21745f38571b563f2221cfda224da4 SHA512 9e280c4b9f15207a476196e103c265de4ecc3a4a36e5fae12d8330b12e85a774a39b6188ba4d13d028ef191b621b69bdecdd7e4362c0c49be689e6be69b46b1a
-EBUILD opera-52.0.2871.30.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
-EBUILD opera-52.0.2871.37.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
+EBUILD opera-52.0.2871.40.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-52.0.2871.37.ebuild b/www-client/opera/opera-52.0.2871.37.ebuild
deleted file mode 100644
index 139f6afa7c77..000000000000
--- a/www-client/opera/opera-52.0.2871.37.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it ja
-	ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi zh-CN
-	zh-TW
-"
-inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	http://download1.operacdn.com/pub/
-	http://download2.operacdn.com/pub/
-	http://download3.operacdn.com/pub/
-	http://download4.operacdn.com/pub/
-"
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
-"
-done
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}-stable/copyright || die
-	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera/opera-52.0.2871.30.ebuild b/www-client/opera/opera-52.0.2871.40.ebuild
index 139f6afa7c77..139f6afa7c77 100644
--- a/www-client/opera/opera-52.0.2871.30.ebuild
+++ b/www-client/opera/opera-52.0.2871.40.ebuild
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index 65562ceb51a0..d2abdbd4920a 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -1,8 +1,4 @@
-AUX qupzilla-2.1.2-openssl-1.1.0.patch 4631 BLAKE2B 27ede6f8ac9f198b147bf3eddecbe9f78c50dff050f3e9bd8565620847eec1cb6fb3c3f8164a51f7220b9365c275ce9ea4321e0e7e99976170748a75ef674c8c SHA512 0171a9d64c4202c3893767c962b7951d6f431d7e70a7de1385e80c097dd6d1e55fd77be8da3621a9d15cb6982a92d4049e0dc6058c00b7bf7fc90439d659479f
-DIST QupZilla-2.1.2.tar.xz 2767560 BLAKE2B 4d012f86618680a112c227d07d71c24d6fc2c517be63fe172abc99eb0c20e8b2756e2cc51049b0dff91e1739357121afe0b1e7328df372370dec969995447eb0 SHA512 d09a394ba70ae0f7f908940a26d6554a3706b6638c197d16b75e1e5855f76015c8e13b7155c40dacee3a38080a0c277d9410eaf07cf912dc4b295eafe1ff6343
 DIST QupZilla-2.2.5.tar.xz 2532760 BLAKE2B b9bf3f5415aa5a06397a7b9f98f56a16a7c9238d561bf6a2583214e43b23c53c825c8274b51ff0e34ced8aac6077c12dad60968d88abe810ccb35dbd2a457e0e SHA512 78e02141f18268a5f31a896c49e4f6cbd709e609dfcdb50277fc20123526e5316b79ede612dcac74ff07103334c381e4d657b18b6e187a10983d5a44a649858a
-DIST qupzilla-plugins-2016.05.02.tar.gz 425314 BLAKE2B c10f9f3fe17f36b91a77b4bdb15b3d0c63160c50b558ba2f180ec83b2d226b15baea51e9125e0c72d3960c2f99f8f3753d90c7eeb4b88eb07381da19bc3ea777 SHA512 b294ecb2372b3267603a43bc7412ab75d2cd29a8c4667331f0d2c74e3b0b99d0c2a005b9e4854c6d777894522bba9fb3b1607e85e8da6dcbaa760c9ddc6288f2
 DIST qupzilla-plugins-2017.03.26.tar.gz 430926 BLAKE2B d5db8c854886b1af8db20aaffe9a244600259d4f8cbc40890bf0f1075f790afe1a6e2ac19abe06c585eff0353127a3a7b1b1b79013bfc1b81bf5df750e5d9d20 SHA512 3b04b41208dddd25fd58937986cf12f2b521cf78a64380b915d46735ada3f4776f914056c5511daa781c89867d0309af7cbf833eb71dfa4b14b6b9ba25d80315
-EBUILD qupzilla-2.1.2.ebuild 3107 BLAKE2B 759e2b8ca800b96a7132986b4c776f260b05c6397999351abaf624d3aeceb46433aa7f6de662b35d7fc4079ac775b379569bd087ed3ecf59ba9b780053a09462 SHA512 d3d945b8fc44e0e7b64867b6cc66f018640791745fbb6e67fe533cb397046ac133a72ddd256d86d232421366ebc6eda90295f22f1cf2279e5fe0707c33e6097d
 EBUILD qupzilla-2.2.5.ebuild 3168 BLAKE2B 80a43b236bad4887ce94d26580e0018a53169f10fa2dd78b3e09617197e0ad8a87d69386da4bb502703ccb431bf49a84fa92f4ff8332b493c3e0717586ef089a SHA512 3a68d13d169239d0d939b9fbf28c27143e2f91668006b17a6e660e0bb7781f9029e57b5c5ed5d63446f38656753e25cfa5420d990079827ad9fc4b8db0594529
 MISC metadata.xml 691 BLAKE2B 242030684387619d08dfc3aa46f7f0c82055bfac4693bf2e5f655d6d2762b026af5bc1f87ec05eb099d80fd48bde8df80f7deb6ac16263c4067fafd0aa389122 SHA512 585fed97ee3390094552cb5350c185dcdfaba1df7d5d3608cddbb6c05812223276b661121518ffce7921456983ee073aea58ada17ee6347d01a9e5559f75388d
diff --git a/www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch b/www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch
deleted file mode 100644
index 42effa56d5cc..000000000000
--- a/www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From efc4725e91e10ccfef257143408d3a683e74a866 Mon Sep 17 00:00:00 2001
-From: Jose Rios <joseriosneto@protonmail.com>
-Date: Mon, 1 May 2017 02:12:26 +0100
-Subject: [PATCH] Fixed compilation for Openssl 1.1.0
-
-Most of libcrypto and libssl internal structures were made
-opaque in this version not allowing to instatiate them in
-the stack.
-
-More info:
-    * https://www.openssl.org/news/openssl-1.1.0-notes.html
-    * https://github.com/openssl/openssl/issues/962#issuecomment-208792020
----
- src/lib/tools/aesinterface.cpp | 28 ++++++++++++++++------------
- src/lib/tools/aesinterface.h   |  4 ++--
- 2 files changed, 18 insertions(+), 14 deletions(-)
-
-diff --git a/src/lib/tools/aesinterface.cpp b/src/lib/tools/aesinterface.cpp
-index fa33eb3..29ed37e 100644
---- a/src/lib/tools/aesinterface.cpp
-+++ b/src/lib/tools/aesinterface.cpp
-@@ -39,14 +39,18 @@ AesInterface::AesInterface(QObject* parent)
-     : QObject(parent)
-     , m_ok(false)
- {
--    EVP_CIPHER_CTX_init(&m_encodeCTX);
--    EVP_CIPHER_CTX_init(&m_decodeCTX);
-+    m_encodeCTX = EVP_CIPHER_CTX_new();
-+    m_decodeCTX = EVP_CIPHER_CTX_new();
-+    EVP_CIPHER_CTX_init(m_encodeCTX);
-+    EVP_CIPHER_CTX_init(m_decodeCTX);
- }
- 
- AesInterface::~AesInterface()
- {
--    EVP_CIPHER_CTX_cleanup(&m_encodeCTX);
--    EVP_CIPHER_CTX_cleanup(&m_decodeCTX);
-+    EVP_CIPHER_CTX_cleanup(m_encodeCTX);
-+    EVP_CIPHER_CTX_cleanup(m_decodeCTX);
-+    EVP_CIPHER_CTX_free(m_encodeCTX);
-+    EVP_CIPHER_CTX_free(m_decodeCTX);
- }
- 
- bool AesInterface::isOk()
-@@ -78,10 +82,10 @@ bool AesInterface::init(int evpMode, const QByteArray &password, const QByteArra
-     int result = 0;
-     if (evpMode == EVP_PKEY_MO_ENCRYPT) {
-         m_iVector = createRandomData(EVP_MAX_IV_LENGTH);
--        result = EVP_EncryptInit_ex(&m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData());
-+        result = EVP_EncryptInit_ex(m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData());
-     }
-     else if (evpMode == EVP_PKEY_MO_DECRYPT) {
--        result = EVP_DecryptInit_ex(&m_decodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)iVector.constData());
-+        result = EVP_DecryptInit_ex(m_decodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)iVector.constData());
-     }
- 
-     if (result == 0) {
-@@ -106,14 +110,14 @@ QByteArray AesInterface::encrypt(const QByteArray &plainData, const QByteArray &
-     uchar* ciphertext = (uchar*)malloc(cipherlength);
- 
-     // allows reusing of 'm_encodeCTX' for multiple encryption cycles
--    EVP_EncryptInit_ex(&m_encodeCTX, NULL, NULL, NULL, NULL);
-+    EVP_EncryptInit_ex(m_encodeCTX, NULL, NULL, NULL, NULL);
- 
-     // update ciphertext, c_len is filled with the length of ciphertext generated,
-     // dataLength is the size of plaintext in bytes
--    EVP_EncryptUpdate(&m_encodeCTX, ciphertext, &cipherlength, (uchar*)plainData.data(), dataLength);
-+    EVP_EncryptUpdate(m_encodeCTX, ciphertext, &cipherlength, (uchar*)plainData.data(), dataLength);
- 
-     // update ciphertext with the final remaining bytes
--    EVP_EncryptFinal_ex(&m_encodeCTX, ciphertext + cipherlength, &finalLength);
-+    EVP_EncryptFinal_ex(m_encodeCTX, ciphertext + cipherlength, &finalLength);
- 
-     dataLength = cipherlength + finalLength;
-     QByteArray out((char*)ciphertext, dataLength);
-@@ -163,9 +167,9 @@ QByteArray AesInterface::decrypt(const QByteArray &cipherData, const QByteArray
-     // because we have padding ON, we must allocate an extra cipher block size of memory
-     uchar* plainText = (uchar*)malloc(plainTextLength + AES_BLOCK_SIZE);
- 
--    EVP_DecryptInit_ex(&m_decodeCTX, NULL, NULL, NULL, NULL);
--    EVP_DecryptUpdate(&m_decodeCTX, plainText, &plainTextLength, cipherText, cipherLength);
--    int success = EVP_DecryptFinal_ex(&m_decodeCTX, plainText + plainTextLength, &finalLength);
-+    EVP_DecryptInit_ex(m_decodeCTX, NULL, NULL, NULL, NULL);
-+    EVP_DecryptUpdate(m_decodeCTX, plainText, &plainTextLength, cipherText, cipherLength);
-+    int success = EVP_DecryptFinal_ex(m_decodeCTX, plainText + plainTextLength, &finalLength);
- 
-     cipherLength = plainTextLength + finalLength;
- 
-diff --git a/src/lib/tools/aesinterface.h b/src/lib/tools/aesinterface.h
-index e0debc6..c3c940c 100644
---- a/src/lib/tools/aesinterface.h
-+++ b/src/lib/tools/aesinterface.h
-@@ -50,8 +50,8 @@ class QUPZILLA_EXPORT AesInterface : public QObject
- private:
-     bool init(int evpMode, const QByteArray &password, const QByteArray &iVector = QByteArray());
- 
--    EVP_CIPHER_CTX m_encodeCTX;
--    EVP_CIPHER_CTX m_decodeCTX;
-+    EVP_CIPHER_CTX* m_encodeCTX;
-+    EVP_CIPHER_CTX* m_decodeCTX;
- 
-     bool m_ok;
-     QByteArray m_iVector;
diff --git a/www-client/qupzilla/qupzilla-2.1.2.ebuild b/www-client/qupzilla/qupzilla-2.1.2.ebuild
deleted file mode 100644
index 2ea1fc82dbec..000000000000
--- a/www-client/qupzilla/qupzilla-2.1.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_ES es_MX es_VE eu_ES
-	fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID is it_IT ja_JP ka_GE
-	lg lt lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr
-	sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn
-	zh_CN zh_HK zh_TW"
-
-PLUGINS_HASH='c332d306c0f6cf645c75eaf198d2fc5e12339e9e'
-PLUGINS_VERSION='2016.05.02' # if there are no updates, we can use the older archive
-
-inherit l10n qmake-utils xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/QupZilla/${PN}.git"
-else
-	MY_P=QupZilla-${PV}
-	SRC_URI="https://github.com/QupZilla/${PN}/releases/download/v${PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="A cross-platform web browser using QtWebEngine"
-HOMEPAGE="https://www.qupzilla.com/"
-SRC_URI+=" https://github.com/QupZilla/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="dbus debug gnome-keyring kwallet libressl nonblockdialogs"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.7.1:5
-	>=dev-qt/qtdeclarative-5.7.1:5[widgets]
-	>=dev-qt/qtgui-5.7.1:5
-	>=dev-qt/qtnetwork-5.7.1:5[ssl]
-	>=dev-qt/qtprintsupport-5.7.1:5
-	>=dev-qt/qtsql-5.7.1:5[sqlite]
-	>=dev-qt/qtwebchannel-5.7.1:5
-	>=dev-qt/qtwebengine-5.7.1:5[widgets]
-	>=dev-qt/qtwidgets-5.7.1:5
-	>=dev-qt/qtx11extras-5.7.1:5
-	x11-libs/libxcb:=
-	dbus? ( >=dev-qt/qtdbus-5.7.1:5 )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	kwallet? ( kde-frameworks/kwallet:5 )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-5.7.1:5
-	>=dev-qt/qtconcurrent-5.7.1:5
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS BUILDING.md CHANGELOG FAQ README.md )
-
-PATCHES=( "${FILESDIR}/${P}-openssl-1.1.0.patch" )
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_prepare() {
-	# get extra plugins into qupzilla build tree
-	mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_HASH}/plugins/* "${S}"/src/plugins/ || die
-
-	rm_loc() {
-		# remove localizations the user has not specified
-		sed -i -e "/${1}.ts/d" translations/translations.pri || die
-		rm translations/${1}.ts || die
-	}
-
-	# remove outdated prebuilt localizations
-	rm -rf bin/locale || die
-
-	# remove empty locale
-	rm translations/empty.ts || die
-
-	l10n_find_plocales_changes translations '' .ts
-	l10n_for_each_disabled_locale_do rm_loc
-
-	default
-}
-
-src_configure() {
-	# see BUILDING document for explanation of options
-	export \
-		QUPZILLA_PREFIX="${EPREFIX}/usr" \
-		USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		DEBUG_BUILD=$(usex debug true '') \
-		DISABLE_DBUS=$(usex dbus '' true) \
-		GNOME_INTEGRATION=$(usex gnome-keyring true '') \
-		KDE_INTEGRATION=$(usex kwallet true '') \
-		NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs true '')
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 6d6ac6ef6da9..c7e7c90aa527 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -4,24 +4,6 @@ DIST chatzilla-SEA2_48_RELBRANCH.tar.bz2 440336 BLAKE2B 3fe09e3d2ba698d95054cbb6
 DIST dom-inspector-DOMI_2_0_17.tar.bz2 155095 BLAKE2B e67e90a09db4c5acd4f58d004992094bec38145d48f8aa4abf1b39289222aa9be0498ebc45f01c7e94e90936ffe8b0cb415e3fb42d09b4bb8855317b1b9b4522 SHA512 0b9915566270d1d6670075263fffb0c59f834c4bfae933e6da23747914f069918f6f3dcf1ab3de6ea3b456623ef6e008f2d2aadcad0da84e483cae02e11f0b9b
 DIST firefox-52.4-patches-02.tar.xz 14412 BLAKE2B 9c15aa293dfc36efe1236d9b5736012a3efd0480f0d8eb243687b50245ccdb6e0ed13e564271569211eb767bd01ba3c7688c350005ce862403335dcc2e87bca7 SHA512 6befeaefc118bc161ad05eed619142814e5cf31aaeede3fb5618b1f5ace887e9e1fa6914320b513404380a426cfb0f45107435f92b2d7e95d95cd7c44e03ad96
 DIST seamonkey-2.46-patches-01.tar.xz 768 BLAKE2B e886f8c43cd856bb7cc4ea2a03c2a364bde1faef5c77156456d161c87867c52e0fb9bd348cc92330a22cff8ae0ebbab997b3d3985bb40c6c0883da4a35789f9c SHA512 2bbf09c8285f9f1ef5e194da7c43a8d1bbd4f2366ba182c78a7be4f0c36f549eb8cfee5e42d2eea87ea5d6920b36196e901b31ddca94e792aa2d3fb28de097ad
-DIST seamonkey-2.49.5.0-cs.xpi 941974 BLAKE2B 4de71b190c63e4284b5915ab3f9f9672026fd2375996df26064598a6e1859f3e9b56c668c63a4741c37471c23dadb6eefc018a1715d7afa3e5ced8477a16eb50 SHA512 c3b061e0b735c6949a0ce7f8be22c7818e6bd039de5284015b0ff63b8456f18bd51db9f3a3d1f9a5df2a6d0610043ea9e33f16ccd3ba64e20ac53e901196afd3
-DIST seamonkey-2.49.5.0-de.xpi 949902 BLAKE2B a51a5ccf0a86708b26c9394cc88d3a05f6108760933b5ccca92d54390090f379ab34b4d90796e77764bcba1fbb20a8ffe56f7cf5ba7aeefc80e0e01d3f5cc86b SHA512 fb85fa867b5b9417190aa25cc678d68e3afed04bfe052896167aaf46042397da6e1bbeb70acc321f46bd0bed4f0856152d80a348b478a336d28825c4120af1c6
-DIST seamonkey-2.49.5.0-en-GB.xpi 911789 BLAKE2B 495cd6fcb8cde5dcbab636bad20e1da5f89dcfb3bbafea12fec1c2fc68bdf9145d533828163884dd25988f792839739a3374a233567820cdf97fb49c44d7228c SHA512 973fc7f693abe9b87bd971f79e050bd4bd9a16e4e6f6a50d9298f2c71d45aa328c4279055382b7f9bf8c807dff9c1ab8855d97dbbe3eb4d71c40ee5e3a02f3b6
-DIST seamonkey-2.49.5.0-es-AR.xpi 952759 BLAKE2B fb882c78290507b7bd349ab01545c7263b983b156c26938fa77565658b55d567d3f057b177b2e98be0d83e5bfb21c3b9bf39f31ecbc4b406739afa6f3af5e5ec SHA512 ec198ed919079e16bf638be032cc7de165d0e9d05d0742a12828b5ad510884d4dd0da57c0cbae85b3fe0089a1be26f42c9887957ab6ecac8b8ef6cf0fbbcb345
-DIST seamonkey-2.49.5.0-es-ES.xpi 897737 BLAKE2B 6ddefeeff9b9d1c96b4dc8d068a179d92a353470329571e8b84962f3c667bdb06cd4f9851a64868958e99412d7eb7f3a3910edf48c4a73c86474283a8268c504 SHA512 e9fb5834f3086ee1cf99404930149f06ee7f3f0d5796550c3368b915ed9f729dbd92032682c6273b687b6f3077a4ca3a78192e101f1276d90ebf2eb71f39f22e
-DIST seamonkey-2.49.5.0-fr.xpi 969290 BLAKE2B ec7bbac2dda87d64486e36a18b18ab89c5940df2134704c5fa5af892c0b9669ff2cea81fb34355d383b6207c0993504afe052c5c435a4a402862a5c814debfe7 SHA512 188f4a8c79b10f95c807a08837290fbc3245c983e6797b8f8a0beea4f4ffad915abeb942920f9986910a0530218f4e35ba16de60b4f21d33116ae16756eb4e8c
-DIST seamonkey-2.49.5.0-hu.xpi 955174 BLAKE2B 60784e962a43bf01630f76693b17954d4788daebb54d29f95ff5f3650ecd78b7067f1af20421d104feffaed10d08dfe1b25f8551969678bd4e1fe9b414a7edcf SHA512 e28beb23242a6535230df4fd1adb82e8957487179402cb82dedc2faa6464b411d22ddb2732e0490a916597301eebf2fda727bcadb34e029bd468bd066dbc3080
-DIST seamonkey-2.49.5.0-it.xpi 793590 BLAKE2B 4c7e837b93a090b3f0934a37bb1c63534dce632839677b0127055502cb7dc57f210c1390afa663ca9c2f4f01196756579750d94b8815de12fc6b2bd9c12a6a19 SHA512 c750a85b74bb37d966f1bbecdafcd6ad9d4532eaf0f49f9148081f821c61aec332646eb7c43f0eef4b736362a8c2ab0a1205a38537129f6fe920dc8ae0f16ca9
-DIST seamonkey-2.49.5.0-ja.xpi 1033801 BLAKE2B 0fb8ebcde8c64f60872d3ed4acd17249c852fb43863e5649cf778dfffde13cdee5ed63af4d66647d4c57a9d456a769b2b43f28cf9637b8b71ffb053dc0f46bee SHA512 454756af04d5d3301c3ffe321109e1c78aa69a3b9e4a29e1b1e7226b958062e451551d73c3df87785fd80e74a4e433fc2094e3702ceb1a547abb858551878056
-DIST seamonkey-2.49.5.0-lt.xpi 956024 BLAKE2B 75ffe875f683e8e47e703574e4a3b73cb2bb764e8163f833208e06b914709acf772734848a2164b94f138dae021c4915e8b20f417132c84197042215548b5b25 SHA512 14124e0b9b60f360f6f2b77b5bafe80569894754a3ffd27b6a3aab34136d7876d785b5e9178cb1d34ec46a7b858f26327658e1a3e43ac97abe272838dde78228
-DIST seamonkey-2.49.5.0-nl.xpi 957391 BLAKE2B 859a5cce26654b3f67d4a340d40b96d66199461250342a699f3186f97edad0347174e87a68a6be21bd6c2ff91497195be98bfb717679d76aa9be2590b809ee9c SHA512 0f3e68df37e211b73773e1b84d39d4540d1d8865cc534bad841babc30c074bb9301cc472aa0e4e61e09bc26948270e1106e1546d27705380819d830ca158215d
-DIST seamonkey-2.49.5.0-pl.xpi 913004 BLAKE2B 8fa4e937c41b6585075f920a778c13d08fcbb6a5759d5371a05d278b5646963d4b8a066aedd60e7521caf354d4ed57e14864d6cb802900284a8be05553ea0e38 SHA512 532b64032b6e4cb902cd9d99ef5505f3ac57964452196f3a9f49eff1bd965c5a8a8271960951482266f12214cce4cad876268f9f38a193f5d91c2644fef0aff8
-DIST seamonkey-2.49.5.0-pt-PT.xpi 939012 BLAKE2B 16bcdbd9c04f023dba7de4e5caaa16f2bbd0bda45625008b909fa360eb98409b21081b892d9e3dcc4fbc5a3ffb1bafc630f2266f69149c70ad96a81025aa7e01 SHA512 f8cac43e61de1d4dfbc0febddcadfa10cc457e7552016c79ff954cddef900470e60912c607076976b15811944a07cd785fbd2ffd85a5af3ce545ec98c12bdc05
-DIST seamonkey-2.49.5.0-ru.xpi 995907 BLAKE2B ce02fd35e093b3f5c2fed309a2fae066e48c7b3351075d55b72751d66b6e13fb13758b8ef4ffa351e85907152ac78a0fb4ced99e2af2993f5906440ba69b0051 SHA512 846f7f361a15ea1b04539ec789dffb459e1fbd85283c720883d6545da67a979e040c80b5cb6a0938f0ca9e059e837310cf3fb2d97671e37ff256ad2ac780291c
-DIST seamonkey-2.49.5.0-sk.xpi 967988 BLAKE2B fd7db86b778be8b1202c031ccb6b18805fc9027f50dd513e3ca0ef2afa1208f5df0b7636c0b6f822fda9618ebe48dc1b16710888284c2d5681e00e4be26c03cf SHA512 8fb02cb8f95c68ce40aabaf79c57bd7c655092dd5fb939d68a62a1bec707b903fbcf16299ff8dd094e161b5f4c732a813d63e33b3ff3ac09f9e1afcf740426d9
-DIST seamonkey-2.49.5.0-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1297105332db66fa5e0c841f19aca4e3274822f43f49b925eba7e86bb8682963424369bb4ce8b089df32d8fc7fbd294e2d SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf
-DIST seamonkey-2.49.5.0-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
-DIST seamonkey-2.49.5.0-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
 DIST seamonkey-2.49.7.0-cs.xpi 941974 BLAKE2B 4de71b190c63e4284b5915ab3f9f9672026fd2375996df26064598a6e1859f3e9b56c668c63a4741c37471c23dadb6eefc018a1715d7afa3e5ced8477a16eb50 SHA512 c3b061e0b735c6949a0ce7f8be22c7818e6bd039de5284015b0ff63b8456f18bd51db9f3a3d1f9a5df2a6d0610043ea9e33f16ccd3ba64e20ac53e901196afd3
 DIST seamonkey-2.49.7.0-de.xpi 949902 BLAKE2B a51a5ccf0a86708b26c9394cc88d3a05f6108760933b5ccca92d54390090f379ab34b4d90796e77764bcba1fbb20a8ffe56f7cf5ba7aeefc80e0e01d3f5cc86b SHA512 fb85fa867b5b9417190aa25cc678d68e3afed04bfe052896167aaf46042397da6e1bbeb70acc321f46bd0bed4f0856152d80a348b478a336d28825c4120af1c6
 DIST seamonkey-2.49.7.0-en-GB.xpi 911789 BLAKE2B 495cd6fcb8cde5dcbab636bad20e1da5f89dcfb3bbafea12fec1c2fc68bdf9145d533828163884dd25988f792839739a3374a233567820cdf97fb49c44d7228c SHA512 973fc7f693abe9b87bd971f79e050bd4bd9a16e4e6f6a50d9298f2c71d45aa328c4279055382b7f9bf8c807dff9c1ab8855d97dbbe3eb4d71c40ee5e3a02f3b6
@@ -40,8 +22,6 @@ DIST seamonkey-2.49.7.0-sk.xpi 967988 BLAKE2B fd7db86b778be8b1202c031ccb6b18805f
 DIST seamonkey-2.49.7.0-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1297105332db66fa5e0c841f19aca4e3274822f43f49b925eba7e86bb8682963424369bb4ce8b089df32d8fc7fbd294e2d SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf
 DIST seamonkey-2.49.7.0-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
 DIST seamonkey-2.49.7.0-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
-DIST thunderbird-52.5.0.source.tar.xz 230282080 BLAKE2B d55dc086c23813cc116277d532e3f3f99711d7f00be1e09c22d76f021b074d63b1abc8f3814906d73060481857328f0391140484eb1b4c413e8c91fb70003063 SHA512 b9b599e5853887bd518e5a57f6fd04751bb78f553f97b260cd9ba7268c4cff307be40b81b00f1320f5a5156e5c67115595b2d389f931c265d0c3448f56fb8319
 DIST thunderbird-52.7.0.source.tar.xz 230410444 BLAKE2B 4c7d10a16f78c2ea791d72f3f99b25556ccfce9448d7b1235403738722aee1c8ad9aa08a21bce3c5a82389d9b4d96ada104950b0168424308f07fa6a939c190b SHA512 875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21
-EBUILD seamonkey-2.49.5.0_p0.ebuild 12777 BLAKE2B acd8d141bde54ef97de914b4e93dc21f778ffd52fee6b3ce7cb10572f43b81893b234246c9daad8345b6fc2c5e59ea27d83abe3a9156098387210eacd5795589 SHA512 d26f680fa5924307f473aa5f1955cc62e19badd328ae4f9d3909de74eae1217596445856bfe2775f37090550dbfd05812df75b28e5faf40677b0bd3e2a588661
-EBUILD seamonkey-2.49.7.0_p0.ebuild 12779 BLAKE2B e13faf9db3c33f0976c38ee690517ed81367a713353ffdf0c6c1a5b0e5a1e9088b37f75b4118984ddd037e3d733934bbc41548872a04ccf3ed8c4dcf64de691c SHA512 3a557932975c1bb0944b0d9a7a696f83c7ea62dfc089b4293dfcbd584b4fc13d8ab227ae309275df986a2f96a4a3f4a9840248ee01ad474922a6efbfe0adf4d8
+EBUILD seamonkey-2.49.7.0_p0.ebuild 12777 BLAKE2B acd8d141bde54ef97de914b4e93dc21f778ffd52fee6b3ce7cb10572f43b81893b234246c9daad8345b6fc2c5e59ea27d83abe3a9156098387210eacd5795589 SHA512 d26f680fa5924307f473aa5f1955cc62e19badd328ae4f9d3909de74eae1217596445856bfe2775f37090550dbfd05812df75b28e5faf40677b0bd3e2a588661
 MISC metadata.xml 1882 BLAKE2B e72fa92838230026eaab872a858ba54ccecf47055bff324215219f785e3143daa13984d1f8b2bc746d8a0cc1a07c74a0ee2067f029b92df098431a43588a27a3 SHA512 d533b6033b37fe1410722b2f005a147e1508a2e9a390176a199b15a6464ff5b354ba5ee2542ea243c33b4d4d1e1f91b6e331f9bf43f13b0ef1ceb973e8e9e117
diff --git a/www-client/seamonkey/seamonkey-2.49.5.0_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.5.0_p0.ebuild
deleted file mode 100644
index b416d59f01f4..000000000000
--- a/www-client/seamonkey/seamonkey-2.49.5.0_p0.ebuild
+++ /dev/null
@@ -1,403 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-# note - could not roll langpacks for: ca fi
-#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
-#	    ru sk sv-SE tr uk zh-CN zh-TW)
-MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
-	    ru sk sv-SE zh-CN zh-TW)
-
-MOZ_PV="${PV/_pre*}"
-MOZ_PV="${MOZ_PV/_alpha/a}"
-MOZ_PV="${MOZ_PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-MOZ_PV="${MOZ_PV/_p[0-9]}"
-MOZ_P="${P}"
-MY_MOZ_P="${PN}-${MOZ_PV}"
-
-if [[ ${PV} == *_pre* ]] ; then
-# the following are for upstream build candidates
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
-	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	SRC_URI+=" ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz"
-	S="${WORKDIR}/${MY_MOZ_P}"
-	# And the langpack stuff stays at eclass defaults
-# the following is for self-rolled releases
-	#MOZ_HTTP_URI="https://dev.gentoo.org/~axs/distfiles"
-	#MOZ_LANGPACK_PREFIX="${MY_MOZ_P}."
-	#MOZ_LANGPACK_SUFFIX=".langpack.xpi"
-	#SRC_URI="${SRC_URI}
-	#${MOZ_HTTP_URI}/${P}.source.tar.xz
-	#"
-elif [[ ${PV} == *_p[0-9] ]]; then
-	# gentoo-unofficial release using thunderbird distfiles to build seamonkey instead
-	TB_MAJOR=52
-	SMPV="${PV%.[0-9].*}"
-	MOZ_P="${PN}-${MOZ_PV}"
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/thunderbird/releases/${MOZ_PV/${SMPV}/${TB_MAJOR}}"
-	#MOZ_GENERATE_LANGPACKS=1
-	#https://dev.gentoo.org/~axs/distfiles/${PN}-${SMPV}-l10n-sources-20170727.tar.xz
-	MOZ_LANGPACK_PREFIX="../../../seamonkey/releases/2.49.1/linux-i686/xpi/"
-	MOZ_LANGPACK_SUFFIX=".xpi"
-	S="${WORKDIR}/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}"
-	CHATZILLA_VER="SEA2_48_RELBRANCH"
-	INSPECTOR_VER="DOMI_2_0_17"
-	SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/source/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}.source.tar.xz
-	https://hg.mozilla.org/chatzilla/archive/${CHATZILLA_VER}.tar.bz2 -> chatzilla-${CHATZILLA_VER}.tar.bz2
-	https://hg.mozilla.org/dom-inspector/archive/${INSPECTOR_VER}.tar.bz2 -> dom-inspector-${INSPECTOR_VER}.tar.bz2
-	"
-else
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
-	MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
-	MOZ_LANGPACK_SUFFIX=".langpack.xpi"
-	S="${WORKDIR}/${PN}-${MOZ_PV}"
-	SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
-	"
-fi
-
-MOZCONFIG_OPTIONAL_GTK3=1
-MOZCONFIG_OPTIONAL_WIFI=1
-inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.52 pax-utils xdg-utils autotools mozextension nsplugins mozlinguas-v2
-
-PATCHFF="firefox-52.4-patches-02"
-PATCH="${PN}-2.46-patches-01"
-
-DESCRIPTION="Seamonkey Web Browser"
-HOMEPAGE="http://www.seamonkey-project.org"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test"
-
-SRC_URI+="
-	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
-	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCHFF}.tar.xz
-	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
-"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND="
-	>=dev-libs/nss-3.28.3
-	>=dev-libs/nspr-4.13.1
-	jack? ( virtual/jack )
-	crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 )
-"
-
-DEPEND="
-	${RDEPEND}
-	!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )
-"
-
-BUILD_OBJ_DIR="${S}/seamonk"
-
-# 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
-
-pkg_setup() {
-	if [[ ${PV} == *_pre* ]] ; then
-		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
-
-	moz_pkgsetup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-
-	if [[ -n $TB_MAJOR ]]; then
-		# move the irc and inspector code into the correct locations
-		# when we are building from a thunderbird tarball
-		mv "${WORKDIR}"/chatzilla-${CHATZILLA_VER} \
-			"${S}"/mozilla/extensions/irc || die
-		mv "${WORKDIR}"/dom-inspector-${INSPECTOR_VER} \
-			"${S}"/mozilla/extensions/inspector || die
-	fi
-}
-
-src_prepare() {
-	# Apply our patches
-	eapply "${WORKDIR}"/seamonkey
-
-	# browser patches go here
-	pushd "${S}"/mozilla &>/dev/null || die
-	rm -f "${WORKDIR}"/firefox/1000_gentoo_install_dir.patch
-	eapply "${WORKDIR}"/firefox
-	popd &>/dev/null || die
-
-	if grep -q '^sdkdir.*$(MOZ_APP_NAME)-devel' mozilla/config/baseconfig.mk ; then
-		sed '/^sdkdir/s@-devel@@' \
-			-i mozilla/config/baseconfig.mk || die
-	else
-		einfo "baseconfig.mk hackery no longer needed."
-	fi
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	# force a version update that matches the minor and patch version of thunderbird
-	if [[ -n ${TB_MAJOR} ]]; then
-		echo ${MOZ_PV} >"${S}"/suite/config/version.txt
-	fi
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	local ms="${S}/mozilla"
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/suite/installer/Makefile.in || die
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
-	# (this is hard-coded in the build system at present rather than being based on configuration)
-	use chatzilla || sed '/extensions\/irc\/locales libs-/s@^@#@' \
-		-i "${S}"/suite/locales/Makefile.in || die
-
-	eautoreconf old-configure.in
-	cd "${S}"/mozilla || die
-	eautoconf old-configure.in
-	cd "${S}"/mozilla/js/src || die
-	eautoconf old-configure.in
-	cd "${S}"/mozilla/memory/jemalloc/src || die
-	WANT_AUTOCONF= eautoconf
-}
-
-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.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	if ! use chatzilla ; then
-		MEXTENSIONS+=",-irc"
-	fi
-	if ! use roaming ; then
-		MEXTENSIONS+=",-sroaming"
-	fi
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# Other sm-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --enable-safe-browsing
-	mozconfig_use_enable calendar
-
-	mozlinguas_mozconfig
-
-	# 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
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# Work around breakage in makeopts with --no-print-directory
-	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
-
-	if [[ $(gcc-major-version) -lt 4 ]] ; then
-		append-cxxflags -fno-stack-protector
-	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
-		if use amd64 || use x86 ; then
-			append-flags -mno-avx
-		fi
-	fi
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake V=1 -f client.mk configure
-}
-
-src_compile() {
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
-	emake V=1 -f client.mk
-
-	mozlinguas_src_compile
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
-	local emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
-
-	# Copy our preference before omnijar is created.
-	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	echo 'pref("extensions.autoDisableScopes", 3);' >> \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	local plugin
-	if ! use gmp-autoupdate ; then
-		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-				|| dir
-		done
-	fi
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake DESTDIR="${D}" install
-	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
-
-	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
-		-i "${T}"/${PN}.desktop || die
-	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
-		|| die
-
-	# Install language packs
-	mozlinguas_src_install
-
-	# Add StartupNotify=true bug 290401
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
-	fi
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
-	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}
-
-	if use minimal ; then
-		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
-	fi
-
-	if use chatzilla ; then
-		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}/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
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla
-
-		# install the merged extension
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla/* || die
-		insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# Handle plugins dir through nsplugins.eclass
-	share_plugins_dir
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
-	doins "${T}"/11${PN}
-}
-
-pkg_preinst() {
-	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
-
-	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
-		rm ${MOZILLA_FIVE_HOME}/plugins -rf
-	fi
-}
-
-pkg_postinst() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-	#gnome2_icon_cache_update
-
-	if ! use gmp-autoupdate ; then
-		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
-	fi
-
-	if use chatzilla ; then
-		elog "chatzilla is now an extension which can be en-/disabled and configured via"
-		elog "the Add-on manager."
-	fi
-}
diff --git a/www-client/seamonkey/seamonkey-2.49.7.0_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.7.0_p0.ebuild
index fdac7c1d5486..b416d59f01f4 100644
--- a/www-client/seamonkey/seamonkey-2.49.7.0_p0.ebuild
+++ b/www-client/seamonkey/seamonkey-2.49.7.0_p0.ebuild
@@ -70,7 +70,7 @@ PATCH="${PN}-2.46-patches-01"
 
 DESCRIPTION="Seamonkey Web Browser"
 HOMEPAGE="http://www.seamonkey-project.org"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"