Do not hardcode LXC_PATH. Bug #548568. Patch by Erik Mackdanz <erikmack@gmail.com>

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

4 files changed, 222 insertions, 19 deletions

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index 78208e8ec233..996a47da2ce6 100644
--- a/app-emulation/lxc/ChangeLog
+++ b/app-emulation/lxc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.78 2015/06/11 17:06:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.79 2015/06/13 11:54:25 hwoarang Exp $
+
+*lxc-1.1.2-r2 (13 Jun 2015)
+
+  13 Jun 2015; Markos Chandras <hwoarang@gentoo.org> +lxc-1.1.2-r2.ebuild,
+  files/lxc.initd.3:
+  Do not hardcode LXC_PATH. Bug #548568. Patch by Erik Mackdanz
+  <erikmack@gmail.com>
 
 *lxc-1.1.2-r1 (11 Jun 2015)
 
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index fc1c207c8538..d6e83d27c96e 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -5,7 +5,7 @@ AUX lxc-1.0.6-bash-completion.patch 1341 SHA256 ddac7cc033a4029f8264d06978321bb3
 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-1.1.2-fix-gentoo-moresecure-template.patch 1551 SHA256 79df56e61bdfaba3c176f8ddbe357c38d59cc28a0471c0e546b7ff2aeca34a04 SHA512 64eb328872c737b3285b075e00a813844bd6fae4e3c76ad671c7a6d54e85eaa8b44b0bb20ceda90fe8e9ec624fe58a0e41cf3767554b4846d4ccd3aaf5890478 WHIRLPOOL 899d2257de2f6da1f55d62e2b8bd8f276334a4808e795542646c007506b15df172890d199da6c175e0d1b16615d798772da1c6e364cc681fffd4ba9c91067bef
-AUX lxc.initd.3 3798 SHA256 e399325baf194db7fb53b968ddd087c23a5609fb069e125596cae8ddabbe1186 SHA512 f59dfea9391c6af377922ce4294ef10b3cc208e68d759106481de1544a8f3b4157a5024bcef9b2801f9423ce3e5d75ee55eb1de254aa9509d5549028be95837c WHIRLPOOL 0de3910122babcac1925a4a0f2467fab8f9e9f15fbcd8016d3bd35fd27582c75959b40c21c3793ac19c6f488748c837e0aa3395cc10ebc514fa446b6da903a53
+AUX lxc.initd.3 3812 SHA256 0bc3b8703c9d3873c344509602b81e99feac87c1cfa219a5c2e3618a98a3f52d SHA512 663a3c16465e45df7190c686d99182040971e0abcf68918fb04f19cc693bd5d31eeb046e4217ddfa0ac1519c0960dbdba43b5fad64c0a202fbea3ef24b2c4c66 WHIRLPOOL 89eb4cceb675bca61222194e1b6c589797a310b7c717a584c473a03d36006118f6e62cba69b031f3e6630b15211c4161e4f5fee73e725708e23137f615f6aec7
 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
@@ -18,25 +18,26 @@ EBUILD lxc-1.0.7.ebuild 5920 SHA256 7664d07f7d41ee3798e02e5623bbc3b7365aa6120fea
 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
 EBUILD lxc-1.1.2-r1.ebuild 6082 SHA256 b34c8269aefbc1bcf38a3cf7db1662d38afbc0a8bf72a23ce5e477720ef4b79c SHA512 2bbf7d9af89af61854cfdd873f8219fb9984ea7086e3920186619c84b427edf53e7ec640deb0c928a416536b7c44c080c4ffcf9d28b35336fca31a38f1c39b8d WHIRLPOOL 44392e4e1a0a0495ed1e61bea7a007c445ed7efd8d274e2291aa118876661279d85d2c4d7efa1e483444694e8d094e111189f4e3de127586262c441c7d6a0a49
