gentoo resync : 02.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
commit: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree: c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /dev-java
parent: 6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)
27 files changed, 1049 insertions, 478 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 80b618f57baf..00ba933a4f7a 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 8f27b18f99ff..1b202550c6f9 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -6,6 +6,8 @@ DIST icedtea-bin-core-3.10.0-ppc64.tar.xz 54444136 BLAKE2B baa42a8a5133936f6071c
 DIST icedtea-bin-core-3.10.0-ppc64le.tar.xz 54511716 BLAKE2B ab536cd53c696828e3edee14b7bf589b332243d6cf3fba3502aed3cf5863fb62d946ba57479c7bf64c7b5a2b8e22eb571aa86a1ea0f134e6c066c23957bb7296 SHA512 d78b9d06232d2e09d2b550b9ce750190b5340254381ccb9801f437e4af73ec99f09a64d2b6a2ba2a33bcb1e0983e8bac918a3573147a448b54cd29f71871e9cc
 DIST icedtea-bin-core-3.10.0-r1-x86.tar.xz 61580012 BLAKE2B e334e6589f7603fcd881f9fea8c2178804502f83c898274e53f427752ad8f284f5ca1ba9f6a87546e4a21284a30226551fc7047ce7f84836af3f3a815e2ea50c SHA512 004a16e67804eb01d56ba9c36b67e60547198943bb086a19fd161f7f348cea774deb6a806814f6fbddefd111e59e7e98d934d895b89db2bfdd5a836b6aa4b483
 DIST icedtea-bin-core-3.12.0-amd64.tar.xz 62006904 BLAKE2B 826bf190b8c2a20d953c3eb7222020006d8101caeff3e57b5cace7758cfa1ea70ffa5aad8001f7ca6ea8e10cc71830f239edbfd1179ce5a88b691b1921548a14 SHA512 0771b8f92102086eedca945bc2d1e2f77477bda5318e5c7a4e05d43ded588df29622fa6b92f57a821f3f4e599db8f97098cd796dd5821b62e48824b806bafa76
+DIST icedtea-bin-core-3.12.0-arm.tar.xz 58065212 BLAKE2B 4a317018ab941cafa3a6d98ab6bfa376df3f36150832f3e4e081802215f2d295225faf4cd71be492bd1e4e245d8c7fde7b2fd032c899d1bc5bc6dc53f80d7653 SHA512 591194495eea10aa2802f53f11222c03fec46e05668f004723aff7ca1923dcc9bd8eb929b9dde900e10fa779d09eae003c280de21bf1569fa3129acec8fe5cb3
+DIST icedtea-bin-core-3.12.0-arm64.tar.xz 61721616 BLAKE2B cec7f5d11f0fe3688b3e10c274ccbab1c7d6667a85cfa74a053822d223d364dc8dda6ea7114c551ab76612cecafd26333da140637a0b1aadd4136e391f4afb94 SHA512 d2020d4984b84bffe9bb642070377ae0bf4ff04ca3770a59d5553bc31a294d0f9ecb6398c8e1ee245455548f2f255c0c7a2268debb1e7c14dae16646b4e39c8f
 DIST icedtea-bin-core-3.12.0-ppc64.tar.xz 55033784 BLAKE2B 57deb4a82576b34d615ae06ed588e7304564a784d7ff8bc08597de4715c24b918716ef92f0172e9f0e9f57d4d422e21441b2adb1df4403f579fe0c0f5c1744ab SHA512 83738080c431a9b7d4dc840005ad9e1938abf2164d4cb01e2f12f81d9adf24c715c1a0306108fe4c8d0d190fe80688f158fe8a37ae9b4f5927277a4ea3609f68
 DIST icedtea-bin-core-3.12.0-ppc64le.tar.xz 55129328 BLAKE2B cb4d7b5262ed7c624ba8ad0b536dadf25fe29c8848636614c8f53fd722e3ed37bcc0adfe82f8997c1baac9610e8aef112b137935357fa623f19189bdf0c2ebca SHA512 f6711fecf9305478ece98311c13b577317f69b4c7d15acb7c8e230ef3acda3d5032067c2859f0fc6b3000e09355a1773b6caf803c4d269655dd00977ce80ec2a
 DIST icedtea-bin-core-3.12.0-x86.tar.xz 61446708 BLAKE2B 0d5790deb0092ef590eab4c631028f58fdc86df97d4e8b7ccb83993980781d7b2313c7c97bb2663e8ce43f71b7c8761a6972ff7f0c096c4fdf878f178ca8ecfd SHA512 cb5db79e955a3e7f292ece7bdaa6e3f1a0be15c1982b904bcf299699b88402390fd2b343ed95b8855ede242729c7943c6dc25befc785d153018c5e3f8dcecdcd
@@ -18,11 +20,13 @@ DIST icedtea-bin-examples-3.10.0-ppc64.tar.xz 1852168 BLAKE2B 90202d9960ad99e14b
 DIST icedtea-bin-examples-3.10.0-ppc64le.tar.xz 1854000 BLAKE2B c6345b3202b581a60ccbecf5dd593ccddb0ad3079e03794c4a55412bde53480651e9e3dab8714759f342eefb752fd3b509a3eab42e7e21e796aad0771aa2e1e4 SHA512 1de307b0e3230936ddfd57cae1f0a44d890d6e5cb61b6634c55abc5979c930784eda21d52a705968e59b5fc3434869693e54f61eb33dcbeeea837c99c8414128
 DIST icedtea-bin-examples-3.10.0-r1-x86.tar.xz 1863128 BLAKE2B 12002c655df6ba2228453840155495090d09b3e1fb49241f0b8d558b822f8d9fbf5395aaf0e391635034fefc170828489e5bb24470a8d98ab9b052d82f51069b SHA512 d6e7ad0c7b400acaf4bf7bdb8aa85de0028e5fcf349d04c1bf06c3a645727c2f9fb266e6f6578b6451121dac04d7d5957b717b9e97ac56079593cb42c5384da4
 DIST icedtea-bin-examples-3.12.0-amd64.tar.xz 1853616 BLAKE2B 48267b2783c402bafd1ec5988d4284a30175635035682e3761aeb36feb962977ad90130f91e55768e52eff862fd3e2c4bb1b123ec3aa629f07acd50e60335683 SHA512 6dce1b575be9d8b1e9171eb6d4724c096c8ef18508c03ba581be7b1427d266595b8fac06eb02db5583399b2763d641b712aec4cb391772c444368c79c0067ca6
