Fix init script not to look for a configuration file when generating dependencies for the base (multiplexed) init script. Revision bump to make sure users reinstall the ebuild, and remove old. Closes bug #382519.

(Portage version: 2.2.0_alpha56/cvs/Linux x86_64)

4 files changed, 12 insertions, 124 deletions

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index f5e51d06f862..d1add772c90b 100644
--- a/app-emulation/lxc/ChangeLog
+++ b/app-emulation/lxc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/lxc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.26 2011/09/05 18:32:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.27 2011/09/14 19:39:40 flameeyes Exp $
+
+*lxc-0.7.5-r1 (14 Sep 2011)
+
+  14 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> -lxc-0.7.4.2.ebuild,
+  -lxc-0.7.5.ebuild, +lxc-0.7.5-r1.ebuild, files/lxc.initd:
+  Fix init script not to look for a configuration file when generating
+  dependencies for the base (multiplexed) init script. Revision bump to make
+  sure users reinstall the ebuild, and remove old. Closes bug #382519.
 
 *lxc-0.7.5 (05 Sep 2011)
 
diff --git a/app-emulation/lxc/files/lxc.initd b/app-emulation/lxc/files/lxc.initd
index 16b5140e4bc0..6266193031e6 100644
--- a/app-emulation/lxc/files/lxc.initd
+++ b/app-emulation/lxc/files/lxc.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd,v 1.6 2011/09/05 18:32:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd,v 1.7 2011/09/14 19:39:40 flameeyes Exp $
 
 CONTAINER=${SVCNAME#*.}
 
@@ -18,7 +18,7 @@ lxc_get_configfile() {
 	fi
 }
 
-CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)}
+[ $CONTAINER != $SVCNAME ] && CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)}
 
 lxc_get_var() {
 	awk 'BEGIN { FS="[ \t]*=[ \t]*" } $1 == "'$1'" { print $2; exit }' ${CONFIGFILE}
diff --git a/app-emulation/lxc/lxc-0.7.4.2.ebuild b/app-emulation/lxc/lxc-0.7.4.2.ebuild
deleted file mode 100644
index 2e05dd140090..000000000000
--- a/app-emulation/lxc/lxc-0.7.4.2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.7.4.2.ebuild,v 1.1 2011/07/26 13:39:28 flameeyes Exp $
-
-EAPI="4"
-
-MY_P="${P/_/-}"
-
-inherit eutils linux-info versionator flag-o-matic
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="http://lxc.sourceforge.net/"
-SRC_URI="http://lxc.sourceforge.net/download/lxc/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="doc examples vanilla"
-
-RDEPEND="sys-libs/libcap"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-sgml-utils )
-	>=sys-kernel/linux-headers-2.6.29"
-
-# For init script, so protect with vanilla, they are not strictly
-# needed.
-RDEPEND="${RDEPEND}
-	vanilla? (
-		sys-apps/util-linux
-		app-misc/pax-utils
-	)"
-
-CONFIG_CHECK="~CGROUPS
-	~CGROUP_NS ~CPUSETS ~CGROUP_CPUACCT
-	~RESOURCE_COUNTERS ~CGROUP_MEM_RES_CTLR
-	~CGROUP_SCHED
-
-	~NAMESPACES
-	~IPC_NS ~USER_NS ~PID_NS
-
-	~DEVPTS_MULTIPLE_INSTANCES
-	~CGROUP_FREEZER
-	~UTS_NS ~NET_NS
-	~VETH ~MACVLAN"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:	needed for pts inside container"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:	needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS:	needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:	needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH:	needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:	needed for internal (inter-container) networking"
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	econf \
-		--localstatedir=/var \
-		--bindir=/usr/sbin \
-		--docdir=/usr/share/doc/${PF} \
-		--with-config-path=/etc/lxc	\
-		--with-rootfs-path=/usr/lib/lxc/rootfs \
-		--with-linuxdir="${KERNEL_DIR}" \
-		$(use_enable doc) \
-		$(use_enable examples)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS CONTRIBUTING MAINTAINERS \
-		NEWS TODO README doc/FAQ.txt
-
-	# If the documentation is going to be rebuilt, the Makefiles will
-	# install the man pages themselves; if we're not going to, we
-	# still need to install them, as they are provided with the
-	# tarball in recent versions.
-	if ! use doc; then
-		doman doc/*.{1,5,7}
-	fi
-
-	rm -r "${D}"/usr/sbin/lxc-{setcap,ls} \
-		"${D}"/usr/share/man/man1/lxc-ls.1 \
-		|| die "unable to remove extraenous content"
-
-	keepdir /etc/lxc /usr/lib/lxc/rootfs
-
-	find "${D}" -name '*.la' -delete
-
-	use vanilla && return 0
-
-	# Gentoo-specific additions!
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	keepdir /var/log/lxc
-}
-
-pkg_postinst() {
-	if ! use vanilla; then
-		elog "There is an init script provided with the package now; no documentation"
-		elog "is currently available though, so please check out /etc/init.d/lxc ."
-		elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
-		elog "to start the container defined into /etc/lxc/configname.conf ."
-		elog "For further information about LXC development see"
-		elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
-		elog ""
-	fi
-	ewarn "With version 0.7.4, the mountpoint syntax came back to the one used by 0.7.2"
-	ewarn "and previous versions. This means you'll have to use syntax like the following"
-	ewarn ""
-	ewarn "    lxc.rootfs = /container"
-	ewarn "    lxc.mount.entry = /usr/portage /container/usr/portage none bind 0 0"
-	ewarn ""
-	ewarn "To use the Fedora, Debian and (various) Ubuntu auto-configuration scripts, you"
-	ewarn "will need sys-apps/yum or dev-util/debootstrap."
-}
diff --git a/app-emulation/lxc/lxc-0.7.5.ebuild b/app-emulation/lxc/lxc-0.7.5-r1.ebuild
index 53fe91a015aa..8b729caa0fce 100644
--- a/app-emulation/lxc/lxc-0.7.5.ebuild
+++ b/app-emulation/lxc/lxc-0.7.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.7.5.ebuild,v 1.1 2011/09/05 18:32:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.7.5-r1.ebuild,v 1.1 2011/09/14 19:39:40 flameeyes Exp $
 
 EAPI="4"