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 | 58d1d09e79ac4e230b9c5d06292fce25059c0f10 (patch) | |
| tree | 2157aad1d23bd9180ec8148b2868485f10aee524 /app-admin | |
| parent | Added a few patches from upstream and debian. Should pass tests now. (diff) | |
| download | historical-58d1d09e79ac4e230b9c5d06292fce25059c0f10.tar.gz historical-58d1d09e79ac4e230b9c5d06292fce25059c0f10.tar.bz2 historical-58d1d09e79ac4e230b9c5d06292fce25059c0f10.zip | |
Fix file collision one webapp eclass manpage, bug 322759
Package-Manager: portage-2.2_rc88/cvs/Linux x86_64
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/webapp-config/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/webapp-config/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild | 8 |
3 files changed, 13 insertions, 5 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/Manifest b/app-admin/webapp-config/Manifest index 182e6d35a5cd..5f9c4000d50c 100644 --- a/app-admin/webapp-config/Manifest +++ b/app-admin/webapp-config/Manifest @@ -4,6 +4,6 @@ AUX webapp-config-1.50.16-baselayout2.patch 511 RMD160 cfe440f27a29d0db4b536db5b 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-r3.ebuild 1918 RMD160 4edee5bace5a146585ef8551f699cf0de98bb99e SHA1 5dbbb75e9cc26c79d952c1096d428a55badb2197 SHA256 58809c3b665136feb71d7b4a7c93135b37638e646e08a4797caf0d5a4e3032cc -MISC ChangeLog 23229 RMD160 4717812217fac0b80552f53404751c3c796205bf SHA1 5923c76a9e64a931765643468e5686e0c7b11ac4 SHA256 1e5be6fc5685c0db9d463f5ce88937964c58f8a82ecdcee247aa514c7cd26095 +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 metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96 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() { |