+EBUILD lxc-1.1.2-r2.ebuild 6082 SHA256 da212a3c7d66b851b88b46f9601dc5faae3339ce8c5130dff43fe3674b9ae9cc SHA512 38b2912e56e2b4de2151b24b21e3b86416713af44c0dee819c5436d06af45ab313f0fedcc4898ffb1d099289838338c6743fce1c4f16909368960f4ac71a915e WHIRLPOOL 6319b6ca53161a33723487347e4b9200f34ee8a5f817fbc9e4d4e9ed75fbfa85f03784b58ae5b2df76797ec4f8980721c4f4f0dd853192c3a14dccfa8f46fbe5
 EBUILD lxc-1.1.2.ebuild 6015 SHA256 87265023b5bc5a156e2f4e47a9161e04b5dde6926448eaf1f9c01fbf36b4bdf6 SHA512 1a58a11140f90031379bbbf603e443befbd2a1706914ffaa5122e30bebe28ead4e2beec1687b7f4deace04fdc379108249b4d8c86e1e07c52b2a3a76f9b3fa85 WHIRLPOOL a4cdb2d82dccd767121574c8b13a153a57846ba2be196d6a1bd565ef7b1865a82b1976c95667c1bbb1fe5662673f9875663cb8fd3017d08234817c7e8e052287
-MISC ChangeLog 15887 SHA256 c285b925afba44b2631cac35ab9049583d9c7e7d85b93113f0d4a07c9d5ac01e SHA512 9e9c79d13b2df6e999f8d5c7802bbc558682eff4ac9b9ecddc9cf993abc16e9537306b1cb3b9c5437e7a6c4398ba521d6607122dafd90c8636b32c91775450c8 WHIRLPOOL 4ace197e6541cb0a88b4684e4e56e03a0f7c18a18adb7c81615719a5bf4f8f1e096cb778a8a121be6355c5144a41248fb1bff03df07c7396ce6f41fae851e8c6
+MISC ChangeLog 16100 SHA256 2cec6cc390a835852427e9038056ab5525f8a51b9b22fafbb700a8f0b7a1c095 SHA512 39321a6c96a45ed939baf1d2754f2eec783fa2284d91a824859a9b307956a97ae4c4c9696aebd19bb90c1f1199c7e520d5f5b2b09516cab87991854d7973f385 WHIRLPOOL 2b272a80843c78e636c734e1df130895de714a7704fa2a47e95127dfb4b6509f0aceef442c3d9aaae342300617a9dabcb53174cf35247729e9dd50d06abf6e59
 MISC metadata.xml 581 SHA256 1346e876483a9e2188cd367e6e990d83d145fb4efd81d73e7a2a5a5c6183d69f SHA512 8f55511b8ca270dc05444d159d35572a09e965852a537dcb159cb3de2f0581191133e47bf2b5cc87e7a3acca075c4f8ee89f7e6f37ff8fc78ce8d1f3054bc2e5 WHIRLPOOL 1ba29f9ecee0b57bd00952e216f08e1ceeb7d49508962755fc6f437b1da062c1c9da7f66d285f2294161635f97d742c08fc05912576165fa675f8d2a526e71a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVecARXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVfBnxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88RuAP/1CsM7ZKs28bTiyk6adMJxSz
