summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Brinkmann <luckyduck@gentoo.org>2005-03-16 15:30:13 +0000
committerJan Brinkmann <luckyduck@gentoo.org>2005-03-16 15:30:13 +0000
commit6061b24e42ece62f3447083106c2381376be04bf (patch)
treed2be56d50e8eeb9876101e6b187a4d4a561bc259 /dev-java/struts-legacy
parentversion bump (diff)
downloadgentoo-2-6061b24e42ece62f3447083106c2381376be04bf.tar.gz
gentoo-2-6061b24e42ece62f3447083106c2381376be04bf.tar.bz2
gentoo-2-6061b24e42ece62f3447083106c2381376be04bf.zip
added has_version jdbc2-stdext call to avoid error messages, depend on jdbc2-stdext is conditional. fixes #85415
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-java/struts-legacy')
-rw-r--r--dev-java/struts-legacy/ChangeLog9
-rw-r--r--dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild8
2 files changed, 12 insertions, 5 deletions
diff --git a/dev-java/struts-legacy/ChangeLog b/dev-java/struts-legacy/ChangeLog
index f8895620395b..c09ea6450c1c 100644
--- a/dev-java/struts-legacy/ChangeLog
+++ b/dev-java/struts-legacy/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/struts-legacy
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/ChangeLog,v 1.8 2004/10/17 07:32:04 absinthe Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/ChangeLog,v 1.9 2005/03/16 15:30:13 luckyduck Exp $
+
+ 16 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+ struts-legacy-1.0-r1.ebuild:
+ added has_version jdbc2-stdext call to avoid error messages, depend on
+ jdbc2-stdext is conditional. fixes #85415
17 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
struts-legacy-1.0-r1.ebuild:
diff --git a/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild b/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild
index 3a537ebc0962..d7a4885163a6 100644
--- a/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild
+++ b/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# 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.7 2004/10/17 07:32:04 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild,v 1.8 2005/03/16 15:30:13 luckyduck Exp $
inherit java-pkg
@@ -25,7 +25,9 @@ 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
+ if has_version jdbc2-stdext; then
+ echo "jdbc20ext.jar=`java-config -p jdbc2-stdext`" >> build.properties
+ fi
echo "jdk.version=1.4" >> build.properties
local antflags="dist"