diff options
| author |   Jonathan Callen <jcallen@gentoo.org> | 2015-06-14 02:41:01 +0000 |
|---|---|---|
| committer | Jonathan Callen <jcallen@gentoo.org> | 2015-06-14 02:41:01 +0000 |
| commit | 9fc3bebe374c0a3546cc14d27fbed807d034d455 (patch) | |
| tree | eeb02169fe59174d49fb911cc33ff671ff18d68c /dev-util | |
| parent | Version bump (bug #549916), see http://segfault.linuxmint.com/2015/06/cinnamo... (diff) | |
| download | gentoo-2-9fc3bebe374c0a3546cc14d27fbed807d034d455.tar.gz gentoo-2-9fc3bebe374c0a3546cc14d27fbed807d034d455.tar.bz2 gentoo-2-9fc3bebe374c0a3546cc14d27fbed807d034d455.zip | |
Fix build with USE=doc; revbump to fix bash-completion file
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 229E5838)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/schroot/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/schroot/schroot-1.6.10-r1.ebuild (renamed from dev-util/schroot/schroot-1.6.10.ebuild) | 13 |
2 files changed, 16 insertions, 5 deletions
diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog index 0ef3b0a1f54a..f7f3a5fa25eb 100644 --- a/dev-util/schroot/ChangeLog +++ b/dev-util/schroot/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/schroot # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.42 2015/06/12 02:50:26 jcallen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.43 2015/06/14 02:41:01 jcallen Exp $ + +*schroot-1.6.10-r1 (14 Jun 2015) + + 14 Jun 2015; Jonathan Callen <jcallen@gentoo.org> +schroot-1.6.10-r1.ebuild, + -schroot-1.6.10.ebuild: + Fix build with USE=doc; revbump to fix bash-completion file *schroot-1.6.10 (12 Jun 2015) diff --git a/dev-util/schroot/schroot-1.6.10.ebuild b/dev-util/schroot/schroot-1.6.10-r1.ebuild index d06c7130f568..575a67d97978 100644 --- a/dev-util/schroot/schroot-1.6.10.ebuild +++ b/dev-util/schroot/schroot-1.6.10-r1.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/dev-util/schroot/schroot-1.6.10.ebuild,v 1.1 2015/06/12 02:50:26 jcallen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.6.10-r1.ebuild,v 1.1 2015/06/14 02:41:01 jcallen Exp $ EAPI="5" @@ -53,7 +53,8 @@ src_unpack() { } src_prepare() { - sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt + sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die + sed -i -e '/^have schroot/d' etc/bash_completion/schroot || die cmake-utils_src_prepare } @@ -79,6 +80,10 @@ src_configure() { cmake-utils_src_configure } +src_compile() { + cmake-utils_src_compile all $(usev doc) +} + src_test() { if [[ $EUID -ne 0 ]]; then ewarn "Disabling tests because you are not root" @@ -101,9 +106,9 @@ src_install() { if use doc; then docinto html/sbuild - dohtml doc/sbuild/html/* + dohtml "${BUILD_DIR}"/doc/sbuild/html/* docinto html/schroot - dohtml doc/schroot/html/* + dohtml "${BUILD_DIR}"/doc/schroot/html/* fi if use pam; then |