some file cleanup and a fix for bug 498262

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

5 files changed, 125 insertions, 41 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index b371a70f174a..a3f722e466ad 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/memcached
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.146 2014/01/26 19:58:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.147 2014/01/27 07:19:49 prometheanfire Exp $
+
+*memcached-1.4.17-r1 (27 Jan 2014)
+
+  27 Jan 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +files/memcached-1.4.17-EWOULDBLOCK.patch, +memcached-1.4.17-r1.ebuild,
+  -files/memcached-1.2.2-p-threads.patch:
+  some file cleanup and a fix for bug 498262
 
   26 Jan 2014; Matthew Thode <prometheanfire@gentoo.org>
   -memcached-1.1.12-r3.ebuild, -memcached-1.2.1-r2.ebuild,
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 7f947550a61d..8248aa119e66 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -5,18 +5,14 @@ AUX 1.1.12/conf 636 SHA256 0a5b83267788e429c2be0c4af1ef6a30320e96becab78aaba5af8
 AUX 1.1.12/init 1246 SHA256 21f2c89bd15508d82f9230cd96a3bbf6bd7fd9378668e67fe07e3c787ba81972 SHA512 9f4baf3bdb3b38e0018170343934935b5cc5131fc438bf9175b8c244598afe9554dbcf00f618d96074b0d96fdbf56b15b1795fe8224f11ff079c79a366d94a95 WHIRLPOOL a40107f30cb06a3037315c5b916b452f6da3746d18923493ab814a7c89f1573fe1a54d3652093eba7f1e52b7fb75b5ded2d556982913aa5fa7f32964e4298897
 AUX 1.1.13/conf 639 SHA256 883921447c65b5bb627df3ec330fe61f1ba93c96b63398990da953dc0da0114f SHA512 338ff2f2421fda432b57f3c755611bd0f01f9110e19b52fcf314e73af4cd66b5cc5025cf404e50f7ea6232fecc6c9e3586e91df46c210cba95c089342e320e07 WHIRLPOOL f650c2df92e5345e017de1b5aa77979094ef99d99e3d35bbccea9643567c93c0f88437217885a36925c82e3e17e76555224f622bfefb4ee013998be7755813cb
 AUX 1.1.13/init 1266 SHA256 987739e360c03aaf147c4c57ca5e817c5787bf4ea075d69a8dc9bda326b61767 SHA512 b4e74f6e039155e5bff240d493f1387d9e83f4c01cf1a71cc4cc35b9324b52723b61361156214d01223816057868df3332706f948796d0a6d67919ed4faa14dc WHIRLPOOL 086fba2b83a25d707badfcda856aa48e6aa2eb57583c95dc0bb2dd998a1a54bcfda3e9599e1ed11e4ad0b809823a91b89f8592a57ccf9dcd56e627d477bf967d
