Version bump. Bug #543570

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

4 files changed, 254 insertions, 16 deletions

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index fa02555e3a11..779bf9cd9a9d 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.69 2015/03/14 09:21:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.70 2015/03/17 20:03:20 hwoarang Exp $
+
+*lxc-1.1.1 (17 Mar 2015)
+
+  17 Mar 2015; Markos Chandras <hwoarang@gentoo.org>
+  +files/lxc-1.1.1-shm-tmpfs.patch, +lxc-1.1.1.ebuild:
+  Version bump. Bug #543570
 
 *lxc-1.1.0-r5 (14 Mar 2015)
 
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 618a00932785..4cdc9206e2b4 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX lxc-1.0.6-bash-completion.patch 1341 SHA256 ddac7cc033a4029f8264d06978321bb33ef7c4fd34c9a44bb1acaaaf1c85d302 SHA512 56b00f77812c0600a8ff7557ef0acf7f50d37bb9f6e5b3641c9a218a53ac64a59785430d0775c1c7980ac39120a2544fd7c28cf39fefc07e7f1558f88b9b5917 WHIRLPOOL b3ff9a377d7d29fa76b6d547f2d1b1621c5ab52e972a9b52389c269f26ba9f43eae6a414db46135be84f1ed91ebea9d6d24cc25da11f493dc86fee088e90bfb4
 AUX lxc-1.1.0-fix-gentoo-template.patch 1375 SHA256 f0b765d1b150b18adc3c67fdff6d80e2ab81f7d48ddafbd9cd95fef3d4d6243e SHA512 17f21b9a0ce45de5d184ae0421666f2b1193ac0da0fec39d12fe463054669ca7b55636794e0ab747058a7b9d79ae68a68e3f5e2d3e3d05854ea3d6e49bf536dd WHIRLPOOL 3858155a567c6efde97368dd1c39173d39d7f3635ab46a14238726ca60be7e45b82d96c58e33e48d46042eeb81664ce78f3d272bb5e632da15484c33a25422c0
+AUX lxc-1.1.1-shm-tmpfs.patch 1137 SHA256 db2714fe67d8acd1ebc68e196b467f20a548ef60673120c5a0415d282ab29069 SHA512 0d6162ed0b538ca5c9a6f9cf094474b0e084a8989eefb9d8c5c507fdcdb13962f20f2466833f867c41ce39184e9ac7791b49735c39add94deccaecd763a177ec WHIRLPOOL 4598f31a16d2dc0d2a47e720f6f346866570dbe103eeef36e214543667e6126f0a908bae3a983636ed4f154f8bdab5f5bf20595d356b876ae3768de78b9a543d
 AUX lxc.initd.2 3673 SHA256 bb7780168695e934549909c5c7baa7d6cdc92b0e19093a3d04a1313081a832e1 SHA512 25b0474d6f16fcede89a8e17518a658f810cb554eaef10aae3ce1fdd8c8640118aa6375cbee443f0b26e8086eb7c25375ceaaaf29a4110bd779f94b2f4b0d300 WHIRLPOOL 28f56d71b95b26c7f6ad5402a37413a973bc7bdf08fd3963ad192888ae1b49809a56c16009bc6049061d419ecffb1279e153e6ef5acbe06956efca154eae6a01
 AUX lxc.initd.3 3765 SHA256 2a96156f8d07391ae67d2160199d6ae362889438ac5b48c6c241aa02b9f4928e SHA512 fecefad41640c648bc3923952131e97617bc40bfcaa8b7dce2cac752551ca4c9e126c14febe4c56c04ccb3ebd378a91c5a6fe1d3a8cfcf083186b962e4d43b82 WHIRLPOOL ac64b41aed33c08e3baef74fbacb3895a0566837f3e185315792e5a333e35af72c5c784e890cdbf4480515704b017a97c8ba8e1a256032c50da22c3d63b135d4
 AUX lxc_at.service 232 SHA256 0aaf2f362b3ac6aa2b427d47ac4436d46387624b0d8bc4850c5d5b6a7d228711 SHA512 4c3bab4f2cc9aea8b0753dcaf2fd7ed5f1cd7d97d286d6204b2fc17505b6edaac2f536bbda5c1466856311d0e93d75de91dec51e9b0f665d67afedbf40c19170 WHIRLPOOL f6928b4b85e63c38295cabc651b7bd61d2b0bc69ff1850de7cfa8a4f40e4894d94264c262fec7d345488cace49c4283f932739313b975f6862c1aa0ef51e0652
@@ -10,30 +11,32 @@ AUX lxc_at.service.2 291 SHA256 ada7e5fa2728d3f2385bd7410c7263ffd789bd2ae6b3c61c
 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
