app-editors/xemacs: Use system malloc (bug 609110)

Move to EAPI=5, patch for glibc macro deprecation

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Manifest-Sign-Key: 0x377034660A5828DE!

3 files changed, 84 insertions, 5 deletions

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index ba31b4f22859..bd49e82b84e2 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,6 +1,51 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX README.Gentoo 1426 SHA256 9fa4fa31fc4deb0742dd220c8a1cf41af2bb4f4651e4f995589389afcc9f5f92 SHA512 0576235fb09ea9ad5fbe5b1bbaa41dd37913603ab40773f2c476b72e147eac9b8de62f600717d06d5366184deadb55e0002e79b9987ba215bad5ebee41fdfbb1 WHIRLPOOL a0687729c64ac2323d3b2d3fb8db9a68368553a3188725ade8d2a1d2b5c09ae32e3f8079037edc9c1f1e933894b9d287dd0c24fa8feb5dde953df9490a5403de
+AUX xemacs-21.4.19-db.patch 3157 SHA256 c0c0cf18ccd01ee0e34e913c4f275977f4f61aa7343fef9fdff1f3ba84096022 SHA512 b4987784295c5d2335440dccca4e157d5ccece510d97fc131e33f701fc2dc48bd01080df577c6e588d926703f7b461a347d0d3e3f99931e10cdb8b11592b35be WHIRLPOOL 0ff39c8a7ba863194636a71e55831d145c79c2f45463c21705763618bcf4e2092ee2cef3ae485de8d8eb335dbe66d2d560674cf3028d29b23de1f1c358a0c122
+AUX xemacs-21.4.19-texi.patch 1107 SHA256 9f7af4de522d03c9e78076c4801db775ce919d30b27f4f84c8b055d17f476ae5 SHA512 8b032464dfdeed928c1d4fc566657762fa791e64a3b255a2725edf0d244b76c928c9dcc643584debbaa5b8c1d3c53f635950905ab30900f6d758ed5951d3c219 WHIRLPOOL 6aff14b5206492c5f519bd199927a438ecfc754527196e96f2106eaa2b5e416e09ee3e1313b93a53435249c5a44a626d37c1ab299a66927a9532ee5f04b394ba
+AUX xemacs-21.4.21-vcdiff.patch 476 SHA256 adf0bb95ef289187027203f28fb0055be817c6b54211912bc33c16a9ff9cfb2c SHA512 89d8c8ba5af0467057506b9e2b974fa5d09432e7375dcd0517007ad4d28fee8019895667bc4291fe500b1a039fbeef0b82d2318995ca41ed7045327dff860f85 WHIRLPOOL 0c0343e962bad880f328b292c73240dade407b60dea93c400101f9c3db76d92a0b4cd3a891647df390ba6cace35e1d1050961f576364f5478833d5ec411df4d5
+AUX xemacs-21.4.22-deprecated-ldap.patch 516 SHA256 41100c6c9fc45d90aa4618e9e9897f229854fbea60ba34fb0e6b82e8e8a37a7b SHA512 4761f5759741f733518668fededec21ab2e9ec1cb883a363ca23669e1c82d9d44c03126a758da02c21cad8a810c3f83f0516f2bad4103fbea2cf73b00516b388 WHIRLPOOL ae9da77b267b96e8fc3c87e3498f1bee86fd0a2629be4083da84a3ddf50651c18d32c9e6af552cb3fa569f944b58e559a23c38554e27af4e6cd3b2ae94ad3dfa
+AUX xemacs-21.4.22-large-images.patch 4695 SHA256 bde9b13e2e57f25564d732213fa5cb5f2bef17ce8580f8d18e81975febade3f8 SHA512 b1e03d7824d0fed82eff4fc6e5d6cd7e9f1b94e6eeec5d429b8a66027a9fc95943318c4c010bbb0f57d59b31a90bab94360a41bb0858735da59ffcfb75d59319 WHIRLPOOL 391d95c4fb41fb2a9fe40fb90973a7475fe69079e8199345a0a3029d08d08b6f593452e3ecc44805bd505f8790344be834ddc9fc12d85d587d76716854b7316b
+AUX xemacs-21.4.22-libpng15.patch 2593 SHA256 d2e1b5a1410cd6394f055092db591caba3c615f6bb26d4c8f1ff6507b0d70a69 SHA512 f026634a164e4d34eb10a4fa60da3a86743f9cd8bda8e760a7ad206fa4056a4e4c2236c9e8a4ac92d70883b5838086e48e5d5647979a3692c15da0a765aa2e1e WHIRLPOOL ec21ac2290415f0c6c475e4628be241a0f73301453cbd5e8d82a655882165e9b92b37084216d4f7eabf82676859e6b7c306aff0fccbbe739a5f5d4846b818f13
+AUX xemacs-21.4.22-texinfo-5.patch 12752 SHA256 282a8291a1e9c7436ffbfb86c6b458d5b80ab4154131bf783e4c97aa1685ca12 SHA512 0817a882ca75d99537865a23a4565e9f8b21af75b1cb90f951ee672b0ad6485542d10b28c5c7532267b07e1fae973879e40f174a1dac40ef7dc305f34a575637 WHIRLPOOL e6528655da5439f66e7f43d67cd19ea539af9d7ed87e136e59a54f40e02cf9d458ffb3b05bcc157dff3adfdbe3c6c98b4e3fd6f0ad5d28baa8a4c9b0d242f22a
+AUX xemacs-21.4.24-gcc5.patch 1132 SHA256 5a2ec81e20914af91ade0c80a4683783a46d4dd2ee993eaea2b138287ca15458 SHA512 1b3e56804594b82209ddb6318c2bff13b8e63f189d98e5ff313022eb66267eb45683841599dadd8a4d97e5e221dd85195121246fba5c91eade905e1d7b593749 WHIRLPOOL 05b61799c344e581fd23621ebc10743b9b5652c820c74432d219b4614b7e4fb84de9c344f023ba524dd94539c2559ce237245b23ee80ef585af37a7d06ab1f2e
+AUX xemacs-21.5.29-optimization-bug.patch 371 SHA256 14c5d9ddab865a9e4a1c6d4f64ed44e4b16e0eccb9fdcef94cedfaa30948863c SHA512 a955379e9abe736bdc17eeb9e924b9bf292bf4c9b2f59ca6221a09de8dafa020350ff5466732779bbb01f05152e8a823e333b9c967a6ec2fb5c1f2c9d7f694da WHIRLPOOL 9405db9d2dc618310f30e6a257a95667dfb94782db0f7ec3f5a7c702a210e9293bbe04cec5b8a1c59ec94a35b4960b1a03fbf3ce0892e29c3657fa93bbf97150
+AUX xemacs-21.5.33-no-mule-build.patch 1393 SHA256 805014085e7faeacd98d7bb2a3a57e49cf6a6f991db26dfa28230373044f2809 SHA512 2afac7a199455ad0ace5a63f6a1e2b73d8f2a8da3eb93b59975b2d654ae85acd24d206ba0d9cfe08e35fb1fdea757fc6cd3588f4b97b75991eb946885eab85b4 WHIRLPOOL 6d1e2d2df7059d0b8477eadccfeb8873a8dde3a129bc06ffdca4e86950c1df924070212198dcb309f00287f0a4525e230b6df1827c209bb058ae3f6d6feffa11
+AUX xemacs-21.5.34-gcc5.patch 1194 SHA256 e72a849fdcf4f4bc2ec4b5ef66e066a4498fd9b6ea17b71d52395c35097b9bcb SHA512 276f3e10334c3809f625e69ea0d56585fd429e9aced65331bd1ca0ced467bcf526cee43925b4c4dc381723883348877782e1c234db00e60c3d74a78021a2330b WHIRLPOOL 12c8179bbbcf9ef51eada3955444d4013fc85febb3cc51eb48ac69c81250412f0a497e9fdfd72f34a2ec358bd5ee16a687e42614531f389473f1ef39e185fb4b
+AUX xemacs-21.5.34-glibc-macro.patch 1369 SHA256 20c320e475d35b89f966b555ecba0dcd3cbbb8abe7e49939e8d4f309c4fe09c6 SHA512 6397267d99649f62a20a0a1f2bc380360ed7689691adde515421286b3bcad55dbb0cea246427e03f904fd829624060ad7ae66a67c63f16f3b3c1f88803022176 WHIRLPOOL bca96f308eba1e9c3b4be169d2cb83f2ecb98a2c89a88f4780399983a9c931f9241a7ac1f09d425f24bc327b7395e87f8a577a61ec13af210c5c20a3685de85c
+AUX xemacs-21.5.34-ncurses-tinfo.patch 699 SHA256 ded43ce90666103396d63e7a3180f9f65cfff81352db16bee5d304982c6ec3ef SHA512 814b01388e7eb5963307dd5cd136725dd6d0d206b1a4e8ffc2ca8dabdd0070a58122fb4faa943efead1fe70f6309819177870630e05e5c02b51dc5e2aa0bd765 WHIRLPOOL 57f3dac98434869bf694992e32e00802237cdd89452fa2e3cd55b004767d19f0b43bab563321e2dfa94eb292c664d5a8f41f8ebcb32b5fd9e7e1d0324d3ef0ff
+AUX xemacs.desktop 1061 SHA256 0f73f0492c8f647892ff94c76d7fe99bb8271ca79573093061870a60f35eaf5e SHA512 6542fc7777af888ae711d386918e712e1d106635f70e65af77d1e809156baba9831fc4c8bd2cb7e7c6f9ab0ab18ddfb92709ac2909aa613471101454599bdb69 WHIRLPOOL 1124a7f80ce877110e8ddd27f36c656952d81408230ad05de0458a80d00aa51cc0e0704d5b98829c99d1e92206e9fa619274c9a50bb890325e1186583b514782
 DIST NeXT_XEmacs.tar.gz 39571 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566 WHIRLPOOL d47aafa6fe7a11de94196dffb752c683722b8ead23979a7f4344c61964ebcd052a4f0ad6b9ab42a5d41f5551c0a543f46af59656fc8a79340257626272c1faae
 DIST xemacs-21.4.22.tar.gz 8357931 SHA256 87fb7633106625935105e821eb8fe65e521a3de44d45fe864109779c3a8e4bd1 SHA512 7ddd91f8d1a1b9f6d984a5bfddd98705dd6f7e3d6b4f81c1e03d971c93e33bff09b641bc2ad0a0d9d2e44170063550ad0399f3e28237dd34b8ad6200d8b197e8 WHIRLPOOL f1d313aa2dee7f4238190b90c10dc951a31302563a8a098e69ed740e85f428ac360b363e44f1e618f2d97782b5532846df290e9f79f11abdc7648a1e380cb44e
 DIST xemacs-21.4.24.tar.gz 8543879 SHA256 9016a51496d4978cf3dba75000a8e38bfc8cb4ca3a3f3e71371aa19259f26cd5 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213 WHIRLPOOL 469d52341833037e22cebeb6b554435c81b3f5749f64d86ddf31c3990dfc08a57f49fab7e868ab8c2009d1cae665f4fd731813f25c942d5aafd287ad7736a049
 DIST xemacs-21.5.31.tar.gz 15802193 SHA256 d59f90b7e72621376a23daa484f1929945d0527350a10989fd086bde9d0a997d SHA512 17c385459edffc063d43537dae5b2883d2d7481e7f7596d02c9859ecb9dd4ee48921647b389ed979d65ede2745b647c9b196c9ef0873e6d526d21262f04b7f41 WHIRLPOOL b2a1741af341f260671e1c8479f47c30113b515b240d86b41b6449abde96be896371d3f6b038ab72a96c422f84704de0a41e403a16c9ca2a4861e590e65b1f59
 DIST xemacs-21.5.33.tar.gz 15781151 SHA256 448c76aa32cd5c84257027846f01b75a5e4f1e9db3278f95e68ff23d59fb8f94 SHA512 75358b5cf2a012d23b95eb918e0ba1abf254db51d979d370f407b67871c6d09e2d59f59fe1acd46149933913222935e2c12be72cdf0314109c568f9f14438151 WHIRLPOOL 29d6a19d8cacc243afd3c21ed96cfabfa956531692e8ce4a454b958d32b08bb3eac47f52ada872ccfdb41082514145c602cc7ed81443bece7529365ba089f454
 DIST xemacs-21.5.34.tar.gz 15816932 SHA256 33cc54a6a9a45224a64b6c57c8138b5a5f0f1be368951a6d9ec8c0aec5993ee5 SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a WHIRLPOOL 733aabc45309ff4172ab77492dd85e71f156722f2e06d9a185c0a4260b9fbea607ff8a41dc43fc009cb8cdf3f05d4523778610a501f27a4917ab43cea03c6209
