From 710c7afebabcce94e331de166d65656ba9e8b403 Mon Sep 17 00:00:00 2001
From: Christian Ruppert <idl0r@gentoo.org>
Date: Sat, 31 Dec 2011 20:36:21 +0000
Subject: Revbump. Don't use deprecated start-stop-daemon options, bug 377311.

Package-Manager: portage-2.1.10.41/cvs/Linux i686
RepoMan-Options: --force
---
 net-misc/memcached/ChangeLog                  | 49 ++++++++++++++++-
 net-misc/memcached/Manifest                   | 58 ++++++++++----------
 net-misc/memcached/files/1.1.12/init          |  7 +--
 net-misc/memcached/files/1.1.13/init          |  7 +--
 net-misc/memcached/files/1.2.4/init           |  6 +-
 net-misc/memcached/files/1.2.5/init           |  6 +-
 net-misc/memcached/files/1.2.6/init           |  6 +-
 net-misc/memcached/files/1.3.3/init           |  6 +-
 net-misc/memcached/files/conf                 | 22 --------
 net-misc/memcached/files/init                 | 24 --------
 net-misc/memcached/memcached-1.1.12-r2.ebuild | 46 ----------------
 net-misc/memcached/memcached-1.1.12-r3.ebuild | 46 ++++++++++++++++
 net-misc/memcached/memcached-1.1.13-r1.ebuild | 52 ------------------
 net-misc/memcached/memcached-1.1.13-r2.ebuild | 53 ++++++++++++++++++
 net-misc/memcached/memcached-1.1.13-r3.ebuild | 52 ++++++++++++++++++
 net-misc/memcached/memcached-1.1.13.ebuild    | 53 ------------------
 net-misc/memcached/memcached-1.2.1-r1.ebuild  | 50 -----------------
 net-misc/memcached/memcached-1.2.1-r2.ebuild  | 50 +++++++++++++++++
 net-misc/memcached/memcached-1.2.4-r1.ebuild  | 59 ++++++++++++++++++++
 net-misc/memcached/memcached-1.2.4.ebuild     | 59 --------------------
 net-misc/memcached/memcached-1.2.5-r1.ebuild  | 59 ++++++++++++++++++++
 net-misc/memcached/memcached-1.2.5.ebuild     | 59 --------------------
 net-misc/memcached/memcached-1.2.6-r1.ebuild  | 59 ++++++++++++++++++++
 net-misc/memcached/memcached-1.2.6.ebuild     | 59 --------------------
 net-misc/memcached/memcached-1.2.8-r1.ebuild  | 61 +++++++++++++++++++++
 net-misc/memcached/memcached-1.2.8.ebuild     | 61 ---------------------
 net-misc/memcached/memcached-1.3.0-r1.ebuild  | 59 ++++++++++++++++++++
 net-misc/memcached/memcached-1.3.0.ebuild     | 59 --------------------
 net-misc/memcached/memcached-1.3.3-r1.ebuild  | 62 ---------------------
 net-misc/memcached/memcached-1.3.3-r2.ebuild  | 63 ---------------------
 net-misc/memcached/memcached-1.3.3-r3.ebuild  | 61 +++++++++++++++++++++
 net-misc/memcached/memcached-1.3.3-r4.ebuild  | 62 +++++++++++++++++++++
 net-misc/memcached/memcached-1.3.3-r5.ebuild  | 63 +++++++++++++++++++++
 net-misc/memcached/memcached-1.3.3.ebuild     | 61 ---------------------
 net-misc/memcached/memcached-1.4.0-r1.ebuild  | 68 -----------------------
 net-misc/memcached/memcached-1.4.0-r2.ebuild  | 63 +++++++++++++++++++++
 net-misc/memcached/memcached-1.4.0-r3.ebuild  | 68 +++++++++++++++++++++++
 net-misc/memcached/memcached-1.4.0.ebuild     | 63 ---------------------
 net-misc/memcached/memcached-1.4.1-r1.ebuild  | 68 +++++++++++++++++++++++
 net-misc/memcached/memcached-1.4.1.ebuild     | 68 -----------------------
 net-misc/memcached/memcached-1.4.10-r1.ebuild | 79 +++++++++++++++++++++++++++
 net-misc/memcached/memcached-1.4.10.ebuild    | 79 ---------------------------
 net-misc/memcached/memcached-1.4.2-r1.ebuild  | 75 +++++++++++++++++++++++++
 net-misc/memcached/memcached-1.4.2.ebuild     | 75 -------------------------
 net-misc/memcached/memcached-1.4.4-r1.ebuild  | 79 +++++++++++++++++++++++++++
 net-misc/memcached/memcached-1.4.4.ebuild     | 79 ---------------------------
 net-misc/memcached/memcached-1.4.5-r1.ebuild  | 79 +++++++++++++++++++++++++++
 net-misc/memcached/memcached-1.4.5.ebuild     | 79 ---------------------------
 net-misc/memcached/memcached-1.4.7-r1.ebuild  | 79 +++++++++++++++++++++++++++
 net-misc/memcached/memcached-1.4.7.ebuild     | 79 ---------------------------
 net-misc/memcached/memcached-1.4.8-r1.ebuild  | 79 +++++++++++++++++++++++++++
 net-misc/memcached/memcached-1.4.8.ebuild     | 79 ---------------------------
 52 files changed, 1443 insertions(+), 1454 deletions(-)
 delete mode 100644 net-misc/memcached/files/conf
 delete mode 100644 net-misc/memcached/files/init
 delete mode 100644 net-misc/memcached/memcached-1.1.12-r2.ebuild
 create mode 100644 net-misc/memcached/memcached-1.1.12-r3.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.1.13-r1.ebuild
 create mode 100644 net-misc/memcached/memcached-1.1.13-r2.ebuild
 create mode 100644 net-misc/memcached/memcached-1.1.13-r3.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.1.13.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.2.1-r1.ebuild
 create mode 100644 net-misc/memcached/memcached-1.2.1-r2.ebuild
 create mode 100644 net-misc/memcached/memcached-1.2.4-r1.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.2.4.ebuild
 create mode 100644 net-misc/memcached/memcached-1.2.5-r1.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.2.5.ebuild
 create mode 100644 net-misc/memcached/memcached-1.2.6-r1.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.2.6.ebuild
 create mode 100644 net-misc/memcached/memcached-1.2.8-r1.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.2.8.ebuild
 create mode 100644 net-misc/memcached/memcached-1.3.0-r1.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.3.0.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.3.3-r1.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.3.3-r2.ebuild
 create mode 100644 net-misc/memcached/memcached-1.3.3-r3.ebuild
 create mode 100644 net-misc/memcached/memcached-1.3.3-r4.ebuild
 create mode 100644 net-misc/memcached/memcached-1.3.3-r5.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.3.3.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.4.0-r1.ebuild
 create mode 100644 net-misc/memcached/memcached-1.4.0-r2.ebuild
 create mode 100644 net-misc/memcached/memcached-1.4.0-r3.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.4.0.ebuild
 create mode 100644 net-misc/memcached/memcached-1.4.1-r1.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.4.1.ebuild
 create mode 100644 net-misc/memcached/memcached-1.4.10-r1.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.4.10.ebuild
 create mode 100644 net-misc/memcached/memcached-1.4.2-r1.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.4.2.ebuild
 create mode 100644 net-misc/memcached/memcached-1.4.4-r1.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.4.4.ebuild
 create mode 100644 net-misc/memcached/memcached-1.4.5-r1.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.4.5.ebuild
 create mode 100644 net-misc/memcached/memcached-1.4.7-r1.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.4.7.ebuild
 create mode 100644 net-misc/memcached/memcached-1.4.8-r1.ebuild
 delete mode 100644 net-misc/memcached/memcached-1.4.8.ebuild

