Remove old version, install man pages even with USE=-doc now that they are shipped...

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index 191a4107369341b7c37e0da7ce29223b930ed02b..e199af5ca18128c4ac9bf8cb0ddf7a669a47e515 100644 (file)
--- 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/Manifest b/app-emulation/lxc/Manifest
index 5bb3e60e78bdf4ad70b843c51179786e7f2faeda..ef4da395392550776df2620d51953922eab4a703 100644 (file)
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -5,16 +5,14 @@ AUX lxc-0.6.4-fix-full-system.patch 1741 RMD160 049dea2e10d4df6abf758bf70bd18ea5
 AUX lxc-0.6.4-lxc.network.pair.patch 3787 RMD160 79dcc4b4e6e8c8710d295e2b6b9273d9764160df SHA1 24c75f18bee91fe797e8242d0b0e80ed6cf494eb SHA256 aa3e64248ae37b1d1eb1e74499641cff06cab71dcc3b4a985dec2345998a2f19
 AUX lxc-0.6.4-move-rcfile.patch 8502 RMD160 594a72a5f8272302492a5467de0d1854d81a1dea SHA1 03ae85bcdb2d8951647d539cee16bdf9fe336489 SHA256 52d570bb1feaedf88a643899bd64408da7e8803f88479e4549abe5e7cd1ffec2
 AUX lxc-0.6.4-tty-malloc.patch 946 RMD160 9128f04a383c58c5c3851b2be6db03532194d2f8 SHA1 f2b3c19e656766686aad7733ecb07f4a5beb5851 SHA256 40734c9afac0f84553965f756617a7cff6f525307bf664e6bf708c810be50330
-DIST lxc-0.6.4.tar.gz 288214 RMD160 542fc7968ef735ab30f45a2c93c51f355c29314e SHA1 d3b00458691d02d0d31bc2943a07c5c52cfc39a9 SHA256 3ff249246e0a8805db1d3619219c61e3489b5d774cc6c227e8371c7038ed2d04
 DIST lxc-0.6.5.tar.gz 275144 RMD160 ee16852d56e0afefa19d0c9fc9a29567c6f9e703 SHA1 6eaf8c029c48635f8ef7a00207089e330a28451f SHA256 60f203a196a58c7ded1c68790a2d3abacb98acdb7b96fab2f9c3d8574557f21d
-EBUILD lxc-0.6.4-r2.ebuild 2011 RMD160 bdd149b0ae30cb4d2fb09deff013c770c5fa72d6 SHA1 12847ffa4db98b551dc211e8cc162d7e74140d99 SHA256 97c0ba14a930e176b15efb8f0ece3c6efc6d83eec8960483264caeb27f3b31c5
-EBUILD lxc-0.6.5.ebuild 1836 RMD160 71c027daafe06829539b3e2b1d772dd6a9fee33d SHA1 424e41d45002cb21fdaafa21df0946734152dca9 SHA256 6d9aeff37d5db92238714da5be3017e7091f8c007efb09e67a0d84a80d07c121
-MISC ChangeLog 1966 RMD160 b4bb8d2d15744cd1d66556005b1226e50e640e21 SHA1 fb500ee228e26d3c430a296a342f6a43b64dca22 SHA256 5d9833148ce8902fc2d4e1abb42e69bf8f6bf171f58e846699f1598208fdb2e8
-MISC metadata.xml 521 RMD160 a545e00e2df3202e465b684e7581fa541ba2165f SHA1 023dbfe77bba8e848659d38de3287eb8eb1f3832 SHA256 a8f5a0f955bef325605cc123abd008ed57f89e7b6601dad56ca49a6e977eabbc
+EBUILD lxc-0.6.5.ebuild 2195 RMD160 0bd3f4c8de8ef86311e7c83d4f1c140648f9558c SHA1 951045726851fce362e6f21d791604a1b0402dd6 SHA256 874187267738fd37f429cab6c656ddd548674f4ae554a6dd0d019dab66cb55e2
+MISC ChangeLog 2316 RMD160 7d839bc25070688812896429fac45a3dab1b17b1 SHA1 d87a02268ea5a00882bedf5014a7dba8464be72f SHA256 bd96e0db5cdcb7be4693937c3a73b1cc41c9e7a97d60b56f1868d11dd49dfccf
+MISC metadata.xml 310 RMD160 a4aeb0a359704671f8128ef15d4e5140d66e198f SHA1 eec47e2b6feb72b1aa448155708756521cf8d082 SHA256 255ba2a5412f475edbc07ba230222a616e045cf3d95d819915c19ce2edb210dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktkvfQACgkQAiZjviIA2XhZKwCgwX+f1pLg1llyYNK/ZNLpip0C
-XYEAoIPPI2k+x6ZU+0MgUKd09NFEsmVN
-=0tYC
+iEYEARECAAYFAkuWUIYACgkQAiZjviIA2Xiz6wCg3VOmpqOkqU27MXs9p0Sw47gI
+JVMAnia3l18mZrR3TBpooFEkH6rLW85O
+=urQD
 -----END PGP SIGNATURE-----

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 (file)
index 997b190..0000000
--- 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 bd2e892786b5369be6def860eadf9e5280a19599..0dc4bda3296c7277f57bd0b9d5e7a07a45fd4ed6 100644 (file)
--- 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 e7d5ab49966149ed9473798ef42230a5aab97c96..5865a9b99939cbd40d9b3c7ef1839742f75f4327 100644 (file)
--- 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>