net-misc/memcached: clean up old 1.2/1.3 series that no longer build, as well as filesdir and old 1.4 release; update src_uri

Package-Manager: portage-2.3.2

24 files changed, 21 insertions, 730 deletions

diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 3e7370291082..6db0179f9584 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1,7 +1,3 @@
-DIST memcached-1.2.6.tar.gz 217651 SHA256 365c5719997af9477aedf4ff0435fbd83aadf5fa9b1c7a2e0d744f865aac578e SHA512 0e492c0dbd84321533588b9373827c41e90b6ef0ce233e5849c3291c25179947e4e332c7e972285c6899e45317edfcc718e558bf63ce1f2d00180dd95b927c63 WHIRLPOOL 0b08ff9534ac983bbc7f4ec5190d61f7f55d217080d18f406bb655fc6c202ef162a91043070b18875b80af28e5ce5c5ae15cfcbda18044de5f85c9701f3f9b9a
-DIST memcached-1.2.8.tar.gz 221285 SHA256 9e36702833a9213d607801a44325d108e6b86abc7af82fe265cce4b96eb2269e SHA512 582a40aa1ebe20232ecb004830919d0ba4fe3d6fa15e6d51d1d929ab13719d90629858ae7fda4f45a78b877a03dd68241938e6b18a48bc5421df99a8437498df WHIRLPOOL f84a494951d95bd14ed43713f8b61425c01cc58efdabb844a2b8092d20ee00afb4dd239e950618bf0e8bc85ec79ecb4f0904f068049e507d653b8be218f5850e
-DIST memcached-1.3.3.tar.gz 260203 SHA256 3728c714c3c0194a429f754d739067bea193d66359a03a63437428bf4a2cce84 SHA512 ce05d12b00fbb88d7020073591015ec918fb8e90476e2b1d652349520595416a65634a8d22cc5486a9d723b9fb938493145c8b70b9a3a31f426a6e55a9803eec WHIRLPOOL b4df09679deb9adb9fdf83b23e9d79f116e29d0c26f8f8c102f4fba3b01d939889ded347e98f977ee278072328aadd4079ba34053bbc680203bcc28aea63e519
-DIST memcached-1.4.17.tar.gz 326970 SHA256 d9173ef6d99ba798c982ea4566cb4f0e64eb23859fdbf9926a89999d8cdc0458 SHA512 cf44500f81494efe8b27d2859d160e288260323d9c0ca6f0d0507c131257048012248e6a7639e410cec6765219d4595359d9335281eeb3b238306972a5bd859d WHIRLPOOL 2c9115630e0fd68d42e0771aea7d59f1d296b1f5ff4f2d586095ecd01ded6f4c60d0722a1ba63b926042e304b3e88521b2f862dffecec5c0145b96785c4b2b14
 DIST memcached-1.4.24.tar.gz 354917 SHA256 08a426c504ecf64633151eec1058584754d2f54e62e5ed2d6808559401617e55 SHA512 446676ae7b21d8d9246f38d3df06b167ea93a853f88ac70ae3a99b1a85a4de3d452ee266e77fac599660b9bc6e785bc89224f46e16ff6e216476d50e4706b9f6 WHIRLPOOL 269e920a0d5279786a4f4ef516b71fa7e95cacdf8627a2b692d2387a66d5d9a80618f190cf013bf070aff0f73d70d6e75dc4e3402fe8e64b372026be83170e3d
 DIST memcached-1.4.25.tar.gz 359709 SHA256 f058437b3c224d321919a9a6bb4e3eedb2312ed718c0caf087ff2f04ab795dda SHA512 e037c3bbb68c4077f814f855663501af418ce3b1f8bc20f8e7eba3249aea378e55b3291457952fa4511779ec3702496fdaab5799edae7d59bc64eb6fd54ee14e WHIRLPOOL 213bb95d9b814e446dce31073701d997ac6b994bca655bf38eb7b8f552c4bd7e87bd36d5f9a802a965649306fe5e1ea3f093b4ce274119b23fe7aaf22a55f2ca
 DIST memcached-1.4.26.tar.gz 373384 SHA256 4a67800277eec2e523c51d5f620c416e7d0acfde90beacaa26d8e4f6976b43f6 SHA512 b9346e5fd60407133d2d1eb1a6fadfe455607b6b9ba4434a00ec9c8ce480dffddf19a4965dfed92a6a10d46b98f1a6754851fd4c20d55c4a19200879db5baf9c WHIRLPOOL 9b03018914b11eadb9af2c7f67af9a298e2fc3d4139af615951f94114e0c099b600f859c08d2230c919888d288b3b80a7d2df188a95e4d73ec781ae6965a7910
