commit: 4924c4b05b14040cd4cde6b778391410fb66efb5 Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> AuthorDate: Thu Jun 25 01:13:35 2015 +0000 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> CommitDate: Thu Jun 25 01:13:35 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=4924c4b0
Sync IcedTea-Web/IcedTea-Sound support from icedtea:7. Fix X hack (#552916) and typo. Add sctp & pcsc-lite dependencies. Explicitly disable in-tree pulseaudio support, deferring to IcedTea-Sound. Package-Manager: portage-2.2.17 Manifest-Sign-Key: 35964222 dev-java/icedtea/ChangeLog | 8 ++++++ dev-java/icedtea/Manifest | 26 +++++------------- ..._pre04.ebuild => icedtea-3.0.0_pre04-r1.ebuild} | 32 ++++++++++++++++------ dev-java/icedtea/metadata.xml | 1 + 4 files changed, 39 insertions(+), 28 deletions(-) diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index fb7867d..7dcb39b 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*icedtea-3.0.0_pre04-r1 (25 Jun 2015) + + 25 Jun 2015; Andrew John Hughes <[email protected]> + +icedtea-3.0.0_pre04-r1.ebuild, -icedtea-3.0.0_pre04.ebuild, metadata.xml: + Sync IcedTea-Web/IcedTea-Sound support from icedtea:7. Fix X hack (#552916) + and typo. Add sctp & pcsc-lite dependencies. Explicitly disable in-tree + pulseaudio support, deferring to IcedTea-Sound. + 20 Jun 2015; James Le Cuirot <[email protected]> icedtea-3.0.0_pre04.ebuild, icedtea-6.9999.ebuild, icedtea-7.2.6.0_pre23.ebuild: media-fonts/lklug is now keyworded ~ppc64. Remove redundant --with-ecj-jar diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index cf11186..1655e9b 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -25,27 +25,15 @@ DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a6 DIST icedtea-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4 DIST openjdk-6-src-b35-14_apr_2015.tar.xz 33730692 SHA256 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b SHA512 bd19261322aeafe84061be996378b6c65c8453ea4c780342bd44dd710bc6f6f414c4aee2d656db4a2750a6d217a92d20bc8d33c12b45e83504a40ff6d5a59cb5 WHIRLPOOL 69c2408afe7c8aac1a1dd62ab40f755d75c57c6ed3dee57d56c0d8fd5f1946a2516143923352660785d2740895f2c0a1ba90304a2e5f6f7d24fd8b1a78c14234 -EBUILD icedtea-3.0.0_pre04.ebuild 10978 SHA256 f009648f3891b8be5e588fe79f9c59d13943f573c0264eafc6c5ae1e07b3aa50 SHA512 80ed305b0c6ec99649fc58466262182fb0874cccce1749d48255bd14b25d460357287862adcf276cbb048cdb2318aaf9f032101d00fec5433fe2085fcc012dd5 WHIRLPOOL 1cf58293b8f8ba6581d7e6001479b9b8d9f1f57808fe72b2daad5a3bdb419062d3a49548cc5eb37223a23370d575ebbe772f38ba08069457960e8d1730231c5b +EBUILD icedtea-3.0.0_pre04-r1.ebuild 11616 SHA256 08603d2f789e6ef92f9f3fbcc8384bded23a2f213febffed40138ade4d45ec82 SHA512 138647c8f29f7917c80dda82c9178579311cdcf6055e56d739a1d56187dbacc9ff90f94ce2aba42758e9393f176e78501e046d9ff56496a314bef328d754c35e WHIRLPOOL fafa00d1174518fab5b0ba64f76ed08cd80dd7390ca4a5f81a0cd5c92fa90e55eb80f147390d2fc6e111eda3c7797de88b3b8d6813aede6d03ca0fc6025f0adf EBUILD icedtea-6.9999.ebuild 10369 SHA256 89d321a886499e5e3565f0253a5f08e5188795f57d1162902d44bda8a5fafe5b SHA512 7cc9367a475ff10b01314a33bbcc2e4a8409246a7f50404fbc4df335c496fe37bc2c78538cc6ccecb76b55bd8a5f049b3ffe8a1a36e452b97e99e4f6e7e244bf WHIRLPOOL 9f7c08be6252f44255f4864b096da4677d6e16db8fabc3deba9e717bdc81d12df08aa65d8564af1d1d83d6e6a3d45dc0d60a91b6e032fe753f466f8a1d148a74 EBUILD icedtea-7.2.6.0_pre23.ebuild 13181 SHA256 ae430d666aca90422fb023abd49745c20cef1353a210ef2ddc6af6285fc71b27 SHA512 ed082f1256a870db257a94215ad0037da296b9040a0a338fa5ba0f9ed4cc7d1b4099383591c8c1a8fce68d036951ef656b7b6048399251b98467a7ea05c7f87b WHIRLPOOL 3827655635acb133fb46d77605a4ae8ad1ca299e965aac8f8691494e8c2d23389fdbf24973cc4ec35a0ce7048b4de5f9ea1caced6b44796b8f9c1eaeb9e5c2c1 -MISC ChangeLog 91366 SHA256 4af9da0cbc5723123b4c3eb52b21d2414c8110e19736b2706a4e1ef220e727c5 SHA512 55fdf0298eea5c9ea526ee48e3a6832af20fab0b4129b23dd3bdef29340b217d323c75b1067811a4b4f50fdea8f318f6646ec37c06c51cb0808abe6f6eb911b8 WHIRLPOOL 4284a3d761bf2ffe201c0e8ab59a4e9e794dd98964bca946154e5c087631805ce8b236ff37be45d86c30a25d97c623dcee954b0a795497270f4f1b2aec44f74f -MISC metadata.xml 1680 SHA256 41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512 5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c WHIRLPOOL 5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d +MISC ChangeLog 91747 SHA256 3a55f7d5fac8735a61c4fab0a8b6d3c58ca437dab491051a17a403507609128e SHA512 bf4561351c08f242fda9db5e88ab4f0f26bb5c436b3244b2edd6bed71ada40da3d42a7606b828e99077e604fcba3272d3fef35900730d063412fe8fbf409d833 WHIRLPOOL 2f244c8cb22e21d3214003eaaf08c936c5761e9a2dd4f87138ad03f683047aad5e71fb8593cc462bbd9c0da24173254a7216da90d71011927b982892b80eee4f +MISC metadata.xml 1764 SHA256 6bd7ffcf408f3421856648e9a4952f59ef188be7a49ef1cefe4f5f546989dfc6 SHA512 76ab63f0d00b167189d2ac680f3b75fecd6efc75ea848ac0cbcb9c943ab7828634fe07cc27f2d6392bd7ed0e288d9247aeb09ae9a97c0086b424aba6ec5443cb WHIRLPOOL 71d4725e45d99be9d435b36ab284d480962d2c89d2a4202168ebed11f117757943dce5d73ca7b10e775340f7c1caa0221605cfc34065fbaee356d16c2b4f6ba8 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.1 +Version: GnuPG v2 -iQJ8BAEBCABmBQJVhWu0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy -MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kPWYQAI3GJMsTBuV0gumSmxUGKhHS -f94sHxLsfQRMUCKAda1k4D63k/mEH9yxlupHZGJa8L992q4ok+g03nKcAE4WDMSw -MT36rgNFfiHh4SIl6AbUU7YuNt593ZBec78SVhE8SggVQaB510tywmX0lDDNHBcW -kNVQf8E6rGNEya9hVYs/ZZLPlzs4vz6FDa1scdbdt25fm1dSnIHfhV15G3DSc4qP -0FBATcz1+IG+/84uQrySNyBNGgihWPOQBrxkzwjaQlHW5Orgm4HeA3eO1xCMjzvo -zGpUwFFdOPYnpuqXgWGOiX6aKepqlN2kINdsKLeJq+Q2Rt/a4dsCJFMcAqjEJVFA -g4PJlt20aON3cIUqkmRHFMli0owz1r+Nn9TbPJTzd56c26kjJ567FN8hvEc+QiyX -1Ft+SrdBb0vzUutW0TDtHmS3SWyBRpSURZ8SgoNxnuzGCs5/4N4frStew7zWnd5L -j6kDd95fYfuZbVmUJiIq9izerYvVcJ/ATmuj1t1LqE+YdTg+TC9m4FgdYRsZX90i -EM8xsd90MZ+8zdEha8droEkl7zqUHmDPrGje25e3RT0QAAe2bycP9xnaWE2emVV9 -LaOMiFmZlj0yBHQjnzj1D6FGfFRNkRIarXGimODeEVhmQT+i4AdfD+mUAN4a6P5N -ykSR1GXPfD1dk0OZB5d1 -=VDQv +iF4EARYIAAYFAlWLVbgACgkQz9oPmzWWQiLLCwEA8nI1wgExXpECK72H3of5IdTL +UtDzC+kfDI1EUTmFGrsA/jdIwM8qc9tAjJZNAXP8fHYEhTLRMA/Py2GyUvZUp5sO +=k5th -----END PGP SIGNATURE----- diff --git a/dev-java/icedtea/icedtea-3.0.0_pre04.ebuild b/dev-java/icedtea/icedtea-3.0.0_pre04-r1.ebuild similarity index 91% rename from dev-java/icedtea/icedtea-3.0.0_pre04.ebuild rename to dev-java/icedtea/icedtea-3.0.0_pre04-r1.ebuild index 9cf637c..cfcc32d 100644 --- a/dev-java/icedtea/icedtea-3.0.0_pre04.ebuild +++ b/dev-java/icedtea/icedtea-3.0.0_pre04-r1.ebuild @@ -63,7 +63,7 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="+X +alsa cacao cjk +cups debug doc examples jamvm +jbootstrap +nsplugin - +nss pax_kernel pulseaudio selinux +source test zero +webstart" + +nss pax_kernel pulseaudio sctp selinux smartcard +source test zero +webstart" # Ideally the following were optional at build time. ALSA_COMMON_DEP=" @@ -100,8 +100,10 @@ COMMON_DEP=" >=sys-libs/zlib-1.2.3:= virtual/jpeg:0= nss? ( >=dev-libs/nss-3.12.5-r1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) - >=dev-util/systemtap-1" + >=dev-util/systemtap-1 + smartcard? ( sys-apps/pcsc-lite ) + sctp? ( net-misc/lksctp-tools ) + !dev-java/icedtea-web:7" # cups is needed for X. #390945 #390975 RDEPEND="${COMMON_DEP} @@ -146,8 +148,11 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND} pax_kernel? ( sys-apps/elfix )" -PDEPEND="webstart? ( dev-java/icedtea-web:0 ) - nsplugin? ( dev-java/icedtea-web:0[nsplugin] )" +PDEPEND="!ppc? ( !ppc64? ( !x86? ( + webstart? ( dev-java/icedtea-web:0[icedtea8] ) + nsplugin? ( dev-java/icedtea-web:0[icedtea8,nsplugin] ) ) + pulseaudio? ( dev-java/icedtea-sound ) +) )" S="${WORKDIR}"/${ICEDTEA_PKG} @@ -248,7 +253,7 @@ src_configure() { ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.' ewarn 'If so, please rebuild with USE="-cacao"' fi - jamvm_config="--enable-cacao" + cacao_config="--enable-cacao" fi # Turn on Zero if needed (non-HS/CACAO archs) or requested @@ -285,11 +290,10 @@ src_configure() { --disable-hotspot-tests --disable-jdk-tests \ --enable-system-lcms --enable-system-gif \ --enable-system-jpeg --enable-system-png \ - --enable-system-zlib \ + --enable-system-zlib --disable-pulseaudio \ $(use_enable !debug optimizations) \ $(use_enable doc docs) \ $(use_enable nss) \ - $(use_enable pulseaudio pulse-java) \ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \ ${zero_config} ${cacao_config} ${jamvm_config} } @@ -318,8 +322,9 @@ src_install() { local ddest="${ED}${dest#/}" # Ensures HeadlessGraphicsEnvironment is used. + # Hack; we should get IcedTea to support passing --disable-headful if ! use X; then - rm -r "${ddest}"/jre/lib/$(get_system_arch)/xawt || die + rm -vf "${ddest}"/jre/lib/$(get_system_arch)/libawt_xawt.so || die fi if ! use examples; then @@ -330,6 +335,15 @@ src_install() { rm -f "${ddest}"/src.zip || die fi + # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool + if use webstart || use nsplugin; then + dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings + dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings + fi + if use webstart; then + dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws + dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws + fi dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} # Fix the permissions. diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml index 8ff9391..4f0e668 100644 --- a/dev-java/icedtea/metadata.xml +++ b/dev-java/icedtea/metadata.xml @@ -21,6 +21,7 @@ <flag name="nss">Enable NSS security provider support.</flag> <flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag> <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag> + <flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag> <flag name="smartcard">Build the PCSC driver against pcsc-lite</flag> <flag name="sunec">Build the SunEC provider against system NSS</flag> <flag name="systemtap">Enable SystemTap probes in HotSpot.</flag>
