summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-10-04 00:01:32 +0000
committerMaciej Mrozowski <reavertm@gentoo.org>2010-10-04 00:01:32 +0000
commite811e0a417a2dc1d09cd07bed85de08a8257ac3d (patch)
treea922ba8b07d822db3ab78870f0361f4423f3ad07 /app-admin/webapp-config
parentFix file collision one webapp eclass manpage, bug 322759 (diff)
downloadhistorical-e811e0a417a2dc1d09cd07bed85de08a8257ac3d.tar.gz
historical-e811e0a417a2dc1d09cd07bed85de08a8257ac3d.tar.bz2
historical-e811e0a417a2dc1d09cd07bed85de08a8257ac3d.zip
Remove webapp eclass manpage also in this version, bug 322759
Package-Manager: portage-2.2_rc88/cvs/Linux x86_64
Diffstat (limited to 'app-admin/webapp-config')
-rw-r--r--app-admin/webapp-config/ChangeLog6
-rw-r--r--app-admin/webapp-config/Manifest4
-rw-r--r--app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild7
3 files changed, 13 insertions, 4 deletions
diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog
index 65459dd83a84..94cc06d7dd2e 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.66 2010/10/03 23:49:12 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.67 2010/10/04 00:01:32 reavertm Exp $
+
+ 03 Oct 2010; Maciej Mrozowski <reavertm@gentoo.org>
+ webapp-config-1.50.16-r1.ebuild:
+ Remove webapp eclass manpage also in this version, bug 322759
03 Oct 2010; Maciej Mrozowski <reavertm@gentoo.org>
webapp-config-1.50.16-r3.ebuild:
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 5f9c4000d50c..6b805b4b2a0a 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -3,7 +3,7 @@ AUX webapp-config-1.50.16-apache-move.patch 507 RMD160 f86f9a966c0848c36a4404a93
AUX webapp-config-1.50.16-baselayout2.patch 511 RMD160 cfe440f27a29d0db4b536db5b3fe5655ccf1120b SHA1 1d69d0d88a750b05389b71771b371650eaa89913 SHA256 b94bbd0075f22b735189bd6af334ee68f563470632f96f53fa055a0655fb0360
AUX webapp-config-1.50.16-htdocs-symlink.patch 509 RMD160 ad53b2107e5f51626f3996925c9562d77fc1fdb5 SHA1 0adaefe78f272f32a939f56f941634c7f3c8ed6a SHA256 24e48a42f2b08010ad25f5f83bf4f3f47686fbcd786c0547e95c054cf7021b75
DIST webapp-config-1.50.16.tar.gz 103576 RMD160 d3ab1b27d9b279241d2c9ff3b764ac0b9699b0a0 SHA1 dae0b27bf731116516aed16fd10dc75c0146d332 SHA256 cd5cf95d0abc9b469b08e6fffa885df10d3651d558164d35efe8e45df1fc8a5f
-EBUILD webapp-config-1.50.16-r1.ebuild 1730 RMD160 42ec41759c426fc25751a0e39736738caea13159 SHA1 b8fe6ba81949e7f37952fc3ab5e6161515b6d18f SHA256 a05c74ba79fe1bf99925d55c204c17652d8d5c2c028c710d1ec1cd965f7787dd
+EBUILD webapp-config-1.50.16-r1.ebuild 1926 RMD160 fa1be7b2e9d11adc4abaa6b81f3c3eb8edd6e6a5 SHA1 991f609d362503bf43bd3329f5583811cf45a1fa SHA256 9c0e3e66f28c8b0732038fab94aefa148bad4eea14151d1b54cede8cc222f365
EBUILD webapp-config-1.50.16-r3.ebuild 2079 RMD160 d7f2cbdd6dcab5c5114b5a8827a00b919779fc40 SHA1 a708fff98f08d71e5a943e79a2edb11eedae12e1 SHA256 a9e23c9d8cd17b8eb6aad2f48c93025fd3e440ed0beb98cefc70fa80214fc39c
-MISC ChangeLog 23377 RMD160 69ad58f4eea44da4145b906ebc851b96870f229f SHA1 af315393ef5cd90f3bea24bb23b2bab2e44608ae SHA256 c4dc5e8edc2f50c472c688f5fc82565c6b236ce14e6410e981e84bc607a90196
+MISC ChangeLog 23531 RMD160 a940d6a624885ddc8acc7d0f38cc8ab2b98a99de SHA1 82c6d924acbbf6eb1ee2af0ee80f75b12fbf375d SHA256 092b1200ce310188375358a1e755b2b2d2f8e14f3c1291a820a3d68a64428a5e
MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96
diff --git a/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild b/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild
index d303040bc873..808461a5a2a9 100644
--- a/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.50.16-r1.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-r1.ebuild,v 1.14 2010/05/14 18:56:00 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild,v 1.15 2010/10/04 00:01:32 reavertm Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -25,6 +25,11 @@ PYTHON_MODNAME="WebappConfig"
src_prepare() {
epatch "${FILESDIR}/${P}-apache-move.patch"
+ # 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() {