(limited to 'net-misc/memcached')

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index 2e0281b6c3b9..4f7f16b8bf07 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,53 @@
 # ChangeLog for net-misc/memcached
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.117 2011/11/16 08:52:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.118 2011/12/31 20:36:19 idl0r Exp $
+
+*memcached-1.4.10-r1 (31 Dec 2011)
+*memcached-1.4.8-r1 (31 Dec 2011)
+*memcached-1.4.7-r1 (31 Dec 2011)
+*memcached-1.4.5-r1 (31 Dec 2011)
+*memcached-1.4.4-r1 (31 Dec 2011)
+*memcached-1.4.2-r1 (31 Dec 2011)
+*memcached-1.4.1-r1 (31 Dec 2011)
+*memcached-1.4.0-r3 (31 Dec 2011)
+*memcached-1.4.0-r2 (31 Dec 2011)
+*memcached-1.3.3-r5 (31 Dec 2011)
+*memcached-1.3.3-r4 (31 Dec 2011)
+*memcached-1.3.3-r3 (31 Dec 2011)
+*memcached-1.3.0-r1 (31 Dec 2011)
+*memcached-1.2.8-r1 (31 Dec 2011)
+*memcached-1.2.6-r1 (31 Dec 2011)
+*memcached-1.2.5-r1 (31 Dec 2011)
+*memcached-1.2.4-r1 (31 Dec 2011)
+*memcached-1.2.1-r2 (31 Dec 2011)
+*memcached-1.1.13-r3 (31 Dec 2011)
+*memcached-1.1.13-r2 (31 Dec 2011)
+
+  31 Dec 2011; Christian Ruppert <idl0r@gentoo.org>
+  -memcached-1.1.12-r2.ebuild, +memcached-1.1.12-r3.ebuild,
+  -memcached-1.1.13.ebuild, -memcached-1.1.13-r1.ebuild,
+  +memcached-1.1.13-r2.ebuild, +memcached-1.1.13-r3.ebuild,
+  -memcached-1.2.1-r1.ebuild, +memcached-1.2.1-r2.ebuild,
+  -memcached-1.2.4.ebuild, +memcached-1.2.4-r1.ebuild, -memcached-1.2.5.ebuild,
+  +memcached-1.2.5-r1.ebuild, -memcached-1.2.6.ebuild,
+  +memcached-1.2.6-r1.ebuild, -memcached-1.2.8.ebuild,
+  +memcached-1.2.8-r1.ebuild, -memcached-1.3.0.ebuild,
+  +memcached-1.3.0-r1.ebuild, -memcached-1.3.3.ebuild,
+  -memcached-1.3.3-r1.ebuild, -memcached-1.3.3-r2.ebuild,
+  +memcached-1.3.3-r3.ebuild, +memcached-1.3.3-r4.ebuild,
+  +memcached-1.3.3-r5.ebuild, -memcached-1.4.0.ebuild,
+  -memcached-1.4.0-r1.ebuild, +memcached-1.4.0-r2.ebuild,
+  +memcached-1.4.0-r3.ebuild, -memcached-1.4.1.ebuild,
+  +memcached-1.4.1-r1.ebuild, -memcached-1.4.2.ebuild,
+  +memcached-1.4.2-r1.ebuild, -memcached-1.4.4.ebuild,
+  +memcached-1.4.4-r1.ebuild, -memcached-1.4.5.ebuild,
+  +memcached-1.4.5-r1.ebuild, -memcached-1.4.7.ebuild,
+  +memcached-1.4.7-r1.ebuild, -memcached-1.4.8.ebuild,
+  +memcached-1.4.8-r1.ebuild, -memcached-1.4.10.ebuild,
+  +memcached-1.4.10-r1.ebuild, files/1.1.12/init, files/1.1.13/init,
+  files/1.2.4/init, files/1.2.5/init, files/1.2.6/init, files/1.3.3/init,
+  -files/conf, -files/init:
+  Revbump. Don't use deprecated start-stop-daemon options, bug 377311.
 
 *memcached-1.4.10 (16 Nov 2011)
 
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 85b276d1d332..e32a1ddaa753 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1,17 +1,15 @@
 AUX 1.1.12/conf 636 RMD160 4bae6b67ae0941e74f6f494568ae026949ebd6fa SHA1 5d78a2ff7709510c9b6920bd1bf7e044708063b4 SHA256 0a5b83267788e429c2be0c4af1ef6a30320e96becab78aaba5af8d7eb8ff3ee2
-AUX 1.1.12/init 1284 RMD160 c3456498f58e7d20e1eecd764b5b10000ab034f5 SHA1 bad69ee734ba9fd4243b1175a4bccb423cbcfe3a SHA256 3981a78a1a77297f882163cf3e8c8352eb96afaf0820797ff12a40b90e23eef7
+AUX 1.1.12/init 1246 RMD160 e360b332f4cddc7a0fb4e8d82fcc16ea6806ca5b SHA1 76d9523dd0f9d63f3e43724e320b8a9f7d679d13 SHA256 21f2c89bd15508d82f9230cd96a3bbf6bd7fd9378668e67fe07e3c787ba81972
 AUX 1.1.13/conf 639 RMD160 1ef3957a92d2e894c6ee533fde289b1b866d1387 SHA1 711cf870976c33b5bebb521abd46ca10b36be82c SHA256 883921447c65b5bb627df3ec330fe61f1ba93c96b63398990da953dc0da0114f
-AUX 1.1.13/init 1307 RMD160 9c9f260b60dc89b06a365ca9a694669679dfe423 SHA1 b6d64c68edc856643a7e54b227b6ef3176f9a184 SHA256 abea96e396dd47c46cdb79ae6339d00a2af549016c02135e889df055633c52cc
+AUX 1.1.13/init 1266 RMD160 b157a5588b3de085ce9f0b9dfb4aed306aec2728 SHA1 6756e5acd5c9645f5ddaff924ed2b4bfe0ab8565 SHA256 987739e360c03aaf147c4c57ca5e817c5787bf4ea075d69a8dc9bda326b61767
 AUX 1.2.4/conf 813 RMD160 b299bd4c1b30da82ff97bef6c53ebb742250cba5 SHA1 fa1d7d8a288e793558bad624df1f71fb94b136f4 SHA256 0ec5ac0e22e7beed1e601c6606df837724f318c3becef6965e391e98a711dc2e
-AUX 1.2.4/init 2124 RMD160 54926ee68c86e7e0607649ab6e69a831553eafff SHA1 706a3d3403c52e8b467af778be7c3d4bbf518ef0 SHA256 fe09e6dd9b0a83dd4d9265c6bd689c17866b396be1bf98daff7d0c6b5f329820
+AUX 1.2.4/init 2083 RMD160 4ac391ff3c99c4acff8d8f804f1a8faee6d177d4 SHA1 85cfdce2698feb6aae4684c01f456bcd471104a5 SHA256 a49d14d469442f602f04380141456dee8cd05412f175f412213dccd789dbe38c
 AUX 1.2.5/conf 811 RMD160 816215be39e3bdb3163df90c88e864337d47e37a SHA1 8a38d0322f894b3afc60d3a5657dcb0f7c16af2f SHA256 3bf5f7dbcbe8bf8a8a521a55599a1a674243af2541b0de83e674533cb7af9f7f
-AUX 1.2.5/init 2122 RMD160 5fd5deba348febbf2d5396404225486d0d0edb41 SHA1 2a0309dbdaed5ce2aef09fe8ab9e5125ee98e9b2 SHA256 27cfbb1be26725327bd3abc9e7702ff34b805c6361221ecb4d21b51f037db4c0
+AUX 1.2.5/init 2083 RMD160 a83be1a8b437f7da55319f15f27147d5df92b332 SHA1 5ed66b909d0312301d13930011a68b91932ac462 SHA256 102bc31f2a8595ae220f0e949029d0bd9aa30bfc086c1c45eff1717ed7a6a75b
 AUX 1.2.6/conf 811 RMD160 2c8c13c4f2d112e4c1925ae87d50be50cfb29351 SHA1 3c0cb7c59553bf05952341feccd11f1dcdccc149 SHA256 7afc0dfb7fb8dbc47c6b41f56fa62f90fec53bef1b3049d3b2a307856bdb984a
-AUX 1.2.6/init 2122 RMD160 187519a373a768deec455775d073b8d3b704a1c4 SHA1 2bddef6ebc95c07b04d4f67c3070393f52961fa4 SHA256 d1f3485e52ed27b766acecfd21028ff4c1c202d06a3403a9625e3441b2071563
+AUX 1.2.6/init 2083 RMD160 eca56e9b63c9a36d0cfc8470f3a84a0c6a596f77 SHA1 d75debd2ca41c0131998f702e9b84d7664b4bfa8 SHA256 c5bb5c5c48e5e7df5fe7cd6c0520a2ec419cfb6df65ca292a0be27b8e66fdf4d
 AUX 1.3.3/conf 896 RMD160 19e6a55b77c9e9b48dec0185e70015ed63809bbf SHA1 287af1e355054c3ef53041ac5196e771caf97dd0 SHA256 d8648ea385035632b209acfae27b0a46ec446e58d37de43874d2a41ba13b6923
