Revbump to use correct systemd file. Bug #540076. Drop old

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

4 files changed, 11 insertions, 198 deletions

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index 0d53b31b7536..229891a0f42d 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.60 2015/02/15 15:38:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.61 2015/02/17 15:15:21 hwoarang Exp $
+
+*lxc-1.1.0-r2 (17 Feb 2015)
+
+  17 Feb 2015; Markos Chandras <hwoarang@gentoo.org> +lxc-1.1.0-r2.ebuild,
+  -lxc-1.1.0-r1.ebuild, -lxc-1.1.0.ebuild:
+  Revbump to use correct systemd file. Bug #540076. Drop old
 
 *lxc-1.1.0-r1 (15 Feb 2015)
 
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index f270151e0557..f44bb5b4cac7 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -8,7 +8,6 @@ DIST lxc-1.0.7.tar.gz 564985 SHA256 a0b1b09592e076e270dcb3ba004616d9ac3147f9de0b
 DIST lxc-1.1.0.tar.gz 592543 SHA256 216e806f7e18e5bfbc782493a9e44fc255f24a587d6faee94cda848a0b949155 SHA512 160da88d6dc96cd9f0679f948bfed057c024adcd459fa4b79e872d12284fa3774ac33a13923c6e150072886a371ccfcdf7ab2c4587efa7f6175fc91a67525c4a WHIRLPOOL 2caf81418850ea8b1ecf25b25e799895563ecf1819f32310fcbb4efe88f711eafe2bcb16a0d3b8ee59072c770a5520b4df90a5962215b932e68a4705c4a56d61
 EBUILD lxc-1.0.6-r1.ebuild 5888 SHA256 c8470a673c846599a66c7aab372a9a551a9b2732d35d5fe4142a8ca385c70a51 SHA512 e84b347a0a39eee2c398d89d4cb217b1224f19eab86647d3a479a85b0eeb16f1375606c3c52ce55febe704e2e923890cc77e42940cc968654a60a4ea71a4a792 WHIRLPOOL 7a000c88099ec1dd5deffae80ce9905a274ce1c81e263ca5f12e9b943b455ca66109ea0b3ec9dfb490e326ac09b6e8912786e1138df3a9fe842eca2c9c636092
 EBUILD lxc-1.0.7.ebuild 5917 SHA256 889147f7dbceb408618a81e75789b6f00b24f19b9a7377da74ebfbd1565781d2 SHA512 f88a95ea399ae754202daf570082b3275c464e60a7f6f49485746509bb0a78b44fd43a67dde966ee4123da15d6697524ef46102950396b61ef1eafcecc0cf313 WHIRLPOOL b225c9b00afc6d697d68078f85e244fb3ff8c5e692bb1fae5a4c961ce426852ad612c40ad25e89bd12309c6b0c1c482a6cdd7812356c1f3c7950d07d90141a13
