gentoo resync : 01.12.2017

35 files changed, 134 insertions, 137 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ca9af300859d..be8ccb24c579 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/appframework/Manifest b/dev-java/appframework/Manifest
index 088fe080eb14..32dcdd414e21 100644
--- a/dev-java/appframework/Manifest
+++ b/dev-java/appframework/Manifest
@@ -1,4 +1,4 @@
 AUX appframework-1.03-fix-imports.patch 859 BLAKE2B a42eaa58f066d831ec50d07e356d7b29a31b6e3b60686b8c17a808af210fce56f731b791c42fca50cd829a7a5ae7274168e25aeeb921ca03714aa7badb70e814 SHA512 9fcf414f952d19b78d26eceee80ea8367491e29c26ef195593c54eaeeba296f9874adedca0a119197cde56a7be48955c8b6a4e78a6440c7100120354b15b1541
 DIST appframework-1.03.zip 413438 SHA256 9fad98a0b70e6c67cc38dfe9d01b00fe7b7fedf51fa50ac68e7a86d7d1c38fcd SHA512 7d24329361f0d5f2225a7248ba30b1f0db364efd93e0581e1f10d0f8e2b6354f9d578d585ff1a08b27846dfae0b805b0f609711234be616b3f0a065dc1801309 WHIRLPOOL ef3e4ea022bc3f902334255e26703bc12910f939aa87c12dd6191326c33b2ea9da3abfbf5f29d6d5fa8ad6e65af329520c7cc7c90e36407a1b7b6f384f13c8ea
 EBUILD appframework-1.03-r5.ebuild 916 BLAKE2B 7bf95c011766f287bd7c47de8b59f7b9c0de323c25054761ea132e194d5cffd1f60be2781111b9cd6a29f5efa88b9a02e6dbe71e39c07422466f00bce5134587 SHA512 86d9b9e9e20f3001c65389444312c748a89b9fd0d9d9c43e76cfa3ed957a9bd8570a853638e089b0332f2f16b1be899e0e1bd7b64186e911f026492c2ce55703
-MISC metadata.xml 989 BLAKE2B 4dbeed884171aae1dc30104c4f1d7d8a6ba2182956d1ba6b41c6c42007fa846bbe544e0106a89a02b4dca7d68afc4a56ba9feead23a468ddf93f31e516381714 SHA512 2a4de695dba3016de5df684f7ebd3a5fe25a7de02eb732a3db3673fdce90c358c1663aba0e11da2f2c1ec4c58be1542aa54994a38cd40cd4fdede2ea7669592b
+MISC metadata.xml 980 BLAKE2B 73187a55f372e134ba07bafd9c84d85fa7a4d8f9fb5be49f6e6840c1bb82e0e74d348c48a1079f06f4f7ee84c9b1826f6c69c3324c86ab13c26e6c68e68a8ffe SHA512 182e31f0a6cbf64e1707e08a27ac11b70a54b33f3ce717654cfa1f4435774311895efe7e9efc36c587722dc15b6c052d57a63e55a56a886bdd4f9bcaaa2ee08a
diff --git a/dev-java/appframework/metadata.xml b/dev-java/appframework/metadata.xml
index 6d7f24baa1b5..d217a05000e5 100644
--- a/dev-java/appframework/metadata.xml
+++ b/dev-java/appframework/metadata.xml
@@ -6,11 +6,11 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription lang="en">
-		 The JSR-296  Swing Application Framework prototype implementation is a small set of Java classes that simplify building desktop applications. The prototype provides infrastructure that's common to most desktop applications:
+		The JSR-296  Swing Application Framework prototype implementation is a small set of Java classes that simplify building desktop applications. The prototype provides infrastructure that's common to most desktop applications:
 
-    * Application lifecyle, notably GUI startup and shutdown.
-    * Support for managing and loading resources, like strings, formatted messages, images, colors, fonts, and other types common to desktop applications.
-    * Support for defining, managing, and binding Actions, including Actions that run asynchronously (in the "background").
-    * Persistent session state: support for automatically and selectively saving GUI state from one run of an application to the next.
+		* Application lifecyle, notably GUI startup and shutdown.
+		* Support for managing and loading resources, like strings, formatted messages, images, colors, fonts, and other types common to desktop applications.
+		* Support for defining, managing, and binding Actions, including Actions that run asynchronously (in the "background").
+		* Persistent session state: support for automatically and selectively saving GUI state from one run of an application to the next.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/commons-primitives/Manifest b/dev-java/commons-primitives/Manifest
index a425c20bb3cf..efd29867091d 100644
--- a/dev-java/commons-primitives/Manifest
+++ b/dev-java/commons-primitives/Manifest
@@ -1,3 +1,3 @@
 DIST commons-primitives-1.0.tar.gz 172369 SHA256 96927b484b8cac7e33612469099e7bbd7139cbc79666d5612a32c997fa671ac4 SHA512 239752a615f3a88049d6c85326a67462362869eda421ab76975c0906d811c970c871042769d851a4341c8a06b501d6b12fd1feba74d83007b2dd73370c5b3195 WHIRLPOOL 725644e8ef915e77313dabf6f397a54b857265bcf9d284b4444457d3872e6982cad3670101f1e1576158b1ceebf809348bb2dec2cecec87796a22595ace03129
 EBUILD commons-primitives-1.0-r3.ebuild 621 BLAKE2B d618f03aea9a824f8e2faa19888ea8f3b7bf39365d6191bc2bd7c1318de4912eb1f8f389c637df5de5510da84b2556b418cbcde6e1a590933fad6103b58c2b7b SHA512 93bf0f7ca0deb92a7f15c719713b437ae83361c799a3f24bab33e37991775d04f4f36e4301ba00c6e8723aab52b8b21491877da7abcc0838817d623d01b11d56
-MISC metadata.xml 584 BLAKE2B 724b6a76ebb74c026fdb44ccadd09c78ce80353fab3c8d80754a577567e261c9041edc8d43a8eee5eb8d781811039379081193c954d3cae562a45b891102ebb7 SHA512 f8f968b71c12c0e475c7611ce5d994b320621c92bb04a061c5ce9bc8b77581f16f269cb8f8f2a66e79bcc335a1aa15e3caeb35f6f80742c6e751aef51ef78d6c
+MISC metadata.xml 594 BLAKE2B 019c3e2a8144043dfa99f87db088bd5ea453f17d8ec2d7023ce911394587bd27d8b595176c923a34a3cb38900a9b3eaa3cf791787e53e9fdeea610a1f54ed2a2 SHA512 575b9c4f8596e075cbefe7ac97e7f1fab1ecdfb38fc4e9e08cdaa23ef8e0ba46d7f3ea5f942aa79699653d7184e00bc2943e446ff737ead6c7984a89065cf334
diff --git a/dev-java/commons-primitives/metadata.xml b/dev-java/commons-primitives/metadata.xml
index b8e7fb848f74..a10f35ee50c8 100644
--- a/dev-java/commons-primitives/metadata.xml
+++ b/dev-java/commons-primitives/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-
-<longdescription>
- Apache Jakarta Commons Primitives provides a collection of types and
- utilities optimized for working with Java primitives (boolean, byte,
- char, double, float, int, long, short). Generally, the
- Commons-Primitives classes are smaller, faster and easier to work with
- than their purely Object based alternatives.
-</longdescription>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Apache Jakarta Commons Primitives provides a collection of types and
+		utilities optimized for working with Java primitives (boolean, byte,
+		char, double, float, int, long, short). Generally, the
+		Commons-Primitives classes are smaller, faster and easier to work with
+		than their purely Object based alternatives.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/ezmorph/Manifest b/dev-java/ezmorph/Manifest
index 7b9806250f44..875e447e4f26 100644
--- a/dev-java/ezmorph/Manifest
+++ b/dev-java/ezmorph/Manifest
@@ -1,3 +1,3 @@
 DIST ezmorph-1.0.6-sources.jar 68198 SHA256 81660eed757f05a9d907e4247ce3fca4da37a9661ff0feb3344b838e3aa03843 SHA512 a8f88ff38e2d2815ee64436af87c4dc5a9858edec729c8db3ebda6d64d2fe2644b5e56deafedcf242caffa523643ccb978cd775c85793df6e2e5487c6d878cea WHIRLPOOL 47e5c72a0c4dd9dda634830cfa7bf64ffc8bb64bb0199f3ce42d75e1addc6787173583520c1fea755ad721e758dd24743095ce61b023589ee8e55f5e7518f371
 EBUILD ezmorph-1.0.6.ebuild 960 BLAKE2B 851ce459b6b7c177443be776a96a3e7d7e97c836fa00f0090f0327616031259d731a75a21d72536de434a277db1b1517c1de2e0b0a60743dcaf0631189adf912 SHA512 50abfd78fbe1afa2d6dbceb2f2b0f89ff2a40c1c0462f11581afe964aa7cbeb40565c2a62f5753bcaed768a7b4e2f27a10bcf2ebae4435fbf2de0ab67188f033