-AUX 1.2.4/conf 813 SHA256 0ec5ac0e22e7beed1e601c6606df837724f318c3becef6965e391e98a711dc2e SHA512 6f8b535bcd66b946c5bf710a2897c03b0778c84bdf240b659e7c0298318ac32f11e83cbbcb7ceb900d3b2b00fd2ea3668f8b74739a83b8a38dcd85cf124f5b10 WHIRLPOOL da55a94a03440e6b771a9cc89bc0eab063b93ac8bc66995dd6416e66b52f72558caa0e1d2561de036faceacd5c0e3bc4632ae544a750e4bebd5eff163df4805a
-AUX 1.2.4/init 2083 SHA256 a49d14d469442f602f04380141456dee8cd05412f175f412213dccd789dbe38c SHA512 e512b9be1de867988242f23fe4e0902947bc8e06b7defec65aa036164d29e8edac2a7c2c30c9983ed1439254ba81c06aa7cfd68ef7138026232effbdb910aec6 WHIRLPOOL 5d775ff413ada789dc8908fbfaa7fecd56dd71de5a51afe0922cdb21854ec2aaad16e9b154cd4e4d80a7e2aa95ed82268669257e3b201514292e20c26a877d50
-AUX 1.2.5/conf 811 SHA256 3bf5f7dbcbe8bf8a8a521a55599a1a674243af2541b0de83e674533cb7af9f7f SHA512 f177e6ce060a193ba8d9f2ef93ee1142055ddb400c64d7260036ccda6d4ff33244cba0341d0f4f863505e7949ff38250eceaf75a829082334664f12fdd51cd03 WHIRLPOOL 81f82bc72209b4162774c29a5bf3781cee9563f6b45e686416c162d2472ff3b102e97ed66ea17569cc827ec40cc5ebf74d68a6ff95a5d3d9a7b2976e32e34d77
-AUX 1.2.5/init 2083 SHA256 102bc31f2a8595ae220f0e949029d0bd9aa30bfc086c1c45eff1717ed7a6a75b SHA512 4f24ab93899ff39b2a3a16ef0a2ca0bda9e357914e4a0147666aaf9c56b9cea3542788ddc042020b443168dc463b320d667941fdf654378d941198685fe31c50 WHIRLPOOL 1cec94405cc1ff770afca30ccc3427c468a8baaebb59f424af337857248c9a572295377fa8c07e6941b3dff0ec5aa5fc9398706b180633ef91e9ae0446de529f
 AUX 1.2.6/conf 811 SHA256 7afc0dfb7fb8dbc47c6b41f56fa62f90fec53bef1b3049d3b2a307856bdb984a SHA512 775bcc1bc68ec4236990e951837de7d0babbead2c517117a511b72c0b63a730966901394f575abd38c789763bcddb45abdb97c56bfab570e52df11f1c54a90c1 WHIRLPOOL 483ee83a90f5da7aa0b54f638945a394cc7643e32840bb2c5acedc98714d4523f05d0fa61335ad761f77d010862a4fea503a55ca986f46758681829009f59e85
 AUX 1.2.6/init 2083 SHA256 c5bb5c5c48e5e7df5fe7cd6c0520a2ec419cfb6df65ca292a0be27b8e66fdf4d SHA512 0924859b56f698200c3b85eb566f47fe138d90c6916660071894356c131a6fb6164903c983354a2009386cff4d67782bf3916020e6dec28c97107d5fa4b45b87 WHIRLPOOL db21b7e090c0937de5d1ebc0b7f25c88d94da7220aa76e0e53c6a11382c027a092d36c2d58b933c0b2e8988c56af0783b5bc536ffa334a2bcac7e01c5ed079a8
 AUX 1.3.3/conf 896 SHA256 d8648ea385035632b209acfae27b0a46ec446e58d37de43874d2a41ba13b6923 SHA512 059c16613648bb46ec41e1cab08033cafb7a75c71e9cf961d1e1bfa1219e17a4f528555708fc29d8eedcbd662199c32d7bc5d8ba4418bcabd8e30239bbc8e36c WHIRLPOOL 5ad997342d57f7dcec364e694e606b95ffbbd49ba90e15ad97de7af80e0d38a8a0544db9710e402d6a1a5ba3b19ba71ea1584036f425c762cbe3f21b60a89be3
 AUX 1.3.3/init 2164 SHA256 e697cfe58c19bad40ce084492f6e5af5b70775b14db45b7bbf405f660f0d8bdc SHA512 2eb8634fb46334099294c3fa8ec5fa254f448f852bd8e249de9aeb60369af05b5c86b45f11af9375d7c6fbf53bf0ea021c7be4ab069cf4600c87f1a34aecc2eb WHIRLPOOL e7c6044ec4b154c6bc8367a7e7413c1af2d897f4a7c25e4f208d55f946f95560d66f38e470eeeed681791a2481cea01d628465c3700c7ab3e14de3571c80994b
 AUX memcached-1.2.2-fbsd.patch 328 SHA256 a0e91bd63a01a1a3361b0465fb9c63d091627d8714f3f64c853723b31da54b2f SHA512 efbafa228cc969c49b303e1d746f1699acd3c627ba65f57a8cd9fe63b87c3ce3aa01daa6a767d09c4edb8fdd9159254a0d14e8b6b05263e82041d5d5dcf251a2 WHIRLPOOL eefb5240bd848446f90f68f5b46bfdd9e1559bb3ade827a20082ba3ac72b77e28bf6fa1d7a3d9b7fd6f8cdfe84e2624cdcc14a9ef98ad9d0b73106107ec01a08
