| 1 |
commit: bdda6bc66371feab7558b97dbb141afc187d614c |
| 2 |
Author: Vlastimil Babka <caster <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 1 15:08:08 2014 +0000 |
| 4 |
Commit: Vlastimil Babka <caster <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 1 15:08:08 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=bdda6bc6 |
| 7 |
|
| 8 |
Backporting changes from portage: add pre-build disk space checking, bug #508728. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.14 |
| 11 |
|
| 12 |
--- |
| 13 |
dev-java/icedtea/ChangeLog | 6 +++++ |
| 14 |
dev-java/icedtea/Manifest | 32 +++++---------------------- |
| 15 |
dev-java/icedtea/icedtea-3.9999.ebuild | 20 ++++++++++++++++- |
| 16 |
dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild | 20 ++++++++++++++++- |
| 17 |
dev-java/icedtea/icedtea-6.9999.ebuild | 20 ++++++++++++++++- |
| 18 |
dev-java/icedtea/icedtea-7.2.5.3.ebuild | 20 ++++++++++++++++- |
| 19 |
dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild | 20 ++++++++++++++++- |
| 20 |
7 files changed, 107 insertions(+), 31 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog |
| 23 |
index 18f425f..177da77 100644 |
| 24 |
--- a/dev-java/icedtea/ChangeLog |
| 25 |
+++ b/dev-java/icedtea/ChangeLog |
| 26 |
@@ -2,6 +2,12 @@ |
| 27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
# $Header: $ |
| 29 |
|
| 30 |
+ 01 Nov 2014; Vlastimil Babka <caster@g.o> icedtea-3.9999.ebuild, |
| 31 |
+ icedtea-6.1.13.5-r1.ebuild, icedtea-6.9999.ebuild, icedtea-7.2.5.3.ebuild, |
| 32 |
+ icedtea-7.2.6.0_pre09.ebuild: |
| 33 |
+ Backporting changes from portage: add pre-build disk space checking, bug |
| 34 |
+ #508728. |
| 35 |
+ |
| 36 |
30 Oct 2014; Andrew John Hughes <gnu_andrew@××××××××××.org> |
| 37 |
icedtea-7.2.6.0_pre09.ebuild: |
| 38 |
Lock 2.6 ebuild to Mercurial tag for that pre-release. |
| 39 |
|
| 40 |
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest |
| 41 |
index 1c58c0c..d8a1b57 100644 |
| 42 |
--- a/dev-java/icedtea/Manifest |
| 43 |
+++ b/dev-java/icedtea/Manifest |
| 44 |
@@ -1,6 +1,3 @@ |
| 45 |
------BEGIN PGP SIGNED MESSAGE----- |
| 46 |
-Hash: SHA256 |
| 47 |
- |
| 48 |
AUX fontconfig.Gentoo.properties.src 15602 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647 SHA512 eac3fd310bf0757284a4a0c3c72759a8516bd2d9b8f9d9c7df10ff15fd291833d5adb5429b166175c6f333c883974d56fe7d0339cc16db3a5786a77780217a39 WHIRLPOOL f9f702848c38ef9cca0577f1db5a7c4cd6847e79d205b8e855c14b3a80070328b12fdcd854f5bd2dcf07c7cb9bd2aaf433a770a0752ec01a4e8b308dedf3bf19 |
| 49 |
AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619 |
| 50 |
AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a WHIRLPOOL 57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258 |
| 51 |
@@ -39,27 +36,10 @@ DIST icedtea7-langtools-55486a406d9f.tar.bz2 1702288 SHA256 3ef96c11ea2720b3c9e2 |
| 52 |
DIST icedtea7-openjdk-7faf56bdd783.tar.bz2 126716 SHA256 301bcd38fa62237e62e9ec2c30a43f36b0c25ad666a8b855ff1d8b0e68d05a2f SHA512 6f605d389eb7b3b7caccdae818ab8ed4375761b842a630e78beb231e9f510f4343325a881f84375b0ce0ed2cd78e6e3ec5ab5d8c4bdde33fa0cb84cd1e76017b WHIRLPOOL bb418265d42d2a6055b6bee847c02be6886c8116bf064431a76ed0fb4acc4133d34e60bf1e7f4575b8bf94c9313d1254a5dc71f6e3da351b0e9eab00c2c12910 |
| 53 |
DIST openjdk-6-src-b30-21_jan_2014.tar.xz 33106516 SHA256 ebd9fdf39c8590cd620cb78c481ca233f5919f2819237b5d2b440666f1dd3475 SHA512 3d040f9dc99b38babda3dce3a0dbc0de0dd91c5a2a0bb4bad7caa5acbb42923d0b26926aca836157d50124811f6c4c743f48ae996481d216c6158c21686e1c55 WHIRLPOOL 4a07dca91ad6bbf004fe40f12225a836c8cb634ce05b5974c51c389d235a6aca6a2532b3818fd975b1dd83ee117e08e17e22fcbb1bedff4caaabf50f941afd6f |
| 54 |
DIST openjdk-6-src-b33-14_oct_2014.tar.xz 33476800 SHA256 cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293 SHA512 e3e195b069101c352ae8ed8f59558a464ba61c9966add815cb58c9151c8fefda721dd1650ebd335350af95cbebdd3fedb1b4ac2736fb2625bb83f13b94a85c8c WHIRLPOOL bcd51fe1ce52ec275ef24d03914f0d151a8765c432713a9bfef39618c01587dc7f9ff9a58b86785761c4b69130afa643964c6cf5caad13d7778baa0a346ea291 |
| 55 |
-EBUILD icedtea-3.9999.ebuild 10793 SHA256 7af68c4e5dafe683a0e5719f0a6ea7a485838bf5723509e3b9b1a8526fb935d3 SHA512 f63c8419501c7de0065cd1f57063d51f55a16d3c06702b096aee239d662ff545e4042e7fbfd901b85b5db6eaca0cf65e48acaac1b853a1b9686cd4727d301349 WHIRLPOOL 86fb5a767aed5dd0544a47aba3925d921b647632edbc415b22bb212ba819b4dfd5f08313e279c5a02d4df138c71131d8d517564a85fec2f16c7caf8ab39e1b84 |
| 56 |
-EBUILD icedtea-6.1.13.5-r1.ebuild 10044 SHA256 1eee7decbcefbadaea5d79490f664be87b8ef2328265477663816ffa29b02a68 SHA512 a88bf6d80572278598658835c94cf2672ce57381694b490508e0be388aed5c88121a3f6cfca263ed4cbdc81b69079d09d1b6335087438ae5b867173a5c9a07d6 WHIRLPOOL 25cb9a06614d5a11acf1332b3c7e42f41054a7a508bbbab6e4013d4b8514f36a481f26be6b8519903f0d210db94d2d18df116f1b6a03808824d9c3fd2c848acf |
| 57 |
-EBUILD icedtea-6.9999.ebuild 9757 SHA256 1c1955d08794745b6c78b4b210a2e8f83e21cec57e3d22349ce3915a54284ec1 SHA512 94462631cf1b674e05d8d78d4516c77f28761572ddc4fe512130dfa7464039945dcc11b405b77e0bbc0ed1b17e3f144f28ceb167b82b837e7d15476220d6e42b WHIRLPOOL 480ed6898eb77f5639aa3b1d211f4ae6b172ff25aad9e8dd86c8be64424492071418ab195e8c0ce80d8034a8fe02ec0a391354de8a57eb8d9419e0200eb0a6b7 |
| 58 |
-EBUILD icedtea-7.2.5.3.ebuild 11989 SHA256 53f393c42010e81923a7bd311a532e48b1c64e1bcee86740e7206b02d597de40 SHA512 91ea4e3ba51e63243cbcb2fd33972ff8d4686555bf748aed6fab29d99c6e1d9bc762ef90e2d01326334d3e25844cc85a87f157d40581a73635993ecf35839484 WHIRLPOOL f7db41f557a4cf57c3b8f074a0d464546a9ea3bac01c831a9618496e5ba01e665bedff672b8d3d88ecf5e5ef0a0ec301afc6e9ea3ea018fe8797546a8ec5116f |
| 59 |
-EBUILD icedtea-7.2.6.0_pre09.ebuild 11923 SHA256 94b330a8a946efafd214ba1c698a7bbf87986ac1ca617885f955d4b04385a55a SHA512 3be756e9bcba75f3d34ca0ea26e01c19ef7c4e9344a048595d8560e67230d814c631ec4e24a027a3dcb393a85214d90235fe899aba66e4b330c98c86175fe283 WHIRLPOOL b1b99e5254da8839a45e00568e59629807893670f7b86f9259331b9ea5ebf60bd23a5e2a7d84303c08a59b75bda15c32927d5a6683c812ad680b0cd029c4249a |
| 60 |
-MISC ChangeLog 85729 SHA256 62429e2e8b15f416d0f19f4b651057b1d173af0ac78b8d7760b0f3b0d6314e90 SHA512 e9ecf8a88ed48c2de130a92432497e9538b1f8edec360508068302ff916219e9d2c08aa0d9c81551d3412141824cda2f041b2f02a34283b65f7da9a680470f0d WHIRLPOOL 37d3759b2f037baa7d2a5faf8615354d2f34cbc56571ac98d1a2814fa150bc7f7e30f6fe4a0c0fdd430ccaf6389106ee9180254e171a15ed14f7fb8677e4b3ce |
| 61 |
+EBUILD icedtea-3.9999.ebuild 11066 SHA256 3c81b897f0769756f5c274ddfd32368198cf90c2359e084e7a2b37d29ee38508 SHA512 175a2fd108537cd7b0500153bc302151389d579cd408c660a65bfd140883435ec721fc11c431393d38da6fad33db1c8d5eec96658df9e5e9be020566251b46ad WHIRLPOOL 57ba26b73e09fdb3e47eba96ced9c64424b04a8d4c8e93a32355f23ba42635e6222560d176d94706803b94bf31c25d040e5ee72934adc3317ce6971433607e70 |
| 62 |
+EBUILD icedtea-6.1.13.5-r1.ebuild 10317 SHA256 faba6fb4cd2fd7671bbdb68e69625986721e812a58d55b98adcce0f0573a4888 SHA512 c00f3477b935c12aea9cb5a2286e340b9eda525c25a9183be884ee7e33de120c796d0c559cf733ca6d51abf60103af27128194c00e6166fb3f44269bd228775e WHIRLPOOL 8472335033e6fea8bfd2c50e0b14299fb55e17e8eb0e09ae450de1df60ae3e5fea950b5948c918682129ef52ce3c89b3af619269cc2617275a873c1289f5d7d0 |
| 63 |
+EBUILD icedtea-6.9999.ebuild 10030 SHA256 bbda3ab47ccd5683e9d9cec63627242ce349a9da3689acf4cbaba4c6f7f0ae7a SHA512 0640d7d71750b3b5c8f86bd837f3e2c3772872b799635681e5c8457ecc6ceee5ac8b59ce2ac054b897119d490777eac7e2e92f85a6390cd3fd2e14c5fff201d5 WHIRLPOOL 163b80f5941f0f1732e7136cac845cd78b8305900726940dc5ad95acd1e394b39d31643333475e71b432045797eeb3676df166b18baaa76a5dc48757f7e11d05 |
| 64 |
+EBUILD icedtea-7.2.5.3.ebuild 12262 SHA256 bdf99d56593cd6dda450a58cf55a98043d5e2e46249d70fefd1eade09641b44c SHA512 7773d514887738ed3078b240a048a4e2a1aa3cd0d56cce08321937bed15aaecb7936d8f7ffd2e178ff4a9ea638fc5a839358e69d510a87ee392c9fec64d7295a WHIRLPOOL 6c48c1df093de22322f07632b6eebccf613ba816deea0fc85ceb84c54850414ea943b01898d9716e04c3219df68b83e5fbf7f6f1622f43324eb6183d3111d59f |
| 65 |
+EBUILD icedtea-7.2.6.0_pre09.ebuild 12196 SHA256 aa3cee4c568615b869d6316ecabdc412bf7549eea7a15dc2a74226caac9baf9a SHA512 d3d43661f3afc6dc494504567adc627b02bed709ac9e42f32473300b7cc38c244d5a75e6a728acda0a170f8d15c7bbe8b6c60079c3ff7f8478cd598a6008e3e5 WHIRLPOOL 485f86c9a9889e7de06e2e1a87ac03a549aac25cb2467cc4a53e185ee99d89b7bb3d3dab08b62bfabe7f405558af507c12d529573578209b926255cf77bcff02 |
| 66 |
+MISC ChangeLog 85999 SHA256 dd8bec8fe6128f05f24604aab091e3956c37dda493980fb416804cf54dd1201a SHA512 7b8831deb2c12cbe49eab203c4ad16380165bc5250a3f52eeb431f0ae192368cba8673dd1ccc5013b6a53fc7c1054822dd061028f834ce43c56082a26b96e922 WHIRLPOOL c531e119b483f1ddb73085df71c1070c1150c1ee1b3520ba592608d95ad3b0704ad20fae4eb24165a166e180c181e502bb2b72d0aa43d29de6e2d2f37ba0e0db |
| 67 |
MISC metadata.xml 1680 SHA256 41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512 5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c WHIRLPOOL 5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d |
| 68 |
------BEGIN PGP SIGNATURE----- |
| 69 |
-Version: GnuPG v2 |
| 70 |
- |
| 71 |
-iQIcBAEBCAAGBQJUUsXKAAoJEDuWpXgki9wHR/IP/0hRBCNk0o/WrglfrIQitU75 |
| 72 |
-EwWYAm89+x05wTS8e5SRTVvW19aVSxsXy3QHnv7g1mI/T4GA3BP3cMvVON4pj+7P |
| 73 |
-1hVz6IFRAkqWdH5Zx+JgEOOCZSu8ScejhRiBFZizSzW2vaqAtzhozs7po4S3cRBt |
| 74 |
-6DA22/5dXAsJNqkpzatOMIUjtqA6TVUVzViAipiJPa1z8y4W7N2W2d0prQr6zIG5 |
| 75 |
-/yLvJcW0ZVe0f2LskNJ3Hf7fymsDgLInHThhOrmBSUQMHCKltz52X56Ie2fI+o2u |
| 76 |
-VHQ0ExlKpsEZGgxYDTo/1DpD/e4DtS4sRDBWYoRtrXizKuOgL13eDvrQOMtEmhHs |
| 77 |
-HQijxhzSVL3L5JxPp4z5mOEG4M+1g/gjBIUVg+30jBLFQmF/ttPpzNrZboFYmZEi |
| 78 |
-b9TiQ+w5spaSFwYsd25GM2jKVFdboFJGnwBguiyF+WETA+yHf1AzEJT6vq/LH1IQ |
| 79 |
-vLBeZ7HvkRfrA03CIE9IImlvrbbCF1YQfCynuPEW2ORcOJPinyjaqBXhR6nMyvvN |
| 80 |
-beYht6ORuzwS0nzb49w3tJNMguGrfT7DYe2f5Z8cKQin1VHuSjsW2HM0q2oxQ8lq |
| 81 |
-z7qv/Qy/yCxheB6nXNcmCE+9M6W5jvaC6uW8/vGGIpZ9vevwCc+P+lB9FHf7E4xF |
| 82 |
-9xrz8j1sjVhz03U+S5mS |
| 83 |
-=7nAy |
| 84 |
------END PGP SIGNATURE----- |
| 85 |
|
| 86 |
diff --git a/dev-java/icedtea/icedtea-3.9999.ebuild b/dev-java/icedtea/icedtea-3.9999.ebuild |
| 87 |
index 57ac56f..38e06dc 100644 |
| 88 |
--- a/dev-java/icedtea/icedtea-3.9999.ebuild |
| 89 |
+++ b/dev-java/icedtea/icedtea-3.9999.ebuild |
| 90 |
@@ -9,7 +9,7 @@ |
| 91 |
|
| 92 |
EAPI="5" |
| 93 |
|
| 94 |
-inherit autotools java-pkg-2 java-vm-2 mercurial pax-utils prefix versionator virtualx |
| 95 |
+inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial pax-utils prefix versionator virtualx |
| 96 |
|
| 97 |
ICEDTEA_VER=$(get_version_component_range 1-) |
| 98 |
ICEDTEA_BRANCH=3.0 |
| 99 |
@@ -151,7 +151,25 @@ PDEPEND="webstart? ( dev-java/icedtea-web:0 ) |
| 100 |
|
| 101 |
S="${WORKDIR}"/${ICEDTEA_PKG} |
| 102 |
|
| 103 |
+icedtea_check_requirements() { |
| 104 |
+ local CHECKREQS_DISK_BUILD |
| 105 |
+ |
| 106 |
+ if use doc; then |
| 107 |
+ CHECKREQS_DISK_BUILD="9000M" |
| 108 |
+ else |
| 109 |
+ CHECKREQS_DISK_BUILD="8500M" |
| 110 |
+ fi |
| 111 |
+ |
| 112 |
+ check-reqs_pkg_${EBUILD_PHASE} |
| 113 |
+} |
| 114 |
+ |
| 115 |
+pkg_pretend() { |
| 116 |
+ icedtea_check_requirements |
| 117 |
+} |
| 118 |
+ |
| 119 |
pkg_setup() { |
| 120 |
+ icedtea_check_requirements |
| 121 |
+ |
| 122 |
JAVA_PKG_WANT_BUILD_VM=" |
| 123 |
icedtea-7 icedtea-bin-7 icedtea7" |
| 124 |
JAVA_PKG_WANT_SOURCE="1.5" |
| 125 |
|
| 126 |
diff --git a/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild b/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild |
| 127 |
index fd2ce1c..267ff70 100644 |
| 128 |
--- a/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild |
| 129 |
+++ b/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild |
| 130 |
@@ -9,7 +9,7 @@ |
| 131 |
|
| 132 |
EAPI="5" |
| 133 |
|
| 134 |
-inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx |
| 135 |
+inherit check-reqs java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx |
| 136 |
|
| 137 |
ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) |
| 138 |
ICEDTEA_BRANCH=$(get_version_component_range 1-3) |
| 139 |
@@ -128,7 +128,25 @@ PDEPEND="webstart? ( || ( |
| 140 |
|
| 141 |
S="${WORKDIR}"/${ICEDTEA_PKG} |
| 142 |
|
| 143 |
+icedtea_check_requirements() { |
| 144 |
+ local CHECKREQS_DISK_BUILD |
| 145 |
+ |
| 146 |
+ if use doc; then |
| 147 |
+ CHECKREQS_DISK_BUILD="8500M" |
| 148 |
+ else |
| 149 |
+ CHECKREQS_DISK_BUILD="8000M" |
| 150 |
+ fi |
| 151 |
+ |
| 152 |
+ check-reqs_pkg_${EBUILD_PHASE} |
| 153 |
+} |
| 154 |
+ |
| 155 |
+pkg_pretend() { |
| 156 |
+ icedtea_check_requirements |
| 157 |
+} |
| 158 |
+ |
| 159 |
pkg_setup() { |
| 160 |
+ icedtea_check_requirements |
| 161 |
+ |
| 162 |
JAVA_PKG_WANT_BUILD_VM=" |
| 163 |
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin |
| 164 |
gcj-jdk" |
| 165 |
|
| 166 |
diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild |
| 167 |
index eb27791..63219eb 100644 |
| 168 |
--- a/dev-java/icedtea/icedtea-6.9999.ebuild |
| 169 |
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild |
| 170 |
@@ -9,7 +9,7 @@ |
| 171 |
|
| 172 |
EAPI="4" |
| 173 |
|
| 174 |
-inherit autotools java-pkg-2 java-vm-2 mercurial pax-utils prefix versionator virtualx |
| 175 |
+inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial pax-utils prefix versionator virtualx |
| 176 |
|
| 177 |
ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) |
| 178 |
ICEDTEA_BRANCH=$(get_version_component_range 1-3) |
| 179 |
@@ -126,7 +126,25 @@ PDEPEND="webstart? ( || ( |
| 180 |
|
| 181 |
S="${WORKDIR}"/${ICEDTEA_PKG} |
| 182 |
|
| 183 |
+icedtea_check_requirements() { |
| 184 |
+ local CHECKREQS_DISK_BUILD |
| 185 |
+ |
| 186 |
+ if use doc; then |
| 187 |
+ CHECKREQS_DISK_BUILD="8500M" |
| 188 |
+ else |
| 189 |
+ CHECKREQS_DISK_BUILD="8000M" |
| 190 |
+ fi |
| 191 |
+ |
| 192 |
+ check-reqs_pkg_${EBUILD_PHASE} |
| 193 |
+} |
| 194 |
+ |
| 195 |
+pkg_pretend() { |
| 196 |
+ icedtea_check_requirements |
| 197 |
+} |
| 198 |
+ |
| 199 |
pkg_setup() { |
| 200 |
+ icedtea_check_requirements |
| 201 |
+ |
| 202 |
JAVA_PKG_WANT_BUILD_VM=" |
| 203 |
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin |
| 204 |
gcj-jdk" |
| 205 |
|
| 206 |
diff --git a/dev-java/icedtea/icedtea-7.2.5.3.ebuild b/dev-java/icedtea/icedtea-7.2.5.3.ebuild |
| 207 |
index 1e266bf..c3e460b 100644 |
| 208 |
--- a/dev-java/icedtea/icedtea-7.2.5.3.ebuild |
| 209 |
+++ b/dev-java/icedtea/icedtea-7.2.5.3.ebuild |
| 210 |
@@ -10,7 +10,7 @@ |
| 211 |
EAPI="5" |
| 212 |
SLOT="7" |
| 213 |
|
| 214 |
-inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx |
| 215 |
+inherit check-reqs java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx |
| 216 |
|
| 217 |
ICEDTEA_VER=$(get_version_component_range 2-) |
| 218 |
ICEDTEA_BRANCH=$(get_version_component_range 2-3) |
| 219 |
@@ -158,7 +158,25 @@ PDEPEND="webstart? ( || ( |
| 220 |
|
| 221 |
S="${WORKDIR}"/${ICEDTEA_PKG} |
| 222 |
|
| 223 |
+icedtea_check_requirements() { |
| 224 |
+ local CHECKREQS_DISK_BUILD |
| 225 |
+ |
| 226 |
+ if use doc; then |
| 227 |
+ CHECKREQS_DISK_BUILD="9000M" |
| 228 |
+ else |
| 229 |
+ CHECKREQS_DISK_BUILD="8500M" |
| 230 |
+ fi |
| 231 |
+ |
| 232 |
+ check-reqs_pkg_${EBUILD_PHASE} |
| 233 |
+} |
| 234 |
+ |
| 235 |
+pkg_pretend() { |
| 236 |
+ icedtea_check_requirements |
| 237 |
+} |
| 238 |
+ |
| 239 |
pkg_setup() { |
| 240 |
+ icedtea_check_requirements |
| 241 |
+ |
| 242 |
JAVA_PKG_WANT_BUILD_VM=" |
| 243 |
icedtea-7 icedtea-bin-7 icedtea7 |
| 244 |
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin |
| 245 |
|
| 246 |
diff --git a/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild b/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild |
| 247 |
index 6882b6a..f83c50c 100644 |
| 248 |
--- a/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild |
| 249 |
+++ b/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild |
| 250 |
@@ -10,7 +10,7 @@ |
| 251 |
EAPI="5" |
| 252 |
SLOT="7" |
| 253 |
|
| 254 |
-inherit autotools java-pkg-2 java-vm-2 mercurial pax-utils prefix versionator virtualx |
| 255 |
+inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial pax-utils prefix versionator virtualx |
| 256 |
|
| 257 |
ICEDTEA_VER=$(get_version_component_range 2-4) |
| 258 |
ICEDTEA_PKG=icedtea-${ICEDTEA_VER} |
| 259 |
@@ -158,7 +158,25 @@ PDEPEND="webstart? ( || ( |
| 260 |
|
| 261 |
S="${WORKDIR}"/${ICEDTEA_PKG} |
| 262 |
|
| 263 |
+icedtea_check_requirements() { |
| 264 |
+ local CHECKREQS_DISK_BUILD |
| 265 |
+ |
| 266 |
+ if use doc; then |
| 267 |
+ CHECKREQS_DISK_BUILD="9000M" |
| 268 |
+ else |
| 269 |
+ CHECKREQS_DISK_BUILD="8500M" |
| 270 |
+ fi |
| 271 |
+ |
| 272 |
+ check-reqs_pkg_${EBUILD_PHASE} |
| 273 |
+} |
| 274 |
+ |
| 275 |
+pkg_pretend() { |
| 276 |
+ icedtea_check_requirements |
| 277 |
+} |
| 278 |
+ |
| 279 |
pkg_setup() { |
| 280 |
+ icedtea_check_requirements |
| 281 |
+ |
| 282 |
JAVA_PKG_WANT_BUILD_VM=" |
| 283 |
icedtea-7 icedtea-bin-7 icedtea7 |
| 284 |
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin |
Archives