gentoo resync : 16.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-16 16:47:37 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-16 16:47:37 +0100
commit: 8aebb228036d5e2863b7eaa6e319ab41c1669269 (patch)
tree: 00f4b90ce32462dc8e99ae54a31d6462ea2c3ac6 /dev-java
parent: 76cba73c47c8694e74377004634daca18f2d9c08 (diff)
60 files changed, 134 insertions, 346 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index fec704c49b9d..7e20377532d2 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 002ff3946c09..60ec7a48ebff 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,6 +1,6 @@
-AUX commons-logging-1.2-gentoo.patch 897 BLAKE2B 353550109ecc13bfa897217d845ca9cb6e315d29f1a565462d4905cb02b3092eb3a97b16b992f80d13cfdd6938467c064c91e214b62e0ab1160b3b557c3c870f SHA512 b486f96b1d7ae8e8decb3210fb33a31dbfa147cd30ae8311c60eab4f0d48b71518825bba06f146490aeea746dc3dc996a7191a974d57cf990ca253793b9294a1
-AUX commons-logging-1.2-servletapi.patch 1855 BLAKE2B d3c7cb640563f200fde0a72fc1f7e74a89d3072d74593c2c7829162a71df385af9dfbda5cbd3cc82b78a8fadb353eb1dcc6fba0ff30ac425c4306fed9ec7e731 SHA512 3e608ec37279664249d89eb90eaee7e2f5536ab37efcb6e94a8d586b5284a4641aaa5c58f6ef4730955e51fd22491e82f1a6b5b50303f9c4d7cfd066f751799c
+AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027
+AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
-EBUILD commons-logging-1.2-r1.ebuild 2206 BLAKE2B c9e0282cd31a7d47abb7420a69d1146f674e176bf7753803475a37e15a735189928b5debdd1ec7866b26d89b8b74768c71f096d7058520c945395279b93ef0b0 SHA512 a883053e3a6b7916ba5ce9c58a857df1a3d19ef739d1b466fd9109ff8b91b4ddc4259917a8b2a1f87019f2713b4fafd5702b549f073062c35964a8b84ac8e710
-EBUILD commons-logging-1.2-r2.ebuild 2303 BLAKE2B ef5024e9757c4272af167353900ddd68b6352755238cba889622e1ee0e8d0f9f39ffc29db992d62ad67023ae1b6269f772280b8cf861318c0266430d42845e54 SHA512 7907674ff580c95ece78dfb6481a6510bf6c570c0e6337254c2e01857fbd54ca4f36bb8e68feedfe479b69f196cd7af58b0c449e620d165dc3d8c5f36412bff7
+EBUILD commons-logging-1.2-r1.ebuild 2212 BLAKE2B b91b91b4e26f1d9a5aea2a3743f979df0eb0f884ec00b5ac10087d0859828e6ca0b981fdcdcd520272d224b3f0b377eac8cb1da1566fd08671e3c9d6a6343153 SHA512 63621491db41bc2627c1a673c161218c4b999a3b925493f92e2442a053d9c6feffc5bf8a7c35f05d1a7c6f26504e0e87d723829d25496359c5bea71e4cd3d646
+EBUILD commons-logging-1.2-r2.ebuild 2303 BLAKE2B 3c11c135b650f00c703dfad89cb12648dcbe61bf251de7a7428bce266a51c980187cfbc902e4a7500b5d7c2b457c21d556bd547754ec5fc011a4eb5b7cd62830 SHA512 39b7fd0405164b07c062f300b7f0b71e29650b25d06873fb83171f6571dc63852238a47b71a1f1253fe7f3398556a09441f45220ae621dbbde694fe5daece285
 MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd
diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
index be6e19cbc56a..d31cbb5b606b 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
@@ -8,8 +8,9 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2 java-osgi
 
 DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
-HOMEPAGE="http://commons.apache.org/logging/"
+HOMEPAGE="https://commons.apache.org/logging/"
 SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -21,10 +22,12 @@ CDEPEND="avalon-framework? ( dev-java/avalon-framework:4.2 )
 	log4j? ( dev-java/log4j:0 )
 	servletapi? ( java-virtuals/servlet-api:3.1 )"
 
-RDEPEND="${CDEPEND}
+RDEPEND="
+	${CDEPEND}
 	>=virtual/jre-1.6"
 
-DEPEND="${CDEPEND}
+DEPEND="
+	${CDEPEND}
 	>=virtual/jdk-1.6
 	test? ( dev-java/ant-junit:0 )"
 
diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
index 4aae5b05685c..0f4bba416ed0 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
@@ -43,9 +43,9 @@ DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
 src_prepare() {
 	default
 
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+	eapply "${FILESDIR}/${P}-gentoo.patch"
 	# patch to make the build.xml respect no servletapi
-	epatch "${FILESDIR}/${P}-servletapi.patch"
+	eapply "${FILESDIR}/${P}-servletapi.patch"
 
 	# bug #208098
 	echo "jdk.1.4.present=true" > build.properties || die
diff --git a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
index f359e8e224bf..a654ce1fc763 100644
--- a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
+++ b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
@@ -1,5 +1,5 @@
---- a/build.xml	2013-05-16 22:04:22.000000000 +0200
-+++ b/build.xml	2013-12-25 23:58:47.447266535 +0100
+--- a/build.xml
++++ b/build.xml
 @@ -773,4 +773,23 @@
      </fail>
    </target>
diff --git a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
index 96299c131f1b..a9fccba8d5c1 100644
--- a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
+++ b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
@@ -1,5 +1,5 @@
---- a/build.xml	2013-12-26 00:00:51.019721667 +0100
-+++ b/build.xml	2013-12-26 00:22:27.616511976 +0100
+--- a/build.xml
++++ b/build.xml
 @@ -279,6 +279,8 @@
                 classpathref="compile.classpath"
                 classname="org.apache.log.Logger"/>
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index 514d71f9779c..a8a4835b59e5 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -2,7 +2,6 @@ AUX commons-math-2.1-r1-buildfixes.patch 770 BLAKE2B 99782f38b6efdfa94b0b69390bc
 AUX commons-math-3.2-build.xml 12448 BLAKE2B 04021b793945a00a95152ef98772dfb5735cce14307d33772701a6240a8d5a094b2156faf4fc775454c0c369df066f9404a0d5a5671f809647ae1e5389648ec4 SHA512 7f7d4a469843b218e90e3482360101058f027cf7d2319f1f7a5a4af7c09b6e4b05237c594eb217d5ffc3f07793fcabaa733be52686148af94a12727e4fda89ed
 DIST commons-math-2.1-src.tar.gz 1099423 BLAKE2B 83c52abc10eebb6c749aec218aa435df4cd05106e6bcbead5061df7381d168aa9392ab70dce8eb0b8e254d6d95a372cacddc8f7714198a186a95a04a394bda9d SHA512 53ed8c0400402c588d824c15365ebe60bef41697ff9728270a9fdc3ac30eb60c4c397caf939ccda839eb701453d98af4eac9eae2090575fcfdee4df2d6f6045b
 DIST commons-math3-3.2-src.tar.gz 2602474 BLAKE2B a818ca5ab1b9799359bad1c84d2774329c7c2605aeea3e13769eed9f1578d412555ad90a8de68971daa42b270d4bcd5fbf0fe79714e839d41b08077e32633125 SHA512 132c4725be582e25f67a955c7b3b8c7ef155606d8f4da07770464c422ded6b5e6efd1a13a6e98cff222f4fcac73606d512ee1ab9e3b1c4befcc1ba16ab68787b
-EBUILD commons-math-2.1-r1.ebuild 923 BLAKE2B ba238f19102de7511a9b5fbfe42d4a6b9b32d035ee7f6a28fc500eb4d139f7edb9c02d1f46c1c4bbcffc8499c2ef2a4d7a75879c01501ff9d77bc7619cd2ca2a SHA512 27e322ceeae09a6b38fe639f4eada113e73ce14d86995585a2640324339b5cb9cfee77b8ad63b8b9cb806dbdc6902f5b8d126ca88e0f089d18e55cb823c702cc
-EBUILD commons-math-2.1-r2.ebuild 904 BLAKE2B b44fc90bea0e0e7f41cd8c73d3f1f053d268290e7cc410f90c54583b178d6f43dc921f9abf344c0cb2e2cf37813a1ea9ffea9c3f31a15cbb2552e30c6cc0c213 SHA512 31fe0b2137e32bcf03a2650c71871bf035daec46478dcd0809f6a2b8f2df7150d4af2586c0a80b4a2dccba4a06935fa6ab4c1e8f6e6d88ed45916d3941dad3bf
+EBUILD commons-math-2.1-r2.ebuild 903 BLAKE2B 2b390b4109fd875bc79f957b2fc22a0e3ce1536476ed331bd57e32d1e90417200002f14045cd7af145f0a1a172e23773531682ac427f0a20e905cb10b8ae305f SHA512 aacd02d27d30d7f27c5bb35cad318b21a4235b0264282527244d892f509e3e0032eaf5407bfbab9b6c4f548c7e9efcbe68629bf0502899c1e9c6d32fb8ad9a4e
 EBUILD commons-math-3.2.ebuild 1315 BLAKE2B a0fe207cc34dae87b52df7709e27f9fc4588e591347d507f8b69cf46ded1eb0b2d23943a93af9997ab215146873fd60479628c80fbcc72dcf8cd1d3c5dc1b72f SHA512 a1f5e7f79e7b36e011a16ed87de7aecf5a9cf8ae8570cdc5fff90a79505bde6120c475df96e188129daec1c436d0409e1260136849c36edafef29e9a70389329
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-math/commons-math-2.1-r1.ebuild b/dev-java/commons-math/commons-math-2.1-r1.ebuild
deleted file mode 100644
index 09d67fb2b5dd..000000000000
--- a/dev-java/commons-math/commons-math-2.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-JAVA_PKG_IUSE="doc test source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
-HOMEPAGE="http://commons.apache.org/math/"
-SRC_URI="mirror://apache/commons/math/source/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit4
-		dev-java/hamcrest-core:0
-	)"
-
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${P}-src"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PF}-buildfixes.patch
-}
-
-src_test() {
-	java-pkg_jar-from junit-4
-	java-pkg_jar-from hamcrest-core
-	ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/commons-math/commons-math-2.1-r2.ebuild b/dev-java/commons-math/commons-math-2.1-r2.ebuild
index 5722f745c40e..b18fc803124f 100644
--- a/dev-java/commons-math/commons-math-2.1-r2.ebuild
+++ b/dev-java/commons-math/commons-math-2.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://commons.apache.org/math/"
 SRC_URI="mirror://apache/commons/math/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.6
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index 89de8712d130..6d07e4e086c8 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,5 +1,3 @@
 DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
-DIST javahelp2-src-2.0.05_svn63.zip 3747088 BLAKE2B 80f0fd45741d313fd47ccb9874d31636d12f452ff012dc010de2879bf67a22bd58f6fbde7df86117f463a949f7897ec5e1e3721b1fdd1ee0fc794f30152e188f SHA512 ed795dad98f8d80f4cd4cda40b6aea0978cda621b131b1563016c1ddc02afeb37f3626a28003dac26d7fe996274fb9a97e741a500b15d06b1e5a93342020abc3
 EBUILD javahelp-2.0.05_p20170719.ebuild 1653 BLAKE2B 9988bdfdc76560c9178c23380f48b93b9286c0a9a65d87088900a950e48ea3a324ec6650052a7d857f0a2692ef7bcdffb39e197a128f978f130de78fd4363c5a SHA512 40de8fa2d8c38c88cee306a34c3aad81742cc54dc8c2b29a10ae2b928bb13f9502fe165f434d546566f610a1f4616f4812eb13088e708d4b7047a6e1b7f32447
-EBUILD javahelp-2.0.05_p63.ebuild 2285 BLAKE2B 360be60aba7c50cb0b7235fa7dd970b5ee1dcf456c9cd40098da59a2d9d97c4c7519cc9c1e80b255f0ba70800b740dc4605d05d303243a30b0e5dda3c6585b05 SHA512 d79e0278aad0ac421036c44d9c748c854b6e2ce03abbd51e4b71ec183b1536636fc267a57f724bbe2f35f3b113bc269a0b9683fbb3b7f883926c0f0d9f946b49
 MISC metadata.xml 624 BLAKE2B 0c06c71189c699c3baf3f8d307f8b077ec8e6e03acb4e0ede09c7537354ab6b7bc043824fa6052be49ccbd6f0debc1cbf2b1e46f42f69a95a1906be6e43639b8 SHA512 bd475a0c41855b34bb58ae6d6a3e2d164abbb97348d809f2fc305e77ca80495bccb4d71ad0aeb0b5586565c71649c6e3775b83c92272dbe8518949864120f484
diff --git a/dev-java/javahelp/javahelp-2.0.05_p63.ebuild b/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
deleted file mode 100644
index bd11008d4d6a..000000000000
--- a/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-WANT_ANT_TASKS="ant-nodeps"
-JAVA_PKG_IUSE="doc examples source"
-
-inherit versionator java-pkg-2 java-ant-2
-
-DESCRIPTION="The JavaHelp system online help system"
-HOMEPAGE="https://javahelp.dev.java.net/"
-
-MY_PV="${PV/_p/_svn}"
-MY_PN="${PN}2"
-SRC_URI="https://${PN}.dev.java.net/files/documents/5985/145533/${MY_PN}-src-${MY_PV}.zip"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-COMMON_DEP="
-	java-virtuals/servlet-api:2.4"
-RDEPEND="
-	>=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND="
-	>=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}/"
-BDIR="${S}/javahelp_nbproject"
-
-src_unpack() {
-	unpack ${A}
-	# jdic does not currently build out of the box against the browsers we have
-	cd "${S}/jhMaster/JavaHelp/src/new/" || die
-	rm -v javax/help/plaf/basic/BasicNativeContentViewerUI.java || die
-	mkdir "${BDIR}/lib" && cd "${BDIR}/lib" || die
-	java-pkg_jar-from --virtual servlet-api-2.4
-	java-pkg_filter-compiler jikes
-}
-
-_eant() {
-	cd ${BDIR} || die
-	eant \
-		-Dservlet-jar="$(java-pkg_getjar --virtual servlet-api-2.4 servlet-api.jar)" \
-		-Djsp-jar="$(java-pkg_getjar --virtual servlet-api-2.4 jsp-api.jar)" \
-		-Djdic-jar-present=true \
-		-Djdic-zip-present=true \
-		-Dtomcat-zip-present=true \
-		-Dservlet-jar-present=true \
-		${@}
-}
-
-src_compile() {
-	_eant release $(use_doc)
-}
-
-#Does not actually run anything
-#src_test() {
-#	_eant test
-#}
-
-src_install() {
-	pushd jhMaster/JavaHelp >/dev/null || die
-	java-pkg_dojar "${BDIR}"/dist/lib/*.jar
-	java-pkg_dolauncher jhsearch \
-		--main com.sun.java.help.search.QueryEngine
-	java-pkg_dolauncher jhindexer \
-		--main com.sun.java.help.search.Indexer
-	use doc && java-pkg_dojavadoc "${BDIR}/dist/lib/javadoc"
-	popd >/dev/null || die
-
-	use source && java-pkg_dosrc \
-		./jhMaster/JSearch/*/com \
-		./jhMaster/JavaHelp/src/*/{javax,com}
-	use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
-}
-
-pkg_postinst() {
-	elog "Native browser integration is disabled because it needs jdic"
-	elog "which does not build out of the box. See"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=53897 for progress"
-}
diff --git a/dev-java/jcifs/Manifest b/dev-java/jcifs/Manifest
index 39a6c3c71c95..4ac531b334e0 100644
--- a/dev-java/jcifs/Manifest
+++ b/dev-java/jcifs/Manifest
@@ -1,4 +1,3 @@
-AUX 1.3.17-build.xml.patch 402 BLAKE2B 797df1a932f241974926602d2f1d7c88fcfc7c5e413fc9327ea331d5242fa13a8a3b8f57cd9952f537c206f3363de7e623745ede5134746b379f6767bfc6119e SHA512 a044037c94a8f4a1ba1f9635b4ac8426287fdad9b9942caf89b96665abb7d38f451f8e05666526087cb93511f258491f034af46589b4d611770044c62e27c732
 DIST jcifs-1.3.17.tgz 862091 BLAKE2B 67605ebd810caf097a9172c17f31d39c9e16af5885c706f7d8c2c2cff9b8e6a643174c9aaa8bd6aa06c816e312b7170a5aa06535f823a5c5b182e97beecccd0d SHA512 2fa1950f9ab6f0f3d45fd9b7866cc94993d1135f48d78ce357dca1d872746d22bff6097da8c418d0d11fd71d86b3fdc79b23195bcbab5bc460d8d0cca87efedc
 EBUILD jcifs-1.3.17-r2.ebuild 794 BLAKE2B 4da988b2dc46f9b33b84a6a18b3309c40cb775c7c5faa6312d89d0ee7444e69831cfccb62d4c4f99713c7c98b1755732cd50234aba5f4429f68a5fb449144c49 SHA512 5fa03afb1988311c5398d01ef9af4618260af25ebc0deafb204378553037eb0243051c14bc372484e2b0995a1791d6352f7eba956b564748e03d48f8c604141b
 MISC metadata.xml 547 BLAKE2B 654c37f05e5dd6b09b76c364070d1fe0f60fb0c9adcbc4c111a900cff3f7a0d1320ae934ee1290d015f64eb59bbe18d6965af52a7be69db16461908cd6d5087a SHA512 5783f25610ce9cf8db737748ca4f493d62e22ac5014de06d8e051d114b8aad73484e496b0ca10216462c8f68125ec501f604168fa1957306b8a2ceaed64d42ae
diff --git a/dev-java/jcifs/files/1.3.17-build.xml.patch b/dev-java/jcifs/files/1.3.17-build.xml.patch
deleted file mode 100644
index e90c6ef0ace0..000000000000
--- a/dev-java/jcifs/files/1.3.17-build.xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -52,8 +52,6 @@ dependencies: Checks that all class dependencies are met.
-             source="1.5"
-             target="1.5"
-             fork="yes"
--            executable="/usr/local/java5/bin/javac"
--            compiler="javac1.5"
-             debug="on">
- <!--
-             <compilerarg line="-Xlint:deprecation -Xlint:unchecked"/>
-index ae4c8d8..2b09fa2 100644
diff --git a/dev-java/jmi-interface/Manifest b/dev-java/jmi-interface/Manifest
index 1667f07459e7..b4f42482201d 100644
--- a/dev-java/jmi-interface/Manifest
+++ b/dev-java/jmi-interface/Manifest
@@ -1,6 +1,6 @@
-AUX jmi-interface-1.0-enum.patch 1334 BLAKE2B 2c45299a83abc3baafba3b0799a86f6a6806bd7b08e14505b81c4ebbf9e29dd3ba87f6aea5ad09a3f7e89df5b390195439de3c828b23915d3d18814943346a4f SHA512 462a3d987fbd2e5461db530c9b0af5d9af17a2b964050da3c7cedcd42159e9acb97262ff292293df9f964585d5652b48367ec13153ee3a2a14135633430a5a1c
+AUX jmi-interface-1.0-enum.patch 1026 BLAKE2B 9d9f4eb2938b405cafd8c82123b3b70e80552c34de1f27498610b28ae99f2130b81715a9b87b3208075b02f563a5f3d7ef4c8489d8f7a59ef395b80ff2a15f7e SHA512 82b8b8666da33d40c4284f221a60a44ef4cab4deceda9090f928d59165af6811630a54c771aa36e45dc86378eae0a6bdd7660b56206fe7ba933fe8e0e21ebae2
 DIST jmi-1_0-fr-interfaces.zip 38946 BLAKE2B fb48e994000bc01b9972bd50d6e110322f251de2356202d33fd16c2f8333e76d9d6c185e064e1b435bc572864f244483680a1a2ff9f4ab1970ebaf50bf647613 SHA512 40a7b983ca8bbd5c35f4e2ef0acda7ecb09230c80a41fd17998a24ae57216b579e0e33bcbb2348d0091d1e75c1132be9bcb959a957519fe9d5d29f347bf1eca6
 DIST mof-1.0.xml.bz2 7076 BLAKE2B e86f8cf05a4922130d70a79c95f3cb369d54f40246f89bd04d1371a6401a923633f353268954674dc86ae28ed1da760a3ff90fbffdbe79f4331814e657f9bd94 SHA512 72dfee938fb3cb019928d3813743d5d535e1a5dbaa39915f5af84c39f9a701f8b043150e53f25b3745c5bbf25010144735834b121e3884bcaf044db6ff22e722
 EBUILD jmi-interface-1.0-r4.ebuild 1056 BLAKE2B 0deecf71cd4402749b9a080e9a5be76f8483b6defe0d669645fea973082f6479a0ec50d1234e683a36cf595df74154046198fc29da800d4d8633b5813f705ed2 SHA512 094835e191e82c661b3fcd063eb98d4788eab1b1ac92529cfe3ac91fe2181a10ddec29d9ef333db8848016a06b9f84daf442912d9596cd040c38f06139d3fb4d
-EBUILD jmi-interface-1.0-r5.ebuild 1039 BLAKE2B 95f32750aa18c23adc346c824f3d8b2dfca51515fbb46e8031e7ac64fd636cd10bb0d95332d13c74ce44c11c06f8fb33e2d6a504a1305dd7a249003c86ffcf66 SHA512 b4447dbded9f83ff51d3f59bceb2d5ede9e148a974413557cda49657c1d4f811c753a3f8c1ba2496b8f3f6258cf265358b5c233b14280b8d2ef68bb30a7e6e73
+EBUILD jmi-interface-1.0-r5.ebuild 1039 BLAKE2B 01849d5875749340cc3ecb6721e77e1213f033c0269598388ce83c00b698c2ffd1d27e41057a60b13267a8264f1fafd28b9dcbb1b7c2c996b6d395aa6dd876f5 SHA512 ed85224f3e008f4d463ce05bf5a180bc076cf8a4155cecb93cbefc49d21552860b8f9fd5b00708a85d984991d2da073068d93b6c5925b9991b0efb744c79a566
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jmi-interface/files/jmi-interface-1.0-enum.patch b/dev-java/jmi-interface/files/jmi-interface-1.0-enum.patch
index ba12af789cba..a74dfd4d4461 100644
--- a/dev-java/jmi-interface/files/jmi-interface-1.0-enum.patch
+++ b/dev-java/jmi-interface/files/jmi-interface-1.0-enum.patch
@@ -1,6 +1,5 @@
-diff -Naur src/javax/jmi/reflect/RefClass.java src2/javax/jmi/reflect/RefClass.java
---- src/javax/jmi/reflect/RefClass.java	2006-12-09 00:45:59.000000000 +0100
-+++ src/javax/jmi/reflect/RefClass.java	2002-05-02 13:44:42.000000000 +0200
+--- a/src/javax/jmi/reflect/RefClass.java
++++ b/src/javax/jmi/reflect/RefClass.java
 @@ -8,6 +8,6 @@
      public Collection refAllOfClass();
      public RefStruct refCreateStruct(RefObject struct, List params);
@@ -10,9 +9,8 @@ diff -Naur src/javax/jmi/reflect/RefClass.java src2/javax/jmi/reflect/RefClass.j
      public RefEnum refGetEnum(String enumName, String name);
  }
 \ No newline at end of file
-diff -Naur src/javax/jmi/reflect/RefPackage.java src2/javax/jmi/reflect/RefPackage.java
---- src/javax/jmi/reflect/RefPackage.java	2006-12-09 00:46:08.000000000 +0100
-+++ src/javax/jmi/reflect/RefPackage.java	2002-05-02 13:44:16.000000000 +0200
+--- a/src/javax/jmi/reflect/RefPackage.java
++++ b/src/javax/jmi/reflect/RefPackage.java
 @@ -14,7 +14,7 @@
      public Collection refAllAssociations();
      public RefStruct refCreateStruct(RefObject struct, List params);
diff --git a/dev-java/jmi-interface/jmi-interface-1.0-r5.ebuild b/dev-java/jmi-interface/jmi-interface-1.0-r5.ebuild
index 2f8d24bf984a..76b58a2abf2c 100644
--- a/dev-java/jmi-interface/jmi-interface-1.0-r5.ebuild
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r5.ebuild
@@ -42,7 +42,7 @@ src_prepare() {
 
 	# rename enum keywords because javadoc hates them
 	# even with -source 1.4, bummer
-	epatch "${FILESDIR}/${P}-enum.patch"
+	eapply "${FILESDIR}/${P}-enum.patch"
 }
 
 src_compile() {
diff --git a/dev-java/jung/Manifest b/dev-java/jung/Manifest
index ddf018312acb..2027dd72bf11 100644
--- a/dev-java/jung/Manifest
+++ b/dev-java/jung/Manifest
@@ -1,4 +1,3 @@
-AUX jung-1.7.6-build.xml.patch 714 BLAKE2B 593d710468ffa969e709936892a47686218ab32e9afe4ae2dd5b89253042561ccd486c758748db54d7a4b25eb564f618c4e78f40a40fce51b090baa1f6876e70 SHA512 d9e8548ed4b0271a88aa827dd94a49a95fda7e22e78dfe0e0490ef7c9e161c86d7289f5f3382d4bfcdfa95daf84582143ee6d1cfe7946114c9fb35d2fea17c4e
 DIST jung-1.7.6.zip 8164548 BLAKE2B f7ae35557e531686ca56235a6087587dd520ab1336e1121871e1f6727d64818b078dedaf55b1cbd83c32a8c5e03af7926a75302033a7e21e07200ac8f5d729b5 SHA512 126f06e34a6db6cc55df2b1c1b52612ddece7db7a1fb45cbc91892122678b0b629eac00276fc501aeab558cf1f01a4e5e7f5d0392bfae977ca1950df2c3d063a
 EBUILD jung-1.7.6-r1.ebuild 660 BLAKE2B 782c19117a4c1d230c7bf2b9dd0fc884cfa4b25bc1ce452782fd3140b3aefe7a623bbbba6533db43baf9027dab450cf85b3855591c93ef7a3ee0e9b3356f175c SHA512 f5676eaa00faba26d7e9f1dd9227bb9f5798753cc55d1e322e64c0a88ffd284bdb6aafbd5dfa5321060813552056074838480b8fed1a890baae5877d4dc0eb2e
 MISC metadata.xml 532 BLAKE2B 3f7a781a447b885d31f1a33b8e6030dcb56e4be649b6a1716ef4bba3ee2047caa037dae275c9781f6a90b5d242482eb32dcf35353be8ee7098abec46f9195c41 SHA512 2662c5bedc6f2e200bbcca0af62dfa46063e01759e4abd5ffdaa908abe82f20f875c3fbd3e83134616997d67f8989e059810847ee5951cb0c2b296bb127f3c14
diff --git a/dev-java/jung/files/jung-1.7.6-build.xml.patch b/dev-java/jung/files/jung-1.7.6-build.xml.patch
deleted file mode 100644
index 1ddf38597d6f..000000000000
--- a/dev-java/jung/files/jung-1.7.6-build.xml.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- build.xml	2009-05-24 12:12:51.007684864 +1200
-+++ build.xml	2009-05-24 12:39:01.796913330 +1200
-@@ -83,7 +83,7 @@
- 		</fileset>
- 	</path>
- 
--	<taskdef classpathref="jcoverage" resource="tasks.properties"/>
-+	<!--<taskdef classpathref="jcoverage" resource="tasks.properties"/>-->
- 
- 	<target name="clean" description="clean up build artefacts" unless="cleaned">
- 		<delete quiet="true">
-@@ -157,7 +157,7 @@
-         the instrumented classes reference classes used by the
-         jcoverage runtime.
-       -->
--			<classpath refid="jcoverage"/>
-+      			<!--<classpath refid="jcoverage"/>-->
- 			<classpath refid="alljars"/>
- 			<!--	  <formatter type="brief" usefile="false"/> -->
- 			<formatter type="xml"/>
diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 49ec5f222544..421a0696226c 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -1,4 +1,4 @@
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-apisupport-8.2.ebuild 3010 BLAKE2B c210afe19aac779eb56f7c6820a3c2e66185b16a0abde87fc2478c73e4f0b72ca6789cd9aa27f1e57eb4fde974afd59d3a44a5303e81da2ff2958ffdae9cfc0b SHA512 e2844ded0c02943a8989c2e3e8c755f804d386687bf15b126933e8aff7610faa1442f6aaee73e93486a4bac63b498692e38c92ce0db435407cdf8f30b4780ced
+EBUILD netbeans-apisupport-8.2.ebuild 3010 BLAKE2B 6fdfe1664730ef473cc979aa36d323a235bc074a08fb28e166d0c8c92e32ad1eb741e65955f08728bebf3f6f3f117760dfd354a7d2c26736f410cff6883627dd SHA512 f20ff5bbde263b8a4992ee83ed0de8fc4c6f52fc515aa6c9ad9eda9f493cdae2659e53fa3cdc8dca23ad6cd1f0335f7db376164cd026b439326a3fcf49644135
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
index 787e88b67f4d..73f3a4ebf168 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -47,7 +47,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index e6ee4846bbff..f1c9ba62aa67 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -6,5 +6,5 @@ DIST E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip 179656 BLAKE2B 563
 DIST F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip 11747046 BLAKE2B a3cc474e94c650abf257e62979373a7909d1a8759c2536e2547fb609c05c0c545f23d8f5b541a5658257d907c55df2260ba1de9e9c435ddf79de805185529de8 SHA512 73f5c986f132bc898fe67c528f5a356868c7d5a0dd7e9201252b3a20a4906f3e729ce5444b33197c28a94513cbc47664a8c80aeb5c114f9a58c7065b41d414f8
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-cnd-8.2.ebuild 4416 BLAKE2B c072edc64bb99079f0d4dc3ff968c1e75a2ff6d5c81428a28bfc3f45c29e4221df0d6ade1a4fb61708e4f3af408fa60b4d9e592a7e2781349e0fdfdd8ee8ca0a SHA512 bfac943aa83ee1ade491c83812f4cb9747289303b960335b6056a9abccb4b1f6aa53949e93308f172f073f16a717269278e3165b8e5b3a0d4a6f17f1e004eb04
+EBUILD netbeans-cnd-8.2.ebuild 4416 BLAKE2B 895b65ef45554d056dec6c766514733d3585e8dbc8e57427170416339257947b76b6b520ee46c822e4537a590072d05a2a71ec63193e53336045e40b71e112ec SHA512 c2d7ff1d976790981856b7f4deed0b804586b47ec9425b1566e178606387537968ca28d64bac4515472e6c2132bcb324a92a5b806164499ce64db25da964a0f3
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
index f26b61f73473..815b8d949a70 100644
--- a/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
+++ b/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -65,7 +65,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index ba365899158c..f3c2def452cf 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -1,5 +1,5 @@
 DIST 18E39A0D10357B72EDB76F2070E27019317792F1-fs_server-1.0.zip 474820 BLAKE2B 0bcb5b01505060627921411b695d873c21b1529ef120078f598458978f61b24778bfe4a959e1d835640888628c49cf0e02c87482d7971ee00d83ae2dc16d563d SHA512 5bc28a6ebe734279ce4999f4657c34885f91f2f44b157dbf65b3690986189961fec138631fe39274ff43762ed74860f3adc1db605f79352dfdc362d2239677a8
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-dlight-8.2.ebuild 2594 BLAKE2B 6119efd7537c0c475cc103ea77247f0251948c6217f4496ed939617eebf0e8e873b818591f1b92935eb9e509f2c9a767db64db4f78c6e80479765914bbc64df2 SHA512 ef3dbf1c870c324c9fe04b3310c97a33507064d6f24cf626f04028f7eb1fa22ad9694aea79bf03fd13b4cdcd0c45d413936970fc800f3635aed195df327ade96
+EBUILD netbeans-dlight-8.2.ebuild 2594 BLAKE2B 5fdc5ea80e83a04bf1f35f668110bf00024b274f3ab99fde29c4946338354b5bb52ead92fa725400efe89e739b1a1539ae09d353f346dd2fc468bb4191217fc0 SHA512 0c3e7b8e4b8b6c0b78ec2f882e981fd51324f718077c7c335c468efa3e4e6f513646c81bb0db60c15fba8762f2f5d7ec199c5a3f6b5a46b767bce5f7345c1558
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
index 535be0582236..ccbf7aef1790 100644
--- a/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
+++ b/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -49,7 +49,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 450539e2aad6..d93ca2a98ba9 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -31,5 +31,5 @@ DIST F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip 57110 BLAKE2B 3e44
 DIST FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip 5025064 BLAKE2B 0fd7e1d26d9bf61afaf51234d40a38b181022ba47ef5c365bb68c7be3cf72e8d3ac3bdfa44ad7e838db9d5dabbbc9962cc3d3387fd6c1eca6d29fc2ad2d77acd SHA512 8624cb07f939d36b7528343b7e3690427578089de7a1b46ed30d576b69002df6f1ffb5878e9c40624dfe8ccf898b7a0be056333184b51d26d3eadb073f58241c
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-enterprise-8.2-r1.ebuild 15451 BLAKE2B 43656b2e8e0d3d97944247d526b5df03f5025200ea01d6d1345265075091bc4212b33caf4b070ede0f95aa136d83ea34358b910c9c26e7948bdb28eb446622f0 SHA512 22acf17f22423ef3bc8622b2ad5ff1c47e6e3b5896a1eb2c8ff241f1ae52355c95c3759adb519ef0e80861c849a79d62871b8e504b69b810db7485009c1257cf
+EBUILD netbeans-enterprise-8.2-r1.ebuild 15451 BLAKE2B 08e7931a1c2204768c9bb75120fd7cc887b0ecf5db920f8b36a27d61d8b740513b8239ded8f81e3d713cea83f76ff341a095c220a04814c54bb033836a400606 SHA512 f0c6d33c7fdfc67708653548d43034baa634bf9e6d5acfe4e9897933170f39fb703c58ea0fb86dff56211c5f42b74b829b8c373153ab566185b49af3f2501a1a
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild
index 8e34ef4d13bb..cd3f853e2846 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -136,7 +136,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 72cd7c904917..50950fa201a0 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -1,4 +1,4 @@
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-ergonomics-8.2.ebuild 2539 BLAKE2B d06442802510d13a58211634dde00ede77aea4fc26f7458e1323c4b07decb34484134850fd01ca2b8d638b1afd385f47d6fcacef216b761544dfc2d35215f6a3 SHA512 23405528f0aa14e982dbd08a8aefc4b9ba4b865fe2f63bb38c95319597151231a1f9bd9e25937026b794dc2472141755db2c43d558425f86c2f3ba52ae373ada
+EBUILD netbeans-ergonomics-8.2.ebuild 2539 BLAKE2B 295b04652fad991c40b1a0ff09927226cc60ca9a5607f8034da6dda4436c3bd9bcfaaa384818972eee2486eb50411649b0d5e6fd3079c3430d05330870dc61ea SHA512 76972a212794b1442453b5acb8d16748990b3d2ab417406ce383e6d104a2cd66122b0888ea424504346b1e71f0c2b8e7a2cf171cce18218794f93c45db2d6df8
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
index 865d19cbb6dd..224881a93101 100644
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -45,7 +45,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index f9c3d51817a7..6b33332a3fb6 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -2,5 +2,5 @@ DIST 545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip 99139 BLAKE2B b
 DIST BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip 2341753 BLAKE2B e322b5aff8830c4e20fe8ed132b06169ab12a22b2c6416d85c6b7e45d34e546e99dfaa5ff30f4bbce33c77089df0f298fffabb1d187224e6ac1b4a6ec36a8e31 SHA512 024b1458f74ae977f5864b543b39417205203f27ff94518aa61ee4c7336c887dc5704b71909fd2b6286c3a29a9ee0aeb86aafc32f741c7650adcacc8374f62ca
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-extide-8.2.ebuild 3003 BLAKE2B 51cd4e95534d8e59f428cf2a7f09eaa94b1c1b9efff0ac15f7aa4eb1974ab0524da9c6549f4605301898b48aa7bce7b1be95357fc4e98dd60b0d531d138ab87b SHA512 bcf4fdfd89802534a3cb0db402bcdd9e03e497b5c5dd27f73c68eece6402d9c14aa892efafac6b64b741d7f4fbbef7d0d20dc395fcfa4a37eaaba1e3459a6cf3
+EBUILD netbeans-extide-8.2.ebuild 3003 BLAKE2B 0452a10c95c5f561c0c0120b22098688e1962175e8734385aec4ba67d393c81f250c2c8397d9943cdba9294f2fdfae3601fa820f0441213debb7462fbd94c61a SHA512 8baef1c1cbce3ad7d9fe6176b49306f989ff331048a899ba4a7125e232c1cddd7c61be83c18d51adb4e90d6217ff444137e2ab74deff0eb736c28ee763bee1fd
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild b/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
index 548164d33300..87ded315355c 100644
--- a/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
+++ b/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -51,7 +51,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index ad57baac89bd..203ceead86d9 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -1,5 +1,5 @@
 DIST 01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar 6997394 BLAKE2B e7be2e27e2f1880071302f385e86b4ad7cb41e19004036c94bcbb76037b287a2ab264881eeac1d965a3cd42aaecc8222aba2cb4ee81226e0e3498a05f4a734e8 SHA512 44d66a51338c478a08092160d483c005cedc275f238d2521748d8af95fbb11920b818d7ea3780545658e76aeb25f900e6188cbc09277ca4726b90ada5d883653
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-groovy-8.2.ebuild 3042 BLAKE2B a17ca75ceac30c24083f328d5bb6a9b0c654ebb7c0f9bc9e60952d9db539f69af048b7d30bbd80fd8cc3eef367dab6589fea0155cf4fbf53843603f4e0e400ab SHA512 cb06b806c059bbe55121627a23ba5cac47fdc7a89aa4ca24a2948065c328ee03135f73ec9634019e855e5c808d79d28f3eee617ba39fef5994e4931914c37772
+EBUILD netbeans-groovy-8.2.ebuild 3042 BLAKE2B 3bb871bbb59ead9216f4bb3d4396a63f83da2e9c86772399a23c9e76837ad95deffcf2f0dac51521e8a2d92aef1a3e8fd79653473c3162afd3ebe5cdb95ef5b4 SHA512 5ec0e771489003212f49849d7cef5a7dfbd8acbadf64c1fb6c8a880fd37b5e99e19c7f694133074ad9eb5aff649d0339e840258ab390185d87764cecbc7526ef
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
index 2277c2b9b5ff..f00968df2a12 100644
--- a/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
+++ b/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -51,7 +51,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 1b331752f8dd..755a62f0d458 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -5,5 +5,5 @@ DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 BLAK
 DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 BLAKE2B e06cc8c989a3ecf5c501ad3e187b8f2afcd7a4838345812b52e0496a2a68b481d2f4406bde00f9cad662d94d97494769d7ea3a2686cf62d3691d953d67701010 SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-harness-8.2.ebuild 3752 BLAKE2B 5b5d9693bff6de0339ae38b78533e7d35a28b555a63534f9b670e9e9c6352ced752881f28be1eaf35adbf7168ffaf77877c1bd2a76beb65202278d13102e10f9 SHA512 d59934baf3b6438267634fc669cc8db7b61d7755ba508c0a4e60e40376b550a4993b8ec243f81e4c80916f5d483db6d78f93864c100290c2e876960102e38b12
+EBUILD netbeans-harness-8.2.ebuild 3752 BLAKE2B 46064f2fc61e80ad005c4de3d020d9178c0fd940704d4c6339e0384bbd50b36cf29244479ee258f7ced555e126733d1e930cd23f72dacc94eb150e81ce670ec1 SHA512 b1e360b877145e24b683e38b3b912ea19daed54bf5c0d5034b536acab40ddb535656afe082d6c1ab1ea56a1e885b332d7b6694dc513bc91b3e9fc51ef0855b18
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild b/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
index 179b86fbee1a..9e5f5e9db7a2 100644
--- a/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
+++ b/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -57,7 +57,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 3d5e34013b10..14422d2629cd 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -71,6 +71,6 @@ DIST F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.
 DIST F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip 459564 BLAKE2B 8d847c768f545b668838b7adce3f0eba4b3b7b4f56469b59e658da0089313748843d08a4f0df180824a3a5e516fb9f103e259c37b315b0352daf58e8ff711470 SHA512 8add9ad7e3f2fb551c11841ad991f204dbeadf7d88cf2e10609644deaa1012095579fb32d568aa67715108062836b48d5c17fd69d5b61d33bca38ad85a617ab5
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-ide-8.2-r1.ebuild 29502 BLAKE2B 3a9bc2b5a9e7d7cda2b9f62ba86b54d4f44e51663b31f4ae81669e8c384460b2b8bb6f193b97b82b4081b323e63c82ed4290abaf8cbed59f5b26fc4fd490d0cb SHA512 c0b15cfbab11668090bdc0e9ac774c4e86d069fec544005ab921df38a929fc6ad33e797275936fed00df047648417f1c2608479e41e84d2627686f745c91670c
-EBUILD netbeans-ide-8.2.ebuild 29489 BLAKE2B b2afafa7eeafa7d3fec47678867548b67959d3762060128d3a80dc6a0a233e65917723dc06438a3be2a72a5d1d681e266375fe220fd00de5e8da18906e5a50fd SHA512 815e30f56b8800b52f5efce0d272af845df730494809593ef64032cb778d6377f526c15f4ff0dfb48e66748e00528648b5cf06ba6f3601950b5e26e878101a24
+EBUILD netbeans-ide-8.2-r1.ebuild 29502 BLAKE2B a602e565fac2cfebfa905a264795bd638e26cff038d8dd40104b19c398d938c054cfcc5cdd8d90354d16fe16e384d6a28811c1685f955fba7628990cf99b66bb SHA512 b240c2d2e3a76ab7b8dc9f0fead272caa85ec2583c25d4e486ec0a9396f802fd5f2b6b9a261ddd45c3fb8ef6119fc92904abef83a496ed3b6677a174c16b8a34
+EBUILD netbeans-ide-8.2.ebuild 29489 BLAKE2B 12c8c79b8566387e30401dc33b411c5491702b1cdf2f72486afdb6be42a9659d5465bafdd386c7ecbeaed4181f0b9cfb8ad039b99b92c801fe441da9d23f31c5 SHA512 4be4bb7912bef84b19a4daeab23291a7480564906834d0190f5ff2440e52ce16228defebea3c1aab03152c2eb1022e43d5ffbe5428b3c95649d531e66d0da248
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild
index 0fb63f1ef94e..841b1b8c9e65 100644
--- a/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -228,7 +228,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
index 6d5de68c9f5d..1d445837b6c6 100644
--- a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -228,7 +228,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 1595ae1a20a4..abb1770c97ac 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -27,5 +27,5 @@ DIST F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
 EBUILD netbeans-java-8.2-r1.ebuild 15304 BLAKE2B 71694169d54d481dcfb95f23eb23950473ef595eac0f1c06421b893b31ee1a00beae5fdc0e68deabe72e7a4cfa58a91f0262f59cf0a3485f32ec84d2150c0780 SHA512 c08f766179e97b6866c137b51216f9d9115304cebfe3d7cdb64b9b804a396125e32c0f313150edf41ecc08e37049a3dfad2a546f2417e2d98d7bb02b26ef6547
-EBUILD netbeans-java-8.2.ebuild 15282 BLAKE2B 5ebca1edff8a8040358be0d925021aad7e382d6d9169aa1c8c77a86549a72418330f8b6ef009026a6f4edac3391f957cdf8aabaea4d7b06ea6021780d7bd2a2a SHA512 d89f60bf78b3ae17c820dee321c282bc3e12c2e04674852cd2c19da82f61af627ccbb6540257f85432ae950e20f0e30bc4e7b8528dbb7bc808d7605224c97a0f
+EBUILD netbeans-java-8.2.ebuild 15282 BLAKE2B 6f9cc569192af99f8fb70f17564cee6e2dcff4df8d537a920447fe49aa538fa8296091388670c89e41162c1a1abfb638d1607c96b54b83fd8617df1808be3827 SHA512 833a66094812baf6ee45ead2dbe4afec5e1b9b4269bd55e77e6445d5ddd17f295e856235b62c59932a8ac27d5b0c1f3d560360dd8a19dd6ce4b7d32bcd97cc97
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-java/netbeans-java-8.2.ebuild b/dev-java/netbeans-java/netbeans-java-8.2.ebuild
index 175fe1c8942e..20e2c32c4036 100644
--- a/dev-java/netbeans-java/netbeans-java-8.2.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 0cf55fb489c8..1834bc8713a6 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -3,5 +3,5 @@ DIST 6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip 7788619 BLAKE2B 3e
 DIST 9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar 125083 BLAKE2B f5d82243a58e8dff86966d2d745ca2fd39654ba33d502cdd56ad4dcb88ca28bdf6e347dd48034bd2cb70318ff0cebc79c7b26887fcc5bad430c8ab13f9acc8f5 SHA512 52601718cefae5570412b801999b5d6799ff6425d6a090323c6dac80248598b21f8ecf09c31e6a7f73f6ca7de9e99bdd3e79f539d96c5e1192fd2958766d212c
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-javacard-8.2.ebuild 4597 BLAKE2B 1c2d763b4a6e8fd54d4765baa027e533bb9406cb0e37de7fc386d36b10488e2d0f61e75582a0d7a5391387fe78bb3c250724ae169f31db543349bc011258c050 SHA512 2d0731bc6c1776b17a16ed8b3ed38407ec214dd477d25e225d104d16380e0bbf516494fd546e3dbb44d5fb52ccf387e2eef5817c505b69f1aecf00f8c082ae32
+EBUILD netbeans-javacard-8.2.ebuild 4597 BLAKE2B ec30097b59f82426e3bb1ca8370365150d374d32c13af558613c15612512211a5be4c220790c42153b4803ab29fa7ecea7db9e295adff6872690e2a77d27b0a7 SHA512 08db9582217c6b8d1c151e2e04d985a5b2bb4b2321b56d1ce7e782480e6d56e77bba288513457a13e5aefd828f9b33d8e663124b760ab00b40081f0d91022114
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
index f0be557f92b8..ec2f0e662487 100644
--- a/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
+++ b/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -62,7 +62,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 88573ca1b761..279c592c77c7 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -6,5 +6,5 @@ DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 BLAK
 DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 BLAKE2B e06cc8c989a3ecf5c501ad3e187b8f2afcd7a4838345812b52e0496a2a68b481d2f4406bde00f9cad662d94d97494769d7ea3a2686cf62d3691d953d67701010 SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-javafx-8.2.ebuild 4343 BLAKE2B 8f895be89ea2cbc02f9db8ae06fcb179ce37a8c107ef2f9ea6b8523c2bcb654e4e55e5dd85e7013d02c376083bdbb932c0fd26a284f4468448737602529c1141 SHA512 c5a5a06446883660cb5b97c719e34e41ac4fce1576d2f942998ea4915052d1b42217b5365ac2cb3b3ed462fcefac0d338dd3fad3232ae76868dc70256ced63d4
+EBUILD netbeans-javafx-8.2.ebuild 4343 BLAKE2B 3aba488e1f9745ea11e9205a7058338d60db2378c8cc05c0620871b1ff89c0d9310c631dc7b686787870ec468b1ad9b04e4cc7dedf64a0b8542cbedd004d080b SHA512 b883be9a1d77a1933e719a7713ead18206dc3301212cd23a9cc88aa7d06560139e95a2dabf53fb2a5b926d0ab085ab266751d8aed646a97d6ea9fabe7cb9aa19
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
index 4e35c021f66b..1709fa057411 100644
--- a/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
+++ b/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -62,7 +62,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 0dfc4de8cb73..91b436c23ad7 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -1,4 +1,4 @@
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-mobility-8.2.ebuild 4038 BLAKE2B 4dfc8203a8de30005030141ea9ba379ee82b95bc83245694c8f3d7ec0a60825dc68e25769ba05935c96026f85a202770fa4eba588361ecf90f365ccc3f7075ef SHA512 3513d901337d40f7022135428bdb47342965e983066f57d8e05eb623fed7d2ee32226d7c38da7d03f349cb1d53f2ba05e3b7d0e59aadbc2341173c8f9be59384
+EBUILD netbeans-mobility-8.2.ebuild 4038 BLAKE2B 1811d5c1e5e59ffed5b0846dd862f0397d974ef10af800cfa873918f1e78cf5e09a3a2e92f3b9e6768dc31dba1d54285632253eb620b8163a86219dcfcfc5dd3 SHA512 efd620ee98dd6482f87a01f6b114f867a67de9e772b1ae6759d71ba6deca253492759fdc1c674d1b57ae30caa4f7c0f53ddde103d370372acbe886cb1f20bebf
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
index c2c95b3be78e..46b758883587 100644
--- a/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
+++ b/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -53,7 +53,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 3944c0584d58..c69bd78f4c52 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -3,5 +3,5 @@ AUX 8.0/keychain-support.patch 872 BLAKE2B b03371474ee9153bd9d2d1008089e1c1730b3
 DIST netbeans-7.0.png 20011 BLAKE2B f502517c7495b888f4942ae0aa7ea5206205ecadf13ffb5abb7470abeaf27db84dd5a8ff39e540c3da701c3e56f6ba196933f00ba38aa13d022e5b4d0cc19eaf SHA512 67bc2673f3e770bbde10587e68890c3091ef38a850cdf48ca73e4c1a288246e1f757fd4ef1c7b052b6137f31fa6044c9bf3ea5a2a9e0ceaede132c106a746113
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-nb-8.2.ebuild 3738 BLAKE2B 8d98deca46edfb9eed1c91aae9d4314e0e8c47deda0b419f9a53cbe09bd335528c439cd4504d97067d1b7d67845b7c7d506af99cad4a46df2ee01d40add54c12 SHA512 26a0943335e05cfceac532ea0feecd0a1fe741cb898d9fa46356f898b9b56f08bceac5bec4d4599f5338ac7d0490b2f92567ab8dc914206ae1b4682ca5f683b3
+EBUILD netbeans-nb-8.2.ebuild 3738 BLAKE2B 775f43c9e5ef5ecd71615e9ff5b13a2338a828b02e31d3fcf9d99176011d342c98f69e478e1235ebb830088b4e9d50b9c1866c398c04fb0f93d857a3a9ebb473 SHA512 729097b8a574ea971c8010adb3387aa3f4a54773f565fc735ed8ccaf6294cba8254f2c325734c7d7f9d1cf16cf1f9bc9d7ca5cb323294eb541b8f16442bdfb3c
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
index 490cca860c9a..9025ef03d113 100644
--- a/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -46,7 +46,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index dc6571b22d0a..3f0fa435ea2f 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -3,5 +3,5 @@ DIST 3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip 4593 BLAKE2B b
 DIST 472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip 510273 BLAKE2B b66803089a422d55a9187a51e3381f6bae6eb80d602b4bbe51423fe46065c5b8ff23ed22f8b55e3743d851b6a6c603c09daf4233e244fb5ce87ba9943e460eef SHA512 d28f46ff8cc1874108a9a2ef37b6e41b40df27cd36eb976e23d75ac2fac36dcd08f8a18a26d62126bd982724e747cdc9c344f8c25cf3cbeeec9194e0d4412341
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-php-8.2.ebuild 4044 BLAKE2B 20daf612c4adac31e5a13a13fdee46bf39c3d7edece81ad9563a23e73bda8fbe033cd8205ef39b3fe2b1df2fc7b73176013fec25f0764f10c1aa44704ab8cec6 SHA512 3d816ee6ae286b10692bb4b88f46df3150f2288a83e6652666f5beb3f6d212acc9148a32447f00865a6cd288050e02900e72d588736b77ecb5b5b45579c4596d
+EBUILD netbeans-php-8.2.ebuild 4044 BLAKE2B 57d223814a428803bfbb458c5e2f8da59b396d34c258ff91b27deb0b4dbccbda7cff728a43cf6c1b65929f22ddb6a49e7c17dccba9fafb2f05565a495df8541c SHA512 43f9b754382b1496f881d3a2d6f9a1ea2a04322d32cf876b9fa6dd1e9c012e31d3359f8a8828908a973f2eb9c65723f5d34e62a02d2a1b5475b87324cf02cdd5
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-php/netbeans-php-8.2.ebuild b/dev-java/netbeans-php/netbeans-php-8.2.ebuild
index 29a09553b8b3..c4aaafc0b777 100644
--- a/dev-java/netbeans-php/netbeans-php-8.2.ebuild
+++ b/dev-java/netbeans-php/netbeans-php-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -57,7 +57,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index a9f5f1ce2966..4628461f1b39 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -1,4 +1,4 @@
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-profiler-8.2.ebuild 3098 BLAKE2B becd2e864a1725c4004cb83987d73fef830991fc18d7c2ccbf8fc254b876aab82d5f70bbf3e7abd0290c20a8fb12fc71d1983d47a3cf0caa370a63d8c13b9da6 SHA512 4bbb984e5b5b2371ebd2ab4a5bae067a3bde0038042e18f6bd0b4918defbd836eaaf21516e6286c41d4988513feca61caf5acbcf06e70f38a014c941b38d3c87
+EBUILD netbeans-profiler-8.2.ebuild 3098 BLAKE2B 8e9d62d5153ea361a7d32e3849eea4db39703296c08dd2e1c3313a4b560274351c7651d187726c6376d2379f5d50d9f78cb13b81bb45735f3cfb97ae2a60fb4d SHA512 9a501315ac528476b7fb610a5ce4a74b820c9098adbffa880b1750ead5066006287943abdd4292f46134013f9ef09708b3e4cb322ebb9ee9382fd39c9e5b9fb0
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
index c4a13c6a1883..f48d6c544a99 100644
--- a/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
+++ b/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -49,7 +49,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 23a8f5b345da..4961c056cb6e 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -14,5 +14,5 @@ DIST CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip 2179489 BLAKE2B
 DIST D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip 912402 BLAKE2B 8f128e9bf4fa6811d085316dd4f2ce38e309dda300b59e1fa614f2cdc75fd4b19cc46a6d91fc96f3e418dfc2008a585aaccb94a14b6a057090339a7ade8debab SHA512 0bc0a65bb7b6d78a003634027c93d842e2f1d928fcfedc9b12db4b508752b06931429a4a580a08b5fd5e666e4f3a208aed86eb21e81377973b43cb77b48cf4ce
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-webcommon-8.2.ebuild 5868 BLAKE2B 454e3bfb3f7f51e53e225203c6442497e4a979e125882b66709f18c216c52fb93baba1a984d98e33c26c49cfe2d0d9f1366d7ec3cbd53c2a304005e965d39e69 SHA512 aaf5e6b49180411c393d19a64b7a171e7bb907320e740ab26d72701e1daf46131fd3de17d220a2100c74503b8f21629822638f7ce2f72bde27cd1fa5ae68e173
+EBUILD netbeans-webcommon-8.2.ebuild 5868 BLAKE2B a7720483ee3105fe326deb68cd204751fcfc5a78addcd2be873cd4567bc3925ecbd0640887d28011e28ed06c66de9e02d856887df246c0018d86807ccfba00f6 SHA512 b0973af70d56fcbac4e5b22706069acebe5eb46435212cfa5163773c1070ad66bcc0eb7f193703aee381c38a62d4cf357e0457edf140558455dd30126635917d
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
index 0cca60b3b7ee..0ea4053b2eac 100644
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -77,7 +77,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index b6af1318ad63..6d201073d4c0 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -1,4 +1,4 @@
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-websvccommon-8.2.ebuild 2347 BLAKE2B a242d5d711fcc629dd5e41fef2923e6456147a715c93da0a03cdd60cc72f8836f286312039f50b74bb4702fb3be1456a2d9949407f792d04dadb4ca39743d791 SHA512 a86aa006fc5006f3ffa538eedec5839eaa7d3c6878e06e5c03b7458313bab252b49513a8e82167e1624c5a66e40518e16653483aa53f16d7ba052de9cbf2e1b8
+EBUILD netbeans-websvccommon-8.2.ebuild 2347 BLAKE2B 95292b97d5662f360755c96b55f06e4838d90c5b0735dd86fb93039d3079eb4969bb3ec0d3ee72507ab892b83afdb55617b77f5adfdefb6f0d30efcbdd805c4d SHA512 dd69b56961f5684c49d93ad35d4cfae355e4705406f4c710819fed0d7789e241cfb97fa44b1973c7e0ec4b69cc7cda3ab860acb8f3891c029f11fd61a74cea8a
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
index f288a9052ec8..5ab104d7c79a 100644
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -44,7 +44,7 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-8.2-build.xml.patch
+	eapply netbeans-8.2-build.xml.patch
 
 	einfo "Symlinking external libraries..."
 	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index 9bef71ed39e9..aecca257cda8 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -3,6 +3,5 @@ AUX 9.2-edition.properties 74 BLAKE2B d468841c782fa7bf1b39cbeeac01d983a8d6891a13
 DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccdc294e782ac0935010a841405fb21663bd35853042c53548991dfefa7f789be292fe8497a29253c87ee09 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a
 DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e
 EBUILD saxon-6.5.5-r2.ebuild 867 BLAKE2B a5879fbeb51e113e05dfbfe4dff8088e26621278c76f83cde4b47b6744cf83e9fb94fd25f661f25e57a3f8a5d513d903f3808dfb6fb6ba79d6e450cbccb03b5a SHA512 a8a6978c47998380b6c7ec09f7102584007aedd829cd95d0ff629d2df9062c5eb46ceecff88b2bb0fa575907810fb21fa14dc1253ff0da3f9962687935f53df1
-EBUILD saxon-9.2.0.6-r2.ebuild 1966 BLAKE2B 305d50270c2603fa68dac2f6a43a3d1c6ee9ad0d7d964bc6974364fa5faa907e76643add8a25e8057bf69d521c0721678ebe05a1c17873ad585fb2a311273a95 SHA512 1485a7ae386034895a82f2ac638fd843df9c913cda57fa78b982b5b9900053fb4f57935cdcb33038ecc874908f68f90c4a1b7142c8b41591da35782c3013491d
-EBUILD saxon-9.2.0.6.ebuild 2191 BLAKE2B a383bf6d0e8cde78e45945ec028fa2fe5ff0a21051b4a05eb325147c88adc0376b6c250339da2fbcc99a8495d3975845aa832cd22c2cb235e4747cee333ba70d SHA512 c20b14dbad9faf4306a7ac0a1ccb3c49388197521185e4d6bbc3b9bfed9535432105cb3645071ba4ca0ed2faf1a7e40b2f6cbcf1e48abf1d6e305a28fcc29f85
+EBUILD saxon-9.2.0.6-r2.ebuild 1965 BLAKE2B a6fc49263e9322f3172a97a85721c614157449f3f9582ac9a74a5649c28078fda0588bd4ae3dea4367aae8f7b06eba69b64dcd13bac690303088755ba8298eef SHA512 204c2924bf4a4e9610a8b3e1377c47185129d92f714358df1f41c8a5191b15f9d86e74ac32af3c36232b411e1273ba870b74da464d5b76efeb1d3df941e07b9c
 MISC metadata.xml 311 BLAKE2B fdce161da5c8394b66ee6b1bcebbccd863cd5e70291afab04400c4d806afc955f803b5c5aa15601157f2784e434baf505dcbebdbff9817fe960961f8108d3b63 SHA512 2fc12b71b9e977a095610f8f784f19252d44e31442cc5d5ce513f601a2394f4bf491fc9065de88bbf45afe7b8f1ca33ea907e31aa26875f48846856f1bf51126
diff --git a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild b/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
index 8851b65890bb..d538db728ef6 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}he${MY_PV}source.zip"
 
 LICENSE="MPL-1.0"
 SLOT="9"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 CDEPEND="
 	dev-java/xom:0
diff --git a/dev-java/saxon/saxon-9.2.0.6.ebuild b/dev-java/saxon/saxon-9.2.0.6.ebuild
deleted file mode 100644
index 9cb4a84da3ce..000000000000
--- a/dev-java/saxon/saxon-9.2.0.6.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit versionator java-pkg-2 java-ant-2
-
-MY_PV="$(replace_all_version_separators -)"
-
-DESCRIPTION="A XSLT and XQuery Processor"
-HOMEPAGE="http://saxon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}he${MY_PV}source.zip"
-
-LICENSE="MPL-1.0"
-SLOT="9"
-KEYWORDS="amd64 ~arm ppc64 x86"
-
-IUSE=""
-
-# virtual/jdk slot for external javadoc
-JDK_VER="6"
-# dev-java/jdom slot for external javadoc
-JDOM_VER="1.0"
-# dev-java/dom4j slot
-DOM4J_VER="1"
-
-CDEPEND="dev-java/ant-core
-	dev-java/dom4j:${DOM4J_VER}
-	dev-java/jdom:${JDOM_VER}
-	dev-java/xom"
-RDEPEND=">=virtual/jre-1.${JDK_VER}
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.${JDK_VER}
-	app-arch/unzip
-	${CDEPEND}"
-
-S="${WORKDIR}"
-
-# prepare eclass variables
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
-
-src_unpack() {
-	unpack ${A}
-
-	### fedora-inspired remove
-
-	# deadNET
-	rm -rv net/sf/saxon/dotnet
-
-	# Depends on XQJ (javax.xml.xquery)
-	rm -rv net/sf/saxon/xqj
-
-	# This requires a EE edition feature (com.saxonica.xsltextn)
-	rm -v net/sf/saxon/option/sql/SQLElementFactory.java
-}
-
-java_prepare() {
-	# <major>.<minor> version
-	local version="$(get_version_component_range 1-2)"
-
-	# generate build.xml with external javadoc links
-	sed -e "s:@JDK@:${JDK_VER}:" \
-		-e "s:@JDOM@:${JDOM_VER}:" \
-		< "${FILESDIR}/${version}-build.xml" \
-		> "${S}/build.xml" \
-		|| die "build.xml generation failed!"
-
-	# prepare creates the dir for properties
-	eant prepare
-
-	# properties
-	cp -v \
-		"${FILESDIR}/${version}-edition.properties" \
-		"${S}/build/classes/edition.properties"
-}
-
-src_compile() {
-	local gcp="$(java-pkg_getjars dom4j-${DOM4J_VER},jdom-${JDOM_VER},xom)"
-	gcp="${gcp}:$(java-pkg_getjars --build-only ant-core)"
-	eant -Dgentoo.classpath="${gcp}" jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform
-	java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query
-
-	java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc build/api
-
-	use source && java-pkg_dosrc src
-}
diff --git a/dev-java/sbt-bin/Manifest b/dev-java/sbt-bin/Manifest
index b8bdee7b9c0b..a9019f8dce8d 100644
--- a/dev-java/sbt-bin/Manifest
+++ b/dev-java/sbt-bin/Manifest
@@ -4,10 +4,12 @@ DIST sbt-0.13.6.tgz 1066241 BLAKE2B b4cf59409b82fc851e9978421b324da549dd376d89b3
 DIST sbt-0.13.7.tgz 1058904 BLAKE2B b199c28b97364434dc7b7d3a25e9c6598160c9900621f4c470abab6b415c66bec9ba2d573beee5064efc2a6466ee79acfea53514b29ab0994b25353199fa7c40 SHA512 6022ed88b2d25f947ab068b7971e51fdcf8df77cea3d0a03eceff6df4442f013fd13cbeda11cdfcc35cc23ee85e1661986c53921f48d4350e2fa8bf0ae5f3e1f
 DIST sbt-0.13.8.tgz 1059183 BLAKE2B 5ad55bda946891cde52bbae0483ed3ffa7507a0467a75ae1bed6f08e7befa7dfa04c61efeeda59d31586db432cc7f406347f4f68b2c0c172516b1a4eb1bec477 SHA512 79479308c631b78b71196dfe4f8b26bd9b75727272c17432fce5ddd61a0dcaf4e261dd1eb9a8376b1e7a836ba6d84917819d181c35d19b543360d803193286d8
 DIST sbt-0.13.9.tgz 1049367 BLAKE2B de8f70de43aa6ccd816c90b82ee92295d7b33fd43226fadce48f9bd00c515838ae275e513ed438a5b758541a75520d86b0b6f93e3a3d01f468b3b338fe672667 SHA512 cf0deb1a5a07ce3690a831a2ee0f499a5c904cd9a9038873ab78773717a12ce4dec668e00c3dd6b89e7919357c32b26ff97a78613de5c6252b495bc7fdc763f3
+DIST sbt-1.1.4.tgz 45858350 BLAKE2B 792b05bf9bf16968c6580f070e042395b13580c6137a6592ca66bc3b02df3b27676b49364db8c6d2ec259b22b09a7e7a2d364e940890be38a96ba079066c4fa2 SHA512 7b278ecd22d4778482c61ec2e9650c8dd199c341aaaa624fee6b7f8989203de3d4dac24c4181ee08f0da50c69901321a1e11a535f0911241c9f6bfdfab5e94b8
 EBUILD sbt-bin-0.12.4.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
 EBUILD sbt-bin-0.13.15.ebuild 861 BLAKE2B c69df18ba3556eda5140032c214a853748d86ecf37e3ccbbef8774611464f9a28af4e3372cc81fca9d78b2058a06b1b58a57e93a5fe8d3fc4c25c318b16de84e SHA512 8d527e1b536e867dd105c36d5290f7684750c8ba2c345230445c75a3f53aab8d9518f92cbd91f7ed67937be807295c4f2e1bdd8714c20932c42ec7b6d5ba9ac2
 EBUILD sbt-bin-0.13.6.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
 EBUILD sbt-bin-0.13.7.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
 EBUILD sbt-bin-0.13.8.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
 EBUILD sbt-bin-0.13.9.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
+EBUILD sbt-bin-1.1.4.ebuild 860 BLAKE2B b17b66c3d6a2f845a87bba126f99050e9e3cd19dce5650d8d91968730bb79a471f0c2224eb7aeaad8df7ad6447974bfe982ce39071c647f50f3f37c9ab33d2e6 SHA512 31a2bf25148fcbf9e387f51c535dd18cba311181ddd01cb6aa19637bb6269e83f596c70fb3d4bdeedb6e7d1136886722cdc54112747f9c07d41098a9f72d43df
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sbt-bin/sbt-bin-1.1.4.ebuild b/dev-java/sbt-bin/sbt-bin-1.1.4.ebuild
new file mode 100644
index 000000000000..7d39ba4f4053
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-1.1.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+DESCRIPTION="sbt, a build tool for Scala"
+HOMEPAGE="https://scala-sbt.org"
+SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/sbt" "${S}" || die
+}
+
+src_prepare() {
+	default
+	java-pkg_init_paths_
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -v bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
+
+	insinto "${dest}/lib"
+	doins bin/* || die
+
+	insinto "${dest}"
+	doins -r conf || die
+
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-16 16:47:37 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-16 16:47:37 +0100
commit	8aebb228036d5e2863b7eaa6e319ab41c1669269 (patch)
tree	00f4b90ce32462dc8e99ae54a31d6462ea2c3ac6 /dev-java
parent	76cba73c47c8694e74377004634daca18f2d9c08 (diff)