summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin91690 -> 91537 bytes
-rw-r--r--dev-java/glassfish-connector-api/Manifest3
-rw-r--r--dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild46
-rw-r--r--dev-java/glassfish-connector-api/metadata.xml8
-rw-r--r--dev-java/icedtea-bin/Manifest2
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild2
-rw-r--r--dev-java/openjdk-bin/Manifest3
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild11
-rw-r--r--dev-java/openjdk/Manifest3
-rw-r--r--dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild239
-rw-r--r--dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild2
-rw-r--r--dev-java/protobuf-java/Manifest4
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.7.1.ebuild2
-rw-r--r--dev-java/protobuf-java/protobuf-java-9999.ebuild2
14 files changed, 19 insertions, 308 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 6b336dfdeae6..db089b438d8e 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/glassfish-connector-api/Manifest b/dev-java/glassfish-connector-api/Manifest
deleted file mode 100644
index 66d76a380a82..000000000000
--- a/dev-java/glassfish-connector-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST glassfish-v2ur2-b04-src.zip 39817113 BLAKE2B 4aeb0df44f838c91fa8dd52e2a4985e86457f75cec3cd5d527de54f672afcd2824cefaad9d9e67c5ce096515e389bb2fc0874d76ce2ec86a956233f2c3508439 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8
-EBUILD glassfish-connector-api-1.1.2.2.04.ebuild 1078 BLAKE2B 7d58722ae79549f28f79c3e36f882d3007d88733e1bfada43761272153e7b864cd9da6d60702bef4bfb7bbfbe3fff360209ff080d6f7be7d001b90f6cfae72f7 SHA512 fd8c4916848f767854da011218ac456247c78d2566139c07ee121c4914601fac328d9f045fda79c4e8a1dc8b72b0e0c5ae4bdd675c583d9dc8ba19745c290a49
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild b/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild
deleted file mode 100644
index 3ad3ed6feacd..000000000000
--- a/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit versionator java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Transaction API"
-HOMEPAGE="https://glassfish.dev.java.net/"
-MAJOR=v$(get_version_component_range 3-4)
-MAJOR=$(replace_version_separator 1 ur ${MAJOR})
-MY_PV=${MAJOR}-b$(get_version_component_range 5)
-MY_PN=${PN/-//}
-ZIP="glassfish-${MY_PV}-src.zip"
-SRC_URI="http://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
-
-LICENSE="|| ( CDDL GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEP}"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
- unzip -q "${DISTDIR}/${ZIP}" "${MY_PN}/*" "glassfish/bootstrap/*" \
- || die "unpacking failed"
- einfo "${S}"
-}
-
-EANT_BUILD_TARGET="all"
-EANT_EXTRA_ARGS="-Djavaee.jar=\"${S}/${PN}.jar\""
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
- java-pkg_dojar *.jar
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc src/java/javax
-}
diff --git a/dev-java/glassfish-connector-api/metadata.xml b/dev-java/glassfish-connector-api/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/glassfish-connector-api/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 79bfeeb23ae9..f7e95941b5a0 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -28,5 +28,5 @@ DIST icedtea-bin-examples-3.12.0-x86.tar.xz 1859900 BLAKE2B 44ea53632b82e1bbcc7b
DIST icedtea-bin-src-3.10.0.tar.xz 45755380 BLAKE2B ba6fd20de7d21e728108ff1d30599112ddf7ac24135e30891ae0d033bf77d52238c81c5c7fc7375e062ad4e8bb9492098cc0a20d3ab8486a4a02f20efa1f06a5 SHA512 0693cfe83a80d5e9e86be394b142b23097b0cfc1193f68f0fd07045ad4792b38bffcce47ea764f934d3dbfc568bdfbf5017725e7f35fbe1175b48498d53b0c5e
DIST icedtea-bin-src-3.12.0.tar.xz 45776320 BLAKE2B 97ca4172ed8eadbcda0e20b598083b6948cd3a90705653716f1b6a9e65e150a1ef7d9e9ecdd3ad5ea90fd972ec9f1c3fe20ace44e4d2a0ede8e6d491991f7f9f SHA512 f6e7efa0962632d52032cd22a6b8de50bc2571a5ebcd18314b9aa01fb23cbd8d134eda5d1d2a6bb7fb1e26decc8a5740dfa60318019b920eb3f0498c2a9e9784
EBUILD icedtea-bin-3.10.0-r2.ebuild 4394 BLAKE2B ffc1c96d61a6eb5afe2ad5677f493f0eeb4e84467a9426bc6b58a6f5440d14fa07df05edbeb828e36010dc58b6d57041cc9e03f1977a700e8ce2a869f159cda2 SHA512 8ff85806b905a1d2e8817d37ceefd1758b40d0a8a7824721fadb833bcd71e0aee6180287940fe0b77eb704086dfec6941479db6a8a581c85a7dfb08bc39bf7cf
-EBUILD icedtea-bin-3.12.0-r1.ebuild 4600 BLAKE2B dc791f18d2eac82f4cde2a6d2ea82cef5c583c5dda1f07738dce04140ebbc333d2091bca5e994b98e87a6c87fb6e03fbdceff1648b86b67ec842f9794de9bde0 SHA512 9c66dd3af5ebaaeef5c57ded7a59a6d7c342fd4b2b63c8cd741825862e4bff31853eb8b90d6405eb3875504f1764dc75c0489aacebc0c14c71f2199694f170bf
+EBUILD icedtea-bin-3.12.0-r1.ebuild 4599 BLAKE2B b7b7bfa287eaa90d3c1cffe402ba1ac166d2561809e1cdc0f8aa19b123fac1a6271eaf1f0fab0d65b913e8c96cd8d02ffb3e397d2845c7f9d5e9ab44a0c946c4 SHA512 5a6f7a64937248950134f1455fcf8efc17c223d6b2402f926a8c8dabf92dafa4b56579b3a851f00e36938eb6ddee07dbb236c7fa0d36790a3f2b4c63e1a8970e
MISC metadata.xml 560 BLAKE2B f377bffd73661fbf1573f3d80906a38fa9fd170a686dee6c13ee7769ffadd8ff2de696d63cd7fdc4332ca654851da027b76e22389a98412b52b4fd5c00935429 SHA512 71613013231a9bf6daabb672557c3f419bd9443999b740a4d73fe242b827a278a66671f2cb347d20833008c332262609f7df03691e313e0dc0ec3e2a56e79565
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
index 5c5e744bca91..5788fa2b18bb 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
# Don't block arm. See bug #600134.
#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="-* amd64 ~arm ~arm64 ppc64 x86"
inherit java-vm-2 multilib-build toolchain-funcs
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 730de576a718..434d1ae1afec 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,12 +1,13 @@
AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
AUX openjdk-bin-8.env.sh 705 BLAKE2B 0e155706fa9633a9a2e54ae2c9ecb95516c0b46ead84e24dc4c4d79a1b67644eedc6b97e6d4e17da4f6162e2ce7bfafe60dddc950e7f76a666af46920a8a5025 SHA512 ca6fc7b0889ae3d2be386696eadaf9f25fdedaf94cb24696a2de56214695cb0211226bc87671449bf366763f568229b22409201e532d14394c641164c48ffe2d
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.3_7.tar.gz 194142513 BLAKE2B 1809ee89a4dd31d5453d15b0e3672e1d4a9e1e4573954a8dcf793cb4f837ca4bb44eab73fb685896273fa5301011d671568cb7648c0c5095659f5441a559bfad SHA512 22964e4b0819eb214f378969501b9ad67e39f4efeb7425245022f7eae804386a5e0c7a8139a5df604efd649ff1d551323e6b08299ce0e3f71719e3cd120d7b91
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz 174868718 BLAKE2B 74c482d6cdc4066e4c8fbc93ab7f44165dc55c360d7cab36228032b76073217546e046e0556ae9aac3de05a69e860aa06d3a55d9f2aac1e8ccce1b650f45b464 SHA512 053787da52083f8e4cfd808205a965486d88f6e61117119ee7a5c359eb02564e581f0111ee9738feed3424eb8abc55e9e8d94d6558a63b3be7150361aaa39a89
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.3_7.tar.gz 180425080 BLAKE2B 77f571a145e837c80da49a2ef8d20089b24ec23abf8078cc5781762ec9b88038d4c47c9d36766195c2f96809c98e4706b249c14518ef450b1fbfb100ba8c49d8 SHA512 6b7542fcbd9b727e93a2c2e157ecd52fb27db74d67cc98fb713eed531c7ea4420fdae2e420131b3d046e6ad2bccb2f91461928750e7b9c4274984a983293be8a
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz 195982221 BLAKE2B 61ccbceb07bcb72a5f9d797997b4a250c2d171d7c7930877db0865d95b1faeb83e160eab59c484d2fce06a7116f06eb8a57eb5295a254fba7315ccb2e88b6db9 SHA512 2c590492ab9bddef68afcfbb54117688e1b24b41dc871bc4ba869319c16587ebfc061ce72712f209403e76d589f01d57cd85384653b1ecf767ee8e4018e1607a
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u191b12.tar.gz 75382012 BLAKE2B 9521bb3d0dc08d5069108bb56594d401cbadf7a290652a39c7379e6ded530044e85f1ffae1cd3eb7e881d7c283c06463e6f8b76602d03a7bf5b188b1004f5daf SHA512 156f7a57f095095b72edb4bfc766d575795e496b006fb994566b0207d346e89863cf377ce97290bf1b47923c5d6aee5558eaa7a54f394f95a270b1cfec4308e2
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u212b03.tar.gz 101610850 BLAKE2B 3a782f21855b1633255b2691e4adb516b12b84e37d81cdfda2b7b251cf78602a3b4c4120fbaec01d177fe7187b581f5dde392c7f841a39d269b548f1ada18be2 SHA512 25d53c8ca9bc4e1fd0ae1fca349d1e605e0dfb8a4aa386408875d5c23ef8b3ecc42ed297bc125f2ab74e9726e10374ec12d6c39736a53a94d3150001756e0027
DIST OpenJDK8U-jdk_x64_linux_hotspot_8u212b03.tar.gz 104368598 BLAKE2B 0c16398c1e962e53316eb9301a8ebb6dc7b37ef812d3b65719c239f392074fcba999fca8442cc52a0b067eb4761b0477e9da243d0d84a2e2ded1d883614d15b3 SHA512 7674f26bbc69535c1d06d7364f515ddd00f1f43f6fb76c806c56cd3b379e03047084fbf6439e375cf57257b8a1fdf94702ba063bf843793b009a76fb449a5cc9
-EBUILD openjdk-bin-11.0.3_p7-r1.ebuild 2963 BLAKE2B 83ecbd0e1d771404d63da0162604331aa5d56d1b081b65489bbcf821e7d5a6a961219002e991e986cf42b5ca0973316745319ed6268925b0dd8c3c9d76b37217 SHA512 9db8bd814a2b0a3ec915737de22d8e1082015a5dd641915fd5fd56a6abde8a72fc3b4c70f0933833bd3fbd3646bb55eb1c4b2aa2cfa32dc9e1a61dc0fe302601
+EBUILD openjdk-bin-11.0.3_p7-r1.ebuild 3103 BLAKE2B 6f2cc8dde84c26ae07f851cc2de442475812d70f3b4140ee8798ed5db202d7a0f00e323fdaa920b75dc57b96cc0ac5b57ecfc7f580ee13bd43c0497ca4419662 SHA512 164e4d5063c08c853250405bfce9ac462e21d2dc6b7fc2a50d2205f479de5a8b9ee56b18066c45675776097abc2024ef13b2f109d785f75bcd716f00e83918ee
EBUILD openjdk-bin-8.191_p12-r1.ebuild 2588 BLAKE2B a5621d26ba42de2ac06e4c4bbc3b044868645d554d4a21c6290a8f25fed8b492986d2affa80d2ec5bafdf9177b0d6688a916cdbdd2f33901523e883b2fe9812d SHA512 05f94a9eace6c0388ade4a75470c63d7f93732c47bbc7475642651a9de90431fef0974be8c266fcf6246992c57170e42f16775e52718a298ac91b03982c122df
EBUILD openjdk-bin-8.212_p03-r3.ebuild 2802 BLAKE2B be06cd2dab9c4a3654a53a148850e3fcbf6ecb541117035c6e4d872a155e456b2371665ad719d86f113d6f88ffa453a2e6b95a633543a9f0cbd688298ebd7591 SHA512 c065c02e0e807e4482577e4c3d3236cb622a002966ae17e5426cb677ac05b78a15ce0b1c3edfdd9fa6a4d3a1a17e537931160f0e1818c3294736dfdd4a6138e0
MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild
index a70143ee9f51..dfe0d4c44d1f 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild
@@ -15,15 +15,16 @@ MY_PV=${PV/_p/+}
SLOT=${MY_PV%%[.+]*}
SRC_URI="
- $(abi_uri x64 amd64)
+ $(abi_uri arm)
$(abi_uri aarch64 arm64)
$(abi_uri ppc64le ppc64)
+ $(abi_uri x64 amd64)
"
DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
HOMEPAGE="https://adoptopenjdk.net"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
RDEPEND="
@@ -52,6 +53,12 @@ QA_PREBUILT="*"
S="${WORKDIR}/jdk-${MY_PV}"
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]]; then
+ die "These binaries require a hardfloat system."
+ fi
+}
+
src_install() {
local dest="/opt/${P}"
local ddest="${ED%/}/${dest#/}"
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 5e06f5a878c8..e7d600f7d673 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -10,7 +10,6 @@ DIST openjdk-jaxws-8.212_p03.tar.bz2 2540937 BLAKE2B 53c2793d9071f408a3704dacc4d
DIST openjdk-jdk-8.212_p03.tar.bz2 46720739 BLAKE2B af515701052ede8b6cf828cc74f1f5938dad0874a12ed3c5c3f7b03be1f43108fce5e1820452a87e098c3469922227950f6f4fea33306f7b426487b48cc4b993 SHA512 9b3342419c82a8f243d2a7523d83b395c89629820fd99ba387991656e5754ed067877bf12b7e780368dd4bdb6eba10be09e63b1301bcbc0aa29e86e84ec394a3
DIST openjdk-langtools-8.212_p03.tar.bz2 2393112 BLAKE2B 96656795114bad1d2e5eabace5d1c6568646084421fbaa43045ce0ec8d222f1a7e8629e4b86bdd5ff8eb51e90ea1eaafab3e94f34c41932754249f17b2e447f8 SHA512 15b931432cb14cf60c73627bd70e66f6d18ff25763a7b8758109cf8746d278d6c2b5d945a9f0b948a76c0813b5f42c988a3d10ac13165ec12e0f4d9eab98f369
DIST openjdk-nashorn-8.212_p03.tar.bz2 2854888 BLAKE2B 3e5a1867d8a5db301fb3512ebdc4dea8f8226fe3308142d6f3f616795c9cee0d598a257ccd7e790ec440c966339399776d1118764dbf882a46a2daa32d81ddd5 SHA512 5c7fba1d567aa1d0602ef045b24a8624fed9ced72b3bae030ee15ea133ed2223e402cc08c996ff253c4792570da87b7713f351c84704b12556466349f6452f74
-EBUILD openjdk-11.0.3_p7-r3.ebuild 6633 BLAKE2B 544ba95a98184a8ebcc8afbed6df35bae6ebc915d85bca14cd4372a455a993870b412af3a523776b12ab098959893722679225894c3d39cbd81142701b41e85a SHA512 3f977211e70ae9cbeb4d14880e844aa93ec84ce68160a1c2a9a684ed92fc1fb4ec7ae7be3837b6549f59524420c5ad0b941efba5b5e782f7a21f3e1c9b61a13c
-EBUILD openjdk-11.0.3_p7-r4.ebuild 7389 BLAKE2B 26ef9976d264502a77c83f37bb6c1e2fbc17da768f5abfaadf83408598f8e23eec8f3f2adae63801d7972bccd72fb7b7a2f99a6aa8f9b674aa0b1eae1a1af520 SHA512 2d9aa129b5d161b5d42c07767d24910cbdf4f563f477a4b4b926229ce06b572c169f7e352c9d91f03fee06e4edcf49b5dcb67ec598202267a8a20479e41ffa0a
+EBUILD openjdk-11.0.3_p7-r4.ebuild 7394 BLAKE2B d82ea0a57aa97fb40887b7f4da9bc7a6c61b17c6bb0026eef979e9cb44937a7c253e0364c0487348d6274cd7e6f1f84d0a7a3e9ce710729992b1484b42b41531 SHA512 cfb17b2bcfff4a0d63dc4e1a180ad1b088c7d49cd1949ee0605e68342424e4d1e91468cb0c053937d535423d569d7f4164f99c05ffc1618ae996337d73c603d7
EBUILD openjdk-8.212_p03-r3.ebuild 7320 BLAKE2B dc4a418d885c1db666dee134dd5fa73a041772dac925fe7249a24531ed7e38e29c8f1f8ea4d7aa41dcea7173cebb1ef110b6ffe8cffc8bb7b0166751e13e8c2b SHA512 c6b402eadf629322aaa9207cf8ebfcacbd3bb702ee565372200b2f74be8d26b4eb41ffdfc85feb945e8dc044c7f4c5c650172fe27cb59deb32daaa95be3e1063
MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild
deleted file mode 100644
index 3a4668d70da8..000000000000
--- a/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source systemtap +webstart"
-
-COMMON_DEPEND="
- media-libs/freetype:2=
- media-libs/giflib:0/7
- media-libs/libpng:0=
- media-libs/lcms:2=
- sys-libs/zlib
- virtual/jpeg:0=
- systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
- ${COMMON_DEPEND}
- >=sys-apps/baselayout-java-0.1.0-r1
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- app-arch/zip
- media-libs/alsa-lib
- net-print/cups
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- || (
- dev-java/openjdk-bin:${SLOT}
- dev-java/openjdk:${SLOT}
- )
-"
-
-PDEPEND="
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
- local M
- M=2048
- M=$(( $(usex jbootstrap 2 1) * $M ))
- M=$(( $(usex debug 3 1) * $M ))
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- openjdk_check_requirements
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
-}
-
-pkg_setup() {
- openjdk_check_requirements
- java-vm-2_pkg_setup
-
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
- JAVA_PKG_WANT_SOURCE="${SLOT}"
- JAVA_PKG_WANT_TARGET="${SLOT}"
-
- # The nastiness below is necessary while the gentoo-vm USE flag is
- # masked. First we call java-pkg-2_pkg_setup if it looks like the
- # flag was unmasked against one of the possible build VMs. If not,
- # we try finding one of them in their expected locations. This would
- # have been slightly less messy if openjdk-bin had been installed to
- # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
- # file but disable it so that it would not normally be selectable.
-
- local vm
- for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
- java-pkg-2_pkg_setup
- return
- fi
- done
-
- if has_version --host-root dev-java/openjdk:${SLOT}; then
- export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
- else
- if [[ ${MERGE_TYPE} != "binary" ]]; then
- JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
- JDK_HOME=${JDK_HOME#*/}
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
- export JDK_HOME
- fi
- fi
-}
-
-src_prepare() {
- default
- chmod +x configure || die
-}
-
-src_configure() {
- # Work around stack alignment issue, bug #647954. in case we ever have x86
- use x86 && append-flags -mincoming-stack-boundary=2
-
- # Enabling full docs appears to break doc building. If not
- # explicitly disabled, the flag will get auto-enabled if pandoc and
- # graphviz are detected. pandoc has loads of dependencies anyway.
-
- local myconf=(
- --disable-ccache
- --enable-full-docs=no
- --with-boot-jdk="${JDK_HOME}"
- --with-extra-cflags="${CFLAGS}"
- --with-extra-cxxflags="${CXXFLAGS}"
- --with-extra-ldflags="${LDFLAGS}"
- --with-giflib=system
- --with-lcms=system
- --with-libjpeg=system
- --with-libpng=system
- --with-native-debug-symbols=$(usex debug internal none)
- --with-vendor-name="Gentoo"
- --with-vendor-url="https://gentoo.org"
- --with-vendor-bug-url="https://bugs.gentoo.org"
- --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
- --with-vendor-version-string="${PV}"
- --with-version-pre=gentoo
- --with-version-string=${MY_PV%+*}
- --with-version-build=${MY_PV#*+}
- --with-zlib=system
- --enable-dtrace=$(usex systemtap yes no)
- --enable-headless-only=$(usex headless-awt yes no)
- )
-
- # PaX breaks pch, bug #601016
- if use pch && ! host-is-pax; then
- myconf+=( --enable-precompiled-headers )
- else
- myconf+=( --disable-precompiled-headers )
- fi
-
- (
- unset _JAVA_OPTIONS JAVA JAVAC XARGS
- CFLAGS= CXXFLAGS= LDFLAGS= \
- CONFIG_SITE=/dev/null \
- econf "${myconf[@]}"
- )
-}
-
-src_compile() {
- emake -j1 \
- $(usex doc docs '') \
- $(usex jbootstrap bootcycle-images product-images) \
- JOBS=$(makeopts_jobs) LOG=debug CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
- local ddest="${ED}${dest#/}"
-
- cd "${S}"/build/*-release/images/jdk || die
-
- # Oracle and IcedTea have libjsoundalsa.so depending on
- # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
- if ! use alsa ; then
- rm -v lib/libjsound.* || die
- fi
-
- if ! use examples ; then
- rm -vr demo/ || die
- fi
-
- if ! use source ; then
- rm -v lib/src.zip || die
- fi
-
- mv lib/security/cacerts lib/security/cacerts.orig || die
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
- if use doc ; then
- insinto /usr/share/doc/${PF}/html
- doins -r "${S}"/build/*-release/images/docs/*
- fi
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-
- 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 ${SLOT}. This JDK must therefore be invoked using its"
- ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
- fi
-}
diff --git a/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
index ad003801a229..67e91789000b 100644
--- a/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://openjdk.java.net"
SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap +webstart"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index e8f505d608bc..94a2d4023f2f 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -2,7 +2,7 @@ DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fd
DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
EBUILD protobuf-java-3.6.1.3.ebuild 1109 BLAKE2B d76e82ea1872d9c8d3a7cee220e243a424d5352dea09962435d487282c88157d937f89eb07e214f3a0bb62abdaab7afe88572cc4a00decc67e03ca13b6da4673 SHA512 8504a8fead79fe649cfd0d8bb63fe44c30e7f68c5fa8d0f3546a55460dc3e78fbd63f636b4f02269455159f471ead4a86d96431beb7d131c11c211b5b02d1e0a
-EBUILD protobuf-java-3.7.1.ebuild 1447 BLAKE2B e048a175576353702c909fb4ecb935def9824ab21d52d1192c069128f04fb7766c626c6029b7be3c5f6113e1d5e60f5e4bb407a482c4b44679c6816e1b279ee6 SHA512 05282da135ff752a289789b15cc57566512335cd55456d07180a1fade7a4470243a1d7f1d9cedc7b181884be4458d0e5041a92dd5abb40250878678942fc0584
+EBUILD protobuf-java-3.7.1.ebuild 1446 BLAKE2B 0354f61083a5747a713621fcee7a59a938ff03c008260dadd8aec7b928f81758fbe348f4eeb406069ebedfaa2979d98edaede22c1b738d0ce24c25c944a795c6 SHA512 63de3822738f831d43399cfbecb0cadf341dc605c4016abddb7444d6f93b7580102fb9bb95e55c6eaa1c6b4e4cb6217227a69fe5a927c1ee0e5ce3496a34bf15
EBUILD protobuf-java-3.8.0.ebuild 1449 BLAKE2B 6a418e784c7052ebec2d6bd981160ad5a980c0149469390e2a0308b28c9d3e4f6c3a0369335e2655bc1f2b34ea8606234275af456697016e242993cdc5b156e5 SHA512 3f464829e4ded44e8fda593d8cb28380a9fc4d30eeee924e4c9193b207591640d4c68fbfcff55ec6c3e5d1d5a1cd6e9a7a853298f79a4b7e02f31546d914f2f7
-EBUILD protobuf-java-9999.ebuild 1369 BLAKE2B afcc3df497c95019d2bc4a4a55a48e79c359894ab2387395d4546bf6c87e7d0ca58bd382dcd7bcf99b18a1f926cdbd00ec6d1c570ec3f467f80befb5b3b4ff80 SHA512 e231f61731af9dc90e71f4ad96c56fd6bc0280efe05349ba5c944651c33d6974801c1f909b1b7f8f65911e337c762f2378320a881669385e738da3f9dc57b186
+EBUILD protobuf-java-9999.ebuild 1369 BLAKE2B 7a4c1b79b8a6517d03b5bcdfbca494c5c7d416de235cdb26833b6245ff7cbdf2a1b34dcaeb905619b6cc4d5436d681545ca682038dd801d17f9c1766775f8665 SHA512 4913eba9d7bfc2c182101bc9340d3c6d73c913d17abe8fe8358439ffe529ad1a8c2557fab6679cc2b4a4711635b387d1b8657504ce03123ad8b39ebaabea78dc
MISC metadata.xml 652 BLAKE2B 7c402c1ed247fad130bc21514855634041718335e7b43285560165d5b9d30649a760a124d50c57e940a19fa524c2bf5bfb85a7761d17b6f14c050edb53e100e5 SHA512 bb608da39ddc541c7cfc3a0db10da20db6f5f88da9b4a966d9b30c7a1bfc9390773cd9400c24c2be15d62e0a0e890df8a4259adfca4baac36cc6d4047b352e54
diff --git a/dev-java/protobuf-java/protobuf-java-3.7.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.7.1.ebuild
index 5c1ed13f0b47..e41f3168d4c5 100644
--- a/dev-java/protobuf-java/protobuf-java-3.7.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.7.1.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="BSD"
SLOT="0/18"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
DEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index 86873f9cfdb6..982d6bcab326 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -24,7 +24,7 @@ else
fi
LICENSE="BSD"
-SLOT="0/19"
+SLOT="0/20"
KEYWORDS=""
IUSE=""