--- Manifest
+++ Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX jnr-ffi-0.7.11-flags.patch 727 SHA256 aa37ae8a3d6674a141f3e2e448bf5a2ac9c6a64d41185b42fd7f50ca63922b4b SHA512 2ad0a5682d86a3c93eb5b099c919c866b40348addb8efa779cc94fe575f37e1e8638438faf34cad9641c74c0338c8bd3983c0fa940bdff4787e4b60226619d80 WHIRLPOOL 7489d8fd7f92abddd1a44943bf1eeeab8c794f747e2565ab3625cae2b37625521b62ba4801cc640e16e0ded959913fda70cf2ee502b0ac987d7da156d35ea072
 AUX jnr-ffi-1.0.6-junit48.patch 467 SHA256 9aab14e22055438d5b6fc8aa50c6923fdc5775458d558ba97309277eb7455e4f SHA512 e7b5bb64d65b432a028fa709e4e050feccd4f3023fa6d940f89a2ef67f489f8eeb6dfb87c08eb056f47f4a5019c875225013ca559eb065cca105d54f51b5e884 WHIRLPOOL aa6317f662efd57901f986043366880b629fdd45e30ccf20c9c37aa1e92a9022479c12779a69b6b434a0f9da9da06677a7ced20e35161252b85e87633a128092
 AUX jnr-ffi-2.0.2-junit48.patch 467 SHA256 9aab14e22055438d5b6fc8aa50c6923fdc5775458d558ba97309277eb7455e4f SHA512 e7b5bb64d65b432a028fa709e4e050feccd4f3023fa6d940f89a2ef67f489f8eeb6dfb87c08eb056f47f4a5019c875225013ca559eb065cca105d54f51b5e884 WHIRLPOOL aa6317f662efd57901f986043366880b629fdd45e30ccf20c9c37aa1e92a9022479c12779a69b6b434a0f9da9da06677a7ced20e35161252b85e87633a128092
@@ -10,28 +7,17 @@
 DIST jnr-ffi-0.7.11.tar.gz 131566 SHA256 a7045b072762e0905161a7792f60ed66798f298d589ee87262bf1cd75af447b5 SHA512 ddfacafbb5c7764692ef40db082bccb7a635916db9c5ff90ba0720a141e4b61072baaf4b4f5b985ef74fc5e8cb59753b93f7ffddb6f89c8a8ebcd0067ee0178b WHIRLPOOL 41d3308df161db08708fd05b12d9b3c49aba884523c0f19d4eb4531edf4c54316f12255f72a2d45e5ed720a619b2df024c06c7bf96fd252184344af3f8887db0
 DIST jnr-ffi-0.7.7.tar.gz 130740 SHA256 d0f93346af0edd922e330975524f01f3dc5a2beb329fc5a62e32fd5153992807 SHA512 41a315fa6e03837e675a06d1f537a080430005c3a6ba63d03b3471998171a82b8205ba3d784a4d6b6ed4f94aeeac51121057580d51b14362216fac820eff2fa5 WHIRLPOOL 0ac7f995b396e95fdd80c470d2df328af7f97209feb09367ada66f49640a4fc413e111eb8e6748e9bd7341bc974e8b8dad2235be2de9b78621699b675d845225
 DIST jnr-ffi-0.7.9.tar.gz 131265 SHA256 8b9cefd983afc45cdf9dbe6a0f8915d636f26708c3e87de3e88156f0d87cef7d SHA512 fe6d2735fb538b11d9cc72e02f9cf37151db1750caad3ad8a758055d4693ca1e928d101e4f87b1037b99b982eaac7b878e56cc81c441f36e088ca24ca28de8ac WHIRLPOOL 0beca5fd67ff08c92e3a22e625e1ebc088dfdaa2250da0f6de808fec2dbc2fddfd98fa3bda73d7a9c436f7e905ce57901a6e8dcadfeee93b13fe071aa23ff501