-EBUILD lxc-1.1.0-r1.ebuild 5733 SHA256 5c325823910f1044194ceccacf963e7397ca3f24f1cc86bc1908fedff12c2a4d SHA512 5a8b688b2ae520cad3a1a5978d26fe2ca9d60ce9331321da8c8a2d05a441ecf5531d85fdee37576feb3964f50bce4a1b94bc3b8d7ecd23d5548375667321b89b WHIRLPOOL cb799344a704e6e0b0a00f43890d447f085c146bd0c9c2abfad32e9f90323c61b02fcdc884330e400033bcf306f41d3b1d5aa9174a81fcdb7247d48fce4f4265
-EBUILD lxc-1.1.0.ebuild 5920 SHA256 69fe56ae8da67fcca434192088a91af500eeaeb5ad1afbd2e0b284a24a61e308 SHA512 fda24963b4fbdd06ab6166b13649ea59b82ca4acfe6a29d1ed64778277fb1e3a99cd5c2d1d62336882271040d22b9ae2653836b1de03da8ee39138d64169cf0f WHIRLPOOL 654e9879af5bcadc75d296cdc1e2fc9ed3a7941181e776d0016cc7b71a6ecc3547d34c6795463d49224e052f424dfed7318104d0e7b82ee8efafe663d6d7bb0d
-MISC ChangeLog 12735 SHA256 dc39002b6618693d4edd9a1d20576e2c4273e887aa72f1c0565bdfdf514d462e SHA512 b62f04061a1360579dc8b05572c2cec5c763013a263031e98e4d1569718b3373345644e1351df9843c70ec84a0fd8aef7a08a37d14e6c4a283d8f684b9f3d02e WHIRLPOOL 1e7bc59d10d4fbfd3e6081e4f3994628e9931b99d7767ab890c68e1ae3568b5957addd28642fa3b1eaa53f05c928870777465f84b18705f538b5e50b9a79be18
+EBUILD lxc-1.1.0-r2.ebuild 5735 SHA256 126052b99bd9df4bb5383237b49c6aeb781bf3a7216aa6408d1794c2ba94a919 SHA512 63463bf01f25749e8bf222a9dbf7b4ee517c86f5ecb5c9a998ae09684876ab3b93e34f43905a6df98a9b9ff6f314b6d1e812a13b5c698feccca0e18341fa8736 WHIRLPOOL 7e5b1a001c7d0e7c3e6d858d931ce5a61d411e22e091304dafb7fb1e7689fa051a829f6a87a182d645e75cfededbbbfd8f24fb146ef80939bf3f87891b93a8c6
+MISC ChangeLog 12944 SHA256 81ac49edbdc96e4b328d3975ff6291b40a3b29e43c1a6b87bc741cf50964ae94 SHA512 fda83949240ed7b6f8908c8a18b3aad11ec3f8d4a0549d9e498ff971ea6a91c2d71b157534ffa682373baeb1de16b58e98882a689e54fb366c5177233dd5aa7d WHIRLPOOL d79a57f140499b1848fe6178e8c90a26e8fe96a8e55ade92fa42d0f3baac7eb2ef8c7913a39be907e1d240aba9e1511f691e26e93739570ee2b1266f6379e49d
 MISC metadata.xml 602 SHA256 9499be0ed7a430f9b8492a9db1dbebd9eff3c495962882c6c6e35c96f3cbc5d6 SHA512 fa7af1390b3e60c04dfa085654d68e121b476ed1e92e367d9b9aab2aabd6b8e8b028db9704161c1da25b3b62fce268ef503eea229da37a3f09fb1235c78847fb WHIRLPOOL 9760914ec9365c7c5f904fee3282b942b37b7afc723cc00694ddf0705c052f32b5328eff26517d3e668676ffe92f6a117abe25e5e5373deda2adea61c607fc15
diff --git a/app-emulation/lxc/lxc-1.1.0-r1.ebuild b/app-emulation/lxc/lxc-1.1.0-r2.ebuild
index c1a55316a47b..b05d050387d7 100644
--- a/app-emulation/lxc/lxc-1.1.0-r1.ebuild
+++ b/app-emulation/lxc/lxc-1.1.0-r2.ebuild
@@ -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-r1.ebuild,v 1.1 2015/02/15 15:38:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.1.0-r2.ebuild,v 1.1 2015/02/17 15:15:21 hwoarang Exp $
 
 EAPI="5"
 
@@ -173,7 +173,7 @@ src_install() {
 	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 "lxc@.service"
+	systemd_newunit "${FILESDIR}"/${PN}_at.service.2 "lxc@.service"
 }
 
 pkg_postinst() {
diff --git a/app-emulation/lxc/lxc-1.1.0.ebuild b/app-emulation/lxc/lxc-1.1.0.ebuild
deleted file mode 100644
index d068911f9c7e..000000000000
--- a/app-emulation/lxc/lxc-1.1.0.ebuild
+++ /dev/null
@@ -1,192 +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.ebuild,v 1.2 2015/02/08 10:06:47 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
-	# Use that script with the systemd service (Similar to upstream
-	# Makefile.am
-	cp "${FILESDIR}"/${PN}_at.service ${PN}_at.service || die
-	sed -i \
-		"/Restart=always/a ExecStartPre=/usr/libexec/${PN}/${PN}-devsetup" \
-		${PN}_at.service \
-		|| die "Failed to add ${PN}-devsetup to the systemd service file"
-	systemd_newunit ${PN}_at.service "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 ""
-}