Drop obsolete RESOURCE_COUNTERS check. Bug #540980
authorMarkos Chandras <hwoarang@gentoo.org>
Fri, 20 Mar 2015 21:56:28 +0000 (21:56 +0000)
committerMarkos Chandras <hwoarang@gentoo.org>
Fri, 20 Mar 2015 21:56:28 +0000 (21:56 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

app-emulation/lxc/ChangeLog
app-emulation/lxc/Manifest
app-emulation/lxc/lxc-1.1.0-r2.ebuild [deleted file]
app-emulation/lxc/lxc-1.1.0-r3.ebuild [deleted file]
app-emulation/lxc/lxc-1.1.0-r4.ebuild [deleted file]
app-emulation/lxc/lxc-1.1.0-r5.ebuild
app-emulation/lxc/lxc-1.1.1.ebuild

index 779bf9cd9a9d023a1e3da57859981de2508c9b21..000cbe6f9013f31ec680a8be7260608d2e9eb2a8 100644 (file)
@@ -1,6 +1,14 @@
 # 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.70 2015/03/17 20:03:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.71 2015/03/20 21:56:18 hwoarang Exp $
+
+  20 Mar 2015; Markos Chandras <hwoarang@gentoo.org> -lxc-1.1.0-r2.ebuild,
+  -lxc-1.1.0-r3.ebuild, -lxc-1.1.0-r4.ebuild, lxc-1.1.0-r5.ebuild,
+  lxc-1.1.1.ebuild:
+  Drop obsolete RESOURCE_COUNTERS check. Bug #540980
+
+  LKML: https://lkml.org/lkml/2014/10/13/498
+  Commit: 5b1efc027c0b51ca3e76f4e00c83358f8349f543
 
 *lxc-1.1.1 (17 Mar 2015)
 
index 4cdc9206e2b404a47f05eb054a35197972a4d53a..08ba1b684626ef94c4ae03a04c92ad2e342eb169 100644 (file)
@@ -14,29 +14,26 @@ DIST lxc-1.1.0.tar.gz 592543 SHA256 216e806f7e18e5bfbc782493a9e44fc255f24a587d6f
 DIST lxc-1.1.1.tar.gz 594112 SHA256 64951fdd39df2bea083bb5a8ac35a7390daf2dc7753d8fce33138129892ef672 SHA512 8af3fb43127b57de4e252baf5cb387270955062ff3838e4807a93d04520ca23f0457913bc8274da51b20961fb08650f9b976a84d395785aca2b2d300b285d549 WHIRLPOOL 4f28b976dd6710705d6361b9a45fef9a1265dffef0cedd0fb304f2820585ece3e2bb64d4c5289d444b3ab55bac265850943c63cdf258c40c45c99176a788ca2a
 EBUILD lxc-1.0.6-r1.ebuild 5890 SHA256 1cecb85629b81866f30d6d7309533ef69319778d01a14f85fa8f6b009cbb7782 SHA512 ff4a550cbef9ffff1307677a03d6847bf1840a89e89472347e514d2477ac78d3e48d717f4da44b5810c252882f452cf899af73358ec5f8618145940ca115a9ae WHIRLPOOL 81507999151c7b1494bdf836cf6f59cf626f494b03dbb249155f589358ae1d575ea584967048a8dc67d8885350b48531879c7985fc5e282a38559cc008169452
 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
-EBUILD lxc-1.1.0-r4.ebuild 6063 SHA256 f48a5f117eb2a554549e68e9caa8660455406d5bb24a92bf9702be0e8aefcc63 SHA512 9691a3b8c674343c9b86d943e6840231820cd2453e6fba57f75417fdf280de7571137b2ef3dfe6c1ca913d04e9d02cbfaf083e61cf4b0600dd448208b8d1287b WHIRLPOOL 8dd8733bffb85f29b02d516eb5043c60d3655c2209c31eafaa2bb84ac485f7a4e0315a34b455c4960577722522b95a9b021ddca8f383f23272206471c421d6d8
-EBUILD lxc-1.1.0-r5.ebuild 6089 SHA256 edfa640a70472632cba434fb16068c65083a320582d396965b61b94ef222e78b SHA512 a65a1a1de30dc0fbc4cb3430e98ab9b53b7abca57d1032afcb4b871745bfd61ad97d03147166d158ae09f8c0a1f6b49143e7c694726308f8602ac3e928c993c2 WHIRLPOOL db43ef49e8c6f0fafafb74fdc59783aa44519622120be8593ffb90c72d5763e76592ba14b4823234f9c10a23a23e03279722f4a1bf37e286e9d1a93396d317ee
-EBUILD lxc-1.1.1.ebuild 6130 SHA256 89197f5736491bb086a7aa069e68e0ba130461d7435ba8c9634da7d8a64666ec SHA512 96ed71c32d11afd02596759c3e0b70dbd4a33cde8f42a76c186d27a352cb48884079045f3da7c147d3a66d2ff064181a6808c715b860a3898117f469b85678bd WHIRLPOOL 021b5f661aeccb8998fea33d170375983438cc677670775ebded1224d02c028c525457a02ce9d146c31db5d3f9c4e06ed50b1657657b8c9b73bdcc3b1e0806a3
-MISC ChangeLog 14367 SHA256 89be62e3aff03d73c4aeb272133d2522d0845e2b28b1b83a4f721b5e96667b59 SHA512 18e94271bc89622df591192acbb1823c9d4a207595a6580f7096be4fe05bb2d1afdee3d3643759a50f844d30a3007ccee781d31f1d9ae3f02244b55a26a3d81e WHIRLPOOL bbd1fbd92ab3fe27de0691e05e8ba31d8b0df527f2e74303d6d87ce3c578da9fc34b43f7d7e4741e6222005e301edf7e7d34b10487df26ae235c8477c09f463a
+EBUILD lxc-1.1.0-r5.ebuild 6069 SHA256 bd59246b75d109769fb269f60a0f08238ffa7d1b1f52c241542282f906178d44 SHA512 b52ad906076edc4bed6cfa2171010c3c6058f17ee280455d4aa258ae441e826e4539096f78934671dd7f73959076697cdac4a677622c91ef5fd0202eecef3cc6 WHIRLPOOL 943cbb39d2f4590e8ef6c521c671186751f2a35da6e7bb04eb1c0ef264fbcb15ea3ca8da1f784c2e161669eac5d987521261363132da260da09571300f67e7e3
+EBUILD lxc-1.1.1.ebuild 6110 SHA256 c7836835a7469b21d08559601c2085ce571fbe2943de1902ee45d53df0a87103 SHA512 c62d282bdfad10b07abb9ca6adda8e0b05dc9a268f9ef371f5347484015024f956bdce4e6435292c813386304d5007fc0bceb51af14f60862f135996f4b71920 WHIRLPOOL 1f082e5e46452fdfbb7822772a00a780fd45b378207c6016484aebf6b385d1f8232e67fff02057e3405619e1cb14bc45d13ab70ee1bec7195a34fe907a8fdb99
+MISC ChangeLog 14680 SHA256 e2568bacb7fbaa535497728787c4bee847ad7bf7923c8d4158699a2c41f241e8 SHA512 b45169693d02f25bbfc2dbceb66fd9224e80176772205ae71283057cbad76aee396a04565a21b75a7c572b5d2f990905dafb2ab7d38dd56a9d6a44ffe2695d60 WHIRLPOOL 8847a219793c4cb77a77643360bc422066519683943967b2e22e5aa544d0d0b95a96698c80c22e50c915b735c5d144333e0247b170dc6f44f6defa885ad7d90c
 MISC metadata.xml 505 SHA256 b73ca71fcfe6d4f1e60053cbb74193f42175f9679f9a6126b656a5723c8bc45b SHA512 217f2d296d2d23b6c5c8462e74554b7ba3c57d76eb363b4f69be2f47173caee45878b0cea98d024ff4c6cf5e1ba2e9b0de3882ab12efb5b6357598a337af0c78 WHIRLPOOL 174c2bad87f51a5fd8cdaed0e068a8f26998b9a4b9959ad2192f4b14b5253c41ffcf9c0baa04233f1cd74dcf6198fe8fa40e12a4f6c13fd4cb70638e1bc6e0a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVCIiNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVDJeFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88ow0P/2ZyZHcJSHMqy6jZWX7xs4rd
-mbk/e3dQYyHKO7oqoFgBWzCSg1pqmOStjWgs/LpqVud7MidzfFAUyGegx73xk6FA
-IthvBDbAsUb0/sdQB3xxS+mvihzlzBtCS3ztvoH4Q1PxSsOELP1dJowDi9OubrW8
-glC3Ilk4Fz2zoeb0Va4SRx9BFtdDGWANNXA420/jshKc5eJPNHjoNtiSo7ZccwUW
-d40NLX4rMepmRFgs0TEKeJMKPOmR9syvxfd7zk7Ws/FhhhKnsjnA33/VBKIo0c09
-eCL78qDDfSKOLCr+aZK+eE9+L+pEenFR1+wX14kVURc14jBkvx7f4iDOYgTAGKte
-iyUaVTeCmXtWJDAlLF6cvzppc0XTVocNo4m/AAidWV0kphx/hGiDsScnzoNgHoxS
-EY/ulTI4n/yZDH7gYIFZAf5/LKY0I6latq5CI6vwNgtFEd7Kz6tdfMz4xZYWBNdK
-0yK5OtNmwRe1Wy4yr1HZlP9xilfPXuV5ZFPZBH0TiYat3endF9NWhNPgu4GEvVGg
-3/vjxALruw6wJVQISIZRvNKtOWCNVJskFZb08U3vnVGVLeOU1MwCC84gOMhxH/DS
-axUlkMzMPumdDA9Cw8KD15kObUCbSTr/6FQW6x4Jby2i5eQfXf3WP/KU02/J83h0
-YuZ3BXSYeY6T8Xq8pwrz
-=pjYy
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88H3gQAMKbVcD47tp4CqbZtDi0moBH
+PLylI5VDvpOCzJbDgTpIThzrXv0PRECCacvKyng4B2B+6LcJkKfJ6zXZqoafi+zO
+OU+gosSf4AF/QMBfzQoUslMfwsd7vGF9ABo9krTXA5UcJGuZGKhwp5FrgRkDzROc
+XLM8Huoc/DubwUPf1eaO3S8K0xF/lWW8MadRJL1kFSHlsO9ex1Rw1tnGITIwTr5l
+DeFxwf5CJXFMRGLZVAjLPIl4mig12D6weuvl8jjL7Bc5ZblTw25J6biw02kPHnkT
+NfVotVvq8bE5U8na2RvnD940QxyID1cVNGskeggQE68u7RfhO7hYa2bONK+TGU2k
+LKksPyqJ+22J5o2SBH+q42KRgJnZtXeJWqn4cb2g9T9j5VzrDfz8+ff+sDX+LYQj
+9Zs6rVPIh0vRVTmHRw2eSN5ioxjW0zXjuxUvQasc38LtVPRclgqqQoc+GUStymcn
+hacNVPB7WGVggYzHAWfkeu0mC1fOckYs8/XZGXk10Er1igzvLtL+JmCz0xn3EsXR
+FlhffszZ8rJWAcv16/dS8Hswg5rhLXQykEZbjzt28JJqG88yZmUUXjq8m4J2z6wH
+q2e8JsQ4M7xknrgsSlW3OZaNsgWyfbvJkwODnCK8TByR9l/T44m1RsXsuM4F1sJo
+cwpUeaRi0oekvxNQjSUW
+=1zMq
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/lxc/lxc-1.1.0-r2.ebuild b/app-emulation/lxc/lxc-1.1.0-r2.ebuild
deleted file mode 100644 (file)
index 5520fe4..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-# 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-r2.ebuild,v 1.2 2015/02/23 20:36:27 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() {
-       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
-       # 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 "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/lxc-1.1.0-r3.ebuild b/app-emulation/lxc/lxc-1.1.0-r3.ebuild
deleted file mode 100644 (file)
index 6176aa1..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-# 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-r3.ebuild,v 1.2 2015/02/23 20:36:27 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() {
-       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
-       epatch "${FILESDIR}"/${P}-fix-gentoo-template.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=/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) \
-               --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
-       # 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 ""
-}
diff --git a/app-emulation/lxc/lxc-1.1.0-r4.ebuild b/app-emulation/lxc/lxc-1.1.0-r4.ebuild
deleted file mode 100644 (file)
index b33521f..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-# 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.3 2015/03/13 08:54:55 dlan 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 ~arm"
-
-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
-
-       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/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 ""
-}
index 2e8d0ff94fe67cf1e13b5d6d66e0f79abd35cc27..72555016bfb41639fd1b21b8da88925860bf86de 100644 (file)
@@ -1,6 +1,6 @@
 # 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-r5.ebuild,v 1.1 2015/03/14 09:21:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.1.0-r5.ebuild,v 1.2 2015/03/20 21:56:18 hwoarang Exp $
 
 EAPI="5"
 
@@ -39,7 +39,6 @@ RDEPEND="${RDEPEND}
 
 CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
        ~CPUSETS ~CGROUP_CPUACCT
-       ~RESOURCE_COUNTERS
        ~CGROUP_SCHED
 
        ~NAMESPACES
index 62c82ec9998f3068acc3aabcb55835c4b0422811..cd957c04e1884ce253d9b34e99ec74ff2f98d3b5 100644 (file)
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2015/03/17 20:03:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.1.1.ebuild,v 1.2 2015/03/20 21:56:18 hwoarang Exp $
 
 EAPI="5"
 
@@ -39,7 +39,6 @@ RDEPEND="${RDEPEND}
 
 CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
        ~CPUSETS ~CGROUP_CPUACCT
-       ~RESOURCE_COUNTERS
        ~CGROUP_SCHED
 
        ~NAMESPACES