-AUX memcached-1.2.2-p-threads.patch 869 SHA256 be6066ca09d2c871d6f0691cc101684512bf7a16c5e823412ed8a98213048e61 SHA512 5a0c0c0aff06656c3c37de7455141e770337db9a5d9e504167755bca6acc20cd572bcd507e26267b35d1430838578e90f97897628dd6fb5e1198cc09402d6c78 WHIRLPOOL f4659123bf8644ed9a6fc0ec7c5a6730f5df5ed5df76cfbeebeca2e67f1e07d459837929bf28c8ccc49c8bba883d31e585715f416daf286a95539765f9fe5dda
 AUX memcached-1.3.3-gcc4-slab-fixup.patch 1051 SHA256 a812ac8711230764408eab9c3379811b7143d799d787d6f1642a45c82967c62d SHA512 7ba91b6add12d7a45d02a425f172052f3762d038eec921c9f2b65afb1cb031acb2bff07c299cf7792894653138afb04fe9924df7939a10559dacff53a8786dd3 WHIRLPOOL 2a8b6c329ad2b6ba1fd1c36d5687e46c50e9be88997d8f44e374cbf83c78018d45aa6dcf6af384d7abc88d0d3bad1fc12db201ef4726fe169863ae3322b62341
 AUX memcached-1.4.0-fix-as-needed-linking.patch 1557 SHA256 bfedf767ee68f83e1e31d78d551d16f644cbfc8d385c991968d6cfdd22946cb8 SHA512 a177f82d13b25a1ee13b02852040289a46b08fba750467026ecd8932d12008c7a276ea4b9b166de3d3371f5e7f9a6e0ef8d15315ab1ec9d10928dd7f40090253 WHIRLPOOL 68a54588b33543083ecb853bd80282dd54c1b8f3a20101bfad5ae95344d8edef297bcd7c8ef94216fdbc112c938b72465f3f34766dedc4323551bd19ba7f69b9
+AUX memcached-1.4.17-EWOULDBLOCK.patch 506 SHA256 c0f2be207fd5a6185c70d16482d1d24931e966fde028ad82f7aaf94023778663 SHA512 6ddd823154a384e7502e138528b8d391b9fe203366c56f14ae38ddb6d8b6394fd0297e5fad90cf94f7bc1e7d90e04e0aab17b545fe3f1d2a55f0e2158e9a98dc WHIRLPOOL bcdb64364d56d1f1d69e2d555e9332f1ae2ab356906e5e46715d864504bbf0b5af73471b11d46aa1839930eb67802e2ba4a97ff1abb036c7c0d5b840a3faebe4
 AUX memcached-1.4.4-as-needed.patch 1135 SHA256 4b08e69c7a3f97e6add4fb337b095b7b0aba55c3d62ed793858cbf1dad036421 SHA512 16f1ebae169d47836a83857e9da1ba4498b061367979d2ec5d271b91c939b1b5655ced68f37653c8996e41266e2daa64c2ae63d787b54d221ce92d544cea722e WHIRLPOOL baf83fc9213b04f35e6c503606f6b6b386ce0b5c50ba173a0cb48e8b7aa5576361b541d9a2af0da34795b64d5d58cbcee62bcb8d50e5695d8fb4ccd0b23137e3
 AUX memcached.confd 872 SHA256 700e2d718cb9d15de92a334cd8fe5f966bc3a34bba32878c1b95b5ce7696963b SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63 WHIRLPOOL 07465aef2fdc867a2e2c4dbad801715f65030ee5d83bc73a38ff887c2cc022ea7b299564b560a315db9ee2bc441cab3d732453c591ca32e82042edcc6ebe4032
 AUX memcached.init 2261 SHA256 e06423a32d23c7c3231f186d1ff89e0e3d92612c81168db7bf23e69926aebdee SHA512 66b6bfea619cdb0d6d118bcfcff06139f9f01d0ef5d01394234c3aab474beca2aab8a749541dd83f4d01d6e725e2d9ce415a5c39f87e316270939f844f845705 WHIRLPOOL e7eac88553c144d95918f64087bbe493540dc5531fe80fc9ef504abbb21a3875c423d5bbccd87015042d46bc6922701fe8d1023256c3b18ca024d6c5be3ae77e
