Fix package.env DEPEND atom, javadoc installation, too long DESCRIPTION and cleanup the ebuild.

(Portage version: 2.1.2-r12)

4 files changed, 85 insertions, 3 deletions

diff --git a/dev-java/ant-ivy/ChangeLog b/dev-java/ant-ivy/ChangeLog
index 4010520535b1..a6bb2354b60f 100644
--- a/dev-java/ant-ivy/ChangeLog
+++ b/dev-java/ant-ivy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/ant-ivy
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-ivy/ChangeLog,v 1.2 2006/09/11 17:50:44 nelchael Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-ivy/ChangeLog,v 1.3 2007/03/01 13:33:42 betelgeuse Exp $
+
+*ant-ivy-1.3.1-r1 (01 Mar 2007)
+
+  01 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> metadata.xml,
+  +ant-ivy-1.3.1-r1.ebuild:
+  Fix package.env DEPEND atom, javadoc installation, too long DESCRIPTION and
+  cleanup the ebuild.
 
   11 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org> ant-ivy-1.3.1.ebuild:
   Added ~ppc.
diff --git a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..f05278d7699f
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild,v 1.1 2007/03/01 13:33:42 betelgeuse Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN=${PN##*-}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Ivy is a free java based dependency manager"
+HOMEPAGE="http://jayasoft.org/ivy"
+SRC_URI="http://jayasoft.org/downloads/ivy/1.3.1/${MY_P}-src.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="doc source"
+
+COMMON_DEP="
+	dev-java/ant-core
+	=dev-java/commons-cli-1*
+	=dev-java/commons-httpclient-3*
+	dev-java/commons-logging
+	=dev-java/jakarta-oro-2.0*"
+DEPEND="
+	>=virtual/jdk-1.4
+	app-arch/unzip
+	source? ( app-arch/zip )
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_P}
+
+# Rewrites examples... bad
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${MY_P}-noresolve.patch"
+	epatch "${FILESDIR}/${MY_P}-tasks.patch"
+
+	mkdir ${S}/lib
+	cd ${S}/lib
+	java-pkg_jar-from commons-cli-1,commons-httpclient-3,commons-logging,ant-core,jakarta-oro-2.0
+
+	cd ${S}
+	java-ant_bsfix_one build.xml
+}
+
+src_install() {
+	java-pkg_dojar build/artifact/${MY_PN}.jar
+	dodir /usr/share/ant-core/lib
+	dosym /usr/share/${PN}/lib/${MY_PN}.jar /usr/share/ant-core/lib/${PN}.jar
+	use doc && java-pkg_dojavadoc doc/build/api
+	use source && java-pkg_dosrc src/java/*
+}
+
+src_test() {
+	eant test || die "Junit tests failed"
+}
diff --git a/dev-java/ant-ivy/files/digest-ant-ivy-1.3.1-r1 b/dev-java/ant-ivy/files/digest-ant-ivy-1.3.1-r1
new file mode 100644
index 000000000000..cc8f6285af91
--- /dev/null
+++ b/dev-java/ant-ivy/files/digest-ant-ivy-1.3.1-r1
@@ -0,0 +1,3 @@
+MD5 370904397b30b0b46e2693effbde4c8e ivy-1.3.1-src.zip 1302693
+RMD160 9a344ee8ba78d34ec9ee2fc35e1a56b4096560ad ivy-1.3.1-src.zip 1302693
+SHA256 2a4653de892b739f8dfbf21403bfbf49c7febe9fb5a3d855cd9ad4bb29964fa0 ivy-1.3.1-src.zip 1302693
diff --git a/dev-java/ant-ivy/metadata.xml b/dev-java/ant-ivy/metadata.xml
index 250f2d1940ea..e97bb1c449fb 100644
--- a/dev-java/ant-ivy/metadata.xml
+++ b/dev-java/ant-ivy/metadata.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+	<herd>java</herd>
+	<longdescription>
+		Ivy is a powerful dependencies manager with transitive dependencies
+		support and much more features.
+
+		With Ivy you define the dependencies of your module in an xml file,
+		called an ivy file. Then you usually ask ivy to retrieve your dependencies
+		to a local lib dir, and it does it for you by locating the artifacts of
+		your dependencies in repositories, such as ibiblio.
+	</longdescription>
 </pkgmetadata>