Avoid escape sequences with `echo` #523874 by Alex Xu.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

11 files changed, 54 insertions, 412 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index dffee8963d4a..564352dbe7bb 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/man
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.178 2014/11/02 09:47:12 swift Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.179 2015/05/08 03:22:04 vapier Exp $
+
+*man-1.6g-r1 (08 May 2015)
+
+  08 May 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.6g-echo-escape.patch, +man-1.6g-r1.ebuild,
+  -files/man-1.5p-defmanpath-symlinks.patch, -files/man-1.5p-search-order.patch,
+  -files/man-1.6b-more-sections.patch, -files/man-1.6d-fbsd.patch,
+  -files/man-1.6f-compress.patch, -files/man-1.6f-xz.patch, -man-1.6f-r4.ebuild,
+  -man-1.6f-r5.ebuild:
+  Avoid escape sequences with `echo` #523874 by Alex Xu.
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> man-1.6g.ebuild:
   Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 4e48055881fd..b3a0d7f9a293 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -3,44 +3,37 @@ Hash: SHA256
 
 AUX makewhatis.cron 115 SHA256 3e7f377a6c9ecdeff6e85f918993a4af0cf8bb5bcc63bf7a35e6426d50e434a4 SHA512 378f1980da40d67d82e3ed6a8d470df58180ca3eeee1d9f6df5d8eec7101461ee0af2f5d7c1da81af086f0aad0665bdffd4c6ee65418dff5f7c187a39b2e79b8 WHIRLPOOL edead434db104a859f8d325451e6da42920ad76ba218224563294396638a1c35dd3f0436d3195646a0b12a9869f084dff3a667a2938617c4036042fa57640bbf
 AUX man-1.5m2-apropos.patch 450 SHA256 c524c12eaa1f40e26eba40e3c6b88b32b5b24bd4cb75d2ba9a0361a539877ec9 SHA512 cf8c5f6debe6de3a424d1b4cb4cd234e2524477150fb726f7dc659ed436d491c0506649f63d06f1b825765d48e18736ef6476dcbbb27aabe1d1a3b47d7bf7317 WHIRLPOOL 95f64f954b9a963392bdc75bc82e76562bcff10ed9cb4ec4c102123c02b4b6df9a5bf366a194e106a734603b3bb9867c412e2fb3a1ab0bdfb63fac9229419a95
-AUX man-1.5p-defmanpath-symlinks.patch 881 SHA256 bd6bdb63af8c78f088ef8b19723adadc1bd465c799a4f97601c0fa9c5ff48a0d SHA512 32cd5d2bbe59655ce1f11cd64d28845fcdc5c332eaa9623a623a5d52d18626c2f303dad022d757aadfbb15f9e9766fb8cdfaec368429ab7a5b7ca579fb729934 WHIRLPOOL 3c2fd8b8f906dc898f221cd27a3d63e3493997dba8711e12103db0471eb61a794668072ef6cad640ba0e87da00ec4973df43819442b7b6ea6044cd19dafe8c78
-AUX man-1.5p-search-order.patch 463 SHA256 96d73ede177ec43880f834eab326f7b27b75c4d99d0e04027dff3a14078fd5a6 SHA512 fee0fd1a1ecc10f2ad3a97e5eda9238408942f71c872f1aa050e60f9339743b50bd9249cdfdbd389dd91c12afd79b8b448e8b9519f6cdbac52d37b5546f9f616 WHIRLPOOL dad4d0106db6ce90758cfa5a3c72ae83d2819476d9fdd623eb8d260317582433a5ee078968dece41f82a3f9bb5c217a2e7a8b10652394c61d25c6ca699b44455
 AUX man-1.6-cross-compile.patch 1744 SHA256 ddc610cde46bd13e86802db0b86c21200c5695b88c9b660e386cd8c0a7d03540 SHA512 8be42b2ac831d7ba7de7e2f54c0b5d4ca2d1c88e6b3125b0bb2b9996c15daaf659f3e4e1c9edf05bf9628ea9e043cb9781e05987dcb34abb3c937b19d4787204 WHIRLPOOL 14d51eb9ab1495f65957d5a54ea9f9fc1a18a21e108637160c5af849e4f4175fbc5408e9dff2ee4e6b6864578c205972d3c71f728a911819dd9bef44925781c2
-AUX man-1.6b-more-sections.patch 291 SHA256 33d876a93a84d0680bf737be9b06968d91ff376800e21ae8799e45357c35efef SHA512 1cd8abeebd1ca36fc8540569656e6fdaf080ec19069586d472fae6d04475b3d42bae417f3153dcaf2febadfc5df184992ff630b14fd495ce58ab1b37b4a68285 WHIRLPOOL d354e0e2460c456caa9c44fca64bed9eceda914b1e36dc20d0291bbdbbec8b87be6af0843aa5be00c126ccf1b1f3fd92760962cd6eaa0b2f7bd3c6b12f9cd5df
 AUX man-1.6c-cut-duplicate-manpaths.patch 2148 SHA256 a9557114725da765265891a4c1cf846b6a8f0b38c0180628a7fec7dfb1b76a4d SHA512 00141e89313e5dd4bf781c2010ca1aea4f8c265339cb4a46ee596870388b41e78135191b0266f4d1046a15f92d404477622139baf5f92a9692c8f9ee79d3a820 WHIRLPOOL 265069c0bb580472bddae9ea88273694bb50fb5303c70eaf30a54a03e5496aa9d3f80563b39033a437085be5f832253b7ddc7a7e98908a3c0bfcb72361d982d4