+EBUILD xemacs-21.4.22-r4.ebuild 7274 SHA256 a08614d7d7aeb0f7520ebcddbb6ec37a014415a6731c0ab30034f2c25daa4c29 SHA512 4679ed1595dccbd12537aeee22175c599d956f29c7ca50296961f043aec8f5f2dc7c3c01131520de2603988439fbef6fffa0cf50eb9debdc7ea3ea817b1194b3 WHIRLPOOL 6706c6ff6efb6a794e8b0461163b6eca508ff2e15218b8f38a3256f335d294c0805b6737d76d858dedf371e5bb32b24828ba91b4deae96dd5b6ee5d79207263b
+EBUILD xemacs-21.4.24.ebuild 6931 SHA256 f8f121f72e7351031a4a64d2abd4a054ea8b07c15642b7a6fb7e7b398101bd81 SHA512 a1e649d2bd39ad8fe296e8495378a07a8047f7392370f8c35145bcac0e9007383825255bd995dc93a433abefb7d5f42d51735e8c59265f27963b40b17ffa2b0c WHIRLPOOL d039ea435fdd371ebc01708c5523e6241042e348a6839c0f9790e963472d732983c5b67e413f2245b956929fec079eeed4279c82da523db6119d13b3e5013316
+EBUILD xemacs-21.5.31.ebuild 6573 SHA256 ba732c465db30869f973f633ee6d38458d452ba62c6107acf760f2b8e033a705 SHA512 3612d0bdcc4db79461bc71fdd8fb61c2f758a08bf84a759b701135b9344ae78ebf4604b4622e74a4808874500346862e8b332b2657bd1489d07f9fd0be191ffc WHIRLPOOL bc640701f1ec28e2b1e8fb17049fea50b01ad2800a1e85cd09567d915c5edd1a29348e52a3149a3d71fccf9f3bd10e45d837c9473fb189e1dc4b90a2d005036d
+EBUILD xemacs-21.5.33.ebuild 6435 SHA256 88f4ddf3bc2db313ac6667d2a22c08d67b4ba894e6c68db09da3a8e68ed6c85a SHA512 589142dec075107324ffd87544d7d7d2cacdca034b42a55a7ab2845f9108ece3a3971eb0a86138dc4194ca37434bcac49657841a92c959b0f9562423f01b4e22 WHIRLPOOL dd1c1c275d0da44199ed925a0e0e295d63c72726ae284770b42f43776f57345e000a7432be46ddc8d645cb1cacec99349a0928995e4597af30e8f42f75c49240
+EBUILD xemacs-21.5.34-r2.ebuild 7032 SHA256 5811a0d9d9d68576cb5f82ab194b4c71c05844a68f86888a06c9aa8ff7fad6a6 SHA512 10dee7ed4d2cc8676aedff8bc6e812b60ae8a80a853673a119df0d06a4386d7f11c2c6992d279bf130d951faf2014580ebb08e54f8b50ee8bf61bef0cbc9f4a3 WHIRLPOOL 8f67985f023ec6fb7fc267a9db5fd8d94c0b1c001fcc8d65443aa58bf18681a94c992f58c6c1dac8e1fc58da37b44cd8ae1083d48bf190f73ef8379b248890e0
+EBUILD xemacs-21.5.34-r3.ebuild 7089 SHA256 0119279c4b0d13d9de82ca6455cb3c424aa914edeed00afd7e9b2f1e769179d9 SHA512 4585fa322460d4d2bc074bb154cd8546efc0ed51a41a9304148fe943e1a75f3d131b774cab5bc0e3742822060c60efbf77d15401e756e40d7df4576d60a4839a WHIRLPOOL 0d8b67654419fb29efa97357a63e5079b69512e7ef447e2493d127785216f7e019d8a0c709cefedc958cc8e2f69af50b0699fee61beb864863e6864aff1653ca
+EBUILD xemacs-21.5.34-r4.ebuild 7203 SHA256 90e5467a237f75a3b49561bc7a9dae0a994da18c93de98333da060b258d0d59a SHA512 71b06747e4c3d8e189fcbfc81b0191b52d8e15a97fbd398420c019ed30c27d692952b2690dc6c22a832012af5e0f694d6aff79dd388b9767db113b0687fa5fc0 WHIRLPOOL ac5733e5877138d1401b2e4255add99becec004f4cc5fdbecc9716fe44712fd198cb46d7c8032db8b9dff65fff17a48e3c6d0261a10a1bfad74c66e7ffd0ed65
+MISC metadata.xml 687 SHA256 f28d37a42139ff92026d345596f348b6c65549c8d274d73df08b58d3530f2a8c SHA512 aac1d99e5d83e74eaf7c11ef08d5d6c9ed4dda2cc06967535adfc40b15f079884892dc38ad9d2daae1b57bdeea9ecb66e4e64a55f7fa0782931f056194c50914 WHIRLPOOL c00b9a07a866ecae46e0104158418e446f0dcf760c13bca75e1ea9eec8a69bd7800565bff0d646b68c663b008141cc1afab36c880e690018bcb0c7e2f7ea156a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQKTBAEBCAB9FiEE35B2rE+iuUAVGU99N3A0ZgpYKN4FAljetOJfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldERG
+OTA3NkFDNEZBMkI5NDAxNTE5NEY3RDM3NzAzNDY2MEE1ODI4REUACgkQN3A0ZgpY
+KN713w/+LZHOzGZ3oIc/FYcAie5V3gVzUxPdMa30gGHhPXK1mIeCxEkQpEubqQPH
+V/7i6i6getUmZNgcOkO2gUy54ddU/tzeK7yYe5u06B0LWcBY1q/fk0w2+EVF7uId
+GB9EUVhdvb1QaOfI038wOrmiuvKXA0W31e094v3RLZ/kcHgo0nSpLHesj+ycbk7U
+KEK4Kuce441fHI8aoPDVhaswMDV3hPGVVFxyvuN6k4H/zqD6qUpYQwbD2qjFTGRo
+U9C+WqZ5wWJu9DH/d82mY1bhzXcabyC3bzf8XE2fwCCfX8Ljz0QpYkaCKkb/8JhE
+a0f2OLPb61DmmsKuutUiGdQI52RkL/GCLMmbKKlWyj6zsrta/kshBmTY0J2Sb7xJ
+1Ue4apeQuYyANbjECgr4zum6QkGbMzQ7o0Bf3bGQQWJzLJCcRdpTJmv8wRC/IO7/
+/wM0cELUgxePwaOXLvv5ym4fgc+yfM2sFTm2Yjz3oI8DF5kPug+MkVL6mxISGfuA
+r1D9gxWM63iKqLwGBJwpvGKWXSSXyejDRbmeB6PW8Pnw7GT9VGBxG2F3VCTPaHl6
+UlmlrLjjbI4x3ZZSbVlyXHjvOHlog1Nbi4CWwb0Tr9bbCvX/ePsudQIbA3igo4Kj
+WcppmtSwy4b3jI0JHA6HPgAcpj+D4EG7N7wN8xf/XkIYB9HMgmg=
+=t+Zf
+-----END PGP SIGNATURE-----
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch
new file mode 100644
index 000000000000..b611b15fd8b1
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch
@@ -0,0 +1,32 @@
+diff -r f412e9f093d4 configure
+--- a/configure	Wed Jan 25 00:47:06 2017 +0000
++++ b/configure	Sun Jan 29 19:32:47 2017 +0100
+@@ -13507,7 +13507,10 @@
+ 	  -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;;
+ 	  *     ) val=1 ;;
+ 	esac
+-	if grep "^#define $sym " confdefs.h >/dev/null; then :; else
++	if grep "^#define $sym " confdefs.h >/dev/null          || \
++           test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
++           test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
++        then :; else
+ 	  if test "$val" = "1"
+ 	    then cat >>confdefs.h <<_ACEOF
+ #define $sym 1
+diff -r f412e9f093d4 configure.ac
+--- a/configure.ac	Wed Jan 25 00:47:06 2017 +0000
++++ b/configure.ac	Sun Jan 29 19:32:47 2017 +0100
+@@ -3136,7 +3136,12 @@
+ 	  *     ) val=1 ;;
+ 	esac
+ dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
+-	if grep "^#define $sym " confdefs.h >/dev/null; then :; else
++dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf
++dnl likes us to define; ignore them if appropriate.
++	if grep "^#define $sym " confdefs.h >/dev/null          || \
++           test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
++           test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
++        then :; else
+ 	  if test "$val" = "1"
+ 	    then AC_DEFINE_UNQUOTED($sym)
+ 	    else AC_DEFINE_UNQUOTED($sym,$val)
diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index 90171f0d93d9..e351b320cfec 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
 # -nopie flag in CFLAGS or help fix bug #75028.
 
