From f78108598211053d41752a83e0345441bb9014ae Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 11 Feb 2018 16:09:52 +0000 Subject: gentoo resync : 11.02.2018 --- dev-java/Manifest.gz | Bin 96627 -> 96643 bytes dev-java/gradle-bin/Manifest | 2 +- dev-java/gradle-bin/metadata.xml | 1 - dev-java/icedtea-sound/Manifest | 2 +- dev-java/icedtea-sound/metadata.xml | 1 - dev-java/icedtea/Manifest | 2 +- dev-java/icedtea/metadata.xml | 2 - dev-java/idm-console-framework/Manifest | 2 +- dev-java/idm-console-framework/metadata.xml | 2 - dev-java/oracle-jdk-bin/Manifest | 2 +- .../oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild | 245 +++++++++++++++++++++ .../oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild | 242 -------------------- 12 files changed, 250 insertions(+), 253 deletions(-) create mode 100644 dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild delete mode 100644 dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 82601873a1ab..1540493995e4 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest index de68c990519d..99b523216c45 100644 --- a/dev-java/gradle-bin/Manifest +++ b/dev-java/gradle-bin/Manifest @@ -2,4 +2,4 @@ DIST gradle-3.3-all.zip 91388147 BLAKE2B 15539ec06cadcdaee9d54928381d5626bf06bae DIST gradle-3.4.1-all.zip 91604607 BLAKE2B 1c4aaae4899f3faa94fc3ead84c4fd4bdb6212c0f579a255c7494896fd2a498890c58e853315892c3c9d78635b58da5423b1b2211b991639474d19eca1f2992f SHA512 bdaabf747e60ae1cf2c9fedb0730a2e3deb914609db05ffc7e4cbd5402bc44e84d2c98154f14fdd7f944c2f49eb5dead0f44c119ac5a16bd7491c3369d784f5c EBUILD gradle-bin-3.3.ebuild 1012 BLAKE2B 88db4b90f690e935665f3bcf06a292765ffaa72781fb14be7ee3f64a3f1b8b9dcb6184c8138419d14bc5f9af2ebebf12707582bb8765c33c4e5f37de67e8638e SHA512 a0a9d78d5fa7104f7a720ff7f8125d3b7b81fcfbc481f65c0a6e31fb97e7fcb50ec3b14c40e0262179a9f8175ff2726c2b051284662a7f4251e6f3babb5400f8 EBUILD gradle-bin-3.4.1.ebuild 1020 BLAKE2B f388743943ab861566d3880d95df439f469b68c975085b167edc5fb99b214a165ecb1399dc5d61fc36d74371471af905f3276f6f14efc60eb8bb35ee164fd23d SHA512 0df5a41dd5f941a4b8058125fbfaed550b900ded90767a5252a236af7477ff5939ce7cc77cd1e171c311305c88b7664a4fcd9d615e43376750d298292a138d9c -MISC metadata.xml 493 BLAKE2B bbb7259ddef9704d4ff5c51d6b84ec88cff358f7d220aefe10e00c31f356ad76dfc7f496969fe6b4669e4f720fde6e83b080372b25d69a68dfdd4c56cca99c74 SHA512 f00054b4729cca37b67106baa8a92be953cbe5ec281332997ac1e1359eca16873d156d96061555b36e48228902b1d373a7d3caadd51b901cd89faa1b9571b5ec +MISC metadata.xml 435 BLAKE2B 22a7527b15ef2974a3e389977eb4056c03f7575ec9866848b90ef9e98bb7d2d645e83408f0ab4cbb139699757e7e3a1b5eb458a389563597ae3fa0ff5c310c0b SHA512 2a8b7c438d8aed952350c0a08660bde349363bb80794de9197c7ac107409021c1e38f0168e13213d730c6251ed9e39f644c42d6de050f0e58e862efaa46b2a43 diff --git a/dev-java/gradle-bin/metadata.xml b/dev-java/gradle-bin/metadata.xml index 6ba59b53805c..1b6bfaff005f 100644 --- a/dev-java/gradle-bin/metadata.xml +++ b/dev-java/gradle-bin/metadata.xml @@ -7,7 +7,6 @@ flo@geekplace.eu - Maintainer, CC him on bugs java@gentoo.org diff --git a/dev-java/icedtea-sound/Manifest b/dev-java/icedtea-sound/Manifest index 2fa00b0db9e9..2ccfea8b71d1 100644 --- a/dev-java/icedtea-sound/Manifest +++ b/dev-java/icedtea-sound/Manifest @@ -1,3 +1,3 @@ DIST icedtea-sound-1.0.1.tar.xz 1515308 BLAKE2B 4d9939e1bc0e0b331b032c3a54244960d61354d6b85b83cbbce1aeb96f2748906d5bd0936b36e2aacac526bd7927dbc0686a47a0dd0f41568ca86e3805b943ea SHA512 505d02f5ce885d4c7638cde8042a686aa3651de9072d325db6fefb8c5bd3d7de73253b27162555396e827a65f50aeed8326e99099757d5efe18d14ccebc1c07a EBUILD icedtea-sound-1.0.1.ebuild 847 BLAKE2B 0b3d21e190f6c07b74be2cdaef5a3a97947aa335fd29e86f208594b7e9695f66ac649b6412df6769ec7040fd433c185b63942eb8cf6b8d1d5e65b279a5bfb7e1 SHA512 88886e208bc2f62a2b423f642afd868e3809d3298a5a45c315af61ff11ad09736069b1622cc457105c005044272a62827153655dc98bc7e013999a574b61e30d -MISC metadata.xml 550 BLAKE2B e82de82b89135aed59fd62f0ac428de45c97e3a9f08904bbc9e34848b822df00b02ca3568b448d0fef5dac5568f9b092838e0be6ba5cad664f5a48fafd22f39d SHA512 67958c201defdf3d83c97dc6735a8d5751cc8026a19d063f44f47e6c9eeb2264672f12b0f1e7493d8a58a6b12a47a63e0f9d623d20fd8f991ec4f3c9c4d25626 +MISC metadata.xml 502 BLAKE2B 956158234bf2b4cf3e69d59e5db820789235dba816167c1a64ae1c94e585996f14c75b72526c8344584950336fb273c094176b9dd042fc41baaadfa56f46e2b9 SHA512 2d7a91be3364f491b4402f6cd525ff8e27fd4ed27b89268817ccc9d8318f207a0b315827fdf12bae8a443751469ebc9987e0bd6f08857199f53b62f4db93c00e diff --git a/dev-java/icedtea-sound/metadata.xml b/dev-java/icedtea-sound/metadata.xml index c9fa532b5f99..05fd5cab7ec2 100644 --- a/dev-java/icedtea-sound/metadata.xml +++ b/dev-java/icedtea-sound/metadata.xml @@ -4,7 +4,6 @@ gnu_andrew@member.fsf.org Andrew John Hughes - Proxy Maintainer java@gentoo.org diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 8274f6b14363..6881b2a8ef3c 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -14,4 +14,4 @@ DIST icedtea-3.6.0.tar.xz 1489504 BLAKE2B 759adf7a4fad51fe0f80028d4174feb93afe0a 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.6.0.ebuild 13675 BLAKE2B 4c70b6fc928217bc5d40a3e9057046ddf5bcdfbb31e62d6ccd5f22274c0573421c25f20180dc11719d4a0f005657671f5bb0e078e7d3681cce0008033663bfa3 SHA512 fa605b6e3796840079c707c23b41261621b2abec23b081a1794267e6608e991ea3e6209b9b7f918a4b62ebb762ce91cda8894cfb68bc6fa8f9a1d556a8365cf8 -MISC metadata.xml 2042 BLAKE2B ef74c0bd174176127c1e1eebfb3b5d1f182b298f2f3954ead33b0d85d0b49b3332773f18e97162d1441aaa38e8af1825c46cb3b7a458568191192a2172e44a1e SHA512 b4f76e77b083b6038fd397a294a356e127062e1a02c369e65e9d4c83abe6d06923a335631ae89a4fa383248172d54ba5c811f73b5ce7c27cee5094729965dd37 +MISC metadata.xml 1957 BLAKE2B 46e8fcdad93fb80f91e0af3b2cabfaecca347a17537ce9dac81b76dcd85e5b1532cb63bea6dad6d1d5d9423c1a08315c43ca54b559370e44c413ab92a5ec5649 SHA512 cbfb9a87cee0ab7d7245f758840c96b320bd8f50567d9181830155d849dc411fb17f2e0dde6ecbb840fe48268f5bc09840e3cce25edb73224286c854ae38db1e diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml index 533bc719560c..10578ad3a5f8 100644 --- a/dev-java/icedtea/metadata.xml +++ b/dev-java/icedtea/metadata.xml @@ -4,12 +4,10 @@ gnu_andrew@member.fsf.org Andrew John Hughes - Proxy Maintainer chewi@gentoo.org James Le Cuirot - Committer java@gentoo.org diff --git a/dev-java/idm-console-framework/Manifest b/dev-java/idm-console-framework/Manifest index 1266063469c0..b99c90b536b9 100644 --- a/dev-java/idm-console-framework/Manifest +++ b/dev-java/idm-console-framework/Manifest @@ -1,3 +1,3 @@ DIST idm-console-framework-1.1.7.tar.bz2 708770 BLAKE2B 82e69ced74e92bcd0cae30a7c58ba37d890ed56694e23d464dd8ce91be5aab80a2a48ec91608a83a4e8f5892ba242c273e266c431aa00ab172b894fe04d8a841 SHA512 ce4441cbc9917f6ffd0ef6ced44c7ebc542c14db60e7c6eeb844f8c68cbb15fe533916b9ea363d1e865759138d92d38365e9172206c7cd0fa385f4bf443aa739 EBUILD idm-console-framework-1.1.7.ebuild 1597 BLAKE2B e61a3819ffd6519a2aaf1b67c36c69a09ac8d5a0706f6b478d7f21d9b9b937ffd92c60fba01b4ad64f2fefc16dae9fde8957d24d13c5a8fd5aada236fb84b6ee SHA512 d9a8e630971d16262b9a519f9bc4853fa2676a87c363e944083d9d81e8fc718bb99eadbee679110e9795d711f4e6942520c93dcc6de86294c3301762e9065095 -MISC metadata.xml 695 BLAKE2B d554e75ec7c73c07b17f448c4e5c790cd67399c0d3be59475c645aaa42429f0b3a638bdb60a302669f17f968f4fb22c6c61736daebc991f6526757476b39e801 SHA512 6c5a39287e841354ff465b1b1d893c446fe4ca54e18b5155e39fedf5d15183bd6724714254702b46b6d99d76dca6e7897cffef57e3828e0594f7a3327e8e3ef1 +MISC metadata.xml 571 BLAKE2B 87ece50943597b058ab1fda6f7a96c34ca2ca391d71303da9701baee68c471ceb104633ddf7bd883fdd9a65ff181a4cdfe0b7996a968de389727decd00ba9f11 SHA512 0332dc27ea58f9ab191783fc12ce14e47a7680ef232601901c7b33a10b672c13bbb9c8ba75a0ef0eaac1ce31e4e7d1c62ac3a701160e2ae9aa5de4915cde9b23 diff --git a/dev-java/idm-console-framework/metadata.xml b/dev-java/idm-console-framework/metadata.xml index 664e0f4d871a..b3788377b81e 100644 --- a/dev-java/idm-console-framework/metadata.xml +++ b/dev-java/idm-console-framework/metadata.xml @@ -4,12 +4,10 @@ wibrown@redhat.com William Brown - Proxy maintainer. Part of the 389-ds core team. wes@sol1.com.au Wes - Proxy maintainer. proxy-maint@gentoo.org diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest index c14d9d952955..3e5e0adce391 100644 --- a/dev-java/oracle-jdk-bin/Manifest +++ b/dev-java/oracle-jdk-bin/Manifest @@ -19,5 +19,5 @@ DIST jdk-9.0.4_linux-x64_bin.tar.gz 354635831 BLAKE2B 6d102ca812c7fcf03b611d9588 DIST jdk-9.0.4_osx-x64_bin.dmg 400672048 BLAKE2B 0bcc3643ccbc72cd98aca71823e06fd60068a7e1d72c7ce59f8e4c26bb9461a207f57ef239b244ec05c8f843666f2854b07a5f05841819cfe79ed8fefafb3650 SHA512 34191b5802c2d369f890cb1b563f77ee040b9af6ee4fc8ae81974f46afea675401e2a02803fc4345e11bab1103397dd8b583d68bb81edcdd02902cb3e595cc52 DIST jdk-9.0.4_solaris-sparcv9_bin.tar.gz 217025485 BLAKE2B 6b3d4f4701ff3349f8acce727fcfcb06ce420e54dd32d2e6b91b71aa898a8d6a293375ec2cb0c66f14a5df77a6f5b7016160572b995ad84a593e9d5c6c928184 SHA512 9418a725a33dfbedf7f692abfb92550f23fca594fa8c1b85934d601284261339f177a32af7440e0b09233b2e99b2fd7cef835c54252cec6a645ea322a389de14 EBUILD oracle-jdk-bin-1.8.0.162.ebuild 8558 BLAKE2B 362a0e866d590cfe000660cbe6ffae98417a85e1af0dadc1144e9c043138e5485692e99ff447cd3ab2047d99e2158861bbe2d79994753a87d2a652c18f8421d3 SHA512 e4a434c7ded313e830045b930314a99393ee29168aca37f36d8379cd48e06c924d80eedf97205b6041e658d95510ad110af916cfa1947f1c389a2d54141c6256 -EBUILD oracle-jdk-bin-9.0.4.ebuild 6773 BLAKE2B 4a14d476a65369fb37ef1d28c1419142a9912cf4f42a602df71873886d46a10acbae7a4ca8e1259d565ca1040803d962a39dac860a2a956b5962fd31eb59c268 SHA512 36c52361def1f6b9eaa04900595731ceb9d63279788ff434be6fad3066f88574bf044239319d5ef91cf958dad8419d4d811bc08146a2b2c859409caf799d8e87 +EBUILD oracle-jdk-bin-9.0.4-r1.ebuild 6796 BLAKE2B 3426cf28b2b8562c0fc2f8db3dafb47e2d93da8d85d39b2dd3633f5a0308ba03ffc8861540ac2e5ac957440e40943b4203e82075a6cd564e7bb4f029302a7664 SHA512 cf7a37b711f9c81c653afee63a0e6c114c13f7a6d4470954b9bc34005719cb681d9403ce3127e59af1c9a6a3a4ab5e061239a71f79e1461e4ba308936a443639 MISC metadata.xml 1200 BLAKE2B 3ed6f9dd71a1c26a5292a56f89f8ce8ed72475b0c5139cb03afb47559ae464e0ed64ae4ed5a023bc2a2d316c77805a8820762a4dbfa091f612fd2729fe2f17f5 SHA512 1c104de4d08e61cb3cb14755536e7ed74df233325a673fcd83ca930335d35e77408653a4e2f962de792e186dd7ad9457e3898be159af61842610801ea00b9d9f diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild new file mode 100644 index 000000000000..216d6da22178 --- /dev/null +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit desktop gnome2-utils java-vm-2 prefix + +KEYWORDS="-* ~amd64 ~x64-macos ~sparc64-solaris" + +declare -A ARCH_FILES +ARCH_FILES[amd64]="jdk-${PV}_linux-x64_bin.tar.gz" +ARCH_FILES[sparc64-solaris]="jdk-${PV}_solaris-sparcv9_bin.tar.gz" +ARCH_FILES[x64-macos]="jdk-${PV}_osx-x64_bin.dmg" + +for keyword in ${KEYWORDS//-\*} ; do + SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )" +done + +DESCRIPTION="Oracle's Java SE Development Kit" +HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" +LICENSE="Oracle-BCLA-JavaSE" +SLOT="${PV%%.*}" +IUSE="alsa commercial cups doc +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux source" +REQUIRED_USE="javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )" +RESTRICT="fetch preserve-libs strip" +QA_PREBUILT="*" + +# NOTES: +# +# * cups is dlopened. +# +# * libpng is also dlopened but only by libsplashscreen, which isn't +# important, so we can exclude that. +# +# * We still need to work out the exact AWT and JavaFX dependencies +# under MacOS. It doesn't appear to use many, if any, of the +# dependencies below. +# +RDEPEND="!x64-macos? ( + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) + javafx? ( + dev-libs/atk + dev-libs/glib:2 + dev-libs/libxml2:2 + dev-libs/libxslt + media-libs/freetype:2 + x11-libs/gdk-pixbuf + x11-libs/libX11 + x11-libs/libXtst + x11-libs/libXxf86vm + x11-libs/pango + virtual/opengl + + gtk2? ( + x11-libs/cairo + x11-libs/gtk+:2 + ) + gtk3? ( + x11-libs/cairo[glib] + x11-libs/gtk+:3 + ) + ) + ) + !prefix? ( + dev-libs/elfutils + sys-libs/glibc:* + ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + doc? ( dev-java/java-sdk-docs:${SLOT} ) + fontconfig? ( media-libs/fontconfig:1.0 ) + selinux? ( sec-policy/selinux-java )" + +pkg_nofetch() { + einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to" + einfo "${DISTDIR}:" + einfo + einfo " http://www.oracle.com/technetwork/java/javase/downloads/jdk9-downloads-3848520.html" + einfo + einfo "If the above mentioned URL does not point to the correct version anymore," + einfo "please download the file from Oracle's Java download archive:" + einfo + einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase9-3934878.html" + einfo +} + +src_unpack() { + if use x64-macos ; then + S="${WORKDIR}/Contents/Home" + mkdir -p "${T}"/dmgmount || die + hdiutil attach "${DISTDIR}/${A}" -mountpoint "${T}"/dmgmount || die + ( cd "${T}" && + xar -xf "${T}/dmgmount/JDK ${PV}.pkg" \ + jdk${PV//.}.pkg/Payload ) || die + zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die + hdiutil detach "${T}"/dmgmount || die + else + S="${WORKDIR}/jdk-${PV}" + default + fi +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}${dest#/}" + + # Create files used as storage for system preferences. + mkdir .systemPrefs || die + touch .systemPrefs/.system.lock || die + touch .systemPrefs/.systemRootModFile || die + + if ! use alsa ; then + rm -vf lib/libjsoundalsa.* || die + fi + + if ! use commercial ; then + rm -vfr jmods/*.jfr.* lib/jfr* \ + lib/missioncontrol || die + fi + + if use headless-awt ; then + rm -vf lib/lib*{[jx]awt,splashscreen}* \ + bin/{appletviewer,javaws,policytool} || die + fi + + if ! use javafx ; then + rm -vf lib/lib*{decora,fx,glass,prism}* \ + lib/libgstreamer-lite.* lib/*fx* \ + bin/javapackager jmods/javafx* || die + else + if ! use gtk2 ; then + rm -vf lib/libglassgtk2.* || die + elif ! use gtk3 ; then + rm -vf lib/libglassgtk3.* || die + fi + fi + + if ! use nsplugin ; then + rm -vf lib/libnpjp2.* || die + else + local nsplugin=$(echo lib/libnpjp2.*) + local nsplugin_link=${nsplugin##*/} + nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.} + dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}" + fi + + if ! use source ; then + rm -v lib/src.zip || die + fi + + # Even though plugins linked against multiple ffmpeg versions are + # provided, they generally lag behind what Gentoo has available. + rm -vf lib/libavplugin* || die + + # Prune all fontconfig files so that libfontconfig will be used. + rm -v lib/fontconfig.* || die + + # Install desktop file for the Java Control Panel. Using + # ${PN}-${SLOT} to prevent file collision with JRE and other slots. + if [[ -d lib/desktop/icons ]] ; then + local icon + pushd lib/desktop/icons >/dev/null || die + for icon in */*/apps/sun-jcontrol.png ; do + insinto /usr/share/icons/"${icon%/*}" + newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png + done + popd >/dev/null || die + make_desktop_entry \ + "${dest}"/bin/jcontrol \ + "Java Control Panel for Oracle JDK ${SLOT}" \ + sun-jcontrol-${PN}-${SLOT} \ + "Settings;Java;" + fi + + dodir "${dest}" + cp -pPR bin conf include jmods lib "${ddest}" || die + + # Only install Gentoo-specific fontconfig if flag is disabled. + # https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html + if ! use fontconfig ; then + insinto "${dest}"/lib/ + doins "$(prefixify_ro "${FILESDIR}"/fontconfig.Gentoo.properties)" + fi + + # Needs to be done before CDS, bug #215225. + java-vm_set-pax-markings "${ddest}" + + # See bug #207282. + einfo "Creating the Class Data Sharing archives" + "${ddest}/bin/java" -server -Xshare:dump || die + + # Remove empty dirs we might have copied. + find "${D}" -type d -empty -exec rmdir -v {} + || die + + if use x64-macos ; then + local lib + for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do + ebegin "Fixing self-reference of ${lib}" + install_name_tool \ + -id "${EPREFIX}${dest}"/lib/${lib} \ + "${ddest}"/lib/${lib} || die + eend $? + done + fi + + use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-9.env.sh + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + java-vm-2_pkg_postinst + + if ! use headless-awt && ! use javafx ; then + ewarn "You have disabled the javafx flag. Some modern desktop Java applications" + ewarn "require this and they may fail with a confusing error message." + fi + + if use gentoo-vm ; then + ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" + ewarn "recognised by the system. This will almost certainly break things." + else + ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" + ewarn "will not be recognised by the system. For example, simply calling" + ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" + ewarn "fully supports Java 9. This JDK must therefore be invoked using its" + ewarn "absolute location under ${EPREFIX}/opt/${P}." + fi +} + +pkg_postrm() { + gnome2_icon_cache_update + java-vm-2_pkg_postrm +} diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild deleted file mode 100644 index fee4dd82f889..000000000000 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop gnome2-utils java-vm-2 prefix - -KEYWORDS="-* ~amd64 ~x64-macos ~sparc64-solaris" - -declare -A ARCH_FILES -ARCH_FILES[amd64]="jdk-${PV}_linux-x64_bin.tar.gz" -ARCH_FILES[sparc64-solaris]="jdk-${PV}_solaris-sparcv9_bin.tar.gz" -ARCH_FILES[x64-macos]="jdk-${PV}_osx-x64_bin.dmg" - -for keyword in ${KEYWORDS//-\*} ; do - SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )" -done - -DESCRIPTION="Oracle's Java SE Development Kit" -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" -LICENSE="Oracle-BCLA-JavaSE" -SLOT="${PV%%.*}" -IUSE="alsa commercial cups doc +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux source" -REQUIRED_USE="javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )" -RESTRICT="fetch preserve-libs strip" -QA_PREBUILT="*" - -# NOTES: -# -# * cups is dlopened. -# -# * libpng is also dlopened but only by libsplashscreen, which isn't -# important, so we can exclude that. -# -# * We still need to work out the exact AWT and JavaFX dependencies -# under MacOS. It doesn't appear to use many, if any, of the -# dependencies below. -# -RDEPEND="!x64-macos? ( - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - ) - javafx? ( - dev-libs/atk - dev-libs/glib:2 - dev-libs/libxml2:2 - dev-libs/libxslt - media-libs/freetype:2 - x11-libs/gdk-pixbuf - x11-libs/libX11 - x11-libs/libXtst - x11-libs/libXxf86vm - x11-libs/pango - virtual/opengl - - gtk2? ( - x11-libs/cairo - x11-libs/gtk+:2 - ) - gtk3? ( - x11-libs/cairo[glib] - x11-libs/gtk+:3 - ) - ) - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - doc? ( dev-java/java-sdk-docs:${SLOT} ) - fontconfig? ( media-libs/fontconfig:1.0 ) - !prefix? ( sys-libs/glibc:* ) - selinux? ( sec-policy/selinux-java )" - -pkg_nofetch() { - einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to" - einfo "${DISTDIR}:" - einfo - einfo " http://www.oracle.com/technetwork/java/javase/downloads/jdk9-downloads-3848520.html" - einfo - einfo "If the above mentioned URL does not point to the correct version anymore," - einfo "please download the file from Oracle's Java download archive:" - einfo - einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase9-3934878.html" - einfo -} - -src_unpack() { - if use x64-macos ; then - S="${WORKDIR}/Contents/Home" - mkdir -p "${T}"/dmgmount || die - hdiutil attach "${DISTDIR}/${A}" -mountpoint "${T}"/dmgmount || die - ( cd "${T}" && - xar -xf "${T}/dmgmount/JDK ${PV}.pkg" \ - jdk${PV//.}.pkg/Payload ) || die - zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die - hdiutil detach "${T}"/dmgmount || die - else - S="${WORKDIR}/jdk-${PV}" - default - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}${dest#/}" - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - if ! use alsa ; then - rm -vf lib/libjsoundalsa.* || die - fi - - if ! use commercial ; then - rm -vfr jmods/*.jfr.* lib/jfr* \ - lib/missioncontrol || die - fi - - if use headless-awt ; then - rm -vf lib/lib*{[jx]awt,splashscreen}* \ - bin/{appletviewer,javaws,policytool} || die - fi - - if ! use javafx ; then - rm -vf lib/lib*{decora,fx,glass,prism}* \ - lib/libgstreamer-lite.* lib/*fx* \ - bin/javapackager jmods/javafx* || die - else - if ! use gtk2 ; then - rm -vf lib/libglassgtk2.* || die - elif ! use gtk3 ; then - rm -vf lib/libglassgtk3.* || die - fi - fi - - if ! use nsplugin ; then - rm -vf lib/libnpjp2.* || die - else - local nsplugin=$(echo lib/libnpjp2.*) - local nsplugin_link=${nsplugin##*/} - nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.} - dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}" - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - # Even though plugins linked against multiple ffmpeg versions are - # provided, they generally lag behind what Gentoo has available. - rm -vf lib/libavplugin* || die - - # Prune all fontconfig files so that libfontconfig will be used. - rm -v lib/fontconfig.* || die - - # Install desktop file for the Java Control Panel. Using - # ${PN}-${SLOT} to prevent file collision with JRE and other slots. - if [[ -d lib/desktop/icons ]] ; then - local icon - pushd lib/desktop/icons >/dev/null || die - for icon in */*/apps/sun-jcontrol.png ; do - insinto /usr/share/icons/"${icon%/*}" - newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png - done - popd >/dev/null || die - make_desktop_entry \ - "${dest}"/bin/jcontrol \ - "Java Control Panel for Oracle JDK ${SLOT}" \ - sun-jcontrol-${PN}-${SLOT} \ - "Settings;Java;" - fi - - dodir "${dest}" - cp -pPR bin conf include jmods lib "${ddest}" || die - - # Only install Gentoo-specific fontconfig if flag is disabled. - # https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html - if ! use fontconfig ; then - insinto "${dest}"/lib/ - doins "$(prefixify_ro "${FILESDIR}"/fontconfig.Gentoo.properties)" - fi - - # Needs to be done before CDS, bug #215225. - java-vm_set-pax-markings "${ddest}" - - # See bug #207282. - einfo "Creating the Class Data Sharing archives" - "${ddest}/bin/java" -server -Xshare:dump || die - - # Remove empty dirs we might have copied. - find "${D}" -type d -empty -exec rmdir -v {} + || die - - if use x64-macos ; then - local lib - for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do - ebegin "Fixing self-reference of ${lib}" - install_name_tool \ - -id "${EPREFIX}${dest}"/lib/${lib} \ - "${ddest}"/lib/${lib} || die - eend $? - done - fi - - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-9.env.sh - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - java-vm-2_pkg_postinst - - if ! use headless-awt && ! use javafx ; then - ewarn "You have disabled the javafx flag. Some modern desktop Java applications" - ewarn "require this and they may fail with a confusing error message." - fi - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break things." - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 9. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi -} - -pkg_postrm() { - gnome2_icon_cache_update - java-vm-2_pkg_postrm -} -- cgit v1.2.3