-AUX man-1.6d-fbsd.patch 312 SHA256 669c51e8eca894f8c983d41c4fa24af3aa74cf323906e262b3f185dfa1ca00da SHA512 0e844ef34adad1f6ece6657a992cf53cc6cfb15bac14d69d3f731df5dd95d0b3e59399e7b1412faba83dfe4fb6fe566707e13890075a96ed04a85dd3ce18b3da WHIRLPOOL 9715abe1f555af4aa27ea96f10717e846557d885c1d0cb7ab3bf65dcf04f13385b2a4efa629d63d8751b2d98df630ec27b30bc8849d37fec3288d4f12d18e303
 AUX man-1.6e-headers.patch 241 SHA256 d62108e3baaec771d99226eff07a6f604a8b9afefd25ec596b9817574a638e20 SHA512 0fb92a896fe6889289198ac2674ae238e1067e8e3681b6d9c6fee12843f5272a49b80899985ed6e718d84181c036ca7e7c00d8cdb5bdfca299cf4ec00681e925 WHIRLPOOL 20f458cf9812ad7f007ce6aef59405b6767570b9c1f75cb4d66a934107c717f707b5ac1d542471a8c3b79e32eba2741fd104d1131ad45eb34020761c320e1bda
-AUX man-1.6f-compress.patch 941 SHA256 d0e1d976201bb61c7769ce407991647411f7f8da2945b56af64797357ce389b3 SHA512 7c21ed97f258337a2ff75f0eb3ef6a46ef884b9aa72d547f298ca7f4c4fbbb4bee0fe7be2894e2765c5c24cf42e1125577a67b9000c2a54e69e9b41318ea128b WHIRLPOOL 3c155088d4e7bc96b5d2e1eaa18100631ec10b10110f85defc9d510ba47050a3ce8b4f47f846ce0b8e84748e3a1777f6b9a7f9f1c6927ef9664d05ebea4ea380
 AUX man-1.6f-makewhatis-compression-cleanup.patch 2384 SHA256 885fde98225f122597dc16ab05cd5666c808df9d2004589e3aefe7ba63860267 SHA512 24e85bda51ab9ce27d15bae0403b7528cd808b32642e677512806cd88afb6ba2b76cfc6550eeb18cf7cdc7fcf348eca01bbed1b0da3680f53ffb73f824316c10 WHIRLPOOL 73af923df3acf344ce8ced046c335b3053c7c444d7bd8b19d56ca63775eecbf39a92971fed5c6d6decaea8d96d0cecbf842bccac1aa4f7730c0e2196b1779387
 AUX man-1.6f-man2html-compression-2.patch 1725 SHA256 f9df05eabad2408a017790954f46ac06eb565fed4de603d6d20bb3145439f97a SHA512 c7dc78f75876882e4f241ededd61ab1dad9292e2aa91d82c09e0e4a81c6a97d6537c8bb4b9154a17cb1db47d8716464b8146ccd487545e3f5c317482ad86e0bb WHIRLPOOL dd2116a61ab88e35b4dd152c0bd7f1ec3bdcbb9b7ddef030cc778230ee7f0b4f27bf817f1003ff378847349fe4a26a41d7e12855581c7ae92b1773b5a28b5c36
 AUX man-1.6f-parallel-build.patch 2312 SHA256 158a5bfb6bcfe7f82b1ed4586a62a30cbd7c7688244e3c274fcb490112c18d13 SHA512 03bfd0c86d9d17eba4073a94d59a2d1fabc88fc373831796d65c1caf3f45ff17014f3bd314ece01be80746845961ef7f03e7b8e153e3e71ced77f43736f34bf8 WHIRLPOOL 4d2ef8279f4f9b438ca747f9711395a07c8ec173301e74f537245307226a20709e8c9bdaeb04e475529ab1b221376f89413f415a4da365eadc1523b86424ef85
 AUX man-1.6f-so-search-2.patch 1062 SHA256 8f4c6bcfde17291f92c677b82e2367458916488a1a8de6ba345eecd5bfccb2e8 SHA512 af21ff66a9bb0f6a47d98c1fe73fe99a4c0addce6496be154ccd7ede2efb51e80464156337ae40df9aed3a10daceb486f8785dd1130b50d59d4e991406dc70c6 WHIRLPOOL d8f2a9beab76d3ab1e6f4d78ed5d9396e354f127741b31545fb84de5f9f9ed69604fd3bf271a8ece5d65696bc37e87f601fa853984afd8442f94d32877b52c81
 AUX man-1.6f-unicode.patch 656 SHA256 1c7624b5824e5585abd1c3d27ffd8e2d9207a05bf67e268aeaabaddf842d4709 SHA512 f91ebf0886794bb1f3ccc2207cd5fb7dbd83f0dd727470a9270481c7c33dcf1c78e99a62d097232ca964b639764fc1c76ae88380775dc79ee4ed18a6cd677b97 WHIRLPOOL 1052baf2cad3052335a21a6ca31ae740fb2e344940307117725974e5f6857ad85e34f461169a80b90b1a4a30fd8c740954b182b587a9c6c9f04e97e1f3854ba0