diff --git a/net-misc/memcached/files/1.1.12/conf b/net-misc/memcached/files/1.1.12/conf
deleted file mode 100644
index 6609d16bb205..000000000000
--- a/net-misc/memcached/files/1.1.12/conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2003 Gentoo Technologies, Inc
-# $Id$
-# 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="memcached"
-
-#Specify maximum number of concurrent connections
-#1024 is default
-MAXCONN="1024"
-
-#Listen for connections on what address?
-LISTENON=""
-
-#Listen for connections on what port?
-PORT="11211"
-
-#PID file location
-PIDFILE="/var/run/memcached/memcached-${PORT}.pid"
-
-#Other Options
-MISC_OPTS=""
diff --git a/net-misc/memcached/files/1.1.12/init b/net-misc/memcached/files/1.1.12/init
deleted file mode 100644
index 31f1c07d52fa..000000000000
--- a/net-misc/memcached/files/1.1.12/init
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# $Id$
-
-depend() {
-	need net
-}
-
-checkconfig() {
-        if [ -z "${LISTENON}" ]; then
-          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() {
-	ebegin "Starting memcached"
-        checkconfig
-        local dir="$(dirname ${PIDFILE})"
-        if [ ! -d "${dir}" ]; then
-          einfo " Creating ${dir}"
-          mkdir -p "${dir}"
-        fi
-        chown ${MEMCACHED_RUNAS} "${dir}"
-        if [ -f ${PIDFILE} ]; then
-          einfo "  Removing stale pidfile ${PIDFILE}"
-          rm -f ${PIDFILE} 1>/dev/null
-        fi
-
-        if [ -z "${LISTENON}" ]; then
-          c_LISTENON=""
-        else
-          c_LISTENON="-l ${LISTENON}"
-        fi
-
-	/sbin/start-stop-daemon --start \
-	        --exec ${MEMCACHED_BINARY} -- \
-	        -d -p ${PORT} ${c_LISTENON} -m ${MEMUSAGE} \
-		-c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P ${PIDFILE} ${MISC_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping memcached"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	rm -f ${PIDFILE}
-	eend $?
-}
-
diff --git a/net-misc/memcached/files/1.1.13/conf b/net-misc/memcached/files/1.1.13/conf
deleted file mode 100644
index 6609d16bb205..000000000000
--- a/net-misc/memcached/files/1.1.13/conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2003 Gentoo Technologies, Inc
-# $Id$
-# 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="memcached"
-
-#Specify maximum number of concurrent connections
-#1024 is default
-MAXCONN="1024"
-
-#Listen for connections on what address?
-LISTENON=""
-
-#Listen for connections on what port?
-PORT="11211"
-
-#PID file location
-PIDFILE="/var/run/memcached/memcached-${PORT}.pid"
-
-#Other Options
-MISC_OPTS=""
diff --git a/net-misc/memcached/files/1.1.13/init b/net-misc/memcached/files/1.1.13/init
deleted file mode 100644
index 24dff246ce92..000000000000
--- a/net-misc/memcached/files/1.1.13/init
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# $Id$
-
-depend() {
-	need net
-}
-
-checkconfig() {
-        if [ -z "${LISTENON}" ]; then
-          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() {
-	ebegin "Starting memcached"
-        checkconfig
-        local dir="$(dirname ${PIDFILE})"
-        if [ ! -d "${dir}" ]; then
-          einfo " Creating ${dir}"
-          mkdir -p "${dir}"
-        fi
-        chown ${MEMCACHED_RUNAS} "${dir}"
-        if [ -f ${PIDFILE} ]; then
-          einfo "  Removing stale pidfile ${PIDFILE}"
-          rm -f ${PIDFILE} 1>/dev/null
-        fi
-
-        if [ -z "${LISTENON}" ]; then
-          c_LISTENON=""
-        else
-          c_LISTENON="-l ${LISTENON}"
-        fi
-
-	/sbin/start-stop-daemon --start --pidfile ${PIDFILE} \
-	        --exec ${MEMCACHED_BINARY} -- \
-	        -d -p ${PORT} ${c_LISTENON} -m ${MEMUSAGE} \
-		-c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P ${PIDFILE} ${MISC_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping memcached"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	rm -f ${PIDFILE}
-	eend $?
-}
diff --git a/net-misc/memcached/files/1.2.6/conf b/net-misc/memcached/files/1.2.6/conf
deleted file mode 100644
index 61c3c7176522..000000000000
--- a/net-misc/memcached/files/1.2.6/conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2003 Gentoo Technologies, Inc
-# $Id$
-# 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="memcached"
-
-#Specify maximum number of concurrent connections
-#1024 is default
-MAXCONN="1024"
-
-#Listen for connections on what address?
-# If this is empty, memcached will listen on 0.0.0.0
-# be sure you have a firewall in place!
-LISTENON=""
-
-#Listen for connections on what port?
-PORT="11211"
-
-#PID file location
-# '-${PORT}.${CONF}.pid' will be appended to this!
-# You do not normally need to change this.
-PIDBASE="/var/run/memcached/memcached"
-
-#Other Options
-MISC_OPTS=""
diff --git a/net-misc/memcached/files/1.2.6/init b/net-misc/memcached/files/1.2.6/init
deleted file mode 100644
index 790ba074e1e8..000000000000
--- a/net-misc/memcached/files/1.2.6/init
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/sbin/openrc-run
-# $Id$
-
-CONF="${SVCNAME#*.}"
-CONFBASE="/etc/conf.d/memcached"
-
-[ -z "${PIDBASE}" ] && PIDBASE="/var/run/memcached/memcached"
-[ "${CONF}" == "memcached" ] && CONF=''
-
-if [ -n "${CONF}" ]; then
-        PIDFILE="${PIDBASE}-${PORT}.${CONF}.pid"
-        CONFSRC="${CONFBASE}.${CONF}"
-        if [ -f "${CONFSRC}" ]; then
-         source "${CONFSRC}"
-        else
-         eerror "The configuration file $CONFSRC was not found!"
-        fi
-else
-        PIDFILE="${PIDBASE}-${PORT}.pid"
-        CONFSRC="${CONFBASE}"
-fi
-
-depend() {
-        need net
-}
-
-checkconfig() {
-        if [ -z "${LISTENON}" ]; then
-          ewarn "You should edit $CONFSRC and specify an address to listen on."
-          ewarn "Listening on any address (check your firewall!)"
-        fi
-}
-
-start() {
-        if [ -n "${CONF}" ]; then
-                ebegin "Starting memcached (${CONF})"
-        else
-                ebegin "Starting memcached"
-        fi
-        checkconfig
-        local dir="$(dirname ${PIDFILE})"
-        if [ ! -d "${dir}" ]; then
-          einfo " Creating ${dir}"
-          mkdir -p "${dir}"
-        fi
-        chown ${MEMCACHED_RUNAS} "${dir}"
-        if [ -f "${PIDFILE}" ]; then
-          einfo "  Removing stale pidfile ${PIDFILE}"
-          rm -f "${PIDFILE}" 1>/dev/null
-        fi
-
-        if [ -z "${LISTENON}" ]; then
-          c_LISTENON=""
-        else
-          c_LISTENON="-l ${LISTENON}"
-        fi
-
-        /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \
-                --exec "${MEMCACHED_BINARY}" -- \
-                -d -p ${PORT} ${c_LISTENON} -m ${MEMUSAGE} \
-                -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \
-				${MISC_OPTS}
-        eend $?
-}
-
-stop() {
-        if [ -n "${CONF}" ]; then
-                ebegin "Stopping memcached (${CONF})"
-        else
-                ebegin "Stopping memcached"
-        fi
-        start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
-        rm -f "${PIDFILE}"
-        eend $?
-}
diff --git a/net-misc/memcached/files/1.3.3/conf b/net-misc/memcached/files/1.3.3/conf
deleted file mode 100644
index 341ce57f022c..000000000000
--- a/net-misc/memcached/files/1.3.3/conf
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2003 Gentoo Technologies, Inc
-# $Id$
-# 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="memcached"
-
-#Specify maximum number of concurrent connections
-#1024 is default
-MAXCONN="1024"
-
-#Listen for connections on what address?
-# If this is empty, memcached will listen on 0.0.0.0
-# be sure you have a firewall in place!
-LISTENON=""
-
-#Listen for connections on what port?
-PORT="11211"
-
-# Listen for UDP connecitons on what port? 0 means turn off UDP
-UDPPORT="${PORT}"
-
-#PID file location
-# '-${PORT}.${CONF}.pid' will be appended to this!
-# You do not normally need to change this.
-PIDBASE="/var/run/memcached/memcached"
-
-#Other Options
-MISC_OPTS=""
diff --git a/net-misc/memcached/files/1.3.3/init b/net-misc/memcached/files/1.3.3/init
deleted file mode 100644
index dbfd835729b6..000000000000
--- a/net-misc/memcached/files/1.3.3/init
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/sbin/openrc-run
-
-CONF="${SVCNAME#*.}"
-CONFBASE="/etc/conf.d/memcached"
-
-[ -z "${PIDBASE}" ] && PIDBASE="/var/run/memcached/memcached"
-[ "${CONF}" = "memcached" ] && CONF=''
-
-if [ -n "${CONF}" ]; then
-        PIDFILE="${PIDBASE}-${PORT}.${CONF}.pid"
-        CONFSRC="${CONFBASE}.${CONF}"
-        if [ -f "${CONFSRC}" ]; then
-         . "${CONFSRC}"
-        else
-         eerror "The configuration file $CONFSRC was not found!"
-        fi
-else
-        PIDFILE="${PIDBASE}-${PORT}.pid"
-        CONFSRC="${CONFBASE}"
-fi
-
-depend() {
-        need net
-		# per bug #269022, accurate time is important for memcached!
-		# We include the full list of ways it might be set on boot.
-		after ntp-client ntpd rdate openrdate adjtimex hwclock
-}
-
-checkconfig() {
-        if [ -z "${LISTENON}" ]; then
-          ewarn "You should edit $CONFSRC and specify an address to listen on."
-          ewarn "Listening on any address (check your firewall!)"
-        fi
-}
-
-start() {
-        if [ -n "${CONF}" ]; then
-                ebegin "Starting memcached (${CONF})"
-        else
-                ebegin "Starting memcached"
-        fi
-        checkconfig
-        local dir="$(dirname ${PIDFILE})"
-        if [ ! -d "${dir}" ]; then
-          einfo " Creating ${dir}"
-          mkdir -p "${dir}"
-        fi
-        chown ${MEMCACHED_RUNAS} "${dir}"
-        if [ -f "${PIDFILE}" ]; then
-          einfo "  Removing stale pidfile ${PIDFILE}"
-          rm -f "${PIDFILE}" 1>/dev/null
-        fi
-
-        if [ -z "${LISTENON}" ]; then
-          c_LISTENON=""
-        else
-          c_LISTENON="-l ${LISTENON}"
-        fi
-
-        /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \
-                --exec "${MEMCACHED_BINARY}" -- \
-                -d -p ${PORT} -U ${UDPPORT} ${c_LISTENON} -m ${MEMUSAGE} \
-                -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \
-				${MISC_OPTS}
-        eend $?
-}
-
-stop() {
-        if [ -n "${CONF}" ]; then
-                ebegin "Stopping memcached (${CONF})"
-        else
-                ebegin "Stopping memcached"
-        fi
-        start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
-        rm -f "${PIDFILE}"
-        eend $?
-}
diff --git a/net-misc/memcached/memcached-1.2.6-r1.ebuild b/net-misc/memcached/memcached-1.2.6-r1.ebuild
deleted file mode 100644
index 1df879856256..000000000000
--- a/net-misc/memcached/memcached-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz
-	https://www.memcached.org/files/old/${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
deleted file mode 100644
index 51687b78c709..000000000000
--- a/net-misc/memcached/memcached-1.2.8-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils autotools user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/old/${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-r5.ebuild b/net-misc/memcached/memcached-1.3.3-r5.ebuild
deleted file mode 100644
index 2746e9e62d5a..000000000000
--- a/net-misc/memcached/memcached-1.3.3-r5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils autotools flag-o-matic user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/old/${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.4.17-r3.ebuild b/net-misc/memcached/memcached-1.4.17-r3.ebuild
deleted file mode 100644
index 8a23e8788643..000000000000
--- a/net-misc/memcached/memcached-1.4.17-r3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils flag-o-matic systemd user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test slabs-reassign debug sasl" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl
-		 sasl? ( dev-libs/cyrus-sasl )"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	# Handled different upstream
-	#epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init" memcached
-	systemd_dounit "${FILESDIR}/memcached.service"
-}
-
-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
-}
diff --git a/net-misc/memcached/memcached-1.4.17.ebuild b/net-misc/memcached/memcached-1.4.17.ebuild
deleted file mode 100644
index 968ff7ed693e..000000000000
--- a/net-misc/memcached/memcached-1.4.17.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils autotools flag-o-matic user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test slabs-reassign debug sasl" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl
-		 sasl? ( dev-libs/cyrus-sasl )"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	# Handled different upstream
-	#epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init" memcached
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.4.24.ebuild b/net-misc/memcached/memcached-1.4.24.ebuild
index 7f6eabecd6a6..018f6a014293 100644
--- a/net-misc/memcached/memcached-1.4.24.ebuild
+++ b/net-misc/memcached/memcached-1.4.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,8 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="High-performance, distributed memory object caching system"
 HOMEPAGE="http://memcached.org/"
-SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/memcached/memcached-1.4.25.ebuild b/net-misc/memcached/memcached-1.4.25.ebuild
index 5bd5a42b1ded..496ede198f0c 100644
--- a/net-misc/memcached/memcached-1.4.25.ebuild
+++ b/net-misc/memcached/memcached-1.4.25.ebuild
@@ -10,7 +10,8 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="High-performance, distributed memory object caching system"
 HOMEPAGE="http://memcached.org/"
-SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/memcached/memcached-1.4.26.ebuild b/net-misc/memcached/memcached-1.4.26.ebuild
index 31a9918066e4..f41d7cd30662 100644
--- a/net-misc/memcached/memcached-1.4.26.ebuild
+++ b/net-misc/memcached/memcached-1.4.26.ebuild
@@ -10,7 +10,8 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="High-performance, distributed memory object caching system"
 HOMEPAGE="http://memcached.org/"
-SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/memcached/memcached-1.4.27.ebuild b/net-misc/memcached/memcached-1.4.27.ebuild
index 53f09846f643..cb90d58fd110 100644
--- a/net-misc/memcached/memcached-1.4.27.ebuild
+++ b/net-misc/memcached/memcached-1.4.27.ebuild
@@ -10,7 +10,8 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="High-performance, distributed memory object caching system"
 HOMEPAGE="http://memcached.org/"
-SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/memcached/memcached-1.4.29.ebuild b/net-misc/memcached/memcached-1.4.29.ebuild
index 53f09846f643..cb90d58fd110 100644
--- a/net-misc/memcached/memcached-1.4.29.ebuild
+++ b/net-misc/memcached/memcached-1.4.29.ebuild
@@ -10,7 +10,8 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="High-performance, distributed memory object caching system"
 HOMEPAGE="http://memcached.org/"
-SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/memcached/memcached-1.4.30.ebuild b/net-misc/memcached/memcached-1.4.30.ebuild
index 53f09846f643..cb90d58fd110 100644
--- a/net-misc/memcached/memcached-1.4.30.ebuild
+++ b/net-misc/memcached/memcached-1.4.30.ebuild
@@ -10,7 +10,8 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="High-performance, distributed memory object caching system"
 HOMEPAGE="http://memcached.org/"
-SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/memcached/memcached-1.4.31.ebuild b/net-misc/memcached/memcached-1.4.31.ebuild
index 64b9c907badf..391882d22eb3 100644
--- a/net-misc/memcached/memcached-1.4.31.ebuild
+++ b/net-misc/memcached/memcached-1.4.31.ebuild
@@ -10,7 +10,8 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="High-performance, distributed memory object caching system"
 HOMEPAGE="http://memcached.org/"
-SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/memcached/memcached-1.4.32.ebuild b/net-misc/memcached/memcached-1.4.32.ebuild
index 53f09846f643..cb90d58fd110 100644
--- a/net-misc/memcached/memcached-1.4.32.ebuild
+++ b/net-misc/memcached/memcached-1.4.32.ebuild
@@ -10,7 +10,8 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="High-performance, distributed memory object caching system"
 HOMEPAGE="http://memcached.org/"
-SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/memcached/memcached-1.4.33-r1.ebuild b/net-misc/memcached/memcached-1.4.33-r1.ebuild
index c774a4485d78..ee866cfb9add 100644
--- a/net-misc/memcached/memcached-1.4.33-r1.ebuild
+++ b/net-misc/memcached/memcached-1.4.33-r1.ebuild
@@ -10,7 +10,8 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="High-performance, distributed memory object caching system"
 HOMEPAGE="http://memcached.org/"
-SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/memcached/memcached-1.4.33.ebuild b/net-misc/memcached/memcached-1.4.33.ebuild
index 2b55ea4109db..d12374a9e158 100644
--- a/net-misc/memcached/memcached-1.4.33.ebuild
+++ b/net-misc/memcached/memcached-1.4.33.ebuild
@@ -10,7 +10,8 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="High-performance, distributed memory object caching system"
 HOMEPAGE="http://memcached.org/"
-SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"