-MISC metadata.xml 742 BLAKE2B 05a2ce39e8d8fe1d4b72006adab43b57c86c664c4860621f4f805b2d966b1077c7026fd315e3efe2effbb86c84428154f9e6f0a570c9415e6debf4d34c638664 SHA512 41b63dd21a20718678dde8fef5e36cd2b563a6212f928d1c5f516d80306d961064b07e85aeac5913afe81c27d57814054fb095b155db0899fdc4f28dd0e40ff3
+MISC metadata.xml 680 BLAKE2B 9137d55198fb79ceb04257fe148118219677862fe68032439c0564eff62ae82534597572730000e3311b85920275c198221a182621f373335d29e061b2d0e021 SHA512 08bd4ceaa2a3cc59113e92e3f89a39de8cc17677456fc78a2b12aa9de1def12d521cf09d44e9c2369bc3ec4208a7df7cf54ae14757d4d23c3b984c8515871f61
diff --git a/dev-java/ezmorph/metadata.xml b/dev-java/ezmorph/metadata.xml
index dc291df04bae..c4670b98a2e4 100644
--- a/dev-java/ezmorph/metadata.xml
+++ b/dev-java/ezmorph/metadata.xml
@@ -6,15 +6,15 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription lang="en">
-        EZMorph is simple java library for transforming an Object to another Object.
+		EZMorph is simple java library for transforming an Object to another Object.
 
-        EZMorph's key strengths are:
+		EZMorph's key strengths are:
 
-            Supports transformations for primitives and Objects
-            Supports transformations for multidimensional arrays
-            Supports transformations with DynaBeans
-            JDK 1.3.1 compatible
-            Small memory footprint (~76K)
+		Supports transformations for primitives and Objects
+		Supports transformations for multidimensional arrays
+		Supports transformations with DynaBeans
+		JDK 1.3.1 compatible
+		Small memory footprint (~76K)
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">ezmorph</remote-id>
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 3b4dc37ab138..86b1cbfc5e01 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -8,4 +8,4 @@ DIST icedtea-web-1.6.1.tar.gz 1776222 SHA256 a9b46ab6c9dc303c89651143596bc5abea2
 DIST icedtea-web-1.6.2.tar.gz 1824557 BLAKE2B 897155b528a873b2e0166f47973136c5ccc640fa9da26c934dc93deebacf2b2d714cd70943fc4f7eb2c596542e97656d844638dbd12f407f917d30c9cd75f4d7 SHA512 32c9618a575bf05d3fbe5fec3f8429d55036acde70bf7ccf40b59e14eba775d1f561640acbf673b1737a8c5c3a8eadb74e8f1bef525cfa6060e3f1968d45b3f7
 EBUILD icedtea-web-1.6.1-r1.ebuild 2245 BLAKE2B 86e91baf340e3ac8fd2e88dbc16b3f0d04565a0a5011167be5487676c3821b142b4b187167ee4eebd519310e61c8facfc680413cc3e1bb347f66b08ab4bd020f SHA512 37c9aefae8a58b59e455ae6614d6e57367f5f461f3f71c0bb1cdb8d5988fc3b513ec2977a953af7b1f20e0e4a8322413d8f8dd8feecb576768ec1624d99b8255
 EBUILD icedtea-web-1.6.2.ebuild 2117 BLAKE2B 06aadba621c1695c854f6070e337766e1a60f6ee07b5e47a27a6d8fbfcfdce841f93285d853179d915c5e2497688f22985a83e26263ab00a7096411e5517f60f SHA512 55f30c8352625da7ac0d2d96c627903e60a4953f0932ceaca93967a5eecc3c22e09903acf8fd722deaa2ef9a60ce356c2d1db750382cf7287080bef28908b567
-MISC metadata.xml 668 BLAKE2B 33e6fe95750952aefd6cf8c209a6ec339723a47face6ec2ca7c02c98744544963cd7edc840b211507c4b1dbb0d8d8a1f88f6c2e8a34b057e484289e6f38112bf SHA512 59b016e44c6a594bb597d7952e62346f108fc082e74fc17639580ef281c05513bbbfa50f362427f969e320f8f9dbf647c772a5760ae6045e6092f3e617740ed6
+MISC metadata.xml 653 BLAKE2B 4b0309721007539cdfcfc155039efd0dfdf2bcfccb1673cc4c930ee4267e73b5aa1c29b777a139dda6bb1c804fe827160366f59709843e9a03f66ecad41b3c8d SHA512 0b0cc5e6a5226dce345c2ebc01df0459ebaf4dc37d5241748bcba81d80e0429f599ab41d7a3e7020c581eb0c40825f07ad37e5340dbf643240ebb9830c0d500c
diff --git a/dev-java/icedtea-web/metadata.xml b/dev-java/icedtea-web/metadata.xml
index a073aa0c3e71..50b2caefc775 100644
--- a/dev-java/icedtea-web/metadata.xml
+++ b/dev-java/icedtea-web/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <longdescription>
-    FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea.
-  </longdescription>
-  <use>
-    <flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag>
-    <flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
-	<flag name="tagsoup">Depend on dev-java/tagsoup which allows parsing malformed .jnlp files</flag>
-  </use>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea.
+	</longdescription>
+	<use>
+		<flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag>
+		<flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
+		<flag name="tagsoup">Depend on dev-java/tagsoup which allows parsing malformed .jnlp files</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-java/idm-console-framework/Manifest b/dev-java/idm-console-framework/Manifest
index c4165112b58e..69c117410304 100644
--- a/dev-java/idm-console-framework/Manifest
+++ b/dev-java/idm-console-framework/Manifest
@@ -1,3 +1,3 @@
 DIST idm-console-framework-1.1.7.tar.bz2 708770 SHA256 0d3eb64b2a7ce349add244b1544fb18a3dbf04c40b09ef91ad1ad04b44286d5c SHA512 ce4441cbc9917f6ffd0ef6ced44c7ebc542c14db60e7c6eeb844f8c68cbb15fe533916b9ea363d1e865759138d92d38365e9172206c7cd0fa385f4bf443aa739 WHIRLPOOL 1fc8f1dd66e61ed3149e0cf36a76b22794e2836cf3ac95c7172a85bc4b69476d0785f2cd2da05add7e9e3db52acef89a86273715339798f9cf71d8d9f8be558a
 EBUILD idm-console-framework-1.1.7.ebuild 1597 BLAKE2B e61a3819ffd6519a2aaf1b67c36c69a09ac8d5a0706f6b478d7f21d9b9b937ffd92c60fba01b4ad64f2fefc16dae9fde8957d24d13c5a8fd5aada236fb84b6ee SHA512 d9a8e630971d16262b9a519f9bc4853fa2676a87c363e944083d9d81e8fc718bb99eadbee679110e9795d711f4e6942520c93dcc6de86294c3301762e9065095
