From 3a48128ecad9bbbc38ddaff3c75f5317c74d9c9c Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Mon, 22 Jan 2007 02:00:01 +0000 Subject: [PATCH] Fix references to ~/.maven so it builds, and classpath definition for junit so it tests. Package-Manager: portage-2.1.2-r2 --- dev-java/jline/ChangeLog | 8 +++- dev-java/jline/Manifest | 42 ++++++++------------- dev-java/jline/files/maven-build.properties | 2 +- dev-java/jline/files/maven-build.xml | 4 +- dev-java/jline/jline-0.9.9-r1.ebuild | 4 +- 5 files changed, 29 insertions(+), 31 deletions(-) diff --git a/dev-java/jline/ChangeLog b/dev-java/jline/ChangeLog index 96003a444623..6fc3bb04fed9 100644 --- a/dev-java/jline/ChangeLog +++ b/dev-java/jline/ChangeLog @@ -1,6 +1,12 @@ # 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.6 2007/01/21 20:32:33 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/ChangeLog,v 1.7 2007/01/22 02:00:01 caster Exp $ + + 22 Jan 2007; Vlastimil Babka + files/maven-build.properties, files/maven-build.xml, + jline-0.9.9-r1.ebuild: + Fix references to ~/.maven so it builds, and classpath definition for junit + so it tests. 21 Jan 2007; Petteri Räty +files/maven-build.properties, +files/maven-build.xml, diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest index c7f96e7a4c4f..76b29ecadbbf 100644 --- a/dev-java/jline/Manifest +++ b/dev-java/jline/Manifest @@ -1,27 +1,24 @@ ------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 -AUX maven-build.properties 529 RMD160 848710f8ecbb55fe2b5b5a8b383ef6b720d095cb SHA1 fad287b1dc9ead53425755e4e1ada1454b6ef381 SHA256 724fa4a3c9268861f5556df8f03c38bf797b090db7fcaecdd04aab5ac3fa0d55 -MD5 a9eaa4290f58a9ea305de33ebfe3a45a files/maven-build.properties 529 -RMD160 848710f8ecbb55fe2b5b5a8b383ef6b720d095cb files/maven-build.properties 529 -SHA256 724fa4a3c9268861f5556df8f03c38bf797b090db7fcaecdd04aab5ac3fa0d55 files/maven-build.properties 529 -AUX maven-build.xml 8690 RMD160 f0df801eefb80fa60d5892155a24824c1b8a154d SHA1 a66e2d7cdd19fbfb88da3b4dcceb03951f37c2a0 SHA256 927859305f93e7a07cb2b2b6a5e54f11b9d2f0cf47bd424ad89b35fa65660bd7 -MD5 63c08a4586fde5a3295fb6e437e61977 files/maven-build.xml 8690 -RMD160 f0df801eefb80fa60d5892155a24824c1b8a154d files/maven-build.xml 8690 -SHA256 927859305f93e7a07cb2b2b6a5e54f11b9d2f0cf47bd424ad89b35fa65660bd7 files/maven-build.xml 8690 +AUX maven-build.properties 501 RMD160 2f63480b80c49e7b041505fe61632c4bc1db65b1 SHA1 e9d9e32e457394c377cf3883ee935d92711af914 SHA256 ed14880aca9146984f0b988b66e83c1d77e3367003371570855a9ac5d688dac3 +MD5 4011b934c530b4634e2767807e6cad3d files/maven-build.properties 501 +RMD160 2f63480b80c49e7b041505fe61632c4bc1db65b1 files/maven-build.properties 501 +SHA256 ed14880aca9146984f0b988b66e83c1d77e3367003371570855a9ac5d688dac3 files/maven-build.properties 501 +AUX maven-build.xml 8634 RMD160 7d90792ecf24a512676b543faf25b3def29825ed SHA1 31c7400bbf238eb884f277bc85ed036354577d20 SHA256 92c9be86eb0fcff6c3e44cb352f81e615627a96a7f25250ee53c5b9b34f84c0d +MD5 f1ed410610d74880f44cb3f64a5d8800 files/maven-build.xml 8634 +RMD160 7d90792ecf24a512676b543faf25b3def29825ed files/maven-build.xml 8634 +SHA256 92c9be86eb0fcff6c3e44cb352f81e615627a96a7f25250ee53c5b9b34f84c0d files/maven-build.xml 8634 DIST jline-0.9.9.zip 692022 RMD160 62e45ddadf1eb175cf0271df5f8f8d6075f62f07 SHA1 f87ec1bc97bfefcc25d7186f2e94510c57bd9e65 SHA256 f1ac3b06fbb9b81c03555874ab748c3e674644736f0003ac3ed81d6201332e9b -EBUILD jline-0.9.9-r1.ebuild 1319 RMD160 5c29d8035228d91deface7b5c42e9b19ada8e21b SHA1 81e56ecf7eab90332aca736816593590aed2925a SHA256 a2c5c0682b3b9053a95644c77000e421e5b695f597a92a0c19e17fc4fbbaa0bc -MD5 e651190099c827c4c8e9cede6060c254 jline-0.9.9-r1.ebuild 1319 -RMD160 5c29d8035228d91deface7b5c42e9b19ada8e21b jline-0.9.9-r1.ebuild 1319 -SHA256 a2c5c0682b3b9053a95644c77000e421e5b695f597a92a0c19e17fc4fbbaa0bc jline-0.9.9-r1.ebuild 1319 -MISC ChangeLog 1155 RMD160 1b8bc5ee8ad16dd4e4592ad56369899ce2e4e1d3 SHA1 805953bb999865e8ba4e1d7685e28966c9fea844 SHA256 945de61150d5635ceb694b088b8ec81f206c7f0cd501a11e8c34654035a3bc4f -MD5 c33316ab51d058eba906964383c921c0 ChangeLog 1155 -RMD160 1b8bc5ee8ad16dd4e4592ad56369899ce2e4e1d3 ChangeLog 1155 -SHA256 945de61150d5635ceb694b088b8ec81f206c7f0cd501a11e8c34654035a3bc4f ChangeLog 1155 +EBUILD jline-0.9.9-r1.ebuild 1427 RMD160 72e534cdbb192d2de3442ec0fb0265ceb41ed657 SHA1 03e23e7668ee457a83cce99c9a516d60fd0b8766 SHA256 5a70b8262a91c866cd0580fcad89c9745c98dc9d17c791ae05ce5f029a87abe9 +MD5 4e26d81a87ee419a887de44bbe1af087 jline-0.9.9-r1.ebuild 1427 +RMD160 72e534cdbb192d2de3442ec0fb0265ceb41ed657 jline-0.9.9-r1.ebuild 1427 +SHA256 5a70b8262a91c866cd0580fcad89c9745c98dc9d17c791ae05ce5f029a87abe9 jline-0.9.9-r1.ebuild 1427 +MISC ChangeLog 1376 RMD160 bfb01322c84870e7ae85350e385812a5ed393203 SHA1 4915326046a1251a527c588a241eee8bd1d801b3 SHA256 c4fed9ab0fe38809907f0b1e4eb70958f5b97f6d9420f08dec3ca372fe9ad142 +MD5 9e176ceccb3a0a056f9b8fb4a6256566 ChangeLog 1376 +RMD160 bfb01322c84870e7ae85350e385812a5ed393203 ChangeLog 1376 +SHA256 c4fed9ab0fe38809907f0b1e4eb70958f5b97f6d9420f08dec3ca372fe9ad142 ChangeLog 1376 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252 @@ -29,10 +26,3 @@ 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 v2.0.1 (GNU/Linux) - -iD8DBQFFs83ocxLzpIGCsLQRAv7lAJ9KXRehg9sQeuODt6t8vCA93lf/gQCgk3+l -ueKbHVqco3b7wUmpcc1ODlA= -=nEYo ------END PGP SIGNATURE----- diff --git a/dev-java/jline/files/maven-build.properties b/dev-java/jline/files/maven-build.properties index bebd460b3286..66ef7cf2840e 100644 --- a/dev-java/jline/files/maven-build.properties +++ b/dev-java/jline/files/maven-build.properties @@ -5,7 +5,7 @@ maven.build.outputDir=${maven.build.dir}/classes maven.build.resourceDir.0=src/main/resources maven.build.testResourceDir.0=src/test/resources maven.build.testOutputDir=${maven.build.dir}/test-classes -maven.repo.local=/home/betelgeuse/.m2/repository +maven.repo.local=lib maven.settings.offline=false maven.build.dir=target maven.settings.interactiveMode=true diff --git a/dev-java/jline/files/maven-build.xml b/dev-java/jline/files/maven-build.xml index ef1947b88a9f..7be70998ddcc 100644 --- a/dev-java/jline/files/maven-build.xml +++ b/dev-java/jline/files/maven-build.xml @@ -42,12 +42,12 @@ - + - + diff --git a/dev-java/jline/jline-0.9.9-r1.ebuild b/dev-java/jline/jline-0.9.9-r1.ebuild index 199aeb867e58..247d1e8ed6ad 100644 --- 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.5 2007/01/21 20:32:33 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/jline-0.9.9-r1.ebuild,v 1.6 2007/01/22 02:00:01 caster Exp $ inherit java-pkg-2 java-ant-2 @@ -30,6 +30,8 @@ src_unpack() { # - mvn ant:ant # - tweak build.xml to not load properties from home dir # - tweak the test target to match the test cases + # - change maven.repo.local from ~/.maven to "lib" in .properties + # - change classpath definitions to "*.jar" cp ${FILESDIR}/maven-build.xml build.xml || die "failed to copy build.xml" cp ${FILESDIR}/maven-build.properties . || die java-ant_ignore-system-classes -- 2.26.2