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

Package-Manager: portage-2.1.2-r12

diff --git a/dev-java/ant-ivy/ChangeLog b/dev-java/ant-ivy/ChangeLog
index 4010520535b1a3dad61533d125888ee8d7250fdf..a6bb2354b60fcace6186ded812d9dc26924bbda3 100644 (file)
--- 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/Manifest b/dev-java/ant-ivy/Manifest
index 300b81ea0ce47c4a5c2c69e70d1996bf3ae2abff..151a0d58afc5fff4d0a5d60696e46f576a3bd6eb 100644 (file)
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -10,25 +10,32 @@ MD5 8cb3344fbf84ee808793a7d180858d19 files/ivy-1.3.1-tasks.patch 593
 RMD160 d01857a47ba65ea09709c5e7cfe4dd7478144ed5 files/ivy-1.3.1-tasks.patch 593
 SHA256 835bd1b695bb5e19d9481251aaafd529b54032b98e1bdf847a84884902c4a4cb files/ivy-1.3.1-tasks.patch 593
 DIST ivy-1.3.1-src.zip 1302693 RMD160 9a344ee8ba78d34ec9ee2fc35e1a56b4096560ad SHA1 c60df175739052d6acb47a21bbd6214f1895aa7c SHA256 2a4653de892b739f8dfbf21403bfbf49c7febe9fb5a3d855cd9ad4bb29964fa0
+EBUILD ant-ivy-1.3.1-r1.ebuild 1477 RMD160 26463b6a0ed357f14e2d9ded77dfcc146a706e4a SHA1 d195861f0f33bb87b0a4f192131897fe1df2e2dd SHA256 95ffd31050e752ac9593bd1c501c67e741a545fcad5f3fef3b8ce5c02db12d80
+MD5 4fb7dacb191c66d1dd6f11929075d976 ant-ivy-1.3.1-r1.ebuild 1477
+RMD160 26463b6a0ed357f14e2d9ded77dfcc146a706e4a ant-ivy-1.3.1-r1.ebuild 1477
+SHA256 95ffd31050e752ac9593bd1c501c67e741a545fcad5f3fef3b8ce5c02db12d80 ant-ivy-1.3.1-r1.ebuild 1477
 EBUILD ant-ivy-1.3.1.ebuild 1718 RMD160 a28ecb2c21851b928051c4fa9889cd75de0a5fc0 SHA1 ed4677cf000535dc6253eb26de8439385071608f SHA256 f21246716300480dcea7e239be9214cbdd540ac570ee58b647debde51fc3937f
 MD5 e48104084c0ad45adcc18c91cb309f79 ant-ivy-1.3.1.ebuild 1718
 RMD160 a28ecb2c21851b928051c4fa9889cd75de0a5fc0 ant-ivy-1.3.1.ebuild 1718
 SHA256 f21246716300480dcea7e239be9214cbdd540ac570ee58b647debde51fc3937f ant-ivy-1.3.1.ebuild 1718
-MISC ChangeLog 506 RMD160 2b30ae4c4c8feda39e959fa5a8b35b156be12893 SHA1 c0dc9f65d7172fcb76481c9cc8c942a4b6fa60b1 SHA256 f958adb49cee57741ff04ebeaa728029c2ce004801fe396c1d6529bb9d261eb1
-MD5 73e543327a27aa9e400ff711d2b93a28 ChangeLog 506
-RMD160 2b30ae4c4c8feda39e959fa5a8b35b156be12893 ChangeLog 506
-SHA256 f958adb49cee57741ff04ebeaa728029c2ce004801fe396c1d6529bb9d261eb1 ChangeLog 506
-MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
-MD5 9f455923f62e1ecb14ebb7f29636850a metadata.xml 159
-RMD160 7da5c733c224383ffe350605bc36721a3ff2536f metadata.xml 159
-SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb metadata.xml 159
+MISC ChangeLog 737 RMD160 5d535e71be7b5ea28216fb007ff5811678887a33 SHA1 68946bf1719d7b1dbb925f989b076137088edd3c SHA256 af55e07af5bfa2dabba712c3443698a6aefdfb604fda58f979aea0f04fb46596
+MD5 14a6013a55e01f643e2178139cd92bc6 ChangeLog 737
+RMD160 5d535e71be7b5ea28216fb007ff5811678887a33 ChangeLog 737
+SHA256 af55e07af5bfa2dabba712c3443698a6aefdfb604fda58f979aea0f04fb46596 ChangeLog 737
+MISC metadata.xml 577 RMD160 7b73bf734668528919731e5630aec46aaf2566ee SHA1 9ddd4852f963bf48aa4a9b8511aa2081ae1d1614 SHA256 7009fb41885befd40b3e2d36f9ebba67212d18db2397173e156fa46f5b3064ac
+MD5 810028b247e2cc18ba95deb1e7b284c9 metadata.xml 577
+RMD160 7b73bf734668528919731e5630aec46aaf2566ee metadata.xml 577
+SHA256 7009fb41885befd40b3e2d36f9ebba67212d18db2397173e156fa46f5b3064ac metadata.xml 577
 MD5 389bab738719cc8b19f6c360a336e4b1 files/digest-ant-ivy-1.3.1 235
 RMD160 d6597cdf06ad7f7a543185ad3ba53c047e7b5a19 files/digest-ant-ivy-1.3.1 235
 SHA256 be061a03cd3f60a9617f865ac377cfe68ae57a58228561d040dc33c7d61cd6dc files/digest-ant-ivy-1.3.1 235
+MD5 389bab738719cc8b19f6c360a336e4b1 files/digest-ant-ivy-1.3.1-r1 235
+RMD160 d6597cdf06ad7f7a543185ad3ba53c047e7b5a19 files/digest-ant-ivy-1.3.1-r1 235
+SHA256 be061a03cd3f60a9617f865ac377cfe68ae57a58228561d040dc33c7d61cd6dc files/digest-ant-ivy-1.3.1-r1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFBaIAgo/w9rxVVVERAoCNAJ9hkSdpMxnmTCDOwMGZUTQmulBBmQCfVUfR
-GtpZM0Aigg/+AKEdxy55UHk=
-=OJ0Y
+iD8DBQFF5tXGcxLzpIGCsLQRApdPAJ0R+AUhWiMPz2UY3uy1MV+cQQmMjACaAu4o
+SwtKtvrnN7Z9Z/DZPuTnwhs=
+=BA4U
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..f05278d
--- /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 (file)
index 0000000..cc8f628
--- /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 250f2d1940ead3717a16811ef97adb5b0729f6c0..e97bb1c449fb98388ab16536af3e78978e8a0eae 100644 (file)
--- 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>