-MISC metadata.xml 703 BLAKE2B c818c0e9601aae6b92c7efb19719fe2ff30027baa2e72e079bfc18887d02beec575b45ec76d65bc1a98892a9c85623a7d5faf05b0f93d313e8ca1ab4e0566147 SHA512 1a753d0ea695e27f608613671beba82f8a9c080a7bb45858ce186b32b54d508d18823fbaa1025eed00f2f3259874b55f6154c6b5ddb257e770488f433b2a326b
+MISC metadata.xml 695 BLAKE2B d554e75ec7c73c07b17f448c4e5c790cd67399c0d3be59475c645aaa42429f0b3a638bdb60a302669f17f968f4fb22c6c61736daebc991f6526757476b39e801 SHA512 6c5a39287e841354ff465b1b1d893c446fe4ca54e18b5155e39fedf5d15183bd6724714254702b46b6d99d76dca6e7897cffef57e3828e0594f7a3327e8e3ef1
diff --git a/dev-java/idm-console-framework/metadata.xml b/dev-java/idm-console-framework/metadata.xml
index c4db44265c6b..664e0f4d871a 100644
--- a/dev-java/idm-console-framework/metadata.xml
+++ b/dev-java/idm-console-framework/metadata.xml
@@ -8,13 +8,14 @@
 	</maintainer>
 	<maintainer type="person">
 		<email>wes@sol1.com.au</email>
-			<name>Wes</name>
-		    <description>Proxy maintainer.</description>
-		</maintainer>
+		<name>Wes</name>
+		<description>Proxy maintainer.</description>
+	</maintainer>
 	<maintainer type="project">
-	    <email>proxy-maint@gentoo.org</email>
-	    <name>Proxy Maintainers</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
-<longdescription>A Java Management Console framework used for remote server
-	management.</longdescription> 
+	<longdescription>
+		A Java Management Console framework used for remote server management.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index 852c935df282..f4bf55897966 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1,3 +1,3 @@
 DIST jackson-dataformat-xml-2.8.5.tar.gz 98385 SHA256 b28a3ebf380ce8eb6dbc48119fd827359519bd3e4311022983b595e572c92505 SHA512 ed93db9a44cacbe1638141b7336798ced03f7009da40e176b1eadcf38c83ac3bde3e2fa98efe3be1286a956db36393f925251b41a4adbc2b95d03ae6ef04b754 WHIRLPOOL 28ea218700c78e1b00f5eaea3b91d37cbcf3fc4aa602e410da1711ccd7070e347abc8ca2f2db809c3d8833fc8386a993e046b8de015e82421ff49ce60f107a83
 EBUILD jackson-dataformat-xml-2.8.5.ebuild 1883 BLAKE2B 79b971493682c3f78297382c52f01b329e283119c8436ec28d1f261ab701cbe203260a278e043f39821cda88e7c1a4da24d75340bfdf640c022c6fbcecb25482 SHA512 dfd8cdf55948cac019f840be80c2111bb0159480f1c4306ce96db705f5e8011a60a57d1d298dfc392e2e75532f16be3575cef0d9e45821d77feab83878593c82
-MISC metadata.xml 856 BLAKE2B 4b32c8ff05917ebb08b723f4d258b2ead719292a78350450eb5c7be35a7db0766c9ef5419d96c2949a329e2020f3caff0dc84ededa5f72788891d35f7551c244 SHA512 95c3036a148dad86a1fa885fc024aea09e58948a3c71aff79bcc22a4aac599e60605938090a4659fa224e5983b811bd412696c4301c9ba31b28b16476f383966
+MISC metadata.xml 854 BLAKE2B 171d08b86695c1dbe5f08993a38cd6198a4aa381f20574f89332bcedd0577539f8ad5a6caa90a92a4bb50ea16e362ead6a8d57c1baac957ddd5c15da699c0a8d SHA512 a4b26143c0c231ef517dd30f28a76f83afaaee4e42d45bc6337875bf822eb1965c2c093484756b40772fc022d666def4d86bdc2ca3012fb10dc77516131ae561
diff --git a/dev-java/jackson-dataformat-xml/metadata.xml b/dev-java/jackson-dataformat-xml/metadata.xml
index 29d934574ee1..fc7bd29f5460 100644
--- a/dev-java/jackson-dataformat-xml/metadata.xml
+++ b/dev-java/jackson-dataformat-xml/metadata.xml
@@ -6,9 +6,9 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription>
-	  This projects contains Jackson extension component for reading and writing XML encoded data.
+		This projects contains Jackson extension component for reading and writing XML encoded data.
 
-	  Further, the goal is to emulate how JAXB data-binding works with "Code-first" approach (that is, no support is added for "Schema-first" approach). Support for JAXB annotations is provided by JAXB annotation module; this module provides low-level abstractions (JsonParser, JsonGenerator, JsonFactory) as well as small number of higher level overrides needed to make data-binding work.
+		Further, the goal is to emulate how JAXB data-binding works with "Code-first" approach (that is, no support is added for "Schema-first" approach). Support for JAXB annotations is provided by JAXB annotation module; this module provides low-level abstractions (JsonParser, JsonGenerator, JsonFactory) as well as small number of higher level overrides needed to make data-binding work.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">FasterXML/jackson-dataformat-xml</remote-id>
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 13d33127052e..2e7605def92f 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -3,4 +3,4 @@ AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1256 BLAKE2B d1da7
 AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227d2eb0edede37650bb8dfa1c7a8e9a18109f34eabfb5ddc7b9db67c2922403b0448997cc96d8e83c96b62974b25da22a624d91dc500cf SHA512 c058363d17e0594ccce355183358d016acf8ec06dd88ff3dc3b360d143cd56fd1a70b5d7d9f5bf774451ea0eed5a78752c8b3fcc32422a1a97d52eb43e057e91
 DIST wrapper_3.5.25_src.tar.gz 556678 SHA256 3cbecb7f2101eda82125e3649e3245fc1e7b4b4d6501b479990ea8b18ac6450b SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4 WHIRLPOOL d6bcf8aa40525e80e7bfeb927b690cd818c69da276a0d6cfd2b6a37afb88cb0b826485fc25cb76fa89d7c6227e49735f31361641f966944caba5ee2cec44bec0
 EBUILD java-service-wrapper-3.5.25-r1.ebuild 1476 BLAKE2B 8e3b5226a58ba3c6eda8edb566460b34744edfb11abb31f768ff949e7a4759660c9e3bfa578bb2c68c62a183ba108052635049f8725a011c6f1f1dfd1fccd3ba SHA512 ed5b5d2fdb8de0f97e617dc387fd42ea9e310841bb45dc5c17b38057743ed91a6b862b83aaaaaded5d5a4a85ba67ca30fbc1364c55f8c94428f51bb33122d10e
-MISC metadata.xml 660 BLAKE2B f51923b1691b20462ac97c3695c2e75c385bbf1843032d9dfdbe6f7a2f0d86ab0fb679b508dfae1e289237f6c2b1c1fc4b3154d22897998455ba730ab69e0dc1 SHA512 d8b4d0f62b3c484d128b9a087dab64dcfe11583eb6c6f380607cb9536cbe1854701b60bbaa11377c6fd326b4d01d5b2011a96e4c4402639b2de038f092b6b2cb
+MISC metadata.xml 639 BLAKE2B 835791890bc6ee84347d2fd82601698b2c1c516b46971df7b567f2000b41ed065bc3bcf3fafb1a97a15ae6ef3c37397580079de48ca56523779f055a99eea8d6 SHA512 4df27ebd9d7503edc1c62e311dbf564bb991963820753df523459baf8e0d65e7464e6b42dbbe1ee6649791c66dae552991eed3cfa1e8e2d100ffe512a8e0df6f
diff --git a/dev-java/java-service-wrapper/metadata.xml b/dev-java/java-service-wrapper/metadata.xml
index b273b002325c..20395dafad7c 100644
--- a/dev-java/java-service-wrapper/metadata.xml
+++ b/dev-java/java-service-wrapper/metadata.xml
@@ -6,15 +6,15 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription lang="en">
-		The Java Service Wrapper is an application which has evolved out of a desire 
+		The Java Service Wrapper is an application which has evolved out of a desire
 		to solve a number of problems common to many Java applications:
