diff options
| author |   Stanislav Ochotnicky <sochotnicky@gentoo.org> | 2012-02-20 20:46:09 +0000 |
|---|---|---|
| committer | Stanislav Ochotnicky <sochotnicky@gentoo.org> | 2012-02-20 20:46:09 +0000 |
| commit | 66790595b3963ffbb990d097653299b35f204aca (patch) | |
| tree | c8a54fd5463f31f6f14bb58fc4e2b92d87729867 /app-arch | |
| parent | Drop unique use flag. Bug 404579 by Daniel M. Weeks. (diff) | |
| download | gentoo-2-66790595b3963ffbb990d097653299b35f204aca.tar.gz gentoo-2-66790595b3963ffbb990d097653299b35f204aca.tar.bz2 gentoo-2-66790595b3963ffbb990d097653299b35f204aca.zip | |
Fix #404479 - failed installation when USE="doc" was used
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/rpm/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/rpm/rpm-4.9.1.2.ebuild | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog index 9f25ce60910e..1e8c09a8acef 100644 --- a/app-arch/rpm/ChangeLog +++ b/app-arch/rpm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/rpm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.126 2012/02/18 20:14:40 sochotnicky Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.127 2012/02/20 20:46:09 sochotnicky Exp $ + + 20 Feb 2012; Stanislav Ochotnicky <sochotnicky@gentoo.org> + rpm-4.9.1.2.ebuild: + Fix #404479 - failed installation when USE="doc" was used *rpm-4.9.1.2 (18 Feb 2012) diff --git a/app-arch/rpm/rpm-4.9.1.2.ebuild b/app-arch/rpm/rpm-4.9.1.2.ebuild index 4cb07739bef2..cac3e8eabd33 100644 --- a/app-arch/rpm/rpm-4.9.1.2.ebuild +++ b/app-arch/rpm/rpm-4.9.1.2.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/app-arch/rpm/rpm-4.9.1.2.ebuild,v 1.1 2012/02/18 20:14:40 sochotnicky Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.2.ebuild,v 1.2 2012/02/20 20:46:09 sochotnicky Exp $ EAPI=4 @@ -83,7 +83,14 @@ src_install() { keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD} dodoc CHANGES CREDITS GROUPS README* - use doc && dohtml -r apidocs/html/* + if use doc; then + pushd doc/hacking/html + dohtml -p hacking -r . + popd + pushd doc/librpm/html + dohtml -p librpm -r . + popd + fi # Fix perllocal.pod file collision fixlocalpod |