+DIST icedtea-bin-examples-3.12.0-arm.tar.xz 1840952 BLAKE2B 7da7e1a79f5a0a846f0a48ade5bab975d841699598101308e2fd7f66b4884feecfcacead940905b839920ddf567c6bfec08704c1d5f880d6094e73d4d7821951 SHA512 b78cd2f61da91e644185b0b2a4595fb9645ac753f3fad0bd5bce3416ee13566e99863b7fbd7acd9ad5e53d0def1e2081622f80ff62fba1a50fb5a2e940c6f9f3
+DIST icedtea-bin-examples-3.12.0-arm64.tar.xz 1850652 BLAKE2B 21620780ec47d588dcde464b1b1706d731f569fb52225b46e27d21910f1c4b49345eb45f436623347068413eb48af5ec332b8346cd53931425e523573500a1fe SHA512 b7bf955188f192be9614d4d768af2cc93b123c3afd1db121ea4156793209ea4badd37504854a9d15e6f8387517b7bf8eed0e49b8b56124ab8281540bcd4c8c27
 DIST icedtea-bin-examples-3.12.0-ppc64.tar.xz 1864952 BLAKE2B 8fda5731a39e36347adec379db562700392c2c482447ba2775b129cb323ccfa101b4f845baeb30a016158204d1565bd2b5e0b7cc1c597f4738848cbf1d2d2816 SHA512 9cbbec98b68437924c3cc2c81a6c341efec533d61f5e3c6df99b46222a3df7824c47e37baa99a4f23e5b868f788b4501064d52b379e77ea523592a7c493629d9
 DIST icedtea-bin-examples-3.12.0-ppc64le.tar.xz 1867256 BLAKE2B f8110bffd2d1b30fa62ebfe3ad18da02ada4d6f65b6016e939ec18cf0ab7970199edc7b9c3b2d8f2edd504db8334c384f49fb423c2c2dec13f761588cdb5c4c5 SHA512 88d9b5070676fbe14fd43fa35ff01a7e1e34002271411befd6bd6b5b69b8136e742fdc6461d58970e2ed06bc7beaa12631c2b150452edd3995faaffe7afdbbb0
 DIST icedtea-bin-examples-3.12.0-x86.tar.xz 1859900 BLAKE2B 44ea53632b82e1bbcc7b569d3aaf9f3f247c79b465ca4f4e54f70f3e3fe1752b1f5d9c84ab40328270e074be6da13b34af3803fa43584df16c9f22898b77265e SHA512 1aa895aa3e02081ec45f7b3b250605ce914c7f06ef4e9c37aaa6d7f2b084295ab48e490174fa443b419d37299f88db217407d81651c08996aba1af91401629ce
 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-r1.ebuild 4387 BLAKE2B 59c2c959ea97b31698aa0ccd14ef299fee806f396cc16a460ba71eb81982b1fee96f249189dedb2ea5aac8bdae463b2dff55dfbba5a704c46fbba5dd514c4018 SHA512 587fc838632fbaf176ce377c2e9ac0fe162ff45b2d9750799bdd216c11d3e3d643856298c2effa2e55223bb3f417eca6d5dfcdcaacadbd1f3659d79d0094e7eb
-EBUILD icedtea-bin-3.12.0.ebuild 4549 BLAKE2B 77861e6ee5c4d6872243c3f74cb52c81a7bb7192568a5e9436de0320d1cbd9c688d4d690e1c8a3d5ba976e1d63af95273cb310c92a672638c6de8749c10b0683 SHA512 24582891626aa33f30a94a001ff1d759e74904ee19b0fd2613e9f72a8fa5eea7e6a3a16cb9400554d3472d2daa5ed53156b880bd6d00d02a099b5f29f9b4e27a
+EBUILD icedtea-bin-3.10.0-r2.ebuild 4394 BLAKE2B ffc1c96d61a6eb5afe2ad5677f493f0eeb4e84467a9426bc6b58a6f5440d14fa07df05edbeb828e36010dc58b6d57041cc9e03f1977a700e8ce2a869f159cda2 SHA512 8ff85806b905a1d2e8817d37ceefd1758b40d0a8a7824721fadb833bcd71e0aee6180287940fe0b77eb704086dfec6941479db6a8a581c85a7dfb08bc39bf7cf
+EBUILD icedtea-bin-3.12.0-r1.ebuild 4603 BLAKE2B cb8c562671f44895ac6984194295b63bd348452b7a071925ea40878b7a18cf3185b55df5874bf008a4c7022499f638956b931509a35429d59ee3b569588b63cd SHA512 a8c8a4b72d79d47e70de1afe83a0155e55259986ab102f6547b3736e07ab351b7f51c8a29e537a713646924d15a1a858a367b5120441f978f987d88c83c22860
 MISC metadata.xml 560 BLAKE2B f377bffd73661fbf1573f3d80906a38fa9fd170a686dee6c13ee7769ffadd8ff2de696d63cd7fdc4332ca654851da027b76e22389a98412b52b4fd5c00935429 SHA512 71613013231a9bf6daabb672557c3f419bd9443999b740a4d73fe242b827a278a66671f2cb347d20833008c332262609f7df03691e313e0dc0ec3e2a56e79565
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.10.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.10.0-r2.ebuild
index 9dc6568062cc..84c1107124c6 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.10.0-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.10.0-r2.ebuild
@@ -43,7 +43,7 @@ RDEPEND=">=dev-libs/glib-2.42:2%
 	>=media-libs/freetype-2.5.5:2%
 	>=media-libs/lcms-2.9:2%
 	>=sys-libs/zlib-1.2.8-r1%
