The package.env file now contains DEPEND, fixes #96145. Introduced support for the examples and the source useflag.

(Portage version: 2.0.51.22-r1)

3 files changed, 28 insertions, 18 deletions

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index 5258e5771a70..c4a63eb7c852 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/struts
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.18 2005/05/29 15:54:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.19 2005/06/18 14:52:47 luckyduck Exp $
+
+  18 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> struts-1.2.4-r1.ebuild:
+  The package.env file now contains DEPEND, fixes #96145. Introduced support
+  for the examples and the source useflag.
 
   29 May 2005; Markus Rothe <corsair@gentoo.org> struts-1.1-r3.ebuild:
   Stable on ppc64
diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest
index b0b60e5a2ebd..77bdf8f39d7c 100644
--- a/dev-java/struts/Manifest
+++ b/dev-java/struts/Manifest
@@ -1,8 +1,8 @@
-MD5 61c6989e440177d4681c12a31ad91685 ChangeLog 3151
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 26dee5f66132ef4a1bc88772c209d86e struts-1.1-r3.ebuild 2242
+MD5 8a3090745db5a092f20e23734359b2e0 struts-1.2.4-r1.ebuild 2639
 MD5 40e7a5fca1abfe86d7e87cbd99ac9198 struts-1.2.2-r2.ebuild 2223
-MD5 3f1bd0f74228332cd60651f2295433ec struts-1.2.4-r1.ebuild 2225
-MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1-r3 75
+MD5 61c6989e440177d4681c12a31ad91685 ChangeLog 3151
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 ca49a9860e1c5de4c613a8209e388c41 files/digest-struts-1.2.2-r2 77
 MD5 762b50289a349b2d9dad8b763f5186a0 files/digest-struts-1.2.4-r1 78
+MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1-r3 75
diff --git a/dev-java/struts/struts-1.2.4-r1.ebuild b/dev-java/struts/struts-1.2.4-r1.ebuild
index 737e333bd9f4..61fac32c4d7b 100644
--- a/dev-java/struts/struts-1.2.4-r1.ebuild
+++ b/dev-java/struts/struts-1.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.4-r1.ebuild,v 1.1 2005/05/14 16:14:02 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.4-r1.ebuild,v 1.2 2005/06/18 14:52:47 luckyduck Exp $
 
 inherit java-pkg
 
@@ -11,7 +11,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 DEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-1.6.0
-	jikes? ( dev-java/jikes )"
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4
 	=dev-java/commons-beanutils-1.6*
 	>=dev-java/commons-collections-2.1
@@ -23,7 +24,7 @@ RDEPEND=">=virtual/jre-1.4
 	>=dev-java/commons-validator-1.1.3
 	=dev-java/jakarta-oro-2.0*
 	=dev-java/servletapi-2.3*"
-IUSE="doc jikes"
+IUSE="doc examples jikes source"
 KEYWORDS="~x86 ~ppc ~amd64"
 
 S=${WORKDIR}/jakarta-${P}-src
@@ -33,16 +34,16 @@ src_compile() {
 	use doc && antflags="${antflags} compile.javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 
-	antflags="${antflags} -Dcommons-beanutils.jar=`java-config -p commons-beanutils-1.6 | sed s/:.*// `"
-	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 jakarta-oro-2.0`"
-	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`"
+	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar	commons-beanutils-1.6 commons-beanutils.jar | sed s/:.*// )"
+	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjar commons-collections commons-collections.jar)"
+	antflags="${antflags} -Dstruts-legacy.jar=$(java-pkg_getjar struts-legacy struts-legacy.jar)"
+	antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjar commons-digester commons-digester.jar)"
+	antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjar commons-fileupload commons-fileupload.jar)"
+	antflags="${antflags} -Djakarta-oro.jar=$(java-pkg_getjar jakarta-oro-2.0 jakarta-oro.jar)"
+	antflags="${antflags} -Dservlet.jar=$(java-pkg_getjar servletapi-2.3 servlet.jar)"
+	antflags="${antflags} -Dcommons-lang.jar=$(java-pkg_getjar commons-lang commons-lang.jar)"
+	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar | sed 's/.*://')"
+	antflags="${antflags} -Dcommons-validator.jar=$(java-pkg_getjar commons-validator commons-validator.jar)"
 
 	ant ${antflags} || die "compile failed"
 }
@@ -57,4 +58,9 @@ src_install() {
 
 	dodoc README STATUS.txt
 	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 source && java-pkg_dosrc src/share/*
 }