Gentoo Archives: gentoo-commits

From: Ralph Sennhauser <sera@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/java:master commit in: dev-java/icedtea/
Date: Tue, 28 Jan 2014 06:58:33
Message-Id: 1390856501.b1a888e3c9af332bc74e57c038f72d0fbccc231f.sera@gentoo
1 commit: b1a888e3c9af332bc74e57c038f72d0fbccc231f
2 Author: Ralph Sennhauser <sera <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 27 21:01:41 2014 +0000
4 Commit: Ralph Sennhauser <sera <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 27 21:01:41 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=b1a888e3
7
8 icedtea: drop ant-nodeps dependency #466558
9
10 With ant >=1.8.2 ant-nodeps is part of ant-core. The eclass
11 depenendency on ant-core is sufficient.
12
13 Package-Manager: portage-2.2.8
14 Manifest-Sign-Key: 3C5CF75A
15
16 ---
17 dev-java/icedtea/ChangeLog | 8 +++++++-
18 dev-java/icedtea/Manifest | 32 +++++++++++++++----------------
19 dev-java/icedtea/icedtea-3.9999.ebuild | 8 +++-----
20 dev-java/icedtea/icedtea-6.1.11.14.ebuild | 8 +++-----
21 dev-java/icedtea/icedtea-6.1.12.7.ebuild | 8 +++-----
22 dev-java/icedtea/icedtea-6.1.13.0.ebuild | 8 +++-----
23 dev-java/icedtea/icedtea-6.9999.ebuild | 8 +++-----
24 dev-java/icedtea/icedtea-7.2.3.12.ebuild | 8 +++-----
25 dev-java/icedtea/icedtea-7.2.4.3.ebuild | 7 +++----
26 dev-java/icedtea/icedtea-7.9999.ebuild | 8 +++-----
27 10 files changed, 47 insertions(+), 56 deletions(-)
28
29 diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
30 index 9d67d83..9e7964e 100644
31 --- a/dev-java/icedtea/ChangeLog
32 +++ b/dev-java/icedtea/ChangeLog
33 @@ -1,7 +1,13 @@
34 # ChangeLog for dev-java/icedtea
35 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
36 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
37 # $Header: $
38
39 + 27 Jan 2014; Ralph Sennhauser <sera@g.o> icedtea-3.9999.ebuild,
40 + icedtea-6.1.11.14.ebuild, icedtea-6.1.12.7.ebuild, icedtea-6.1.13.0.ebuild,
41 + icedtea-6.9999.ebuild, icedtea-7.2.3.12.ebuild, icedtea-7.2.4.3.ebuild,
42 + icedtea-7.9999.ebuild:
43 + asdfa
44 +
45 27 Dec 2013; Andrew John Hughes <gnu_andrew@××××××××××.org>
46 icedtea-6.1.13.0.ebuild:
47 Update URL for OpenJDK 6 tarball.
48
49 diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
50 index f5e1b63..da3241e 100644
51 --- a/dev-java/icedtea/Manifest
52 +++ b/dev-java/icedtea/Manifest
53 @@ -65,24 +65,24 @@ DIST icedtea7-openjdk-424e7e279ef6.tar.gz 135297 SHA256 9fd129437c81a2d8da3b8b17
54 DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 SHA256 f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227 SHA512 a965efa2fbe95a32988f78f1e51c42321ff42c1e631d5062aff204ba42839d6e05455f1ae039540e38ec947b50a635984cd3302eb09e81962575510309374e05 WHIRLPOOL 2dd759c4d8a23f0eb66bb28e1b48842fa3984d9796833bbbb6a3305a49d9cb1f2ce19b59c93b9f2a33d679559bf893fd62b4f831aa76bb053351e219639d9286
55 DIST openjdk-6-src-b27-26_oct_2012.tar.gz 45789350 SHA256 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 SHA512 4198f11b2f49c9bc5ffbeadf2d0d87dfa413a918d49faff3a043266bf4a2fa99579fba3c6d75164d87e88b8fc5c97c3c1527560eb25c55cdd42ad813c8e175e8 WHIRLPOOL 5038258710f2c0eac1a5a1957629998d931d49a6145450485b84e21988d8fdfa5127dc0852067319fb2ac054f621ec511c0d8e01961943c7e4a223049317b894
56 DIST openjdk-6-src-b29-05_dec_2013.tar.gz 53754194 SHA256 a9b1b0a48fb52aef82bbe5db33b1dae1672fc8a5f456451f2e300158fc7a7d6b SHA512 09cd1c05ada15c1266c53c0222e7f3fd944f188668f05796b7b8774e6c28d96f4bf9ceefde0943e2af56d7222a95e14c23a932f75b503ba41b3208372acf5d27 WHIRLPOOL d6782245a721c755478958f1fddbc2599bec8df9a74b75d2c869ea7143d6802de752ae98d928edbb5ab828a3621d381d23531643a29855cc2af61a78482fb5e0
57 -EBUILD icedtea-3.9999.ebuild 10792 SHA256 f3e96b99e4d8897783a373ae390661ace6e614104705f0f0b9a16873f976099a SHA512 daea5346524d193378853a5a94060795c85cc58616cff39c44b0fa0e38c4bcfc8347f3e62cfdb4f8064c097cfec781c70373105909aab246857005f7cb46ab4d WHIRLPOOL 5995a5795895c284a188354c4c62c300fbb114dc9d3e56ae8e42e561ea9ac8f376f05c721deab1674947b5e2951e48dcf6fb80305b2f5015bcd976af1b51d043
58 -EBUILD icedtea-6.1.11.14.ebuild 10106 SHA256 40537d53a16cfa563b7bc80696ca975c6c4202ebf54abb52940dcacf7e523031 SHA512 4e31343ac1854d2207c339795bb5639433e0ae689e19831259b90b24a189faaf3fcf6f97c2a7364a0a73be09b467c7a6fd839e779e609fec9f9e06f54645ab57 WHIRLPOOL b2566c636ccd30785f91c4c9a5f63b2488d328badca5b96b3b7b87362d557de8044a279da1508997e5dbbe1342f8124c9ebb9e390e8dc94f53d29f204a4da761
59 -EBUILD icedtea-6.1.12.7.ebuild 9558 SHA256 c8edc489efdbf020420925996e37042c44b7aab3ffef4ee52c4660eef5a9d2e6 SHA512 227224c4371e1c59eaef33418bc8805b9b214a34e0d4c787c20262c6d2d868d0d171d74a7005773f068c52dad1b94666bb8c5201131ce3438220aa2cbd3a1fd1 WHIRLPOOL 5ed232ea200517194ad7164c2d4557fbf857d60cad46ea1686b1465cb7fcab3f813d5a740b74304f458b2642650ffd01a0e3ce225df57123fe7cc431b7356fb6
60 -EBUILD icedtea-6.1.13.0.ebuild 9632 SHA256 ee860ca22172583095ca5f58f12476a02217b3637a8a03c45ab50317aedbabe7 SHA512 5d0de917e6ca86f9c7a80f6b83cd7c06b1cf33077be960a0b8d84b494467c03c95dbbac28110aacf3e10d3f8aaa616ac2f68255f052f03ee6035d81b86d6fd8b WHIRLPOOL 1b9016fd975ad1dd317f17ca27bdc1c92cceb975543e8a75081ee43b393867a0a4a63221f8bab7bb2f1a7133ae7681bf25eb04e92a7648fb0f3a042ff242c729
61 -EBUILD icedtea-6.9999.ebuild 9586 SHA256 d7188bd833ffd8c77e22064434cc46666eb287756243d6cff2ad0f87e76a3821 SHA512 bf3aa90ac3b8f51004c6e23c1af24cc0f4c37839e863001200732a959ac66ad89756ee2b01d065d6bcb79dc76c575a5ca0e88bc169eb150e029c295ef9d51cd7 WHIRLPOOL 2260f67fdd30df70aa937f52800dd0599d27e5e7aa708ddc2ee3677708baa8b5a1730f0b9884296c251f35c12dedcfc7c1db4f3873c9bbad82af48360911ff42
62 -EBUILD icedtea-7.2.3.12.ebuild 12031 SHA256 233354af349d76069bfb77b0ca62dcb7ac6598745497d8b754deac287eda79a5 SHA512 f055676273a716b723e37a77fc681d4ac9dd36717fccc5ee29717195ed897b4aec0c00443270179e7f9ddb8aad35ce7fecaa8f9f6f09a0a65a4a0fbb514e81f6 WHIRLPOOL cc3cde54ca9cabb3929e111e3403fec6dd7160c922cfbb115632b49b13a2028b411817a8f538473c54d0333684242eade21f82f6e1902432f7d6ec854d4e6c4a
63 -EBUILD icedtea-7.2.4.3.ebuild 11988 SHA256 d82bd09b3ef7c7f5cd39a8f2a7955837a87af00f23c19792621a86231e9e6b4a SHA512 422045e80c5bd47189e4a41a42e86862ac2bc0bd4bb12aa46c7e2a0cb9b644b5c57af68d98678b7972148df701da96888ec6453a08c2263dbc52e77993ff75cc WHIRLPOOL a0d79e7ad7ccda47dd8cf23de2f5b2b7dbf44cea53fd630d126dc38fd567ed3782015395ae9b2f6bd2bcce2dcd67ef0832f736f260157d7c2d56bdf73bdbff2e
64 -EBUILD icedtea-7.9999.ebuild 11584 SHA256 df80555fd651dcb26068e4e4852375cb933c3e807eaf495d236fc2217ede909d SHA512 f770277c0a2a63d5b77586d384d32f7453fa18e575af4bc197af5ccdb4117e96e9ca635a8764e040594246fd2430d3739dea72cd165fb28ce14b5649fe6ee61a WHIRLPOOL c51df51797870597e10c1616a90b2e5a8216226d22864ade987e73c62269cca2370a935b7eabde5b5e8420b730408b666137c4bfbbed218c966e5a92919ce375
65 -MISC ChangeLog 78562 SHA256 8c0d74456fa55dae0c09dc118dcca2b8a77277c421d96570a106a5efee8f34f8 SHA512 de4fb36435fe6031768064dbb3e2230817092ade207b7844e10b2533fbfeb24a4ee5ed755fbff207e583cf7ddd3c1ca28c963726549d3abc92e7983804d36125 WHIRLPOOL 2dc25bca2100bc7589c355c9a7e9420fca068e81afd595bbeebd49cc451bda0e5720590e7b36c043bb5872e2a6b8271e8b2deea4946bad6e90eb214810cedac6
66 +EBUILD icedtea-3.9999.ebuild 10726 SHA256 f1deeffdef35c0e28abb4d39fdde2d6fdd394e17db564ee161edfff0bbf52f77 SHA512 3a0eb9273a9bf2f1deb950bbc298c064f9cb02c1e80c64bdb3c6f7f5d61f67d12b18fb6d573f3b40cbd68c6ad1ca402001bbf3e0c733365cf33a063b439c6e23 WHIRLPOOL 74d29695d3e6bb529c3447c87cd2b0339e2ce65173070ac8ccc778fba7e6df73360d9b3c9317556f46a41f97726481803fd4491e1e1b37cb29791e6ce5a1c7fb
67 +EBUILD icedtea-6.1.11.14.ebuild 10040 SHA256 ac62790f1ba463dca60afde7f89aeb4e987eb1d9123f3ad44b04dea692dd8691 SHA512 0e36d645059c1a904dde5f3c84c054bb684889756cd4e6416cae36294d030e799c1a241855e9b9650ba55d1c9f0135f28e15b02132522fd9848359f9ec6cb187 WHIRLPOOL 6edecf5db05474d89adad93bcb613deaf392b73e16570ad2ed21192f47251daa2371bb9ce7534814a356620f196564ff2581322a976ac6a8ca4c8ed651ebe952
68 +EBUILD icedtea-6.1.12.7.ebuild 9492 SHA256 8b97bdef92ecfb9122b1f8374bff68f17552e45cf17f9dbb986a2824b10e8115 SHA512 a14c37fba3565f729350bbb67f6b06f6ca1eca79014840ae5284645905d840af1149f2f4991ecbd862e4f2df29cac007194ac001b6d48f589dc96cebc650fd45 WHIRLPOOL 91a26676ddef39939958a560742ed9385f5c0136bc017a64267e8a8288b2efabd10757795d8b16e156eacf04032ad1e34ec1c73f0dd21875de057834e36bf738
69 +EBUILD icedtea-6.1.13.0.ebuild 9566 SHA256 d57ddf0cdf3b65a127ec4239d7b94ce9b69fa6717e934af3d3648ef5b2e9627e SHA512 9d230bad178f8a9e12302bb69cbdeaf30dab959fd01c82bea9cf65a53d5366167c59d30e11c33cfbc375b5375acca4bfcdc246a4eeeb5daa7228855b6e4a6c33 WHIRLPOOL 126d8aa90bd0e6b41f95292bbdf275cff98fe80bc57c64a28be9aafddc001a58afd0e76f87aeab0d8c7b90c61c65667a3075da4bf710f52a4490024e97a5448e
70 +EBUILD icedtea-6.9999.ebuild 9520 SHA256 f0d588af6d1e8ddb703e12389102bce075ffe657bf1280d5e75898b8e0d62b46 SHA512 9158748e4700ed580613479dc56d8b3ae87342f124c9b4645edc5fcd3e40d2ec1e4d5b543bcd8246db903472c246f03b483dd19f7b10cae31b9ab2068bb4f2e0 WHIRLPOOL 5a950bf6ab2d8b282f1a0d12ed0d87bf778911562718a87afde093345ec0affcac2a33dad65ddb7c89623c0b37571c5c20729e14ab52edd74ec5588d7daefc20
71 +EBUILD icedtea-7.2.3.12.ebuild 11965 SHA256 418f93a40c2bd9a90ff93c2683e1c2ac1a89a75df568cfef219b3cf1d58f2903 SHA512 a089834fcba42f1657048625f4f9acdc65f3df07077656eb2ca36c89f66fa61be93e82047c9025513c79365c2ed41a8e8dbefc2d4e973661cb3950bd8996399a WHIRLPOOL 03a0f826dc62cf414a4197a8bd7ddd67c253e537a586750906bd39374caeb945f821d76f79e33687918035476570cdc8099c1015ba80382b264145ee0e2871b2
72 +EBUILD icedtea-7.2.4.3.ebuild 11943 SHA256 fdfd08728b79f10697792e37464f60c91a5acf83011d8586ff2bc8620adb1641 SHA512 6d31d506557a599d2c2cd84fd4975d6b01b1f0f145f05b3bbb7e3285579b34cf8810ba259bf268cfd80e0858948aef0b04eb94a5aeda54fabf8316dcce09bc25 WHIRLPOOL 88746fc8da5dce6734fe1427d01ee6a635e4b4d106484f63245e13179410fede559d3c151ae9f11d8fa1989c3e9157f5e7bddd93030dfffb7f31f2e759d63417
73 +EBUILD icedtea-7.9999.ebuild 11518 SHA256 2ae9edcda4137228c9758586d0913fc239d8172da3c0cb8ef845460519ed38e6 SHA512 e840b4cedf9631a1f47c07e898ccb9cccee8a13751713530382b6298cc7c6cc66bcc08db137bcdfb200831e94374cd45bbda01548aab7d933b0dba02a27fe0dd WHIRLPOOL 7e89a7bb7d3b566f23abe23323fc5b00989aaf0a1f8ed318888a82f6b984ff72362792fb3eb6ffd660b68fdf9057a962b6985c21f3f1f2f8dafd7900fb08f822
74 +MISC ChangeLog 78821 SHA256 8e2200f9c5899f58d1d90a24a95814c8b1ff9cf25ca74b5ccef528cbf7fccfd0 SHA512 4be0516bbaabac9436fea7327207b1c906bd7bf02df08768e681a19f8bda42aebf671b6fe66a27b95faa7e14cf023a53b00b1decdb98621d026478ae4174b298 WHIRLPOOL 248a5c7d89fa06bdaf094cb1afaa58c406ef782d0fa866f61120f473b6ef9f86d8d046f60f1d05fb25537c91c71c42cf52108dd90d889c6c624c4a6bb7b3249e
75 MISC metadata.xml 1456 SHA256 b9d10ae7d2ab64b9bd9ecd47d9ea5722861aaabf2ffedc14aa1a040a79247e8c SHA512 5f64eb3df9046ea10692e9c3fa49c9460bf0589e795688c838927cd058c70891de3aef3c7d7c7c8e958248fcbff658d4eca13c5f92af392892337f9dbd3c8539 WHIRLPOOL c188c5e119b4fec761de085276dd0a7b6ce1519fd80be144e0d272ba6345f0244297841fcdcbd37d420ac6b7aa77e8aae412b939bd169a533ba067dd44582cdc
76 -----BEGIN PGP SIGNATURE-----
77 Version: GnuPG v2.0.22 (GNU/Linux)
78
79 -iQEcBAEBCAAGBQJS5sIZAAoJELjwI6Q8XPdawOIH/RQ4Pwy5Xu9Lz+tTrETP6IzR
80 -U0q2RLGdcPUYMm4fv1FJ70HNaKJuiTUDUNUfRITY9E4IBia9btuEtFzoXg8EmgDk
81 -7MnAHBSUmr+ozU6d82ZhYr+OzlUaj6GIUDHVd040GBZ5aokBSaaGckm/ZxsB1l34
82 -Yw/HOqhEXNkop0ppNLuCfNkw0F0+aRe2+EfbwaozUtWPuiqfobsP1o9KCMtmA/UF
83 -DiTGo7kU2kVbvHWjAXVatp4aBs9X24ICmiL/njVxVch8NacQc2in0aLOGPTfakQs
84 -gV6EQn4XmS77w2s2qp9uUldyFj2LX8NFk8+phWtsMPbLe1B4P6SPZGgtK8uhFrw=
85 -=DXUQ
86 +iQEcBAEBCAAGBQJS5sk0AAoJELjwI6Q8XPdaUGYH/1iH39f0/A4cL969qM7EnL7M
87 +nG8png+/X+FGKt6W/Rp25WHk8zFv2oDLhLMtvOX0Cbr1iT0OuBvYYPzig86am9gx
88 +SwyPBR54FyzED2aMl467UagyvtpqH0vmf4q6CHLToXCbxBED0AM2PAAQHIlenUQX
89 +HPRVWXiwqod7o1WQGe+sGJbTa7YEvEQMJxwfJltXAFTvFKDWP4oGGn9u38ybRv3r
90 +6oPx5FRMgn53KEJg5+8zy6AoRFT9DQq1rY0iPLqlM+y/+jVmBAoqoG0pTQTmaJ/h
91 +1KKxo57POzDfMXnw7gwbxA6zjOgUgyayoujXwr9l9Vj9JvZncl4aAQIIy9EkL1w=
92 +=eNX2
93 -----END PGP SIGNATURE-----
94
95 diff --git a/dev-java/icedtea/icedtea-3.9999.ebuild b/dev-java/icedtea/icedtea-3.9999.ebuild
96 index 4eb9866..2fb39f6 100644
97 --- a/dev-java/icedtea/icedtea-3.9999.ebuild
98 +++ b/dev-java/icedtea/icedtea-3.9999.ebuild
99 @@ -1,4 +1,4 @@
100 -# Copyright 1999-2013 Gentoo Foundation
101 +# Copyright 1999-2014 Gentoo Foundation
102 # Distributed under the terms of the GNU General Public License v2
103 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $
104 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
105 @@ -135,8 +135,6 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
106 app-arch/unzip
107 app-arch/zip
108 app-misc/ca-certificates
109 - >=dev-java/ant-core-1.8.1
110 - dev-java/ant-nodeps
111 dev-lang/perl
112 >=dev-libs/libxslt-1.1.26
113 dev-libs/openssl
114 @@ -250,8 +248,8 @@ src_compile() {
115 # Would use GENTOO_VM otherwise.
116 export ANT_RESPECT_JAVA_HOME=TRUE
117
118 - # Load the least that's needed to avoid possible classpath collisions.
119 - export ANT_TASKS="ant-nodeps"
120 + # With ant >=1.8.2 all required tasks are part of ant-core
121 + export ANT_TASKS="none"
122
123 emake
124 }
125
126 diff --git a/dev-java/icedtea/icedtea-6.1.11.14.ebuild b/dev-java/icedtea/icedtea-6.1.11.14.ebuild
127 index 6bf20ac..b6d44d5 100644
128 --- a/dev-java/icedtea/icedtea-6.1.11.14.ebuild
129 +++ b/dev-java/icedtea/icedtea-6.1.11.14.ebuild
130 @@ -1,4 +1,4 @@
131 -# Copyright 1999-2013 Gentoo Foundation
132 +# Copyright 1999-2014 Gentoo Foundation
133 # Distributed under the terms of the GNU General Public License v2
134 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $
135 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
136 @@ -100,8 +100,6 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
137 app-arch/unzip
138 app-arch/zip
139 app-misc/ca-certificates
140 - >=dev-java/ant-core-1.8.1
141 - dev-java/ant-nodeps
142 dev-lang/perl
143 >=dev-libs/libxslt-1.1.26
144 dev-libs/openssl
145 @@ -232,8 +230,8 @@ src_compile() {
146 # Would use GENTOO_VM otherwise.
147 export ANT_RESPECT_JAVA_HOME=TRUE
148
149 - # Load the least that's needed to avoid possible classpath collisions.
150 - export ANT_TASKS="ant-nodeps"
151 + # With ant >=1.8.2 all required tasks are part of ant-core
152 + export ANT_TASKS="none"
153
154 emake
155 }
156
157 diff --git a/dev-java/icedtea/icedtea-6.1.12.7.ebuild b/dev-java/icedtea/icedtea-6.1.12.7.ebuild
158 index 985da10..bbf0e97 100644
159 --- a/dev-java/icedtea/icedtea-6.1.12.7.ebuild
160 +++ b/dev-java/icedtea/icedtea-6.1.12.7.ebuild
161 @@ -1,4 +1,4 @@
162 -# Copyright 1999-2013 Gentoo Foundation
163 +# Copyright 1999-2014 Gentoo Foundation
164 # Distributed under the terms of the GNU General Public License v2
165 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $
166 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
167 @@ -104,8 +104,6 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
168 app-arch/unzip
169 app-arch/zip
170 app-misc/ca-certificates
171 - >=dev-java/ant-core-1.8.1
172 - dev-java/ant-nodeps
173 dev-lang/perl
174 >=dev-libs/libxslt-1.1.26
175 dev-libs/openssl
176 @@ -215,8 +213,8 @@ src_compile() {
177 # Would use GENTOO_VM otherwise.
178 export ANT_RESPECT_JAVA_HOME=TRUE
179
180 - # Load the least that's needed to avoid possible classpath collisions.
181 - export ANT_TASKS="ant-nodeps"
182 + # With ant >=1.8.2 all required tasks are part of ant-core
183 + export ANT_TASKS="none"
184
185 emake
186 }
187
188 diff --git a/dev-java/icedtea/icedtea-6.1.13.0.ebuild b/dev-java/icedtea/icedtea-6.1.13.0.ebuild
189 index 8b3e27c..5375c7a 100644
190 --- a/dev-java/icedtea/icedtea-6.1.13.0.ebuild
191 +++ b/dev-java/icedtea/icedtea-6.1.13.0.ebuild
192 @@ -1,4 +1,4 @@
193 -# Copyright 1999-2013 Gentoo Foundation
194 +# Copyright 1999-2014 Gentoo Foundation
195 # Distributed under the terms of the GNU General Public License v2
196 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $
197 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
198 @@ -106,8 +106,6 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
199 app-arch/unzip
200 app-arch/zip
201 app-misc/ca-certificates
202 - >=dev-java/ant-core-1.8.1
203 - dev-java/ant-nodeps
204 dev-lang/perl
205 >=dev-libs/libxslt-1.1.26
206 dev-libs/openssl
207 @@ -218,8 +216,8 @@ src_compile() {
208 # Would use GENTOO_VM otherwise.
209 export ANT_RESPECT_JAVA_HOME=TRUE
210
211 - # Load the least that's needed to avoid possible classpath collisions.
212 - export ANT_TASKS="ant-nodeps"
213 + # With ant >=1.8.2 all required tasks are part of ant-core
214 + export ANT_TASKS="none"
215
216 emake
217 }
218
219 diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild
220 index a9639cc..b8fc839 100644
221 --- a/dev-java/icedtea/icedtea-6.9999.ebuild
222 +++ b/dev-java/icedtea/icedtea-6.9999.ebuild
223 @@ -1,4 +1,4 @@
224 -# Copyright 1999-2013 Gentoo Foundation
225 +# Copyright 1999-2014 Gentoo Foundation
226 # Distributed under the terms of the GNU General Public License v2
227 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $
228 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
229 @@ -104,8 +104,6 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
230 app-arch/unzip
231 app-arch/zip
232 app-misc/ca-certificates
233 - >=dev-java/ant-core-1.8.1
234 - dev-java/ant-nodeps
235 dev-lang/perl
236 >=dev-libs/libxslt-1.1.26
237 dev-libs/openssl
238 @@ -217,8 +215,8 @@ src_compile() {
239 # Would use GENTOO_VM otherwise.
240 export ANT_RESPECT_JAVA_HOME=TRUE
241
242 - # Load the least that's needed to avoid possible classpath collisions.
243 - export ANT_TASKS="ant-nodeps"
244 + # With ant >=1.8.2 all required tasks are part of ant-core
245 + export ANT_TASKS="none"
246
247 emake
248 }
249
250 diff --git a/dev-java/icedtea/icedtea-7.2.3.12.ebuild b/dev-java/icedtea/icedtea-7.2.3.12.ebuild
251 index 8fbfa1c..8d53f64 100644
252 --- a/dev-java/icedtea/icedtea-7.2.3.12.ebuild
253 +++ b/dev-java/icedtea/icedtea-7.2.3.12.ebuild
254 @@ -1,4 +1,4 @@
255 -# Copyright 1999-2013 Gentoo Foundation
256 +# Copyright 1999-2014 Gentoo Foundation
257 # Distributed under the terms of the GNU General Public License v2
258 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $
259 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
260 @@ -135,8 +135,6 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
261 app-arch/unzip
262 app-arch/zip
263 app-misc/ca-certificates
264 - >=dev-java/ant-core-1.8.1
265 - dev-java/ant-nodeps
266 dev-lang/perl
267 >=dev-libs/libxslt-1.1.26
268 dev-libs/openssl
269 @@ -265,8 +263,8 @@ src_compile() {
270 # Would use GENTOO_VM otherwise.
271 export ANT_RESPECT_JAVA_HOME=TRUE
272
273 - # Load the least that's needed to avoid possible classpath collisions.
274 - export ANT_TASKS="ant-nodeps"
275 + # With ant >=1.8.2 all required tasks are part of ant-core
276 + export ANT_TASKS="none"
277
278 emake
279 }
280
281 diff --git a/dev-java/icedtea/icedtea-7.2.4.3.ebuild b/dev-java/icedtea/icedtea-7.2.4.3.ebuild
282 index 309efec..c7cf698 100644
283 --- a/dev-java/icedtea/icedtea-7.2.4.3.ebuild
284 +++ b/dev-java/icedtea/icedtea-7.2.4.3.ebuild
285 @@ -1,4 +1,4 @@
286 -# Copyright 1999-2013 Gentoo Foundation
287 +# Copyright 1999-2014 Gentoo Foundation
288 # Distributed under the terms of the GNU General Public License v2
289 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $
290 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
291 @@ -137,7 +137,6 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
292 app-arch/unzip
293 app-arch/zip
294 app-misc/ca-certificates
295 - >=dev-java/ant-core-1.8.2
296 dev-lang/perl
297 >=dev-libs/libxslt-1.1.26
298 dev-libs/openssl
299 @@ -269,8 +268,8 @@ src_compile() {
300 # Would use GENTOO_VM otherwise.
301 export ANT_RESPECT_JAVA_HOME=TRUE
302
303 - # Load the least that's needed to avoid possible classpath collisions.
304 - export ANT_TASKS="ant-nodeps"
305 + # With ant >=1.8.2 all required tasks are part of ant-core
306 + export ANT_TASKS="none"
307
308 emake
309 }
310
311 diff --git a/dev-java/icedtea/icedtea-7.9999.ebuild b/dev-java/icedtea/icedtea-7.9999.ebuild
312 index b2f3110..aa971bf 100644
313 --- a/dev-java/icedtea/icedtea-7.9999.ebuild
314 +++ b/dev-java/icedtea/icedtea-7.9999.ebuild
315 @@ -1,4 +1,4 @@
316 -# Copyright 1999-2013 Gentoo Foundation
317 +# Copyright 1999-2014 Gentoo Foundation
318 # Distributed under the terms of the GNU General Public License v2
319 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $
320 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
321 @@ -134,8 +134,6 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
322 app-arch/unzip
323 app-arch/zip
324 app-misc/ca-certificates
325 - >=dev-java/ant-core-1.8.1
326 - dev-java/ant-nodeps
327 dev-lang/perl
328 >=dev-libs/libxslt-1.1.26
329 dev-libs/openssl
330 @@ -268,8 +266,8 @@ src_compile() {
331 # Would use GENTOO_VM otherwise.
332 export ANT_RESPECT_JAVA_HOME=TRUE
333
334 - # Load the least that's needed to avoid possible classpath collisions.
335 - export ANT_TASKS="ant-nodeps"
336 + # With ant >=1.8.2 all required tasks are part of ant-core
337 + export ANT_TASKS="none"
338
339 emake
340 }