-AUX man-1.6f-xz.patch 3738 SHA256 c1b3e6f257f5e6d5303ce5f763ec7adc98bd171cbc03e59536e9d39ab3db4295 SHA512 c5d3824d9e116853b054ebc8420216a51dab9395ae448e202fc0f97e7e797a93e3beccca1c4225eeabc4b814ef83a124e78fdfa095d0b64ecd021676fff86ac5 WHIRLPOOL 708904a8d38b6b9d0d65c1678b17b05ac4f3c478f6b398e29f4cbc27370da2f7cd2345c730fa42d407d9bf95d0ac3cf50ed99189450ae0369bae1762a2fb9bb0
 AUX man-1.6g-compress.patch 343 SHA256 96945eded649cfe908088b75da4a71e7bfb461795e463d0126f34985410bd40f SHA512 eab984c95b75bbf29b65ff38029bbcfa870972fa2cff208da5d4d43c89dd0ceeb32a8faceb43836ced9ff50ee5765d2a5c4f1faf51f5507f0ea97b6ffcfe36c8 WHIRLPOOL ccfb29da707bed5c6e2ad9ace2ba51882d3cdea36c29010a78b1359969b8dcd303467d7566c497cc2a4068e2fb13b8bd2a559c8f96ae60af47e5212d355347db
+AUX man-1.6g-echo-escape.patch 630 SHA256 31ae1e0f3321b2e9e16b604c71cbd9a806d061e80e80a3ff1ae24b22c8a501df SHA512 d66aa7ccc97fe1af2afe1165e2305c4ad4cd4ec48078707432a1ccd79db80f7ff11ad977175651fb6c6875e31461a1e04352f2a3b542762afaf9a07290fe03c0 WHIRLPOOL 447949c0a7a953fbce4598e532ded3acb45bd0bb7d2aa5ef89c38c9f451b90f75f2d68425ab314821de43ff31df06f55b7cca0fa16ec880967fd06451322796e
 AUX man-1.6g-fbsd.patch 366 SHA256 fd4e50be32571103e9880b9291c691d45a225a7d6f2b27ff05168d22dbce7336 SHA512 4019267584b1350b2c9da9aa1851a2e4e96f271265d189ecd677206be20dac67cd212b2887f844f43c10d96076a76613a12e53f3b29a185ec62ed4bff4c5a502 WHIRLPOOL 60bc8aff0c96036ba2842e0113adaa3851a7b0e179b73f013e8e5b42e12511eb1cf07e5c3cbd07f8d7613c4cf2ccb40f6276cc50e9f2ffb7ee9cecf435f0bb77
 AUX man-1.6g-xz.patch 1848 SHA256 7c11114ec34f017d0641c9a7ecd9ad8b93f6c226e9bdd54fd0fedf1313451634 SHA512 6a883fa800a6d3b11c76a70e1a31c0736d380271c9f21315863ddaca9529e3d613b587724287fb94bab2b0d97215f6ccb3f1438a5c5e339e5a2edf872c92515c WHIRLPOOL 4f2ffd7d09ddda0a3bc49d4a1b36a7ef953f9afde4d0dfa164a917783516e549e9a12196994239f65d9c26b3ef1c64553601bb68fcfad4286e882fb0465cb0aa
-DIST man-1.6f.tar.gz 254827 SHA256 9f208c7e1981371ad4481d6e6c2c566bc726a15778723f94136d220fb9375f6c SHA512 da6bb07d506d5974ff64bac226e13a01cb89856526062e4cd6cc7f65b992a6ccfc2ab92026aa92e000401caeeedb08a5a5a745c7c39120c4c344344eb8900efa WHIRLPOOL d359b075c0fcdbab63ef5fa7b0647fb5f3423f29ca9b233c9d56c7010890c68f2d330c50b08f2a9c2cb825e90f051a1e6a5aae0347f6e0d933515b3299c809fa
 DIST man-1.6g.tar.gz 256906 SHA256 ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b WHIRLPOOL 1b531476108c27a3993023da430831c2d20f8045a51490d559a7f588f0771931defd7a3a745e9f1f03797e681eea8767aad4a27ab9abdd5d06ad935dc96a5020
