From 0e029fd37eed8bf82bc251c09d5b5f2279f18b6e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Sat, 28 Apr 2007 20:03:50 +0000 Subject: [PATCH] Fix to work with JAVA_PKG_STRICT. Package-Manager: portage-2.1.2.5 --- dev-java/jdynamite/ChangeLog | 8 +++++-- dev-java/jdynamite/Manifest | 32 ++++++++++++------------- dev-java/jdynamite/files/1.2-build.xml | 2 +- dev-java/jdynamite/jdynamite-1.2.ebuild | 12 ++++------ 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/dev-java/jdynamite/ChangeLog b/dev-java/jdynamite/ChangeLog index b714607e0efa..8c41a709417b 100644 --- a/dev-java/jdynamite/ChangeLog +++ b/dev-java/jdynamite/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jdynamite -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdynamite/ChangeLog,v 1.3 2006/09/11 17:47:13 nelchael Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdynamite/ChangeLog,v 1.4 2007/04/28 20:03:50 betelgeuse Exp $ + + 28 Apr 2007; Petteri Räty files/1.2-build.xml, + jdynamite-1.2.ebuild: + Fix to work with JAVA_PKG_STRICT. 11 Sep 2006; Krzysiek Pawlik jdynamite-1.2.ebuild: Added ~ppc. diff --git a/dev-java/jdynamite/Manifest b/dev-java/jdynamite/Manifest index 76db9ceac054..b7f48808b587 100644 --- a/dev-java/jdynamite/Manifest +++ b/dev-java/jdynamite/Manifest @@ -1,19 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 1.2-build.xml 278 RMD160 2d02ce4bf4022de0f2f3c902d0320cc70930c8af SHA1 41aecdacbbb9f7c29af3ce64a99708a9862a3626 SHA256 456df6c6dc4f34e2f504a99853aa2bb728f1a8ce115660d1d9198aa49017affb -MD5 eb9aa7822f34dd9c3205920f9144a0a0 files/1.2-build.xml 278 -RMD160 2d02ce4bf4022de0f2f3c902d0320cc70930c8af files/1.2-build.xml 278 -SHA256 456df6c6dc4f34e2f504a99853aa2bb728f1a8ce115660d1d9198aa49017affb files/1.2-build.xml 278 +AUX 1.2-build.xml 310 RMD160 f43de99a3f02ae6ba73b5f3acd2beac0febaf3e5 SHA1 279fd460632b3bc36e06fd43653bb0c7aef6414b SHA256 ef47fdd12fa3daa2caac4bab0c2e9c188b9f462e757b4997a02ea4875cb15c62 +MD5 831b65653cd3e46daffbab49f58f0635 files/1.2-build.xml 310 +RMD160 f43de99a3f02ae6ba73b5f3acd2beac0febaf3e5 files/1.2-build.xml 310 +SHA256 ef47fdd12fa3daa2caac4bab0c2e9c188b9f462e757b4997a02ea4875cb15c62 files/1.2-build.xml 310 DIST jdynamite1_2.tar.gz 216501 RMD160 8fa8a2f0215976402f4352c27ab7db95e9b4ef65 SHA1 4da541cf6c20508ed10ceedaaede6093e627544c SHA256 cc7fade32f35f84bc0cf64a37b205c45f719b7234299f523e9da58546d9e57de -EBUILD jdynamite-1.2.ebuild 1024 RMD160 f681b5bdeb828c4cb23e1340fb9638c0a57c2f95 SHA1 bd79ddb1c6656951abc7b7ec28f990c0f42f6325 SHA256 a518f8f694362ee15cc6c53ea2222de77c3ca7c113cc39c0fa85993b779764a5 -MD5 71c89a9de0956101f7fb11a068646479 jdynamite-1.2.ebuild 1024 -RMD160 f681b5bdeb828c4cb23e1340fb9638c0a57c2f95 jdynamite-1.2.ebuild 1024 -SHA256 a518f8f694362ee15cc6c53ea2222de77c3ca7c113cc39c0fa85993b779764a5 jdynamite-1.2.ebuild 1024 -MISC ChangeLog 566 RMD160 0a6a2710c8b8d0216cd0e3d3a2ebc1b4eae7eb24 SHA1 5ff28b9caf58a69e1859174668648b55e2359f37 SHA256 b973aaeca3d56937c1dc9023971b56671f3854500d95f69de3506e8d409935a8 -MD5 d639b67d59d750d40352d99571a8c196 ChangeLog 566 -RMD160 0a6a2710c8b8d0216cd0e3d3a2ebc1b4eae7eb24 ChangeLog 566 -SHA256 b973aaeca3d56937c1dc9023971b56671f3854500d95f69de3506e8d409935a8 ChangeLog 566 +EBUILD jdynamite-1.2.ebuild 1020 RMD160 985b99ebb57ded782352d1ea7061993733d226e1 SHA1 d19cfd8850b254bfa2e5879c6d225a53af03e03a SHA256 3869ff1909b9eea8ac096d4bbed8b1bfef9488ca17d5df67667678a45f684fdb +MD5 0334d768aa3ff595615e7adaeeada6bb jdynamite-1.2.ebuild 1020 +RMD160 985b99ebb57ded782352d1ea7061993733d226e1 jdynamite-1.2.ebuild 1020 +SHA256 3869ff1909b9eea8ac096d4bbed8b1bfef9488ca17d5df67667678a45f684fdb jdynamite-1.2.ebuild 1020 +MISC ChangeLog 703 RMD160 592d452509b28cf71570821fb1d58429ff66b1ed SHA1 bfc5289bcff3099abafab788b854607b79d91638 SHA256 9885e9240e28164b1d88d8bdcf7854ef650f6e92fb6a95e4bcc6471e5ed85f15 +MD5 157e604fd0f28aadf5b6bf100e22335a ChangeLog 703 +RMD160 592d452509b28cf71570821fb1d58429ff66b1ed ChangeLog 703 +SHA256 9885e9240e28164b1d88d8bdcf7854ef650f6e92fb6a95e4bcc6471e5ed85f15 ChangeLog 703 MISC metadata.xml 224 RMD160 ff26da53f08837159410ff3eee9c11933ef21a68 SHA1 37c1f64045f8874b69bb7dffd084e7f699c37678 SHA256 8727090a0c21416083f038251a19559b983ff39bbefc2aa9b5c6c5bdc25b299d MD5 83f6bf68e595b0ec2e45d8e4b78c1f5a metadata.xml 224 RMD160 ff26da53f08837159410ff3eee9c11933ef21a68 metadata.xml 224 @@ -22,9 +22,9 @@ MD5 4f4ee8c6515fc4119db58786da9795c1 files/digest-jdynamite-1.2 238 RMD160 237fb7c8ad9608bbe45d5544bb4c7751613569d8 files/digest-jdynamite-1.2 238 SHA256 5a97cfcf2e5e9c3d4097024e227557b2cc183de876851092571ed1a165142b5d files/digest-jdynamite-1.2 238 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFBaErgo/w9rxVVVERApYGAJ9uztYULYyNNfbOxeln19+Iwwb5zACfcDMD -dxznswGD+kmSO+ImBrJoBg0= -=6fj5 +iD8DBQFGM6ivcxLzpIGCsLQRApIvAJ40lS4W94ec+V4gKy3kCw/MmGcROACeMXzK +nngHFSlFtVgsrcO1rO3BF1Q= +=ZVgx -----END PGP SIGNATURE----- diff --git a/dev-java/jdynamite/files/1.2-build.xml b/dev-java/jdynamite/files/1.2-build.xml index eca166f809fd..86bd14df4658 100644 --- a/dev-java/jdynamite/files/1.2-build.xml +++ b/dev-java/jdynamite/files/1.2-build.xml @@ -2,7 +2,7 @@ - + diff --git a/dev-java/jdynamite/jdynamite-1.2.ebuild b/dev-java/jdynamite/jdynamite-1.2.ebuild index 3d62740642a2..e192334c830b 100644 --- a/dev-java/jdynamite/jdynamite-1.2.ebuild +++ b/dev-java/jdynamite/jdynamite-1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdynamite/jdynamite-1.2.ebuild,v 1.3 2006/09/11 17:47:13 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdynamite/jdynamite-1.2.ebuild,v 1.4 2007/04/28 20:03:50 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 @@ -31,14 +31,12 @@ src_unpack() { cp "${FILESDIR}/${PV}-build.xml" "${S}/build.xml" + mkdir "${S}/build" || die "mkdir failed" } src_compile() { - - mkdir "${S}/build" || die "mkdir failed" - - eant -lib $(java-pkg_getjars gnu-regexp-1) jar || die "ant failed" - + EANT_GENTOO_CLASSPATH="gnu-regexp-1" \ + java-pkg-2_src_compile } src_install() { -- 2.26.2