Version bump. Bug #538698

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

4 files changed, 217 insertions, 17 deletions

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index d9d3e52e5322..1be7f0245a5f 100644
--- a/app-emulation/lxc/ChangeLog
+++ b/app-emulation/lxc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.57 2015/02/05 18:49:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.58 2015/02/08 09:53:31 hwoarang Exp $
+
+*lxc-1.1.0 (08 Feb 2015)
+
+  08 Feb 2015; Markos Chandras <hwoarang@gentoo.org> +lxc-1.1.0.ebuild,
+  metadata.xml:
+  Version bump. Bug #538698
 
   05 Feb 2015; Markos Chandras <hwoarang@gentoo.org> lxc-1.0.6-r1.ebuild,
   lxc-1.0.7.ebuild:
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 8e9b0c7c0eb7..0b591b0536c7 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -7,26 +7,28 @@ AUX lxc.initd.3 3765 SHA256 2a96156f8d07391ae67d2160199d6ae362889438ac5b48c6c241
 AUX lxc_at.service 232 SHA256 0aaf2f362b3ac6aa2b427d47ac4436d46387624b0d8bc4850c5d5b6a7d228711 SHA512 4c3bab4f2cc9aea8b0753dcaf2fd7ed5f1cd7d97d286d6204b2fc17505b6edaac2f536bbda5c1466856311d0e93d75de91dec51e9b0f665d67afedbf40c19170 WHIRLPOOL f6928b4b85e63c38295cabc651b7bd61d2b0bc69ff1850de7cfa8a4f40e4894d94264c262fec7d345488cace49c4283f932739313b975f6862c1aa0ef51e0652
 DIST lxc-1.0.6.tar.gz 561249 SHA256 2aea199a89e2cd946f93406af6c3f62844f36954b79a6991b36d2c33022cb11c SHA512 fe85ccb57865d86704df6b4b79d60f31892785b07dc9dd2580cc6c384c89c29c23516e906b7a16bc03c6582c1fb2432bb8ff11bd17c09efa8f6a035fb41f46b1 WHIRLPOOL 9e77453fbe31523a2e8f39cfaba6f09fef68d00b54549167a0cde56c00934f827f5b4190b9fb64242f36782a9fcda63e6796c35fd47420870c2cee7b9bc0a1c8
 DIST lxc-1.0.7.tar.gz 564985 SHA256 a0b1b09592e076e270dcb3ba004616d9ac3147f9de0b78ca39a30f8956b0a8f2 SHA512 e6ff42a7b41177e1be0d2cd47d4c554565c7fc35355f3aa8aeba00d4adc7a0f364ecd060ddb6c97b2fe5968329c4e4c4b3cb022bffd2da145f30880f077264a8 WHIRLPOOL f07e5e9efb8ff394aa9cdd6c3e725b453c8137ec221399cbf910d57dbc9268fc84e7227273567792821415dc14e774942b76a58a1a478de57d5c82e545702000
+DIST lxc-1.1.0.tar.gz 592543 SHA256 216e806f7e18e5bfbc782493a9e44fc255f24a587d6faee94cda848a0b949155 SHA512 160da88d6dc96cd9f0679f948bfed057c024adcd459fa4b79e872d12284fa3774ac33a13923c6e150072886a371ccfcdf7ab2c4587efa7f6175fc91a67525c4a WHIRLPOOL 2caf81418850ea8b1ecf25b25e799895563ecf1819f32310fcbb4efe88f711eafe2bcb16a0d3b8ee59072c770a5520b4df90a5962215b932e68a4705c4a56d61
 EBUILD lxc-1.0.6-r1.ebuild 5888 SHA256 c8470a673c846599a66c7aab372a9a551a9b2732d35d5fe4142a8ca385c70a51 SHA512 e84b347a0a39eee2c398d89d4cb217b1224f19eab86647d3a479a85b0eeb16f1375606c3c52ce55febe704e2e923890cc77e42940cc968654a60a4ea71a4a792 WHIRLPOOL 7a000c88099ec1dd5deffae80ce9905a274ce1c81e263ca5f12e9b943b455ca66109ea0b3ec9dfb490e326ac09b6e8912786e1138df3a9fe842eca2c9c636092
 EBUILD lxc-1.0.7.ebuild 5917 SHA256 889147f7dbceb408618a81e75789b6f00b24f19b9a7377da74ebfbd1565781d2 SHA512 f88a95ea399ae754202daf570082b3275c464e60a7f6f49485746509bb0a78b44fd43a67dde966ee4123da15d6697524ef46102950396b61ef1eafcecc0cf313 WHIRLPOOL b225c9b00afc6d697d68078f85e244fb3ff8c5e692bb1fae5a4c961ce426852ad612c40ad25e89bd12309c6b0c1c482a6cdd7812356c1f3c7950d07d90141a13