-DIST jnr-ffi-1.0.10.tar.gz 169255 SHA256 baa6ba61b0e336c141d1a4a3787f946363d6c60ce033bb5045356279cbcc047d SHA512 d1c412284a62e830850702349d8441239a5c403968d23ae2d7ff629d27997443b4f40e4ed7dbb0cee0be247c08d6ef9ffe4ffb4e066c7898df3c3046c1ca1511 WHIRLPOOL 431f9772d311b442c149e98db62a713ef620faeb2f1d08320bc89246027a1a006c1e1bfbb81cb0bd06c7b97ba63e6c7632d4ac56dc31ac4f8349e11ca7bafa5d
+DIST jnr-ffi-1.0.10.tar.gz 169196 SHA256 8d37e264705551a0f6b0283046dcc1264b311925874d7f674a6abc1f1f85775b SHA512 a46899e6a71c6fc5ad8586eae8dd718998de1ab30fe7c4b396a6291a54a63057c229c86c195c59e790bff13daa628adcb0caaacb05b1d58683e493fd6aa7fc3b WHIRLPOOL 467b1730a6e6ad494a00063c85bd90c34019df8730ce3a74b60d635f6f574ca0542fa3e2769beb1cecbe0feba2356662f0a2f35021ae425be52cdf1e63d73a1c
 DIST jnr-ffi-1.0.6.tar.gz 168393 SHA256 b049161d4e327085d3c9074dd97c41000fb812b8c5ea6c70a75474db469b81a1 SHA512 7673f9d5a513713bff5992a69db848315f7961a3417c4a247bb26226535d25172b6de26bc4ecc58ae8889da2ba62de40a6e434fb3a4b21a820962e2bce2ba2fa WHIRLPOOL b39831407e3210ce5736842bce4a5ade2d1727abfcfd159ae2d376e78c8fe4f88b3757e7a97e06c56aa47845fded054506f27141ab057a9266d3b06dba0c08c1
-DIST jnr-ffi-2.0.2.tar.gz 170768 SHA256 84866283259fcb1ee7804f264bc516e966a730d162e423e07ef147eca80f7dc5 SHA512 65912f612860a329ebbab06e447ae72de7ac2f48780be1f6c565c4286629554eef2cd4fa7db7422ddb0540bd9da4479d9544ff6f61a1f209df22b92b62e28e26 WHIRLPOOL 4983889d93c2d5dc763680dced977741ccfe98119243eb03612217cf253d2913d8e628d7959f2e17905fc818fbe62ab922c0497907afb7b4001432b1084d9335
+DIST jnr-ffi-2.0.2.tar.gz 170707 SHA256 a79772f3c46cd5afaf272752bc9a8292c8fd53c8302f8dc825a3cf2444ee2ab8 SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0 WHIRLPOOL cdd7b4b27dd2018747d0a669f7237f30def64bbde18486e81ac99c538a8d0c4679237c2402f955cbada773558a54492cfdc9f0a127d3de4007472339215891e8
 EBUILD jnr-ffi-0.5.10.ebuild 1746 SHA256 ea839d72e3dafcf20f290002e7e2c76f26c4e710278fbbaa9b562e3402a4974a SHA512 7d8cb9c1179a5291ad07f99fa6d490f3f7177db18898a30cbba9497e499d35ebc3878d9da922d2fdfc2cf54202eb7c4d14bb82710bae5e766b97ca6b58bbd33e WHIRLPOOL daf9e228af119b18ce3226aa122883684f16ffdbbbe7efda1ab100ff1213e7e33e46ca14751ad65292b4b0d619a682b8227dab978ad69d0697a4ee3438523403
 EBUILD jnr-ffi-0.6.0.ebuild 1574 SHA256 b1749c5d98efcfe5dfa41009c04eba7a9be189a4967f91642086a68ddc257104 SHA512 385095e9f0373b531fdd8a903ff4ac6ce507b47decc9e3cc53db85fe6a6cd6dada19fafe397944074e8abe87c9dc9520c894b1b3a0a3e7e0fcfacc50bb3c5d0d WHIRLPOOL fb842c514b1395229b7ed2e2723d609db6e64f7cbf73b1576506a6fe9e365522cd7c7e987a2c7a033a52b7b383355511f9284e09f6a45e16dda665d1980d8965
 EBUILD jnr-ffi-0.7.11-r1.ebuild 1824 SHA256 f82d37e1833c772d208776529ca52a83733f77a85b7333b2add0f4ff0aa89926 SHA512 a33f8fafa5bd548297f43721e4b10e18a676aef67eba3569f5b7bb3340832dd83062c5e3e9f6570d8cbcac149952596828c0837afb362b4253244207a9b82825 WHIRLPOOL eda071cec0e94631853a3d6360fd0901fa3f3fa497010db5c44fa14accc6173d691f22f72286078e94656078c75115ed3e812c429a9e67cf63cac1af08358aeb
 EBUILD jnr-ffi-0.7.11.ebuild 1578 SHA256 7919eb990e6cfc7a7fb158618c9bf0fc80bb5a2051cc4fd2f0f8de688e313e49 SHA512 03d3002dbe5271a0629c756a0f8ead24ccf38a38b0343f5226272ede53e1a84e5ce2d91618580b403a8fac06f69d48d29f21e722b59829379c4ad6d5d965696c WHIRLPOOL b0530fb7a62a9b678d7fc48f22ea82c35ca234fbecf64e7346f893342ab81be983719d9c1605d26cd5768524110573c27ec1ca47f4c8056c58b3116069c60b08
 EBUILD jnr-ffi-0.7.7.ebuild 1580 SHA256 0fcc5c2ec8d688bb2f4748950e3a1bd4bb037d3bd5b903a5b1d054b36bab53e3 SHA512 5e97cc87d9dca8428bb94191aa6bbd7bb29570d2d98afbaa2f3318fe41e3493a1cc78bb4ace62a37f50c142ddedb966c8b82c0880b5af39ab4b2d91253a8d7b5 WHIRLPOOL bb83600aed3954ccb27e116f25597858946a7ed1f5e95e83f4d035ae6032fe34030f61889c45302558d6be3c3a7d7f5b7a528e8f25c41ea388aa39cfe2e32a10
 EBUILD jnr-ffi-0.7.9.ebuild 1580 SHA256 bf5cdfed3383fa9c008e0317be9a8f3278b314fa16e9d9ae786e9ecad29e42ed SHA512 f671f992842419dc8349ffb9a98ab443cd4cf93a87e5d69175a00be7d42faa7f6e79373d8f13ccd2ed52e4e1760b6de1dfd1fef03a9c9fa8a255c278a74db95a WHIRLPOOL 9406931780b528f935779df2823b357ea1e274f3e2cd9aea1c3ddc8352c304d7389f843fb76c2316dbea5dfcca09ac3a32cb08bb002df768423f0386bf6ce7c0
