Fix init script not to look for a configuration file when generating dependencies...

Package-Manager: portage-2.2.0_alpha56/cvs/Linux x86_64

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index f5e51d06f86259189cf865e3adc4b655913aa33a..d1add772c90b20c76fe14649e65502c788016066 100644 (file)
--- 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/Manifest b/app-emulation/lxc/Manifest
index 264efb28ec257579b184cd8b4415b19ae74f6847..b29b9bf01bec9ab761cf7ebc57f237b6c84d0e08 100644 (file)
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX lxc.initd 3525 RMD160 aa9c9e3864cdad8760b1fac4fa222a4def0bacba SHA1 2a28c4d5fae0f1ee67cbe19403a71faacf49ef12 SHA256 ed3fcb2fb8eb124a7b7a939a720ab08d62429f0cc97f169ede4828ee67984aa4
-DIST lxc-0.7.4.2.tar.gz 274421 RMD160 4f56aab0bbb48a514fee7fece9a485e599688a63 SHA1 876cf9a4788eb082e58e4a7853ca81b0a9676037 SHA256 b483fcc1c1a2540c194af065d9c68aeab261b57bd4d50b17f3970701a322a0b3
+AUX lxc.initd 3555 RMD160 b9bed6bf618d5da2e3e0db99ef0337c383a22fbe SHA1 81eb36e4286b623cb778ca6495fa1e50b9e0fa95 SHA256 1cf87a6fecf50e43828daf58b9bdd9a7a22006c16ea32137ac1d7d9d7f2984f5
 DIST lxc-0.7.5.tar.gz 265562 RMD160 93407be1ebf31bdcfa617e60672d9f86ba2940d1 SHA1 9712dccdcd2c10a522134fa17384a5b9e38fce0e SHA256 019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c
-EBUILD lxc-0.7.4.2.ebuild 3528 RMD160 c3103d7e1e15d42f33313536eeffc7490d93f1a4 SHA1 279fc085f333a5f760f17eedc98bafdd428ce73f SHA256 a4c9350fb82fc9870231a0c97245a80023e701f253ddd97122cd6b0f03dcbb29
-EBUILD lxc-0.7.5.ebuild 3203 RMD160 eeabd1bd57809b17ccab5e6b2aa9a143da2fade1 SHA1 483823a628a0dfde3ae078c43b1b6f3afe0aa9e3 SHA256 35364f5d85c8efdc6adb551727b4f72fdb9a3b0b2700a096b8dda638fb816daa
-MISC ChangeLog 5933 RMD160 2bd4ac5f26caec5df62c8272aadef241b973c06f SHA1 aad583e1c64e76f8d09bfca47efa1e796686161a SHA256 8327c19918513ee08f3c4f3f9696122738fdf8dcba86c74668f9301ceab56df0
+EBUILD lxc-0.7.5-r1.ebuild 3206 RMD160 d51c3d6e0910dea9d6e116b5955fca23a092cb73 SHA1 0c19a7257477147b44f7ec9d8e7f64f71b6e9d58 SHA256 dd6bb65d5add92e2e4606b32138cfce7a886182d603e2632c831bac581e74335
+MISC ChangeLog 6319 RMD160 230592f68e012f79671599ba8f7bee8873fd8c8b SHA1 9f5ab12069ba29fb0d132b9bc42e3dfc1f3f2e47 SHA256 24b343e8bfa4905468ba975359ec536da44751f93239314606c5fca7a87aaa69
 MISC metadata.xml 653 RMD160 d6139a7ce3a5dab18f33c7f111f2e7827c290723 SHA1 47ba631625b4f2b20e491a964e65c78dd236f6f2 SHA256 35f64761067f47ff7abd0e3f3cb57f4bab888a2546bf3267d59987505101a190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5lFa4ACgkQAiZjviIA2XiBbQCg0wslq3FeOe2FquZEe3Qv7hSH
-Zo8AnAioOcCZUtTVehU0sqHsdINrS0vk
-=n84L
+iEYEARECAAYFAk5xAvEACgkQAiZjviIA2XjrUACgmSt25ZuZ5vbnCoS1hWXOyeFv
+uc4An2dp4Qx5EMlaH/0JiQCk6jsBqEZV
+=Aaos
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/lxc/files/lxc.initd b/app-emulation/lxc/files/lxc.initd
index 16b5140e4bc0c3a3c6e6e44a0224af41f0a4dfe0..6266193031e60d72323a3feb994ba72a29a3ba10 100644 (file)
--- 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 (file)
index 2e05dd1..0000000
--- 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
similarity index 96%
rename from app-emulation/lxc/lxc-0.7.5.ebuild
rename to app-emulation/lxc/lxc-0.7.5-r1.ebuild
index 53fe91a015aa867bcfef5f0481b48bcf9200ee64..8b729caa0fce82f56788f5658f2c0656932ff1f7 100644 (file)
--- 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"