Respect USE=python so additional tools can be built. Bug #541932

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

3 files changed, 217 insertions, 15 deletions

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index 8ff503a0d1f8..a3dddb42620c 100644
--- a/app-emulation/lxc/ChangeLog
+++ b/app-emulation/lxc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.65 2015/03/03 05:51:15 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.66 2015/03/11 18:18:44 hwoarang Exp $
+
+*lxc-1.1.0-r4 (11 Mar 2015)
+
+  11 Mar 2015; Markos Chandras <hwoarang@gentoo.org> +lxc-1.1.0-r4.ebuild:
+  Respect USE=python so additional tools can be built. Bug #541932
 
   02 Mar 2015; Yixun Lan <dlan@gentoo.org> lxc-1.0.7.ebuild:
   add arm64 support, tested on A53 board
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 9bac9737dc6b..92101d3774a3 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -14,22 +14,25 @@ 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-r2.ebuild 5737 SHA256 5a61ff7dee0c4fa4abb271d741b5a927b046f876bfe45c4861190ec099ecf8e5 SHA512 a84e5b7435e09f6d21c7a5afa7ec3fc779f195562bb9e77990c4bd6378b64e26a6617d693399abb29f3a97bdc2b387add6a5a1db52544771d8035c2dd692ce68 WHIRLPOOL db6f2033329d3fabb7868d4c777efd803fb8b50d3c601eb2f0b62a991a2c94e0c4444c9dea45eba43dc86d5c6c8f224985aedfaabb89bd3064744b7e6f999316
 EBUILD lxc-1.1.0-r3.ebuild 6061 SHA256 6e578ef49d4576f28c52e0b62cde6ef43ca60a0e343812b59c86b3793f207f64 SHA512 f4bb0b0d84c272654b2f2ade7c795648f4cb6bd192aca3f3fa0390fc752dd3c64b4dea17b983f7bc523464b5ae04ef8933871a504529def1bc256f0809afb1f1 WHIRLPOOL 29dc33088aeddcf5d34f289aa8547094d089d0b2e83b406495e908a9a7cf27c31b97bb140f0c4cb59cf3d1c3c9efa5fe16dedf1ca8ef56d6e3cf8dfe4c391d4b
-MISC ChangeLog 13612 SHA256 db6af2048ee2bddf8875bdd2196c8d66afd8f0e641472c64dd58e68aae9a92f3 SHA512 6775ca3ed48c4e66549ca9e631875f765643da37c64cedb79c869011ad243cf6f71e85f45c7f739a824217b26b2cee76271bba254d1a52ec83ee120dc55b85ec WHIRLPOOL d56064d4f0d9947ad8882824b2653a458fefb311c6feb560f643194da1943124a6d3ae19ca947b5a848b5bf24dfb142d3a47af8928a3c6a280a5a831fd2e2001
+EBUILD lxc-1.1.0-r4.ebuild 6034 SHA256 2c8125c4440f6e4061bdf0167a9e818dcf9494e37ec655cadcd31ea8b5d052e2 SHA512 dd8531413c0a75546b7e0701f5706f18786896afd17fb7c1f3ea323e521c9f33984b79df3721f284fa0d8f0ee0542d72a0f0111eeb921a56c8a7c7d17314383d WHIRLPOOL d19ea33cf3a14ee02c178511866a258cec760e97e21a2406e1586f0bcb0f548bdb91d9894cf1e1f7cd2d70a7397915ffb2d69600e5646c0995a4c601ffee1516
+MISC ChangeLog 13788 SHA256 cad65862781bdc7ae4bda8efec7699c8663ecb7f43f24e430dbfe295df7dbb9d SHA512 edbfc7048fea22eba6afed14e60fa9abe11e4bfe5da39aafca0b2d241fae193733821b311e8bc3d3e1cc7ecd4319bb98b88126aa9ef5034683720569b357b0b0 WHIRLPOOL 040c0870fb3ddcf878b196b264ed57c35d2e3867452fa67cd0ea3c7d324458bab951c3f5379b0d31658a2e39cc89a9cf3aacefafb9788476289d92143c293460
 MISC metadata.xml 505 SHA256 b73ca71fcfe6d4f1e60053cbb74193f42175f9679f9a6126b656a5723c8bc45b SHA512 217f2d296d2d23b6c5c8462e74554b7ba3c57d76eb363b4f69be2f47173caee45878b0cea98d024ff4c6cf5e1ba2e9b0de3882ab12efb5b6357598a337af0c78 WHIRLPOOL 174c2bad87f51a5fd8cdaed0e068a8f26998b9a4b9959ad2192f4b14b5253c41ffcf9c0baa04233f1cd74dcf6198fe8fa40e12a4f6c13fd4cb70638e1bc6e0a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU9Nr1AAoJEJIMDbyqvv1VeHYQAMk/1FL3SlldZ5jiM1ONHzXw