-EBUILD jnr-ffi-1.0.10.ebuild 1507 SHA256 1d8704add376eb84a258d36c38882c01995bdc84bb6e64569232edbbabf2cfc0 SHA512 59287433766bff39aaffaf1b301776ff474cee1dc55362209128713d60631047b31a6d86e6f99a93c809e8afedce217cc2375b5c715a64029c469b63f356f30b WHIRLPOOL 31ae37e02d6209296c7f1863d255d14e10e65634145bdf6bd00e54a27ad01537ce2dfa090a105c6f35d25588537289058abdc2cdd7ee165977a2cbc2eb2a997a
+EBUILD jnr-ffi-1.0.10.ebuild 1507 SHA256 3579f39676760a8ee96b139773d769a294134b84d6716ee557e607ff3345ec38 SHA512 805d4fbb3426feec4824855320f283cf873557ce630e42f552707b5f658afb40f6144991b39a40b18deae2a4c6f4964a225de7e0e56a27ebb9e2305c2994f957 WHIRLPOOL aa40b535bcf0c78f0b4dd7d38fe01c20c7aae5ed86df3398496dd184ee7a781a569fb517fa0d854532a3c05009e954cddf1b1c631938d6223a37c85d7e003dc5
 EBUILD jnr-ffi-1.0.6.ebuild 1620 SHA256 1a5889cbfb1f8880bb90ad54a92f268d14c8328cb41381b1b9f75aa872024b49 SHA512 fe88c695710ddad271c13c5c14c39cd3f5983daa6612ed935eb745f4e4f8d3cbe632179343743408080d501ef2d69ae374bbfede29c8ece2bcf3e7af502a0ed2 WHIRLPOOL 3a4d05b909bcf8d51b47d724ef8b92176e05acf9461c491d3fda2f11a7956ce1c3f3487635dadbe552f23b301ba6ed5cdac4615d46c3af4c896eab2cbee7b05c
