use -D instead of build.properties

5 files changed, 15 insertions, 14 deletions

diff --git a/dev-java/commons-net/ChangeLog b/dev-java/commons-net/ChangeLog
index 2397a16bab99..cd5977a34027 100644
--- a/dev-java/commons-net/ChangeLog
+++ b/dev-java/commons-net/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-net
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.11 2004/07/16 20:01:29 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.12 2004/07/23 21:00:28 axxo Exp $
+
+  23 Jul 2004; Thomas Matthijs <axxo@gentoo.org> commons-net-1.1.0.ebuild,
+  commons-net-1.2.0.ebuild, commons-net-1.2.2.ebuild:
+  use -D instead of build.properties
 
 *commons-net-1.2.2 (16 Jul 2004)
 
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index 42cc30eb48de..773c4a7bc2f5 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,8 +1,8 @@
-MD5 71da135db73d34f97af7b1c4625392cd commons-net-1.2.0.ebuild 1155
-MD5 1d3bf7b2475718fe650f984a3d307b6e commons-net-1.2.2.ebuild 1238
-MD5 9bac1bc37e99d892dc881faf52651485 ChangeLog 1338
+MD5 9be562e4cfbec1c43377a942f2f90523 commons-net-1.2.0.ebuild 1126
+MD5 8f3d7f0ef554f2215266485979688283 commons-net-1.2.2.ebuild 1213
+MD5 2764f76f66116bac7cb557fceb6e0979 ChangeLog 1505
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 e3535c622108aa7663ba7290f00599ac commons-net-1.1.0.ebuild 1043
+MD5 6f9ab465c92e902041031835de070039 commons-net-1.1.0.ebuild 983
 MD5 e2628a3419f04cdb65cb4a3caad1c9df files/gentoo.diff 4678
 MD5 cd5dd0f16006dfa0491e9fb71981d402 files/gentoo-1.2.diff 3152
 MD5 bf7e171a6deff0530e8f453dbc3d00bf files/digest-commons-net-1.1.0 73
diff --git a/dev-java/commons-net/commons-net-1.1.0.ebuild b/dev-java/commons-net/commons-net-1.1.0.ebuild
index 133717c130e3..2904eeedee4d 100644
--- a/dev-java/commons-net/commons-net-1.1.0.ebuild
+++ b/dev-java/commons-net/commons-net-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.1.0.ebuild,v 1.7 2004/07/14 01:48:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.1.0.ebuild,v 1.8 2004/07/23 21:00:28 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -20,11 +20,10 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/gentoo.diff
-	echo "oro.jar=`java-config -p oro`" >> build.properties
 }
 
 src_compile() {
-	local antflags="jar -propertyfile build.properties"
+	local antflags="-Doro.jar=$(java-config -p oro) jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "died on ant"
 }
diff --git a/dev-java/commons-net/commons-net-1.2.0.ebuild b/dev-java/commons-net/commons-net-1.2.0.ebuild
index 750b236d0246..b4b01c8ee70b 100644
--- a/dev-java/commons-net/commons-net-1.2.0.ebuild
+++ b/dev-java/commons-net/commons-net-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.2.0.ebuild,v 1.2 2004/06/24 22:23:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.2.0.ebuild,v 1.3 2004/07/23 21:00:28 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -20,11 +20,10 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/gentoo-1.2.diff
-	echo "oro.jar=`java-config -p oro`" >> build.properties
 }
 
 src_compile() {
-	local antflags="jar"
+	local antflags="-Doro.jar=$(java-config -p oro) jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} javadoc"
 	ant ${antflags} || die "died on ant"
diff --git a/dev-java/commons-net/commons-net-1.2.2.ebuild b/dev-java/commons-net/commons-net-1.2.2.ebuild
index 9381270e59e0..8e993acbc225 100644
--- a/dev-java/commons-net/commons-net-1.2.2.ebuild
+++ b/dev-java/commons-net/commons-net-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.2.2.ebuild,v 1.1 2004/07/16 20:01:29 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.2.2.ebuild,v 1.2 2004/07/23 21:00:28 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -20,13 +20,12 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/gentoo-1.2.diff
-	echo "oro.jar=`java-config -p oro`" >> build.properties
 	#for some reason 1.2.2 claims its 1.3
 	sed "s/commons-net-1.3.0-dev/commons-net-1.2.2-dev/" -i build.xml
 }
 
 src_compile() {
-	local antflags="jar"
+	local antflags="-Doro.jar=$(java-config -p oro) jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} javadoc"
 	ant ${antflags} || die "died on ant"