Version bump; update warnings (configuration is now back to 0.7.2 syntax); make sure the init script logs warnings, as otherwise you'll never know what's going on.

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

4 files changed, 140 insertions, 11 deletions

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index b0c10091e6e8..e30c16140736 100644
--- a/app-emulation/lxc/ChangeLog
+++ b/app-emulation/lxc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/lxc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.19 2010/11/22 10:48:32 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.20 2011/02/26 18:02:51 flameeyes Exp $
+
+*lxc-0.7.4 (26 Feb 2011)
+
+  26 Feb 2011; Diego E. Pettenò <flameeyes@gentoo.org> +lxc-0.7.4.ebuild,
+  files/lxc.initd:
+  Version bump; update warnings (configuration is now back to 0.7.2 syntax);
+  make sure the init script logs warnings, as otherwise you'll never know
+  what's going on.
 
   22 Nov 2010; Diego E. Pettenò <flameeyes@gentoo.org> lxc-0.7.3-r1.ebuild:
   Add a postinst note about the new location, since upstream provides no
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index b6fbdbe2222d..7d9812a93793 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX lxc.initd 3198 RMD160 040fe0799306a781201500b5cd6b4fd1b23a2b39 SHA1 159d86282ba7be1541b7e1899a935cf4688ef0db SHA256 14a918e913173b1c9d3782e9b3df2471bb9d715df1d9d3f1e030f42da62f6d69
+AUX lxc.initd 3206 RMD160 012b94240f1c061eb9d3f6a3e1bc31414ee952c3 SHA1 5de2218a1e7529ef285099b8d28bdb010267d7f8 SHA256 33802f04be6fbc8623a6332eb31d67ade45a7e9b6b40e531e574f35a19ae58b9
 DIST lxc-0.7.2.tar.gz 266877 RMD160 3c4f2a751c1f4965bab75d9825e4d9d0642a4a4b SHA1 75dfc113a576fa15d46a3736ff788a168de0b258 SHA256 0660edbc08d74275968cb18c8e634aafd6f1ad395419e037d7018f2b1d669b1a
 DIST lxc-0.7.3.tar.gz 269712 RMD160 e7a3e157ac2d82cf655da4cea909c35474be100c SHA1 507f81d71ba963e6e9eb1b3cae6f6f5e103be9c2 SHA256 fa3b28cdb79b7c4735eaa8535dd014f94c8b7683d8ce2934d5836d241f48da09
+DIST lxc-0.7.4.tar.gz 274417 RMD160 cdf47bd031e1e475fcbe1b4e9d51f2544df058b8 SHA1 2759f463e5c75f211a01241ba676a80fdbe102e2 SHA256 a8237b2a42a05266a39aa9f9d64d7aa6f12b197cf1982d7764a0b0f9b940eef6
 EBUILD lxc-0.7.2-r1.ebuild 3073 RMD160 b04383df106bf68dfc65967c595ae0ac2c25ed02 SHA1 0b5663325909d39b8682603293b2dc1db893c169 SHA256 0118908c15e225b06efca3648d6734a384faa3443c84709e2ae4861615c67402
 EBUILD lxc-0.7.3-r1.ebuild 3518 RMD160 210742e06f924971ec8e9b5ba9e45b7085b5db53 SHA1 388af83f15ca993dbb6ea8df55cf4be6375a93e2 SHA256 9ee6684a080b2475ab9874dd7de9471e1e1691f1c011d496257082900d342c88
-MISC ChangeLog 4514 RMD160 847147dce9b1e484b0ccfb631899d231f3cbdb97 SHA1 78fd342ccecd018f51e3e955bb6467ce11aa5fc2 SHA256 2b7b5eb86c01a6bceac199a8d9be25af1fff9efcf4c557cda5624c24cbc897da
+EBUILD lxc-0.7.4.ebuild 3558 RMD160 9afa1f7941e4115b395d26f960f18c61d24bf126 SHA1 1993d952067f96130ab3c1bcf462c89e10c633db SHA256 29040dc66ed79d74d90de57d0e42652441b4ed6820482439084a9852a9c6b3cc
+MISC ChangeLog 4805 RMD160 0fecd93c5a388b3bebc033b71471451d98ee96dd SHA1 7dafa47af4695f70977b6bb6b9308d4ecf035ede SHA256 1350694e4e957ff7e0e764e1729ecaddb3c3c8397711087e302eb209a4877c11
 MISC metadata.xml 653 RMD160 d6139a7ce3a5dab18f33c7f111f2e7827c290723 SHA1 47ba631625b4f2b20e491a964e65c78dd236f6f2 SHA256 35f64761067f47ff7abd0e3f3cb57f4bab888a2546bf3267d59987505101a190
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzqSncACgkQAiZjviIA2Xj2WQCg4K82thNiKq1zWV1L99XAl1lQ
-SuUAoIUmJoSKgLuq/tW7hjqrmBs54Asr
-=MySk
+iEYEARECAAYFAk1pQFsACgkQAiZjviIA2XiyVwCdEckwSvhT3kBH2zdhTwrgIUOy
+bCgAoJvqtO7ci4GBA5ORLQuyYAeh2STZ
+=X4RN
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/lxc/files/lxc.initd b/app-emulation/lxc/files/lxc.initd
index 78acc1400a3e..86bae5f75762 100644
--- a/app-emulation/lxc/files/lxc.initd
+++ b/app-emulation/lxc/files/lxc.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 2010-2010 Gentoo Foundation
+# 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.2 2010/08/01 21:13:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd,v 1.3 2011/02/26 18:02:51 flameeyes Exp $
 
 CONTAINER=${SVCNAME#*.}
 CONFIGFILE=${CONFIGFILE:-/etc/lxc/${CONTAINER}.conf}
@@ -75,7 +75,7 @@ start() {
     esac
 
     ebegin "Starting ${CONTAINER}"
-    ${setarch} lxc-start -n ${CONTAINER} -f ${CONFIGFILE} -d -o /var/log/lxc/${CONTAINER}.log
+    ${setarch} 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
diff --git a/app-emulation/lxc/lxc-0.7.4.ebuild b/app-emulation/lxc/lxc-0.7.4.ebuild
new file mode 100644
index 000000000000..d55ea276bed7
--- /dev/null
+++ b/app-emulation/lxc/lxc-0.7.4.ebuild
@@ -0,0 +1,119 @@
+# 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.ebuild,v 1.1 2011/02/26 18:02:51 flameeyes Exp $
+
+EAPI="2"
+
+MY_P="${P/_/-}"
+
+inherit eutils linux-info versionator base
+
+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 ~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() {
+	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) \
+		|| die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	dodoc AUTHORS CONTRIBUTING MAINTAINERS \
+		NEWS TODO README doc/FAQ.txt || die "dodoc failed"
+
+	# 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} || die
+	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."
+}