+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
-MISC ChangeLog 14204 SHA256 7c93a02186515e371f84dd559fcd8550f6a047cf65c6aa54bf9c881bc456bf4f SHA512 188b427bebc8b018064545106541394e07f42a91efa1b981f7bb319777e93be7fb4989cc3a254da29ce1c895144d52511ac2ab5811da9327d86d2c0b92ddc699 WHIRLPOOL 0f61faaf8dfb1d66fac5c762e102d27b77f06a984de0d8a8e610f8a79c5fb238917e15058023e700adabeaf5c880232471899ffa5eca7c7f33d683a0248a03c3
+EBUILD lxc-1.1.1.ebuild 6130 SHA256 89197f5736491bb086a7aa069e68e0ba130461d7435ba8c9634da7d8a64666ec SHA512 96ed71c32d11afd02596759c3e0b70dbd4a33cde8f42a76c186d27a352cb48884079045f3da7c147d3a66d2ff064181a6808c715b860a3898117f469b85678bd WHIRLPOOL 021b5f661aeccb8998fea33d170375983438cc677670775ebded1224d02c028c525457a02ce9d146c31db5d3f9c4e06ed50b1657657b8c9b73bdcc3b1e0806a3
+MISC ChangeLog 14367 SHA256 89be62e3aff03d73c4aeb272133d2522d0845e2b28b1b83a4f721b5e96667b59 SHA512 18e94271bc89622df591192acbb1823c9d4a207595a6580f7096be4fe05bb2d1afdee3d3643759a50f844d30a3007ccee781d31f1d9ae3f02244b55a26a3d81e WHIRLPOOL bbd1fbd92ab3fe27de0691e05e8ba31d8b0df527f2e74303d6d87ce3c578da9fc34b43f7d7e4741e6222005e301edf7e7d34b10487df26ae235c8477c09f463a
 MISC metadata.xml 505 SHA256 b73ca71fcfe6d4f1e60053cbb74193f42175f9679f9a6126b656a5723c8bc45b SHA512 217f2d296d2d23b6c5c8462e74554b7ba3c57d76eb363b4f69be2f47173caee45878b0cea98d024ff4c6cf5e1ba2e9b0de3882ab12efb5b6357598a337af0c78 WHIRLPOOL 174c2bad87f51a5fd8cdaed0e068a8f26998b9a4b9959ad2192f4b14b5253c41ffcf9c0baa04233f1cd74dcf6198fe8fa40e12a4f6c13fd4cb70638e1bc6e0a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVA/2cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVCIiNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88sgYQANNjsiNI8hbz5q0aXMZgV7Hf
-2btPDC3JwVdk09OjdXG0fUcdKQ5d8Z5HDVpjAa89kq7TBNxblkZf6VrqnyArgQIW
-YjLDUko7iBJ6DEhqLOwtwf88pL+eHnko/8fq9WFQFTJjmfTkHBn4nOU+hkHa0cDi
-C2AnFyQgFqfke/Kx4ZJoae7m/0cvviN65cdW9ktjyhH1I2uFekpCGnbCDfcn1Rwe
-PbSeEzL37FuzAIqgKlAJ3O56ue2mnymVQCA9QApd0UKAQyBkt8iJZl+MFqu4vAd9
-CgKouGJaIwqlUlgrnkwBdqGH4G2jIynoh7uAJNbuvl5XvgANZ4EaymsC2zfHcQ/S
-3Ua2KsTBBJHbyV4+bHfQkMid0V0H70O3xsgy4sZ/JxkrVZXXB/E+E0Mh2QVavfyJ
-AK0YgH4cgcpruOz7KcU5Fa9hMEKFDvGc4LYwEPW3Szja+rnNSsPbs8rddaYOyjs5
-H+Z17/pv0EPaQqtuV60LzQzxEIVnXhNyWJfvb14SMdiRzlrsG6lWEfxSduy6YXV8
-cOfOEgQC+CNnubiLCkHQ/3yyhpzHhY5xuVijHB6RbTkSqqYAWOjdLsh9Qyz/S9tU
-CRChq+GWCLf0Jm1NfJ0sdrXnRNShoOoLo1/n0h5W7i0/R0pKowTu51RtCoaVKHe9
-/dIqG+6dIMQGPwqe2rEM
-=FMXP
+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
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/lxc/files/lxc-1.1.1-shm-tmpfs.patch b/app-emulation/lxc/files/lxc-1.1.1-shm-tmpfs.patch
new file mode 100644
index 000000000000..7c8f595e0fb6
--- /dev/null
+++ b/app-emulation/lxc/files/lxc-1.1.1-shm-tmpfs.patch
@@ -0,0 +1,31 @@
+From 7ed54c6155982bd8376fdb88bed79c664d5e111f Mon Sep 17 00:00:00 2001
+From: Markos Chandras <hwoarang@gentoo.org>
+Date: Thu, 12 Mar 2015 20:52:11 +0000
+Subject: [PATCH] templates: gentoo.common: Add /dev/shm tmpfs mount entry
+
+/dev/shm needs to be mounted as tmpfs. It's needed by python
+and possibly other packages.
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+---
+Applied in master but not in 1.1.1. It will probably make it
+to 1.1.2
+---
+ config/templates/gentoo.common.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/config/templates/gentoo.common.conf.in b/config/templates/gentoo.common.conf.in
+index ca3ffc1..49cd411 100644
+--- a/config/templates/gentoo.common.conf.in
++++ b/config/templates/gentoo.common.conf.in
+@@ -21,3 +21,7 @@ lxc.cgroup.devices.allow = c 10:232 rwm
+ ## To use loop devices, copy the following line to the container's
+ ## configuration file (uncommented).
+ #lxc.cgroup.devices.allow = b 7:* rwm
++
++# /dev/shm needs to be mounted as tmpfs. It's needed by python (bug #496328)
++# and possibly other packages.
++lxc.mount.entry = none dev/shm tmpfs rw,nosuid,nodev,create=dir
+-- 
+2.3.2
+
diff --git a/app-emulation/lxc/lxc-1.1.1.ebuild b/app-emulation/lxc/lxc-1.1.1.ebuild
new file mode 100644
index 000000000000..62c82ec9998f
--- /dev/null
+++ b/app-emulation/lxc/lxc-1.1.1.ebuild
@@ -0,0 +1,198 @@
+# 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 $
+
+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
+	# Fixed in master. It will probably make it to 1.1.2
+	epatch "${FILESDIR}"/${P}-shm-tmpfs.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 "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 ""
+}