diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-10-03 23:49:12 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-10-03 23:49:12 +0000 |
| commit | 7326327111e73d1e527f84c5d597bdbd0941a2d8 (patch) | |
| tree | b2f562754a8c55e2e5f55179b20b6748755cac6b /app-admin/webapp-config | |
| parent | Added a few patches from upstream and debian. Should pass tests now. (diff) | |
| download | gentoo-2-7326327111e73d1e527f84c5d597bdbd0941a2d8.tar.gz gentoo-2-7326327111e73d1e527f84c5d597bdbd0941a2d8.tar.bz2 gentoo-2-7326327111e73d1e527f84c5d597bdbd0941a2d8.zip | |
Fix file collision one webapp eclass manpage, bug 322759
(Portage version: 2.2_rc88/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/webapp-config')
| -rw-r--r-- | app-admin/webapp-config/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog index edf92db19b7b..65459dd83a84 100644 --- a/app-admin/webapp-config/ChangeLog +++ b/app-admin/webapp-config/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/webapp-config # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.65 2010/05/14 18:56:00 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.66 2010/10/03 23:49:12 reavertm Exp $ + + 03 Oct 2010; Maciej Mrozowski <reavertm@gentoo.org> + webapp-config-1.50.16-r3.ebuild: + Fix file collision on webapp.eclass manpage, bug 322759 14 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> webapp-config-1.50.16-r1.ebuild, webapp-config-1.50.16-r3.ebuild: diff --git a/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild b/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild index 38b17acbbafd..1e943605f09c 100644 --- a/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild +++ b/app-admin/webapp-config/webapp-config-1.50.16-r3.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-admin/webapp-config/webapp-config-1.50.16-r3.ebuild,v 1.4 2010/05/14 18:56:00 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild,v 1.5 2010/10/03 23:49:12 reavertm Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -28,7 +28,11 @@ src_prepare() { epatch "${FILESDIR}/${P}-baselayout2.patch" epatch "${FILESDIR}/${P}-htdocs-symlink.patch" epatch "${FILESDIR}/${P}-absolute-paths.patch" - rm -f doc/webapp.eclass.5{,.html} + # Do not build nor install eclass manual, bug 322759 + rm -f doc/webapp.eclass.5* + sed -e '/MAN_PAGES/s/webapp.eclass.5//' \ + -e '/HTML_PAGES/s/webapp.eclass.5.html//' \ + -i doc/Makefile || die } src_install() { |