-EBUILD jnr-ffi-2.0.2.ebuild 1619 SHA256 24297fb18abf526dbc5240c0e048d6d0d0b4acd06ea318cc3395bd941e16cc6f SHA512 1fe8b72533ddc0d141c161281828471d7185959010c27559adce85412a74732e2b00dc4887eb01d1fd7168d9556449fdd0d6a607e2a225633e58006952ce5997 WHIRLPOOL 92ee5730dea32cf8d2ba59523200423c94b10df9705afd13f2793f6a4b04144fe57bda7070566c061a17f4fcb7760f214bb50d1407ff1422f7a20be4280cb487
+EBUILD jnr-ffi-2.0.2.ebuild 1498 SHA256 149d3b354ba9666f73547467d99a755923c0963ed3e66e7593c72d73fb1ab33d SHA512 bb7a1d97d4ab043b0db5227d925ed891d4b5ef2544da0d336ed6aa95a73208b542bc94592e8f0d303abb78c7a10fb74747e750515178dcc1084d3ab6ebc0a030 WHIRLPOOL 7c3b5821785f1e7d5b4603ca63f920ac142f302e406efb06ca296dbf3439035d8c7bc120f6681610dcb63fae056137630ca192b030634aa4c06c52b61f758d5e
 MISC ChangeLog 2794 SHA256 82c17abdc1298318351470778ddae6c055b9e94b586c84a5c6dd212f5dc979d8 SHA512 2de91d116e39ba7e413082f23bf87a4c335898d2034e9efa70dc6d60c0b91aaacb8ebd1b5755b851914f7276c3aa452c78379b8c19cbbcd56ed2215288fc6a3a WHIRLPOOL b52ddd01a9d1120c2007888964bfe676479b557957268712f5e7646246025f11759ed0a265fd339c4d75ba62b4a8a02078814c833d7e09d2c7eac98933865ff5
 MISC metadata.xml 205 SHA256 e319f1701f6be29c8e077049d77738b69b72be0458754ef90ad9a684f2ec1722 SHA512 fb7831a8a05e9995888eaef748c98a12adcb911ef1c9901a3555765782d87cd3172cfb2c47ffa89d8a5454e7aa1f5bd27358b88a035c97f1ff388d7fc85a9d7e WHIRLPOOL 673d7b564054942d04b33cfcd01f7c5ff16ad9f9f2a60586ccc54c60443bf2dc34fa037e4e1de889539838342eea62022a3b9a7cae65b0c2f34fcbacfcfd0c73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJVDcDOAAoJEJGRpfGTSRu4tLIH/ieMqh2sWh1ox00Hfux+E7vE
-eQa6d5BxKVK47sEk2BGkbTmeGotFj5Qp0K+fKF9sE2Y1yy7pTvZZzsUoB4SJZBB9
-ZqMg9ehJKMuE2CRnJgJRYDkp5ZF9rO0VGmT9kBGfhPkUW/vC7nU+3gI5atgE4ZTg
-o5Wp+XWoEtg/jWUvZECzZpU5ziJ3akQIVcZ3tQC5SXR+Oqt3TCr+pm6wVcMhkQNY
-5XrakRnNSc+qWl9qP+zrgHBCwytjeFKsGv12OJUL4ukoGQ21BqGPgPNJkoS62O76
-3FIPMtBd749En3JvziPC/cImhjA2e7P0HkXS1TDvBM2jhclCXu/xRCYh37weEww=
-=DaeU
------END PGP SIGNATURE-----
--- jnr-ffi-1.0.10.ebuild
+++ jnr-ffi-1.0.10.ebuild
@@ -13,7 +13,7 @@
 SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="2"
+SLOT="1"
 KEYWORDS="~amd64 ~x86"
 
 COMMON_DEP="
--- jnr-ffi-2.0.2.ebuild
+++ jnr-ffi-2.0.2.ebuild
@@ -6,14 +6,14 @@
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit java-pkg-2 java-ant-2 vcs-snapshot
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="An abstracted interface to invoking native functions from java"
 HOMEPAGE="https://github.com/jnr/jnr-ffi"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="1"
+SLOT="2"
 KEYWORDS="~amd64 ~x86"
 
 COMMON_DEP="
@@ -46,9 +46,6 @@
 EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
 
 src_test() {
-	# Fails, upstream pom has ignore test failures enabled.
-	rm -v src/test/java/jnr/ffi/StringArrayTest.java || die
-
 	# build native test library
 	emake BUILD_DIR=build -f libtest/GNUmakefile