-		
+
 		* Run as a Windows Service or Unix Daemon
-    	* Application Reliability
-    	* Standard, Out of the Box Scripting
-    	* On Demand Restarts
-    	* Flexible Configuration
-    	* Ease Application Installations
-    	* Logging
+		* Application Reliability
+		* Standard, Out of the Box Scripting
+		* On Demand Restarts
+		* Flexible Configuration
+		* Ease Application Installations
+		* Logging
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/jetty-alpn-api/Manifest b/dev-java/jetty-alpn-api/Manifest
index 1cc715d2285c..3fa3f0953bc0 100644
--- a/dev-java/jetty-alpn-api/Manifest
+++ b/dev-java/jetty-alpn-api/Manifest
@@ -1,3 +1,3 @@
 DIST alpn-api-1.1.2.v20150522.tar.gz 4246 SHA256 d6cb4ca709fee42a0f551447fbefcf66a483c78487923e671c6c553b57f3bb96 SHA512 5c7cedf80bf7b3e27fe365df2fb1a2b0f4eb5d94416f54565c960036c73a79aaee50fb7d00a0a856f2808be7dafa921b8ad89772101ff7bd97fe452a0e395e79 WHIRLPOOL b05a44bf094bd3f87699c8577ddf14e1942145464fce4caaf19a6bb7766d35851605303b25eb3caad98c0f1767fb142166e019fbe2990524c67b577b34a1b85a
 EBUILD jetty-alpn-api-1.1.2.ebuild 608 BLAKE2B 53924240ae6fa8769767f968dee9e42739499d65c1b4e564e652e19501d0ca5ec00ccef1e4eddf3fd313266b2ac86bb8f555a97f5a1912d7fc23a55234a8fe02 SHA512 1a15814152bf068dd1773d8e4493167ffe9da0824efd57eaa2955ea383d4276f1938a7e915ce1a14365c8003958382c6e74837e640032d9ca3f8dc7f481270fd
-MISC metadata.xml 1025 BLAKE2B c3025e05458e9d33c283a3ae8381442248fe6cc09ce44b5f68a699195060c15ca5a7e387161ad9fad493d7b450d1ae277c0a7251c62b25e10333309a688ae2cf SHA512 1bb04f6c262f4b95c6d8e0d48e46712cc7f11014db5991fc865926a5f03fa487567c08f38bbb39db66a519aad4ecd48a3128264894bbac04a4d48c06a59fe8a4
+MISC metadata.xml 1029 BLAKE2B 266579d645a1af7055babed34e0413f5e03af1031659315e0520df3908505915139215eef7473a6ba6162f259c71b07ba8f11b132719ff5773d9cea7ef0ea399 SHA512 4debed277a9f8f6666d0595342533f6727ca7a2a5bc03f3b2828bc2523cba306b6c280bcaa275ac33726322df2de09871c5ff5a71aa3157a138372d44514293c
diff --git a/dev-java/jetty-alpn-api/metadata.xml b/dev-java/jetty-alpn-api/metadata.xml
index d0ea9f190876..e7ff4b83b664 100644
--- a/dev-java/jetty-alpn-api/metadata.xml
+++ b/dev-java/jetty-alpn-api/metadata.xml
@@ -8,7 +8,9 @@
 	<upstream>
 		<remote-id type="github">eclipse/jetty.alpn.api</remote-id>
 	</upstream>
-    <longdescription>The Jetty project provides an implementation of the TLS extension for ALPN for OpenJDK 7 and OpenJDK 8. ALPN allows the application layer to negotiate which protocol to use over the secure connection.
+	<longdescription>
+		The Jetty project provides an implementation of the TLS extension for ALPN for OpenJDK 7 and OpenJDK 8. ALPN allows the application layer to negotiate which protocol to use over the secure connection.
 
-Any protocol can be negotiated by ALPN within a TLS connection. The protocols that are most commonly negotiated are HTTP/2 (for browsers that support it) and, historically, SPDY. The ALPN implementation is therefore not HTTP/2 or SPDY specific in any way. Jetty's ALPN implementation, although hosted under the umbrella of the Jetty project, is independent of Jetty (the Servlet Container); you can use the ALPN implementation in any other Java network server.</longdescription>
+		Any protocol can be negotiated by ALPN within a TLS connection. The protocols that are most commonly negotiated are HTTP/2 (for browsers that support it) and, historically, SPDY. The ALPN implementation is therefore not HTTP/2 or SPDY specific in any way. Jetty's ALPN implementation, although hosted under the umbrella of the Jetty project, is independent of Jetty (the Servlet Container); you can use the ALPN implementation in any other Java network server.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/jetty-npn-api/Manifest b/dev-java/jetty-npn-api/Manifest
index 25c41fc633a7..9eb683a57296 100644
--- a/dev-java/jetty-npn-api/Manifest
+++ b/dev-java/jetty-npn-api/Manifest
@@ -1,3 +1,3 @@
 DIST npn-api-1.1.1.v20141010-sources.jar 3078 SHA256 0d9ec6fcde094ff785522fc403576e338b29207f4266155398c91defb1a26455 SHA512 8ae7847dfae1e2f0561f976ed887eeadcf62594c88df6400a79cd5f02b877e83016ade6f93153a9c31eb2ba41ea436c1c4faa960713f72c0d2bfa818c96cc13b WHIRLPOOL db15844781896fdf93e54fc6db302fb20c48e171367e2132dfba82e41301e8a665b78f270a5ee6626f2c98ef257caa7b120cf7c377f799b2f7105fb4183b63a7
 EBUILD jetty-npn-api-1.1.1.ebuild 551 BLAKE2B ba0c214ee25940a7ca5998b66780685c3e0035c245705738f9e529b0145384c51ab853be31ab32638c50f1c6fdb6e8353fd5d0b87565812a8e34c2a29c869101 SHA512 e223b56b00565ce7db96e0fc1f8e4ab871430336396c204f06d68c9bbee653ddf79d635772e008e85a564e4d492efb8c8672d465a7dfd3870ec873c75d34c3d5
-MISC metadata.xml 845 BLAKE2B 0a93a676498dd6e101141e3257b1601e2be4e7ad5daeb7d56054987cf41c404f16bc6659f587b6dba96b80a977639579f4b0b7e3b12ebe87c778da3b316b5efb SHA512 e54631d9c51269e9d669202cedde5f104cfb3cd3a1cc40ff7d5103277106aa4a196f8bc2c8c1247ecfd615d0963e6b360dd80f2ad3d5ad134d8fbe9a8b07804b
+MISC metadata.xml 849 BLAKE2B 16578097f3b77ead7a5d0ae5b1152f1616f0cc6aea45ea2e5b941d50bd542dd34628ca0b6c88554490e6e4a897101f27c155862d0a6b6304fda7d3db137bae69 SHA512 3b2d209b4efb73e5bffb93cdcc41d587cdd70f9f8a459031fe0b42e3cecd64c125be99cb9c5e2efe48d6d7d8710a59327abd15875d20fce89f36186b82474814
diff --git a/dev-java/jetty-npn-api/metadata.xml b/dev-java/jetty-npn-api/metadata.xml
index 6aaf1c0d7d08..df60d53575e0 100644
--- a/dev-java/jetty-npn-api/metadata.xml
+++ b/dev-java/jetty-npn-api/metadata.xml
@@ -5,7 +5,9 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-    <longdescription>The Jetty project provides an implementation of the Next Protocol Negotiation TLS Extension (NPN) for OpenJDK 7 or greater. NPN allows the application layer to negotiate which protocol to use over the secure connection.
+	<longdescription>
+		The Jetty project provides an implementation of the Next Protocol Negotiation TLS Extension (NPN) for OpenJDK 7 or greater. NPN allows the application layer to negotiate which protocol to use over the secure connection.
 
