commit: 29c924b996cdaff6527deb16bacd85df7352764a
Author: Vlastimil Babka <caster <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 1 15:26:47 2014 +0000
Commit: Vlastimil Babka <caster <AT> gentoo <DOT> org>
CommitDate: Sat Nov 1 15:26:47 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=29c924b9
Backporting changes from portage: use multiprocessing eclass instead of manual
MAKEOPTS parsing
Package-Manager: portage-2.2.14
---
dev-java/icedtea/ChangeLog | 6 ++++++
dev-java/icedtea/Manifest | 12 ++++++------
dev-java/icedtea/icedtea-3.9999.ebuild | 9 ++-------
dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild | 9 ++-------
dev-java/icedtea/icedtea-6.9999.ebuild | 9 ++-------
dev-java/icedtea/icedtea-7.2.5.3.ebuild | 9 ++-------
dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild | 9 ++-------
7 files changed, 22 insertions(+), 41 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 177da77..6bb2b15 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -5,6 +5,12 @@
01 Nov 2014; Vlastimil Babka <cas...@gentoo.org> icedtea-3.9999.ebuild,
icedtea-6.1.13.5-r1.ebuild, icedtea-6.9999.ebuild, icedtea-7.2.5.3.ebuild,
icedtea-7.2.6.0_pre09.ebuild:
+ Backporting changes from portage: use multiprocessing eclass instead of
+ manual MAKEOPTS parsing
+
+ 01 Nov 2014; Vlastimil Babka <cas...@gentoo.org> icedtea-3.9999.ebuild,
+ icedtea-6.1.13.5-r1.ebuild, icedtea-6.9999.ebuild, icedtea-7.2.5.3.ebuild,
+ icedtea-7.2.6.0_pre09.ebuild:
Backporting changes from portage: add pre-build disk space checking, bug
#508728.
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index d8a1b57..9e958c4 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -36,10 +36,10 @@ DIST icedtea7-langtools-55486a406d9f.tar.bz2 1702288 SHA256
3ef96c11ea2720b3c9e2
DIST icedtea7-openjdk-7faf56bdd783.tar.bz2 126716 SHA256
301bcd38fa62237e62e9ec2c30a43f36b0c25ad666a8b855ff1d8b0e68d05a2f SHA512
6f605d389eb7b3b7caccdae818ab8ed4375761b842a630e78beb231e9f510f4343325a881f84375b0ce0ed2cd78e6e3ec5ab5d8c4bdde33fa0cb84cd1e76017b
WHIRLPOOL
bb418265d42d2a6055b6bee847c02be6886c8116bf064431a76ed0fb4acc4133d34e60bf1e7f4575b8bf94c9313d1254a5dc71f6e3da351b0e9eab00c2c12910
DIST openjdk-6-src-b30-21_jan_2014.tar.xz 33106516 SHA256
ebd9fdf39c8590cd620cb78c481ca233f5919f2819237b5d2b440666f1dd3475 SHA512
3d040f9dc99b38babda3dce3a0dbc0de0dd91c5a2a0bb4bad7caa5acbb42923d0b26926aca836157d50124811f6c4c743f48ae996481d216c6158c21686e1c55
WHIRLPOOL
4a07dca91ad6bbf004fe40f12225a836c8cb634ce05b5974c51c389d235a6aca6a2532b3818fd975b1dd83ee117e08e17e22fcbb1bedff4caaabf50f941afd6f
DIST openjdk-6-src-b33-14_oct_2014.tar.xz 33476800 SHA256
cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293 SHA512
e3e195b069101c352ae8ed8f59558a464ba61c9966add815cb58c9151c8fefda721dd1650ebd335350af95cbebdd3fedb1b4ac2736fb2625bb83f13b94a85c8c
WHIRLPOOL
bcd51fe1ce52ec275ef24d03914f0d151a8765c432713a9bfef39618c01587dc7f9ff9a58b86785761c4b69130afa643964c6cf5caad13d7778baa0a346ea291
-EBUILD icedtea-3.9999.ebuild 11066 SHA256
3c81b897f0769756f5c274ddfd32368198cf90c2359e084e7a2b37d29ee38508 SHA512
175a2fd108537cd7b0500153bc302151389d579cd408c660a65bfd140883435ec721fc11c431393d38da6fad33db1c8d5eec96658df9e5e9be020566251b46ad
WHIRLPOOL
57ba26b73e09fdb3e47eba96ced9c64424b04a8d4c8e93a32355f23ba42635e6222560d176d94706803b94bf31c25d040e5ee72934adc3317ce6971433607e70
-EBUILD icedtea-6.1.13.5-r1.ebuild 10317 SHA256
faba6fb4cd2fd7671bbdb68e69625986721e812a58d55b98adcce0f0573a4888 SHA512
c00f3477b935c12aea9cb5a2286e340b9eda525c25a9183be884ee7e33de120c796d0c559cf733ca6d51abf60103af27128194c00e6166fb3f44269bd228775e
WHIRLPOOL
8472335033e6fea8bfd2c50e0b14299fb55e17e8eb0e09ae450de1df60ae3e5fea950b5948c918682129ef52ce3c89b3af619269cc2617275a873c1289f5d7d0
-EBUILD icedtea-6.9999.ebuild 10030 SHA256
bbda3ab47ccd5683e9d9cec63627242ce349a9da3689acf4cbaba4c6f7f0ae7a SHA512
0640d7d71750b3b5c8f86bd837f3e2c3772872b799635681e5c8457ecc6ceee5ac8b59ce2ac054b897119d490777eac7e2e92f85a6390cd3fd2e14c5fff201d5
WHIRLPOOL
163b80f5941f0f1732e7136cac845cd78b8305900726940dc5ad95acd1e394b39d31643333475e71b432045797eeb3676df166b18baaa76a5dc48757f7e11d05
-EBUILD icedtea-7.2.5.3.ebuild 12262 SHA256
bdf99d56593cd6dda450a58cf55a98043d5e2e46249d70fefd1eade09641b44c SHA512
7773d514887738ed3078b240a048a4e2a1aa3cd0d56cce08321937bed15aaecb7936d8f7ffd2e178ff4a9ea638fc5a839358e69d510a87ee392c9fec64d7295a
WHIRLPOOL
6c48c1df093de22322f07632b6eebccf613ba816deea0fc85ceb84c54850414ea943b01898d9716e04c3219df68b83e5fbf7f6f1622f43324eb6183d3111d59f
-EBUILD icedtea-7.2.6.0_pre09.ebuild 12196 SHA256
aa3cee4c568615b869d6316ecabdc412bf7549eea7a15dc2a74226caac9baf9a SHA512
d3d43661f3afc6dc494504567adc627b02bed709ac9e42f32473300b7cc38c244d5a75e6a728acda0a170f8d15c7bbe8b6c60079c3ff7f8478cd598a6008e3e5
WHIRLPOOL
485f86c9a9889e7de06e2e1a87ac03a549aac25cb2467cc4a53e185ee99d89b7bb3d3dab08b62bfabe7f405558af507c12d529573578209b926255cf77bcff02
-MISC ChangeLog 85999 SHA256
dd8bec8fe6128f05f24604aab091e3956c37dda493980fb416804cf54dd1201a SHA512
7b8831deb2c12cbe49eab203c4ad16380165bc5250a3f52eeb431f0ae192368cba8673dd1ccc5013b6a53fc7c1054822dd061028f834ce43c56082a26b96e922
WHIRLPOOL
c531e119b483f1ddb73085df71c1070c1150c1ee1b3520ba592608d95ad3b0704ad20fae4eb24165a166e180c181e502bb2b72d0aa43d29de6e2d2f37ba0e0db
+EBUILD icedtea-3.9999.ebuild 10745 SHA256
60ef5129eb09068143617b8efc6b5e3b91101f27c692adf7674db7f43bd32549 SHA512
7c33920feae31f86ee307ac9d3a0df88e235f750f9a46a7c2d6fb9dcefa0c19e662f3869f48871375fc2644609db8377d426a9cec0aa196e612aa6c0cd0e01e2
WHIRLPOOL
7325d35c76b7a4d7d2a26fc680d215ced33d5113122511a9b84277f3b331d04796e904ed3228139d0f1b676c0ebeef27610da678d24676218e827f223259c94e
+EBUILD icedtea-6.1.13.5-r1.ebuild 9996 SHA256
6a363563f06288e8389a0e136b97c7b584e76d4ab32befd465f5f50a2eaf6663 SHA512
ae094175fe94e3cd118f047c6ffda6e840f37c0f4d81f76ea40df1b03be20620ff60153fa3286fbb42488ea4d03c688e484855e996b9d3d607bc4ece8c863aec
WHIRLPOOL
5ad6ff0c4f86feb090eec9b0b3457ce95b908136069823666a016b4c255acc8d97a28b825072a75640414b57cb3725d90ff60b2c793aa626850138494cb33c0c
+EBUILD icedtea-6.9999.ebuild 9709 SHA256
3d15e7e191a3ae6c808c5c7e24d45131c759b88a1bf408957ef9f1786af34d47 SHA512
18a8d8d9c07397401e37ed6a1cc22bd919b2af427a294f9c5ea21de58ad65ab3dc179ed731dc80e9007cb8d64b30e5637dfd29e8359f2ec5a865c1bd3d37d540
WHIRLPOOL
8bec6e4cbe56069ac33788c0d8d64a26c46b448eedefcf603c5410956000f64162146e6eae08fc8e2d446002ba48372a90bd11a5ee4c651bd400405efb11bbc1
+EBUILD icedtea-7.2.5.3.ebuild 11941 SHA256
9c102aef85ce49ea5db3e70063f8121af7cd45b70c89b30913ec836a6d54601f SHA512
ab3255eb9e3b2f8b6f2cda0824971df6ea8ec85d1b7c5ad5ffc30bde712b322f7e8219d3031ff84e25e65d5c671590bc0f66e1dd28529ea07a1a55d0c285da67
WHIRLPOOL
1304fa0ffcfdcde0053d291aaacdf8f4f91347a651c4a61366c588fac366c579e9e427b0733c1a6dac6f30827ae74d58511ede281b76dcbb77ee7667d77f5238
+EBUILD icedtea-7.2.6.0_pre09.ebuild 11875 SHA256
a3483c9ea75caff960c58473f4a97d00bd3b118721c6e8996c67682e3a9cf235 SHA512
4176663095f29e94e951e70f7867c72c09fa95e6583bb19687e4a55c0e95f7d9751096b50b5a60dab6fcf57a6e7b9a52748c6b4a3a74a1c5ef7277b3db7276a2
WHIRLPOOL
6aca4926f38690ec92d6a8de79b1df0b1590bc13543169ba8a1baa841ac7afcb76a22b9cf201a045778c6c70ae0407f54441927034a4fe7d8b6258ae1b7c4019
+MISC ChangeLog 86283 SHA256
1bfd78c0c533cefe1f4d783af26476c4531eef6cb5b03ed4dfcc3a8b5f2d9172 SHA512
25d97784437c47795f53231ebb8b547302337e17a99cc44276b29aea564ae39832a9aa00a3c80a5a9e1ab8e1082a9d3a85681057d9c6c82fb1f3920dfb63668c
WHIRLPOOL
7b9b3083fd4825e210cc1cee4ee63c7e695704b79718bfc4b49bb6d89be50f3142c54a7d0e5beb86d7b86d7750d4a6621f8786020ec98df68ddd3d1efb156261
MISC metadata.xml 1680 SHA256
41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512
5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c
WHIRLPOOL
5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d
diff --git a/dev-java/icedtea/icedtea-3.9999.ebuild
b/dev-java/icedtea/icedtea-3.9999.ebuild
index 38e06dc..2777175 100644
--- a/dev-java/icedtea/icedtea-3.9999.ebuild
+++ b/dev-java/icedtea/icedtea-3.9999.ebuild
@@ -9,7 +9,7 @@
EAPI="5"
-inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial pax-utils prefix
versionator virtualx
+inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial multiprocessing
pax-utils prefix versionator virtualx
ICEDTEA_VER=$(get_version_component_range 1-)
ICEDTEA_BRANCH=3.0
@@ -228,12 +228,7 @@ src_configure() {
config="${config} --enable-jamvm"
fi
- # OpenJDK-specific parallelism support. Bug #389791, #337827
- # Implementation modified from waf-utils.eclass
- # Note that "-j" is converted to "-j1" as the system doesn't support
--load-average
- local procs=$(echo -j1 ${MAKEOPTS} | sed -r
"s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
- config="${config} --with-parallel-jobs=${procs}";
- einfo "Configuring using --with-parallel-jobs=${procs}"
+ config+=" --with-parallel-jobs=$(makeopts_jobs)"
if use javascript ; then
config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6
js.jar)"
diff --git a/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
b/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
index 267ff70..23ab1e6 100644
--- a/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
@@ -9,7 +9,7 @@
EAPI="5"
-inherit check-reqs java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils prefix
versionator virtualx
ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
ICEDTEA_BRANCH=$(get_version_component_range 1-3)
@@ -211,12 +211,7 @@ src_configure() {
config="${config} --enable-cacao"
fi
- # OpenJDK-specific parallelism support. Bug #389791, #337827
- # Implementation modified from waf-utils.eclass
- # Note that "-j" is converted to "-j1" as the system doesn't support
--load-average
- local procs=$(echo -j1 ${MAKEOPTS} | sed -r
"s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
- config="${config} --with-parallel-jobs=${procs}";
- einfo "Configuring using --with-parallel-jobs=${procs}"
+ config+=" --with-parallel-jobs=$(makeopts_jobs)"
if use javascript ; then
config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6
js.jar)"
diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild
b/dev-java/icedtea/icedtea-6.9999.ebuild
index 63219eb..d180ac3 100644
--- a/dev-java/icedtea/icedtea-6.9999.ebuild
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild
@@ -9,7 +9,7 @@
EAPI="4"
-inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial pax-utils prefix
versionator virtualx
+inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial multiprocessing
pax-utils prefix versionator virtualx
ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
ICEDTEA_BRANCH=$(get_version_component_range 1-3)
@@ -208,12 +208,7 @@ src_configure() {
config="${config} --enable-cacao"
fi
- # OpenJDK-specific parallelism support. Bug #389791, #337827
- # Implementation modified from waf-utils.eclass
- # Note that "-j" is converted to "-j1" as the system doesn't support
--load-average
- local procs=$(echo -j1 ${MAKEOPTS} | sed -r
"s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
- config="${config} --with-parallel-jobs=${procs}";
- einfo "Configuring using --with-parallel-jobs=${procs}"
+ config+=" --with-parallel-jobs=$(makeopts_jobs)"
if use javascript ; then
config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6
js.jar)"
diff --git a/dev-java/icedtea/icedtea-7.2.5.3.ebuild
b/dev-java/icedtea/icedtea-7.2.5.3.ebuild
index c3e460b..4e5a0b8 100644
--- a/dev-java/icedtea/icedtea-7.2.5.3.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.5.3.ebuild
@@ -10,7 +10,7 @@
EAPI="5"
SLOT="7"
-inherit check-reqs java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils prefix
versionator virtualx
ICEDTEA_VER=$(get_version_component_range 2-)
ICEDTEA_BRANCH=$(get_version_component_range 2-3)
@@ -251,12 +251,7 @@ src_configure() {
zero_config="--enable-zero";
fi
- # OpenJDK-specific parallelism support. Bug #389791, #337827
- # Implementation modified from waf-utils.eclass
- # Note that "-j" is converted to "-j1" as the system doesn't support
--load-average
- local procs=$(echo -j1 ${MAKEOPTS} | sed -r
"s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
- config="${config} --with-parallel-jobs=${procs}";
- einfo "Configuring using --with-parallel-jobs=${procs}"
+ config+=" --with-parallel-jobs=$(makeopts_jobs)"
if use javascript ; then
config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6
js.jar)"
diff --git a/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild
b/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild
index f83c50c..25317de 100644
--- a/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.0_pre09.ebuild
@@ -10,7 +10,7 @@
EAPI="5"
SLOT="7"
-inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial pax-utils prefix
versionator virtualx
+inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial multiprocessing
pax-utils prefix versionator virtualx
ICEDTEA_VER=$(get_version_component_range 2-4)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
@@ -253,12 +253,7 @@ src_configure() {
zero_config="--enable-zero";
fi
- # OpenJDK-specific parallelism support. Bug #389791, #337827
- # Implementation modified from waf-utils.eclass
- # Note that "-j" is converted to "-j1" as the system doesn't support
--load-average
- local procs=$(echo -j1 ${MAKEOPTS} | sed -r
"s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
- config="${config} --with-parallel-jobs=${procs}";
- einfo "Configuring using --with-parallel-jobs=${procs}"
+ config+=" --with-parallel-jobs=$(makeopts_jobs)"
if use javascript ; then
config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6
js.jar)"