@@ -31,23 +27,24 @@ EBUILD memcached-1.1.13-r3.ebuild 1516 SHA256 08d1a6d7cb4cfe07aab639e1343e218a69
 EBUILD memcached-1.2.6-r1.ebuild 1623 SHA256 68b721cefb4ed0430809c57a64f4b2e3f4970d25c6c3da24c926eb61f7292541 SHA512 9b1a7b2c9ba445aa1dfa06f2bb13ce5cedb8802ce00420722a354e7f5050486be0f6fefc6516e23d51eaee96ece17183ed4666098e37cab713a4770dd7aefabc WHIRLPOOL 0286fbf7ea2a5b9863088b60fca542c3408a37a196d463ab5723a58b641481bce4cd477e7824fe35b8665ef544a4a470422abc5b8a1543291a8e188af690b156
 EBUILD memcached-1.2.8-r1.ebuild 1720 SHA256 fdafda09b3b89f1a09c9072a2030e594c9f365913fe99247cf9f5ca72f413783 SHA512 a73f001ecb8d03cf4af489ab122b12219695cf1cc4a920e13f33f7b0a088b83f315532def2f80a0e7fc3b1abbbf15a9565a05f61394aed53b718d303a5007308 WHIRLPOOL 17c74daf29b75e98426e67a728b383323adab35c4d0a59fdf6bd4fa01d358966ed3638a4a3ed7f963fd8da4d1a48a6167a57374dfdc3c34e109fedfb814fc789
 EBUILD memcached-1.3.3-r5.ebuild 1824 SHA256 e66192d4a4e10fa382a587f6aff61ece0da3651cc576e90433a045bfa91fbb03 SHA512 89ad0576342f26d6328958ebf94e4195c27fa93b317a969055a770e719cac4a3876e0628de395166b0e29384ea98bbd2f24e11adfdcc9e075bdd6d9fbdac152a WHIRLPOOL 05a45c917cb2d7eecff54527fd48183afa16e179e9317ca85410814e7f66563078cd117088ed9dd8c80558e3b5b604be8ff34b8c37ec6ae0e16f29d6375f90c0
+EBUILD memcached-1.4.17-r1.ebuild 2558 SHA256 e460d9879c1e2c5137f83bc993108b12e33de7ec82850fb1efd392f1520246f7 SHA512 b02cd2dd62f4a43978766a49211b67878c1bc29dc86444df9a5d4de92f4f0852f598fd29faa9429ac3443f0ed3919baf801f0dc1c787baab1382cea136b17db3 WHIRLPOOL c716e0668ba7e98ab05e29f4304190277070b5905820e3186c4a9868ca7075796469ad574b043aac002a7d48c9b23f5d12c605400b18a78599af9eb63892ea39
 EBUILD memcached-1.4.17.ebuild 2483 SHA256 aac261b7f4f0264213aa00df9df1670ab36993694e67d80a4849957f6d4e07fc SHA512 687b0d0ef109e81eb1c4133b78801bb4986b566b75165a6fb7655a3f16b4e3c42aa698d6750f4c95e686536d78a934104700bb10adbc35281f1ad8bbe0f7c3fe WHIRLPOOL 119bbde87a5edaf53e91277645b2df9b9e56958bc78b224e13006c5478b3aa8db086e7de372eb78d593a702b6f9125c90be63b37aff59975361019af496c2c20