-NPN currently negotiates using SPDY as an application level protocol on port 443, and also negotiates the SPDY version. However, NPN is not SPDY specific in any way. Jetty's NPN implementation, although hosted under the umbrella of the Jetty project, is independent of Jetty (the servlet container); you can use it in any other Java network server.</longdescription>
+		NPN currently negotiates using SPDY as an application level protocol on port 443, and also negotiates the SPDY version. However, NPN is not SPDY specific in any way. Jetty's NPN implementation, although hosted under the umbrella of the Jetty project, is independent of Jetty (the servlet container); you can use it in any other Java network server.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/jexcelapi/Manifest b/dev-java/jexcelapi/Manifest
index 7bd51cc5048e..80477ea149b6 100644
--- a/dev-java/jexcelapi/Manifest
+++ b/dev-java/jexcelapi/Manifest
@@ -1,3 +1,3 @@
 DIST jexcelapi-2.6.8.tar.gz 1925926 SHA256 12f05e4453c203b91329a65329b564e86aaa77a005101f876c4de7b648c36034 SHA512 c649dcff8647530ca719f3e546d45ac585fed46d0a220763848f6d97b3f42c871b6520aee3575202598c7aba3391f647690075b6d9d52d1c2920817ff69548c1 WHIRLPOOL 24d60ad81961b224c6d63267ee4cb4432bca5bb89c1462797dc96dce4f7fb6403741c34819c78a36312a1df9f0fce756c1d026b1672c751fc8b3a42cc9f0e3c7
 EBUILD jexcelapi-2.6.8-r2.ebuild 831 BLAKE2B 8b220819ad67ec7dfc5a1a0a84e0c0e2d28a61f3d6d3388ab8fb8380cef916546d569d2578b6e712a464fef438e77006c7558a6eb8d44195f4061cbc7c0c69ab SHA512 114772ccf3ad6806115123fcd66de70ce14a291482d4a7729c5357565e82ab46b3ee46742e8a930558793e108a075b07229e01a47492d1b91427b209f21a2bd7
-MISC metadata.xml 668 BLAKE2B d63ab6cb159adb0811bb86292108f796767e82a7a62035fda4a6e2310eb0de560af0c49c0f1b017bd0d5b7c5c5a385b1d7e2651f53505e3abd7a9ddb46b5fc09 SHA512 37560219e338352fcfa1b1f0335735168206b9258e4ce8ede92e86ea249db24073ea0e8f7bb9e75d6345cc9cd8b58390d25f4e549535f96e4896b8f83673713e
+MISC metadata.xml 667 BLAKE2B fb5f2fdffcec384b1d69a8d9f467641381a7fdeb746e6266d1f64b80f9975e4354f60d2d99a447ee3664355f202917daf769f4eb3ea1230dfa24f20f448b3731 SHA512 90d7da9fba907cd18ce204c107c4c2ec4472c740847a6da9987690a3138519224e3614f017e388ba13cfafa97ab620533ae042f9456b98fc347852cd74dedd43
diff --git a/dev-java/jexcelapi/metadata.xml b/dev-java/jexcelapi/metadata.xml
index cbb59f0a0e7e..3d1e38d960d1 100644
--- a/dev-java/jexcelapi/metadata.xml
+++ b/dev-java/jexcelapi/metadata.xml
@@ -6,10 +6,8 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription>
-
- Java Excel API is a mature, open source java API enabling developers to read, write, and modifiy Excel spreadsheets dynamically. Now java developers can read Excel spreadsheets, modify them with a convenient and simple API, and write the changes to any output stream (e.g. disk, HTTP, database, or any socket).
-	
-</longdescription>
+		Java Excel API is a mature, open source java API enabling developers to read, write, and modifiy Excel spreadsheets dynamically. Now java developers can read Excel spreadsheets, modify them with a convenient and simple API, and write the changes to any output stream (e.g. disk, HTTP, database, or any socket).
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">jexcelapi</remote-id>
 	</upstream>
diff --git a/dev-java/metadata-extractor/Manifest b/dev-java/metadata-extractor/Manifest
index 5d6b8652204a..b8c84bf6bed3 100644
--- a/dev-java/metadata-extractor/Manifest
+++ b/dev-java/metadata-extractor/Manifest
@@ -1,3 +1,3 @@
 DIST metadata-extractor-2.8.1.tar.gz 3132397 SHA256 0d734971e9896709fb9e11406cefbeaa0cf11d57fa7dca6b02acaf92a2a686fd SHA512 4e9fe88be4112fbf9ce481e7fd3b3a7c9544d1d5b1ebd646d2c6e2a2a1fe2d53a4b80ab859fe5e277c3e72f5e035aa46d7af7a953a182f5b8215edf9cde99974 WHIRLPOOL bc296ebe64b82ec9485f364e287139369bb1da5f98eab47db5014d0f1d263378d0341383da95bda3efa5fba6c81c3ebb9c30a3586aa7277ec893d2ad6ac5e52f
 EBUILD metadata-extractor-2.8.1.ebuild 1179 BLAKE2B 30e087e1e06bcb51f6ecc53def755d7984da880b6fd63e46fccbd159716d1737d82f82c96a723264ba5f33dae13fd2199ac0135293b5f2842d201081cc708a8f SHA512 86edd91c93b17f35fb6e62f4fe04a69f27cce096d0470c46be2f3bc02c296104cc80703cd4feb40c1b38d2327ed962076e0a9ddae7a094770b1a9a095ce93aab
-MISC metadata.xml 748 BLAKE2B 5837df996dbe21805daef61276da549ff529d99404b0557856fb2205d3aac9cc644a1d7b52594555015ca4b9c4a2d03b12cd4481463bee8dfef34c2bc0d809d7 SHA512 d92645cf069566265332a113fa053a8ca33ae6146a79adabae34714294a11ed030008945a6a7704b103b5c253241a191e0071794d4cc87732becab772d0449a1
+MISC metadata.xml 744 BLAKE2B 6fa67251c20eefea15005ed8e193ea650a9f8b7fa0c4acabd38173ca7fa25be53a45efcf8a1e2da24a43a6513350adb5d714077e13e7069357f01210a61de921 SHA512 a83a4d45bd9abc54687d55cf3aa0756915d261391ec317f27775639b08a8e973f865e9f1885d306a5344630f101ee5cffc0b080b791ace2c35c46812d946c780
diff --git a/dev-java/metadata-extractor/metadata.xml b/dev-java/metadata-extractor/metadata.xml
index 3d82341578d3..9ad285ab6075 100644
--- a/dev-java/metadata-extractor/metadata.xml
+++ b/dev-java/metadata-extractor/metadata.xml
@@ -6,13 +6,13 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription>
-	  metadata-extractor is a straightforward Java library for reading metadata from image files.
+		metadata-extractor is a straightforward Java library for reading metadata from image files.
 
-	  Metadata metadata = ImageMetadataReader.readMetadata(imagePath);
+		Metadata metadata = ImageMetadataReader.readMetadata(imagePath);
 
-	  With that metadata object, you can iterate or query the various tag values that were read from the image.
+		With that metadata object, you can iterate or query the various tag values that were read from the image.
 
