Version bump. Bug #546232. Fix lxc path in the openrc init script. Bug #547266

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

4 files changed, 229 insertions, 25 deletions

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index cebd8e3ac483..06340303c937 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.75 2015/04/14 10:15:37 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.76 2015/04/23 16:31:44 hwoarang Exp $
+
+*lxc-1.1.2 (23 Apr 2015)
+
+  23 Apr 2015; Markos Chandras <hwoarang@gentoo.org> +lxc-1.1.2.ebuild,
+  files/lxc.initd.3:
+  Version bump. Bug #546232. Fix lxc path in the openrc init script. Bug #547266
 
   14 Apr 2015; Yixun Lan <dlan@gentoo.org> lxc-1.1.1-r1.ebuild:
   add arm64 support, tested on cortex-a53 board
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 693eda54eb6d..a909d7ac0f5b 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -4,35 +4,37 @@ 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.3 3765 SHA256 2a96156f8d07391ae67d2160199d6ae362889438ac5b48c6c241aa02b9f4928e SHA512 fecefad41640c648bc3923952131e97617bc40bfcaa8b7dce2cac752551ca4c9e126c14febe4c56c04ccb3ebd378a91c5a6fe1d3a8cfcf083186b962e4d43b82 WHIRLPOOL ac64b41aed33c08e3baef74fbacb3895a0566837f3e185315792e5a333e35af72c5c784e890cdbf4480515704b017a97c8ba8e1a256032c50da22c3d63b135d4
+AUX lxc.initd.3 3798 SHA256 e399325baf194db7fb53b968ddd087c23a5609fb069e125596cae8ddabbe1186 SHA512 f59dfea9391c6af377922ce4294ef10b3cc208e68d759106481de1544a8f3b4157a5024bcef9b2801f9423ce3e5d75ee55eb1de254aa9509d5549028be95837c WHIRLPOOL 0de3910122babcac1925a4a0f2467fab8f9e9f15fbcd8016d3bd35fd27582c75959b40c21c3793ac19c6f488748c837e0aa3395cc10ebc514fa446b6da903a53
 AUX lxc_at.service 232 SHA256 0aaf2f362b3ac6aa2b427d47ac4436d46387624b0d8bc4850c5d5b6a7d228711 SHA512 4c3bab4f2cc9aea8b0753dcaf2fd7ed5f1cd7d97d286d6204b2fc17505b6edaac2f536bbda5c1466856311d0e93d75de91dec51e9b0f665d67afedbf40c19170 WHIRLPOOL f6928b4b85e63c38295cabc651b7bd61d2b0bc69ff1850de7cfa8a4f40e4894d94264c262fec7d345488cace49c4283f932739313b975f6862c1aa0ef51e0652
 AUX lxc_at.service.2 288 SHA256 b2445667b02889a989eb24134e51be4742d121edb319c11d51ebbc61337f1be6 SHA512 f4b9eb1c2917e4f975b5645f56c70457b1b8a11834a2813d7555f169c30a80258b48d9b02119798659ca4c29b3715d5d12a1c9a09369f2b7931bebfe9b95a146 WHIRLPOOL 627f64b2f494be55f77747df9625c2a1ffd64b32679fcceaf981262b19d63fdbb623dd728da37fa4936ec4d3d32e34a12c22fc81e30a1261658187740286e314
 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