-MISC ChangeLog 26447 SHA256 b997de27b395aa73a6baabc672a9653593ee43fd029b7d7a50d207dc8ce69f62 SHA512 161b3a2bb9b3fafb58c4fef4fab39c0da6d28b4214ee58185b32642914ac9167b2ed51572b220c2cf545326774792bb739cabe1292ea183adb12e2f5abf62439 WHIRLPOOL 54658b28317d8cd9db0dc352d27fdbd510a0ad6241e486189582e2d82f1bf11d057ed0442b784ee7b30fe60f7df0e6d921df5ea6a01439391199fa2be44eb6a8
+MISC ChangeLog 26702 SHA256 634c9e98c09080975559fc148f7141932f8d5ab3074b4addb027c5192aa61a5a SHA512 0a93bcd5381fc6873d816a4538e4662f198e1734db966390b75e9ecf918f06935adadb6700bca198daf935a583a0a67fdac88123c197e7617c7d80bee2066758 WHIRLPOOL cf6add7ab73f258f76bffe3fc923d1239daead2cf45f5a6692a90ece9ff43ca2a9044da00c7727b20fee80a28d5027d779714163fe5fdd7eaef5670ff4ac63a0
 MISC metadata.xml 1101 SHA256 a99106f3b0f91f0cc6e24f72d60af090d308ae02cffe19b05dc082e26578e253 SHA512 071d36e1df0e820b4c2c536a00e9a69ec7c37269030a516e15f361c28457318f8de8e2e077e3f3ffa8de024d4427a3caa1e0c40ba3527b5205bc1a33d6dc4b94 WHIRLPOOL 0c3fab47e7802256a9960e9380b752c9aab1ee026e4743f0d0d64a4ca97b48b181ec148914f6663cbf903336974ae9ed9cc9acf26eb85d8efb93fc86229ec0f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS5WkbAAoJECRx6z5ArFrDtCAP/0fSht8Ote1jtj/gpYziRQOg
-WRdRJsACPcIZ6Kfiq7xnw65Y0FIQWw0Meskq6nwj/QbJVm+QU3HsOuFbGFRNr+Uq
-t5xcGXEaOYSoqKLhq5N75DDwhF1LD8V6nyuAp07UIB34gdYSfiB0dzJDU/z5+YbV
-uzI0Qz1JB46HuBdj1DbtkemuN7Ykyv+hp+ep3Sobhad7MQL5araXlwQRtzN/pfQW
-Wr8sZO5JqNSADmoajz9KgXsCaJdu/ZaWFGOgeVCgcgR/+jYbIqHGcWW5LHPOatj/
-7PFI51Kq4d0sjGugy2VQ1+J5CbjPuH+AQjqMAg1biNw3VtgnD+GjjhQ/raYPPy47
-edjZ5ndoB9tpwRIgyJW2hNj07QF6jGmCAu+LN918D1n26t5+sZnJK6E/mA63H2VI
-34o8WBVoMYXPFqc0UOjX6yf72e/sCi7EhtXk6YN9EqMUCWl6vT28Nz5xXYx3SMgR
-IEZwKk/FKoX+AMTkcG9gIqhlzVi7rVKLSWSCuAC8cUB8yHu9E6KjEpYxAtlCZt41
-AE+Gtej2YzKzAYAYzTAd+YMgBT19a/MxibROvw/0EDxAa0aB31eesMpPtsS+a2G8
-W4jS1r/4PXa85C0D+IPTu/+Xjtbmuy/8cNa26qGmLfkbVINJyy1JvVIvJLLYBUSk
-WURwQmkEQqXdb4kSB05D
-=lEjb
+iQIcBAEBCAAGBQJS5gjGAAoJECRx6z5ArFrDWSEP+wVpzNPpgCL/HwmvBl7/hdoH
+b9ADr0hdbGsgy8U6KQuOft9j4eClnvzINr1JQioVYTzHVBEe/TAKnePJcP9hYpaU
+ugVryF6afuSHFBKBrdZyJfifc137q/IphXCm2W+GmIMWvGU5ypSUmlO7tDTNY0vn
+kTmZNhBsgKjnQTlXZ2s5kK6u7KPQRJpMXDjguxiRSWo6HZ6RT7A6vGkweSfEwUn9
+K/BWGzZ7S8nRkhfVqxUtI3n8tKRrFMTSu9kSzNPhiXgDN0edtsMfoYXYZSOdLSoA
+0PQOiyqbc5VQqF/xXYXZRyayeUZakuS3j7fhrLOLLOH+kJRPim0lHaWc+oaiI1Cy
+lXzXWHURYajEqXTdGFtsKVBotVSLqO0XuGq+tmNXHi25vwV+MYWPup2kX1rIoRWU
+3kyK/69p3qRI9O1bKl6JSitPWF+MBYx8tmgsTQB+qBjGls0Af+648p1uM9UXYeLj
+sQKIYMe8HHSqrMnBbEiN5ZfIdgHXHsXbZSwsO2579yVKA3lDTEln9JVKuJnWYZ1i
+Fhlq2GwC+cRJa+VP/l/vJEeFMPcuTdfWQWpq8BjkXEeSZzyGmqoHB23ZeNUVlcer
+NsTu3ygefGCnWOTgeUsbple0Hs2oAxJJWA4OMieIFyxLYM5LtVUSv9XYenPjOagB
+XjMTFraIwH8/J91NSoVe
+=8oQ7
 -----END PGP SIGNATURE-----
