gentoo resync : 01.12.2017

4 files changed, 19 insertions, 21 deletions

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[@]}"
 }