Remove unused file

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

3 files changed, 19 insertions, 149 deletions

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index 000cbe6f9013..ac15b6c6bacc 100644
--- a/app-emulation/lxc/ChangeLog
+++ b/app-emulation/lxc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/lxc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.71 2015/03/20 21:56:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.72 2015/03/20 21:58:12 hwoarang Exp $
+
+  20 Mar 2015; Markos Chandras <hwoarang@gentoo.org> -files/lxc.initd.2:
+  Remove unused file
 
   20 Mar 2015; Markos Chandras <hwoarang@gentoo.org> -lxc-1.1.0-r2.ebuild,
   -lxc-1.1.0-r3.ebuild, -lxc-1.1.0-r4.ebuild, lxc-1.1.0-r5.ebuild,
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 08ba1b684626..c05a98829c93 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -4,7 +4,6 @@ Hash: SHA256
 AUX lxc-1.0.6-bash-completion.patch 1341 SHA256 ddac7cc033a4029f8264d06978321bb33ef7c4fd34c9a44bb1acaaaf1c85d302 SHA512 56b00f77812c0600a8ff7557ef0acf7f50d37bb9f6e5b3641c9a218a53ac64a59785430d0775c1c7980ac39120a2544fd7c28cf39fefc07e7f1558f88b9b5917 WHIRLPOOL b3ff9a377d7d29fa76b6d547f2d1b1621c5ab52e972a9b52389c269f26ba9f43eae6a414db46135be84f1ed91ebea9d6d24cc25da11f493dc86fee088e90bfb4
 AUX lxc-1.1.0-fix-gentoo-template.patch 1375 SHA256 f0b765d1b150b18adc3c67fdff6d80e2ab81f7d48ddafbd9cd95fef3d4d6243e SHA512 17f21b9a0ce45de5d184ae0421666f2b1193ac0da0fec39d12fe463054669ca7b55636794e0ab747058a7b9d79ae68a68e3f5e2d3e3d05854ea3d6e49bf536dd WHIRLPOOL 3858155a567c6efde97368dd1c39173d39d7f3635ab46a14238726ca60be7e45b82d96c58e33e48d46042eeb81664ce78f3d272bb5e632da15484c33a25422c0
 AUX lxc-1.1.1-shm-tmpfs.patch 1137 SHA256 db2714fe67d8acd1ebc68e196b467f20a548ef60673120c5a0415d282ab29069 SHA512 0d6162ed0b538ca5c9a6f9cf094474b0e084a8989eefb9d8c5c507fdcdb13962f20f2466833f867c41ce39184e9ac7791b49735c39add94deccaecd763a177ec WHIRLPOOL 4598f31a16d2dc0d2a47e720f6f346866570dbe103eeef36e214543667e6126f0a908bae3a983636ed4f154f8bdab5f5bf20595d356b876ae3768de78b9a543d
-AUX lxc.initd.2 3673 SHA256 bb7780168695e934549909c5c7baa7d6cdc92b0e19093a3d04a1313081a832e1 SHA512 25b0474d6f16fcede89a8e17518a658f810cb554eaef10aae3ce1fdd8c8640118aa6375cbee443f0b26e8086eb7c25375ceaaaf29a4110bd779f94b2f4b0d300 WHIRLPOOL 28f56d71b95b26c7f6ad5402a37413a973bc7bdf08fd3963ad192888ae1b49809a56c16009bc6049061d419ecffb1279e153e6ef5acbe06956efca154eae6a01
 AUX lxc.initd.3 3765 SHA256 2a96156f8d07391ae67d2160199d6ae362889438ac5b48c6c241aa02b9f4928e SHA512 fecefad41640c648bc3923952131e97617bc40bfcaa8b7dce2cac752551ca4c9e126c14febe4c56c04ccb3ebd378a91c5a6fe1d3a8cfcf083186b962e4d43b82 WHIRLPOOL ac64b41aed33c08e3baef74fbacb3895a0566837f3e185315792e5a333e35af72c5c784e890cdbf4480515704b017a97c8ba8e1a256032c50da22c3d63b135d4
 AUX lxc_at.service 232 SHA256 0aaf2f362b3ac6aa2b427d47ac4436d46387624b0d8bc4850c5d5b6a7d228711 SHA512 4c3bab4f2cc9aea8b0753dcaf2fd7ed5f1cd7d97d286d6204b2fc17505b6edaac2f536bbda5c1466856311d0e93d75de91dec51e9b0f665d67afedbf40c19170 WHIRLPOOL f6928b4b85e63c38295cabc651b7bd61d2b0bc69ff1850de7cfa8a4f40e4894d94264c262fec7d345488cace49c4283f932739313b975f6862c1aa0ef51e0652
 AUX lxc_at.service.2 291 SHA256 ada7e5fa2728d3f2385bd7410c7263ffd789bd2ae6b3c61c6825ad392f71afce SHA512 367e090d0f22d52e5ffe3b06c4d3699e9c2602ad2cd195c5802dd50f58730146bbfe9b13f052067e2ab39d4d94b8ad93a065dd712c6c9d3381f70bcd46525886 WHIRLPOOL de409239a546314928c838701222825d39d9b0af3a8149459cd8c73e0b0eca274a6d6a82c0ac7eb839d8f636fb5094a880adb5e73a1f6be32d7592a1e902252c