-	  The library understands several formats of metadata, many of which may be present in a single image.
+		The library understands several formats of metadata, many of which may be present in a single image.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">drewnoakes/metadata-extractor</remote-id>
diff --git a/dev-java/mimepull/Manifest b/dev-java/mimepull/Manifest
index e3f1a7616f04..4b95a4ab18c1 100644
--- a/dev-java/mimepull/Manifest
+++ b/dev-java/mimepull/Manifest
@@ -3,4 +3,4 @@ DIST mimepull-1.8.tar.bz2 48841 SHA256 357f3c2b558a755c4f3d7b71056d8973d723cd2b8
 DIST mimepull-1.9.6.jar 68382 SHA256 615b78d220c74b6c924ed09d51698628ad098786cedb5646bf411aae60f50301 SHA512 528eb77d6edbbfb1b1d8aebb617f9d20c84b9c18f7ab763163ea136c3898319519bbfa8a8e204bd0697a4eac9b964eaf3fb2ee214555efcb3da152ebf467ae64 WHIRLPOOL c38827897a903642eb5c6a79b876265f665412aff09219e06692bdec9ee1489394a9398534e3240d6bdef1b18e6e1caefee5048d800b77c453064fa0da0073de
 EBUILD mimepull-1.8.ebuild 963 BLAKE2B 839e91810252748dcb9feeaa3b0e3f6a536fbeef4d366ed0e4bc05a72b7dcc231447403833a8b88d4423fa828125b79caba2179e68986171ce1440beb48b271d SHA512 24f9bbcd439f4c9cd9ec49c89e529e9cba5a699cb42c90d949f485b10c4951f27548f7636025c8630de2c82b1b8d50088f3fb7cac6ea111b5ffb28040e19cb5d
 EBUILD mimepull-1.9.6-r1.ebuild 496 BLAKE2B 51f4d6ae0fc26652cc9adb3ecd26e0d72f019ab6d2660b30e368071c7a935a61434fbcaf96274836b05646f2fbd057d68814ed115857e6a601cb20768897d408 SHA512 97fe69a0ce8b215a306347a17655fd156754150a22593262927b0dee1740044239c433478fc6bb44bca14ddb9f2b60872b32cfce81acf65550e8d95faeeda357
-MISC metadata.xml 580 BLAKE2B 6f68938165a269a8e62d875817a10ffef26e21f5ef74aeee42f52a695c3837bbce14296ff4f887dfb0c6e7c5457513e784522e96ff2a76fde8d44657aab3d9bd SHA512 b337805ec86960d64b0a0beace8a9b8a764abcaa273f81fe11c7eb710293b0cc23852e59c951b99381261c9ee6b6cfc562f66c70407f1ddd503ba763ff4b2a75
+MISC metadata.xml 573 BLAKE2B f056f34e757829704b8efe77f55e2da69d27a7dc086cde47135854469195578f1b9dd3b67638a0379bc30eff764c25269a93560e11e0e12f9d7440308d240f44 SHA512 5ba96c89a6e2e5c29367ec1b5e52ab3abbfa7bdb0d8e1dd2e305980d83de83b4c29d657e5ecb4a9c1eb3804fd8589b5de86e4f34f70b951b14b2ed453a8ef427
diff --git a/dev-java/mimepull/metadata.xml b/dev-java/mimepull/metadata.xml
index ba80f7d6663d..b06e421248fc 100644
--- a/dev-java/mimepull/metadata.xml
+++ b/dev-java/mimepull/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <longdescription lang="en">
-    This provides a streaming API to access attachments parts in a MIME message.
-	Often times, a large MIME message cannot be loaded into memory. Hence the
-	whole message or attachment parts are written to a file system and access to
-	the attachment parts is provided using those files.
-  </longdescription>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		This provides a streaming API to access attachments parts in a MIME message.
+		Often times, a large MIME message cannot be loaded into memory. Hence the
+		whole message or attachment parts are written to a file system and access to
+		the attachment parts is provided using those files.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/nanoxml/Manifest b/dev-java/nanoxml/Manifest
index 61d2e19588e5..ac86469d24cf 100644
--- a/dev-java/nanoxml/Manifest
+++ b/dev-java/nanoxml/Manifest
@@ -1,5 +1,5 @@
-AUX nanoxml-2.2.3-enum.patch 9471 BLAKE2B 7ab5d54936790cf63fc14c16688b8c7649f485c121fc3f52f934fbb53ce271d6b03e445e115a5a6964ed65c9831044b8f2fa6f7fa3e34599cc7490732656d32c SHA512 9cb9f5d7482efb6f64f3c99a0b59e0820658b6eed8fbbb2e014ff08d8194942d51d64b6c1661d77774f8cb484f89b9f0bd096556c000df03ab9f0a5b21ed93f4
-AUX nanoxml-2.2.3-lite-enum.patch 2511 BLAKE2B 86ebcaafc7e75979dab3e9f75b5a44ad96d4f376e39265c9e7335e0804044ee6394a5e2e67cdb233c7df90fc0213e9c1ed1bdd4512f81a2cc26d887694e87d3d SHA512 443c45e7c6995cf5cd957e379b56c8b8c6573bcbb3c6439ac9d9997107893b8400b669e9c32700ee2f2159e829be44579858c96f201d365ac6ea15238f0137ba
-DIST nanoxml-2.2.3.tar.gz 426111 SHA256 df3bd3663b766851caffba963853383cff813695dca3e827ce6e00a920d544fa SHA512 6800b86039cb555efc05644db65c516fb242d4d081ea612969d6cc52a12ffd7571e012a7afe7962cd61c28b0ebb3b9d94af76f20013f3b4dd7d2aacdc552c6fc WHIRLPOOL 3164e5c09b2e42058da1c2c3df55512dfc75245dca7857fb46085f1a6b0a8a4360397026825a6e0f3ce66fab9c55774ad65ee9d6daf072ee9f0bae42d6509882
-EBUILD nanoxml-2.2.3-r3.ebuild 923 BLAKE2B c1e7b12bcfcb3ae88063e840401a35c5882d8c4534348e47f16782e2a71e6e6bc3d63f19dbdb2b8d9bb22ea4e588ea2019fee6de38ca8abb1bafc43c105495e2 SHA512 30ef7f0a4d5011e6b78d91b2b4c7a123499a6fff4c403d61f0ff330dc49ccbc5695af9ae4daa61b481d8a576de0670e85301db41d1e344ed3c333b078b4de0fd
+AUX nanoxml-2.2.3-enum.patch 9487 BLAKE2B 33d1433983f461f50f17a63151b292798036eda70d340ca8d7f139615fc16dda87c6e4d4314952ed8b270a7972ecd06fc1ddda8faa24e505af816c1bf7f0f614 SHA512 cdb5bc356f35e0b1906d2acc6b937ab8102ae34fd688f77e214976417174a3f15c884b1d22715782a19b4c374f9def94d35971ca88b9400c9c28350d3f795769
+AUX nanoxml-2.2.3-lite-enum.patch 2515 BLAKE2B 41f698b9fd685739b181951d1ac022226e5be8e4c4c72078ec4339102f46fb24acd9ba3aa2765f6f9787a9c818bf6c50bc3818835635f48279dc2214a84d284c SHA512 8bb31f737211168bb4a24f2abbd8f4fb78df35bc471116b427b5c2faeb2b1b1710ce5eda793d364a95bd7d7162075f1322dfed4c5a2527c3ae113a8c9a5cb97e
+DIST nanoxml-2.2.3.tar.gz 426111 BLAKE2B ac9980502c8c6ec50c6aebd19c0d08319701a508eea2a58847b804dcb3a3a93ca8d41ee1f08f4ec48527e669fc1695ec945933688516775373458ac7b6564895 SHA512 6800b86039cb555efc05644db65c516fb242d4d081ea612969d6cc52a12ffd7571e012a7afe7962cd61c28b0ebb3b9d94af76f20013f3b4dd7d2aacdc552c6fc
+EBUILD nanoxml-2.2.3-r4.ebuild 875 BLAKE2B 03bff6a5a87cb09ad518fb7d17b95299152af143203c51bf03953261c0a1182168b6900ad94720bc7d6db54e8175cc5aa264f52cbc8e9e41a40ce3ce2392e388 SHA512 2eba557cff7beb1ef4d5d73d75facac6ea5a5980f7432dc60f75bab7b7ac3fe03f2ebc51d5118cdc21dc46732607894a5bd9c6bb167e1dc2c71ea1c29ede82f4
 MISC metadata.xml 313 BLAKE2B f5fa3b22b2233fbfe20819af9612b185c1279d5d6ce3688942d9fd1b651bbf07b92efacd77ad2ca77418dc3c3d384bfe903cc66f65693e79560f3d35e2340da8 SHA512 e9b3806d0286175ade9158968346fd9dc2251dd4f4f7363bfdb147bf08b60f3088d07483971c55b2e1ccf656362d83443cea57a2a6b876a0f1c6107987ee7974