-EBUILD man-1.6f-r4.ebuild 3825 SHA256 089ed4d830e60e843662ca532235555cafb0127a91f4a89dc150c9613e6dedd5 SHA512 03afadbf69a292ddfec0f46a797d55fc0c22fab3f25641972163f49b433d504db2a24d104aa0f9761ebdb3ab1a624e1be6d7486e64695ac7f87f9e725f27c898 WHIRLPOOL cfa01af7f14efdf401eed4e67b2f2b202655c17958fc6590fb69b46ed5ab227cc8ad8b3e91e25a6b4cd0061ad60676ffc181f5b489ff34ee89fb375b02afa7c5
-EBUILD man-1.6f-r5.ebuild 3913 SHA256 e67b7fa8e49cbeb21cb18de5df9c38979e88a1d5b33fcb07ee594facf598d20b SHA512 efc0f5e95e65f07f22ce3330b2ed2a09f22c34e4fa23ddc4fa4bb0ef26fad76b11421495b1d3452638011ebbfaa10e9745ef3bf6a44ec3a4702de01430fe1b14 WHIRLPOOL 34b8dcc30d3f8e58597bb0b0a042ed7705679c4fd7db6d81e00198f729a4e190a8ab0d2bb0522691f22bae2034bb3a973d935e5fff3fb2ca795e595cf2161be1
+EBUILD man-1.6g-r1.ebuild 3809 SHA256 2fe11fe109dfef3ce6a8938dc41560da71ad2fcd1135223364f4bb8a597eaaa8 SHA512 d99a777cc7657680f3e8948689c429d612442174b507a25fc8945bc690025217ae94113e2035bdc36ec8a459c06326e753bccab479682047542c3b27a48d5c92 WHIRLPOOL d1a65b95fee274501a59740f4c43dfdebfa70a44d17d1680e0f3e08590593b980e432d7f9fe1050e538ae26d5ecff616458efdf4e81628002f65114b1449ae0c
 EBUILD man-1.6g.ebuild 3730 SHA256 baf837610469e645a771fd411af014b80a6ff357ede5fe771bdb18e23fa58c80 SHA512 b8d7af95769030c5caaa554a8de45ee9c627f58f336e68d8913c42d59a68d467045c39ad94df10f21312b4676c87de2c5b0d0467536e38bffab411137ab24472 WHIRLPOOL 4ce24e1b0669320f0068b4b05fe078eaba363a2f0abfc6ba49b71439b19e04083340072967a8363315f1ef86ec8bff58dbd45ba1cf5adb1ae31979d614bb47f4