+DIST lxc-1.1.2.tar.gz 597158 SHA256 f22fcf2659ca98dfe864e632374de98c42cdf465d0c694834b6f6098a3cb8519 SHA512 7c4c9b5418321eedcd37a3f5c2c99ff227de48f672cabd1722a74722077d33badb038675ec95fc3e338eaf2b06972c4ffb2e11f36347587ef71a95fad5b66daa WHIRLPOOL 2b657a9195b6357a367f6aa7609952d9162aae7d7be3f2c5e4cda4b2e81f2c7411835e75af5740cca053d445a3cf7dc7457f9e76ca866de7265e99ed42c744e9
 EBUILD lxc-1.0.6-r1.ebuild 5884 SHA256 87bf658b34b2cdddeecec092eca4ef3fdb9f79ca40c8327cd1e1c70a5e7597c7 SHA512 d0ea2bd13eab1ba4e5437288bb15e7bacaa21bdf1d1e83a0ce4ab3fa6ac404fcdbfbd695e35458edc48952d402e8211171639215369712267e2e65efdcd5a8e4 WHIRLPOOL bc4e92f47c8e401e8efaee262f57d998e7a2abbf42323ed12c67e0e946d2453c3afaf4461b25b4e5cc2cc3a9e29c2a20022bb0007b40a7483f13b4022d24f499
 EBUILD lxc-1.0.7.ebuild 5920 SHA256 7664d07f7d41ee3798e02e5623bbc3b7365aa6120feae136ed25700c486c3d2d SHA512 39d5377fa44e8afef2eddbd36996515053dc98f3e0192b54837477d9ff3337f817626fa9566cbff300e7795f8c54337f5e220a10731956f91f862e98b3a5d50d WHIRLPOOL 0298bfdd8b4a94d506042bdbe92840087942d4c7157ffc2dba7c287166ab6db728dbc2c381900a95a9aad93bedae112c8d48d01b1a3319a79072061675c4096d
 EBUILD lxc-1.1.0-r6.ebuild 6063 SHA256 fff832a37bdaebaf2ad646909a2a6d8c12f3aa82a20bd334abab1d8bf6c6feb3 SHA512 39f049953c570aefe3f18db9cb496bfac3116166474b3995ae38553bb4de3f5f2c65914896c702cfc47d02f1e370b962997c9f0a99db4757a61ebb9e32f96975 WHIRLPOOL 005dd22df8b2358b9e2bb1b488f4ba6f325d8e34a25d93d155b2b3e9388286940fb42cd18324915991fe13c7188137710eb799d2f78e28f9c097f73387ad05d7
 EBUILD lxc-1.1.1-r1.ebuild 6112 SHA256 520627a234245d3e0796574e7747a34e9cf02f3d2b3e79f918a60604bb09399d SHA512 45adfd3d6f51e632a6c5cb75f5186c1f0acd092df87285921e7bbac2704ce5e5ee8df8c83c303ed862af024b82b19f869cdf500def90c05081c871f19fa89cce WHIRLPOOL 80c816803f976e7510449d2e5c1e841330882492773e0c05cb06ed321e23386f0634bf999ef70006611693723852c1fd4130d1babac01f310c89886bade66db9
-MISC ChangeLog 15327 SHA256 b54f93eff8a5f1f762ce7e862a98d11368ef8facbff0096ebdf70a203c9f5fde SHA512 ce91542c1b65023ed6f3a3567463de5ff21af2d867c80261d59a3a74e34e7f3984695a381d94a923aa857021eca825d6534969d367724e226d2a8b03390ae5fd WHIRLPOOL c2deaca25e615f60fb4ed2f02e431405fd21cc693dab5a4dbc0d84cf54996dcb56b72b68e24a38faa2df173d3a839c290e2171eb697f13aa582d1855ee154f5f
+EBUILD lxc-1.1.2.ebuild 6015 SHA256 87265023b5bc5a156e2f4e47a9161e04b5dde6926448eaf1f9c01fbf36b4bdf6 SHA512 1a58a11140f90031379bbbf603e443befbd2a1706914ffaa5122e30bebe28ead4e2beec1687b7f4deace04fdc379108249b4d8c86e1e07c52b2a3a76f9b3fa85 WHIRLPOOL a4cdb2d82dccd767121574c8b13a153a57846ba2be196d6a1bd565ef7b1865a82b1976c95667c1bbb1fe5662673f9875663cb8fd3017d08234817c7e8e052287
+MISC ChangeLog 15532 SHA256 e8adcf7190c97dfc010eaf67a188754852ce2ad3fc19db039ea93e3ec3271684 SHA512 92924619402048ee974db1f06ea95f0c255a5a8050d4a1194eb9f1a9fcbceddd772291d5bd2de6bf429eaf8ccdda6d314c4b64ab4652b10f7d1569e28545280e WHIRLPOOL 3ae7eeace926cabaf7977f1d653b51508490e9e6864f8f10877cbc2d4b861700fa66a15efae1502db7946b01e8e26b5f8bc51c6f39f668b8a9319f19c149b6a7
 MISC metadata.xml 505 SHA256 b73ca71fcfe6d4f1e60053cbb74193f42175f9679f9a6126b656a5723c8bc45b SHA512 217f2d296d2d23b6c5c8462e74554b7ba3c57d76eb363b4f69be2f47173caee45878b0cea98d024ff4c6cf5e1ba2e9b0de3882ab12efb5b6357598a337af0c78 WHIRLPOOL 174c2bad87f51a5fd8cdaed0e068a8f26998b9a4b9959ad2192f4b14b5253c41ffcf9c0baa04233f1cd74dcf6198fe8fa40e12a4f6c13fd4cb70638e1bc6e0a9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVLVd0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
-MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtVQEP/2orDba/zXqQwLHCSz+JeeFM
-iNX+UUZbVSa6/piFbfr2+QbTJgH4FuxILxL9fYM7WsRkX6AZ/skwyCRBfL4D6FaK
-wb3tzBiakyAWjDCiP2IaeC2SW0+kP9byilbZEEdTCM5J8peOc/18gXwmZeTg7mXD
-GtgLryxitgZ8Elx4Ji/rhww+z9qlwCM2KAshcmxIUWjlBbGSGau6wj5C2C2g7tI3
-aM+BAFaBSgKViFoh/a70jIx95Sqk9+Z0+imEYV1VoJeFGLNezM6y4pRK969P/khQ
-gyc0a6t7gn0DQPu2NWGovH2hz8/I3ViPYJu0QUuxjB8k3cQSNadgINrJslWhGUiq
-4JCOZ2zfKRtvkgVwtuxeQw7uluc4HR0RALUM69X0NaGuowfy865F6fzMIJPtIBSl
-5e9t2ZmdRZTxDnCHm0CEHId4I2CZBM7vA45I4XB0YuJr44+EtfKWsnpVQOcWnqrY
-liYfedpw3oGzladhS10WJL6o4SRxwJgb5rVokv5foQ7ExYx4Y72/0EzD+FX+WaiH
-AgtU4qf+JWRH9mAtEZXwvGaQ3THwroNJW4atWH7RpecmLUp+/2IWg9N5EigwGqJo
-NAPmauIpLsHEIvHcAwP8PDAK9QnBxx2dJcIsc+72ACJ13Xzq2d9cTa+0FUIgNDxj
-sUglixlWQjAvt+lEsnb0
-=5ukD
+iQJ8BAEBCABmBQJVOR5vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88JaUQAMUA7ZJYsAKOcxTreVvceZ87
+tyyVbG+Um7Vb0xAgeqTfqVsu5yy1l18c32YVRkozCrQZnXKWgD7U7qerMZvFVZQF
+rInvSqo0JM7k67S8b9i1OYdRxdSv7zWrHHWSpeAirudactA0xYfPFmoI5af4tTVk
+fylyDtc2l1+FRMYfjAdnwd4j21CdrQl1WzbHf3EnAsRytNxNOYmoHSmknki4X8MT
+qmrayXLWUEQxIqDg0yr6wQ7eWE6JTH7BxFb7XrFb2fC3JQfinHHr+8pXjPZf+lvc
+cQUS1fa6RW+9lVEnZFt9XF6qumJH/rK/3yKS5zeHde7rQoDyJUXzMZ7/tCBGLQED
+emAam4gytU1RjYkHpCqcnqXUDiD0Xzqk4yQWQBGtdv+a8jxjVVyHa77xL2iRRD+y
+lvNwtW3zsrwYeK9ou8stoj9HYr3aH23q4YTg1QSxtoQ+zGfA4YMqce9/JEHHX27J
+hwNXzoBbiC0GcwLUoV0xHbsVRp7MYv3XAMraV+7H68TmQzdy5M7b/SgI4W25BZtH
+3OyPBLUHWVVrD99i8DOWc7clX1qy79bopekEo7afZix+UrePIRwTZ5DucqbI675U
+dUuNkIYX+a4VxLtcw/5iPAIHd0D9oHOtmu1HNo48tLEue/nIRwUnF4SUeoxGUho1
+0HrtOPiLPZbwdmzHsUQS
+=y9/V
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/lxc/files/lxc.initd.3 b/app-emulation/lxc/files/lxc.initd.3
index b2a1ee2f8b81..5724c4754b03 100644
--- a/app-emulation/lxc/files/lxc.initd.3
+++ b/app-emulation/lxc/files/lxc.initd.3
@@ -1,15 +1,17 @@
 #!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.3,v 1.1 2014/10/18 17:00:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.3,v 1.2 2015/04/23 16:31:44 hwoarang Exp $
 
 CONTAINER=${SVCNAME#*.}
 
+LXC_PATH="/var/lib"
+
 lxc_get_configfile() {
-	if [ -f "/etc/lxc/${CONTAINER}.conf" ]; then
-		echo "/etc/lxc/${CONTAINER}.conf"
-	elif [ -f "/etc/lxc/${CONTAINER}/config" ]; then
-		echo "/etc/lxc/${CONTAINER}/config"
+	if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then
+		echo "${LXC_PATH}/${CONTAINER}.conf"
+	elif [ -f "${LXC_PATH}/${CONTAINER}/config" ]; then
+		echo "${LXC_PATH}/${CONTAINER}/config"
 	else
 		eerror "Unable to find a suitable configuration file."
 		eerror "If you set up the container in a non-standard"
diff --git a/app-emulation/lxc/lxc-1.1.2.ebuild b/app-emulation/lxc/lxc-1.1.2.ebuild
new file mode 100644
index 000000000000..7d609d7d65d7
--- /dev/null
+++ b/app-emulation/lxc/lxc-1.1.2.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.2.ebuild,v 1.1 2015/04/23 16:31:44 hwoarang Exp $
+
+EAPI="5"
+
+MY_P="${P/_/-}"
+PYTHON_COMPAT=( python{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 ~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.0.6-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 "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 ""
+}