-AUX 1.3.3/init 2320 RMD160 d4faf07df1939a1f79189c67cc45daedc38e6a07 SHA1 a07e8aa811914ef86577caebd245d69bbe82defd SHA256 e4b6415c5501963d2ce421aab9d595736091bc895b8f3762e746593f7d736792
-AUX conf 537 RMD160 5de199b3d9a76ef0efed7ee6105594e904e9f8ad SHA1 5213df426a6bb9f19893fdbc77a5e060dc3ab8b4 SHA256 c93f522dd0fdcdd8c92c34114bc830b66edbd612f464a648c313ddc3f1ec00dd
-AUX init 571 RMD160 ddaa6e2e9464618920cc3b6cb02d7ded1d164bdb SHA1 db92dc23707f261bdaa23b692a22b1495c3195fd SHA256 8ae8fa692c9dec80403840205cfb16295b843392f446bd8dc7715607bc43d31f
+AUX 1.3.3/init 2279 RMD160 4c77e236f28a60abc1d2021f356b6f846fcbc1fa SHA1 c9e040ee9875e6ec140242d5c2828deecdfff416 SHA256 532c3d3255ee65d63842ebf5d7f3d5e522803273f1d76c48520d4731dee3153d
 AUX memcached-1.2.2-fbsd.patch 328 RMD160 669542854d9cbca5495db2ac2fe280502dbe96e6 SHA1 c783c1f1b89da8f61f170641dcf4d0987b9c3b08 SHA256 a0e91bd63a01a1a3361b0465fb9c63d091627d8714f3f64c853723b31da54b2f
 AUX memcached-1.2.2-p-threads.patch 869 RMD160 1b1673479b543515b67a284bfd38876f235e5fba SHA1 6345377ac93ef302386abae8e7ab9c273a4e3a98 SHA256 be6066ca09d2c871d6f0691cc101684512bf7a16c5e823412ed8a98213048e61
 AUX memcached-1.3.3-gcc4-slab-fixup.patch 1051 RMD160 846caa1cbb5aeb4cb8f976b260d3c8cebf489715 SHA1 bcf25452ab529440a61334be14c8271343c48f87 SHA256 a812ac8711230764408eab9c3379811b7143d799d787d6f1642a45c82967c62d
@@ -34,26 +32,26 @@ DIST memcached-1.4.4.tar.gz 297920 RMD160 9d10ce383684bf94f4c169471e1ca49d271653
 DIST memcached-1.4.5.tar.gz 302516 RMD160 c1f534fbc585a1ea033bbd12d6fc94c77a085032 SHA1 c7d6517764b82d23ae2de76b56c2494343c53f02 SHA256 9571b4b85484e46b3b10f07ccba77a1fa97d60660b32859f990effefb3005f91
 DIST memcached-1.4.7.tar.gz 307741 RMD160 95bad7c299721fd0d6ff7c0e4b36314a7a29c792 SHA1 09e6ba550ea9f55b3116cd084b23ea2b923f9b41 SHA256 925837a4cf440e3cb451e338413ed9ad1429fd0d80ba4d903955f5fed8da7be6
 DIST memcached-1.4.8.tar.gz 311398 RMD160 1f24abccce58375c0490302d7f539d105b012b39 SHA1 1a06a391b6baca6f70a58922d2daa29773b03e35 SHA256 9c640e99cc0ccfbea9483cfb8d41bb9f084d30d6f818cd235bf4ba4248b08512
