summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-java/commons-validator/ChangeLog8
-rw-r--r--dev-java/commons-validator/commons-validator-1.0.2-r2.ebuild12
-rw-r--r--dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild60
-rw-r--r--dev-java/commons-validator/files/digest-commons-validator-1.0.2-r31
-rw-r--r--dev-java/struts-legacy/ChangeLog8
-rw-r--r--dev-java/struts-legacy/files/digest-struts-legacy-1.0-r11
-rw-r--r--dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild39
-rw-r--r--dev-java/struts/ChangeLog7
-rw-r--r--dev-java/struts/files/digest-struts-1.1-r11
-rw-r--r--dev-java/struts/struts-1.1-r1.ebuild55
10 files changed, 183 insertions, 9 deletions
diff --git a/dev-java/commons-validator/ChangeLog b/dev-java/commons-validator/ChangeLog
index 20fbbf9a6f79..8ff1adb4ae12 100644
--- a/dev-java/commons-validator/ChangeLog
+++ b/dev-java/commons-validator/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/commons-validator
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.9 2004/06/19 23:39:46 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.10 2004/06/21 19:59:32 karltk Exp $
+
+*commons-validator-1.0.2-r3 (21 Jun 2004)
+
+ 21 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+ commons-validator-1.0.2-r3.ebuild: Changed to more suitable runtime
+ and buildtime dependencies, fixes #46205.
*commons-validator-1.0.2-r2 (20 Jun 2004)
diff --git a/dev-java/commons-validator/commons-validator-1.0.2-r2.ebuild b/dev-java/commons-validator/commons-validator-1.0.2-r2.ebuild
index f5d632b9ffdb..97306889e37a 100644
--- a/dev-java/commons-validator/commons-validator-1.0.2-r2.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.0.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r2.ebuild,v 1.1 2004/06/19 23:39:46 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r2.ebuild,v 1.2 2004/06/21 19:59:32 karltk Exp $
inherit java-pkg
@@ -9,16 +9,16 @@ HOMEPAGE="http://jakarta.apache.org/commons/validator/"
SRC_URI="mirror://apache/jakarta/commons/validator/source/${PN}-${PV}-src.tar.gz"
DEPEND=">=virtual/jdk-1.3
>=dev-java/ant-1.4
+ app-arch/zip
+ jikes? ( dev-java/jikes )
+ junit? ( >=junit-3.7 )"
+RDEPEND=">=virtual/jre-1.3
>=dev-java/oro-2.0.6
>=dev-java/commons-digester-1.0
>=dev-java/commons-collections-2.0
>=dev-java/commons-logging-1.0
>=dev-java/commons-beanutils-1.0
- >=dev-java/xerces-2.0.1
- app-arch/zip
- jikes? ( dev-java/jikes )
- junit? ( >=junit-3.7 )"
-RDEPEND=">=virtual/jre-1.3"
+ >=dev-java/xerces-2.0.1"
LICENSE="Apache-1.1"
SLOT="0"
RESTRICT="nomirror"
diff --git a/dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild b/dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild
new file mode 100644
index 000000000000..c14769141ce0
--- /dev/null
+++ b/dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild,v 1.1 2004/06/21 19:59:32 karltk Exp $
+
+inherit java-pkg
+
+DESCRIPTION="Jakarta component to validate user input, or data input"
+HOMEPAGE="http://jakarta.apache.org/commons/validator/"
+SRC_URI="mirror://apache/jakarta/commons/validator/source/${PN}-${PV}-src.tar.gz"
+DEPEND=">=virtual/jdk-1.3
+ >=dev-java/ant-1.4
+ app-arch/zip
+ jikes? ( dev-java/jikes )
+ junit? ( >=junit-3.7 )"
+RDEPEND=">=virtual/jre-1.3
+ >=dev-java/oro-2.0.6
+ >=dev-java/commons-digester-1.0
+ >=dev-java/commons-collections-2.0
+ >=dev-java/commons-logging-1.0
+ >=dev-java/commons-beanutils-1.0
+ >=dev-java/xerces-2.0.1"
+LICENSE="Apache-1.1"
+SLOT="0"
+RESTRICT="nomirror"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="doc jikes junit"
+
+S="${WORKDIR}/${P}-src"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ echo "oro.jar=`java-config --classpath=oro`" >> build.properties
+ echo "commons-digester.jar=`java-config --classpath=commons-digester`" >> build.properties
+ echo "commons-collections.jar=`java-config --classpath=commons-collections`" >> build.properties
+ echo "commons-logging.jar=`java-config --classpath=commons-logging | sed s/.*://`" >> build.properties
+ echo "commons-beanutils.jar=`java-config --classpath=commons-beanutils`" >> build.properties
+ echo "xerces.jar=`java-config --classpath=xerces`" >> build.properties
+}
+
+src_compile() {
+ local antflags="compile"
+ use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+ use doc && antflags="${antflags} javadoc"
+ use junit && antflags="${antflags} test"
+ ant ${antflags}
+}
+
+src_install() {
+ # Dirty hack
+ mv ${S}/target/conf/MANIFEST.MF ${S}/target/classes/
+ cd ${S}/target/classes
+ zip -qr ../${PN}.jar org
+
+ cd ${S}
+ java-pkg_dojar target/${PN}.jar
+ use doc && dohtml -r dist/docs/
+ dohtml PROPOSAL.html STATUS.html
+ dodoc RELEASE-NOTES.txt
+}
diff --git a/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r3 b/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r3
new file mode 100644
index 000000000000..f6bd8c581e2d
--- /dev/null
+++ b/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r3
@@ -0,0 +1 @@
+MD5 917cf3d82847e497e11f9e86488d4b56 commons-validator-1.0.2-src.tar.gz 53692
diff --git a/dev-java/struts-legacy/ChangeLog b/dev-java/struts-legacy/ChangeLog
index 51b0d80b8215..e1da2804f64d 100644
--- a/dev-java/struts-legacy/ChangeLog
+++ b/dev-java/struts-legacy/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/struts-legacy
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/ChangeLog,v 1.2 2004/05/25 04:27:07 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/ChangeLog,v 1.3 2004/06/21 20:04:20 karltk Exp $
+
+*struts-legacy-1.0-r1 (21 Jun 2004)
+
+ 21 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+ struts-legacy-1.0-r1.ebuild: Added more suitable runtime dependencies,
+ fixes #45402.
25 May 2004; Chris Aniszczyk <zx@gentoo.org> struts-legacy-1.0.ebuild:
Closes #51770.
diff --git a/dev-java/struts-legacy/files/digest-struts-legacy-1.0-r1 b/dev-java/struts-legacy/files/digest-struts-legacy-1.0-r1
new file mode 100644
index 000000000000..6007ab165d0d
--- /dev/null
+++ b/dev-java/struts-legacy/files/digest-struts-legacy-1.0-r1
@@ -0,0 +1 @@
+MD5 805b7f3e787c1469f57fed9f5eebc3a1 struts-legacy-1.0-src.tar.gz 12767
diff --git a/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild b/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild
new file mode 100644
index 000000000000..1e382ee68391
--- /dev/null
+++ b/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild,v 1.1 2004/06/21 20:04:20 karltk Exp $
+
+inherit java-pkg
+
+DESCRIPTION="Jakarta Struts Legacy Library"
+SRC_URI="mirror://apache/jakarta/struts/struts-legacy/${P}-src.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/struts/"
+IUSE="doc jikes"
+DEPEND=">=virtual/jdk-1.4
+ dev-java/ant
+ jikes? ( dev-java/jikes )"
+RDEPEND=">=virtual/jdk-1.4
+ >=dev-java/jdbc2-stdext-2.0
+ dev-java/commons-logging"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86"
+
+S=${WORKDIR}/${P}-src
+
+src_compile() {
+ sed -i 's:compile,docs:compile:' build.xml || die "sed failed"
+ echo "commons-logging.jar=`java-config -p commons-logging | sed 's/.*://'`" > build.properties
+ echo "jdbc20ext.jar=`java-config -p jdbc2-stdext`" >> build.properties
+ echo "jdk.version=1.4" >> build.properties
+
+ local antflags="dist"
+ use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+ use doc && antflags="${antflags} docs"
+ ant ${antflags} || die "compile problem"
+}
+
+src_install () {
+ java-pkg_dojar dist/*.jar
+ dodoc STATUS.txt
+ use doc && dohtml -r dist/docs/
+}
diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index df9d48a60fdb..7df9de3cdab1 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/struts
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.1 2004/03/18 05:03:12 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.2 2004/06/21 20:02:12 karltk Exp $
+
+*struts-1.1-r1 (21 Jun 2004)
+
+ 21 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org> struts-1.1-r1.ebuild:
+ Fixed to more suitable runtime dependencies, fixes #45402.
*struts-1.1 (18 Mar 2004)
diff --git a/dev-java/struts/files/digest-struts-1.1-r1 b/dev-java/struts/files/digest-struts-1.1-r1
new file mode 100644
index 000000000000..71be52a0b597
--- /dev/null
+++ b/dev-java/struts/files/digest-struts-1.1-r1
@@ -0,0 +1 @@
+MD5 c21f443d145f5753d5b560a2d3c2d065 jakarta-struts-1.1-src.tar.gz 9944708
diff --git a/dev-java/struts/struts-1.1-r1.ebuild b/dev-java/struts/struts-1.1-r1.ebuild
new file mode 100644
index 000000000000..305bf29434ab
--- /dev/null
+++ b/dev-java/struts/struts-1.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r1.ebuild,v 1.1 2004/06/21 20:02:12 karltk Exp $
+
+inherit java-pkg
+
+DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
+SRC_URI="mirror://apache/jakarta/struts/source/jakarta-${PN}-${PV}-src.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/struts/index.html"
+LICENSE="Apache-1.1"
+SLOT="0"
+DEPEND=">=virtual/jdk-1.4
+ >=dev-java/ant-1.5.4
+ jikes? ( dev-java/jikes )"
+DEPEND=">=virtual/jre-1.4
+ >=dev-java/commons-beanutils-1.6.1
+ >=dev-java/commons-collections-2.1
+ >=dev-java/struts-legacy
+ >=dev-java/commons-digester-1.5
+ >=dev-java/commons-fileupload-1.0
+ >=dev-java/commons-lang-1.0
+ >=dev-java/commons-logging-1.0
+ >=dev-java/commons-validator-1.0
+ >=dev-java/oro-2.0.6
+ =dev-java/servletapi-2.3*"
+IUSE="doc jikes"
+KEYWORDS="~x86"
+
+S=${WORKDIR}/jakarta-${PN}-${PV}-src
+
+src_compile() {
+ local antflags="compile.library"
+ use doc && antflags="${antflags} compile.javadoc"
+ use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+
+ antflags="${antflags} -Dcommons-beanutils.jar=`java-config -p commons-beanutils`"
+ antflags="${antflags} -Dcommons-collections.jar=`java-config -p commons-collections`"
+ antflags="${antflags} -Dstruts-legacy.jar=`java-config -p struts-legacy`"
+ antflags="${antflags} -Dcommons-digester.jar=`java-config -p commons-digester`"
+ antflags="${antflags} -Dcommons-fileupload.jar=`java-config -p commons-fileupload`"
+ antflags="${antflags} -Djakarta-oro.jar=`java-config -p oro`"
+ antflags="${antflags} -Dservlet.jar=`java-config -p servletapi-2.3`"
+ antflags="${antflags} -Dcommons-lang.jar=`java-config -p commons-lang`"
+ antflags="${antflags} -Dcommons-logging.jar=`java-config -p commons-logging | sed 's/.*://'`"
+ antflags="${antflags} -Dcommons-validator.jar=`java-config -p commons-validator`"
+
+ ant ${antflags} || die "compile failed"
+}
+
+
+src_install() {
+ java-pkg_dojar target/library/struts.jar
+ dodoc README STATUS
+ use doc && dohtml -r target/documentation/
+}