commit:     66951c3d0c77a379ea0252d46172a1ad7b110d74
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 11:33:18 2015 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 11:33:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66951c3d

app-emulation/lxc: Version bump. Bug #563186 and #563274

Package-Manager: portage-2.2.23

 app-emulation/lxc/Manifest         |   1 +
 app-emulation/lxc/lxc-1.1.4.ebuild | 194 +++++++++++++++++++++++++++++++++++++
 2 files changed, 195 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index fe67c91..59c2136 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -4,3 +4,4 @@ DIST lxc-1.1.0.tar.gz 592543 SHA256 
216e806f7e18e5bfbc782493a9e44fc255f24a587d6f
 DIST lxc-1.1.1.tar.gz 594112 SHA256 
64951fdd39df2bea083bb5a8ac35a7390daf2dc7753d8fce33138129892ef672 SHA512 
8af3fb43127b57de4e252baf5cb387270955062ff3838e4807a93d04520ca23f0457913bc8274da51b20961fb08650f9b976a84d395785aca2b2d300b285d549
 WHIRLPOOL 
4f28b976dd6710705d6361b9a45fef9a1265dffef0cedd0fb304f2820585ece3e2bb64d4c5289d444b3ab55bac265850943c63cdf258c40c45c99176a788ca2a
 DIST lxc-1.1.2.tar.gz 597158 SHA256 
f22fcf2659ca98dfe864e632374de98c42cdf465d0c694834b6f6098a3cb8519 SHA512 
7c4c9b5418321eedcd37a3f5c2c99ff227de48f672cabd1722a74722077d33badb038675ec95fc3e338eaf2b06972c4ffb2e11f36347587ef71a95fad5b66daa
 WHIRLPOOL 
2b657a9195b6357a367f6aa7609952d9162aae7d7be3f2c5e4cda4b2e81f2c7411835e75af5740cca053d445a3cf7dc7457f9e76ca866de7265e99ed42c744e9
 DIST lxc-1.1.3.tar.gz 599889 SHA256 
b75fb8e376d3313e152f31fb7372b68f33a953a12191a39de4cded04fff94300 SHA512 
cafa4fbe4fe23b8c0b98007a79f20899c4a3b98c51d797b9c16e38dfec1eee5a513b58621308fe6551707d38028d9e5bd78ade8822691ffe4a7a369b10a48dda
 WHIRLPOOL 
04ad57d8b189ab089b27adad8e511dcc2e5c563505f8134323ac9d738283bd5d0d929ebadeb69cd49ea68ea3e182f22c72590505cbf6f9d8438112e46909e1b5
+DIST lxc-1.1.4.tar.gz 604167 SHA256 
b087baf5ac4b94618388e6e759d9cdafcf5c98ed67bf9012ee9660076f9fb0d1 SHA512 
b239c285b68ddb25c165e998307d69b368bb802e89c1e26de9daab956ffc05cb8e80bf7c796233552b08a57d1cc37c22777bb7a7469db111582184ee13272c93
 WHIRLPOOL 
2d69d0540c15274627cdbd0f1944a119b601e1298b9328ba336beae0aa6bffd62dfdf85af82f54c3926489e19b4cee7eaa6c35bcfb72e4b3904f85102055ae85

diff --git a/app-emulation/lxc/lxc-1.1.4.ebuild 
b/app-emulation/lxc/lxc-1.1.4.ebuild
new file mode 100644
index 0000000..7344904
--- /dev/null
+++ b/app-emulation/lxc/lxc-1.1.4.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="${P/_/-}"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+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 ~arm ~arm64"
+
+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
+       ~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.1.3-bash-completion.patch
+       eautoreconf
+}
+
+src_configure() {
+       append-flags -fno-strict-aliasing
+
+       if use python; then
+               #541932
+               python_setup "python3*"
+               export 
PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}"
+       fi
+
+       # 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/bin \
+               --sbindir=/usr/bin \
+               --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 "[email protected]"
+}
+
+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 ""
+}

Reply via email to