-EAPI=4
+EAPI=5
 
 WANT_AUTOCONF="2.5"
 inherit eutils flag-o-matic multilib
@@ -23,14 +23,14 @@ IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
 RDEPEND="
-	berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 )
+	berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
 	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
 	>=sys-libs/zlib-1.1.4
 	!libressl? ( >=dev-libs/openssl-0.9.6:0 )
 	libressl? ( dev-libs/libressl )
 	>=media-libs/audiofile-0.2.3
 	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/postgresql:= )
 	ldap? ( net-nds/openldap )
 	alsa? ( media-libs/alsa-lib )
 	nas? ( media-libs/nas )
@@ -47,7 +47,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	canna? ( app-i18n/canna )
 	freewnn? ( app-i18n/freewnn )
-	>=sys-libs/ncurses-5.2
+	>=sys-libs/ncurses-5.2:=
 	>=app-eselect/eselect-emacs-1.15"
 
 DEPEND="${RDEPEND}
@@ -67,6 +67,7 @@ src_prepare() {
 	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
 	epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
 	epatch "${FILESDIR}/${P}-gcc5.patch"
+	epatch "${FILESDIR}/${P}-glibc-macro.patch"
 
 	# Some binaries and man pages are installed under suffixed names
 	# to avoid collions with their GNU Emacs counterparts (see below).
@@ -174,6 +175,7 @@ src_configure() {
 		--with-site-lisp=yes \
 		--with-site-modules=yes \
 		--with-newgc \
+		--with-system-malloc \
 		--enable-option-checking=no \
 		--with-last-packages=/usr/lib/xemacs \
 		|| die "configuration failed"