summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Harring <ferringb@gentoo.org>2012-03-29 06:53:13 +0000
committerBrian Harring <ferringb@gentoo.org>2012-03-29 06:53:13 +0000
commit4adeb585addeb79f36151f28912cd87fa11948e8 (patch)
tree582a17b952457bc70893e4587e3c84a5f8f73897 /sys-apps
parentRemove old. (diff)
downloadgentoo-2-4adeb585addeb79f36151f28912cd87fa11948e8.tar.gz
gentoo-2-4adeb585addeb79f36151f28912cd87fa11948e8.tar.bz2
gentoo-2-4adeb585addeb79f36151f28912cd87fa11948e8.zip
update -9999 to match vcs heads support allowing docs and man pages to be optional. Update metadata.xml with specific description for pkgcore.
(Portage version: 2.1.10.52/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/pkgcore/ChangeLog6
-rw-r--r--sys-apps/pkgcore/metadata.xml4
-rw-r--r--sys-apps/pkgcore/pkgcore-9999.ebuild17
3 files changed, 21 insertions, 6 deletions
diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 1140f7011948..1e2259594ad9 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/pkgcore
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.150 2012/01/26 15:47:25 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.151 2012/03/29 06:53:13 ferringb Exp $
+
+ 29 Mar 2012; Brian Harring <ferringb@gentoo.org> pkgcore-9999.ebuild:
+ Update to match vcs head allowing man pages and html to be optional in
+ generation.
*pkgcore-0.7.7.8 (26 Jan 2012)
diff --git a/sys-apps/pkgcore/metadata.xml b/sys-apps/pkgcore/metadata.xml
index a8c28e08a672..2cee712e1bc8 100644
--- a/sys-apps/pkgcore/metadata.xml
+++ b/sys-apps/pkgcore/metadata.xml
@@ -5,4 +5,8 @@
<email>ferringb@gentoo.org</email>
<name>Brian Harring</name>
</maintainer>
+ <use>
+ <flag name="man">Build and install man pages.</flag>
+ <flag name="doc">Build and install API docs.</flag>
+ </use>
</pkgmetadata>
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 2998d2274c0b..8132bf399d7f 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.7 2012/01/26 14:57:03 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.8 2012/03/29 06:53:13 ferringb Exp $
EAPI="3"
DISTUTILS_SRC_TEST="setup.py"
@@ -15,13 +15,15 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="doc"
+IUSE="+doc +man"
RDEPEND=">=dev-lang/python-2.4
=dev-python/snakeoil-9999
|| ( >=dev-lang/python-2.5 dev-python/pycrypto )"
DEPEND="${RDEPEND}
- dev-python/sphinx dev-python/pyparsing"
+ doc? ( dev-python/sphinx )
+ man? ( dev-python/sphinx )
+ dev-python/pyparsing"
DOCS="AUTHORS NEWS"
@@ -32,8 +34,13 @@ pkg_setup() {
}
src_compile() {
- distutils_src_compile
- python setup.py build_man || die "man generation failed"
+ distutils_src_compile $(use_enable doc html-docs) \
+ $(use_enable man man-pages)
+}
+
+src_install() {
+ distutils_src_install $(use_enable doc html-docs) \
+ $(use_enable man man-pages)
}
pkg_postinst() {