@@ -16,24 +15,24 @@ EBUILD lxc-1.0.6-r1.ebuild 5890 SHA256 1cecb85629b81866f30d6d7309533ef69319778d0
 EBUILD lxc-1.0.7.ebuild 5922 SHA256 91ac06c4a1094697e86ebf85403faa83db155b7c71f5f0d98349cd12ad3770c7 SHA512 e51f9f3705c1c5f01dfdda012c7fe4d178182fb4823e21a65c3518388b7a4464fde44033f8f4240ed4cea2ccc7d9c9151cae7878d0e442b9be8cc418ebf28483 WHIRLPOOL 98102baa34865b5f1e936c8033ba00c10667943fc4697575c8e8c23a8288ffd108cf050964394686175c1b98e605b77a3119408c5e59468dcc4e4a312ddf2697
 EBUILD lxc-1.1.0-r5.ebuild 6069 SHA256 bd59246b75d109769fb269f60a0f08238ffa7d1b1f52c241542282f906178d44 SHA512 b52ad906076edc4bed6cfa2171010c3c6058f17ee280455d4aa258ae441e826e4539096f78934671dd7f73959076697cdac4a677622c91ef5fd0202eecef3cc6 WHIRLPOOL 943cbb39d2f4590e8ef6c521c671186751f2a35da6e7bb04eb1c0ef264fbcb15ea3ca8da1f784c2e161669eac5d987521261363132da260da09571300f67e7e3
 EBUILD lxc-1.1.1.ebuild 6110 SHA256 c7836835a7469b21d08559601c2085ce571fbe2943de1902ee45d53df0a87103 SHA512 c62d282bdfad10b07abb9ca6adda8e0b05dc9a268f9ef371f5347484015024f956bdce4e6435292c813386304d5007fc0bceb51af14f60862f135996f4b71920 WHIRLPOOL 1f082e5e46452fdfbb7822772a00a780fd45b378207c6016484aebf6b385d1f8232e67fff02057e3405619e1cb14bc45d13ab70ee1bec7195a34fe907a8fdb99
-MISC ChangeLog 14680 SHA256 e2568bacb7fbaa535497728787c4bee847ad7bf7923c8d4158699a2c41f241e8 SHA512 b45169693d02f25bbfc2dbceb66fd9224e80176772205ae71283057cbad76aee396a04565a21b75a7c572b5d2f990905dafb2ab7d38dd56a9d6a44ffe2695d60 WHIRLPOOL 8847a219793c4cb77a77643360bc422066519683943967b2e22e5aa544d0d0b95a96698c80c22e50c915b735c5d144333e0247b170dc6f44f6defa885ad7d90c
+MISC ChangeLog 14775 SHA256 9909a88407ef51e899dbacdefdabdb3edd43a754d76aabdc7000af8442ed091a SHA512 fa9ae87b2b3dc127da17a75746a362863732a03ee650e8e12367ef7ec634d2e1a339caa5fd8cf20a7e776c41889e36b9ae7dd9a8f448525aa51e5e92cdffe911 WHIRLPOOL 4bb695f53c9f9562a121a1f10991ae59547ad6e3d5d93f96d3e7c08da7fca67939611a60f880bb047abc8df13543acc526b34d35f412f04e3d63b61990b3efcd
 MISC metadata.xml 505 SHA256 b73ca71fcfe6d4f1e60053cbb74193f42175f9679f9a6126b656a5723c8bc45b SHA512 217f2d296d2d23b6c5c8462e74554b7ba3c57d76eb363b4f69be2f47173caee45878b0cea98d024ff4c6cf5e1ba2e9b0de3882ab12efb5b6357598a337af0c78 WHIRLPOOL 174c2bad87f51a5fd8cdaed0e068a8f26998b9a4b9959ad2192f4b14b5253c41ffcf9c0baa04233f1cd74dcf6198fe8fa40e12a4f6c13fd4cb70638e1bc6e0a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVDJeFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVDJfzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88H3gQAMKbVcD47tp4CqbZtDi0moBH
