diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2008-04-14 13:07:02 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2008-04-14 13:07:02 +0000 |
| commit | 26f9f03ecd37d449e82952739dd9007ad367bc91 (patch) | |
| tree | e42c6d1b7ca3e684fd8cbddbec97d83088d26ba4 /dev-java/struts | |
| parent | Version bump (diff) | |
| download | gentoo-2-26f9f03ecd37d449e82952739dd9007ad367bc91.tar.gz gentoo-2-26f9f03ecd37d449e82952739dd9007ad367bc91.tar.bz2 gentoo-2-26f9f03ecd37d449e82952739dd9007ad367bc91.zip | |
Fix commons-validator dependencies to not only match a subset of slot 0. Use java-pkg_doexamples. Fixes bug 217624.
(Portage version: 2.1.5_rc3)
Diffstat (limited to 'dev-java/struts')
| -rw-r--r-- | dev-java/struts/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/struts/struts-1.2.9-r2.ebuild | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog index 974d581cd6c0..cf10daaaea03 100644 --- a/dev-java/struts/ChangeLog +++ b/dev-java/struts/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/struts # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.38 2008/03/22 21:36:01 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.39 2008/04/14 13:07:02 betelgeuse Exp $ + + 14 Apr 2008; Petteri Räty <betelgeuse@gentoo.org> struts-1.2.9-r2.ebuild: + Fix commons-validator dependencies to not only match a subset of slot 0. Use + java-pkg_doexamples. Fixes bug 217624. *struts-1.2.9-r2 (22 Mar 2008) diff --git a/dev-java/struts/struts-1.2.9-r2.ebuild b/dev-java/struts/struts-1.2.9-r2.ebuild index d84a4d6f5ae8..f046ae67b209 100644 --- a/dev-java/struts/struts-1.2.9-r2.ebuild +++ b/dev-java/struts/struts-1.2.9-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild,v 1.1 2008/03/22 21:36:01 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild,v 1.2 2008/04/14 13:07:02 betelgeuse Exp $ EAPI=1 JAVA_PKG_IUSE="doc examples source" @@ -21,7 +21,7 @@ COMMON_DEPS=" >=dev-java/commons-digester-1.5 >=dev-java/commons-fileupload-1.0 >=dev-java/commons-logging-1.0.4 - ~dev-java/commons-validator-1.1.4 + >=dev-java/commons-validator-1.1.4:0 dev-java/jakarta-oro:2.0 java-virtuals/servlet-api:2.3" RDEPEND=">=virtual/jre-1.4 @@ -75,9 +75,6 @@ src_install() { dodoc README STATUS.txt || die use doc && java-pkg_dohtml -r target/documentation/ - if use examples; then - dodir /usr/share/doc/${PF}/examples - cp -r src/example*/* "${D}/usr/share/doc/${PF}/examples" - fi + use examples && java-pkg_doexamples src/example* use source && java-pkg_dosrc src/share/* } |