-mpIKjGOi7G5IfvDfyk4JznGDX3Rhwo41Twt1jhEFeqXCPPsQZ6tDYfmpbKea4LWS
-SrbQBVyEqsplHKNr7dMJEbX5IKIZtcthMDWWSp4NP8V0Xz0Fp00oojmETs9zrzWy
-qOqLvbJCbO4dMXeNRPztD2fCSJTNJLrM02lyHhLHcYYQFDFBXiMfjlP1rCODH4rU
-gjCKhDMmeVXpwMqLq7ICDG3wvKLsGSup4yy4Dz9VoPplqhdCyz9emDwGdMBNdQwN
-8kbA9ZCKePjDrGpHxLb18a/LB/1u8fIboQQ09gX6y4F9u71re88Pco20XehFhZBR
-h1xkGiIg2umebelqfmySy+wJwqYA1fxEVtJmyITRkjsbZWoUGD1GkK7mEbikU/rv
-srLa3bqCSgXUdUALVin/8J5+zw+ARzHRoXS/Df/5JWfZ2Kjmx39k9tAk4CUeh74T
-StLVOE6ZCuFCgj4svUEInzOrQzQdAiY+dJ54UhM1DBvPB6GjaIjqaQF08Hk3M4Ot
-ZohhvOLmpOmRNFGktmoIpZh/ANoR3sev6zUYjDTwbCJ5lWKxyOhiUFqnLtDvGFC6
-LLWVjAqJ4GFEsxSFfEULuYouQLtUwmRh8hREyKLtWgPEC4QyP25j9M+/YaJE7TQT
-fz2wpQYW4iE4E03ajqEm
-=w0ig
+iQJ8BAEBCABmBQJVAIcGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88wAUQAJ26yMTQWiMuwvZsboXWVnTk
+tCpGZc9B9fLE2O9v5uLnnij4cZM8DJbc4iJSxS4wAJvrq2BrFjjJNqfjVK2ozOCk
+024n50opn5riRPxa/2g7EfNO0jtdzJWxXkTr/fa1FOdvu5lh0c6IPIvPnymsTEw2
+fAk0KFP9SeCzh8+/LZrhjHucv6Q+nqqJkss2Yd0odo5F2hqm2oAcfNTM6xyzFvCW
+M5TsNkAeslpMgrlVTdryyL8UxydQ9R+IRUXIF+LUcrn3f8kY6HIbOXUPZWvlmTeY
+axHyal51FqXqa6J1AynE7Hms8l19l2ExM1PKGUHcFx6/bOXnwrYJP2g28vGfUSNT
+FMitfA0YBlfbtxEueK5IQTnceEb62yjB5DsXtTeq7cS5KTaLqwyU1loFpvUxVhuF
+n119/Lxa2nhkKQuDDWpxvgiLQTe3r6wZMjefFHpjLISMrxxmnm8obyD3FEk+QHnF
+cEtxTirU/6UE9MyTxp2Nm+fmdnOenHtxQyJjumPwtM3jap3KTgcCmQqo2XSTD1RZ
+rjoxI4d9+j/R2I8AqXkr+oioUMYtnA9bO7u9PIeIaZQ0Bz8+YPFoXHmSUGqNnNLs
+zQFNZue1mLqnLsaGDNsTNf7PZYP0r2LYTrVfMEE/D07B6i3nF/oUuZmWHDuGg8NI
+ydXRFaFwUVERfSI2behS
+=oj4D
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/lxc/lxc-1.1.0-r4.ebuild b/app-emulation/lxc/lxc-1.1.0-r4.ebuild
new file mode 100644
index 000000000000..c2f6fdc94fd9
--- /dev/null
+++ b/app-emulation/lxc/lxc-1.1.0-r4.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.1.0-r4.ebuild,v 1.1 2015/03/11 18:18:44 hwoarang Exp $
+
+EAPI="5"
+
+MY_P="${P/_/-}"
+PYTHON_COMPAT=( python{3_2,3_3,3_4} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/"
+SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="cgmanager doc examples lua python seccomp"
+
+RDEPEND="net-libs/gnutls
+	sys-libs/libcap
+	cgmanager? ( app-admin/cgmanager )
+	lua? ( >=dev-lang/lua-5.1:= )
+	python? ( ${PYTHON_DEPS} )
+	seccomp? ( sys-libs/libseccomp )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook-sgml-utils )
+	>=sys-kernel/linux-headers-3.2"
+
+RDEPEND="${RDEPEND}
+	sys-process/criu
+	sys-apps/util-linux
+	app-misc/pax-utils
+	virtual/awk"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+	~CPUSETS ~CGROUP_CPUACCT
+	~RESOURCE_COUNTERS
+	~CGROUP_SCHED
+
+	~NAMESPACES
+	~IPC_NS ~USER_NS ~PID_NS
+
+	~NETLINK_DIAG ~PACKET_DIAG
+	~INET_UDP_DIAG ~INET_TCP_DIAG
+	~UNIX_DIAG ~CHECKPOINT_RESTORE
+
+	~DEVPTS_MULTIPLE_INSTANCES
+	~CGROUP_FREEZER
+	~UTS_NS ~NET_NS
+	~VETH ~MACVLAN
+
+	~POSIX_MQUEUE
+	~!NETPRIO_CGROUP
+
+	~!GRKERNSEC_CHROOT_MOUNT
+	~!GRKERNSEC_CHROOT_DOUBLE
+	~!GRKERNSEC_CHROOT_PIVOT
+	~!GRKERNSEC_CHROOT_CHMOD
+	~!GRKERNSEC_CHROOT_CAPS
+"
+
+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"
+
+ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG:  needed for lxc-checkpoint"
+ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG:  needed for lxc-checkpoint"
+ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG:  needed for lxc-checkpoint"
+ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG:  needed for lxc-checkpoint"
+ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG:  needed for lxc-checkpoint"
+ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE:  needed for lxc-checkpoint"
+
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
+
+ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC features make LXC unusable see postinst notes"
+
+DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+
+	epatch "${FILESDIR}"/${PN}-1.0.6-bash-completion.patch
+	epatch "${FILESDIR}"/${P}-fix-gentoo-template.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	#541932
+	python_setup "python3*"
+	export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}"
+
+	# I am not sure about the --with-rootfs-path
+	# /var/lib/lxc is probably more appropriate than
+	# /usr/lib/lxc.
+	econf \
+		--localstatedir=/var \
+		--bindir=/usr/sbin \
+		--docdir=/usr/share/doc/${PF} \
+		--with-config-path=/var/lib/lxc	\
+		--with-rootfs-path=/var/lib/lxc/rootfs \
+		--with-distro=gentoo \
+		--with-runtime-path=/run \
+		--disable-apparmor \
+		$(use_enable cgmanager) \
+		$(use_enable doc) \
+		$(use_enable examples) \
+		$(use_enable lua) \
+		$(use_enable python) \
+		$(use_enable seccomp)
+}
+
+python_compile() {
+	distutils-r1_python_compile build_ext -I ../ -L ../${PN}
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd "${S}/src/python-${PN}" > /dev/null
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+	bashcomp_alias ${PN}-start \
+		${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
+
+	if use python; then
+		pushd "${S}/src/python-lxc" > /dev/null
+		# Unset DOCS. This has been handled by the default target
+		unset DOCS
+		distutils-r1_src_install
+		popd > /dev/null
+	fi
+
+	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
+
+	find "${D}" -name '*.la' -delete
+
+	# Gentoo-specific additions!
+	# Use initd.3 per #517144
+	newinitd "${FILESDIR}/${PN}.initd.3" ${PN}
+
+	# lxc-devsetup script
+	exeinto /usr/libexec/${PN}
+	doexe config/init/systemd/${PN}-devsetup
+	# Remember to compare our systemd unit file with the upstream one
+	# config/init/systemd/lxc.service.in
+	systemd_newunit "${FILESDIR}"/${PN}_at.service.2 "lxc@.service"
+}
+
+pkg_postinst() {
+	elog ""
+	elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been"
+	elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc"
+	elog "please add the following to your /etc/lxc/default.conf"
+	elog "lxc.lxcpath = /etc/lxc"
+	elog ""
+	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 ""
+}