diff --git a/dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch b/dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch
index 61226b46fe43..f3992f845b85 100644
--- a/dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch
+++ b/dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch
@@ -1,5 +1,5 @@
---- Sources/Java/net/n3/nanoxml/XMLElement.java.orig	2016-03-04 09:21:07.908000000 +0000
-+++ Sources/Java/net/n3/nanoxml/XMLElement.java	2016-03-04 09:35:16.283000000 +0000
+--- a/Sources/Java/net/n3/nanoxml/XMLElement.java.orig	2016-03-04 09:21:07.908000000 +0000
++++ a/Sources/Java/net/n3/nanoxml/XMLElement.java	2016-03-04 09:35:16.283000000 +0000
 @@ -484,9 +484,9 @@
       * @return the child element, or null if no such child was found.
       */
@@ -130,8 +130,8 @@
              if (! elt.hasAttribute(attr.getName(), attr.getNamespace())) {
                  return false;
              }
---- Sources/Java/net/n3/nanoxml/NonValidator.java.orig	2016-03-04 09:36:05.247000000 +0000
-+++ Sources/Java/net/n3/nanoxml/NonValidator.java	2016-03-04 09:36:25.195000000 +0000
+--- a/Sources/Java/net/n3/nanoxml/NonValidator.java.orig	2016-03-04 09:36:05.247000000 +0000
++++ a/Sources/Java/net/n3/nanoxml/NonValidator.java	2016-03-04 09:36:25.195000000 +0000
 @@ -587,10 +587,10 @@
                                            int        lineNr)
     {
@@ -146,8 +146,8 @@
           extraAttributes.put(key, props.get(key));
        }
     }
---- Sources/Java/net/n3/nanoxml/XMLWriter.java.orig	2016-03-04 09:36:53.616000000 +0000
-+++ Sources/Java/net/n3/nanoxml/XMLWriter.java	2016-03-04 09:38:11.868000000 +0000
+--- a/Sources/Java/net/n3/nanoxml/XMLWriter.java.orig	2016-03-04 09:36:53.616000000 +0000
++++ a/Sources/Java/net/n3/nanoxml/XMLWriter.java	2016-03-04 09:38:11.868000000 +0000
 @@ -182,10 +182,10 @@
              }
           }
@@ -190,8 +190,8 @@
                 this.write(child, prettyPrint, indent + 4,
                            collapseEmptyElements);
              }
---- Sources/Java/net/n3/nanoxml/StdXMLParser.java.orig	2016-03-04 09:38:44.521000000 +0000
-+++ Sources/Java/net/n3/nanoxml/StdXMLParser.java	2016-03-04 09:39:08.028000000 +0000
+--- a/Sources/Java/net/n3/nanoxml/StdXMLParser.java.orig	2016-03-04 09:38:44.521000000 +0000
++++ a/Sources/Java/net/n3/nanoxml/StdXMLParser.java	2016-03-04 09:39:08.028000000 +0000
 @@ -492,10 +492,10 @@
                                                  extraAttributes,
                                                  this.reader.getSystemID(),
diff --git a/dev-java/nanoxml/files/nanoxml-2.2.3-lite-enum.patch b/dev-java/nanoxml/files/nanoxml-2.2.3-lite-enum.patch
index f91d14c38d6f..602cd9f87909 100644
--- a/dev-java/nanoxml/files/nanoxml-2.2.3-lite-enum.patch
+++ b/dev-java/nanoxml/files/nanoxml-2.2.3-lite-enum.patch
@@ -1,5 +1,5 @@
---- Sources/Lite/nanoxml/XMLElement.java.orig	2016-03-04 09:16:52.339000000 +0000
-+++ Sources/Lite/nanoxml/XMLElement.java	2016-03-04 09:19:03.213000000 +0000
+--- a/Sources/Lite/nanoxml/XMLElement.java.orig	2016-03-04 09:16:52.339000000 +0000
++++ a/Sources/Lite/nanoxml/XMLElement.java	2016-03-04 09:19:03.213000000 +0000
 @@ -63,8 +63,8 @@
   * The following example shows how to list the attributes of an element:
   * <UL><CODE>
diff --git a/dev-java/nanoxml/nanoxml-2.2.3-r3.ebuild b/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild
index d0fe385ae93b..023a196112c0 100644
--- a/dev-java/nanoxml/nanoxml-2.2.3-r3.ebuild
+++ b/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
@@ -15,8 +15,7 @@ SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/nanoxml/${MY_P}.tar.gz/357c7136
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 CDEPEND="dev-java/sax:0"
 
@@ -26,7 +25,6 @@ DEPEND="
 
 RDEPEND="
 	${CDEPEND}
-	source? ( app-arch/zip )
 	>=virtual/jre-1.6"
 
 S="${WORKDIR}/${MY_P}"
@@ -40,8 +38,8 @@ PATCHES=(
 	"${FILESDIR}"/"${P}-enum.patch"
 )
 
