www-client/seamonkey: Fix build with libevent-2.1

Package-Manager: Portage-2.3.3, Repoman-2.3.1
johu · Feb 6, 2017 · 481b1a8 · 481b1a8
1 parent e99a318
commit 481b1a8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/eclass/mozconfig-v6.49.eclass b/eclass/mozconfig-v6.49.eclass
@@ -121,7 +121,7 @@ RDEPEND=">=app-text/hunspell-1.2:=
 	system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 )
 	system-icu? ( >=dev-libs/icu-56.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( =dev-libs/libevent-2.0*:0= )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
 	system-sqlite? ( >=dev-db/sqlite-3.13.0:3[secure-delete,debug=] )
 	system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
 	system-harfbuzz? ( >=media-libs/harfbuzz-1.2.6:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 )

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
@@ -1,5 +1,5 @@
 DIST enigmail-1.9.6.1.tar.gz 1745021 SHA256 3874331e981aed864443d3c965d856e003fd84f73e5a89fd5004ced9dc29b96f SHA512 e6ab69734a39a4953e0167e07b06f0d5c83fb42956515392319a1cd9d665ca274f6a12b4141e2dfa373ef074f0526f3d7330a48d29d600fc38f724d26518ff84 WHIRLPOOL e89b0e5857564cc2f7ebf3ab46b110c6bbb1b16e7c0e045750119fd02e693b9bd9667c2932e7a65f9c8fb2c7c835ed048f6df2613d12b25d961894f47f67cf48
-DIST firefox-49.0-patches-03.tar.xz 12260 SHA256 05e01e0e52ed0d9930f9655f94023d76ef50fe1b80e5771030d08e515693adc5 SHA512 246fcbc54424024c0ddb0c2997b3734d2dc42dc768e9ce961bb5fdbc080cb87939de7f305176421cb10b8f49e37f6f256390655df3f17a4b263390a4d2a2b18e WHIRLPOOL b685e084e6e0db0ac7be8226e6ad18bc781be3bfe3c726bec65fd727e02cbfda844f15648094553a257eb067e4cb1c70b3ae7cfe0958ae4ef4a3178e979b1347
+DIST firefox-49.0-patches-04.tar.xz 13356 SHA256 4968b4c6a0e326de587af6d389826dd29acd8b8eafc605f7636c637db0a64158 SHA512 3346cbe0146d6b480336c250c34c5be0a37cf9c7222238366794b4a03fb9c636ea22294cb517fc59826a0793a4a5723ff2f4cf85384fc405f1c1f14080458282 WHIRLPOOL b0bbf5f307f3d8467e40d76f58e28e0bbf9bed5398e3f17309b7bbdc310350d1d57b02596471b682b997d77bf89bcc3d748af5e0ff19e81a98ab33dcdf4f5210
 DIST seamonkey-2.46-be.xpi 936650 SHA256 d97376ff92ffcdf04ec08273b60b8750d2c4f65edd71eed734313f72885f45db SHA512 a48caf48c0f705e991c31f6f0191662c99bcf022e9bec59b6caeaf03cec384f5b45c6a03af1103d0889fed2d19e57ff5c61fc67faad9cc1786993d0e9368a954 WHIRLPOOL 5cd5a26c3c7bfc02add5063a18f806ebaf58bde1d621bc3d7185edef776254674aba7c4925ab248158c21c5a90b19d156973f8b4a4ace821df60c9586617f3eb
 DIST seamonkey-2.46-ca.xpi 937577 SHA256 11adc88aab13826dbb7dd9374f877b80c87a085d75712c976173f243950292a6 SHA512 cf0d7c4829cae2baa064f8a68bfd827c6d596b9036d50e51f50a7d85faa7b1bd067c7dd84f7062affab6c1282186591c54f1cce60457e76924ae328eabca6505 WHIRLPOOL 80daf65a5d75038683f5a8c18f23c79d4f67c9daa7e7090aba8a9d7e610104dae890f45aa81a49a175542fd9c6fe08422f916e7d7d0854d12db7b346f0473be3
 DIST seamonkey-2.46-cs.xpi 936101 SHA256 4fae0f46a8ba83a72e6c7a50b7ba73153f153055b874fa3e857ebf6867a48ff3 SHA512 faa70bfbd6b8ecf3bf31ae7da164922ed4618558c62d8263b5655d285c932f0b3fd2e501397845276c4a2d0e519fcfd6d20bf7f0af5323cf5b1c1de94385766e WHIRLPOOL 4dba7015f5702871bf96b55def971c34c02212279c3f4fc1b75336547f11b03ee9c3d837472ddfbff77878cd96dafb43cafd406c4d9a4492ad4a68c3035e78bf
@@ -16,7 +16,7 @@ DIST seamonkey-2.46-ja.xpi 1000175 SHA256 b3f8a0e23cbd3e235d33d1fb083ff6b5b4d0ab
 DIST seamonkey-2.46-lt.xpi 951611 SHA256 32ca1b4668234c96c161512e6e7a444d864229d86efdc89caafff5e1d882bd0d SHA512 dbb61a46407695d1644923ea822a4b32b05ea0e6657b9ad0c75bab97920fd33dd5ec8b3e5f8eeba3c5f2d34219e374bb66ea5bac82f6cf6226b6061f21b205b5 WHIRLPOOL 520eb0f92e8a828946f3e8ff4425b48eb475114d800a64aee4ce2e7c41698d7c52939b917f73bedad0ae57a2f14f31fbd82df3840a6ae29e294c1f5439a6dd60
 DIST seamonkey-2.46-nb-NO.xpi 921937 SHA256 20b93b1f9475fc97a9f86f48d2bbcdeca43015c2cfe62a5a7b4d204dee1d7e0f SHA512 d808ae3cc7d391611d78154f82c57fd92705481ec5ebafea9aa8bb9fce44302a3f5912ae5d9f0997f84eb7ef08faae666a0f4b14e57dca4b97bc458f8dd72ddb WHIRLPOOL 754ee843e0be9a118b7167858bc70e287059c5f7165f89f671f84c93e0090d750f2238eebbd97281d5f73801d3d844404f7d2acc5b6d5f2d5514b17e56381247
 DIST seamonkey-2.46-nl.xpi 926891 SHA256 eb9e84781c9c70411ccc199b8ccd6bf96729763ac09210d67d2dbe9178f9b8c4 SHA512 179280b6a549f6946eee21a58bca066a3181e6311328037fcec70d51bb0a191b3b1aaad118fb3c247c24f766c211e4470370535d2e4060a67dafbca1fe97f525 WHIRLPOOL c8cb41e47d33b9d676778120b7d3bf9c7256663607485eca8cdaaf29f96ab52473db82a33a529db19a978fbc8bb96c8d1c102613045a28ba22fc18e9df06227e
-DIST seamonkey-2.46-patches-01.tar.xz 768 SHA256 461e59a07ddf1d58a835a2b831054f477d24582e73bcbabf1693db2b4ac91365 SHA512 2bbf09c8285f9f1ef5e194da7c43a8d1bbd4f2366ba182c78a7be4f0c36f549eb8cfee5e42d2eea87ea5d6920b36196e901b31ddca94e792aa2d3fb28de097ad WHIRLPOOL 8d5f95f9ea391863b1dadd335efbc3f589d911133b6355c94e481876f3ddc85d3e60f2973024107c70ec806eb8187825fb8d105af8b95d08c52fad34f08aa3a8
+DIST seamonkey-2.46-patches-02.tar.xz 1352 SHA256 43633aaf982805a0ffd4adfe7a560073e108949c2b13dd00c58fa3e7b0b19da4 SHA512 d92f3df10a92581da345f440d338befe96e1b3c26da419f846b5b6c2903ddd494e48b37beec7eb854d3a863dd08fbe3f157f670e33dbeecefda4b7bf2bf9708b WHIRLPOOL 47bd1f90716bd10481992c156b52f3d068e584905a466c33c20b402d2019061778e15bb38ee4984ca9e084eb2a329ccb93bf08fd879963162d4f4650cae3ec80
 DIST seamonkey-2.46-pl.xpi 918214 SHA256 47a18be4d673bc8ef172b358512390d5bcfc6f81d1c2d327669aa135b2aec482 SHA512 fbb65a47f2e790e5ef3d7aa0134d25cd8a21b7ef3d4216b63c84ff9cf0c6e31b5611f56d88cff752317a337d497e96712ef533badfe87b0f8d9bde388a95d47a WHIRLPOOL 41c0aa607450284a374aaaf536547cde34eca48a1735d9ad90bfaecb9ac2bef7e808136d73d3c573986f10276fcba660160b404abd4b066f773cd01d3f7ca8ab
 DIST seamonkey-2.46-pt-PT.xpi 934340 SHA256 0ba281071038143950c64a03edaab7a37a4d284ed1583b50633ab58e393c7743 SHA512 99eae434fa4648e619c748a0b8ac2dbde07cdd6908a3720d764bb072e8788e28ec2e26690742730a1743819e90685da67f995c7aab80ec4fad8214891195250e WHIRLPOOL 0fb116985deb60de4c1dc6f916926b39a1d2c2a6da3330adc20a13e5c066120407e9c1def9d888cf68fdcd54876f4c8fd6754c656bebc534dcff0955ea5d76b0
 DIST seamonkey-2.46-ru.xpi 960162 SHA256 fd50c7fd8f291530f68af88424dffd15e59340cb854a1edc915d2d5dc548ec78 SHA512 d86e695835102c84716fec3ea2e4a411bb73d9ecd00bf0f6361f0095e2994a5392d89d79603345548cca33efec6c364931a9918a32692d09f126ebf6bf7db429 WHIRLPOOL 259ffe11d24fdc93bca404d2db9a0610cff97d95711b0552b5eee239d87a4a5b7eece562049abcf01b93b59963dc4357b417a1e2b971a8319bdc354d11b9fb1a

diff --git a/www-client/seamonkey/seamonkey-2.46-r1.ebuild b/www-client/seamonkey/seamonkey-2.46-r1.ebuild
@@ -61,8 +61,8 @@ MOZCONFIG_OPTIONAL_WIFI=1
 MOZCONFIG_OPTIONAL_JIT="enabled"
 inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.49 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas-v2
 
-PATCHFF="firefox-49.0-patches-03"
-PATCH="${PN}-2.46-patches-01"
+PATCHFF="firefox-49.0-patches-04"
+PATCH="${PN}-2.46-patches-02"
 EMVER="1.9.6.1"
 
 DESCRIPTION="Seamonkey Web Browser"
@@ -135,13 +135,11 @@ src_unpack() {
 src_prepare() {
 	# Apply our patches
 	eapply "${WORKDIR}"/seamonkey
-	eapply "${FILESDIR}"/${PN}-2.46-configure_regexp.patch
 
 	# browser patches go here
 	pushd "${S}"/mozilla &>/dev/null || die
 	rm -f "${WORKDIR}"/firefox/2000-firefox_gentoo_install_dirs.patch
 	eapply "${WORKDIR}"/firefox
-	eapply	"${FILESDIR}"/firefox-52-curve.patch
 	popd &>/dev/null || die
 
 	# Shell scripts sometimes contain DOS line endings; bug 391889