-MISC ChangeLog 12151 SHA256 ee81c1d230fe20398447a23a65405b441aa6c03878e92c04364db19b3efd3ec9 SHA512 1bb7c04387fef8909d6bd9927982594e9b071f89d367cbb569b794f7737895929a078b873edd53d3e9448ae824750d0e5efa4f262c8e8fe096a6c573d9bd5c30 WHIRLPOOL 2a417b8689052696c7017310949b5e6bf2c7e5aa92eb1f6afdafe483418202809f5253cc19860f293c273f15b436ab8b9ef0e814a1e158c89f58301a52a3149a
-MISC metadata.xml 494 SHA256 82db4b5e8580454962bfd6c341660f4b5b2d244311152978f8ff107dcf3c55d2 SHA512 cb0cdedcafedb433898bf9cde51736a6728db69d689ca0cc324487cf1f35356e710062bb8072a94909139bfa1cace529d81cc6a8b4ae4cba6e6f99fde0ac53a7 WHIRLPOOL a1aacd0211fb2a31522c7a0ab2f1259870b4cbcc8ba099ec35188bf24e55fc4f4cf3eb76dd67360037b0a038b3d80f1c7c45fb6a081f6bf424780573f1178a1c
+EBUILD lxc-1.1.0.ebuild 5812 SHA256 b573b1483c8180d2e8aba3ffc70b38a4278e87c3a83915347885056e943aaec1 SHA512 9c6616e56e78bad15c5a9d0719e907ce66b30a87a4521842a5eb36ad953731d814230c7f41362d5f3fe135d0a8c98c2d19eef7b33863bdee11179797dfdba367 WHIRLPOOL 2108bc1ff11c8f367da6536164303f8acb106d096a72b95c7f108d52818e2c2d98fcb1ff2fa46048eba02e2221ac73de6f8551d9f10d74baae574d6c8ef901c0
+MISC ChangeLog 12294 SHA256 9ba441072acc3bdab2637b29c558f45c4e8e6f4191419dde46a63bd797572cc9 SHA512 5f97c11af7fb7f28cf87c32225b6894b3ab39cf2c209cdf9d5d03f19d509ade052ec44bf0ff91b2e2536284e99d2a7a4d656159f132ac151b87fde290f04ed9b WHIRLPOOL 42a4bbf1579d580513214a8d1372d374cd3e51b94d34b5cc0fe302a0219f7a781b921e68a3b00d5ae63f3b91d9d752fd77cb8b8507cb41af4aebef4bc66b6260
+MISC metadata.xml 602 SHA256 9499be0ed7a430f9b8492a9db1dbebd9eff3c495962882c6c6e35c96f3cbc5d6 SHA512 fa7af1390b3e60c04dfa085654d68e121b476ed1e92e367d9b9aab2aabd6b8e8b028db9704161c1da25b3b62fce268ef503eea229da37a3f09fb1235c78847fb WHIRLPOOL 9760914ec9365c7c5f904fee3282b942b37b7afc723cc00694ddf0705c052f32b5328eff26517d3e668676ffe92f6a117abe25e5e5373deda2adea61c607fc15
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU07wFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU1zIdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88qIoP/juIIChgfCEHJr54b73FPQKT
-H0bUpH9+bCdNbVD+dzlqYc1cA08NN3GRf4RGM12n5E2pD3p64o84Yx9xkBKJatit
-YmybSQ7qd4zbW6FHd8IjcFdTo+uLYiSrXiynv7YZ4cIZv8q+vymw5kRSUuhkAHWd
-AFzY5cgCUEYfe1jMDh+0SGdbMq/pQowVDo8CxAw9T71Y4GHzWw205lz8Qnez5/Jf
-5J9dRPBWqlUDgZvDnmUbdOdu4+mSPPKmtz4qjm9ieDPXqReqmP4Ti9M+uR/LNhEz
-oy74okLUC1srpAkPVj4LEMrHL0CY2uUhKsO7YomuX91G/eOmgzq8nWIxQFJqxLkK
-srJa1e6Z8sY+rU2cZEBDaVW1kgKpcKpmHWzI3sK6LJgIxkt8OVQ/h6LDurd9z+Rl
-UZya/g3sbzfNf/smUKZegVV2lhz/DzFs9EUP0lhCYEmdzOVLAFS58cnRFAfHAfB3
-orRaLnO1W4xgdI1K1h3dLoeoJYWKG7tV5+GkNX+j+FLzUxcQ9fYlX71Rnnlim+ms
-QQnbWgsnHtGJ4TUFZreR+DNfH8TS8WXlKCaYH+C35dRcBzR1UGrrv8MFX7fSugRB
-WyViBxEoDogEYt/qbb8xBQ+M5kF1d1TVPKNjpBEc7vJVGIXOhlehVJcnt29I7TiU
-wfUPr4rd9HGUxLONvu+Y
-=fNvg
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88LQwQALElEhdScb7r18Yl3F6/M2Rw
+sslHbIOeY2OearhJ6SL05VyKQ5df/CovQAOYejWSpVzI/eHZWslwLgdy+yvHV1Uk
+W4ukY835NFQ9N7PxWGHAac5gT82GXy3dMLfzyNd/NVKMX5fZ7/DBXCh5Z3mI1mPQ
+DuL8ELKDxEI3dpsBFJWHsUVaIpimsrOt3ebjRROx7Ap0gFzn51tqlF5OoVas7jQX
+GsRyG2rkVbeW6GeJHXVoo52VP/UaKdc86yfkRd8HolZFCe6zm/Y0PWo5abwgxBPy
+3ToeMIjtA51YrzwuFpk8gOju4yqLmUujWYcnZVJCENoF5f134aEUpBQOfHXwp3L9
+jvOCwLOjKLUz/O1TWEhxPiAMQMnLNpQoBgTDEWSNLNFscfZYZ1fFXk0wE8MutX0j
+Hx3K7r7K4rOdF1dPfW8RmxCS72lm2X2HljbivFacB0YByEQi3kdQ9ggdQJCx2gGp
+e0TSy4hbNnRiLyBpTgki7tpPgtGsaAqEuoP+T2mjkJcn6uyJ1dJDoqsbGhr4uFWo
+9puHU/aiQVp0fjBEGvUXtCZSBzPY/4fahWQHCFOg59O0ClRi/2bQYKw9UzI1XMCP
+4Wop8X+XBFKcIrSh2wO1AQ5F7M4ZS83I5WEqbOljv8HXDUsglR/75ZTbu7lFXqRE
+VIk+OeHTyWUw8LlqPFM3
+=nGD2
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/lxc/lxc-1.1.0.ebuild b/app-emulation/lxc/lxc-1.1.0.ebuild
new file mode 100644
index 000000000000..f4393098fcf5
--- /dev/null
+++ b/app-emulation/lxc/lxc-1.1.0.ebuild
@@ -0,0 +1,191 @@
+# 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.ebuild,v 1.1 2015/02/08 09:53:31 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
+
+	~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="UNIX_DIAG:  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() {
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	if [[ -n ${BACKPORTS} ]]; then
+		epatch "${WORKDIR}"/patches/*
+	fi
+
+	epatch "${FILESDIR}"/${PN}-1.0.6-bash-completion.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# 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=/etc/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) \
+		--disable-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
+	# Use that script with the systemd service (Similar to upstream
+	# Makefile.am
+	cp "${FILESDIR}"/${PN}_at.service ${PN}_at.service || die
+	sed -i \
+		"/Restart=always/a ExecStartPre=/usr/libexec/${PN}/${PN}-devsetup" \
+		${PN}_at.service \
+		|| die "Failed to add ${PN}-devsetup to the systemd service file"
+	systemd_newunit ${PN}_at.service "lxc@.service"
+}
+
+pkg_postinst() {
+	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 ""
+}
diff --git a/app-emulation/lxc/metadata.xml b/app-emulation/lxc/metadata.xml
index b0c9c684ed47..f529f22b507d 100644
--- a/app-emulation/lxc/metadata.xml
+++ b/app-emulation/lxc/metadata.xml
@@ -12,6 +12,7 @@
     <email>hwoarang@gentoo.org</email>
   </maintainer>
   <use>
+    <flag name="cgmanager">Enable support for cgroup management using <pkg>app-admin/cgmanager</pkg></flag>
     <flag name="seccomp">Use seccomp syscall filters using <pkg>sys-libs/libseccomp</pkg></flag>
   </use>
 </pkgmetadata>