Fixed to compile with JAVA_PKG_STRICT.

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/dev-java/jline/ChangeLog b/dev-java/jline/ChangeLog
index 480d97eccb4466045a5843d196a3d54e44317a42..33e6ec5537c16402dc1b97a525dfb8675cd9b4e4 100644 (file)
--- a/dev-java/jline/ChangeLog
+++ b/dev-java/jline/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jline
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/ChangeLog,v 1.3 2007/01/05 04:22:49 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/ChangeLog,v 1.4 2007/01/10 18:27:58 betelgeuse Exp $
+
+  10 Jan 2007; Petteri Räty <betelgeuse@gentoo.org> jline-0.9.9-r1.ebuild:
+  Fixed to compile with JAVA_PKG_STRICT.
 
   05 Jan 2007; Joshua Nichols <nichoj@gentoo.org> jline-0.9.9-r1.ebuild:
   Added ~ppc.

diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest
index 148d6381a79e99c0873b1576f0843e3d4ea571da..f382d0dae7b49ea5cc53a34eb0f96ba2680e4843 100644 (file)
--- a/dev-java/jline/Manifest
+++ b/dev-java/jline/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build-0.9.9.xml 3483 RMD160 31693eabfa651af418938f22175aaf8be3608112 SHA1 d9a1a8ba7a9709c1e873d30cc1b2fd8bb8067a6f SHA256 36ee2d8d6770f8c6fe0a13a94b8cc86682139f902b911b308528ba04b9c08bb2
 MD5 fea58a669e91ad7cb8adc6e47484c153 files/build-0.9.9.xml 3483
 RMD160 31693eabfa651af418938f22175aaf8be3608112 files/build-0.9.9.xml 3483
 SHA256 36ee2d8d6770f8c6fe0a13a94b8cc86682139f902b911b308528ba04b9c08bb2 files/build-0.9.9.xml 3483
 DIST jline-0.9.9.zip 692022 RMD160 62e45ddadf1eb175cf0271df5f8f8d6075f62f07 SHA1 f87ec1bc97bfefcc25d7186f2e94510c57bd9e65 SHA256 f1ac3b06fbb9b81c03555874ab748c3e674644736f0003ac3ed81d6201332e9b
-EBUILD jline-0.9.9-r1.ebuild 1008 RMD160 6c99838b67ea96f66c1f11555c725ba11020f278 SHA1 5314d5e131c344d2b7adc4f0499995d58a6da875 SHA256 71c6940efe25ec0f31b04db66fbe290fa376088a2d8adc3f4fe21f31cbad29c1
-MD5 eeff35e448ce7c20f067072de8bdfd63 jline-0.9.9-r1.ebuild 1008
-RMD160 6c99838b67ea96f66c1f11555c725ba11020f278 jline-0.9.9-r1.ebuild 1008
-SHA256 71c6940efe25ec0f31b04db66fbe290fa376088a2d8adc3f4fe21f31cbad29c1 jline-0.9.9-r1.ebuild 1008
-MISC ChangeLog 665 RMD160 074fd1900eb9a244a37e6f8ebf9846b326d9f70c SHA1 432fcb717f8824ab84992ae9092500b092194398 SHA256 14e97e316b555c62758fcd0f27232ef8d1764bcadf6696c882077b710d4d1ca6
-MD5 d445779152a5d822c71a83c9e2d1cde2 ChangeLog 665
-RMD160 074fd1900eb9a244a37e6f8ebf9846b326d9f70c ChangeLog 665
-SHA256 14e97e316b555c62758fcd0f27232ef8d1764bcadf6696c882077b710d4d1ca6 ChangeLog 665
+EBUILD jline-0.9.9-r1.ebuild 1170 RMD160 dea78b67a2bd64898fce9ce57db046eda6ab428a SHA1 6d27ac968796c111b0cf3b448eba103adbf2efd4 SHA256 84426cc282e3fed12f95396dc208a5967c05cd538830264817e892129a916bbf
+MD5 5d819891db180aa79887dde517948c91 jline-0.9.9-r1.ebuild 1170
+RMD160 dea78b67a2bd64898fce9ce57db046eda6ab428a jline-0.9.9-r1.ebuild 1170
+SHA256 84426cc282e3fed12f95396dc208a5967c05cd538830264817e892129a916bbf jline-0.9.9-r1.ebuild 1170
+MISC ChangeLog 787 RMD160 c44513b9f00f7f3c8317fc96156aaceaff2aa900 SHA1 52bd0125851b99d67d70b3ac6df2321456288776 SHA256 301546ebfd83011348c7a70efd518962f8dc32e143bfb573f135787a5716d32d
+MD5 01e1b0ccbd104894894c70622928efd3 ChangeLog 787
+RMD160 c44513b9f00f7f3c8317fc96156aaceaff2aa900 ChangeLog 787
+SHA256 301546ebfd83011348c7a70efd518962f8dc32e143bfb573f135787a5716d32d ChangeLog 787
 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a
 MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252
 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252
@@ -18,3 +21,10 @@ SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a metadata
 MD5 1f96274dc29bbf19598105039e7106a1 files/digest-jline-0.9.9-r1 226
 RMD160 e0e738a6995c1c505e6bf84b08555c4948d8f65d files/digest-jline-0.9.9-r1 226
 SHA256 b598c193b8fc7f5aba1c3ba65d0427912ce24ece03d5cb1b7588517b00532cd9 files/digest-jline-0.9.9-r1 226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFpTA/cxLzpIGCsLQRAvvuAJ4yYGkNLuSiQL7+wjm8gqhioFj5jACeOCP+
+fB8/D4q8z0ycmSaJT/i51GY=
+=jhm4
+-----END PGP SIGNATURE-----

diff --git a/dev-java/jline/jline-0.9.9-r1.ebuild b/dev-java/jline/jline-0.9.9-r1.ebuild
index c9fdc050a6d508862017d69dd4e74615de48edd6..0f643aac5afe9c7d1693527a96e1e98aa98e22f2 100644 (file)
--- a/dev-java/jline/jline-0.9.9-r1.ebuild
+++ b/dev-java/jline/jline-0.9.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/jline-0.9.9-r1.ebuild,v 1.2 2007/01/05 04:22:49 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/jline-0.9.9-r1.ebuild,v 1.3 2007/01/10 18:27:58 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -13,9 +13,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="source"
 
+# TODO: use maven to create a build.xml that does not always
+# run tests
 DEPEND=">=virtual/jdk-1.4
        dev-java/ant-core
        app-arch/unzip
+       dev-java/junit
        source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4"
 
@@ -23,13 +26,17 @@ S="${WORKDIR}/${P}/src"
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
-       mkdir lib
+       rm -v "${P}"/*.jar
+       cd "${S}"
        # we don't support maven for building yet. this build.xml was generated by:
        # - mvn ant:ant
        # - tweak build.xml to use <fileset dir="lib" includes="**/*.jar" for
        # build.classpath
        cp ${FILESDIR}/build-${PV}.xml build.xml || die "failed to copy build.xml"
+
+       mkdir lib
+       cd lib
+       java-pkg_jar-from --build-only junit
 }
 
 src_install() {