-EBUILD memcached-1.1.12-r2.ebuild 1239 RMD160 33f5f859b1f29674e8670524a5ae08be025c3f52 SHA1 ffd0b62a858f89b82a9e955e5ed87c8ceca665d9 SHA256 70793be39fb3fd35516868e00d8406d2e721ff0a4f6af2f92b237eb328e64d99
-EBUILD memcached-1.1.13-r1.ebuild 1638 RMD160 dec94934ef333ce82957982a87efe822bf93f7b4 SHA1 0de155e965ab1d73acf1ecec2ec4d6a68b348093 SHA256 80e929b814fe3bdd8c1696726cbb73cc7f15fd454388bab2ddf06c8b227de332
-EBUILD memcached-1.1.13.ebuild 1629 RMD160 17d29a1b9339f5d7bef3495058e59b941cda057e SHA1 3b5ef6cb7f43ddbbcdf7c370548ce52b97920097 SHA256 45c959a62b927445416fd2abd4b37d0351cbd98f2f27a529eb4e95cf2b8f0513
-EBUILD memcached-1.2.1-r1.ebuild 1620 RMD160 a135abe0416575dc4285d4f5f912e33030389e9b SHA1 68d46909aa0870da09b1efea62963e0b331a9208 SHA256 e5892e109ae0e02a867da4e22fe68de5c31f91ef058444e9a2368b705a70e640
-EBUILD memcached-1.2.4.ebuild 1614 RMD160 13e81ae7447df0b3a8e2f61465d5db29511fcf80 SHA1 6f980ddea7079c12cfc8915e62b89ae15ce852bb SHA256 2e72ffc951dfd214068b73ada8787067dc38cf926b012c61acb2cc4921fc22dc
-EBUILD memcached-1.2.5.ebuild 1616 RMD160 8929b79853d4516fa46d5c501c5cc384ff7c15ab SHA1 b51eaf9c22be194868b76d83f5fc5bd982f16d44 SHA256 3bace3fa474e0f757bafee5428dff31e2f9750693eb60d3f4ad70f2681163086
-EBUILD memcached-1.2.6.ebuild 1615 RMD160 6f27c376b744894cbc7e45469840c182d4e8b479 SHA1 2af5edbcf50d06b1145da8e988b2f8befb752078 SHA256 c11c2ed113f0dc403ffb4e0cac72dad7f07dc1f9d2210deb540345f1d791dcd6
-EBUILD memcached-1.2.8.ebuild 1712 RMD160 3759092b2b9393a908a1a551d639a9fddb739c6a SHA1 1e7b0b8373fea7348e2076928e70d1fa20065099 SHA256 d944e1e12148f8d657de06d805a0a1d30ba9f89b03ba4f1134d0e61b996eeed1
-EBUILD memcached-1.3.0.ebuild 1626 RMD160 58827e010e169540c96b81deacc37e5a0aab2043 SHA1 6b1cf11ad8c2b6f619ace2689e26f8ec0cff5ecb SHA256 fc15c447bf031d1acf246b28d98460ada9cf52b6d9d7b82e55391c19ad052f79
-EBUILD memcached-1.3.3-r1.ebuild 1806 RMD160 65cb1604dd20ad81104d196bfb6ead0d57ff5cee SHA1 4cd2a308cf9b91dde4668a521bd7858165dad00a SHA256 983eef21af6d44b2685df6413e92a2c508422a6ce1e71aae203329b21dd65cd3
-EBUILD memcached-1.3.3-r2.ebuild 1819 RMD160 01630571e76e9d79e8ec06ddd7cd6ad1b6aaabd0 SHA1 bcb06a17ba7f947b2a309913472452d5178a2943 SHA256 41230a631a7bbd3d86ae12e1994f6d5f66191d5f94ed52c24838ce549b7a574a
-EBUILD memcached-1.3.3.ebuild 1714 RMD160 70359cf49548ad62315ed217c56f0987eb71c48c SHA1 eb8a43677aee0bf9623b997362e436ad2e1005e8 SHA256 e1d10d1c532cb9833248dd8fea30f029025092da83896b9d20298b333f22dd62
-EBUILD memcached-1.4.0-r1.ebuild 2241 RMD160 13e61e663cd021d434c8942a655a5d8f785ea61f SHA1 765640ecf3f77a7f498fd119b7af3f2f1092c1f8 SHA256 b26e28ddfeacb8163a85de77e5b3a1cda087e5b3ec57648da1ea4de7a30dc5a6
-EBUILD memcached-1.4.0.ebuild 1827 RMD160 2fee4f19753cb8760ce69a59a1534551f573b440 SHA1 4ae001c1b7616326255bbf8eb7af14771474f7cc SHA256 6f999dc74e4c98995da76bea11a305654dc34e77a1697c4e43e195736b7e2f44
-EBUILD memcached-1.4.1.ebuild 2229 RMD160 b9ddaa79b0d94841bc4a95a5ca83327eafc71cc6 SHA1 ea541cdcef71baca83ceba984fdd7c87a54d8e0e SHA256 1db27147362a96209fb653a0c4e1b66008ecdd888ab9d45fcbbc09c21ee589e3
-EBUILD memcached-1.4.10.ebuild 2602 RMD160 a4eb4cde279b353c093c2f184d6013d0267aa9ab SHA1 3339e8a636b01609b4e1ae6458a2668c886cbdcc SHA256 ca4a1f186bdcb32e319fa990f5ac9e54b7c3e983965c1274574c4931ab3305e0
-EBUILD memcached-1.4.2.ebuild 2418 RMD160 3c5125a46925c0ad9cac9c84dc71de7e2815f1a2 SHA1 5a699f07e96c8ca57c8719ea3a87d70744f3a82d SHA256 bb538d36c687f0fb31fa093fb74a1dbd6c14a6513defcab76331c880a2316213
-EBUILD memcached-1.4.4.ebuild 2599 RMD160 d91d7f3a4ab6b6d51f767bf9924376e3b2f7d4f2 SHA1 9e742e8275a5da1e486e66b07293adb62ff5c6a3 SHA256 7716eccb290d304d1ec9882981603f9ade32c7457ff42cafdf66b6562e8c9c07
-EBUILD memcached-1.4.5.ebuild 2590 RMD160 3590a434178c00e3ddf3d5156f5c6849f6716076 SHA1 4e9774b5f42c6b6353dce5c9f934fc56c09987f1 SHA256 eb945f48f9dc0ebe67f8405bea20c1acbce06091193ca02efcc211a7d23fcdec
-EBUILD memcached-1.4.7.ebuild 2601 RMD160 d9bba19b6c7b51f562aa0b4571760acb3cd91a01 SHA1 f13a3a9531fcf278e27f1115fa0e483c00ece249 SHA256 e4fd1cc0e578bac857b4fe1e3d6aec031f9db39e8c0d59f98613557dd61c57e6
-EBUILD memcached-1.4.8.ebuild 2601 RMD160 b2abd8d0da618e4d3046b742663c648c5a8faba4 SHA1 363a1cee564078c6198b8020dfe9e9fc3148103c SHA256 62ab3f9342d9b07086cd3812a4fb395f7b7b979af1b722787d5e65367ab654c4
-MISC ChangeLog 19286 RMD160 3ff06bbc17ab97cadd40148ad24499db1aa55421 SHA1 766231d72e83b42eecd97fb863493d64b00f74ec SHA256 93f9f6e8dc69b9d29b25da038b1a4f027e93f62c1b068b4f9461ae521ad05945
+EBUILD memcached-1.1.12-r3.ebuild 1236 RMD160 e8617a2e9dde06c3ddd229983586923844223b08 SHA1 b9b89bf2bb3b64ab5b981ce0f69cf79409461427 SHA256 ea61b4a021109dddf3742251895db045c564eb56e83572cddc528716da3cb143
+EBUILD memcached-1.1.13-r2.ebuild 1629 RMD160 fb6beb8e6f24748700b031ddefddaf060c064b7d SHA1 926cb01c46799076bd359914e83a701b80317d0a SHA256 930e34bbc918454f1107a1de1f05ff392b0061503aaa0c26bc40159baf9fb4fd
+EBUILD memcached-1.1.13-r3.ebuild 1636 RMD160 ed16e24301209588d21e7c85f6fc082b9789830e SHA1 1bcd5bfab345dca41dac92e1d45fd4aebad17f1b SHA256 094d4f12cee57ea6d63f68b6179e5dd2f6c01b7f8d6c0e05e257b1df50e5cd7c
+EBUILD memcached-1.2.1-r2.ebuild 1617 RMD160 fde1390c730654cfe746b009589f31bede68bc96 SHA1 f5045e2a2bf307eee58ab8b83f1f5f9bd763dbca SHA256 19e1d4266a3bb106b1de397084a3f817f1b3189314391025873d3755e75e269d
+EBUILD memcached-1.2.4-r1.ebuild 1616 RMD160 116f1785676bfa72bdb07d89ba4cfbb2422800f4 SHA1 ebdd9d94b3cf05854483b044e8d35017c619536e SHA256 eaf97df051346b3aecb4b39ff57b866da5c37a90b63f09b747a52de0f61a0b23
+EBUILD memcached-1.2.5-r1.ebuild 1617 RMD160 29688aa7182d9b381600818edac57d6ce3dc06bc SHA1 fa50efa9ff123ee5a08041c95ad7055d2b362cb3 SHA256 d4b973b3883f809623f961dfd83d3a77d189669883440bbba58e961145e88be7
+EBUILD memcached-1.2.6-r1.ebuild 1617 RMD160 b0a76e2d5ad44ebbbdb3e7ff679a5b3ad1ade7d8 SHA1 dee5b2873a3d6b88f0f9caa9bb54b9ddc09e6870 SHA256 473f9dd299231a9b9b4672f1c601020beed6b45412d9618742bd9e46816a6446
+EBUILD memcached-1.2.8-r1.ebuild 1714 RMD160 1369dbbbafbb6c6c3d7df86801cf354a24be80fc SHA1 0fbb93d002ae464384b7bec84ba31b23b0a8579b SHA256 60ddebafbb7244fb03319323c9cc4aec0c609dc5c037061989cefc476d760852
+EBUILD memcached-1.3.0-r1.ebuild 1627 RMD160 891945c7b21ec1b686185c1814dcb3bfc6d0167b SHA1 bb8d2ae8c0aa6fc35fdf9b71c135e1bce6e968a9 SHA256 b3684404d7055c7995a95e544cc94fab28a44fbef606cc411f92a0dc37fe7ad6
+EBUILD memcached-1.3.3-r3.ebuild 1715 RMD160 1d7a0dad1d874060eb1d24997389ba8b4cbf9a68 SHA1 54e86e0e799b3343fbd9f4eebe6a7f0b0fa43118 SHA256 fb3baa3f448a0dd80bc283c2c4ba97e5cdc5f34041a7b79fec8c8715fd73d94a
+EBUILD memcached-1.3.3-r4.ebuild 1802 RMD160 f4b19969a9d189e81ce07e24ed0867a2841a862a SHA1 187324feb95b34674626d0ae72230b655ff00b7b SHA256 f5208639c8233ac68b38f7cb6a3bb306d8105811449767f6b979a3cf7fb9c2c3
+EBUILD memcached-1.3.3-r5.ebuild 1818 RMD160 ede28d9ea9970bfacf74e4e3fde1895e353c68ef SHA1 372391b38ae980c36153ea41248a106c29da0794 SHA256 e15e34a87b47a02c379a8e346ace87a501a21b3403b67c1e8bcff1f4523964df
+EBUILD memcached-1.4.0-r2.ebuild 1828 RMD160 6a0d49102ad2779207722ac133699e55fa9ee1b5 SHA1 91c53bd7511e051b2d32e514b2531d4d707627a3 SHA256 48e9c85525fc3d078790c09cfe9faf570da22ffb7942bb3b60b1823ade9f9701
+EBUILD memcached-1.4.0-r3.ebuild 2239 RMD160 65b8d688b4233f0ac7eb41c5b383fd70c9f9b12c SHA1 683ec9f7164526592e20ac126f857c9f7e6cf5c1 SHA256 7dfb71056e7f166a98aca923993acf3a940292eca63fa830a5b77e5524734abf
+EBUILD memcached-1.4.1-r1.ebuild 2230 RMD160 f8d17fd734576d854e11cfa62fac8645b9f493da SHA1 3b5dd756d0e33d59c831e1cdfde40dfca27898eb SHA256 c2ad7e3d4e30897f81dea30ea0e64197b0a3f3407d0f734fbff5e461b65c8b24
+EBUILD memcached-1.4.10-r1.ebuild 2603 RMD160 8b9ecab36e04886ac25e016d0d92cb98aac07019 SHA1 9840a3c588223a81e6f6828e495083ff8a853dd5 SHA256 cac6fe2b37f1920329c3c0dda8a58385c392c87c99b66758251b100464c9b264
+EBUILD memcached-1.4.2-r1.ebuild 2417 RMD160 5ab6bb9041116d7f531b297de52df7b2516faaa4 SHA1 512bef664cabe2066460d4832a4e382e2aa6957c SHA256 78f491aa0855c3b4306b15493a1fc754a86fa8bcbbfd1844e848d3529b1112f5
+EBUILD memcached-1.4.4-r1.ebuild 2602 RMD160 abe7ef1f8b09c64f8d413830bf49f10cffe6742e SHA1 da269a5da6b9b9c8c2e51a535ed342fa80a5dbe0 SHA256 a28113c9355d915ef2fea228f81eeefdc53366da57587b3542bc7b4a3e5a57ae
+EBUILD memcached-1.4.5-r1.ebuild 2592 RMD160 0d7950af3aaad5e5e7cf5937487ab75bee8fc43c SHA1 d452affcc914e839006e1b4ffed1aae97103b3c2 SHA256 b14c4cca81bf950131b054fe1b5dec34f3f642de6d4f6e7e2c1915d72a3c26f0
+EBUILD memcached-1.4.7-r1.ebuild 2602 RMD160 95c06685003c4d5ba371c82cdb2d132703bd3f97 SHA1 f9376403145aae634a1a5cb441b7c70b0f71e029 SHA256 d56804f7648a2596649d0449cc28611693e7c1e911f8e54961fca7f8585c36a9
+EBUILD memcached-1.4.8-r1.ebuild 2602 RMD160 aa349ee2abe00350f781283adba58fec8d14a81d SHA1 ba04bb4675a0a32fbc318d593da5406c6ae2f606 SHA256 7638ab59ed091f0ff599041830331df3b0f0f251b3240f4d2c5157395e46d700
+MISC ChangeLog 21413 RMD160 bf01fdc11b4c0c65f0e911fd8c4ea3eac919c4f7 SHA1 7bac984af5572d4d5b340b049f81b839e6ffb4db SHA256 361f6dfc61a24fb78b27ba2a92f56760a0d57e9684d1c232f3bf8b4d4c2b8231
 MISC metadata.xml 945 RMD160 236fa2698012cf40d7f5afb7421314c0292127f6 SHA1 13c240d34e1d80da54cce5f96e22e1929e7a5ba6 SHA256 643e8b688c25a04137d9e1a2818a8668fc6700c96d09b00c0321302a0ad77c28
