From 2d767cf02d16877021f092a760c97e6c5232e6c2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Miroslav=20=C5=A0ulc?= Date: Fri, 9 Feb 2007 21:27:01 +0000 Subject: [PATCH] Removed commons-io-1.2 because a test was failing (problem in ebuild and access rights), and replaced with commons-io-1.3 version bump. Package-Manager: portage-2.1.2-r9 --- dev-java/commons-io/ChangeLog | 11 +++++- dev-java/commons-io/Manifest | 36 +++++++++---------- ...ns-io-1.2.ebuild => commons-io-1.3.ebuild} | 28 ++++++++------- .../files/commons-io-1.0-gentoo.diff | 25 ------------- .../files/commons-io-1.2-gentoo.diff | 11 ------ .../files/commons-io-1.3-build.xml.patch | 20 +++++++++++ .../commons-io/files/digest-commons-io-1.2 | 3 -- .../commons-io/files/digest-commons-io-1.3 | 3 ++ 8 files changed, 64 insertions(+), 73 deletions(-) rename dev-java/commons-io/{commons-io-1.2.ebuild => commons-io-1.3.ebuild} (59%) delete mode 100644 dev-java/commons-io/files/commons-io-1.0-gentoo.diff delete mode 100644 dev-java/commons-io/files/commons-io-1.2-gentoo.diff create mode 100644 dev-java/commons-io/files/commons-io-1.3-build.xml.patch delete mode 100644 dev-java/commons-io/files/digest-commons-io-1.2 create mode 100644 dev-java/commons-io/files/digest-commons-io-1.3 diff --git a/dev-java/commons-io/ChangeLog b/dev-java/commons-io/ChangeLog index f16a2d2870ad..9fc1923efa09 100644 --- a/dev-java/commons-io/ChangeLog +++ b/dev-java/commons-io/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-java/commons-io # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.15 2007/01/22 12:39:23 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.16 2007/02/09 21:27:01 fordfrog Exp $ + +*commons-io-1.3 (09 Feb 2007) + + 09 Feb 2007; Miroslav Å ulc + -files/commons-io-1.0-gentoo.diff, -files/commons-io-1.2-gentoo.diff, + +files/commons-io-1.3-build.xml.patch, -commons-io-1.2.ebuild, + +commons-io-1.3.ebuild: + Removed commons-io-1.2 because a test was failing (problem in ebuild and + access rights), and replaced with commons-io-1.3 version bump. 22 Jan 2007; Vlastimil Babka commons-io-1.2.ebuild: Fix dojavadoc call, thanks to Martin von Gagern in diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest index d3a0090a709d..c91ecaa76610 100644 --- a/dev-java/commons-io/Manifest +++ b/dev-java/commons-io/Manifest @@ -1,29 +1,25 @@ -AUX commons-io-1.0-gentoo.diff 932 RMD160 c577d6564b7a028e36a71b24c6be59f60e0c67fc SHA1 413e9cc9a7191234a868e1736fc5b7bfdac132b8 SHA256 7fb257f9e926df403a9fdfc653eee41a9621c77986dc4901a5aedc1cfaae2652 -MD5 d1ce414440c549e8c25716008f452630 files/commons-io-1.0-gentoo.diff 932 -RMD160 c577d6564b7a028e36a71b24c6be59f60e0c67fc files/commons-io-1.0-gentoo.diff 932 -SHA256 7fb257f9e926df403a9fdfc653eee41a9621c77986dc4901a5aedc1cfaae2652 files/commons-io-1.0-gentoo.diff 932 AUX commons-io-1.1-gentoo.diff 508 RMD160 fd5ad828bde427ce8bfc62214b84d85132a9743d SHA1 74c2dcd676c8bdc99e71b40dbd607394869492b9 SHA256 925de8632fae344eb2564b0e0e26d41329bcd9e511813b561d1371366413f75b MD5 c85588e58e9dcc2fcde64e1d4615bb12 files/commons-io-1.1-gentoo.diff 508 RMD160 fd5ad828bde427ce8bfc62214b84d85132a9743d files/commons-io-1.1-gentoo.diff 508 SHA256 925de8632fae344eb2564b0e0e26d41329bcd9e511813b561d1371366413f75b files/commons-io-1.1-gentoo.diff 508 -AUX commons-io-1.2-gentoo.diff 508 RMD160 fd5ad828bde427ce8bfc62214b84d85132a9743d SHA1 74c2dcd676c8bdc99e71b40dbd607394869492b9 SHA256 925de8632fae344eb2564b0e0e26d41329bcd9e511813b561d1371366413f75b -MD5 c85588e58e9dcc2fcde64e1d4615bb12 files/commons-io-1.2-gentoo.diff 508 -RMD160 fd5ad828bde427ce8bfc62214b84d85132a9743d files/commons-io-1.2-gentoo.diff 508 -SHA256 925de8632fae344eb2564b0e0e26d41329bcd9e511813b561d1371366413f75b files/commons-io-1.2-gentoo.diff 508 +AUX commons-io-1.3-build.xml.patch 1026 RMD160 f8fdd740aea41e8e54dd09f0a2585da43e2dc9b2 SHA1 f5bdd83e997dfd49329895eb21d18efa73f431b4 SHA256 e4c6b2738d4b8e4a269153cc8d20ecbcc5c0fd03340dfc7d5538ab094c552fd1 +MD5 57e860da0874edeb8492e4df9dcf81b9 files/commons-io-1.3-build.xml.patch 1026 +RMD160 f8fdd740aea41e8e54dd09f0a2585da43e2dc9b2 files/commons-io-1.3-build.xml.patch 1026 +SHA256 e4c6b2738d4b8e4a269153cc8d20ecbcc5c0fd03340dfc7d5538ab094c552fd1 files/commons-io-1.3-build.xml.patch 1026 DIST commons-io-1.1-src.tar.gz 197922 RMD160 ad7be482ee4eebcdc193fe78497ed17394309ab1 SHA1 25a9302eaee611655ead3cd7e1a087e8ab745a99 SHA256 375983a026c86afee9b07405a616b3614de3f844b2530d54a5f12c06a666b92c -DIST commons-io-1.2-src.tar.gz 205563 RMD160 cd1914721f5c2d460f0fe4e7ba2e1e23099bff2a SHA1 3f8758a3918e748d9a40500d3712292fdbcdd2df SHA256 9c9983fed8b5c633b156e429eb7885e70d6268eb23b00c16366702158daf8a22 +DIST commons-io-1.3-src.tar.gz 691864 RMD160 37422ddcff592f45a6fc9e90312d349a6410993b SHA1 06f9922ab64968b5e9e40aba8e7976bc480f8ba8 SHA256 80b6b207f062a65d891f6db453f4b25ad7704a83e75cd8184d4a7d3166aa6035 EBUILD commons-io-1.1-r1.ebuild 1463 RMD160 27915fdce8cb9578e050bfdb5b905b21e862ae5b SHA1 d208026d68a329bdab4f6d754ae92e5d94f66b18 SHA256 3f59ee7665a3bbad9cdb3f3b5d0f26f5c4b93b3fd74be4786c0484bbb4b6afb7 MD5 cbc392b291fd139551a58db7017918be commons-io-1.1-r1.ebuild 1463 RMD160 27915fdce8cb9578e050bfdb5b905b21e862ae5b commons-io-1.1-r1.ebuild 1463 SHA256 3f59ee7665a3bbad9cdb3f3b5d0f26f5c4b93b3fd74be4786c0484bbb4b6afb7 commons-io-1.1-r1.ebuild 1463 -EBUILD commons-io-1.2.ebuild 1370 RMD160 e6d6cc9e58913e1a0981b698f49b77aefc95d8ad SHA1 a744870b9ce519631c506087f93d7991b614e6f5 SHA256 4d30cd78b7f814c2a2e214fb0c4082b0487fd342f415f750abded19e9eff4470 -MD5 5b6991965b04d581f437e204f9dfeccb commons-io-1.2.ebuild 1370 -RMD160 e6d6cc9e58913e1a0981b698f49b77aefc95d8ad commons-io-1.2.ebuild 1370 -SHA256 4d30cd78b7f814c2a2e214fb0c4082b0487fd342f415f750abded19e9eff4470 commons-io-1.2.ebuild 1370 -MISC ChangeLog 2333 RMD160 9bb8316d2d4a60ab1392fa2924c4abeb4d92f94d SHA1 fcb23dd34124911adee4de2dd7e660c53fe87e26 SHA256 0c281e9e2d743521bff19ffa8d0d6e45ee6954cdfcccc17fea38daa323b1888c -MD5 0a1a3c1d8d2b60de4867dfde5907604e ChangeLog 2333 -RMD160 9bb8316d2d4a60ab1392fa2924c4abeb4d92f94d ChangeLog 2333 -SHA256 0c281e9e2d743521bff19ffa8d0d6e45ee6954cdfcccc17fea38daa323b1888c ChangeLog 2333 +EBUILD commons-io-1.3.ebuild 1296 RMD160 c5edeb2933d753d152688e633b1190ae2702f8a8 SHA1 6a5204fbf907f08b66a2eee85ad861fed2208eb9 SHA256 a4f86cf3dfcad5caff852ecbff3b82853d1afa8215ca523d957746710fb3b3e1 +MD5 c9a40c25838eb43ecdb0896f49ab968c commons-io-1.3.ebuild 1296 +RMD160 c5edeb2933d753d152688e633b1190ae2702f8a8 commons-io-1.3.ebuild 1296 +SHA256 a4f86cf3dfcad5caff852ecbff3b82853d1afa8215ca523d957746710fb3b3e1 commons-io-1.3.ebuild 1296 +MISC ChangeLog 2722 RMD160 4c83e0b12a40453707b2fc4ba6166f8c5dd92353 SHA1 3e4b834e53227137c73f31be9cef5687470f4f36 SHA256 dfa263058fee20aeae806281242e556bfb206eb8dd88212d0a67361a395d056e +MD5 dcc6adbc531837f64b097a646311195a ChangeLog 2722 +RMD160 4c83e0b12a40453707b2fc4ba6166f8c5dd92353 ChangeLog 2722 +SHA256 dfa263058fee20aeae806281242e556bfb206eb8dd88212d0a67361a395d056e ChangeLog 2722 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -31,6 +27,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata MD5 bc1ffbee448015bc91fa01027dde0fc4 files/digest-commons-io-1.1-r1 256 RMD160 cf11facacd17ab742a02e9e9e996b77144b1d1a6 files/digest-commons-io-1.1-r1 256 SHA256 e61a0c2ef412f92221612ef4339403b97a7251b950e4e0216f383b6a193dad47 files/digest-commons-io-1.1-r1 256 -MD5 313a2af07d8d0fb3c8776ccc9dd58e8c files/digest-commons-io-1.2 256 -RMD160 e36e92280db0a42341c7d0ff11220cbde37143ab files/digest-commons-io-1.2 256 -SHA256 a297ee846d83225494f320601b5217e3ab923da5f67bdf8c12e0f8e81d086d23 files/digest-commons-io-1.2 256 +MD5 d3ef03f7921f2288f07998a5006fde68 files/digest-commons-io-1.3 256 +RMD160 a35204a059bb4edff2ae1a39b260750b10bf0476 files/digest-commons-io-1.3 256 +SHA256 4bcd7435807c9a7ffa3bf85d7d51db35051a537c3f53a504300c1aa128cea212 files/digest-commons-io-1.3 256 diff --git a/dev-java/commons-io/commons-io-1.2.ebuild b/dev-java/commons-io/commons-io-1.3.ebuild similarity index 59% rename from dev-java/commons-io/commons-io-1.2.ebuild rename to dev-java/commons-io/commons-io-1.3.ebuild index 9694cedbfbfb..1665d2f759b3 100644 --- a/dev-java/commons-io/commons-io-1.2.ebuild +++ b/dev-java/commons-io/commons-io-1.3.ebuild @@ -1,23 +1,28 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/commons-io-1.2.ebuild,v 1.4 2007/01/22 12:39:23 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/commons-io-1.3.ebuild,v 1.1 2007/02/09 21:27:01 fordfrog Exp $ + +JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 eutils MY_P="${P}-src" -DESCRIPTION="Commons-IO contains utility classes , stream implementations, file filters , and endian classes." +DESCRIPTION="Commons-IO contains utility classes, stream implementations, file filters, and endian classes." HOMEPAGE="http://jakarta.apache.org/commons/io" SRC_URI="mirror://apache/jakarta/commons/io/source/${MY_P}.tar.gz" LICENSE="Apache-1.1" SLOT="1" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="doc source test" +IUSE="test" -DEPEND="dev-java/ant-core +DEPEND=">=virtual/jdk-1.4 source? ( app-arch/zip ) - test? ( dev-java/junit dev-java/ant-tasks ) - >=virtual/jdk-1.4" + test? ( + =dev-java/junit-3.8* + dev-java/ant + ) + !test? ( dev-java/ant-core )" RDEPEND=">=virtual/jre-1.4" S="${WORKDIR}/${MY_P}" @@ -26,18 +31,15 @@ src_unpack() { unpack ${A} cd "${S}" - rm -v *.jar - epatch ${FILESDIR}/${P}-gentoo.diff + rm *.jar + epatch ${FILESDIR}/${P}-build.xml.patch java-ant_ignore-system-classes java-ant_rewrite-classpath } -# one of the tests (FileUtilsCleanDirectoryTestCase) used to always fail -# when run as root, but I could not get this behaviour any more. - src_test() { - eant test -Dgentoo.classpath="$(java-pkg_getjars junit)" \ - -DJunit.present=true + ANT_OPTS="-Djava.io.tmpdir=${T}" eant test \ + -Dgentoo.classpath="$(java-pkg_getjars junit)" -DJunit.present=true } src_install() { diff --git a/dev-java/commons-io/files/commons-io-1.0-gentoo.diff b/dev-java/commons-io/files/commons-io-1.0-gentoo.diff deleted file mode 100644 index c6521a8649da..000000000000 --- a/dev-java/commons-io/files/commons-io-1.0-gentoo.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- build.xml.orig 2005-03-10 00:04:37.625655328 +0100 -+++ build.xml 2005-03-10 00:06:00.875999352 +0100 -@@ -23,10 +23,11 @@ - - - -- -+ -+ - - - -@@ -50,7 +51,7 @@ - - - -- -+ - - - diff --git a/dev-java/commons-io/files/commons-io-1.2-gentoo.diff b/dev-java/commons-io/files/commons-io-1.2-gentoo.diff deleted file mode 100644 index 62a7c51550e9..000000000000 --- a/dev-java/commons-io/files/commons-io-1.2-gentoo.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- build.xml.orig 2005-11-25 19:53:06.000000000 +0000 -+++ build.xml 2005-11-25 19:54:39.000000000 +0000 -@@ -92,7 +94,7 @@ - - - -- -+ - - - diff --git a/dev-java/commons-io/files/commons-io-1.3-build.xml.patch b/dev-java/commons-io/files/commons-io-1.3-build.xml.patch new file mode 100644 index 000000000000..cf509dcd51df --- /dev/null +++ b/dev-java/commons-io/files/commons-io-1.3-build.xml.patch @@ -0,0 +1,20 @@ +--- build.xml.original 2007-02-09 21:36:40.000000000 +0100 ++++ build.xml 2007-02-09 21:38:25.000000000 +0100 +@@ -92,7 +92,7 @@ + + + +- ++ + + + +@@ -196,7 +196,7 @@ + + + +- ++ + + + diff --git a/dev-java/commons-io/files/digest-commons-io-1.2 b/dev-java/commons-io/files/digest-commons-io-1.2 deleted file mode 100644 index 4a5c828bb195..000000000000 --- a/dev-java/commons-io/files/digest-commons-io-1.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d45b0c7c0fae36c3be99df86354d4323 commons-io-1.2-src.tar.gz 205563 -RMD160 cd1914721f5c2d460f0fe4e7ba2e1e23099bff2a commons-io-1.2-src.tar.gz 205563 -SHA256 9c9983fed8b5c633b156e429eb7885e70d6268eb23b00c16366702158daf8a22 commons-io-1.2-src.tar.gz 205563 diff --git a/dev-java/commons-io/files/digest-commons-io-1.3 b/dev-java/commons-io/files/digest-commons-io-1.3 new file mode 100644 index 000000000000..f11835e756a8 --- /dev/null +++ b/dev-java/commons-io/files/digest-commons-io-1.3 @@ -0,0 +1,3 @@ +MD5 1681b8e8bc96693b7fb7983458ed623a commons-io-1.3-src.tar.gz 691864 +RMD160 37422ddcff592f45a6fc9e90312d349a6410993b commons-io-1.3-src.tar.gz 691864 +SHA256 80b6b207f062a65d891f6db453f4b25ad7704a83e75cd8184d4a7d3166aa6035 commons-io-1.3-src.tar.gz 691864 -- 2.26.2