From d6df0a1ade02397a7e910d62a06f76222c1b55e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 4 Dec 2019 00:06:05 +0000 Subject: [PATCH] Switch to older icedtea:8 ebuild which actually builds. --- dev-java/icedtea/Manifest | 26 ++--- ...tea-3.13.0.ebuild => icedtea-3.3.0.ebuild} | 110 +++++++++--------- dev-java/icedtea/icedtea-7.2.6.9.ebuild | 3 +- 3 files changed, 66 insertions(+), 73 deletions(-) rename dev-java/icedtea/{icedtea-3.13.0.ebuild => icedtea-3.3.0.ebuild} (80%) diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 0caea72..3c89962 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -9,19 +9,19 @@ DIST icedtea-2.6-jdk-ce87b1399385.tar.bz2 32812887 BLAKE2B 2ce5c2318d9bde2cec6c8 DIST icedtea-2.6-langtools-dd8e22d986c8.tar.bz2 1711235 BLAKE2B 274196b0784a696a1106a2c35903fd091db641abfee139f116cb4887932dd22c6fc54a10cbda5b08d2339caaae8dd61057ec87075beeeacab470fbadf1e0419e SHA512 880924b19d3c021f137368eea51c380b0df8222c0148d8442b1b786d13a3698dc567d8783af1798a31364bdaa31b7580fcf02dfb82147a890407cd33c6a5595e DIST icedtea-2.6-openjdk-2dd04ef37829.tar.bz2 130401 BLAKE2B 4f724258553d8055e661c3ac8f2fb61eab29651364679cd819681025b9c5674df420e862df7e134abe5bd799301eee6722d61f1346b0c111b569d72a52bc4903 SHA512 67493785ec7aa3093f3d558a82e45c3f699bea63ccefacf273754b046d0a10b5cd19bb9a3dad7803a19e5d242ac06082729d1ac73088479db5712ccd08fdd223 DIST icedtea-2.6.9.tar.xz 2107156 BLAKE2B f14babb6d52c85473bef75a4a4b10b4a52d0def45a0e3c9d036dcffe8c4c28c3f0428fa33b743311ca75ed1a13c2146a3860978cdcfebe316fb14f81d3a83717 SHA512 6362e7329bdf5224d1c6340d4c03fe3ca6e5a879395c3af75390fcff9a8e8a599517a3f287d36110c301ba908e5bc4bcc8aa89cd605aa76f0e51f7a9aced6b3e -DIST icedtea-3.13-aarch32-26d64a5c4b9a.tar.xz 6832524 BLAKE2B 68399b723d1f6a0fc3c940ccbbae48a47767b3870ce0eecc2eb51ef6f36f25e4d742db3eb4b204815c571d1104301a492c60ed3c608a1fc3e36271a2618d5d27 SHA512 84e8217020d8ddd62745298b2d1591e5a6d9a9ff117930524170179dee4d4c35c35007603d5bf9601b7be404ba887b69953272f687d1a9858429e1fe26c9f049 -DIST icedtea-3.13-corba-24a4cc7d7de6.tar.xz 946268 BLAKE2B d1bef8c7029c5017e0a43d6711c92643527930bb037511e84625055f38faef6fb701652458e64b062f3cdbd3e6ec35e5099411e07af3933589dc9c6a3f065ccf SHA512 834b8b09590f5b4f11bbc32af3222e1cb6bef14c44c34ae4d3f65b6320d1a78c297a341cadb76bb59156b434811510b83705d2d2994922c610ba1bafb3f59345 -DIST icedtea-3.13-hotspot-ab8fadcbbde6.tar.xz 6908200 BLAKE2B 922a86a66d670ae920c2e5a1b81da7ffbf2bb20323bc6ac1bb8d5e034528d9e767ee2ef9855dfba467c8a6a81939739f76dec28ced50531d62d1dfeae2762d16 SHA512 60c144997b2566dc42698ca4cb888b92de6a9fdbb18e01703d00f54311ad56191862c61c89e3eff4d6c4793c98d3dafd5f723bc9a22db2329138d08e832ddc11 -DIST icedtea-3.13-jaxp-7f4569c121d6.tar.xz 2292228 BLAKE2B 175847c9e9ff99555a8aa64ed2e8df718738e3203d671a965fc231363f10f41aac9948f045f7a0e12983c6c7d801026ec0b64d693ae79f86c556f43fd6ba2e30 SHA512 ccf05a50d6bc3b5ce1663bab4925cc738d32b9f1a9c696ada0cbbfe3477dc60556e5e7e9939394b2a932122500555ac9e56a935d3b8762d0ddf65201ddc48ba9 -DIST icedtea-3.13-jaxws-1c6f4ebde697.tar.xz 2275120 BLAKE2B 65ff39d6ad84a5d1f21b5b9fff8d0ce92f0682006dce93773f6b8cdeb5d1a184aaa10279a5a49045f843e5046c719fd68f0c4b872afa9c850bffd4f0066a931a SHA512 80a2539ba45e213de1f2a8e236709f3cd81c6c37ee1181474fd4f0d4d612a7cdf91eabdd6bea5d652e18e73c41c3f59a27a173d08d46ad0664628fd6ffecfc57 -DIST icedtea-3.13-jdk-51afcf17e031.tar.xz 39491120 BLAKE2B dca4e58bd41cccaf8eb13e5b182cec0fca9b82e7739f10396407ae1b40882ab8aed799bfeffeba2416e0d1966edd16d5aa666c84dda9ea7bf9db92998028a9e4 SHA512 8b1c8e0e37a9830d67feaab52915c39faf75e94d8972925702f29eea0efd5dbc2f4deaff3b45b2f0f785235bd87c7bb10e62e7a9fb46c1c27e5fddfbbb5fdaa2 -DIST icedtea-3.13-langtools-2008b12a91d1.tar.xz 2076092 BLAKE2B 39898c7d55ebbb3aa1e56c3678b3b860a389d29e8a755fc5551e179ca2d7702316f57175774477c2c4bbf479fbf212808e926ce363a9b56f3065480c6261d612 SHA512 2cd1cdbc8283f5000dd68365412ed36235cfcbecee3a79b8b6111c3a6431f817d4b1ea04463bb049abdf503fe354e4ddf7b71fee399b459e6cf98299703d6e2c -DIST icedtea-3.13-nashorn-69b1da223d93.tar.xz 2320140 BLAKE2B f2534ef33181545f9d53362873fb8e0c2c59ba689b46c7f45511efc8ae09597dca7a1df8dc4b893b7e9adb13f694cc9b9028789b67df24833c70170568d0dfc2 SHA512 d86706393adabe5982092865addbe04c07781407d99b8d9ee49baf4224ec9b961bdf8498488548f043b099130b35ac017d846cc41874bcfb218520ee0b37004a -DIST icedtea-3.13-openjdk-c8f86954855a.tar.xz 361204 BLAKE2B af71575af9e68b05a7b31808ccc10318569db83b938f72cb9717e0e4d7532fd342e514442969945bf39d861514cd9173bb256b6f253a83211de95b29b8081e2c SHA512 e5e1072f43b024d8341e770eb8768d0161dd91f483cfa9a719790eb81458dd2a4da4e688a2c7828025f5b39247558ea69881176c53700cddd161708f0cedb764 -DIST icedtea-3.13-shenandoah-ff69edbcd7ae.tar.xz 7071080 BLAKE2B 4af91356631762cde7e2af12f5cda2fbe30a6953fa7d0828a122c091e4e13ff10e1c3b916c2add5ff43d30756c355c879102edda0610579c9d652d328031e503 SHA512 898ad626cc84a8ff223feb8f6673e8338bee3e4112ecd977f1a61a66bdf3729fe006d16c97071bdb191e8aa83397cf1eb4ce0505d265e670d2db430d7264376d -DIST icedtea-3.13.0.tar.xz 1526900 BLAKE2B 6fbfd5cfbd2ba712ab2c03465ae3df68f87613857e763ca7b0283876a6d86330f07c94e85868f313dda9de3f6c82dc41e11ce9d7fada22300ef2b018295a6577 SHA512 312bcc6660360eb73b96801fdac0475d6b192bc3fcb80e250225cbb4dfe39ce178e0fa5154c509e7f5605113b34077a6f9c252a52024e568bab7ed6a74140f7c +DIST icedtea-3.3-corba-8eb9dd5fe2fb.tar.xz 940804 BLAKE2B d838131cc9c9d13f95f5eec6713d83fffdbcd1f38b4e9a6fcd90c4d22a6630f02629e48b4fe461df74d03f6fcbd344f4f730feda0d578297e6893810c23ae401 SHA512 b1f44e1e41b3565bd45176f726e4d1c2999c5ff25a5f2e973f0e5836b7fd2cf6540eae83d3944b303677797e052abd950bb9748fb3e218e4c71b1ea059bf1209 +DIST icedtea-3.3-hotspot-6efaf77e82a1.tar.xz 6813884 BLAKE2B 3efdeaef01bdd301ae1401fbf750ff32b1578e942bc9b04729bada7f7a6900c7d12837610aa8d06b7d1333aa2f934fd36faf71d4b8dae96d8cffc66f30f56b70 SHA512 8a593b1c9f022e7a3efa834c5547c59f1a2143f946edae2647a3368f9d4d39b9d473f36575d395e627e5bfac1f9cdef0efe607e0a81b40c46dca44ad6d59a65b +DIST icedtea-3.3-jaxp-faf1c4a9a51d.tar.xz 2302792 BLAKE2B a3ba9c92705e5c1b61199e9dbd47f5ab9d65d293c1877bf0f3c28b1380aaa3ac4aa60a61b9828757e5988cb8d43730eaaa913cad2e049e8e65fff3803d712eaf SHA512 3addabc7478c8a443de5db5606b9eb71778484ed68943d3aa2b61c02bff993d3cb446333be7a5bfc90f8757d0125eb1f53f2483c60c79bb0f19e642e1696ddcd +DIST icedtea-3.3-jaxws-5f5237104669.tar.xz 2269396 BLAKE2B efde94737e03f9abeef06d8aa8fda4988dc9b358f0353e709c96383897a6a260c00405d96a977002f9e8587dbd0e4b6fea76da41ff625ecafa60ec30d89ee30e SHA512 1b83b0a90cf0c11220cae034d2f86ad51ff8f6d153dc22e8e9f65b8ec4de8f7148fd37356aa19098e6545967da3c53e87edac747adfa76e254c1fc9d31e4ec1b +DIST icedtea-3.3-jdk-3642a826880b.tar.xz 38972276 BLAKE2B 0e107edc97e2cbd07e618223cd48a4e47a1138de414a389fb278e5839d9c69d88a03896abb4d2c0cab9d8b0d55ec62fedd2f49f7e5ea2208ce4efa7f9f813783 SHA512 60c932a057dc1869bec52ea73af2a21af9e622a196510d074c5d17c01bf7d98babd651f5577bafe96a832e6a54ded8704c4f7d964f0874edaf2222bdbe3c0c46 +DIST icedtea-3.3-langtools-d10a13bdc98c.tar.xz 2070432 BLAKE2B cf3a9510d591c480ebc0c0d2f7926f9286938df254aea425cc46439674e397d390f95d2322ba41a49fdaf6323aec382ab3f80f4614ac3cc281b2baa4ee87e7ce SHA512 13065b54ca036ad11b8879d9ebaa725a823c25cda5b28f0092902bda2b8879cfd000d132916302f2661b63b03c0bec90d1adfe4863d38c201cfbdf74f1f942c6 +DIST icedtea-3.3-nashorn-8c0fe384c4e7.tar.xz 2229336 BLAKE2B bb8d8842d4d45863223fe4874b4ce4a0b1edc9a699aa6fe30a7d5311e15d350b22aae3eb28595fc1d56596d69a780e361240a57f0dad19f6a13ac1e8706c17cf SHA512 c0aec36e921288b6ad11e71daa32111a4ee45302a2bbe407229cc143f05869372993f7b0dd366c07ecb31fac47e1d3cdb0c59cc1a48375d3719656c2159fee95 +DIST icedtea-3.3-openjdk-d5760f7cce54.tar.xz 337064 BLAKE2B 6077dba3d39301f23058d1d6ed5d9c19d4efd7228e783e3c0822e3e6b40b82a5e5ac837e84088ab7805b67d3410986819d36057fd1adf4d23eab2bf4ac10ceac SHA512 d98790823408e09f3fa9946ceeeda48187dddd3302625fc546d64a4ecc89967235c550af23c05368a90d8dd2ceb38c092cd3130958132d18d30692342bd1151e +DIST icedtea-3.3-shenandoah-d9a978177779.tar.xz 6866276 BLAKE2B 9c95bb1645b87211919fbbbc84b86f0a5bb1e4d4c20180f62a2f0d0ab5bf675d6f60f97be4b8d1d109bfdf721329e8c0af640a8fdbb91599ffa654ef7b98a4fc SHA512 df658cea99bb306962fe393d6babc4e69b363f0e03d64ac90ef4ce8c14faec723cb6d338598e7b6739139f9e9aa447e3463fd9ab773fad95b5c5266955f5c53f +DIST icedtea-3.3.0.tar.xz 1453792 BLAKE2B b6ef155360d72ae83c22253dce012c166d59dde9f934c136abedf2d5cd8f6cbd416baf87e3922446d6b9f6fe8317cb252db84165886248d61ac2d3d8a548f2a3 SHA512 58f8fc80ba68d38cac797192af827d6da5a93e165a5c62b8dfe852f848bfd8cb851dfb3d5d2c7b79f60f2fdced985ba473102afc4a2d5a56d6ddf1f8bb7cf9c3 DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 BLAKE2B 5c1faa3cbbfea62f819562a01ec389f3682cf3164d06f5404d1d16359c87b37d6ae4101f7c33cde30bad4f3d52af18f0f410e36868b2c9d1280661d2340e683b SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 -EBUILD icedtea-3.13.0.ebuild 12128 BLAKE2B 36c6de30c83d95f0577f37a9955f66aaeb38b96714872b9be345c88dfd8113fed0c3b2021608c356b998a05a7427b84424c5bfe4d5c4a92bceaa7902f98a8d5a SHA512 bf6a6a884a9c6e710122dc902c5205bd6eb56b99208553f638e25fa26c0e94d7372fe71f0558a15b98ba9937d7775fbc60e916df7db9210e71ed58a2e2c5410d -EBUILD icedtea-7.2.6.9.ebuild 11513 BLAKE2B 378640bf8d75191ee5666797e9d51c9ec16154d37ab11a23d9d97f57278ef292b70e9132503d336bbde6a122576f2714383d02c0d01db609ae658daa19e0bd07 SHA512 4d9aaff718ddf460d7c345275ec65df148757f3ac3a3f098ac3e69025b9deaf9fbf8bc8978ea8b0fa1c93892d098d726bbdda478d9ac7878dd6740805fc7eb09 +EBUILD icedtea-3.3.0.ebuild 12233 BLAKE2B 617a4a440d073002e4e844f7ce59714759ec39090e64982a3605b3e3f2024705c7dca3d9bbd329ffc535c56cbe7a57d5e8717283af25d665c1e80504138d4110 SHA512 98b7ed34fad1d58e26e30ce38b1cd1dd7ca23971c1bf2e28fbff18ca638999619e05de4a6def9b933b385df336d8283556ec871db6da0a235fa2b3f5371c8378 +EBUILD icedtea-7.2.6.9-r1.ebuild 12161 BLAKE2B 4c5f17638e9ec9bd9eac5a619d0669c10f4fd2a66618707522fd64fe985452b80bce1064aa4cb7179d9b98aa969c31d010b0cd7cfa5ae5f9e03e89d990a4e9dd SHA512 e7452baebb1565f13eb7ef211e903e797498b953e90e315548a363ed1790d61c025eeb43625d086ee62ba36d9feef8bf6af921ccd2066130032b753cd6659263 +EBUILD icedtea-7.2.6.9.ebuild 11500 BLAKE2B 55dd39c4624c46a72c63e6dc1414db8ecf0bc7ae83a8217d3b8fc20821624a58fb1bbab0c6a5d375162029b9873443e14b83c8ca5d9612486b966d74a73cff36 SHA512 c13e9b57e78ad410ce5fe09c7d964d508ea308dc5e3faf88dfcdd99ad5082faf320c1079f6ef540b09d64de4615576cfe51f16d3623ba9da1136cd10c5c0ecc0 diff --git a/dev-java/icedtea/icedtea-3.13.0.ebuild b/dev-java/icedtea/icedtea-3.3.0.ebuild similarity index 80% rename from dev-java/icedtea/icedtea-3.13.0.ebuild rename to dev-java/icedtea/icedtea-3.3.0.ebuild index 3858db9..b0bec02 100644 --- a/dev-java/icedtea/icedtea-3.13.0.ebuild +++ b/dev-java/icedtea/icedtea-3.3.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 - +# $Id$ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -10,23 +10,22 @@ EAPI="6" SLOT="8" -inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator xdg-utils +inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator ICEDTEA_VER=$(get_version_component_range 1-3) ICEDTEA_BRANCH=$(get_version_component_range 1-2) ICEDTEA_PKG=icedtea-${ICEDTEA_VER} ICEDTEA_PRE=$(get_version_component_range _) -CORBA_TARBALL="24a4cc7d7de6.tar.xz" -JAXP_TARBALL="7f4569c121d6.tar.xz" -JAXWS_TARBALL="1c6f4ebde697.tar.xz" -JDK_TARBALL="51afcf17e031.tar.xz" -LANGTOOLS_TARBALL="2008b12a91d1.tar.xz" -OPENJDK_TARBALL="c8f86954855a.tar.xz" -NASHORN_TARBALL="69b1da223d93.tar.xz" -HOTSPOT_TARBALL="ab8fadcbbde6.tar.xz" -SHENANDOAH_TARBALL="ff69edbcd7ae.tar.xz" -AARCH32_TARBALL="26d64a5c4b9a.tar.xz" +CORBA_TARBALL="8eb9dd5fe2fb.tar.xz" +JAXP_TARBALL="faf1c4a9a51d.tar.xz" +JAXWS_TARBALL="5f5237104669.tar.xz" +JDK_TARBALL="3642a826880b.tar.xz" +LANGTOOLS_TARBALL="d10a13bdc98c.tar.xz" +OPENJDK_TARBALL="d5760f7cce54.tar.xz" +NASHORN_TARBALL="8c0fe384c4e7.tar.xz" +HOTSPOT_TARBALL="6efaf77e82a1.tar.xz" +SHENANDOAH_TARBALL="d9a978177779.tar.xz" CACAO_TARBALL="cacao-c182f119eaad.tar.xz" JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz" @@ -40,19 +39,18 @@ OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}" NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}" HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}" SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}" -AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}" CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}" JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}" -DROP_URL="https://icedtea.classpath.org/download/drops" +DROP_URL="http://icedtea.classpath.org/download/drops" ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}" DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" -HOMEPAGE="https://icedtea.classpath.org" +HOMEPAGE="http://icedtea.classpath.org" SRC_PKG="${ICEDTEA_PKG}.tar.xz" SRC_URI=" - https://icedtea.classpath.org/download/source/${SRC_PKG} + http://icedtea.classpath.org/download/source/${SRC_PKG} ${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL} ${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL} ${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL} @@ -62,7 +60,6 @@ SRC_URI=" ${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL} ${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL} shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} ) - arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} ) ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL} ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}" @@ -71,7 +68,7 @@ KEYWORDS="amd64" IUSE="+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch - pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test +webstart zero" + pulseaudio sctp selinux shenandoah smartcard +source +sunec test +webstart zero" REQUIRED_USE="gtk? ( !headless-awt )" @@ -90,10 +87,10 @@ X_COMMON_DEP=" >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite" X_DEPEND=" - x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXinerama-1.0.2" + >=x11-libs/libXinerama-1.0.2 + x11-base/xorg-proto" # The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn COMMON_DEP=" @@ -101,12 +98,13 @@ COMMON_DEP=" >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= + >=media-libs/lcms-2.5:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) - system-lcms? ( >=media-libs/lcms-2.9:2= )" + sunec? ( >=dev-libs/nss-3.16.1-r1 )" # Gtk+ will move to COMMON_DEP in time; PR1982 # gsettings-desktop-schemas will be needed for native proxy support; PR1976 @@ -114,7 +112,6 @@ RDEPEND="${COMMON_DEP} !dev-java/icedtea:0 !dev-java/icedtea-web:7 >=gnome-base/gsettings-desktop-schemas-3.12.2 - >=sys-apps/baselayout-java-0.1.0-r1 virtual/ttf-fonts alsa? ( ${ALSA_COMMON_DEP} ) cups? ( ${CUPS_COMMON_DEP} ) @@ -129,16 +126,17 @@ RDEPEND="${COMMON_DEP} selinux? ( sec-policy/selinux-java )" # ca-certificates, perl and openssl are used for the cacerts keystore generation -# perl is needed for running the SystemTap tests and the bootstrap javac +# perl is needed for running the SystemTap tests # lsb-release is used to obtain distro information for the version & crash dump output # attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2 # x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h) # Ant is no longer needed under the new build system DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND} || ( - dev-java/icedtea:7 + dev-java/icedtea-bin:8 + dev-java/icedtea-bin:7 dev-java/icedtea:8 - dev-java/openjdk:8 + dev-java/icedtea:7 ) app-arch/cpio app-arch/unzip @@ -178,10 +176,7 @@ pkg_pretend() { pkg_setup() { icedtea_check_requirements - JAVA_PKG_WANT_BUILD_VM=" - icedtea-7 - icedtea-8 - openjdk-8" + JAVA_PKG_WANT_BUILD_VM="icedtea-8 icedtea-7" JAVA_PKG_WANT_SOURCE="1.5" JAVA_PKG_WANT_TARGET="1.5" @@ -228,10 +223,8 @@ src_configure() { # Are we on a architecture with a HotSpot port? # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86. - if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then + if { use amd64 || use arm64 || use ppc64 || use sparc || use x86; }; then hotspot_port="yes" - # Work around stack alignment issue, bug #647954. - use x86 && append-flags -mincoming-stack-boundary=2 fi # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... @@ -241,18 +234,14 @@ src_configure() { fi if use shenandoah; then - if { use amd64 || use arm64; }; then + if use amd64; then hs_config="--with-hotspot-build=shenandoah" hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}"" else - eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah"" + eerror "Shenandoah can only be built on x86_64. Please re-build with USE="-shenandoah"" fi else - if use arm ; then - hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}"" - else - hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}"" - fi + hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}"" fi # Turn on JamVM if needed (non-HS archs) or requested @@ -283,11 +272,12 @@ src_configure() { zero_config="--enable-zero" fi - # PaX breaks pch, bug #601016 - if use pch && ! host-is-pax; then - config+=" --enable-precompiled-headers" + # Warn about potential problems with ccache enabled + if has ccache ${FEATURES}; then + ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.' + config+=" --enable-ccache" else - config+=" --disable-precompiled-headers" + config+=" --disable-ccache" fi config+=" --with-parallel-jobs=$(makeopts_jobs)" @@ -310,19 +300,20 @@ src_configure() { --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ --with-pkgversion="Gentoo ${PF}" \ - --disable-ccache \ --disable-downloading --disable-Werror --disable-tests \ - --disable-systemtap-tests --enable-improved-font-rendering \ - --enable-system-jpeg --enable-system-zlib \ + --enable-system-lcms --enable-system-jpeg \ + --enable-system-zlib --disable-systemtap-tests \ + --enable-improved-font-rendering \ $(use_enable headless-awt headless) \ $(use_enable !headless-awt system-gif) \ $(use_enable !headless-awt system-png) \ $(use_enable doc docs) \ $(use_enable kerberos system-kerberos) \ - $(use_enable system-lcms) \ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \ + $(use_enable pch precompiled-headers) \ $(use_enable sctp system-sctp) \ $(use_enable smartcard system-pcsc) \ + $(use_enable sunec) \ ${zero_config} ${cacao_config} ${jamvm_config} ${hs_config} } @@ -357,18 +348,21 @@ src_install() { # Fix the permissions. find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts + # We need to generate keystore - bug #273306 + einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/" + mkdir "${T}/certgen" && cd "${T}/certgen" || die + cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die + for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do + openssl x509 -text -in "${c}" >> all.crt || die + done + ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die + cp -vRP cacerts "${ddest}/jre/lib/security/" || die + chmod 644 "${ddest}/jre/lib/security/cacerts" || die java-vm_install-env "${FILESDIR}/icedtea.env.sh" java-vm_sandbox-predict /proc/self/coredump_filter } -pkg_postinst() { - xdg_icon_cache_update - java-vm-2_pkg_postinst -} - -pkg_postrm() { - xdg_icon_cache_update - java-vm-2_pkg_postrm -} +pkg_preinst() { gnome2_icon_savelist; } +pkg_postinst() { gnome2_icon_cache_update; } +pkg_postrm() { gnome2_icon_cache_update; } diff --git a/dev-java/icedtea/icedtea-7.2.6.9.ebuild b/dev-java/icedtea/icedtea-7.2.6.9.ebuild index 9a054fa..ca5577e 100644 --- a/dev-java/icedtea/icedtea-7.2.6.9.ebuild +++ b/dev-java/icedtea/icedtea-7.2.6.9.ebuild @@ -169,8 +169,7 @@ pkg_setup() { icedtea_check_requirements JAVA_PKG_WANT_BUILD_VM=" - icedtea-7 icedtea-6 - gcj-jdk jamvm-bootstrap" + jamvm-bootstrap icedtea-7 gcj-jdk" JAVA_PKG_WANT_SOURCE="1.5" JAVA_PKG_WANT_TARGET="1.5"