Fix directory structure

(Portage version: 2.1.4.4)
 (Unsigned Manifest commit)

3 files changed, 113 insertions, 2 deletions

diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index c65b87d89870..b99e6c8f1278 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -4,6 +4,8 @@ AUX 1.1.13/conf 639 RMD160 1ef3957a92d2e894c6ee533fde289b1b866d1387 SHA1 711cf87
 AUX 1.1.13/init 1307 RMD160 9c9f260b60dc89b06a365ca9a694669679dfe423 SHA1 b6d64c68edc856643a7e54b227b6ef3176f9a184 SHA256 abea96e396dd47c46cdb79ae6339d00a2af549016c02135e889df055633c52cc
 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.5/conf 813 RMD160 b299bd4c1b30da82ff97bef6c53ebb742250cba5 SHA1 fa1d7d8a288e793558bad624df1f71fb94b136f4 SHA256 0ec5ac0e22e7beed1e601c6606df837724f318c3becef6965e391e98a711dc2e
+AUX 1.2.5/init 2124 RMD160 54926ee68c86e7e0607649ab6e69a831553eafff SHA1 706a3d3403c52e8b467af778be7c3d4bbf518ef0 SHA256 fe09e6dd9b0a83dd4d9265c6bd689c17866b396be1bf98daff7d0c6b5f329820
 AUX conf 537 RMD160 5de199b3d9a76ef0efed7ee6105594e904e9f8ad SHA1 5213df426a6bb9f19893fdbc77a5e060dc3ab8b4 SHA256 c93f522dd0fdcdd8c92c34114bc830b66edbd612f464a648c313ddc3f1ec00dd
 AUX init 571 RMD160 ddaa6e2e9464618920cc3b6cb02d7ded1d164bdb SHA1 db92dc23707f261bdaa23b692a22b1495c3195fd SHA256 8ae8fa692c9dec80403840205cfb16295b843392f446bd8dc7715607bc43d31f
 AUX memcached-1.2.2-fbsd.patch 328 RMD160 669542854d9cbca5495db2ac2fe280502dbe96e6 SHA1 c783c1f1b89da8f61f170641dcf4d0987b9c3b08 SHA256 a0e91bd63a01a1a3361b0465fb9c63d091627d8714f3f64c853723b31da54b2f
@@ -18,6 +20,6 @@ EBUILD memcached-1.1.13-r1.ebuild 1638 RMD160 dec94934ef333ce82957982a87efe822bf
 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 1622 RMD160 3d80b9057900ac8311d7bec6acd952b2eefcc8be SHA1 b9a1240ab9e9c3ba5695b1924cbf1148d0e08ca5 SHA256 05e2e6cb83aa34576f7dfe254684c3731eb180869168ae69afaa52f48a92683b
-EBUILD memcached-1.2.5.ebuild 1702 RMD160 4be3b7afaedb80acc6f591e53118aaec4e65be1a SHA1 337a368c934392aec21c0b23a740f0334cad4271 SHA256 3fd8751e21f1762ad723ec32cfa2c37dcefa8d85d114967bf32837a0bee92db3
-MISC ChangeLog 11922 RMD160 58afa813aa13b54d1a5a4c736b42e164aadc5d95 SHA1 0d0a456cefdeec2cd13f9a9d2a71f1515bd82ab5 SHA256 aa9c8bd4b760e403417be69e8e8dedcf6ca1306a4737724ae0a5b8f6f9aa6b27
+EBUILD memcached-1.2.5.ebuild 1624 RMD160 34b6adb262bb20e39458a70e2d016f4a7382bb56 SHA1 cca5db5014751e3825f48351975c50a08d6ab235 SHA256 fde702bf5a213303fba4616403ebb9dbf9791812693ab9c04bb1129bf3e75306
+MISC ChangeLog 12060 RMD160 3a4e59765fb2453ec6b73b77ecbdda0cfd15a831 SHA1 862ae3defbdcfffbd5b06bdee6e79f328defa498 SHA256 3da258f48d471f196c151df4bc1d6528781c55b331cf2387ad65b253666ae72c
 MISC metadata.xml 841 RMD160 60a5beb49a85e92147066ead33afb1961bb00eec SHA1 11a620a9e2336f2dcee196b60c4d4e8127ca5c1e SHA256 6ecc5efcf267f183adeac1a372a306042849384a67f86d3543397dcaf62ff64e
diff --git a/net-misc/memcached/files/1.2.5/conf b/net-misc/memcached/files/1.2.5/conf
new file mode 100644
index 000000000000..44c20837f327
--- /dev/null
+++ b/net-misc/memcached/files/1.2.5/conf
@@ -0,0 +1,32 @@
+# Copyright 2003 Gentoo Technologies, Inc
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.2.5/conf,v 1.1 2008/03/31 12:17:07 caleb 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="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.5/init b/net-misc/memcached/files/1.2.5/init
new file mode 100644
index 000000000000..68104b4a683e
--- /dev/null
+++ b/net-misc/memcached/files/1.2.5/init
@@ -0,0 +1,77 @@
+#!/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 $
+
+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}" \
+				--startas "${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 $?
+}