-PLylI5VDvpOCzJbDgTpIThzrXv0PRECCacvKyng4B2B+6LcJkKfJ6zXZqoafi+zO
-OU+gosSf4AF/QMBfzQoUslMfwsd7vGF9ABo9krTXA5UcJGuZGKhwp5FrgRkDzROc
-XLM8Huoc/DubwUPf1eaO3S8K0xF/lWW8MadRJL1kFSHlsO9ex1Rw1tnGITIwTr5l
-DeFxwf5CJXFMRGLZVAjLPIl4mig12D6weuvl8jjL7Bc5ZblTw25J6biw02kPHnkT
-NfVotVvq8bE5U8na2RvnD940QxyID1cVNGskeggQE68u7RfhO7hYa2bONK+TGU2k
-LKksPyqJ+22J5o2SBH+q42KRgJnZtXeJWqn4cb2g9T9j5VzrDfz8+ff+sDX+LYQj
-9Zs6rVPIh0vRVTmHRw2eSN5ioxjW0zXjuxUvQasc38LtVPRclgqqQoc+GUStymcn
-hacNVPB7WGVggYzHAWfkeu0mC1fOckYs8/XZGXk10Er1igzvLtL+JmCz0xn3EsXR
-FlhffszZ8rJWAcv16/dS8Hswg5rhLXQykEZbjzt28JJqG88yZmUUXjq8m4J2z6wH
-q2e8JsQ4M7xknrgsSlW3OZaNsgWyfbvJkwODnCK8TByR9l/T44m1RsXsuM4F1sJo
-cwpUeaRi0oekvxNQjSUW
-=1zMq
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88w18QAIh8QXm3EwsYYQaqOZlqJ01X
+TsHifOAED0ADZkhIkx8vKXZLgE+eJUBxMjkruqkvJX8mjr3ImJQdsYV+V1BNs1eX
+mu2VLrw3bqbLv5dPLDmRtM0ygHlTbczIh7MNaxGcZ87Cw3JHxc7VSglHglmUAe8U
+xjPSQtewAVR+drObw9qftAaP0vlSuV6SSOd8WqKxyuInlWA0pEBivews5AOktRV3
+1oeth5/gacGumtreDf4hKIoKxajf6nZUxZA1HvzHR2DrhFqxHm/1kBFMElcCngXb
+wk0nXJA2XzilJ0abf4HeJoqqMpSP7OcM2rrI+eihQPYHw5EbS7ntt7k3232S1oYj
+EN/fwP4/b5w17KVRCFymQxcZuallaFudLNPOumDj9u7XCZy3rKCdTK29odjfiiYu
+4oMydO0/d9uYEfWVPxOnzmqaboDKGoAThUQ8icK1Ho20JZBKIZuUDhARarAtr/2t
+NPfAtucfwiNbWxJE6ymCE1W7UG6dIUQ0Z3tAcSTFjmSuqe2MZaLq0UI43jdSN9M3
+ilwoFfk8BvG2/4399Euda8nJ63b/RPBfY+EtdL+dHjZMmq9zmRqK6D3SArRUUVLs
+0mEeoQu4TazuaOw5vLafIyy5qoqqdJdOdaqyttPKZDB2D7nsLRp+67KnGc8HU9TI
+Rz7aQd854rbT1l5ZxMeV
+=SAra
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/lxc/files/lxc.initd.2 b/app-emulation/lxc/files/lxc.initd.2
deleted file mode 100644
index 72680d8f9476..000000000000
--- a/app-emulation/lxc/files/lxc.initd.2
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.2,v 1.6 2012/11/14 02:15:10 flameeyes Exp $
-
-CONTAINER=${SVCNAME#*.}
-
-lxc_get_configfile() {
-	if [ -f "/etc/lxc/${CONTAINER}.conf" ]; then
-		echo "/etc/lxc/${CONTAINER}.conf"
-	elif [ -f "/etc/lxc/${CONTAINER}/config" ]; then
-		echo "/etc/lxc/${CONTAINER}/config"
-	else
-		eerror "Unable to find a suitable configuration file."
-		eerror "If you set up the container in a non-standard"
-		eerror "location, please set the CONFIGFILE variable."
-		return 1
-	fi
-}
-
-[ $CONTAINER != $SVCNAME ] && CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)}
-
-lxc_get_var() {
-	awk 'BEGIN { FS="[ \t]*=[ \t]*" } $1 == "'$1'" { print $2; exit }' ${CONFIGFILE}
-}
-
-checkconfig() {
-	if [ ${CONTAINER} = ${SVCNAME} ]; then
-		eerror "You have to create an init script for each container:"
-		eerror " ln -s lxc /etc/init.d/lxc.container"
-		return 1
-	fi
-
-	# no need to output anything, the function takes care of that.
-	[ -z "${CONFIGFILE}" ] && return 1
-
-	utsname=$(lxc_get_var lxc.utsname)
-	if [ ${CONTAINER} != ${utsname} ]; then
-	    eerror "You should use the same name for the service and the"
-	    eerror "container. Right now the container is called ${utsname}"
-	    return 1
-	fi
-}
-
-depend() {
-	# be quiet, since we have to run depend() also for the
-	# non-muxed init script, unfortunately.
-	checkconfig 2>/dev/null || return 0
-
-	config ${CONFIGFILE}
-	need localmount
-
-	# find out which network interface the container is linked to,
-	# and then require that to be enabled, so that the
-	# dependencies are correct.
-	netif=$(lxc_get_var lxc.network.link)
-
-	# when the network type is set to phys, we can make use of a
-	# network service (for instance to set it up before we disable
-	# the net_admin capability), but we might also not set it up
-	# at all on the host and leave the net_admin capable service
-	# to take care of it.
-	nettype=$(lxc_get_var lxc.network.type)
-
-	if [ -n "${netif}" ]; then
-	    case "${nettype}" in
-		phys)	use net.${netif} ;;
-		*)	need net.${netif} ;;
-	    esac
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	rm /var/log/lxc/${CONTAINER}.log
-
-	rootpath=$(lxc_get_var lxc.rootfs)
-
-	# Check the format of our init and the chroot's init, to see
-	# if we have to use linux32 or linux64; always use setarch
-	# when required, as that makes it easier to deal with
-	# x32-based containers.
-	case $(scanelf -BF '%a#f' ${rootpath}/sbin/init) in
-		EM_X86_64)	setarch=linux64;;
-		EM_386)		setarch=linux32;;
-	esac
-
-	ebegin "Starting ${CONTAINER}"
-	env -i ${setarch} $(type -p lxc-start) -l WARN -n ${CONTAINER} -f ${CONFIGFILE} -d -o /var/log/lxc/${CONTAINER}.log
-	sleep 0.5
-
-	# lxc-start -d will _always_ report a correct startup, even if it
-	# failed, so rather than trust that, check that the cgroup exists.
-	[ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ]
-	eend $?
-}
-
-stop() {
-	checkconfig || return 1
-
-
-	if ! [ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ]; then
-	    ewarn "${CONTAINER} doesn't seem to be started."
-	    return 0
-	fi
-
-	init_pid=$(lxc-info -n ${CONTAINER} --pid | awk '{ print $2 }')
-
-	if [ "${init_pid}" = "-1" ]; then
-	    ewarn "${CONTAINER} doesn't seem to be running."
-	    return 0
-	fi
-
-	ebegin "Shutting down system in ${CONTAINER}"
-	kill -PWR ${init_pid}
-	eend $?
-
-	TIMEOUT=${TIMEOUT:-30}
-	i=0
-	while [ -n "$(pgrep -P ${init_pid})" -a $i -lt ${TIMEOUT} ]; do
-		sleep 1
-		i=$(expr $i + 1)
-	done
-
-	if [ -n "${missingprocs}" ]; then
-		ewarn "Something failed to properly shut down in ${CONTAINER}"
-	fi
-
-	ebegin "Stopping ${CONTAINER}"
-	lxc-stop -n ${CONTAINER}
-	eend $?
-}