-	virtual/jpeg:62%
+	virtual/jpeg-compat:62%
 	alsa? ( >=media-libs/alsa-lib-1.0% )
 	cups? ( >=net-print/cups-2.0% )
 	gtk? (
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.12.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
index 00bb6c4eb2ee..c5065d63effb 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.12.0.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 ~ppc64 ~x86"
+KEYWORDS="-* ~amd64 ~arm  ~arm64 ~ppc64 ~x86"
 
 inherit java-vm-2 multilib-build toolchain-funcs
 
@@ -23,6 +23,8 @@ SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
 	big-endian? ( $(abi_uri ppc64) )
 	!big-endian? ( $(abi_uri ppc64le ppc64) )
 	$(abi_uri amd64)
+	$(abi_uri arm)
+	$(abi_uri arm64)
 	$(abi_uri x86)"
 
 DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
@@ -41,7 +43,7 @@ RDEPEND=">=dev-libs/glib-2.58:2%
 	>=media-libs/freetype-2.9.1:2%
 	>=media-libs/lcms-2.9:2%
 	>=sys-libs/zlib-1.2.11-r1%
-	virtual/jpeg:62%
+	virtual/jpeg-compat:62%
 	alsa? ( >=media-libs/alsa-lib-1.0% )
 	cups? ( >=net-print/cups-2.0% )
 	gtk? (
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index cce0bc33579e..89fdd9b60708 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -3,12 +3,10 @@ DIST apache-maven-3.0.5-bin.tar.gz 5144659 BLAKE2B a109f1ab8656d031c4c904b9972b5
 DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5cac2f57a5faee6e74df3054df3fd71b8ada691586def77df7d8f0ab88f4ba464a0d3ba382f3259aa19e2a80e1b1d60322221 SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1
 DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
 DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
-DIST apache-maven-3.6.0-bin.tar.gz 9063587 BLAKE2B c5acab74168061ef8216cf6d085c25ce3e1eb941724bf0d4bbbe1a69a2da3c255c8233233a5bef800469b7363fa34ca1c4a4717c3f18b8eb2828fdd5d5762bcb SHA512 fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
 DIST apache-maven-3.6.1-bin.tar.gz 9136463 BLAKE2B d630ceeb1c35f742eae324a025c3385fac0b7aa58e0bd3fe239a2027138127604a076958e5f6db6bba4f1e99bc524f0c62643bc4ab4d570378e93e8f72c234c0 SHA512 b4880fb7a3d81edd190a029440cdf17f308621af68475a4fe976296e71ff4a4b546dd6d8a58aaafba334d309cc11e638c52808a4b0e818fc0fd544226d952544
-EBUILD maven-bin-3.0.5.ebuild 1265 BLAKE2B c7942c23734722f217b7d5dbd51168f8e170417337ad336d36bca1d1b2cb0d894f8a183fe5c8d442754e223c3b3d3ce0d136d04dd6340b63349996b00439e543 SHA512 c22ddf526763e7162be557c0bace6ce4ea33edc7786a1d6fe7dc1297700821c6a22d387874e0a9f8b566d5582bc6be149a93d03e3ce60e0a263542ca735ae1b7
-EBUILD maven-bin-3.1.1.ebuild 2274 BLAKE2B cff19f6b3eba70d6e5890f30cb7faaba15a89777c8b35c35be85fb214e2413ac66b49376902a19a85ff8fb955445eaac50d8d2eab105bdd779289b1917c6c8fd SHA512 287cbbdbdbf3c7eb8e029bc35a26b86b9d19bbebd5bb878dbdc4ce03a88f194f8acdb72932040fd1c5574a1fa0eef7aaca07f69478e46c7bcbea6939da2edb03
-EBUILD maven-bin-3.2.5.ebuild 2279 BLAKE2B c94fc09f4aba4b15ad52b300460794d35a213b1218761996dfac0c81be3c71c4103e504ffff9948959c92da75099b5cfe9b9d5160de28318170bb6174012a84d SHA512 e11a7cd2b3620754966cfd6130baec3dbf7b3f8875506c9c80a329e125d0cbe4d360dcd519d62a8fb574b62fae92ffe085c041b3f8da0678d11ad187194f08c8
-EBUILD maven-bin-3.3.9.ebuild 2218 BLAKE2B dff6966b08eef11aebdff6858203257ef76dfd24e79c9360b19b1f2203c176929b1909582e0c0588ca6a811f6ae80d1c0948b3f3e3440e12cda0ede68bd62d83 SHA512 5a73c301485e47b68aa5e5868e8c2ecfdbcd345a4c54a8638db2bbb3767b803308ff726ef9975d146249b6d58a7509989cd97592d74219dfc4e57cde2da80007
-EBUILD maven-bin-3.6.0.ebuild 2218 BLAKE2B 4692451547ef9a1d71f63a974f0a9bf86e43f101874c7f0690be0d3b0d7903fbbf87477cd64994e0e11b8b05f09923caee1a9971dfd0138cc822789c1b2b0890 SHA512 b444131af7c1bf8376a985c88a313a7515aab30aafb69aa4984c7421f0769480c7ed82ce59e811cbd160a42ebbb8224cc7e76414fb67671c9eae2068db9463aa
-EBUILD maven-bin-3.6.1.ebuild 2218 BLAKE2B b5ec30cc9313106e0dec93cdf7bc810673bfbb497912f4329005ba0b87cae08e24723517234af4194ae704b7f83925838eb350a9a0403137f15a0ee41cacd461 SHA512 3de59f5d3bbea858a19d03d90c7deba4f901b8916455dc52849fab7d8251f1d8988f00ca183814a05d1b3354bea6e9a34b3d95011cf6c5330ed312326d6cc9a6
+EBUILD maven-bin-3.0.5-r1.ebuild 1288 BLAKE2B 5df56d1fb434fa78f2e31b706923a954f3eb544287ef2f2c903972d1f12b107c166b1415a04f9aadfaac0e1bd5d9c57b9227ee3eb1da8b950f4d3925f6f375d4 SHA512 d661caf7691165fceddb6b469d36ecc533b52dc2ee376cbc3bc1d158e5ea37f37c07212d6c6f79269d5101cf953c1b025b81703fc1a6493ceb88ebcefc9d652a
+EBUILD maven-bin-3.1.1-r1.ebuild 1234 BLAKE2B 4e3435b9bbfb4661f36cf1375211fc2818d0fcc937319bd918615c9ade29ad913ce570bb2ba3bb32a76bf52941a4e45c02c08a5617eac6f5745714ab1620e6f9 SHA512 d02c484ce95bff8e37d9c360ad49a987796e1332a7a9a33dcf69a7d472db4b50bc2f7f715c48786238b39bceac7ee707f690f47091aee290885703470b6ef114
+EBUILD maven-bin-3.2.5-r1.ebuild 1232 BLAKE2B 7e0fc95a813cd06342c77aef9aa137e06ac50f9dcd7089f175ece037583085f8d63fbd4e6cbdb3a0e779ce5eb018b19b6b6139aa8fa8dc80eaacae6561bf1862 SHA512 66a6e136376517e82b862bfca3033dcb92366bec865b51fafb19ce27a4e8d50e97ebef916b39b4c8438a69984698c71e8a146969cb16aa6a2d963675a054c992
+EBUILD maven-bin-3.3.9-r1.ebuild 1236 BLAKE2B 9641f5146ef168f7b1edb7616940f492011adc2d96d5c9852ec22171f2d3ab45452ab0ff2801348f82c726fe12c43160f2056b06d973b05c2d4f871e13d4fc16 SHA512 fe144d82cde207dca1b10cb072a747e8bc3649e493301bc9f45280e767a0ff85946f3702d1e86ea047a430fe8d088d2adae28a651e2c04e16a7f78e06c5f5b62
+EBUILD maven-bin-3.6.1-r1.ebuild 1236 BLAKE2B a18fa4ad369338ebd818f894414e084b895df52c9fd2123db1136133b1b71f3e11b2f2bd2f0cc76847c1f0998416317d7ea9b44f65336369ef5456a57e1ddd7f SHA512 ed8e9bc788d03e581e3d802eb350fce294034c726294e9929465d5a574900845cd003cf94251dc6f3b7739cd9b2612b3a044c705fdd48f0e678dd47054e96ace
 MISC metadata.xml 610 BLAKE2B 84180dd51fc9e6b9089111a4f79aae2f2e8339a50b3db00cebb103714e7bb87c99a7fbfbd2401a5646f044b6d78cf370b1a1af7e524be91b7065176cf6b8673f SHA512 e761707a3985b90298ab8511d26458c9c04c7c1750b861f2c866862db07345d645953559b6ca8c1cdcd75c4aae1e84a7646eb376c32f0fe87427d4938d44a083
diff --git a/dev-java/maven-bin/maven-bin-3.0.5.ebuild b/dev-java/maven-bin/maven-bin-3.0.5-r1.ebuild
index c8fd2a500821..c17509652106 100644
--- a/dev-java/maven-bin/maven-bin-3.0.5.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.0.5-r1.ebuild
@@ -17,22 +17,27 @@ LICENSE="Apache-2.0"
 SLOT="3.0"
 KEYWORDS="amd64 x86"
 
-DEPEND="app-eselect/eselect-java"
+DEPEND="
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
+
 RDEPEND="
-	${DEPEND}
-	>=virtual/jdk-1.5"
+	>=virtual/jre-1.8"
 
 S="${WORKDIR}/${MY_P}"
 
 MAVEN=${PN}-${SLOT}
 MAVEN_SHARE="/usr/share/${MAVEN}"
 
-java_prepare() {
+src_prepare() {
+	default
 	rm -v "${S}"/bin/*.bat || die
 	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
 }
 
-# TODO we should use jars from packages, instead of what is bundled
+# TODO:
+# we should use jars from packages instead of what is bundled.
+
 src_install() {
 	dodir "${MAVEN_SHARE}"
 	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
diff --git a/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..22a30f299033
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.1.1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
deleted file mode 100644
index b75f0e64b4d2..000000000000
--- a/dev-java/maven-bin/maven-bin-3.1.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-DEPEND="app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
-	dev-java/aopalliance:1
-	dev-java/avalon-framework:4.1
-	dev-java/commons-cli:1
-	dev-java/commons-io:1
-	dev-java/javax-inject:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/juel:0
-	dev-java/osgi-core-api:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:2.4"
-
-RDEPEND=">=virtual/jdk-1.5
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v bin/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-	java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
-	has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
-	has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
-	has_version dev-java/log4j:0 && java-pkg_jar-from log4j
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.3.9.ebuild b/dev-java/maven-bin/maven-bin-3.2.5-r1.ebuild
index 45c967a5d4e7..1c7cfabd20fb 100644
--- a/dev-java/maven-bin/maven-bin-3.3.9.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.2.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 inherit java-pkg-2
 
@@ -15,72 +15,21 @@ SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
 HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
-SLOT="3.3"
+SLOT="3.2"
 KEYWORDS="amd64 x86"
 
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-CDEPEND="
-	dev-java/juel:0
-	dev-java/log4j:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/commons-io:1
-	dev-java/aopalliance:1
-	dev-java/commons-cli:1
-	dev-java/javax-inject:0
-	dev-java/osgi-core-api:0
-	dev-java/commons-logging:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:3.0"
-
 DEPEND="
-	${CDEPEND}
-	app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
-	>=virtual/jdk-1.7"
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
 
 RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
+	>=virtual/jre-1.8"
 
 S="${WORKDIR}/${MY_P}"
 
-MAVEN="${PN}-${SLOT}"
+MAVEN=${PN}-${SLOT}
 MAVEN_SHARE="/usr/share/${MAVEN}"
 
-MAVEN_DEPENDENCIES=(
-	juel
-	jsoup
-	log4j
-	jsr250
-	javax-inject
-	commons-io-1
-	osgi-core-api
-	aopalliance-1
-	commons-cli-1
-	commons-logging
-	interceptor-api
-	servlet-api-3.0
-)
-
-java_prepare() {
-	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-
-	# Link deps.
-	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
-		java-pkg_jar-from "${mvn_dep}"
-	done
-}
-
 # TODO: We should use jars from packages, instead of what is bundled.
 src_install() {
 	dodir "${MAVEN_SHARE}"
diff --git a/dev-java/maven-bin/maven-bin-3.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
deleted file mode 100644
index 74e3ef2b4a48..000000000000
--- a/dev-java/maven-bin/maven-bin-3.2.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="amd64 x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-DEPEND="app-eselect/eselect-java
-|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
-dev-java/aopalliance:1
-dev-java/avalon-framework:4.1
-dev-java/commons-cli:1
-dev-java/commons-io:1
-dev-java/javax-inject:0
-dev-java/jsoup:0
-dev-java/jsr250:0
-dev-java/juel:0
-dev-java/osgi-core-api:0
-java-virtuals/interceptor-api:0
-java-virtuals/servlet-api:2.4"
-
-RDEPEND=">=virtual/jdk-1.6
->=virtual/jre-1.6
-${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v bin/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-	java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
-	has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
-	has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
-	has_version dev-java/log4j:0 && java-pkg_jar-from log4j
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild b/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild
new file mode 100644
index 000000000000..966eaa23b60a
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.3"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.6.0.ebuild b/dev-java/maven-bin/maven-bin-3.6.0.ebuild
deleted file mode 100644
index a7e55b1b599d..000000000000
--- a/dev-java/maven-bin/maven-bin-3.6.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="~amd64 ~x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-CDEPEND="
-	dev-java/juel:0
-	dev-java/log4j:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/commons-io:1
-	dev-java/aopalliance:1
-	dev-java/commons-cli:1
-	dev-java/javax-inject:0
-	dev-java/osgi-core-api:0
-	dev-java/commons-logging:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:3.0"
-
-DEPEND="
-	${CDEPEND}
-	app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
-	>=virtual/jdk-1.7"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-MAVEN_DEPENDENCIES=(
-	juel
-	jsoup
-	log4j
-	jsr250
-	javax-inject
-	commons-io-1
-	osgi-core-api
-	aopalliance-1
-	commons-cli-1
-	commons-logging
-	interceptor-api
-	servlet-api-3.0
-)
-
-java_prepare() {
-	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-
-	# Link deps.
-	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
-		java-pkg_jar-from "${mvn_dep}"
-	done
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild b/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..46ef90466cd5
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.6.1.ebuild b/dev-java/maven-bin/maven-bin-3.6.1.ebuild
deleted file mode 100644
index 4a6edff4651e..000000000000
--- a/dev-java/maven-bin/maven-bin-3.6.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="~amd64 ~x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-CDEPEND="
-	dev-java/juel:0
-	dev-java/log4j:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/commons-io:1
-	dev-java/aopalliance:1
-	dev-java/commons-cli:1
-	dev-java/javax-inject:0
-	dev-java/osgi-core-api:0
-	dev-java/commons-logging:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:3.0"
-
-DEPEND="
-	${CDEPEND}
-	app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
-	>=virtual/jdk-1.7"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-MAVEN_DEPENDENCIES=(
-	juel
-	jsoup
-	log4j
-	jsr250
-	javax-inject
-	commons-io-1
-	osgi-core-api
-	aopalliance-1
-	commons-cli-1
-	commons-logging
-	interceptor-api
-	servlet-api-3.0
-)
-
-java_prepare() {
-	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-
-	# Link deps.
-	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
-		java-pkg_jar-from "${mvn_dep}"
-	done
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 5fc15ab3ad8a..5e06f5a878c8 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -10,6 +10,7 @@ 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 6580 BLAKE2B f585ddb24bfed4927e4caa947afdb28d62149f9d2bb15e41039a54d55958328c1afb52a7bcd277cdf81fcb008bc4167c711ef4998d1fed57176a187adebd35fe SHA512 a66032f37b6129eeb147bc0572d64b5f90eb96ffd20328d4a29278fa39e26c74cd0291263d133beaf8dcd54e144be83a896ebd3e8b1887029ac719f0e4260f19
-EBUILD openjdk-8.212_p03-r3.ebuild 7267 BLAKE2B dbdfaddfdc2e66a19cff88144f5d1bbe46698f100766a229df1c1497fca1bd60e0f93d2907429671d6875e5ad8909a154aa8ab01adddaa897dfb811239d1e4b6 SHA512 b74b6c4a9ba9961c6b8050e5778ab3efb5b6a4498dbece6f7496ab3e7e2ba93d7f96a93549dae2e72ec6a46126642af33d606e1ab6d62585cc85602318a55bcf
-MISC metadata.xml 1263 BLAKE2B 10b2f20ba3d3627539ca0d3ed16dc6036b6966811582a6d333c90fbcdcb7ba8997c0b8dd4f0a14b58824e46d9afd2ef95f70faa2e67ae7ea4cb20d03dad3f5d4 SHA512 23416f1799ab40e2d12f96f6fc3f09a8c5e4e6896f6eef40a88f403cf51b12813992b3052ecae8bb715cafc0fc162bd065422774991adbf32dac97c8bac61461
+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-8.212_p03-r3.ebuild 7320 BLAKE2B dc4a418d885c1db666dee134dd5fa73a041772dac925fe7249a24531ed7e38e29c8f1f8ea4d7aa41dcea7173cebb1ef110b6ffe8cffc8bb7b0166751e13e8c2b SHA512 c6b402eadf629322aaa9207cf8ebfcacbd3bb702ee565372200b2f74be8d26b4eb41ffdfc85feb945e8dc044c7f4c5c650172fe27cb59deb32daaa95be3e1063
+MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
index 302f56980357..c9555ad9e77e 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -20,6 +20,7 @@
 	<use>
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag>
 		<flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
+		<flag name="javafx" restrict="&gt;=dev-java/openjdk-11">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag>
 		<flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag>
 		<flag name="source">Install JVM sources</flag>
 		<flag name="systemtap" restrict="&gt;=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag>
diff --git a/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild
index 960d7ca146c6..3a4668d70da8 100644
--- a/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild
@@ -115,11 +115,13 @@ pkg_setup() {
 	if has_version --host-root dev-java/openjdk:${SLOT}; then
 		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
 	else
-		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
+		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
 }
 
diff --git a/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
new file mode 100644
index 000000000000..ad003801a229
--- /dev/null
+++ b/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
@@ -0,0 +1,262 @@
+# 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 javafx +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
+	javafx? ( dev-java/openjfx:${SLOT} )
+	|| (
+		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] )
+"
+
+REQUIRED_USE="javafx? ( alsa !headless-awt )"
+
+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)
+	)
+
+	if use javafx; then
+		local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+		if [[ -r ${zip} ]]; then
+			myconf+=( --with-import-modules="${zip}" )
+		else
+			die "${zip} not found or not readable"
+		fi
+	fi
+
+	# 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
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || 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
+
+	# must be done before running itself
+	java-vm_set-pax-markings "${ddest}"
+
+	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
+	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	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/*
+		dosym /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	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-8.212_p03-r3.ebuild b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
index b10d08e19c72..2f13332849d1 100644
--- a/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
+++ b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
@@ -122,11 +122,13 @@ pkg_setup() {
 	if has_version --host-root dev-java/openjdk:${SLOT}; then
 		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
 	else
-		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
+		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
 }
 
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
new file mode 100644
index 000000000000..a1313a5f4f7d
--- /dev/null
+++ b/dev-java/openjfx/Manifest
@@ -0,0 +1,17 @@
+AUX 11/disable-buildSrc-tests.patch 534 BLAKE2B d1cb4da89602fa9a48e5509586d1909d10b9d62e167bdd4d57b9615f2896704dd0ee925d14a86753bf53182f85fc9c21f195c3f044a0c6d38c960ee4f5494332 SHA512 ffbc3d671cea448ffddd8d92e4a4031a941008c067d5a7acb358fb82ed217c9388ef1916aa04cf4693ff2a83e0bdcf3fc5bdc919196a6231d57c8341e44ddede
+AUX 11/fix-build-on-gradle-5x.patch 1214 BLAKE2B 2dd50897a5a83773c452afd57ef87e0cbd065e2f53ccf931c00f81a0521791f43e5933e5209f8f6133f855bb3327856ddae109b357da746da72128b60c228031 SHA512 e7c737d5329e872ac104ea229f74bc05447ff7d11bb88e1e3ab0ea5d108195b2af9139650566eb9b18dffedf9141123ee808c71ba01eabe1d1a2f47c2258358b
+AUX 11/glibc-compatibility.patch 547 BLAKE2B e63e83d708765dc7ad5013ff3a5bf0885fa426290e4fa164684739c15e7c15652c41256b98e9720c35682193086ec19c0225dd202fabc9bd9c9f99fb0fd6d5ff SHA512 abb08198b94e38fe8fb16229f506e2cad78869ed9c4fcabe22490a87884b1851373ee4a92ae4d7dbecaf3fc9a784911d932fad2457b0611a102e63a983113981
+AUX 11/respect-user-cflags.patch 8604 BLAKE2B b4455f5580a9b310e013c0d58ba39a3d9ebe15e7ed30e75a954c1f6ba36107f1c1a5b6bbc88e5a0e0d21f21d275214ad66ed012088f8fbbf81a6384127c8edfe SHA512 3547c711515714ffdbfbeaf84e538fe0103bc8b38ebe2fc5493414af6eb95bb3a956a7e3fe28936019de4996a62f705e1e28e8ce7eb3a5dbbda6f93f058a5089
+AUX 11/use-system-swt-jar.patch 608 BLAKE2B b0083c54f5f42e6c0069812913c800c9366073e34a401187e90c498ee9cb67b619baa87b7d140cda5a1330076c3b04ff3114898cd264cd51ec4b99498acfd894 SHA512 a700c33639603a26d21b89a4f8a9299cdf42cf7f7a0dc082ec9cd4c9c2235184add1685b05d2a62f3a52bd2251b4c133476e5944471092a2c0c269c973d2604f
+DIST ST4-4.0.8.jar 239543 BLAKE2B 72d257c6d0f1b3bde0afce805128dd38d8520b2073377bbb995fed3b4e18a3ea69d508d6d7554755ec68bf50940082b896ed89998a5178272d24376404b389c5 SHA512 9877289297cd5b15ad464a19467699387f57c510fe8a476e07e9d2334bd11933f9bdb9c6caa4972d4d4c84b56740c6d885cd39300dd7ce35b7c5bde536238086
+DIST antlr-complete-3.5.2.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
+DIST gradle-4.8-bin.zip 75885015 BLAKE2B eb6592afe122690f5e013abec2821beabac070563556ceec67ce02506582d4d9ac9c5d9f97ad2c464e442446f26ff90e9ead2c04e462a564411259564e3332c6 SHA512 4b351c9c5b0970bafb3b2b9b9e2ec9f37ff681cc3ac30004852d712cf8bb83061211a58e5b1f101813cde6a0aec914badf4ef0a806eec603418b851b64a06882
+DIST gunit-3.5.2.jar 287425 BLAKE2B 86e759c5bb164758b689d93bef4b6a0bcb39eb9fee28d2a8dc113a4c97e5e8516b55ada87c27738ffa0fc512805caa338d8649f6f5c9ba36490c4c3ebed86fdd SHA512 c9f14dacec2f22f62b7d3849d1c0e9d626b3dc20eb74a85b32f1901f6279b7b84af095107128bcbe80c49ac05448a713309b60d0c3d2f88e0bca8a14690292b2
+DIST lucene-core-7.1.0.jar 2779248 BLAKE2B 9edea1cfdeca2f2ec9e5c014e575774dc32fa5cf12ba02fd419fc252da10c03cd9f6cda989203211de4bc2ffcd2e79e8b97914e9792951bb0877a203760f07ad SHA512 0cd96016de2bc7ad94779e30348c443cf6028119fdae42c6f29e33d84495876a7519640f20680762324ea40c42e21b595f79cd606a6142b9875501f1e9179678
+DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60c57489017985448ddff46bc8c527b72e615e5f28d0301c28dc8119f0e6c75f4e8a711df3e6aaa418190b8ac8d1857 SHA512 41a85eafde03718efba7cf22598a430efbc6a6a68cf68058988f9eff648d19faa6cc4cf68293fe6e39783a7636eae571f27e04006f4607250dd9f6642184c61d
+DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b967243289d9bded5e9768cb441a35fabbe63641d00b72a8c14aace0bad402df49c21b853f620bf81bc1e829dcecdb SHA512 34df5eccf0577ed037ef347adc9c2552c49d57e35dbff629fdbb860926765be48f8b06fd693bdacfc2edcd9c6ad711c13fe98e5317cb1d1f2157dcab938e34ea
+DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
+DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
+DIST openjfx-11.0.3_p1.tar.bz2 63272033 BLAKE2B 574a622b2b2587fcdc64c91cfef0fbcc6d97baa7827e84a540bf1c8493b9fbc3629bd131e5c0972fb82687d194ceb527dfdedd6c2a00edc16d9a76850699f9b6 SHA512 8f8e07d7588b1a5fbcdfcc2837ae0389fefea3a1d91f89fdd4aab03e0bc6f5b9a1e66a824ae9388b777b36e76beb19cb6c69c963c7d904d36cad40f36c5ef0c7
+EBUILD openjfx-11.0.3_p1.ebuild 6377 BLAKE2B f3382411d65c0b93b8c53c617d0c3aad57457e8352f22948d3f421b92bce258a456887870781959e99173291cafaba9804f80aac4d55b7f3ae534c87b502cb3e SHA512 3b24289b423f9027374d53cd47aed78c62ece77529edc14fd198b312fbb0caa34100f348610f74ba01bef255a11429c106fa3f53ba6644c651886b918aa45476
+MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d
diff --git a/dev-java/openjfx/files/11/disable-buildSrc-tests.patch b/dev-java/openjfx/files/11/disable-buildSrc-tests.patch
new file mode 100644
index 000000000000..39e247107992
--- /dev/null
+++ b/dev-java/openjfx/files/11/disable-buildSrc-tests.patch
@@ -0,0 +1,13 @@
+Description: Disables the buildSrc tests to work around a Gradle bug (UnsupportedOperationException: Cannot nest operations in the same thread)
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/buildSrc/build.gradle
++++ b/buildSrc/build.gradle
+@@ -81,6 +81,7 @@
+ // Java 7 but when we switch to 8 this will be needed, and probably again when
+ // we start building with Java 9.
+ test {
++    enabled = false;
+     enableAssertions = true;
+     testLogging.exceptionFormat = "full";
+     scanForTestClasses = false;
diff --git a/dev-java/openjfx/files/11/fix-build-on-gradle-5x.patch b/dev-java/openjfx/files/11/fix-build-on-gradle-5x.patch
new file mode 100644
index 000000000000..51fde6ad39a3
--- /dev/null
+++ b/dev-java/openjfx/files/11/fix-build-on-gradle-5x.patch
@@ -0,0 +1,23 @@
+From 2f74649395f0242d08b95572b7b30246457b1d6b Mon Sep 17 00:00:00 2001
+From: Ty Young <BlueGoliath@users.noreply.github.com>
+Date: Mon, 3 Dec 2018 20:34:07 -0600
+Subject: [PATCH] Remove final from HashSet instance
+
+Removes final from HashSet instance at about line 107 which causes build failure
+---
+ .../main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy  | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy b/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy
+index 10a85d62d1..13d573fe6e 100644
+--- a/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy
++++ b/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy
+@@ -102,7 +102,7 @@ class NativeCompileTask extends DefaultTask {
+         updateFiles();
+         def source = project.files(allFiles);
+         boolean forceCompile = false;
+-        final Set<File> files = new HashSet<File>();
++        Set<File> files = new HashSet<File>();
+         source.each { File file ->
+             final Map fileData = dependencies.get(file.toString());
+             final boolean isModified = fileData == null ||
diff --git a/dev-java/openjfx/files/11/glibc-compatibility.patch b/dev-java/openjfx/files/11/glibc-compatibility.patch
new file mode 100644
index 000000000000..e7e9b173bb4d
--- /dev/null
+++ b/dev-java/openjfx/files/11/glibc-compatibility.patch
@@ -0,0 +1,15 @@
+Description: Fixes the compatibility with the version of glibc in Debian
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: https://bugs.openjdk.java.net/browse/JDK-8211399
+--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.h
++++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.h
+@@ -25,9 +25,6 @@
+ #ifdef HAVE_LOCALE_H
+ #include <locale.h>
+ #endif
+-#ifdef HAVE_XLOCALE_H
+-#include <xlocale.h>
+-#endif
+ 
+ typedef locale_t xsltLocale;
+ typedef xmlChar xsltLocaleChar;
diff --git a/dev-java/openjfx/files/11/respect-user-cflags.patch b/dev-java/openjfx/files/11/respect-user-cflags.patch
new file mode 100644
index 000000000000..2339f905b7fa
--- /dev/null
+++ b/dev-java/openjfx/files/11/respect-user-cflags.patch
@@ -0,0 +1,227 @@
+From a28f9aaab759d82384279c16d86bb98ab47412a3 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sat, 1 Jun 2019 00:12:55 -0700
+Subject: [PATCH] respect user cflags
+
+---
+ buildSrc/linux.gradle                           |  7 ++++++-
+ .../gstreamer/projects/linux/avplugin/Makefile  | 16 ++++++----------
+ .../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++-----------
+ .../projects/linux/gstreamer-lite/Makefile      | 16 ++++++----------
+ .../native/jfxmedia/projects/linux/Makefile     | 16 ++++++----------
+ 5 files changed, 30 insertions(+), 42 deletions(-)
+
+diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
+index 7a7cbc72..6705a0f3 100644
+--- a/buildSrc/linux.gradle
++++ b/buildSrc/linux.gradle
+@@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${name}.so" as String }
+ def commonFlags = [
+         "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
+         "-fstack-protector",
++        "-Wno-error=cast-function-type",
+         "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
+ 
++commonFlags.addAll(System.getenv("CFLAGS").trim().split(" "))
++
+ if (!IS_64) {
+     commonFlags += "-m32"
+ }
+@@ -61,6 +64,8 @@ def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
+                  "-z", "relro",
+                  "-Wl,--gc-sections"].flatten()
+ 
++linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" "))
++
+ if (IS_DEBUG_NATIVE) {
+     linkFlags += "-g"
+ }
+@@ -294,7 +299,7 @@ LINUX.iio.nativeSource = [
+ LINUX.iio.compiler = compiler
+ LINUX.iio.ccFlags = [ccFlags].flatten()
+ LINUX.iio.linker = linker
+-LINUX.iio.linkFlags = [linkFlags].flatten()
++LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten()
+ LINUX.iio.lib = "javafx_iio"
+ 
+ LINUX.prismES2 = [:]
+diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+index 450b55d3..f27b9479 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+@@ -17,7 +17,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
+ OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
+ endif
+ 
+-CFLAGS = -fPIC                   \
++CFLAGS := -fPIC                   \
+          -Wformat                \
+          -Wextra                 \
+          -Wformat-security       \
+@@ -29,13 +29,8 @@ CFLAGS = -fPIC                   \
+          -DLINUX                 \
+          -DGST_DISABLE_LOADSAVE  \
+          -DGSTREAMER_LITE \
+-         -ffunction-sections -fdata-sections
+-
+-ifeq ($(BUILD_TYPE), Release)
+-    CFLAGS += -Os
+-else
+-    CFLAGS += -g -Wall
+-endif
++         -ffunction-sections -fdata-sections \
++         ${CFLAGS}
+ 
+ PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
+ PACKAGES_LIBS     := $(shell pkg-config --libs glib-2.0 gobject-2.0)
+@@ -46,11 +41,12 @@ INCLUDES= -I../../../plugins                          \
+           -I../../../gstreamer-lite/gstreamer/libs    \
+           $(PACKAGES_INCLUDES)
+ 
+-LDFLAGS = -L$(BUILD_DIR)    \
++LDFLAGS := -L$(BUILD_DIR)    \
+           -lgstreamer-lite  \
+            $(PACKAGES_LIBS) \
+           -z relro          \
+-          -static-libgcc -static-libstdc++ -Wl,--gc-sections
++          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
++          ${LDFLAGS}
+ 
+ ifneq ($(strip $(LIBAV_DIR)),)
+ INCLUDES += -I$(LIBAV_DIR)/include
+diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+index 1e58d4d3..627865f9 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+@@ -14,7 +14,7 @@ DIRLIST = progressbuffer       \
+ 
+ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
+ 
+-CFLAGS = -fPIC                   \
++CFLAGS := -fPIC                   \
+          -Wformat                \
+          -Wextra                 \
+          -Wformat-security       \
+@@ -30,14 +30,8 @@ CFLAGS = -fPIC                   \
+          -DGST_DISABLE_LOADSAVE  \
+          -DGST_DISABLE_GST_DEBUG \
+          -DGSTREAMER_LITE \
+-         -ffunction-sections -fdata-sections
+-
+-ifeq ($(BUILD_TYPE), Release)
+-    CFLAGS += -Os
+-else
+-    CFLAGS += -g -Wall
+-endif
+-
++         -ffunction-sections -fdata-sections \
++         ${CFLAGS}
+ 
+ INCLUDES = -I$(SRCBASE_DIR) \
+ 	   $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
+@@ -47,9 +41,10 @@ INCLUDES = -I$(SRCBASE_DIR) \
+ PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
+ PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
+ 
+-LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
++LDFLAGS := -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
+           -z relro \
+-          -static-libgcc -static-libstdc++ -Wl,--gc-sections
++          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
++          ${LDFLAGS}
+ 
+ ifeq ($(ARCH), x32)
+     CFLAGS += -m32
+diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+index 5baa30a1..ddf0e521 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+@@ -37,7 +37,7 @@ DIRLIST = gstreamer/gst \
+ 
+ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
+ 
+-CFLAGS =-fPIC                   \
++CFLAGS :=-fPIC                   \
+         -Wformat                \
+         -Wextra                 \
+         -Wformat-security       \
+@@ -51,13 +51,8 @@ CFLAGS =-fPIC                   \
+         -DLINUX                 \
+         -DGST_DISABLE_GST_DEBUG \
+         -DGST_DISABLE_LOADSAVE  \
+-        -ffunction-sections -fdata-sections
+-
+-ifeq ($(BUILD_TYPE), Release)
+-    CFLAGS += -Os
+-else
+-    CFLAGS += -g -Wall
+-endif
++        -ffunction-sections -fdata-sections \
++        ${CFLAGS}
+ 
+ INCLUDES = -I$(BASE_DIR)/plugins                          \
+ 	   -I$(SRCBASE_DIR)/projects/build/linux/common   \
+@@ -75,9 +70,10 @@ INCLUDES = -I$(BASE_DIR)/plugins                          \
+ PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa glib-2.0)
+ PACKAGES_LIBS := $(shell pkg-config --libs alsa glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0)
+ 
+-LDFLAGS = -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
++LDFLAGS := -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
+           -z relro \
+-          -static-libgcc -static-libstdc++ -Wl,--gc-sections
++          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
++          ${LDFLAGS}
+ 
+ ifeq ($(ARCH), x32)
+     CFLAGS += -m32
+diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+index ecbd859f..5881cf53 100644
+--- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
++++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+@@ -17,7 +17,7 @@ DIRLIST = jni                \
+ 
+ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
+ 
+-CFLAGS = -DTARGET_OS_LINUX=1     \
++CFLAGS := -DTARGET_OS_LINUX=1     \
+          -D_GNU_SOURCE           \
+          -DGST_REMOVE_DEPRECATED \
+          -DGST_DISABLE_GST_DEBUG \
+@@ -26,7 +26,8 @@ CFLAGS = -DTARGET_OS_LINUX=1     \
+          -DHAVE_CONFIG_H         \
+          -DJFXMEDIA_JNI_EXPORTS  \
+          -DLINUX                 \
+-         -ffunction-sections -fdata-sections
++         -ffunction-sections -fdata-sections \
++         ${CFLAGS}
+ 
+ CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections
+ 
+@@ -56,21 +57,16 @@ ifdef HOST_COMPILE
+ 	           -I$(GSTREAMER_LITE_DIR)/gstreamer/libs \
+ 		  $(PACKAGES_INCLUDES)
+ 
+-	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
++	LDFLAGS := -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
+             -z relro \
+-            -static-libgcc -static-libstdc++ -Wl,--gc-sections
++            -static-libgcc -static-libstdc++ -Wl,--gc-sections \
++            ${LDFLAGS}
+ else
+ 	CFLAGS += $(EXTRA_CFLAGS)
+ 	INCLUDES = $(BASE_INCLUDES)
+ 	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS)
+ endif
+ 
+-ifeq ($(BUILD_TYPE), Release)
+-	CFLAGS += -Os
+-else
+-	CFLAGS += -g -Wall -D_DEBUG
+-endif
+-
+ ifeq ($(ARCH), x32)
+     CFLAGS += -m32
+     LDFLAGS += -m32
+-- 
+2.21.0
+
diff --git a/dev-java/openjfx/files/11/use-system-swt-jar.patch b/dev-java/openjfx/files/11/use-system-swt-jar.patch
new file mode 100644
index 000000000000..34b4245bf0a0
--- /dev/null
+++ b/dev-java/openjfx/files/11/use-system-swt-jar.patch
@@ -0,0 +1,25 @@
+From c7a04feac8281cd3e53c8d0215a229bb6cd4fce8 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sat, 1 Jun 2019 00:36:04 -0700
+Subject: [PATCH] use system swt jar
+
+---
+ build.gradle | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.gradle b/build.gradle
+index 1e414b7..3d967bb 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -2477,7 +2477,7 @@ project(":swt") {
+     commonModuleSetup(project, [ 'base', 'graphics' ])
+ 
+     dependencies {
+-        compile name: SWT_FILE_NAME
++        compile files("__gentoo_swt_jar__")
+     }
+ 
+     classes {
+-- 
+2.21.0
+
diff --git a/dev-java/openjfx/metadata.xml b/dev-java/openjfx/metadata.xml
new file mode 100644
index 000000000000..3ae082145524
--- /dev/null
+++ b/dev-java/openjfx/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		OpenJFX is an open source, next generation client application platform for desktop,
+		mobile and embedded systems built on Java.
+	</longdescription>
+	<use>
+		<flag name="media">Compile media module, based on gstreamer-minimal (does not pull gstreamer)</flag>
+		<flag name="source">Install JavaFX sources</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
new file mode 100644
index 000000000000..02d8964eaea0
--- /dev/null
+++ b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+EGRADLE_VER="4.8"
+
+inherit java-pkg-2 multiprocessing
+
+DESCRIPTION="Java OpenJFX client application platform"
+HOMEPAGE="https://openjfx.io"
+
+SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
+	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar
+	https://repo.maven.apache.org/maven2/org/antlr/antlr-complete/3.5.2/antlr-complete-3.5.2.jar
+	https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="$(ver_cut 1)"
+KEYWORDS="-* ~amd64"
+
+IUSE="cpu_flags_x86_sse2 debug doc source +media"
+
+RDEPEND="
+	dev-java/swt:4.10[cairo,opengl]
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	media-libs/freetype:2
+	media-libs/fontconfig:1.0
+	media-video/ffmpeg:0=
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/cairo[glib]
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/pango
+	virtual/jpeg
+	virtual/opengl
+	|| (
+		dev-java/openjdk-bin:${SLOT}[doc?]
+		dev-java/openjdk:${SLOT}[doc?]
+	)
+"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-java/ant-core-1.10.5-r2:0
+	dev-java/antlr:0
+	dev-java/antlr:3.5
+	dev-java/hamcrest-core:0
+	dev-java/stringtemplate:0
+	virtual/ttf-fonts
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="cpu_flags_x86_sse2"
+
+PATCHES=(
+	"${FILESDIR}"/11/disable-buildSrc-tests.patch
+	"${FILESDIR}"/11/glibc-compatibility.patch
+	"${FILESDIR}"/11/respect-user-cflags.patch
+	"${FILESDIR}"/11/use-system-swt-jar.patch
+	"${FILESDIR}"/11/fix-build-on-gradle-5x.patch
+)
+
+S="${WORKDIR}/rt-${MY_PV}"
+
+egradle() {
+	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
+	local gradle="${GRADLE_HOME}/bin/gradle"
+	local gradle_args=(
+		--info
+		--stacktrace
+		--no-build-cache
+		--no-daemon
+		--offline
+		--gradle-user-home "${T}/gradle_user_home"
+		--project-cache-dir "${T}/gradle_project_cache"
+	)
+
+	export GRADLE_HOME
+
+	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
+	unset ANT_HOME
+
+	einfo "gradle "${gradle_args[@]}" ${@}"
+	"${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
+}
+
+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 JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+		export JDK_HOME="${JAVA_HOME}"
+		export ANT_RESPECT_JAVA_HOME=ture
+
+	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
+			export JAVA_HOME="${JDK_HOME}"
+			export ANT_RESPECT_JAVA_HOME=ture
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack "${P}.tar.bz2"
+	unpack "gradle-${EGRADLE_VER}-bin.zip"
+
+	mkdir "${T}/jars" || die
+
+	local line jar
+	for line in ${SRC_URI}; do
+		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
+			jar=$(basename "${BASH_REMATCH[-1]}")
+			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
+		fi
+	done
+}
+
+src_prepare() {
+	default
+
+	local d="${T}/jars"
+
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
+
+	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
+}
+
+src_configure() {
+	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
+	#FIXME: should we enable webkit? doubt so
+
+	# build is very sensetive to doc presense, take extra steps
+	if use doc; then
+		local jdk_doc
+		if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
+			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
+		elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
+			jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
+		fi
+		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
+	fi
+
+	cat <<- _EOF_ > "${S}"/gradle.properties
+		COMPILE_TARGETS = linux
+		COMPILE_WEBKIT = false
+		COMPILE_MEDIA = $(usex media true false)
+		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
+		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
+		BUILD_LIBAV_STUBS = false
+		GRADLE_VERSION_CHECK = false
+		LINT = none
+		CONF = $(usex debug DebugNative Release)
+		NUM_COMPILE_THREADS = $(makeopts_jobs)
+		JFX_DEPS_URL = ${T}/jars
+		COMPANY_NAME = "Gentoo"
+	_EOF_
+}
+
+src_compile() {
+	egradle zips $(usex doc "" "--exclude-task javadoc")
+}
+
+src_install() {
+	if ! use source ; then
+		rm -v build/sdk/lib/src.zip || die
+	fi
+
+	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
+	doins -r build/sdk/.
+	doins build/javafx-exports.zip
+
+	if use doc; then
+		insinto /usr/share/doc/"${PF}"/html
+		doins -r build/javadoc/.
+		dosym /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
commit	2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree	c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /dev-java
parent	6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)