diff --git a/net-misc/memcached/files/1.1.12/init b/net-misc/memcached/files/1.1.12/init
index 28f339521c46..f3409c0c76f8 100644
--- a/net-misc/memcached/files/1.1.12/init
+++ b/net-misc/memcached/files/1.1.12/init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.1.12/init,v 1.3 2005/12/29 11:55:01 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.1.12/init,v 1.4 2011/12/31 20:36:20 idl0r Exp $
 
 depend() {
 	need net
@@ -10,7 +10,6 @@ checkconfig() {
           ewarn "You should edit /etc/conf.d/memcached and specify an address to listen on."
           ewarn "Listening on any address (I hope your firewall is set up properly)"
         fi
-
 }
 
 start() {
@@ -32,9 +31,9 @@ start() {
         else
           c_LISTENON="-l ${LISTENON}"
         fi
-        
+
 	/sbin/start-stop-daemon --start \
-	        --exec ${MEMCACHED_BINARY} --startas ${MEMCACHED_BINARY} -- \
+	        --exec ${MEMCACHED_BINARY} -- \
 	        -d -p ${PORT} ${c_LISTENON} -m ${MEMUSAGE} \
 		-c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P ${PIDFILE} ${MISC_OPTS}
 	eend $?
diff --git a/net-misc/memcached/files/1.1.13/init b/net-misc/memcached/files/1.1.13/init
index 662d6488d284..13b67b4c6836 100644
--- a/net-misc/memcached/files/1.1.13/init
+++ b/net-misc/memcached/files/1.1.13/init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.1.13/init,v 1.1 2007/03/31 19:03:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.1.13/init,v 1.2 2011/12/31 20:36:21 idl0r Exp $
 
 depend() {
 	need net
@@ -10,7 +10,6 @@ checkconfig() {
           ewarn "You should edit /etc/conf.d/memcached and specify an address to listen on."
           ewarn "Listening on any address (I hope your firewall is set up properly)"
         fi
-
 }
 
 start() {
@@ -32,9 +31,9 @@ start() {
         else
           c_LISTENON="-l ${LISTENON}"
         fi
-        
+
 	/sbin/start-stop-daemon --start --pidfile ${PIDFILE} \
-	        --exec ${MEMCACHED_BINARY} --startas ${MEMCACHED_BINARY} -- \
+	        --exec ${MEMCACHED_BINARY} -- \
 	        -d -p ${PORT} ${c_LISTENON} -m ${MEMUSAGE} \
 		-c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P ${PIDFILE} ${MISC_OPTS}
 	eend $?
diff --git a/net-misc/memcached/files/1.2.4/init b/net-misc/memcached/files/1.2.4/init
index f5e3f1231679..d15acfbe6d0c 100644
--- a/net-misc/memcached/files/1.2.4/init
+++ b/net-misc/memcached/files/1.2.4/init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.2.4/init,v 1.1 2007/11/27 01:22:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.2.4/init,v 1.2 2011/12/31 20:36:21 idl0r Exp $
 
 CONF="${SVCNAME#*.}"
 CONFBASE="/etc/conf.d/memcached"
@@ -29,7 +29,6 @@ checkconfig() {
           ewarn "You should edit $CONFSRC and specify an address to listen on."
           ewarn "Listening on any address (check your firewall!)"
         fi
-
 }
 
 start() {
@@ -57,8 +56,7 @@ start() {
         fi
 
         /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \
-                --exec "${MEMCACHED_BINARY}" \
-				--startas "${MEMCACHED_BINARY}" -- \
+                --exec "${MEMCACHED_BINARY}" -- \
                 -d -p ${PORT} ${c_LISTENON} -m ${MEMUSAGE} \
                 -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \
 				${MISC_OPTS}
diff --git a/net-misc/memcached/files/1.2.5/init b/net-misc/memcached/files/1.2.5/init
index 68104b4a683e..b0b7320863c0 100644
--- a/net-misc/memcached/files/1.2.5/init
+++ b/net-misc/memcached/files/1.2.5/init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.2.5/init,v 1.1 2008/03/31 12:17:07 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.2.5/init,v 1.2 2011/12/31 20:36:20 idl0r Exp $
 
 CONF="${SVCNAME#*.}"
 CONFBASE="/etc/conf.d/memcached"
@@ -29,7 +29,6 @@ checkconfig() {
           ewarn "You should edit $CONFSRC and specify an address to listen on."
           ewarn "Listening on any address (check your firewall!)"
         fi
-
 }
 
 start() {
@@ -57,8 +56,7 @@ start() {
         fi
 
         /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \
-                --exec "${MEMCACHED_BINARY}" \
-				--startas "${MEMCACHED_BINARY}" -- \
+                --exec "${MEMCACHED_BINARY}" -- \
                 -d -p ${PORT} ${c_LISTENON} -m ${MEMUSAGE} \
                 -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \
 				${MISC_OPTS}
diff --git a/net-misc/memcached/files/1.2.6/init b/net-misc/memcached/files/1.2.6/init
index e4efc5a09cd4..b78872d29bc1 100644
--- a/net-misc/memcached/files/1.2.6/init
+++ b/net-misc/memcached/files/1.2.6/init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.2.6/init,v 1.1 2008/08/01 15:56:55 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.2.6/init,v 1.2 2011/12/31 20:36:20 idl0r Exp $
 
 CONF="${SVCNAME#*.}"
 CONFBASE="/etc/conf.d/memcached"
@@ -29,7 +29,6 @@ checkconfig() {
           ewarn "You should edit $CONFSRC and specify an address to listen on."
           ewarn "Listening on any address (check your firewall!)"
         fi
-
 }
 
 start() {
@@ -57,8 +56,7 @@ start() {
         fi
 
         /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \
-                --exec "${MEMCACHED_BINARY}" \
-				--startas "${MEMCACHED_BINARY}" -- \
+                --exec "${MEMCACHED_BINARY}" -- \
                 -d -p ${PORT} ${c_LISTENON} -m ${MEMUSAGE} \
                 -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \
 				${MISC_OPTS}
diff --git a/net-misc/memcached/files/1.3.3/init b/net-misc/memcached/files/1.3.3/init
index 74b2c60918ca..6c9d2a641e08 100644
--- a/net-misc/memcached/files/1.3.3/init
+++ b/net-misc/memcached/files/1.3.3/init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.3.3/init,v 1.1 2009/05/26 00:03:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.3.3/init,v 1.2 2011/12/31 20:36:20 idl0r Exp $
 
 CONF="${SVCNAME#*.}"
 CONFBASE="/etc/conf.d/memcached"
@@ -32,7 +32,6 @@ checkconfig() {
           ewarn "You should edit $CONFSRC and specify an address to listen on."
           ewarn "Listening on any address (check your firewall!)"
         fi
-
 }
 
 start() {
@@ -60,8 +59,7 @@ start() {
         fi
 
         /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \
-                --exec "${MEMCACHED_BINARY}" \
-				--startas "${MEMCACHED_BINARY}" -- \
+                --exec "${MEMCACHED_BINARY}" -- \
                 -d -p ${PORT} -U ${UDPPORT} ${c_LISTENON} -m ${MEMUSAGE} \
                 -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \
 				${MISC_OPTS}
diff --git a/net-misc/memcached/files/conf b/net-misc/memcached/files/conf
deleted file mode 100644
index 4db8824159ee..000000000000
--- a/net-misc/memcached/files/conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2003 Gentoo Technologies, Inc
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/conf,v 1.1 2004/07/08 19:14:45 lisa Exp $
-# memcached config file
-
-MEMCACHED_BINARY="/usr/bin/memcached"
-
-#Specify memory usage in megabytes (do not use letters)
-#64MB is default
-MEMUSAGE="64"
-
-#User to run as
-MEMCACHED_RUNAS="nobody"
-
-#Specify maximum number of concurrent connections
-#1024 is default
-MAXCONN="1024"
-
-#Listen for connections on what address?
-LISTENON="192.168.0.3"
-
-#Listen for connections on what port?
-PORT="11211"
diff --git a/net-misc/memcached/files/init b/net-misc/memcached/files/init
deleted file mode 100644
index 0203fc107142..000000000000
--- a/net-misc/memcached/files/init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/init,v 1.2 2006/04/04 14:07:55 lisa Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting memcached"
-	/sbin/start-stop-daemon --start \
-                --pidfile ${PIDFILE} \
-	        --exec ${MEMCACHED_BINARY} --pidfile /var/run/memcached.pid \
-		-- -d -p ${PORT} -l ${LISTENON} -m ${MEMUSAGE} \
-		-c ${MAXCONN} -u ${MEMCACHED_RUNAS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping memcached"
-	start-stop-daemon --stop --quiet --exec ${MEMCACHED_BINARY}
-	rm -f /var/run/memcached.pid
-	eend $?
-}
-
diff --git a/net-misc/memcached/memcached-1.1.12-r2.ebuild b/net-misc/memcached/memcached-1.1.12-r2.ebuild
deleted file mode 100644
index be7401394cfb..000000000000
--- a/net-misc/memcached/memcached-1.1.12-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.12-r2.ebuild,v 1.10 2007/11/18 15:03:03 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load."
-
-HOMEPAGE="http://www.danga.com/memcached/"
-
-SRC_URI="http://www.danga.com/memcached/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="static perl doc"
-
-DEPEND=">=dev-libs/libevent-0.6
-		perl? ( dev-perl/Cache-Memcached )"
-
-src_compile() {
-	local myconf=""
-	use static || myconf="--disable-static ${myconf}"
-	econf ${myconf} || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	dobin "${S}"/memcached
-	dodoc "${S}"/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
-
-	newconfd "${FILESDIR}/${PV}/conf" memcached
-
-	newinitd "${FILESDIR}/${PV}/init" memcached
-
-	doman "${S}"/doc/memcached.1
-
-	if use doc; then
-	  dodoc "${S}"/doc/{memory_management.txt,protocol.txt}
-	fi
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-}
diff --git a/net-misc/memcached/memcached-1.1.12-r3.ebuild b/net-misc/memcached/memcached-1.1.12-r3.ebuild
new file mode 100644
index 000000000000..ecc500da6bde
--- /dev/null
+++ b/net-misc/memcached/memcached-1.1.12-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.12-r3.ebuild,v 1.6 2011/12/31 20:36:19 idl0r Exp $
+
+inherit eutils
+
+DESCRIPTION="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load."
+
+HOMEPAGE="http://www.danga.com/memcached/"
+
+SRC_URI="http://www.danga.com/memcached/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86"
+IUSE="static perl doc"
+
+DEPEND=">=dev-libs/libevent-0.6
+		perl? ( dev-perl/Cache-Memcached )"
+
+src_compile() {
+	local myconf=""
+	use static || myconf="--disable-static ${myconf}"
+	econf ${myconf} || die "econf failed"
+	emake || die
+}
+
+src_install() {
+	dobin "${S}"/memcached
+	dodoc "${S}"/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
+
+	newconfd "${FILESDIR}/${PV}/conf" memcached
+
+	newinitd "${FILESDIR}/${PV}/init" memcached
+
+	doman "${S}"/doc/memcached.1
+
+	if use doc; then
+	  dodoc "${S}"/doc/{memory_management.txt,protocol.txt}
+	fi
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+}
diff --git a/net-misc/memcached/memcached-1.1.13-r1.ebuild b/net-misc/memcached/memcached-1.1.13-r1.ebuild
deleted file mode 100644
index bed7bb1fd0ee..000000000000
--- a/net-misc/memcached/memcached-1.1.13-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.13-r1.ebuild,v 1.2 2007/11/18 15:03:03 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load."
-
-HOMEPAGE="http://www.danga.com/memcached/"
-
-MY_PV="${PV/_pre/-pre}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="static perl doc"
-
-DEPEND=">=dev-libs/libevent-0.6
-		perl? ( dev-perl/Cache-Memcached )"
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	local myconf=""
-	use static || myconf="--disable-static ${myconf}"
-	econf ${myconf} || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	dobin "${S}"/memcached
-	dodoc "${S}"/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
-
-	newconfd "${FILESDIR}/1.1.13/conf" memcached
-	newinitd "${FILESDIR}/1.1.13/init" memcached
-
-	doman "${S}"/doc/memcached.1
-
-	if use doc; then
-	  dodoc "${S}"/doc/{memory_management.txt,protocol.txt}
-	fi
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-	einfo "With this version of Memcached Gentoo now supporst multiple instances."
-	einfo "To enable this you must create a symlink in /etc/init.d/ for each instance"
-	einfo "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	einfo "Please see Gentoo bug #122246 for more info"
-}
diff --git a/net-misc/memcached/memcached-1.1.13-r2.ebuild b/net-misc/memcached/memcached-1.1.13-r2.ebuild
new file mode 100644
index 000000000000..812ebc32ae4f
--- /dev/null
+++ b/net-misc/memcached/memcached-1.1.13-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.13-r2.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+inherit eutils
+
+DESCRIPTION="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load."
+
+HOMEPAGE="http://www.danga.com/memcached/"
+
+MY_PV="${PV/_pre/-pre}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE="static perl doc"
+
+DEPEND=">=dev-libs/libevent-0.6
+		perl? ( dev-perl/Cache-Memcached )"
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	local myconf=""
+	use static || myconf="--disable-static ${myconf}"
+	econf ${myconf} || die "econf failed"
+	emake || die
+}
+
+src_install() {
+	dobin "${S}"/memcached
+	dodoc "${S}"/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
+
+	newconfd "${FILESDIR}/1.1.12/conf" memcached
+
+	newinitd "${FILESDIR}/1.1.12/init" memcached
+
+	doman "${S}"/doc/memcached.1
+
+	if use doc; then
+	  dodoc "${S}"/doc/{memory_management.txt,protocol.txt}
+	fi
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+	einfo "With this version of Memcached Gentoo now supporst multiple instances."
+	einfo "To enable this you must create a symlink in /etc/init.d/ for each instance"
+	einfo "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	einfo "Please see Gentoo bug #122246 for more info"
+}
diff --git a/net-misc/memcached/memcached-1.1.13-r3.ebuild b/net-misc/memcached/memcached-1.1.13-r3.ebuild
new file mode 100644
index 000000000000..22f6f95c66c1
--- /dev/null
+++ b/net-misc/memcached/memcached-1.1.13-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.13-r3.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+inherit eutils
+
+DESCRIPTION="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load."
+
+HOMEPAGE="http://www.danga.com/memcached/"
+
+MY_PV="${PV/_pre/-pre}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="static perl doc"
+
+DEPEND=">=dev-libs/libevent-0.6
+		perl? ( dev-perl/Cache-Memcached )"
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	local myconf=""
+	use static || myconf="--disable-static ${myconf}"
+	econf ${myconf} || die "econf failed"
+	emake || die
+}
+
+src_install() {
+	dobin "${S}"/memcached
+	dodoc "${S}"/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
+
+	newconfd "${FILESDIR}/1.1.13/conf" memcached
+	newinitd "${FILESDIR}/1.1.13/init" memcached
+
+	doman "${S}"/doc/memcached.1
+
+	if use doc; then
+	  dodoc "${S}"/doc/{memory_management.txt,protocol.txt}
+	fi
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+	einfo "With this version of Memcached Gentoo now supporst multiple instances."
+	einfo "To enable this you must create a symlink in /etc/init.d/ for each instance"
+	einfo "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	einfo "Please see Gentoo bug #122246 for more info"
+}
diff --git a/net-misc/memcached/memcached-1.1.13.ebuild b/net-misc/memcached/memcached-1.1.13.ebuild
deleted file mode 100644
index af3df7605898..000000000000
--- a/net-misc/memcached/memcached-1.1.13.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.13.ebuild,v 1.10 2007/11/18 15:03:03 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load."
-
-HOMEPAGE="http://www.danga.com/memcached/"
-
-MY_PV="${PV/_pre/-pre}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="static perl doc"
-
-DEPEND=">=dev-libs/libevent-0.6
-		perl? ( dev-perl/Cache-Memcached )"
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	local myconf=""
-	use static || myconf="--disable-static ${myconf}"
-	econf ${myconf} || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	dobin "${S}"/memcached
-	dodoc "${S}"/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
-
-	newconfd "${FILESDIR}/1.1.12/conf" memcached
-
-	newinitd "${FILESDIR}/1.1.12/init" memcached
-
-	doman "${S}"/doc/memcached.1
-
-	if use doc; then
-	  dodoc "${S}"/doc/{memory_management.txt,protocol.txt}
-	fi
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-	einfo "With this version of Memcached Gentoo now supporst multiple instances."
-	einfo "To enable this you must create a symlink in /etc/init.d/ for each instance"
-	einfo "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	einfo "Please see Gentoo bug #122246 for more info"
-}
diff --git a/net-misc/memcached/memcached-1.2.1-r1.ebuild b/net-misc/memcached/memcached-1.2.1-r1.ebuild
deleted file mode 100644
index 21cdb7066335..000000000000
--- a/net-misc/memcached/memcached-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.2.1-r1.ebuild,v 1.10 2007/12/18 21:56:53 robbat2 Exp $
-
-inherit eutils
-
-MY_PV="${PV/_pre/-pre}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load"
-HOMEPAGE="http://www.danga.com/memcached/"
-SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="static perl doc"
-
-DEPEND=">=dev-libs/libevent-0.6
-		perl? ( dev-perl/Cache-Memcached )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	local myconf=""
-	use static || myconf="--disable-static ${myconf}"
-	econf ${myconf} || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	dobin "${S}"/memcached
-	dodoc "${S}"/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
-
-	newconfd "${FILESDIR}/1.1.13/conf" memcached
-	newinitd "${FILESDIR}/1.1.13/init" memcached
-
-	doman "${S}"/doc/memcached.1
-
-	if use doc; then
-	  dodoc "${S}"/doc/{memory_management.txt,protocol.txt}
-	fi
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-	einfo "With this version of Memcached Gentoo now supports multiple instances."
-	einfo "To enable this you must create a symlink in /etc/init.d/ for each instance"
-	einfo "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	einfo "Please see Gentoo bug #122246 for more info"
-}
diff --git a/net-misc/memcached/memcached-1.2.1-r2.ebuild b/net-misc/memcached/memcached-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..ec07dff875aa
--- /dev/null
+++ b/net-misc/memcached/memcached-1.2.1-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.2.1-r2.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+inherit eutils
+
+MY_PV="${PV/_pre/-pre}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load"
+HOMEPAGE="http://www.danga.com/memcached/"
+SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="static perl doc"
+
+DEPEND=">=dev-libs/libevent-0.6
+		perl? ( dev-perl/Cache-Memcached )"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	local myconf=""
+	use static || myconf="--disable-static ${myconf}"
+	econf ${myconf} || die "econf failed"
+	emake || die
+}
+
+src_install() {
+	dobin "${S}"/memcached
+	dodoc "${S}"/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
+
+	newconfd "${FILESDIR}/1.1.13/conf" memcached
+	newinitd "${FILESDIR}/1.1.13/init" memcached
+
+	doman "${S}"/doc/memcached.1
+
+	if use doc; then
+	  dodoc "${S}"/doc/{memory_management.txt,protocol.txt}
+	fi
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+	einfo "With this version of Memcached Gentoo now supports multiple instances."
+	einfo "To enable this you must create a symlink in /etc/init.d/ for each instance"
+	einfo "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	einfo "Please see Gentoo bug #122246 for more info"
+}
diff --git a/net-misc/memcached/memcached-1.2.4-r1.ebuild b/net-misc/memcached/memcached-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..aa2634fe6024
--- /dev/null
+++ b/net-misc/memcached/memcached-1.2.4-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.2.4-r1.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+inherit eutils
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://www.danga.com/memcached/"
+SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="nptl test"
+
+RDEPEND=">=dev-libs/libevent-0.6
+		dev-lang/perl"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+}
+
+src_compile() {
+	econf $(use_enable nptl threads)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.2.4/conf memcached
+	newinitd "${FILESDIR}"/1.2.4/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 must 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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.2.4.ebuild b/net-misc/memcached/memcached-1.2.4.ebuild
deleted file mode 100644
index a560d1639166..000000000000
--- a/net-misc/memcached/memcached-1.2.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.2.4.ebuild,v 1.9 2008/12/07 11:07:22 vapier Exp $
-
-inherit eutils
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://www.danga.com/memcached/"
-SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nptl test"
-
-RDEPEND=">=dev-libs/libevent-0.6
-		dev-lang/perl"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-}
-
-src_compile() {
-	econf $(use_enable nptl threads)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.2.4/conf memcached
-	newinitd "${FILESDIR}"/1.2.4/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 must 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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.2.5-r1.ebuild b/net-misc/memcached/memcached-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..ba64997fbb6b
--- /dev/null
+++ b/net-misc/memcached/memcached-1.2.5-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.2.5-r1.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+inherit eutils
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://www.danga.com/memcached/"
+SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="nptl test"
+
+RDEPEND=">=dev-libs/libevent-0.6
+		 dev-lang/perl"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+}
+
+src_compile() {
+	econf $(use_enable nptl threads)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.2.5/conf memcached
+	newinitd "${FILESDIR}"/1.2.5/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 must 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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.2.5.ebuild b/net-misc/memcached/memcached-1.2.5.ebuild
deleted file mode 100644
index 23f709e4cc8f..000000000000
--- a/net-misc/memcached/memcached-1.2.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.2.5.ebuild,v 1.8 2008/09/27 16:35:44 armin76 Exp $
-
-inherit eutils
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://www.danga.com/memcached/"
-SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nptl test"
-
-RDEPEND=">=dev-libs/libevent-0.6
-		 dev-lang/perl"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-}
-
-src_compile() {
-	econf $(use_enable nptl threads)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.2.5/conf memcached
-	newinitd "${FILESDIR}"/1.2.5/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 must 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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.2.6-r1.ebuild b/net-misc/memcached/memcached-1.2.6-r1.ebuild
new file mode 100644
index 000000000000..b1b9dc4171c6
--- /dev/null
+++ b/net-misc/memcached/memcached-1.2.6-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.2.6-r1.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+inherit eutils
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://www.danga.com/memcached/"
+SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="nptl test"
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+}
+
+src_compile() {
+	econf $(use_enable nptl threads)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.2.6/conf memcached
+	newinitd "${FILESDIR}"/1.2.6/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 must 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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.2.6.ebuild b/net-misc/memcached/memcached-1.2.6.ebuild
deleted file mode 100644
index 33ae457b5fdc..000000000000
--- a/net-misc/memcached/memcached-1.2.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.2.6.ebuild,v 1.7 2008/12/07 11:07:22 vapier Exp $
-
-inherit eutils
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://www.danga.com/memcached/"
-SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nptl test"
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-}
-
-src_compile() {
-	econf $(use_enable nptl threads)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.2.6/conf memcached
-	newinitd "${FILESDIR}"/1.2.6/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 must 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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.2.8-r1.ebuild b/net-misc/memcached/memcached-1.2.8-r1.ebuild
new file mode 100644
index 000000000000..08df9e49c6a6
--- /dev/null
+++ b/net-misc/memcached/memcached-1.2.8-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.2.8-r1.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+inherit eutils autotools
+
+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://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nptl test"
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable nptl threads)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.2.6/conf memcached
+	newinitd "${FILESDIR}"/1.2.6/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 must 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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.2.8.ebuild b/net-misc/memcached/memcached-1.2.8.ebuild
deleted file mode 100644
index 5df4a9f664c9..000000000000
--- a/net-misc/memcached/memcached-1.2.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.2.8.ebuild,v 1.3 2009/07/26 12:40:22 ranger Exp $
-
-inherit eutils autotools
-
-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://memcached.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="nptl test"
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_enable nptl threads)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.2.6/conf memcached
-	newinitd "${FILESDIR}"/1.2.6/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 must 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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.3.0-r1.ebuild b/net-misc/memcached/memcached-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..0824a405ee54
--- /dev/null
+++ b/net-misc/memcached/memcached-1.3.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.3.0-r1.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+inherit eutils
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://www.danga.com/memcached/"
+SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nptl test"
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+}
+
+src_compile() {
+	econf $(use_enable nptl threads)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.2.6/conf memcached
+	newinitd "${FILESDIR}"/1.2.6/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 must 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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.3.0.ebuild b/net-misc/memcached/memcached-1.3.0.ebuild
deleted file mode 100644
index c27b54338c75..000000000000
--- a/net-misc/memcached/memcached-1.3.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.3.0.ebuild,v 1.1 2008/11/11 22:23:22 robbat2 Exp $
-
-inherit eutils
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://www.danga.com/memcached/"
-SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="nptl test"
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-}
-
-src_compile() {
-	econf $(use_enable nptl threads)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.2.6/conf memcached
-	newinitd "${FILESDIR}"/1.2.6/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 must 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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.3.3-r1.ebuild b/net-misc/memcached/memcached-1.3.3-r1.ebuild
deleted file mode 100644
index 9a92403297c1..000000000000
--- a/net-misc/memcached/memcached-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.3.3-r1.ebuild,v 1.2 2009/05/15 16:48:11 mr_bones_ Exp $
-
-inherit eutils autotools flag-o-matic
-
-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://memcached.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="nptl test slabs-reassign"
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-}
-
-src_compile() {
-	econf $(use_enable nptl threads)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.2.6/conf memcached
-	newinitd "${FILESDIR}"/1.2.6/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 must 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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.3.3-r2.ebuild b/net-misc/memcached/memcached-1.3.3-r2.ebuild
deleted file mode 100644
index 4866bd61222a..000000000000
--- a/net-misc/memcached/memcached-1.3.3-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.3.3-r2.ebuild,v 1.9 2009/07/26 12:38:16 ranger Exp $
-
-inherit eutils autotools flag-o-matic
-
-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://memcached.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="test slabs-reassign"
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-}
-
-src_compile() {
-	econf
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.3.3/conf memcached
-	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.3.3-r3.ebuild b/net-misc/memcached/memcached-1.3.3-r3.ebuild
new file mode 100644
index 000000000000..5559389099be
--- /dev/null
+++ b/net-misc/memcached/memcached-1.3.3-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.3.3-r3.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+inherit eutils autotools
+
+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://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nptl test"
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable nptl threads)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.2.6/conf memcached
+	newinitd "${FILESDIR}"/1.2.6/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 must 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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.3.3-r4.ebuild b/net-misc/memcached/memcached-1.3.3-r4.ebuild
new file mode 100644
index 000000000000..931a70920e90
--- /dev/null
+++ b/net-misc/memcached/memcached-1.3.3-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.3.3-r4.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+inherit eutils autotools flag-o-matic
+
+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://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nptl test slabs-reassign"
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+src_compile() {
+	econf $(use_enable nptl threads)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.2.6/conf memcached
+	newinitd "${FILESDIR}"/1.2.6/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 must 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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.3.3-r5.ebuild b/net-misc/memcached/memcached-1.3.3-r5.ebuild
new file mode 100644
index 000000000000..e4f22935956c
--- /dev/null
+++ b/net-misc/memcached/memcached-1.3.3-r5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.3.3-r5.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+inherit eutils autotools flag-o-matic
+
+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://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="test slabs-reassign"
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+src_compile() {
+	econf
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.3.3/conf memcached
+	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.3.3.ebuild b/net-misc/memcached/memcached-1.3.3.ebuild
deleted file mode 100644
index 8d4b8c3c7df9..000000000000
--- a/net-misc/memcached/memcached-1.3.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.3.3.ebuild,v 1.2 2009/04/13 02:28:41 robbat2 Exp $
-
-inherit eutils autotools
-
-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://memcached.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="nptl test"
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_enable nptl threads)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.2.6/conf memcached
-	newinitd "${FILESDIR}"/1.2.6/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 must 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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.4.0-r1.ebuild b/net-misc/memcached/memcached-1.4.0-r1.ebuild
deleted file mode 100644
index d91ba126d3b8..000000000000
--- a/net-misc/memcached/memcached-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.0-r1.ebuild,v 1.1 2009/07/28 01:07:27 robbat2 Exp $
-
-EAPI=2
-inherit eutils autotools flag-o-matic
-
-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://memcached.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="test slabs-reassign debug"
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl"
-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"
-	epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-}
-
-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
-	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
-	filter-flags -UNDEBUG
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.3.3/conf memcached
-	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.4.0-r2.ebuild b/net-misc/memcached/memcached-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..ea3fb05cb294
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.0-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.0-r2.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+inherit eutils autotools flag-o-matic
+
+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://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="test slabs-reassign"
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+src_compile() {
+	econf
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.3.3/conf memcached
+	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.4.0-r3.ebuild b/net-misc/memcached/memcached-1.4.0-r3.ebuild
new file mode 100644
index 000000000000..cbc3f0549c8d
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.0-r3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.0-r3.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+EAPI=2
+inherit eutils autotools flag-o-matic
+
+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://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="test slabs-reassign debug"
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl"
+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"
+	epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+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
+	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
+	filter-flags -UNDEBUG
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.3.3/conf memcached
+	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.4.0.ebuild b/net-misc/memcached/memcached-1.4.0.ebuild
deleted file mode 100644
index e9f3fee7a6c6..000000000000
--- a/net-misc/memcached/memcached-1.4.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.0.ebuild,v 1.1 2009/07/22 17:21:57 robbat2 Exp $
-
-inherit eutils autotools flag-o-matic
-
-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://memcached.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="test slabs-reassign"
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-}
-
-src_compile() {
-	econf
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.3.3/conf memcached
-	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.4.1-r1.ebuild b/net-misc/memcached/memcached-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..c150e72c6ca3
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.1-r1.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+EAPI=2
+inherit eutils autotools flag-o-matic
+
+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://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="test slabs-reassign debug"
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl"
+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"
+	epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+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
+	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
+	filter-flags -UNDEBUG
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.3.3/conf memcached
+	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.4.1.ebuild b/net-misc/memcached/memcached-1.4.1.ebuild
deleted file mode 100644
index c40249f191de..000000000000
--- a/net-misc/memcached/memcached-1.4.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.1.ebuild,v 1.8 2009/12/11 18:27:08 armin76 Exp $
-
-EAPI=2
-inherit eutils autotools flag-o-matic
-
-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://memcached.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="test slabs-reassign debug"
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl"
-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"
-	epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-}
-
-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
-	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
-	filter-flags -UNDEBUG
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.3.3/conf memcached
-	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.4.10-r1.ebuild b/net-misc/memcached/memcached-1.4.10-r1.ebuild
new file mode 100644
index 000000000000..c3c381f667e7
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.10-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.10-r1.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+EAPI=2
+inherit eutils autotools flag-o-matic
+
+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://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
+	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
+	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
+	filter-flags -UNDEBUG
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.3.3/conf memcached
+	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.4.10.ebuild b/net-misc/memcached/memcached-1.4.10.ebuild
deleted file mode 100644
index 4dc052d8ddfc..000000000000
--- a/net-misc/memcached/memcached-1.4.10.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.10.ebuild,v 1.1 2011/11/16 08:52:31 robbat2 Exp $
-
-EAPI=2
-inherit eutils autotools flag-o-matic
-
-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://memcached.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
-	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
-	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
-	filter-flags -UNDEBUG
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.3.3/conf memcached
-	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.4.2-r1.ebuild b/net-misc/memcached/memcached-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..7088acfeae8c
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.2-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.2-r1.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+EAPI=2
+inherit eutils autotools flag-o-matic
+
+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://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="test slabs-reassign debug" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl"
+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"
+	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
+	# 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
+	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
+	filter-flags -UNDEBUG
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.3.3/conf memcached
+	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.4.2.ebuild b/net-misc/memcached/memcached-1.4.2.ebuild
deleted file mode 100644
index e8b4a14bd97b..000000000000
--- a/net-misc/memcached/memcached-1.4.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.2.ebuild,v 1.3 2009/10/12 19:52:57 mr_bones_ Exp $
-
-EAPI=2
-inherit eutils autotools flag-o-matic
-
-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://memcached.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="test slabs-reassign debug" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl"
-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"
-	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
-	# 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
-	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
-	filter-flags -UNDEBUG
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.3.3/conf memcached
-	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.4.4-r1.ebuild b/net-misc/memcached/memcached-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..3e81769b8411
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.4-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.4-r1.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+EAPI=2
+inherit eutils autotools flag-o-matic
+
+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://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
+	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
+	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
+	filter-flags -UNDEBUG
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.3.3/conf memcached
+	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.4.4.ebuild b/net-misc/memcached/memcached-1.4.4.ebuild
deleted file mode 100644
index 805ab3e9b974..000000000000
--- a/net-misc/memcached/memcached-1.4.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.4.ebuild,v 1.2 2010/01/07 15:55:42 fauli Exp $
-
-EAPI=2
-inherit eutils autotools flag-o-matic
-
-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://memcached.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
-	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
-	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
-	filter-flags -UNDEBUG
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.3.3/conf memcached
-	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.4.5-r1.ebuild b/net-misc/memcached/memcached-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..0c66f14264b9
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.5-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.5-r1.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+EAPI=2
+inherit eutils autotools flag-o-matic
+
+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://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 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"
+	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
+	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
+	filter-flags -UNDEBUG
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.3.3/conf memcached
+	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.4.5.ebuild b/net-misc/memcached/memcached-1.4.5.ebuild
deleted file mode 100644
index 37d916800795..000000000000
--- a/net-misc/memcached/memcached-1.4.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.5.ebuild,v 1.7 2010/04/30 14:29:09 ranger Exp $
-
-EAPI=2
-inherit eutils autotools flag-o-matic
-
-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://memcached.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 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"
-	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
-	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
-	filter-flags -UNDEBUG
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.3.3/conf memcached
-	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.4.7-r1.ebuild b/net-misc/memcached/memcached-1.4.7-r1.ebuild
new file mode 100644
index 000000000000..6e359d4abbb5
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.7-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.7-r1.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+EAPI=2
+inherit eutils autotools flag-o-matic
+
+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://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
+	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
+	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
+	filter-flags -UNDEBUG
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.3.3/conf memcached
+	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.4.7.ebuild b/net-misc/memcached/memcached-1.4.7.ebuild
deleted file mode 100644
index 05c54e02d34e..000000000000
--- a/net-misc/memcached/memcached-1.4.7.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.7.ebuild,v 1.1 2011/08/17 06:43:20 robbat2 Exp $
-
-EAPI=2
-inherit eutils autotools flag-o-matic
-
-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://memcached.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
-	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
-	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
-	filter-flags -UNDEBUG
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.3.3/conf memcached
-	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
-}
diff --git a/net-misc/memcached/memcached-1.4.8-r1.ebuild b/net-misc/memcached/memcached-1.4.8-r1.ebuild
new file mode 100644
index 000000000000..5fc582195a35
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.8-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.8-r1.ebuild,v 1.1 2011/12/31 20:36:19 idl0r Exp $
+
+EAPI=2
+inherit eutils autotools flag-o-matic
+
+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://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
+	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
+	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
+	filter-flags -UNDEBUG
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.3.3/conf memcached
+	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
+}
diff --git a/net-misc/memcached/memcached-1.4.8.ebuild b/net-misc/memcached/memcached-1.4.8.ebuild
deleted file mode 100644
index 1d6bec5d4208..000000000000
--- a/net-misc/memcached/memcached-1.4.8.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.8.ebuild,v 1.1 2011/10/04 09:10:43 robbat2 Exp $
-
-EAPI=2
-inherit eutils autotools flag-o-matic
-
-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://memcached.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
-	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
-	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
-	filter-flags -UNDEBUG
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}"/1.3.3/conf memcached
-	newinitd "${FILESDIR}"/1.3.3/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 || die "Failed testing"
-}
-- 
cgit v1.2.3-65-gdbad