Introduced support for the source useflag. Cosmetic changes.

Package-Manager: portage-2.0.51.22-r1

3 files changed, 38 insertions, 28 deletions

diff --git a/dev-java/commons-cli/ChangeLog b/dev-java/commons-cli/ChangeLog
index debe8cfc4080..0c525960e086 100644
--- a/dev-java/commons-cli/ChangeLog
+++ b/dev-java/commons-cli/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-cli
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.18 2005/02/06 17:18:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.19 2005/06/05 12:56:15 luckyduck Exp $
+
+  05 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  commons-cli-1.0-r4.ebuild:
+  Introduced support for the source useflag. Cosmetic changes.
 
   06 Feb 2005; Markus Rothe <corsair@gentoo.org> commons-cli-1.0-r4.ebuild:
   Stable on ppc64
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index ab4c9480da97..2687383ea923 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,5 +1,15 @@
-MD5 bdd2013737bfb6ac4788121e34dca117 ChangeLog 2860
-MD5 e69ab69b7452241803f608d5255020ec commons-cli-1.0-r4.ebuild 1590
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0e401c2b5fed0cd611c36a077d9b93e6 commons-cli-1.0-r4.ebuild 1564
+MD5 c4743c1ae713eab63c2fa9d7b1e5a0ec ChangeLog 3007
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 b534e655c6a40ff5b01098dddcda205c files/commons-cli-1.0-gentoo.diff 4407
 MD5 8e1e3125e998bf49313b7e5ac3a5b1a0 files/digest-commons-cli-1.0-r4 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCovaK06ebR+OMO78RAiFvAJ9Fij8TeDyF2WvXONqr+2pqw1ebvwCZAVaK
+3BGYySJmZwrpPJY5HnNlzE8=
+=cxpm
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-cli/commons-cli-1.0-r4.ebuild b/dev-java/commons-cli/commons-cli-1.0-r4.ebuild
index 9f24782214aa..5161be543498 100644
--- a/dev-java/commons-cli/commons-cli-1.0-r4.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.0-r4.ebuild
@@ -1,57 +1,53 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.0-r4.ebuild,v 1.8 2005/02/06 17:18:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.0-r4.ebuild,v 1.9 2005/06/05 12:56:15 luckyduck Exp $
 
 inherit java-pkg eutils
 
 DESCRIPTION="The CLI library provides a simple and easy to use API for working with the command line arguments and options."
 HOMEPAGE="http://jakarta.apache.org/commons/cli/"
 SRC_URI="mirror://apache/jakarta/commons/cli/source/cli-${PV}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="1"
+KEYWORDS="x86 sparc ppc amd64 ppc64"
+IUSE="doc jikes junit source"
+
 DEPEND=">=virtual/jdk-1.3
 	junit? ( >=dev-java/junit-3.7 )
 	jikes? ( >=dev-java/jikes-1.21 )
+	source? ( app-arch/zip )
 	>=dev-java/ant-1.6.2"
 RDEPEND=">=virtual/jre-1.3
 	>=dev-java/commons-logging-1.0
 	>=dev-java/commons-lang-1.0"
-LICENSE="Apache-1.1"
-SLOT="1"
-KEYWORDS="x86 sparc ppc amd64 ppc64"
-IUSE="doc jikes junit"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${PN}-${PV}-gentoo.diff || die "patch failed"
-	echo "commons-logging.jar=`java-config -p commons-logging`" >> build.properties
-	echo "commons-lang.jar=`java-config -p commons-lang`" >> build.properties
-	if use junit; then
-		echo "junit.jar=`java-config -p junit`" >> build.properties
-	fi
+	epatch ${FILESDIR}/${PN}-${PV}-gentoo.diff
+	echo "commons-logging.jar=$(java-config -p commons-logging)" \
+		>> build.properties
+	echo "commons-lang.jar=$(java-config -p commons-lang)" \
+		>> build.properties
+	use junit && echo "junit.jar=$(java-config -p junit)" \
+		>> build.properties
 }
 
 src_compile() {
 	local antflags="jar"
-	if use doc; then
-		antflags="${antflags} javadoc"
-	fi
-	if use junit; then
-		antflags="${antflags} test"
-	fi
-	if use jikes; then
-		antflags="${antflags} -Dbuild.compiler=jikes"
-	fi
+	use doc && antflags="${antflags} javadoc"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use junit && antflags="${antflags} test"
 	ant ${antflags} || die "compilation failed"
 }
 
 src_install() {
-	mv ${S}/target/${P}.jar ${S}/target/${PN}.jar
-	java-pkg_dojar target/${PN}.jar
+	java-pkg_newjar target/${P}.jar ${PN}.jar
 
 	dodoc README.txt
-	if use doc; then
-		java-pkg_dohtml -r target/docs/
-	fi
+	use doc && java-pkg_dohtml -r target/docs/
+	use source && java-pkg_dosrc src/java/*
 }