-java_prepare() {
+src_prepare() {
+	default
 	java-pkg_clean
 	rm -rf Test || die
-	epatch "${PATCHES[@]}"
 }
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index 1c7a28160bce..cc222db3f2e9 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -1,4 +1,4 @@
 DIST pcfi-2010.08.09.jar 6731455 SHA256 a787fb2a842de7bd5ee4fa13c4808aa6793380dde0219560b50054f6ca25c77c SHA512 067394ddac4a48ba8ac94b03f907d0faf98a91be658689a34eb85fdce49515582426f6a1fa433bfa87ca417ce3a6fa3aa89d89126a36176d8e04f3359c36d10b WHIRLPOOL fa9e9b6b2cc45f749101726c8fb7a4c7719d78448122c465b60696cd5be1a2a27bc65f549429d5a74c79bc74aaed39b3c0a8dfe02ec569303b96faa818410e73
 DIST pdfbox-1.8.11-src.zip 11026359 SHA256 160a2d058325845234eaa6b5ae23535b9226aadb4e570a1a76f7106a00653b1b SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1 WHIRLPOOL 9f43dff9921283d074b332ef08a34b56d58fca3624b6c263029554998b0595bb8815ad91e31c7cdee17a95db0807cb88c579ec1b1f9ab724ded3f50382220880
 EBUILD pdfbox-1.8.11.ebuild 2079 BLAKE2B 36c1ee6f0f1d517c7f7d0ce084c427e52993c7dd02e9795862de3c3234554dd245871e072402427b04c27232518e7d79e35b4e28fa4cc1f03adbce7b9bad891c SHA512 249af8e8327b87210e5919f7504978a9a258214accf957644e1a7803a7132b75532882a0ab87e19d35a7d7523eb5ecede5396657f55444f7874bda7b6d322ba8
-MISC metadata.xml 639 BLAKE2B b3cbc294fb2adaaf523485efb9273d3eec8dc53cdc38df2dfd2a6a44173bfe3e42e47025907a5bbd2b056f9e372d143a6fb39ed18686849784ccca5974278322 SHA512 2850f6439820beeb7cc1da7e97dc7e9cad690425e3b525450920f978b77c6f32c69374276d89f427d33e52e7a83326430382f205ed1ce7a2dcc0c7f68ca1bcd1
+MISC metadata.xml 641 BLAKE2B 03d882aee9a768dead555ff0394a3700c55dc9fd72097a1014cd7a87fca6d6e900b675e4ec4707c6ca5baca40646650bca3bcfbd25cd215af679c3e574442b3b SHA512 df978af8abefb42c2eadf80184cfdc0889758d758656f7b7bef19b7d4f59da28e465683cec26d96d288dccce4d82a182d56abff28ee14eb718280d469bb4183f
diff --git a/dev-java/pdfbox/metadata.xml b/dev-java/pdfbox/metadata.xml
index 82ef400a70ab..0282d9706df5 100644
--- a/dev-java/pdfbox/metadata.xml
+++ b/dev-java/pdfbox/metadata.xml
@@ -5,7 +5,9 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-    <longdescription>The Apache PDFBox™ library is an open source Java tool for working with PDF documents. This project allows creation of new PDF documents, manipulation of existing documents and the ability to extract content from documents. Apache PDFBox also includes several command line utilities.</longdescription>
+	<longdescription>
+		The Apache PDFBox™ library is an open source Java tool for working with PDF documents. This project allows creation of new PDF documents, manipulation of existing documents and the ability to extract content from documents. Apache PDFBox also includes several command line utilities.
+	</longdescription>
 	<upstream>
 		<remote-id type="github">apache/pdfbox</remote-id>
 	</upstream>
diff --git a/dev-java/xml-commons/Manifest b/dev-java/xml-commons/Manifest
index 2a8224f19728..3de98d030565 100644
--- a/dev-java/xml-commons/Manifest
+++ b/dev-java/xml-commons/Manifest
@@ -1,3 +1,3 @@
 DIST xml-commons-1.4.01.tar.gz 358779 SHA256 d34bd88dc89c5c1ed2545ec5c61e4606fc28beb200a6fecf8c3ed17694181866 SHA512 9e8f77f7dc65a492548fa2313b49855ad0880fe663acdac865a1b235ea3bc0ba347c4fad3ca16f0c92a60df42a0a802a74525b56ea58dc575cd2d94013561868 WHIRLPOOL 58cd1152ad822562b15f3e1e62559137dbeabb13a1635c33eba0c162974c799384cf937859fea06f62ea9b7bfb102e6cbb71489269b4bdae0097c2783e920fc8
 EBUILD xml-commons-1.4.01.ebuild 591 BLAKE2B 97329e12494a6d46f4565e09d721cc48fafcc2337ab82218097eff6c4896eb708dd688c374313e822281d84193671311a47ba763a4d3fcd7850b6158d2fcfab8 SHA512 dacbcd0cfa5c10d4f178af51188281add62475e3bb02acd213f00bb346747eb83ef4392430b3846c9f1c51e261f37dce168b479252a37a43f3e14152955386fd
-MISC metadata.xml 649 BLAKE2B faca5aca1ba7dd10f5bdee80ae7ceb29d4eb19d94400ad6d8e1804aaaa7ecd0d76dc9e2e2465a443e8ece269eb8438aa0c12c4c2f8422fc5b398f0b4bf6f62ba SHA512 32e372bb6920a9b2a534f69962e4c27e67ec7ee6305474608223c26bfec5cb6df5dcb4d094816b1305772d1f8a80b583ee2a387a80eb3bd9ad5a5e1a9a552632
+MISC metadata.xml 653 BLAKE2B 75fdc42387f3ed46c83044e3d8feb3be13e6924b24bdb388752b9406fc6bb510fffec696ba27b8003a31f268200f5dcecec3e6e1ac8d5f9deb6ce422d607b170 SHA512 969511cbcf2b402bf8da5c10b79a0fd0f4918cbf67d4ecca7a699834cccd2e96994f3b9b9aa5d8a32ada62a418056a3811d64ddc8ce15660487b68c79cb0fc79
diff --git a/dev-java/xml-commons/metadata.xml b/dev-java/xml-commons/metadata.xml
index 7931bd4ad40e..aa326dec0d1e 100644
--- a/dev-java/xml-commons/metadata.xml
+++ b/dev-java/xml-commons/metadata.xml
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		These are some of the components that are provided by the Apache XML Commons
+		project.
 
-<longdescription>
-
-These are some of the components that are provided by the Apache XML Commons
-project.
-
- * Resolver - An XML Entity and URI Resolver donated by Norman Walsh.
- * Which - A simple environment checking utility for Apache projects by Shane
-   Curcuru
- * External Interfaces (xml-apis) - An Apache-hosted set of externally-defined
-   standards interfaces, namely DOM, SAX, and JAXP.
-
-</longdescription>
+		* Resolver - An XML Entity and URI Resolver donated by Norman Walsh.
+		* Which - A simple environment checking utility for Apache projects by Shane Curcuru
+		* External Interfaces (xml-apis) - An Apache-hosted set of externally-defined standards interfaces, namely DOM, SAX, and JAXP.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/xmlrpc/Manifest b/dev-java/xmlrpc/Manifest
index 1c33476be4db..c11e9f3c8b97 100644
--- a/dev-java/xmlrpc/Manifest
+++ b/dev-java/xmlrpc/Manifest
@@ -1,4 +1,4 @@
 DIST apache-xmlrpc-3.1.3-src.tar.bz2 134788 SHA256 648a4ea5a5228408ea32e3efe184261b4c07ebc10fc0a4533e3969c0543dd70f SHA512 6ace33922604b9ee48ce578a5988252ae288fe37c303f98757ab283854f97a8c21b01103fe87ca5eb21ce8c04ffcc5bbf2b0328726348bfb2d43cb29d7b5c5af WHIRLPOOL 017ae57d61faa358caf313cb1ee4dc14d71762f20cbe48048eedbbb2bfa7f99a492525756bc66c0b084142e170a27355079b5334a9fcff6472c7c7bfa9068918
 DIST xmlrpc-3.1.3-build.tar.gz 3133 SHA256 12343e33da90cc73c7536d146d58cfcf1f5247a6d12f9cab4ef0affc89930e83 SHA512 e1613c21a8145994f88ab68c3e64503f6217bb962249a08055f5c24257c0aa3adeb868710c65842c64e2a3e9e1d52dd614a30454be027eb1a939b6f0fc966b57 WHIRLPOOL 632c7f864df9edd9aa7ad55851c64e2f7e48ad2c2adb6e2d42b99d0c0da4b5a57675760389779e6898773f9cb4a38816fc063af28876476db63f68c2eb0a7b17
 EBUILD xmlrpc-3.1.3.ebuild 1603 BLAKE2B e55d4d7efcadbb4a337fa716af783dd4216ff59c35e4480b0a9ba71fa2f10fb7bfa1ffa29d10146eee5cacbbfe49fae06d9f8d2670669313f555b67c56a997b6 SHA512 7e0656bcb29436c558b25c08557c4074bce1e12fada529933b58335ae8d42980222e25967c20aa11095b9f864095312454bc50a7d4d8acc0c9e6131fc1c636ae
-MISC metadata.xml 443 BLAKE2B 8e239517ad91fe7c9387b797fe69674789e360dacabcd17e189329660a4d10ee31d7cd0cb2a23abc729ac3412a3c76568cf94d44d3466dfd6708eeaf94658d29 SHA512 82f3e6900e581cf20196b589d8948c2204ba57d569709196f9e535b61a39342e7515f4fd36847b119c46d398d8c416697ed46ed9199a5549c2b22e9f51a2d368
+MISC metadata.xml 449 BLAKE2B 011fe7cc6a50256054367b90f784d316e85a8706deda835fb69b7952f0597da65185fffa6565edeeed490e234a55a3cd2b3bae1885fb413bb937cf0e47f8bee4 SHA512 77e3706f3bdc80624dcccc20204ce6f5fdc1c47af5afd39375a1ebce7436207636e9b9c962a5439f082af6e22d88f2d19b2c384970d715f699916cc901c59fc2
diff --git a/dev-java/xmlrpc/metadata.xml b/dev-java/xmlrpc/metadata.xml
index 0f98dc1259cc..535c71949d07 100644
--- a/dev-java/xmlrpc/metadata.xml
+++ b/dev-java/xmlrpc/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-<longdescription>
-  Apache XML-RPC (previously known as Helma XML-RPC) is a Java
-  implementation of XML-RPC, a popular protocol that uses XML over
-  HTTP to implement remote procedure calls.
-</longdescription>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Apache XML-RPC (previously known as Helma XML-RPC) is a Java
+		implementation of XML-RPC, a popular protocol that uses XML over
+		HTTP to implement remote procedure calls.
+	</longdescription>
 </pkgmetadata>