Remove old version, install man pages even with USE=-doc now that they are shipped upstream, thanks to Allen Parker in bug #308553. Assign to virtualization herd to have a fallback maintainer if me and Tiziano are not available.

(Portage version: 2.2_rc66/cvs/Linux x86_64)

4 files changed, 21 insertions, 90 deletions

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index 191a41073693..e199af5ca181 100644
--- a/app-emulation/lxc/ChangeLog
+++ b/app-emulation/lxc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/lxc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.8 2010/01/30 23:16:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.9 2010/03/09 13:43:25 flameeyes Exp $
+
+  09 Mar 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -lxc-0.6.4-r2.ebuild, lxc-0.6.5.ebuild, metadata.xml:
+  Remove old version, install man pages even with USE=-doc now that they are
+  shipped upstream, thanks to Allen Parker in bug #308553. Assign to
+  virtualization herd to have a fallback maintainer if me and Tiziano are
+  not available.
 
 *lxc-0.6.5 (30 Jan 2010)
 
diff --git a/app-emulation/lxc/lxc-0.6.4-r2.ebuild b/app-emulation/lxc/lxc-0.6.4-r2.ebuild
deleted file mode 100644
index 997b1901408f..000000000000
--- a/app-emulation/lxc/lxc-0.6.4-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.6.4-r2.ebuild,v 1.1 2009/12/08 07:45:34 swegener Exp $
-
-EAPI="2"
-
-inherit eutils linux-info versionator base
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="http://lxc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="+doc examples"
-
-RDEPEND="sys-libs/libcap"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-sgml-utils )
-	>=sys-kernel/linux-headers-2.6.29"
-
-CONFIG_CHECK="~CGROUPS
-	~CGROUP_NS ~CPUSETS ~CGROUP_CPUACCT
-	~RESOURCE_COUNTERS ~CGROUP_MEM_RES_CTLR
-	~CGROUP_SCHED
-
-	~NAMESPACES
-	~IPC_NS ~USER_NS ~PID_NS
-
-	~SECURITY_FILE_CAPABILITIES
-	~DEVPTS_MULTIPLE_INSTANCES
-	~CGROUP_FREEZER
-	~UTS_NS ~NET_NS
-	~VETH ~MACVLAN"
-
-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 (inter-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:	needed for internal (inter-container) networking"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-lxc.network.pair.patch
-	"${FILESDIR}"/${P}-move-rcfile.patch
-	"${FILESDIR}"/${P}-fix-full-system.patch
-	"${FILESDIR}"/${P}-tty-malloc.patch
-)
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--bindir=/usr/sbin \
-		--docdir=/usr/share/doc/${PF} \
-		--with-config-path=/etc/lxc	\
-		$(use_enable doc) \
-		$(use_enable examples) \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS CONTRIBUTING MAINTAINERS \
-		NEWS TODO README doc/FAQ.txt || die "dodoc failed"
-
-	rm -r "${D}"/etc/lxc "${D}"/usr/sbin/lxc-{setcap,ls}
-
-	keepdir /etc/lxc
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/app-emulation/lxc/lxc-0.6.5.ebuild b/app-emulation/lxc/lxc-0.6.5.ebuild
index bd2e892786b5..0dc4bda3296c 100644
--- a/app-emulation/lxc/lxc-0.6.5.ebuild
+++ b/app-emulation/lxc/lxc-0.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.6.5.ebuild,v 1.1 2010/01/30 23:16:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.6.5.ebuild,v 1.2 2010/03/09 13:43:25 flameeyes Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="+doc examples"
+IUSE="doc examples"
 
 RDEPEND="sys-libs/libcap"
 
@@ -63,7 +63,16 @@ src_install() {
 	dodoc AUTHORS CONTRIBUTING MAINTAINERS \
 		NEWS TODO README doc/FAQ.txt || die "dodoc failed"
 
-	rm -r "${D}"/etc/lxc "${D}"/usr/sbin/lxc-{setcap,ls}
+	# If the documentation is going to be rebuilt, the Makefiles will
+	# install the man pages themselves; if we're not going to, we
+	# still need to install them, as they are provided with the
+	# tarball in recent versions.
+	if ! use doc; then
+		doman doc/*.{1,5,7} || die
+	fi
+
+	rm -r "${D}"/etc/lxc "${D}"/usr/sbin/lxc-{setcap,ls} \
+		"${D}"/usr/share/man/man1/lxc-ls.1 || die "unable to remove extraenous content"
 
 	keepdir /etc/lxc
 
diff --git a/app-emulation/lxc/metadata.xml b/app-emulation/lxc/metadata.xml
index e7d5ab499661..5865a9b99939 100644
--- a/app-emulation/lxc/metadata.xml
+++ b/app-emulation/lxc/metadata.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>no-herd</herd>
+  <herd>virtualization</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
   <maintainer>
     <email>dev-zero@gentoo.org</email>
   </maintainer>
-  <use>
-    <flag name="doc">
-      Build documentation and man pages. This is optional since it
-      requires extra dependencies. If you don't enable this flag, you
-      will have no man pages.
-    </flag>
-  </use>
 </pkgmetadata>