-MISC ChangeLog 24368 SHA256 612f1f6241a8a98632f56e5e09ebdb5d0bb131cfd0994f40c2b47e4a0f549ca0 SHA512 9b9e7255c7c071168365bfd12068202804863962b4d10d2d293b7a27bb05e1e207950f9352194fc81d9b4cade226c6aa52392c242ee197a69b5d222347eca037 WHIRLPOOL 4faf49f450fc71a62e4c4775d4ca3f36da656ff43bfe013dedce36e56675b6939abcaf4c20a7a17b42554e9b51aab8335c3fb7ca0218d95f616da17624329659
+MISC ChangeLog 24815 SHA256 246995690bfdf8b7c1e7d0a012a15d21955983967365cb3201ade29a38e2faa8 SHA512 231e4ad86a93dff35f11c3676c7db9c19cb49cf1a3a91ec9dc7e484cb11d42cda0b5492fee75fa881f23f4a340b526fe469a0c773ebf7074c7b01a3298b65b26 WHIRLPOOL 3c692e40173882cf0600b518910e685b0598c99a1b93c3e52797de32505b0c6a7b5b1d285341c29f440c83297bdab0c3516e25d33391ea6388d346618827c06f
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUVf2hAAoJEC7dUkA7aK9HogsP/0xDy92UEEweXNKM7R64UUDt
-H390MWMqZK0dXU5gCm/2Jz0lPZCMlUBO9M/vEyfHQERHSKzc+UPqqiUG+J6oMnnv
-OeTMMnIUq5/3/tecPgAf4HvxHfXzJwOSqGy0AEKfENJBOtp7jl8FVYoLg77bEl1T
-Ri9iew8Mz4hgrowCd0KPK+qQ9CHrJvUb2j98NQ9fgBi1t9M+/h75CvSI+cW//Bo6
-dIK5O2bp2mwqm2B7OJs+SgNGE3IvnQclOSoeEDSopcR1rRJIvRyLr2wrNgYjBgkz
-5OiEN/0vV4m+ZC81wlKxPpMZXcfBQJbMJeP5mvy6AYAFJSJEX/oG/xX9sPA/zA0L
-izFPMx6p2Xh4/S2QyfDIoXR+LG0BCX30SkBRNKVSParwBRTsGSU4RCNzETAZ0Z3N
-EoTCwGjm4PYUEbP4PDQzfDQNi2VRZxbPIfMzPY+WHNNrUSXtm+VxpD4eIUxSCHqo
-5vlHqwxCHJCLcRTTjm6L0tl80YFUjkNl/a+E5xXs1/lUDKeAJ7ypeF/TRhPncxBy
-OA0e3RKzBb1WhUhuS6Amz6FBK5sn4iCavkUl7c8Gn49ZimuzXR4z158ntbOGz38h
-J4i+fundAWSj3slo/ctaYowNIh5aKQC0/OMan5q8nIpPqLhyKN2JKjJsh7vlR73u
-mfAt6iNFjvnEYUsE6eKZ
-=aByh
+iQIcBAEBCAAGBQJVTCvdAAoJEPGu1DbS6WIA608P/AtQoutLlNfDJrN5pTXfyBIJ
+uvJZrY7qHYzWJTrShXRTAXNl49UYOOl0zw0eKdjMQRHVk9HpD/BTZ8XRpg5Byy/0
+JcnKVdVJe1iCoD7nuNCf/bDIFTWSMLMqZZT7FlTm47fDqytsSLPIbKfuUXmlZfcc
+l64Co50xrE5imnt/JBYHtBLeUv4k4DaTgwAJ3jrTM0VHlImeROwJoUucQoigFQSm
+9cN5e1NeAi6JlopELOkhmAAkOjxxCDZk/1TDFMg35IZGktFcy7nWMnuRXs36DUj6
+k9cAhXlsIB9aLRlpmDdiQtWYph97FDVLjOJ/6blZNdNkHgc4Nw/pV7DjLjCh4PtG
+EpJVyeLCYJNo+YpWVWPBA1Lh2RXZS5+qeEvLzXcTxjQTUw9CpH5P33TtA6x65Klh
+zOmhyN6/qeHOvN+MLBaCIvQuuDPXQQjf43t9TotYszpDGdGub3hQyrEX6t9pA7HL
+YmzoNQnH6YSgsgIorOy02jdfGeQLiaqrtUdAYQmOSB73u8YlDJJhdeG3sKfYuza6
+O+VOXjudtdBDnMlQ8YwXTViMrOYRMoDvCToWN4EoQrO2CU7dtfdjRTwzwPfHGj6C
+Q0OkgX4RZxMSAHSNKu/NA+MUA2jC1vLy4MJyOYMGhb+OIySi9fgn127dk/BO7DeH
+JFZqYpWwEZHST71vzm4D
+=iMX5
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/man/files/man-1.5p-defmanpath-symlinks.patch b/sys-apps/man/files/man-1.5p-defmanpath-symlinks.patch
deleted file mode 100644
index f8ff4f445903..000000000000
--- a/sys-apps/man/files/man-1.5p-defmanpath-symlinks.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-makewhatis traverses manpages twice, as default manpath contains two
-directories that are symlinked together ... this isn't a real fix, just
-a workaround that should be OK for the way Gentoo does things.  a real
-fix would be to filter out any directories which resolv to the same
-directory ...
-
---- man-1.5o2/src/makewhatis.sh
-+++ man-1.5o2/src/makewhatis.sh
-@@ -41,7 +41,7 @@
- # and should be first.
- # It is a bug to add /var/cache/man to DEFCATPATH.
- dm=
--for d in /usr/man /usr/share/man /usr/X11R6/man /usr/local/man
-+for d in /usr/local/man /usr/share/man
- do
-     if [ -d $d ]; then
- 	if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi
-@@ -49,7 +49,7 @@
- done
- DEFMANPATH=$dm
- dc=
--for d in /usr/man/preformat /usr/man /usr/share/man/preformat /usr/share/man
-+for d in /usr/local/man /usr/share/man
- do
-     if [ -d $d ]; then
- 	if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi
diff --git a/sys-apps/man/files/man-1.5p-search-order.patch b/sys-apps/man/files/man-1.5p-search-order.patch
deleted file mode 100644
index b6603b6cf032..000000000000
--- a/sys-apps/man/files/man-1.5p-search-order.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix search order in man.conf so that system installed manpages
-will be found first ...
-
---- man-1.5p/src/man.conf.in
-+++ man-1.5p/src/man.conf.in
-@@ -36,11 +36,11 @@
- #
- # Every automatically generated MANPATH includes these fields
- #
--MANPATH	/usr/man
- MANPATH	/usr/share/man
--MANPATH	/usr/local/man
- MANPATH	/usr/local/share/man
- MANPATH	/usr/X11R6/man
-+MANPATH	/usr/local/man
-+MANPATH	/usr/man
- #
- # Uncomment if you want to include one of these by default
- #
diff --git a/sys-apps/man/files/man-1.6b-more-sections.patch b/sys-apps/man/files/man-1.6b-more-sections.patch
deleted file mode 100644
index 9e13c09e8f4e..000000000000
--- a/sys-apps/man/files/man-1.6b-more-sections.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-[1-8]x are for xorg man-pages
-
---- configure
-+++ configure
-@@ -949,7 +949,7 @@
- 
- # What sections do we anticipate?
- 
--tmpsections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
-+tmpsections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
- 
- if [ x$default = x ]; then
-   echo ""
diff --git a/sys-apps/man/files/man-1.6d-fbsd.patch b/sys-apps/man/files/man-1.6d-fbsd.patch
deleted file mode 100644
index 62189e0e85d0..000000000000
--- a/sys-apps/man/files/man-1.6d-fbsd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes compilation in FreeBSD
-
-http://bugs.gentoo.org/138123
-
---- man-1.6d/gencat/genlib.c
-+++ man-1.6d/gencat/genlib.c
-@@ -54,7 +54,7 @@
- #include <unistd.h>
- #endif
- 
--#ifndef __linux__
-+#if !defined(__linux__) && !defined(__FreeBSD__)
- #include <memory.h>
- static int bcopy(src, dst, length)
- char *src, *dst;
diff --git a/sys-apps/man/files/man-1.6f-compress.patch b/sys-apps/man/files/man-1.6f-compress.patch
deleted file mode 100644
index f110acd806da..000000000000
--- a/sys-apps/man/files/man-1.6f-compress.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.orig	2008-12-26 23:59:40.779042906 -0600
-+++ configure	2008-12-27 00:13:15.265256215 -0600
-@@ -1012,20 +1012,25 @@
-   if test "$ans" = "true"
-   then
-     DO_COMPRESSION=true
--    compress=
--    for i in lzma bzip2 gzip bzip tzip pack compress freeze yabba
--    do
--      eval F$i=missing
--      for j in $DEFPATH
--      do
--        if test -f $j/$i
--        then
--	  eval F$i=$j/$i
--	  if [ x$compress = x ]; then compress=$j/$i; fi
--	  break
--        fi
--      done
--    done
-+	if [ x$COMPRESS != x ]; then
-+		compress=$COMPRESS
-+		echo $compress
-+	else
-+	    compress=
-+	    for i in lzma bzip2 gzip bzip tzip pack compress freeze yabba
-+	    do
-+	      eval F$i=missing
-+	      for j in $DEFPATH
-+	      do
-+	        if test -f $j/$i
-+	        then
-+		  eval F$i=$j/$i
-+		  if [ x$compress = x ]; then compress=$j/$i; fi
-+		  break
-+	        fi
-+	      done
-+	    done
-+	fi
- 
-     if [ x$default = x ]; then
-       echo ""
diff --git a/sys-apps/man/files/man-1.6f-xz.patch b/sys-apps/man/files/man-1.6f-xz.patch
deleted file mode 100644
index 7b2ed9085766..000000000000
--- a/sys-apps/man/files/man-1.6f-xz.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-add support for xz
-
-http://bugs.gentoo.org/302380
-
---- a/configure
-+++ b/configure
-@@ -1017,7 +1017,7 @@
- 		echo $compress
- 	else
- 	    compress=
--	    for i in lzma bzip2 gzip bzip tzip pack compress freeze yabba
-+	    for i in xz lzma bzip2 gzip bzip tzip pack compress freeze yabba
- 	    do
- 	      eval F$i=missing
- 	      for j in $DEFPATH
-@@ -1076,6 +1076,7 @@
-       *gzip*) ext=".gz" ;;
-       *bzip*) ext=".bz" ;;
-       *tzip*) ext=".tz" ;;
-+      *xz*) ext=".xz" ;;
-       *pack*) ext=".z" ;;
-       *compress*) ext=".Z" ;;
-       *freeze*) ext=".F" ;;
-@@ -1114,7 +1115,7 @@
- fi
- 
- # unconditionally handle uncompression
--UNCOMPRESSORS="unlzma gunzip bzip2 pcat zcat fcat unyabba"
-+UNCOMPRESSORS="unxz unlzma gunzip bzip2 pcat zcat fcat unyabba"
- for i in $UNCOMPRESSORS
- do
-   eval F$i=missing
-@@ -1139,6 +1140,10 @@
- if [ $Funlzma != missing ]; then
-   unlzma="$Funlzma -c -d"
- fi
-+unxz=missing
-+if [ $Funxz != missing ]; then
-+  unxz="$Funxz -c -d"
-+fi
- pcat="$Fpcat"
- zcat="$Fzcat"
- fcat="$Ffcat"
-@@ -1170,6 +1175,9 @@
- 	lzma)
- 	  echo "Command to use for .lzma files (standard lzma)"
- 	  echo $n "[`eval echo \\$$filter`] $c" ;;
-+	xz)
-+	  echo "Command to use for .xz files (standard xz)"
-+	  echo $n "[`eval echo \\$$filter`] $c" ;;
-         pcat)
-           echo "Command to use for .z files (pack/unpack)"
-           echo $n "[`eval echo \\$$filter`] $c" ;;
-@@ -1232,6 +1240,7 @@
-   .gz) decompress=$gunzip ;;
-   .bz2) decompress=$bzip2 ;;
-   .lzma) decompress=$unlzma ;;
-+  .xz) decompress=$unxz ;;
-   .z) decompress=$pcat ;;
-   .Z) decompress=$zcat ;;
-   .F) decompress=$fcat ;;
-@@ -1325,6 +1334,7 @@
- s,@gunzip@,$gunzip,
- s,@bzip2@,$bzip2,
- s,@unlzma@,$unlzma,
-+s,@unxz@,$unxz,
- s,@unyabba@,$unyabba,
- s,@compress@,$compress,
- s,@compress_ext@,$compress_ext,
---- a/src/makewhatis.sh
-+++ b/src/makewhatis.sh
-@@ -230,7 +230,7 @@
- 	    find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
- 
- 	    function readline() {
--              if (use_zcat || use_bzcat || use_lzcat) {
-+              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- 		result = (pipe_cmd | getline);
- 		if (result < 0) {
- 		  print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
-@@ -245,7 +245,7 @@
- 	    }
- 	    
- 	    function closeline() {
--              if (use_zcat || use_bzcat || use_lzcat) {
-+              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- 		return close(pipe_cmd);
- 	      } else {
- 		return close(filename);
-@@ -266,7 +266,9 @@
- 		use_bzcat = match(filename,"\\.bz2");
-               if(!use_bzcat)
-                 use_lzcat = match(filename,"\\.lzma");
--              if (use_zcat || use_bzcat || use_lzcat ) {
-+              if(!use_lzcat)
-+                use_xzcat = match(filename,"\\.xz");
-+              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- 		filename_no_gz = substr(filename, 0, RSTART - 1);
- 	      } else {
- 		filename_no_gz = filename;
-@@ -279,13 +281,15 @@
- 		actual_section = section;
- 	      }
- 	      sub(/\..*/, "", progname);
--              if (use_zcat || use_bzcat || use_lzcat) {
-+              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- 		if (use_zcat) {
- 		  pipe_cmd = "zcat \"" filename "\"";
-                 } else if (use_bzcat) {
- 		  pipe_cmd = "bzcat \"" filename "\"";
--                } else {
-+                } else if (use_lzcat) {
-                   pipe_cmd = "lzcat \"" filename "\"";
-+                } else {
-+                  pipe_cmd = "xzcat \"" filename "\"";
-                 }
- 		# try to avoid suspicious stuff
- 		if (filename ~ /[;&|`$(]/) {
---- a/src/man.conf.in
-+++ b/src/man.conf.in
-@@ -133,6 +133,7 @@
- .gz		@gunzip@
- .bz2		@bzip2@
- .lzma		@unlzma@
-+.xz		@unxz@
- .z		@pcat@
- .Z		@zcat@
- .F		@fcat@
diff --git a/sys-apps/man/files/man-1.6g-echo-escape.patch b/sys-apps/man/files/man-1.6g-echo-escape.patch
new file mode 100644
index 000000000000..96e950a51e86
--- /dev/null
+++ b/sys-apps/man/files/man-1.6g-echo-escape.patch
@@ -0,0 +1,15 @@
+avoid using escape sequences in echo as they're not portable
+
+https://bugs.gentoo.org/523874
+
+--- a/src/man.c
++++ b/src/man.c
+@@ -626,7 +626,7 @@ make_roff_command (const char *path, const char *file) {
+ 		 the current position plus 10 lines.  This plus setpl()
+ 		 gives us a single page that just contains the whole
+ 		 man page. (William Webber, wew@cs.rmit.edu.au) */
+-	      strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \\n(nlu+10\"");
++	      strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \"; echo \"(nlu+10\"");
+ #if 0
+ 	      /* In case this doesnt work for some reason,
+ 		 michaelkjohnson suggests: I've got a simple
diff --git a/sys-apps/man/man-1.6f-r4.ebuild b/sys-apps/man/man-1.6f-r4.ebuild
deleted file mode 100644
index ec66c5d1129d..000000000000
--- a/sys-apps/man/man-1.6f-r4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6f-r4.ebuild,v 1.13 2014/01/16 18:19:15 vapier Exp $
-
-EAPI="2"
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="Standard commands to read man pages"
-HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
-SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="lzma nls selinux"
-
-DEPEND="nls? ( sys-devel/gettext )
-		selinux? ( sec-policy/selinux-makewhatis )"
-RDEPEND="|| ( >=sys-apps/groff-1.19.2-r1 app-doc/heirloom-doctools )
-	!sys-apps/man-db
-	!app-arch/lzma
-	lzma? ( app-arch/xz-utils )
-	selinux? ( sec-policy/selinux-makewhatis )"
-
-pkg_setup() {
-	enewgroup man 15
-	enewuser man 13 -1 /usr/share/man man
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/man-1.6f-man2html-compression-2.patch
-	epatch "${FILESDIR}"/man-1.6-cross-compile.patch
-	epatch "${FILESDIR}"/man-1.5p-search-order.patch
-	epatch "${FILESDIR}"/man-1.6f-unicode.patch #146315
-	epatch "${FILESDIR}"/man-1.5p-defmanpath-symlinks.patch
-	epatch "${FILESDIR}"/man-1.6b-more-sections.patch
-	epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch
-	epatch "${FILESDIR}"/man-1.5m2-apropos.patch
-	epatch "${FILESDIR}"/man-1.6d-fbsd.patch
-	epatch "${FILESDIR}"/man-1.6e-headers.patch
-	epatch "${FILESDIR}"/man-1.6f-so-search-2.patch
-	epatch "${FILESDIR}"/man-1.6f-compress.patch
-	epatch "${FILESDIR}"/man-1.6f-parallel-build.patch #207148 #258916
-	epatch "${FILESDIR}"/man-1.6f-xz.patch #302380
-	# make sure `less` handles escape sequences #287183
-	sed -i -e '/^DEFAULTLESSOPT=/s:"$:R":' configure
-}
-
-echoit() { echo "$@" ; "$@" ; }
-src_configure() {
-	strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ })
-
-	unset NLSPATH #175258
-
-	tc-export CC BUILD_CC
-
-	local mylang=
-	if use nls ; then
-		if [[ -z ${LINGUAS} ]] ; then
-			mylang="all"
-		else
-			mylang="${LINGUAS// /,}"
-		fi
-	else
-		mylang="none"
-	fi
-	export COMPRESS
-	if use lzma ; then
-		COMPRESS=/usr/bin/xz
-	else
-		COMPRESS=/bin/bzip2
-	fi
-	echoit \
-	./configure \
-		-confdir=/etc \
-		+sgid +fhs \
-		+lang ${mylang} \
-		|| die "configure failed"
-}
-
-src_install() {
-	unset NLSPATH #175258
-
-	emake PREFIX="${D}" install || die "make install failed"
-	dosym man /usr/bin/manpath
-
-	dodoc LSM README* TODO
-
-	# makewhatis only adds man-pages from the last 24hrs
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/makewhatis.cron makewhatis
-
-	keepdir /var/cache/man
-	diropts -m0775 -g man
-	local mansects=$(grep ^MANSECT "${D}"/etc/man.conf | cut -f2-)
-	for x in ${mansects//:/ } ; do
-		keepdir /var/cache/man/cat${x}
-	done
-}
-
-pkg_postinst() {
-	einfo "Forcing sane permissions onto ${ROOT}var/cache/man (Bug #40322)"
-	chown -R root:man "${ROOT}"/var/cache/man
-	chmod -R g+w "${ROOT}"/var/cache/man
-	[[ -e ${ROOT}/var/cache/man/whatis ]] \
-		&& chown root:0 "${ROOT}"/var/cache/man/whatis
-
-	echo
-
-	local f files=$(ls "${ROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
-	for f in ${files} ; do
-		[[ ${f} == */etc/cron.daily/makewhatis ]] && continue
-		[[ $(md5sum "${f}") == "8b2016cc778ed4e2570b912c0f420266 "* ]] \
-			&& rm -f "${f}"
-	done
-	files=$(ls "${ROOT}"etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
-	if [[ ${files/$'\n'} != ${files} ]] ; then
-		ewarn "You have multiple makewhatis cron files installed."
-		ewarn "You might want to delete all but one of these:"
-		ewarn ${files}
-	fi
-
-	if has_version app-doc/heirloom-doctools; then
-		ewarn "Please note that the /etc/man.conf file installed will not"
-		ewarn "work with heirloom's nroff by default (yet)."
-		ewarn ""
-		ewarn "Check app-doc/heirloom-doctools elog messages for the proper"
-		ewarn "configuration."
-	fi
-}
diff --git a/sys-apps/man/man-1.6f-r5.ebuild b/sys-apps/man/man-1.6g-r1.ebuild
index 248497295ebb..58aad9fac1b1 100644
--- a/sys-apps/man/man-1.6f-r5.ebuild
+++ b/sys-apps/man/man-1.6g-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6f-r5.ebuild,v 1.4 2012/12/15 12:53:52 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6g-r1.ebuild,v 1.1 2015/05/08 03:22:04 vapier Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils toolchain-funcs user
 
@@ -12,14 +12,13 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="+lzma nls selinux"
 
-DEPEND="nls? ( sys-devel/gettext )
-		selinux? ( sec-policy/selinux-makewhatis )"
+DEPEND="nls? ( sys-devel/gettext )"
 RDEPEND="|| ( >=sys-apps/groff-1.19.2-r1 app-doc/heirloom-doctools )
 	!sys-apps/man-db
-	!app-arch/lzma
+	!<app-arch/lzma-4.63
 	lzma? ( app-arch/xz-utils )
 	selinux? ( sec-policy/selinux-makewhatis )"
 
@@ -31,19 +30,17 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/man-1.6f-man2html-compression-2.patch
 	epatch "${FILESDIR}"/man-1.6-cross-compile.patch
-	epatch "${FILESDIR}"/man-1.5p-search-order.patch
 	epatch "${FILESDIR}"/man-1.6f-unicode.patch #146315
-	epatch "${FILESDIR}"/man-1.5p-defmanpath-symlinks.patch
-	epatch "${FILESDIR}"/man-1.6b-more-sections.patch
 	epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch
 	epatch "${FILESDIR}"/man-1.5m2-apropos.patch
-	epatch "${FILESDIR}"/man-1.6d-fbsd.patch
+	epatch "${FILESDIR}"/man-1.6g-fbsd.patch #138123
 	epatch "${FILESDIR}"/man-1.6e-headers.patch
 	epatch "${FILESDIR}"/man-1.6f-so-search-2.patch
-	epatch "${FILESDIR}"/man-1.6f-compress.patch
+	epatch "${FILESDIR}"/man-1.6g-compress.patch #205147
 	epatch "${FILESDIR}"/man-1.6f-parallel-build.patch #207148 #258916
-	epatch "${FILESDIR}"/man-1.6f-xz.patch #302380
+	epatch "${FILESDIR}"/man-1.6g-xz.patch #302380
 	epatch "${FILESDIR}"/man-1.6f-makewhatis-compression-cleanup.patch #331979
+	epatch "${FILESDIR}"/man-1.6g-echo-escape.patch #523874
 	# make sure `less` handles escape sequences #287183
 	sed -i -e '/^DEFAULTLESSOPT=/s:"$:R":' configure
 }