| 1 |
commit: 0b591af2c179dc846810fd8b4e1b45bc1773c43f |
| 2 |
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> |
| 3 |
AuthorDate: Mon Feb 2 19:51:05 2015 +0000 |
| 4 |
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> |
| 5 |
CommitDate: Mon Feb 2 19:51:05 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=0b591af2 |
| 7 |
|
| 8 |
Synchronise Mercurial IcedTea 1.x ebuild with 1.13.x series. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.15 |
| 11 |
Manifest-Sign-Key: 35964222 |
| 12 |
|
| 13 |
--- |
| 14 |
dev-java/icedtea/ChangeLog | 4 ++++ |
| 15 |
dev-java/icedtea/Manifest | 15 +++++++++++--- |
| 16 |
dev-java/icedtea/icedtea-6.9999.ebuild | 36 ++++++++++++++++++++-------------- |
| 17 |
3 files changed, 37 insertions(+), 18 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog |
| 20 |
index e6617c2..3a04025 100644 |
| 21 |
--- a/dev-java/icedtea/ChangeLog |
| 22 |
+++ b/dev-java/icedtea/ChangeLog |
| 23 |
@@ -2,6 +2,10 @@ |
| 24 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
+ 02 Feb 2015; Andrew John Hughes <gnu_andrew@××××××××××.org> |
| 28 |
+ icedtea-6.9999.ebuild: |
| 29 |
+ Synchronise Mercurial IcedTea 1.x ebuild with 1.13.x series. |
| 30 |
+ |
| 31 |
*icedtea-7.2.6.0_pre18 (30 Jan 2015) |
| 32 |
|
| 33 |
30 Jan 2015; Andrew John Hughes <gnu_andrew@××××××××××.org> |
| 34 |
|
| 35 |
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest |
| 36 |
index 154ed77..1f8ce2b 100644 |
| 37 |
--- a/dev-java/icedtea/Manifest |
| 38 |
+++ b/dev-java/icedtea/Manifest |
| 39 |
@@ -1,3 +1,6 @@ |
| 40 |
+-----BEGIN PGP SIGNED MESSAGE----- |
| 41 |
+Hash: SHA256 |
| 42 |
+ |
| 43 |
AUX fontconfig.Gentoo.properties.src 15602 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647 SHA512 eac3fd310bf0757284a4a0c3c72759a8516bd2d9b8f9d9c7df10ff15fd291833d5adb5429b166175c6f333c883974d56fe7d0339cc16db3a5786a77780217a39 WHIRLPOOL f9f702848c38ef9cca0577f1db5a7c4cd6847e79d205b8e855c14b3a80070328b12fdcd854f5bd2dcf07c7cb9bd2aaf433a770a0752ec01a4e8b308dedf3bf19 |
| 44 |
AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619 |
| 45 |
AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a WHIRLPOOL 57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258 |
| 46 |
@@ -34,12 +37,18 @@ DIST icedtea7-jaxws-5ee59be2092b.tar.bz2 2020900 SHA256 5891f10569b4f26f6bf6eb85 |
| 47 |
DIST icedtea7-jdk-19a30444897f.tar.bz2 32261734 SHA256 2f3c22d729d65851f491d924fb0844f7a04c6e4d9b5e926f08938d58e214dd1a SHA512 ee7875b12f85fa2dc5e8fc8dd4c855f8724c0f607602892234e0a2afe0d474401e6f36f3bfa21e313f38e77c32944c53291aa81b27c318177b39cd15e932749b WHIRLPOOL 8aa3876641c62bc8d6271fd659d015e1dffd9f30e2b22005746a0c7d74372b1eb2f620adc11c89954172182f94f9437af5bc871a0c715df34aa6525ebb2f1870 |
| 48 |
DIST icedtea7-langtools-bb9d09219d3e.tar.bz2 1709221 SHA256 5df2c2a496409b0eb1f4ff923ee6de554ab74af8b91af26185f7e2f73071642d SHA512 51d9e5cbfbde281b8dbe0dc6d3ed3ee6a4cdda853809e64931220126de34ea74fa9359ea24cffaf913ea57b967a54fc0d25f31b2bdf62d0c8549cab07e83c969 WHIRLPOOL 655b67b53b6e8166e128bf1621eaa1fed39e18c0b336b6228a4fca4d64ec2efd60d66b1e02b5844beb9107ed1420f471f2ce687773c778418ab75e02e2d8d4f2 |
| 49 |
DIST icedtea7-openjdk-e229119aa0a0.tar.bz2 128769 SHA256 8c77d4d16d38b2ee4edd98525186548c33138a400c61978e1e54b70c494250df SHA512 91e0eab9e9ba1f6ddc922e1a8e6093f211aabfeef0b8e833db871a40a3b624fcf7155efcd2d2de48b9992985079430b5d193277bf3744e4083de0fa0c7e18bc0 WHIRLPOOL c0ad8c0ed7e12f3717f030412408791b1fa3670167baf58cf879c1034781bce9ac8666edf2beb4169c0e6aab7165797e7b366fa7decdebabf54dfacfc460593c |
| 50 |
-DIST openjdk-6-src-b30-21_jan_2014.tar.xz 33106516 SHA256 ebd9fdf39c8590cd620cb78c481ca233f5919f2819237b5d2b440666f1dd3475 SHA512 3d040f9dc99b38babda3dce3a0dbc0de0dd91c5a2a0bb4bad7caa5acbb42923d0b26926aca836157d50124811f6c4c743f48ae996481d216c6158c21686e1c55 WHIRLPOOL 4a07dca91ad6bbf004fe40f12225a836c8cb634ce05b5974c51c389d235a6aca6a2532b3818fd975b1dd83ee117e08e17e22fcbb1bedff4caaabf50f941afd6f |
| 51 |
DIST openjdk-6-src-b34-20_jan_2015.tar.xz 33601316 SHA256 13d1b4e1e152b6f9ad81b5558d6c7c0d3315a9e9494e49e515229722e2ee4e51 SHA512 e8b4a9224d759fe174595f371c1a91adcf51958f6bd79bf3f32f7d004edf18b42fa381c8197efd79ad7ca94d2dfb44f5f8581674feacaa158583b0ea3b6ea3a0 WHIRLPOOL 18f57820aef1aad30cd0ff8acfd73a36701d9eb80f165063ef1958e701e4e16266cf9ab1cebe40c7acaf0c11d2867321fb2b7b3369b5b0f43f1cb711ce911072 |
| 52 |
EBUILD icedtea-3.9999.ebuild 11661 SHA256 3a2f3d9c6ecd7305c36118d1984917ca7e3d0ed3ac0063a5e450181786327523 SHA512 1287f5518f64cc991365d0d271bee9531d955690f3128dabf7432e928a72d2413b396c1523a91d1d47cb63d7abe891f52a72e05b7c2e7ab1214639b98510c8ac WHIRLPOOL 878ab905a55d29dd5e60caa57bcf9c7e829fd28b10c83c4d3d965cebe932d87e65dd6b69580e6e2fe87d247973bf86d1dd2abff0be693152330e12a5f885aebc |
| 53 |
EBUILD icedtea-6.1.13.6.ebuild 11029 SHA256 98c750f62b6f052ec3bb605ab8584f6b3854cdbc31cd183fdf30a82715a27e73 SHA512 95a39a1402a9d17b7d87f3345907182055388e3adc7895c9c2142d088f29e6357f69ee64a3f61ef348e2fb8ae1c917cf2b5b74240ad6800c0dab2781fdcec425 WHIRLPOOL 1807be446ffaa83c5dec70ba8a34071b755a36e01041cbe12ab0d86a715e361e45146d570fbc5dd251a7e0696b2dc871076631e69ddfffe2abed23dacf2b422c |
| 54 |
-EBUILD icedtea-6.9999.ebuild 10736 SHA256 e24fd15c06009009eb81d6d6380667026184b7f9a1afc7fbdd77895363a7f2a4 SHA512 ffdd505208273611598d13c7779242c56d9ff80cf0c3f073445d42e38de1942ff9feb3e29f974bd58c791cfc68e3ef50cdd0e42f27cad3d22b5c7c3ddc29d76f WHIRLPOOL a3c0843a623c9ef908800aafac06a470d9ad90c3331349bfdc6038b12e3a6cb44558b6f7ce170522bb9edc349786f6e54bfd21cbb7978f2e0d00fe9e6968c714 |
| 55 |
+EBUILD icedtea-6.9999.ebuild 11019 SHA256 5ff87eae3fa080795fcdf8260cbfcab38dda294ee267c2673d6303d0a60856b4 SHA512 9aaaa3e45951741499ee2b35d7e9bd95a652c298849f25adb936181a74bafde247ee6250dcd2e4f562e18eb323cbb43e416d9a94ea9deed699607554a96838e5 WHIRLPOOL 5719be60e3ad721e2538f2441446eb65c4a11a6e7a283b1556b8ebbc8ff563cd8cb62e3c35bc54592fbdd5efb1b6c52221084c195bb30c615dc8999a8fa7bc2e |
| 56 |
EBUILD icedtea-7.2.5.4.ebuild 12637 SHA256 0c7a5a18a4dee892346cc693ebcd274730e3102b486431c1368f823ed757921b SHA512 e3fffe574f88531b37706322f0837c879072172bc4beeba805fdd8f0e8126520e3aedbc0dac81909ab7ca640ab8709b6e92e9017c51fdb434e053277f73586b7 WHIRLPOOL 8c605cb4797a412002bd8c82abc5941c2a99e68b7189c0e14fa392715fd8b4f7d2a0962c75daacf5e6bbd15bd639220f2715b694740b89b9922e5e7aa4f6ef52 |
| 57 |
EBUILD icedtea-7.2.6.0_pre18.ebuild 12570 SHA256 beb537c74be9c4f790ad4606e4b8c8fce3dca6e424a4fd4062f4e4c6b7beae20 SHA512 b094d0d9ea4776e2f1a6191c160a519f2c2e7549e3623aca016197ce1b24899129764aefe04586fc178cc1445c69b81fed283bac9988c1403433b1d69382876a WHIRLPOOL 9aca281a8d878e2649da9b4ff98daa135e3a640fb40bd59a27be67e4a645692d70fe77aaaee0ab2aa8fcec4e093d203314fc2f27ab25f4129ee1d51434aba713 |
| 58 |
-MISC ChangeLog 88630 SHA256 7ce0d64c87681c264dae3148fac1991a846421041ba0039cf2bded6ac1f49c88 SHA512 c648ed49978519c6905c4c5b0913ae9fbefc64d97d49422494d00030ccd1e20b3b7d32648c5b03d04582be0a7012716558bc047d6c5b821810eb8f2a918ca22f WHIRLPOOL b47605eda90ba808908ce9a4f0b803019c5787f1879d0aa91b7e723aaafc2b221ad37d75d1a28b5b1ca1295d7cebbb3bc513d5f670d35b6f2d5b9af839ba9d29 |
| 59 |
+MISC ChangeLog 88781 SHA256 38df14cdd1acb1fae022cdc9da43e75e6bdf21791918ff4e3a1f5fbed3f94fa8 SHA512 496c110af252cfd3c2cfef8c1f6f3fd244ce4dd1d6754dc8937ea74c9e80f4d0c4b6daba3d0563d04f72883ff1cfa01ef8dc6cd08a75d048cbdd0d7e26b0f5f9 WHIRLPOOL 1c515648c5493844d9e87094483e34c47f683080e75dc56254c041bc02ab95084d3c250364b6656c3a8d92ec9b5c17aba279fdc4770898b7615473dd0a73b4cf |
| 60 |
MISC metadata.xml 1680 SHA256 41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512 5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c WHIRLPOOL 5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d |
| 61 |
+-----BEGIN PGP SIGNATURE----- |
| 62 |
+Version: GnuPG v2 |
| 63 |
+ |
| 64 |
+iF4EARYIAAYFAlTP1SIACgkQz9oPmzWWQiLQ5gEADo9ghQifquxkN3m1dbzfAqa8 |
| 65 |
+8Wo/bfGN0R4r2mW1x74BADSZ92wkO+ntEr/KBkf6VfqR1f4S9vRJFb8qWp8ou5wJ |
| 66 |
+=OeAj |
| 67 |
+-----END PGP SIGNATURE----- |
| 68 |
|
| 69 |
diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild |
| 70 |
index 50620f4..72e5e73 100644 |
| 71 |
--- a/dev-java/icedtea/icedtea-6.9999.ebuild |
| 72 |
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild |
| 73 |
@@ -13,8 +13,8 @@ inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial multiprocessing pax- |
| 74 |
|
| 75 |
ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) |
| 76 |
ICEDTEA_BRANCH=$(get_version_component_range 1-3) |
| 77 |
-OPENJDK_BUILD="30" |
| 78 |
-OPENJDK_DATE="21_jan_2014" |
| 79 |
+OPENJDK_BUILD="34" |
| 80 |
+OPENJDK_DATE="20_jan_2015" |
| 81 |
OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz" |
| 82 |
# Download cacao and jamvm regardless for use with EXTRA_ECONF |
| 83 |
CACAO_TARBALL="68fe50ac34ec.tar.gz" |
| 84 |
@@ -26,7 +26,7 @@ JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}" |
| 85 |
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" |
| 86 |
HOMEPAGE="http://icedtea.classpath.org" |
| 87 |
SRC_URI=" |
| 88 |
- http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL} |
| 89 |
+ https://java.net/downloads/openjdk6/${OPENJDK_TARBALL} |
| 90 |
http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL} |
| 91 |
http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}" |
| 92 |
EHG_REPO_URI="http://icedtea.classpath.org/hg/icedtea6" |
| 93 |
@@ -35,7 +35,7 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M |
| 94 |
SLOT="6" |
| 95 |
KEYWORDS="" |
| 96 |
|
| 97 |
-IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap +nsplugin |
| 98 |
+IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap kerberos +nsplugin |
| 99 |
+nss pax_kernel pulseaudio selinux +source systemtap test zero +webstart" |
| 100 |
|
| 101 |
# Ideally the following were optional at build time. |
| 102 |
@@ -45,8 +45,8 @@ CUPS_COMMON_DEP=" |
| 103 |
>=net-print/cups-1.2.12" |
| 104 |
X_COMMON_DEP=" |
| 105 |
dev-libs/glib |
| 106 |
- >=media-libs/freetype-2.3.5 |
| 107 |
- >=x11-libs/gtk+-2.8:2 |
| 108 |
+ >=media-libs/freetype-2.3.5:2= |
| 109 |
+ >=x11-libs/gtk+-2.8:2= |
| 110 |
>=x11-libs/libX11-1.1.3 |
| 111 |
>=x11-libs/libXext-1.1.1 |
| 112 |
>=x11-libs/libXi-1.1.3 |
| 113 |
@@ -63,14 +63,15 @@ X_DEPEND=" |
| 114 |
x11-proto/xproto" |
| 115 |
|
| 116 |
COMMON_DEP=" |
| 117 |
- >=media-libs/giflib-4.1.6 |
| 118 |
- >=media-libs/libpng-1.2 |
| 119 |
- >=sys-libs/zlib-1.2.3 |
| 120 |
- virtual/jpeg:0 |
| 121 |
+ >=media-libs/giflib-4.1.6:= |
| 122 |
+ >=media-libs/libpng-1.2:= |
| 123 |
+ >=sys-libs/zlib-1.2.3:= |
| 124 |
+ virtual/jpeg:0= |
| 125 |
>=media-libs/lcms-2.5 |
| 126 |
javascript? ( dev-java/rhino:1.6 ) |
| 127 |
+ kerberos? ( virtual/krb5 ) |
| 128 |
nss? ( >=dev-libs/nss-3.12.5-r1 ) |
| 129 |
- pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) |
| 130 |
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= ) |
| 131 |
systemtap? ( >=dev-util/systemtap-1 ) |
| 132 |
!dev-java/icedtea-web:6" |
| 133 |
|
| 134 |
@@ -114,7 +115,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} |
| 135 |
virtual/pkgconfig |
| 136 |
sys-apps/lsb-release |
| 137 |
${X_DEPEND} |
| 138 |
- pax_kernel? ( sys-apps/paxctl )" |
| 139 |
+ pax_kernel? ( sys-apps/elfix )" |
| 140 |
|
| 141 |
PDEPEND="webstart? ( dev-java/icedtea-web:0 ) |
| 142 |
nsplugin? ( dev-java/icedtea-web:0[nsplugin] )" |
| 143 |
@@ -155,6 +156,9 @@ src_unpack() { |
| 144 |
} |
| 145 |
|
| 146 |
java_prepare() { |
| 147 |
+ # For bootstrap builds as the sandbox control file might not yet exist. |
| 148 |
+ addpredict /proc/self/coredump_filter |
| 149 |
+ |
| 150 |
# icedtea doesn't like some locales. #330433 #389717 |
| 151 |
export LANG="C" LC_ALL="C" |
| 152 |
|
| 153 |
@@ -244,15 +248,16 @@ src_configure() { |
| 154 |
--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \ |
| 155 |
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \ |
| 156 |
--with-jdk-home="$(java-config -O)" \ |
| 157 |
- --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \ |
| 158 |
+ --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ |
| 159 |
--with-pkgversion="Gentoo package ${PF}" \ |
| 160 |
- --disable-downloading \ |
| 161 |
+ --disable-downloading --disable-Werror \ |
| 162 |
$(use_enable !debug optimizations) \ |
| 163 |
$(use_enable doc docs) \ |
| 164 |
+ $(use_enable kerberos system-kerberos) \ |
| 165 |
$(use_enable nss) \ |
| 166 |
$(use_enable pulseaudio pulse-java) \ |
| 167 |
$(use_enable systemtap) \ |
| 168 |
- $(use_with pax_kernel pax paxctl) \ |
| 169 |
+ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \ |
| 170 |
${zero_config} ${cacao_config} |
| 171 |
} |
| 172 |
|
| 173 |
@@ -352,6 +357,7 @@ src_install() { |
| 174 |
if ! use X || ! use alsa || ! use cups; then |
| 175 |
java-vm_revdep-mask "${dest}" |
| 176 |
fi |
| 177 |
+ java-vm_sandbox-predict /proc/self/coredump_filter |
| 178 |
} |
| 179 |
|
| 180 |
pkg_preinst() { |
Archives