-MhTeNAVT+i2DwC6tI9uMn4gJZnSREVV+bk26TA0SZPIZIekxxMfOkIr/2cqpfRn/
-G8xzHJ+94I1Bip3rrycoxQ1lYEUar7GGqlz2mrcCEb7SoE4zc3ooclnzJ4DxIbtc
-IvqwLgkp2MoekLKx9Uu98UyhLMsmDoH/yv0nsmmU8RXzI989qD4HRkQ5qmCgEPrW
-HIHTYXuz/Jv1QzgoB7pwzNvovsW4gnEprnLEYt2eU2CMk4+y1gLKzmJaAicFSwYP
-8SY8BGUQa7T54AqVcKGT3jNN78zeZh4K0bx4g1V25thUKyB0ocoDgpbYh+RUYXAZ
-Y62uxkl3y8TxBS5yM0FuGAnt5sBX4aoLJobZBDpmQPmBmpTfDb8RGgHCylAvSkGE
-9uA8r+P/980DrKc8bSpUpLextXVbpT07ifj1hVJYZ+CEvQir9I57pYFo6Jzpz6MT
-Q0D7yLVN5iRTLk9g+ccJV7xV0wE2trDmn0Iwtp/BzkqPZViKfjVG3MVh7RsKswJO
-iwlvPj08E6S6otO4ibTxEBXicYfDcMR6x4qIAZ8kKnDNxZHYZaP13qCZGSY4cJu+
-eCzWrxhhQuboCA7GNJ9RhMz8nKgAQvlutzZsLgXZiW2xSiyHSX1QF7hf3aTVl1DV
-XAZmygwMStPGDv2WqLFO
-=x7b4
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88Y0YQAJGmkQ8LO18OOr/XjL7HM5S/
+uV7X298NfEIYqbfcfF8bpEWGxnO4T8zZgIlHep7J+UtFbI+CuCVdY5MW35viC+Gj
+Wl2B9nrUILsVLpsFh3TlmQ8uHfvMUkSBwPEVhSQAEASDzmAJKFxXnPByBrXGkl1h
+pXYjVpqavSpwR9u/wTCgvZ/Zl4U9IOrHCNLCfVu+d0eCVTvmfxxtxbRyDVNRCAYV
+vdiGXVeybV66S2+ygKdDVUmpyfpPlVVLcmWP5R3HFBHcqrW4SPlJo0I0yTJ5W5ru
+jPwvEIqYNfGQ+6XGJyXuYA93uuTpaw+CyY8WLUz93Pg/3eV3rzZqD5WHrTqx2STT
+pqxfqtuw/r9x5B3d3uC8nEu4xyudA9OuLW2kchZQ89BYtvrPDU7FQXOEtuwa7zIc
+jLQSwT9WLIr7s9togFOLxubBTPW+cXi+278j0yv3blRK1ejmKAQ4HLYmfl/1Ts8s
+NXrc9Nuqh6mj1L9TiJrKHRKPMUKy45WzfxpozZ0ds3wNhdw1Se/7wfCTMo2/idU3
+jJQ+WR73WMn/57yWLuyor4jRpYgmiB/fPgX9VHJzpsP/Ryz2S06y++iseNYmCi0/
+a4J2qnCGiPZndAfPBBiX9QPV+b/3VnBUyh9A+HKvCh4jqhEnLxoqm0LHS0IIM8Qe
+eU2zbM0zWtC9IJ2My6Bc
+=vKhy
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/lxc/files/lxc.initd.3 b/app-emulation/lxc/files/lxc.initd.3
index 5724c4754b03..e1ae34be7610 100644
--- a/app-emulation/lxc/files/lxc.initd.3
+++ b/app-emulation/lxc/files/lxc.initd.3
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 # 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.2 2015/04/23 16:31:44 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.3,v 1.3 2015/06/13 11:54:25 hwoarang Exp $
 
 CONTAINER=${SVCNAME#*.}
 
-LXC_PATH="/var/lib"
+LXC_PATH=`lxc-config lxc.lxcpath`
 
 lxc_get_configfile() {
 	if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then
diff --git a/app-emulation/lxc/lxc-1.1.2-r2.ebuild b/app-emulation/lxc/lxc-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..27f0485a712e
--- /dev/null
+++ b/app-emulation/lxc/lxc-1.1.2-r2.ebuild
@@ -0,0 +1,195 @@
+# 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-r2.ebuild,v 1.1 2015/06/13 11:54:25 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
+	epatch "${FILESDIR}"/${P}-fix-gentoo-moresecure-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/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 ""
+}