* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea-bin/, dev-java/icedtea-bin/files/
@ 2016-04-12 21:46 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2016-04-12 21:46 UTC (permalink / raw
To: gentoo-commits
commit: be677d64fed9b3c7ce8f521859059bd804a52b2f
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 21:44:40 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 21:46:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be677d64
dev-java/icedtea-bin: Disable SunEC for now (#579676), fontconfig fix
Package-Manager: portage-2.2.28
dev-java/icedtea-bin/files/no-sunec.patch | 27 ++++++++++++++++++++++
...in-3.0.0.ebuild => icedtea-bin-3.0.0-r1.ebuild} | 10 +++-----
2 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/dev-java/icedtea-bin/files/no-sunec.patch b/dev-java/icedtea-bin/files/no-sunec.patch
new file mode 100644
index 0000000..c1d64bd
--- /dev/null
+++ b/dev-java/icedtea-bin/files/no-sunec.patch
@@ -0,0 +1,27 @@
+--- jre/lib/security/java.security 2016-04-12 22:35:18.390181858 +0100
++++ jre/lib/security/java.security 2016-04-12 22:37:10.000000000 +0100
+@@ -67,17 +67,16 @@
+ #
+ security.provider.1=sun.security.provider.Sun
+ security.provider.2=sun.security.rsa.SunRsaSign
+-security.provider.3=sun.security.ec.SunEC
+-security.provider.4=com.sun.net.ssl.internal.ssl.Provider
+-security.provider.5=com.sun.crypto.provider.SunJCE
+-security.provider.6=sun.security.jgss.SunProvider
+-security.provider.7=com.sun.security.sasl.Provider
+-security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
+-security.provider.9=sun.security.smartcardio.SunPCSC
++security.provider.3=com.sun.net.ssl.internal.ssl.Provider
++security.provider.4=com.sun.crypto.provider.SunJCE
++security.provider.5=sun.security.jgss.SunProvider
++security.provider.6=com.sun.security.sasl.Provider
++security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI
++security.provider.8=sun.security.smartcardio.SunPCSC
+ # the NSS security provider was not enabled for this build; it can be enabled
+ # if NSS (libnss3) is available on the machine. The nss.cfg file may need
+ # editing to reflect the location of the NSS installation.
+-#security.provider.10=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
++#security.provider.9=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
+
+ #
+ # Sun Provider SecureRandom seed source.
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.0.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.0.0-r1.ebuild
similarity index 91%
rename from dev-java/icedtea-bin/icedtea-bin-3.0.0.ebuild
rename to dev-java/icedtea-bin/icedtea-bin-3.0.0-r1.ebuild
index 7e102c6..f812c1e 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.0.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.0.0-r1.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit java-vm-2 multilib prefix toolchain-funcs
+inherit eutils java-vm-2 multilib toolchain-funcs
dist="https://dev.gentoo.org/~chewi/distfiles"
TARBALL_VERSION="${PV}"
@@ -90,12 +90,8 @@ src_prepare() {
{,jre/}bin/policytool bin/appletviewer || die
fi
- if [[ -n "${EPREFIX}" ]]; then
- # The binaries are built on a non-prefixed system so the
- # fontconfig needs to have prefixes inserted.
- sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
- eprefixify jre/lib/fontconfig.Gentoo.properties
- fi
+ # Disable EC for now, bug #579676.
+ epatch "${FILESDIR}/no-sunec.patch"
}
src_install() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea-bin/, dev-java/icedtea-bin/files/
@ 2016-08-02 22:34 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2016-08-02 22:34 UTC (permalink / raw
To: gentoo-commits
commit: a139324480ba3b552ddaa09a49840007eab585da
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 1 20:33:44 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 2 22:34:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1393244
dev-java/icedtea-bin: Bump to 3.1.0, adds multilib for amd64
Package-Manager: portage-2.3.0
dev-java/icedtea-bin/Manifest | 10 ++
dev-java/icedtea-bin/files/icedtea-bin.env.sh | 18 +++
dev-java/icedtea-bin/icedtea-bin-3.1.0.ebuild | 151 ++++++++++++++++++++++++++
3 files changed, 179 insertions(+)
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index f9198fd..010526f 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -2,15 +2,25 @@ DIST icedtea-bin-core-3.0.1-amd64.tar.xz 56933308 SHA256 e19c85536d042d20f725c20
DIST icedtea-bin-core-3.0.1-arm.tar.xz 48954784 SHA256 d3df31b2fd26abd5bd068727ad77d97120670659e64fbdf04eecae0403a43088 SHA512 8eaee6c16f066c971a433fb146c980df6f5777022bf876a1d17c5551737aff0888d86d580287cd931788c468b0a176f97f45651b7fa721dbb363f7f6c470296b WHIRLPOOL 407763172f9e1688bc89419b51626812f6a3440b94a2ebe40f56b34da9a67a819b1c72e519d52f391fb363076f22a9f0848aa26ee600b22e638fbced3e28ede6
DIST icedtea-bin-core-3.0.1-ppc64.tar.xz 49966028 SHA256 60389202417cdd136b341d03d886f514534939388b055b08f206e86df5e15640 SHA512 634153fad39bb9efeb26ef823d0b10cc7681f55b5510eb00a6c61d3b4af6ea691c1b19de23baea9d149cf2d3d4a20296a40c4f97e438bd8b97f853a6340b0933 WHIRLPOOL e5dad750128ec5eb8fc0640753a6af8b8f4993307320a5dc580516da049991034f751141069e8022643a199afc704ff15cc85a172bf2f3fdbb3238667076f58a
DIST icedtea-bin-core-3.0.1-x86.tar.xz 56406280 SHA256 e0c380d493b67bae7fb0379720f65106877e3d5abf933e0c22aaa29d9d774ec3 SHA512 bf4c1b8da8f5301efadbf05ce65d0ae451e2445e1bc5e2244a8b3689df53d8b6e55aeb13a877f2458e9c48c46f4c0c180a1036b309692aec1a30a76cb33f7b58 WHIRLPOOL 7640c3e8354f10dc0bd03e37ecd4240a758382bea8092d6c30e389992ff16ec30eda7409968c15462a4c7ebfa4eccc41bd50b3eb94fa98da1952226ccc27ef2a
+DIST icedtea-bin-core-3.1.0-amd64.tar.xz 61688188 SHA256 51cffe3202b311bea19c5a6b85332578986af80b0eafc9833dc83b1823c80403 SHA512 87138137dcde5197fe146ee6a6fc7076980237dba8661ea786902bf94dfd614a1f71fcccf4632fb91bb1d73aa267fef80d9d894b2ae3d820686d4b841a4b194e WHIRLPOOL 4a676f031ed0caadc4e4bfbb1f8f8af6c97443078717feffec172f6b4ef625f7afbc6aa800eb4704fe2de1bf24d46febfc302754d0ac47a8dc5cf7a71699c334
+DIST icedtea-bin-core-3.1.0-arm.tar.xz 53013144 SHA256 8d3fe33f9cd65936cb0aa5da39fca3bd3a2b73e88ca3870bc066b2caa5c6de78 SHA512 acc0b057f4ab3748c6f1e492ee47cea5fe566781721717c34fa7100685bdefa76be5d463b9292f3e80708632c1d45f62509ce50b521c5dcddee09e2aa73a4de1 WHIRLPOOL a05385af3d2f4c9190b20e3167aeca860600de6d2b90fc04a4958e5153d47a5f2637e783ac4cc423642cd782a0afedde5e15d2333201a175919860953eb5838e
+DIST icedtea-bin-core-3.1.0-ppc64.tar.xz 54025844 SHA256 2183b3c2764d3c4293d9af7a6bd27249e469c75f1835d0f9f9acc4ff27354227 SHA512 ef259a57e354f149f41d1f1d3f67596e6adf931104953599baee95cb8adf6f329a6d7f739d71b6aa87013494a19989bc953e83b40a0452ed5824a79b78d78682 WHIRLPOOL 6c1dae02103379b4f0cef1547428c11eeb3b0e1aa6b06f14e6856da1925295275e07eab03e02fc302eb96fddac26266eac6ea6be6c8bce65d0d3e8a1f5b8b0ef
+DIST icedtea-bin-core-3.1.0-x86.tar.xz 61073964 SHA256 f8ab3a75f48444fa608fda61163423db473f99a8923a4f7ea17c520382578fd6 SHA512 1380b1875c7ea48000cc1bc557f8f6a222afd2304afd145db413f7949e7919d6d1838aadc84c6059b6aa105879b2f0b92c99a19da96906c107aa7d42c85c94a8 WHIRLPOOL 34a0800d86460fbde7b8d3f036a4310866ab7b7c65b46ddc58ef6c4f97344f530e346e111dfd76d2dd9f22546b75a883b9e296ede8d033ed1b20d72f1b770b3c
DIST icedtea-bin-core-7.2.6.6-amd64.tar.xz 53051836 SHA256 9729ac37ed34b60f6a9c18c6865e99648379c79e24f189842c0f8dc81424fd9b SHA512 ee621f3dfcc19fb274acb8b936f7256b2053ff97864340732e6cf97db5a265d81ace7269c9f90ee7e4135b4299d7ecdd2b660f5e806ede64e4d74a4dd80b0592 WHIRLPOOL bfd8dd85fd074f7f16d296a41bf7ccaaa167fbeeb3bfcde4119c2b2ee8a59aa2dad9e627a15dd3790f318b9fc8fa8328ead9c472af527a82a93c153b1d92de02
DIST icedtea-bin-core-7.2.6.6-x86.tar.xz 54697212 SHA256 c33e89990e1207458abc56ab0b2720b239ee0a3924e73360e19f52e7a29f8ee6 SHA512 7ebca976f2864cee1e08ed858e93c0dbbc850d127c9359b7e1edb7abacd7e14e0b5cdbb1f042ffd40232cbcea72f21074caad2a669096a5a5a7808c246d4e04d WHIRLPOOL 6640c59170b451f81541cf98451325d596115ad8e530b9d5fabb6f060e4e32e09c9ac49b6799694508108f09b58b82f98c4bd4d678ea8d9319c5653ba342d873
DIST icedtea-bin-doc-3.0.1.tar.xz 11681216 SHA256 5f05fb2fb4a8eb6e52d2d26100d04e121e1afb5611ff68114bde323f5540581d SHA512 1eea99d62e8fc0c917e4622b798df6d32ec3ea6f90ad9b949530dcdf64dd14a4fbb6d7c334634b8aec22b2775fbb9a67b0f70afb79ea678015bc266743afa794 WHIRLPOOL 8ad6d54042627374948447b48fc52123af37fdfcf9bbdf757240d42623b3c3d9d69b76775efb70b9b8e5bd6a7b914e77d0f0f34352d8fe32b6f70f87169684f5
+DIST icedtea-bin-doc-3.1.0.tar.xz 11683216 SHA256 05e5ed8110123e4a0941458f4b4b73ee999029db98fcbad35033d0de97e14b25 SHA512 cd4d3f60e29777240a26ac6fffead099ee31eb05bfb2faa8f3c2c5a7c2aded3159ad0a8aecdc298e7a84bf96cae626d7c1b1cf18af24c39f02c6455d260a64a5 WHIRLPOOL a008c276bf6da08385524c8886366d2f62c2975659d6181991bcbab9f2396a8a8c5a1cdee847d71d6c994ded738d126aeacc4c7180f4a1f5202a7e01f171db00
DIST icedtea-bin-doc-7.2.6.6.tar.xz 10603724 SHA256 150a8aa157b442569b60491c5261909a7a381e0a253070e2bf6d9fd8d0344708 SHA512 39ab65e002d9f780c881cbdea41a4fbae792080399a020c189d7fccf24a83c604ecc90b6fad47b9657eba11254b1021d8c45d83cb8a0dcfe62011f9cede53ce3 WHIRLPOOL 480fb25b1b551699163fc07ad5bf31e774c38f4ef51694d906d0f5c5c5d3f4941806b352ee472fdc3e02c007d96a28d395c41adc4d4965f826babb2465011bb9
DIST icedtea-bin-examples-3.0.1-amd64.tar.xz 1811748 SHA256 9728a787131d892eef67c0b10882f6a7e33d0fde2a6856c84f1c910086eae7fb SHA512 a76caf7a7927e28dc0e46a4e851540231971fd7fd0f4be1c46c1b72e71952495590a10f56aaa60defd0f9d00c77830dc716fe6ecb1c4777e7d0862804d72d463 WHIRLPOOL aca2ade6113814dd4ac89bb1a730cdd36cd6c33162986bedc58df790b10d7ab469192a36e854f2ff34eb13a787420c01e48c5c6d5636be2159a1ca10b5261c9f
DIST icedtea-bin-examples-3.0.1-arm.tar.xz 1794448 SHA256 3cce37e8ee7786c80a1dc90088ca278c81e2239481e7ede4f59c2c3178fa7db0 SHA512 08645c50ca1ad770bb7da044a74b47f4c8590b5382874af3f8683ddc741ba87d0bc3ddcbe0617a551d18da6bd8746fc75ba9c5bcb237b56fa7f4c0dafd73acdc WHIRLPOOL 36ae06e990e1d5aa88692e49eaf2ef4f4dd8ff498cba5eb7259a516b29b543f4522d4fe78ff40baf53e93faad93792ace115e48bc5173211ce18b04902297da4
DIST icedtea-bin-examples-3.0.1-ppc64.tar.xz 1805088 SHA256 5a07a075c4bb3319b734daf1dcbd22670100cb133706aa5594718efa79802cb8 SHA512 4a81748d24f2e3c05445d7331c5327aa05606692c96cd983dbdb29cfc2e96bb2b0fb306fcf97e7fedb90aca8a64ec229c0355be26c4d5b829979ffad79e2b9dd WHIRLPOOL 0f1f5cd66f085e7e430f7a636e6d6e59c8c108fd437bc9ddfd98b6e8c71f7b921900565e2c6c5a7ae768214dd700663286f75365e8c8cf36e542f59ff08b5a4f
DIST icedtea-bin-examples-3.0.1-x86.tar.xz 1816976 SHA256 1704607f2032438115abcc332002dbfba3b9e8653bc016e65e505cc782bf162c SHA512 674ad236d24bded4b1623ffaae779cd87a0cccf082d4318cfb0ad454eaf9c05911b283963fbedf26a9ab922b6b781f1b4ef5b2b4984123983e8ceb2a1dab60c8 WHIRLPOOL 9418ff7721a49e6d926265e7935647d998cd306d79339c896eaabfa7605cd425a911b261c44dd70357a084285f70aeef28468af6b578ab77c7876778be671643
+DIST icedtea-bin-examples-3.1.0-amd64.tar.xz 1855912 SHA256 f5d40a7d8a6e2877f0edb331e2fe288be12f07c373b088889e7682440ea1348c SHA512 c89acc0b6e3b41f043da6a95ca73239606e6b4d262de0a38624e1f31539619c60933ffc6c92ef8f5cf2cb88b2c3bedabe129fbe88a6579c1d44a60c806112139 WHIRLPOOL e2c8567d4d419f79828157118cf2b581b25e6519b13d9fda4c54adfd3c2ac08b593a5f190d1deedfaa19cdf34003748caf6d714751e0b1538038b09005597969
+DIST icedtea-bin-examples-3.1.0-arm.tar.xz 1838976 SHA256 a64f2e9b0129847f629304cc96d3b003005afd4bef8160d53c91dd585f956c6b SHA512 a36657b5b9eb26322daaf7e47cfcc7505e76b936cd00f8e6f6b1e631b4c02e6bf652d021981a39dc70825688cf0fdb6a975855bf0a98dd4212e1c8a578d06673 WHIRLPOOL 511a9734857e31a37ce2fdaba0be1215514fd07d698a2bfe820539829d7376df0fa6d91644c63f4add4f97eb7dcca4f8aa8c8fc198c169bc0f0d76e1e62f81d6
+DIST icedtea-bin-examples-3.1.0-ppc64.tar.xz 1849324 SHA256 8ccc52218af73fe29ef15d2def1ab131637887a692599af2314e99b53cf23753 SHA512 bf1a9dd9447fdffffeaf6c8be18ea24c439c15346f4e1938a214427b491c0245f0727dd895b85a12fd22b06f3e105a4e20c82f91ba4d3347cdc2adf9922aff69 WHIRLPOOL 3cc5316a5b83c81b53ad2971860cd6bc6fde4de69560cf59d380cbba17f950cf0d0de955c8a1da1f6c4e5e8e96b7e03475ed28bc861014fd50327266290a1c8a
+DIST icedtea-bin-examples-3.1.0-x86.tar.xz 1861868 SHA256 34b7e8c4baa1145c86790cf8ebd90df9ba3e466c4743f405c13682eaeedd7691 SHA512 d4f77345dea35c7ffdf06bd6a24d117c9dac26802562724a048f4baa95c9d0d463005e6537b79d7948ff6b1ff3fc87690b531c09cf2130f34af829168bc5b615 WHIRLPOOL 07c3b24782f47cba8ff57c89d2459bfb1c083fd160948e4d6b8f01258d1c9ef1ca8326b214e7ce2868e92f924ff02062d526117dc0f291ab09dda54f025676ce
DIST icedtea-bin-examples-7.2.6.6-amd64.tar.xz 1796808 SHA256 b6add78d86e3420f589f6bcfee1e4a9fb983fc4d0b6a905fe162dfca56e73500 SHA512 38e2d91f6621e38959c2d0bef84f4d566370303a5b50cc468cae6fc97da46d752fccd8c980b6490f43709c0c6340c3af88dd9f7c9a0d7f400289127aa568b3ac WHIRLPOOL c212b2a953f784a05759a1b82d7120fbb5f642d8d7f014750f8c509aa44c29f193f17dc86257b1b653f0e5334e167054f71021726745adc8b8d1c57273902223
DIST icedtea-bin-examples-7.2.6.6-x86.tar.xz 1796496 SHA256 5f7a4f52ed2f36d06ecc6c37041e2b400ed84c56ef4921375a925682b4523d88 SHA512 e80c965ca8cccf60561138fb5c4f21e293b6e44b5a4cecc97d94ffbccffe4f18da40942e2659c7264df54563c8db327b5e7a7f71fbf6ef873a4e74afc122050a WHIRLPOOL 402a1e10aa17e875dd83adff72dbe9d37c05b40a44c26e3212658ea690efec3dc9a61b57aebe24c77f16c52961dcd925f412c645e828e9e0456ae3a8d77ebd9a
DIST icedtea-bin-src-3.0.1.tar.xz 45656168 SHA256 0820242fa98a918f0a25c248cb43a01ba13f87848eba43aa1b731b9ca17f576a SHA512 ece43dcc77812a1e212b48cc4d30a795055e74d52c2f5faac9b8e07fc26f51d3963cd333f71d2603cf3ac82f3ec80fea5093787f079fbb1cea969193b120a4ce WHIRLPOOL 5f7546142824747ae2d551d004223d577ed4d32acb988d1d3cd4f42fedd0a94903366b0b3bf042c0b86d5093b4c32c3c44ae6abb82aceae390de45d8d44cfd1f
+DIST icedtea-bin-src-3.1.0.tar.xz 45670204 SHA256 4a96edba2b2d8cf91253bf2ceb55316729e9688f456abfd46695dceb96dfeaa6 SHA512 f1416398761f66bb57803368aca9bf17a14b4366b99ab3fe8ca3e470c026e962a2554c1b089b879e6d0ce43626a3eacbc81bf6b6f13f9593df54fe05b78256bd WHIRLPOOL 10ee09c2d860f6f0ea1f2fb3d545fd5909e1d6b6fa16d59f873ec35bcfd02d229a294df6ef3b9bdec8c9d899b562df4056d0cfa626454d9d774499b805d5c8cc
DIST icedtea-bin-src-7.2.6.6.tar.xz 40045788 SHA256 4d759dfc12a39ff44650b61a5a89f2ee4dcc5d6d0a863c54f8c6e2c86023ce8c SHA512 13cf426366bd7ced497d16b76dd5d49aadfac45e9686b78c185b4d7c95b47f96fecfc789b14138780592580c39857a2d68d8d35a6d016fb4ba1c0c8103b74f9f WHIRLPOOL f645c6da2a5c08e48bd6598bda025776d4e4fceb3a92898b4c5d9ca7321797e834df572656c07cf24fbd2eb0cde097b38137472857d968b663ccba2788406c07
diff --git a/dev-java/icedtea-bin/files/icedtea-bin.env.sh b/dev-java/icedtea-bin/files/icedtea-bin.env.sh
new file mode 100644
index 0000000..a77df81
--- /dev/null
+++ b/dev-java/icedtea-bin/files/icedtea-bin.env.sh
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="IcedTea JDK ${PV}$(multilib_is_native_abi || printf ' ('${ABI}')')"
+JAVA_HOME="${EPREFIX}/opt/icedtea-bin-${PV}$(multilib_is_native_abi || printf -- -${ABI})"
+JDK_HOME="${EPREFIX}/opt/icedtea-bin-${PV}$(multilib_is_native_abi || printf -- -${ABI})"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/$([[ ${SLOT} = 7 ]] && printf :\${JAVA_HOME}/jre/lib/$(get_system_arch)/xawt/)"
+MANPATH="${EPREFIX}/opt/icedtea-bin-${PV}/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.${SLOT}"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/lib/jfr.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.1.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.1.0.ebuild
new file mode 100644
index 0000000..f78675d
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.1.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib-build toolchain-funcs
+
+MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
+KEYWORDS="-* ~amd64 ~arm ~ppc64 ~x86"
+
+BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
+SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+ source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+ multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )"
+
+for abi in amd64 arm ppc64 x86; do
+ SRC_URI+="
+ ${abi}? (
+ ${BASE_URI}/${PN}-core-${PV}-${abi}.tar.xz
+ examples? ( ${BASE_URI}/${PN}-examples-${PV}-${abi}.tar.xz )
+ )"
+done
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+LICENSE="GPL-2-with-linking-exception"
+SLOT="8"
+
+IUSE="+alsa +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND=">=dev-libs/glib-2.42:2%
+ >=dev-libs/nss-3.16.1-r1%
+ >=dev-libs/nspr-4.10%
+ >=media-libs/fontconfig-2.11:1.0%
+ >=media-libs/freetype-2.5.5:2%
+ >=media-libs/lcms-2.6:2%
+ >=sys-libs/zlib-1.2.8-r1%
+ virtual/jpeg:62%
+ alsa? ( >=media-libs/alsa-lib-1.0% )
+ cups? ( >=net-print/cups-2.0% )
+ gtk? (
+ >=dev-libs/atk-2.16.0%
+ >=x11-libs/cairo-1.14.2%
+ x11-libs/gdk-pixbuf:2%
+ >=x11-libs/gtk+-2.24:2%
+ >=x11-libs/pango-1.36%
+ )
+ !headless-awt? (
+ >=media-libs/giflib-4.1.6-r1%
+ media-libs/libpng:0/16%
+ >=x11-libs/libX11-1.6%
+ >=x11-libs/libXext-1.3%
+ >=x11-libs/libXi-1.7%
+ >=x11-libs/libXrender-0.9.8%
+ >=x11-libs/libXtst-1.2%
+ )"
+
+RDEPEND=">=sys-devel/gcc-4.9.3[multilib?]
+ >=sys-libs/glibc-2.22[multilib?]
+ virtual/ttf-fonts
+ selinux? ( sec-policy/selinux-java )
+ multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
+ !multilib? ( ${RDEPEND//%/} )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+ nsplugin? ( >=dev-java/icedtea-web-1.6.1:0 )
+ pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]]; then
+ die "These binaries require a hardfloat system."
+ fi
+}
+
+src_prepare() {
+ if ! use alsa; then
+ rm -v */jre/lib/*/libjsoundalsa.* || die
+ fi
+
+ if use headless-awt; then
+ rm -vr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+ */{,jre/}bin/policytool */bin/appletviewer || die
+ fi
+}
+
+multilib_src_install() {
+ local dest="/opt/${P}-${ABI}"
+ dest="${dest/%-${DEFAULT_ABI}/}"
+ local ddest="${ED}${dest#/}"
+ dodir "${dest}"
+
+ if multilib_is_native_abi; then
+ dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+ use doc && dodoc -r ${P}/doc/html
+
+ # doins doesn't preserve executable bits.
+ cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+ if use examples; then
+ cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+ fi
+
+ if use source; then
+ cp ${P}/src.zip "${ddest}" || die
+ fi
+
+ # Use default VMHANDLE.
+ java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+ else
+ local x native=$(get_system_arch ${DEFAULT_ABI})
+
+ for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
+ dodir "${dest}"${x%/*}
+ cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
+ done
+
+ for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
+ [[ ${x##*/} = ${native} ]] && continue
+ [[ -e "${ddest}"/${x#*/} ]] && continue
+ dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
+ done
+
+ # Use ABI-suffixed VMHANDLE.
+ VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+ fi
+
+ # Both icedtea itself and the icedtea ebuild set PAX markings but we
+ # disable them for the icedtea-bin build because the line below will
+ # respect end-user settings when icedtea-bin is actually installed.
+ java-vm_set-pax-markings "${ddest}"
+
+ # Each invocation appends to the config.
+ java-vm_revdep-mask "${EPREFIX}${dest}"
+}
+
+src_install() {
+ if use multilib; then
+ multilib_foreach_abi multilib_src_install
+ else
+ multilib_src_install
+ fi
+
+ java-vm_sandbox-predict /proc/self/coredump_filter
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea-bin/, dev-java/icedtea-bin/files/
@ 2017-12-06 21:54 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2017-12-06 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 043e9640fa515fe860cec44454d19fd77e0a4ecf
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 6 21:49:52 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Dec 6 21:54:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=043e9640
dev-java/icedtea-bin: Goodbye Java 7!
Package-Manager: Portage-2.3.16, Repoman-2.3.6
dev-java/icedtea-bin/Manifest | 24 +--
dev-java/icedtea-bin/files/icedtea-bin.env.sh | 4 +-
dev-java/icedtea-bin/icedtea-bin-7.2.6.11.ebuild | 207 -----------------------
dev-java/icedtea-bin/metadata.xml | 1 -
4 files changed, 11 insertions(+), 225 deletions(-)
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 0c82b18b2fc..5e4a4d3c449 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,20 +1,14 @@
DIST icedtea-bin-core-3.6.0-amd64.tar.xz 61911044 BLAKE2B a9efef5d7e482d9a158fe0023252e95225e411237b227338386b9e9ead712b525afb8ecec9c7c382168b8160a66c7417113d53aa8553ded5d548a87371141f9a SHA512 630cba001ad511133ec7997c931891523e05062b6e5460aa392af551e71198481b7f13eee478f234ab9eb33efa059f7b54edf451cc9f5ed26a7f4d023f8a9cc6
-DIST icedtea-bin-core-3.6.0-arm.tar.xz 57965524 SHA256 09a4022a25b31df111475fafea10dbe3a05e69a7b0aeff0224d86903c3c6c9e6 SHA512 731a154fcbcaaf6cdc638b91b72bc65007798de2c31125279a362d3f521bf88a130e6d51ab185f3880687f5f2b07aaab01cf2665e28715ea83191ae6979fbdde WHIRLPOOL 1dbe765023aed33cbe655505b5c1723f6d9e1eed24d021c924b0f2f3ed4ea32164cc46ec9db23a205869692e6ac79320d8169c79ebdf509a7bd49bdb6b140735
-DIST icedtea-bin-core-3.6.0-arm64.tar.xz 58962420 SHA256 5fecb710513230971b4d5c640c9fd91ed333264d14808ff1d32a447b6a9ed05c SHA512 83c65e73fdbf1852a8eefac0ad077fbe988a46ea95a6e709a975df8d7ad812b8ae21c62ba8cd1fb51647836f83d707d6c423c06043cd9be399c5f8a15373e9ac WHIRLPOOL ffc6b09c27623bb7a366bb842bb6c61a6858d5d1e4cce9fda49ddee9293513410a2b1e65ffb847c20c6894a0b7358c594a90184078b6f8451510330d4d61c04a
+DIST icedtea-bin-core-3.6.0-arm.tar.xz 57965524 BLAKE2B 82a3f0d766afbeb4114a8887ac10823b9694edd93b0619e5ee62e80bb706f60e72df2e7168c11c7914dd210ceee49b0317dccf2184716e927c6da63edbeac095 SHA512 731a154fcbcaaf6cdc638b91b72bc65007798de2c31125279a362d3f521bf88a130e6d51ab185f3880687f5f2b07aaab01cf2665e28715ea83191ae6979fbdde
+DIST icedtea-bin-core-3.6.0-arm64.tar.xz 58962420 BLAKE2B e0ab8f8cee1c7284d78aba202a8b65a045be8037e64f9bc32d08eec39706737e5bad087111def8b94acd962c0c34e4ea2da153726677164747b433f9cc9f85af SHA512 83c65e73fdbf1852a8eefac0ad077fbe988a46ea95a6e709a975df8d7ad812b8ae21c62ba8cd1fb51647836f83d707d6c423c06043cd9be399c5f8a15373e9ac
DIST icedtea-bin-core-3.6.0-ppc64.tar.xz 54236316 SHA256 e3f65f96247cfd9d5c8cb472d6335511b143b52a20e07cda7d7d11fd101f11ab SHA512 88187dddbf0acb26b141dc2b04000c710837f02a127bbf90b2225277e1eee7b04ac30a15a2f68ee0d3fc55a3175501131266ba2cd7aaf4231e0f2a67b4106e92 WHIRLPOOL ff33e4a15b3ea0773553819bb29bdae9531a4ea4f0ac421a29e03841bda2981cf0121d675c37dee9687751b937949da12220f6c10bee6453ba96d30d273a331e
DIST icedtea-bin-core-3.6.0-ppc64le.tar.xz 54269552 SHA256 cd07172e19d4e914ef4157fb455e891059ec6b1d6923cc352d5e36e74befa851 SHA512 49842bd5e2a620b4bd1256085c88fb8f374f255086fc0329cb74f0be8cad4d6a4d2385a7e8b5b3e49bda3e1861fb8128fe12392fb5ac17c2ad00de9975950894 WHIRLPOOL 4b302c8b0980326376d10bda3583f1e5a2ed9f89051d3d6ad8cfe2ba917f1041d89f04316591f7bd3a10db3f1a1375f8a5d44e7f769fca1335be889fd9f5cc6a
-DIST icedtea-bin-core-3.6.0-x86.tar.xz 61382796 SHA256 79b1339a8563c3ff1c775ae313c43f5265befbe7a2bbd4ccdd69f1e61fb223be SHA512 0d2dc8d6a080cc0f85ae85fbea842b0ede86df4a1ee4d1db1ef48977039230b4060a753ed67670f154d8733fd74540485290b343ca755cd71f54bf92ad86270b WHIRLPOOL c77de0732e08df5ad2fa8f90fd0637920d5f781d5599945534f5dd2efdec4f71d058354d30b6308f9b36323570e093c18e8995c7d898a0c297abc528f1b78033
-DIST icedtea-bin-core-7.2.6.11-amd64.tar.xz 53452816 BLAKE2B 5565b23c2443d8067be4d2d7dd5552ff0a2ee0ed76935d8f2cf411f18eeb2d9670b4164efb42dfb4acd66d55d84c5df03ebaf1b8ad4b5ebc450857d210318088 SHA512 2801c07230c8fe041ff7b945afc67da582dc820c02ab4c948919ada7e728613a20afb86cf0f552102047c2e10738f0e16d388eebc5b3a44cb245e1eb2829ec4a
-DIST icedtea-bin-core-7.2.6.11-x86.tar.xz 55369568 SHA256 90143af039d56edebf073c38f199dd9c2f7a0f8f22ee28cdd25d5ce5f77c094e SHA512 90b2bd9b79bf287a6a76850e7d60f26de309b07180b8ca42709784c9ecef04e150a35760398b47967a87fb6391aea430ec22d6e7d1e7b8068e8069b27d26646c WHIRLPOOL bad37af054535d964e696d43ae99acde61228d84110350c852fff5ff97cd6fc6a70d053c4962aeb52b99c24a4b7c87625696e3c4fcb7f01c6363ae0ff5c86963
-DIST icedtea-bin-doc-3.6.0.tar.xz 11681684 SHA256 2b9c5898c645072b72a1810881626756d2afbfcda6d4f5633e86e084095d026b SHA512 a04d927cef6026833c7ba8d1127a4f0c2334969bade3ce6f2b6c03f174e8781de899e11467899721a9f450f6e87b64960b3583accede3269386251c1a8d6f1ed WHIRLPOOL 94008767054d0e3a66fb500fa1515c2606818204bda0c0ae87618e481017b34248d6a97cfe5702920dcb589d19a1365dbd5e99d78c7823f9b9c288a1f89265a4
-DIST icedtea-bin-doc-7.2.6.11.tar.xz 10611016 SHA256 b1d785364491a62420f8fded47a936c292e962e5b208b852c7235e1a80f69667 SHA512 6a1d43f469b98288b138b0a0e520185d89e487c61afaadfa82afffd7b0c5c5377c2fb03ce6abfb12da22ce54eb989371d82dca5b49d561e63bd2230961c2fa17 WHIRLPOOL b7482657675223cbe924e75cb428191e7dd23ab203a56ccd466c522fa0d52299aca2b12f811d27b44a4a8e2b038216184c311344d44a0499530d0c7214f518d4
-DIST icedtea-bin-examples-3.6.0-amd64.tar.xz 1855840 SHA256 4c199d5dfc9397f551a6d53021ebfd13a435b3a9f55af927247e3802038741ac SHA512 17e6b323d4f957aa2241b305a1ba9a0e3426593be7f35cc926d4819cf059e1022a837dace23d8aa37af713912c5ac15291b9b0cabbd9022edce86cc2294d5293 WHIRLPOOL 0c38cab1eaf1c1a0dfe58f780268903ab7132b8084a2b428c286b368034d3c0b0171a84f6175a86f7bab77325c0c8e59e7c064cb90bb6d06afc9cb13a439f29d
-DIST icedtea-bin-examples-3.6.0-arm.tar.xz 1840000 SHA256 459b10682419d23dd5373c42add1a8634881cd0885ed23c52ae4164cb641f839 SHA512 4a583857597c9d036f20b74ff620894499dc9b0463d517151f3683d092050bbc10f7eb5f84b98b6ec33e80d5ea4f250466a7c34f8a3106dc36b359865396cac3 WHIRLPOOL 672a0679d37cfa0c81e280b527686747d1b5cc5d80f2b8da00b10ed213070c5a4f944fbb79485d2d7b38dbfc06f2f754e62e86127d3ae8c8b92f50d601eaabf8
-DIST icedtea-bin-examples-3.6.0-arm64.tar.xz 1835852 SHA256 9dd8c0d4e4f17dad9b6a03b654ab9b4a6c0ebd8a275cbd40c6ea344b7d157beb SHA512 c0e779acb241caf84b9639a2714edcd4d8fc329917003a05386cabf8f2e9e2277d35da5925c6550980a90baf0138710fec7db19a1ee0caacfcbf876e7651c31a WHIRLPOOL 9fd2f5e3f21304f784db560c75497930c23cb86af59bfc34990118ba7b818fa06b65e4cbf4454d006ec008437f12595ec51e829561e17dadf09d6c5268a04eaa
+DIST icedtea-bin-core-3.6.0-x86.tar.xz 61382796 BLAKE2B c0e61aaed35e8533c82ad62f663e00a67a4d1a0614ae6e263d4cb1fb81c8e8706a29acefaa1185b1d4dfa32769ce2c05225521018ace9d6ee999153f3fbd178e SHA512 0d2dc8d6a080cc0f85ae85fbea842b0ede86df4a1ee4d1db1ef48977039230b4060a753ed67670f154d8733fd74540485290b343ca755cd71f54bf92ad86270b
+DIST icedtea-bin-doc-3.6.0.tar.xz 11681684 BLAKE2B 4124d3e3daad141a2d1d08b2744e98aaf2c2bb05c3471b4bf983d6aac70b3b6f3a36d5b1886b535b004f613e5a787f215507e64178bf4e2eee9bb5e75f28e615 SHA512 a04d927cef6026833c7ba8d1127a4f0c2334969bade3ce6f2b6c03f174e8781de899e11467899721a9f450f6e87b64960b3583accede3269386251c1a8d6f1ed
+DIST icedtea-bin-examples-3.6.0-amd64.tar.xz 1855840 BLAKE2B ef629ca83136160445e89123267dc60375974d8b0559e51404a165ca2110f72e693ada9e02a91166531a17672a6ce526962a4f2e12ecabbee0800d047a01b7d0 SHA512 17e6b323d4f957aa2241b305a1ba9a0e3426593be7f35cc926d4819cf059e1022a837dace23d8aa37af713912c5ac15291b9b0cabbd9022edce86cc2294d5293
+DIST icedtea-bin-examples-3.6.0-arm.tar.xz 1840000 BLAKE2B df8fa8c32672cdc6f45f9092478b63e5ca6acb8d20d368d6d7175ca8ee17f282bd67108a014b5469b56ed76c83ba73db9161aed0e9e6157294952da78c2115d9 SHA512 4a583857597c9d036f20b74ff620894499dc9b0463d517151f3683d092050bbc10f7eb5f84b98b6ec33e80d5ea4f250466a7c34f8a3106dc36b359865396cac3
+DIST icedtea-bin-examples-3.6.0-arm64.tar.xz 1835852 BLAKE2B e3e181205cd4240214a9cafa74162ba85c9949af5b2625445b36ea7a97c335d26f388e459ef349115b3a6245d7c1df13c002a6699f65c1fd9f2cc2a3f38eab6c SHA512 c0e779acb241caf84b9639a2714edcd4d8fc329917003a05386cabf8f2e9e2277d35da5925c6550980a90baf0138710fec7db19a1ee0caacfcbf876e7651c31a
DIST icedtea-bin-examples-3.6.0-ppc64.tar.xz 1848136 SHA256 561ee38b6de933e03acb37064963f6c7bc49e97b135a13a28033b1d2aa012649 SHA512 62a1d1f518838635bddabd813af96033ce1d48edb0b38555987956f6df23dae8fff10baa8abb4e68e7eecd811403c8598fab1b0110757756b20d4c923434b65d WHIRLPOOL 5b59034bf0dedf1429fc859e0f04bbb0d649113118c3df24595325b55400f007aaa771073f6d2bca88e78687ad3e9445f14db0dbf6d6c9e31d4d8f2c97b48988
DIST icedtea-bin-examples-3.6.0-ppc64le.tar.xz 1845232 SHA256 417df741a95d24399225c239abbd5d71ae9453a3650b888c4c0afbf36a98cc5d SHA512 c0b9f554d0b72ee1b7998c58081dca63d56b58ac3019216faf081752e3133d0c79b14abd61ae7a9ebef33ae8ddccac4b162fba97b742b5823c72401f2e85bc19 WHIRLPOOL 95fec3c03e2c99e785db0ccb03e49ab446a3a25af5940ec689a95c8f06d928a23c9509ce53d23bac3991b7a85ccba1f1dc5d2ec6db1283fcd8ce42998cf7a331
-DIST icedtea-bin-examples-3.6.0-x86.tar.xz 1862508 SHA256 d5fb362b8336e01f38bd990b7639c6d2ed346f27d2e56696b53804dc9dbc1b68 SHA512 d0f39687cedd4c8282816ef923163a5506eda07bfd0850bb3dde78daa4b2e21749ea273be9a1deb9e3d3f32e3dd9d1e587132229840b057558a5cdaa11f18668 WHIRLPOOL e822ee196b9609b06388a897b8aaa62cffe6d6e6d8db058d1a5df303218d2359070672666b223bb2eeb9e8dcd40c222d95400d4576fe5f84f2a81c96b80fe780
-DIST icedtea-bin-examples-7.2.6.11-amd64.tar.xz 1796180 SHA256 18757fb3b88ff425340a389109487931906c9237158ce75597be8d3e125e111b SHA512 c2f714674956cac81b24d1a929638a38fa972dd9aed1e05ae17397b58ea334053d2e5fd2800c8242c25c1f9ccddc814f4e42aa49cb82b00dca7e18b31a6f3670 WHIRLPOOL 72874ed26a3e0b363edc29187e94e6c9b2121c2946323639556c02050e3539ce92c10593ec797593c85224b3b9692313676741e030c068c4438b7897dad8508c
-DIST icedtea-bin-examples-7.2.6.11-x86.tar.xz 1797116 SHA256 f2dd2bef16173d55c0865f471637475ff1a39d027cf7044f2c4dd5c251745abe SHA512 2b91c01e2495914d0c70a6c9885246ebf7b48a9edfdb8fc0f9904db65eb3aa65ce97cec50062e39e91fc55217abccc408a4893137379e88689873907f74fd4dc WHIRLPOOL 018f9b102f06f2304b66f006b3f6a17fad00daf9815140ce5dd383ab69ef2055ebb9d92ad25c3d4a5043eea0f512f25c83bc0ad6163b621c8e421698664dcba6
-DIST icedtea-bin-src-3.6.0.tar.xz 45737964 SHA256 c7723117082376d4376e1c6d3cd563727fc05727162726075d102354d6687465 SHA512 7747beb612bb693650ff00b61524daf092890f70eed9d31321b5a347b15ed4655e3337bc887ac8cb72938f4c67b6625e216ace8e4c428277c5a4518869ca9ecd WHIRLPOOL 915770d8b3e411da3617af1cad1e19e1e1e4ed0024a57ec3f591915ddc832b741253cec54238747729f47837cb4d03bcfa7a15e0dd96915c91e5c92d0acf7be0
-DIST icedtea-bin-src-7.2.6.11.tar.xz 40213908 SHA256 f5bcfa36dcf9e4320b27ea66bda2e44396600a6e2ee1b4ab57483e0603b48177 SHA512 2a1c699ea3e781d2ff81ebbb803cd06ecf1438195a6d40f04eeb8dfb03cbc4eb4934a9563f6328a7ae4ce67f6bc14aa5cd72c84948e45632d0ab92cc14f6ecc5 WHIRLPOOL 71d1f05099e6b1f2633624b33f34d38471a13ddca187437cdc10f08cd4abb861715903b9cc856ee1dbacdef3b54eb8bb83df36f3ca2e27cea9b0a88dee2e691e
+DIST icedtea-bin-examples-3.6.0-x86.tar.xz 1862508 BLAKE2B 0a763600ed95e2efd5fab01d0d9c68f89f6f12165d1eaa33512de5e8b3f46da97b8d8129d7b388292a09b115b2c1484263eaa4b03a71dcaea50ed69d5613b07f SHA512 d0f39687cedd4c8282816ef923163a5506eda07bfd0850bb3dde78daa4b2e21749ea273be9a1deb9e3d3f32e3dd9d1e587132229840b057558a5cdaa11f18668
+DIST icedtea-bin-src-3.6.0.tar.xz 45737964 BLAKE2B 0a5b05e8e8b7da14094e1dff28d0c1ac312255369bc5df53dbad3c69771da9e6af837aaae27a60db4b50c3833043067b040db25bf8ec2bb3ee24aa9ea8b5943c SHA512 7747beb612bb693650ff00b61524daf092890f70eed9d31321b5a347b15ed4655e3337bc887ac8cb72938f4c67b6625e216ace8e4c428277c5a4518869ca9ecd
diff --git a/dev-java/icedtea-bin/files/icedtea-bin.env.sh b/dev-java/icedtea-bin/files/icedtea-bin.env.sh
index f85be43183f..9734e8a604c 100644
--- a/dev-java/icedtea-bin/files/icedtea-bin.env.sh
+++ b/dev-java/icedtea-bin/files/icedtea-bin.env.sh
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
VERSION="IcedTea JDK ${PV}$(multilib_is_native_abi || printf ' ('${ABI}')')"
@@ -7,7 +7,7 @@ JDK_HOME="${EPREFIX}/opt/icedtea-bin-${PV}$(multilib_is_native_abi || printf --
JAVAC="\${JAVA_HOME}/bin/javac"
PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
-LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/$([[ ${SLOT} = 7 ]] && printf :\${JAVA_HOME}/jre/lib/$(get_system_arch)/xawt/)"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
MANPATH="${EPREFIX}/opt/icedtea-bin-${PV}/man"
PROVIDES_TYPE="JDK JRE"
PROVIDES_VERSION="1.${SLOT}"
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.11.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.11.ebuild
deleted file mode 100644
index d7ab5d7d396..00000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.11.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-KEYWORDS="-* amd64 x86"
-
-inherit java-vm-2 multilib-build prefix toolchain-funcs
-
-abi_uri() {
- echo "${2-$1}? (
- ${BASE_URI}/${PN}-core-${PV}-${1}.tar.xz
- examples? ( ${BASE_URI}/${PN}-examples-${PV}-${1}.tar.xz )
- )"
-}
-
-BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
-SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
- source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
- multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
- $(abi_uri amd64)
- $(abi_uri x86)"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="7"
-
-IUSE="+alsa cjk +cups doc examples +gtk headless-awt multilib nsplugin nss pulseaudio selinux source +webstart"
-REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-RDEPEND=">=dev-libs/glib-2.42:2%
- >=media-libs/fontconfig-2.11:1.0%
- >=media-libs/freetype-2.5.5:2%
- >=media-libs/lcms-2.6:2%
- >=sys-libs/zlib-1.2.8-r1%
- virtual/jpeg:62%
- alsa? ( >=media-libs/alsa-lib-1.0% )
- cups? ( >=net-print/cups-2.0% )
- gtk? (
- >=dev-libs/atk-2.16.0%
- >=x11-libs/cairo-1.14.2%
- x11-libs/gdk-pixbuf:2%
- >=x11-libs/gtk+-2.24:2%
- >=x11-libs/pango-1.36%
- )
- !headless-awt? (
- media-libs/giflib:0/7%
- =media-libs/libpng-1.6*%
- >=x11-libs/libX11-1.6%
- >=x11-libs/libXcomposite-0.4%
- >=x11-libs/libXext-1.3%
- >=x11-libs/libXi-1.7%
- >=x11-libs/libXrender-0.9.8%
- >=x11-libs/libXtst-1.2%
- )
- nss? (
- >=dev-libs/nss-3.16.1-r1%
- >=dev-libs/nspr-4.10%
- )"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND=">=gnome-base/gsettings-desktop-schemas-3.12.2
- media-fonts/dejavu
- >=sys-devel/gcc-5.4.0[multilib?]
- >=sys-libs/glibc-2.23[multilib?]
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- selinux? ( sec-policy/selinux-java )
- multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
- !multilib? ( ${RDEPEND//%/} )"
-
-DEPEND="!arm? ( dev-util/patchelf )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
- if [[ "$(tc-is-softfloat)" != "no" ]]; then
- die "These binaries require a hardfloat system."
- fi
-}
-
-src_prepare() {
- default
-
- if ! use alsa; then
- rm -v */jre/lib/*/libjsoundalsa.* || die
- fi
-
- if use headless-awt; then
- rm -vr */jre/lib/*/{xawt,libsplashscreen.*} \
- */{,jre/}bin/policytool */bin/appletviewer || die
- fi
-
- if ! use gtk; then
- rm -v */jre/lib/*/libjavagtk.* || die
- fi
-
- local lib=${P}-${ABI}/jre/lib
-
- # The nss flag in the icedtea package just (un)comments this line.
- sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" \
- ${lib}/security/java.security || die
-
- if [[ -n "${EPREFIX}" ]]; then
- # The binaries are built on a non-prefixed system so the
- # fontconfig needs to have prefixes inserted.
- rm ${lib}/fontconfig.Gentoo.bfc || die
- hprefixify ${lib}/fontconfig.Gentoo.properties.src
- mv ${lib}/fontconfig.Gentoo.properties{.src,} || die
- fi
-
- # Fix the RPATHs, except on arm.
- # https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
- # https://github.com/NixOS/patchelf/issues/8
- if use arm; then
- ewarn "The RPATHs on these binaries are normally modified to avoid"
- ewarn "conflicts with an icedtea installation built from source. This"
- ewarn "is currently not possible on ARM so please refrain from"
- ewarn "installing dev-java/icedtea on the same system."
- else
- local old="/usr/$(get_libdir)/icedtea${SLOT}"
- local new="${EPREFIX}/opt/${P}"
- local elf rpath
-
- for elf in $(find -type f -executable ! -name "*.cgi" || die); do
- rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
-
- if [[ -n "${rpath}" ]]; then
- patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
- fi
- done
- fi
-}
-
-multilib_src_install() {
- local dest="/opt/${P}-${ABI}"
- dest="${dest/%-${DEFAULT_ABI}/}"
- local ddest="${ED}${dest#/}"
- dodir "${dest}"
-
- if multilib_is_native_abi; then
- dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
- use doc && dodoc -r ${P}/doc/html
-
- # doins doesn't preserve executable bits.
- cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
-
- if use examples; then
- cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
- fi
-
- if use source; then
- cp ${P}/src.zip "${ddest}" || die
- fi
-
- # Use default VMHANDLE.
- java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
- else
- local x native=$(get_system_arch ${DEFAULT_ABI})
-
- for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
- dodir "${dest}"${x%/*}
- cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
- done
-
- for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
- [[ ${x##*/} = ${native} ]] && continue
- [[ -e "${ddest}"/${x#*/} ]] && continue
- dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
- done
-
- # Use ABI-suffixed VMHANDLE.
- VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
- fi
-
- # Both icedtea itself and the icedtea ebuild set PAX markings but we
- # disable them for the icedtea-bin build because the line below will
- # respect end-user settings when icedtea-bin is actually installed.
- java-vm_set-pax-markings "${ddest}"
-
- # Each invocation appends to the config.
- java-vm_revdep-mask "${EPREFIX}${dest}"
-}
-
-src_install() {
- if use multilib; then
- multilib_foreach_abi multilib_src_install
- else
- multilib_src_install
- fi
-
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
index 33843e4df12..b7ed2bccdce 100644
--- a/dev-java/icedtea-bin/metadata.xml
+++ b/dev-java/icedtea-bin/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
- <flag name="nss">Enable NSS security provider support</flag>
<flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-06 21:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-12 21:46 [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea-bin/, dev-java/icedtea-bin/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2016-08-02 22:34 James Le Cuirot
2017-12-06 21:54 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox