| 1 |
reavertm 10/10/03 23:49:12 |
| 2 |
|
| 3 |
Modified: ChangeLog webapp-config-1.50.16-r3.ebuild |
| 4 |
Log: |
| 5 |
Fix file collision one webapp eclass manpage, bug 322759 |
| 6 |
|
| 7 |
(Portage version: 2.2_rc88/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.66 app-admin/webapp-config/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/ChangeLog?rev=1.66&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/ChangeLog?rev=1.66&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/ChangeLog?r1=1.65&r2=1.66 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v |
| 19 |
retrieving revision 1.65 |
| 20 |
retrieving revision 1.66 |
| 21 |
diff -u -r1.65 -r1.66 |
| 22 |
--- ChangeLog 14 May 2010 18:56:00 -0000 1.65 |
| 23 |
+++ ChangeLog 3 Oct 2010 23:49:12 -0000 1.66 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for app-admin/webapp-config |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.65 2010/05/14 18:56:00 arfrever Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.66 2010/10/03 23:49:12 reavertm Exp $ |
| 29 |
+ |
| 30 |
+ 03 Oct 2010; Maciej Mrozowski <reavertm@g.o> |
| 31 |
+ webapp-config-1.50.16-r3.ebuild: |
| 32 |
+ Fix file collision on webapp.eclass manpage, bug 322759 |
| 33 |
|
| 34 |
14 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 35 |
webapp-config-1.50.16-r1.ebuild, webapp-config-1.50.16-r3.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.5 app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild?rev=1.5&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild?rev=1.5&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild?r1=1.4&r2=1.5 |
| 44 |
|
| 45 |
Index: webapp-config-1.50.16-r3.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild,v |
| 48 |
retrieving revision 1.4 |
| 49 |
retrieving revision 1.5 |
| 50 |
diff -u -r1.4 -r1.5 |
| 51 |
--- webapp-config-1.50.16-r3.ebuild 14 May 2010 18:56:00 -0000 1.4 |
| 52 |
+++ webapp-config-1.50.16-r3.ebuild 3 Oct 2010 23:49:12 -0000 1.5 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $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 $ |
| 57 |
+# $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 $ |
| 58 |
|
| 59 |
EAPI="3" |
| 60 |
PYTHON_DEPEND="2" |
| 61 |
@@ -28,7 +28,11 @@ |
| 62 |
epatch "${FILESDIR}/${P}-baselayout2.patch" |
| 63 |
epatch "${FILESDIR}/${P}-htdocs-symlink.patch" |
| 64 |
epatch "${FILESDIR}/${P}-absolute-paths.patch" |
| 65 |
- rm -f doc/webapp.eclass.5{,.html} |
| 66 |
+ # Do not build nor install eclass manual, bug 322759 |
| 67 |
+ rm -f doc/webapp.eclass.5* |
| 68 |
+ sed -e '/MAN_PAGES/s/webapp.eclass.5//' \ |
| 69 |
+ -e '/HTML_PAGES/s/webapp.eclass.5.html//' \ |
| 70 |
+ -i doc/Makefile || die |
| 71 |
} |
| 72 |
|
| 73 |
src_install() { |
Archives