diff --git a/net-misc/memcached/files/memcached-1.2.2-p-threads.patch b/net-misc/memcached/files/memcached-1.2.2-p-threads.patch
deleted file mode 100644
index 4631ee523d95..000000000000
--- a/net-misc/memcached/files/memcached-1.2.2-p-threads.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-http://lists.danga.com/pipermail/memcached/2007-October/005415.html
-http://bugs.gentoo.org/show_bug.cgi?id=195248 
-Index: /trunk/server/memcached.c
-===================================================================
---- a/trunk/server/memcached.c (revision 595)
-+++ b/trunk/server/memcached.c (revision 604)
-@@ -2698,9 +2698,10 @@
-         exit(EXIT_FAILURE);
-     }
--    /* save the PID in if we're a daemon */
-+    /* start up worker threads if MT mode */
-+    thread_init(settings.num_threads, main_base);
-+    /* save the PID in if we're a daemon, do this after thread_init due to
-+       a file descriptor handling bug somewhere in libevent */
-     if (daemonize)
-         save_pid(getpid(), pid_file);
--    /* start up worker threads if MT mode */
--    thread_init(settings.num_threads, main_base);
-     /* initialise clock event */
-     clock_handler(0, 0, 0);
-
diff --git a/net-misc/memcached/files/memcached-1.4.17-EWOULDBLOCK.patch b/net-misc/memcached/files/memcached-1.4.17-EWOULDBLOCK.patch
new file mode 100644
index 000000000000..115c6bbc8633
--- /dev/null
+++ b/net-misc/memcached/files/memcached-1.4.17-EWOULDBLOCK.patch
@@ -0,0 +1,21 @@
+errno.h(0P):
+    EAGAIN Resource unavailable, try again (may be the same value as [EWOULDBLOCK]).
+
+    [...]
+
+    EWOULDBLOCK
+        Operation would block (may be the same value as [EAGAIN]).
+
+
+--- a/testapp.c
++++ b/testapp.c
+@@ -1840,6 +1840,9 @@
+                 switch (errno) {
+                 case EINTR:
+                     break;
++#if (EAGAIN != EWOULDBLOCK)
++                case EAGAIN:
++#endif
+                 case ENOMEM:
+                 case EWOULDBLOCK:
+                     more = false;
\ No newline at end of file
diff --git a/net-misc/memcached/memcached-1.4.17-r1.ebuild b/net-misc/memcached/memcached-1.4.17-r1.ebuild
new file mode 100644
index 000000000000..a7e13cfcfda4
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.17-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.17-r1.ebuild,v 1.1 2014/01/27 07:19:49 prometheanfire Exp $
+
+EAPI=5
+inherit eutils autotools flag-o-matic user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://code.google.com/p/memcached/"
+SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test slabs-reassign debug sasl" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl
+		 sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	# Handled different upstream
+	#epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init" memcached
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}