1.0.10's SRC_URI no longer matches the mirrors and 2.0.2 still uses

the old style GitHub URL. Sort this mess out once and for all.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

4 files changed, 31 insertions, 22 deletions

diff --git a/dev-java/jnr-ffi/ChangeLog b/dev-java/jnr-ffi/ChangeLog
index b3794751401b..ca0cca65b729 100644
--- a/dev-java/jnr-ffi/ChangeLog
+++ b/dev-java/jnr-ffi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jnr-ffi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/ChangeLog,v 1.16 2015/03/29 00:27:57 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/ChangeLog,v 1.17 2015/04/02 22:13:15 chewi Exp $
+
+  02 Apr 2015; James Le Cuirot <chewi@gentoo.org> jnr-ffi-1.0.10.ebuild,
+  jnr-ffi-2.0.2.ebuild:
+  1.0.10's SRC_URI no longer matches the mirrors and 2.0.2 still uses the old
+  style GitHub URL. Sort this mess out once and for all.
 
   29 Mar 2015; Patrice Clement <monsieurp@gentoo.org> jnr-ffi-1.0.10.ebuild,
   jnr-ffi-2.0.2.ebuild:
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index e793385fcf1d..9c634e8b2054 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -10,28 +10,36 @@ DIST jnr-ffi-0.6.0.tar.gz 97712 SHA256 91f7a1c21020892332849b9edc5ab7ad98dd7fabe
 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 1574 SHA256 b2bace5c4da7ef9b68cc3bd671363d2498c978cfbc0432c2c79d3041ee12eb88 SHA512 73c6f941f2711d83d481399b7b0eb3760ad6230aa6c039239d7734afcc9bf6cc69443a1caa00070a9ba5b71bcd5ce9d196c4bd0fd69ffd163a9e9672f4520ac8 WHIRLPOOL 8b1e3780ce724759ca4d42711208f16a42ea6250dbb16019158536160dad39faf3419c7a1143788f56c5adcd594195b7f1e2aed091545f1a9f3ce92a7e6dc1ee
+EBUILD jnr-ffi-1.0.10.ebuild 1502 SHA256 e86c8af0127cba7cb0606a2228e60174c8e0ff45ea15c271dc56002d573a8966 SHA512 b1aa6003dc94464185e194db7e1e1b25b52eb5402ee4b131cf62b493cb762c0ffee6d16bc818c4de1a9d5afcaf5bd3380f954ef2a5504425757d16e74d72db4c WHIRLPOOL af9b8fb43ad70774088bcbf32e469983cb72119e3b90350bfe2f62a412778955e1d6399f101b86b67ff7888a58761f6ab7fc3e5a30395315bc418001811d4eac
 EBUILD jnr-ffi-1.0.6.ebuild 1620 SHA256 1a5889cbfb1f8880bb90ad54a92f268d14c8328cb41381b1b9f75aa872024b49 SHA512 fe88c695710ddad271c13c5c14c39cd3f5983daa6612ed935eb745f4e4f8d3cbe632179343743408080d501ef2d69ae374bbfede29c8ece2bcf3e7af502a0ed2 WHIRLPOOL 3a4d05b909bcf8d51b47d724ef8b92176e05acf9461c491d3fda2f11a7956ce1c3f3487635dadbe552f23b301ba6ed5cdac4615d46c3af4c896eab2cbee7b05c
-EBUILD jnr-ffi-2.0.2.ebuild 1619 SHA256 79102c51fc070a6aa235b72c07f0625d9ff49b5d17403895353f5948c621f64a SHA512 efc127d722f8469ff78fa2915b3338ef018ce3f1806294d9a390eb44ad067db09359898ed18d899cad23e5637920b4c0fa59e512dccf4669898d87032f11a9ea WHIRLPOOL 9e2478b00a4f37acdb116111420417817721c55d788ce326b012bd385fe6890b8ff33b7ffcd73c0864b31fe792dae9db25b9bb93586c95ecbb5a82ae7d5bf64a
-MISC ChangeLog 2952 SHA256 f0c61ed24dbb2ae43e0acf64bac85845ff16675c4ed6b9d4a7de4a3ee6ae0564 SHA512 4d8fab91afef6a84364395c1c8cc600d11b38db34307137bcb4eff1b462683e7221248f26a1716320a869526882da6b0c005b0fc8f93667b8e24ec4ee2604094 WHIRLPOOL 11d4d5f345054f887aececc7993e2d8a29e46d49ede131b5c66ed4f6ba07a0c98b6257d3c1289ca8b58e83f8ca773d79464502d86cdcbab9ac06133d342f077f
+EBUILD jnr-ffi-2.0.2.ebuild 1609 SHA256 f7145e5fce7861b5d58fc121f7a9173ce4ddebee5952b2511dae3070130c6de9 SHA512 df388410a2d5d880e705b649a31527d0b5249656f79c0a3dbb86b5e160c64ad71bc4c37d7016dba854127e0ec537a58886449e96ba21b820e22c21bca8dc40b8 WHIRLPOOL 405e34e480e05217bc1d0f7e837a37e8e1ab7d73212f2e5369b5cabb0f1133136ec36db1fca931758ec9c4d4993810bfb7fadbab701b3f299fa6a2d28e6dce06
+MISC ChangeLog 3181 SHA256 750394500341c7c4d1ac3addb00a3426d93763a30c1e6f3f4e03efe3cca42262 SHA512 f488e8eede777bf18d56448a219656b67eb08712a1a3d0025cb4d2ad6cb381bff14854902940bccd457c57a91cdf55120ee9cef3aef9b803550bab3782816f51 WHIRLPOOL 9b27c97f95f077fc91e6fdd96dff4a8109f0c99fa2546b344fdb42a750cf048a36119632dbaff2d4dcb0210cbb7bcec6815c3020bd8b7f21bdc9f5a67595b903
 MISC metadata.xml 205 SHA256 e319f1701f6be29c8e077049d77738b69b72be0458754ef90ad9a684f2ec1722 SHA512 fb7831a8a05e9995888eaef748c98a12adcb911ef1c9901a3555765782d87cd3172cfb2c47ffa89d8a5454e7aa1f5bd27358b88a035c97f1ff388d7fc85a9d7e WHIRLPOOL 673d7b564054942d04b33cfcd01f7c5ff16ad9f9f2a60586ccc54c60443bf2dc34fa037e4e1de889539838342eea62022a3b9a7cae65b0c2f34fcbacfcfd0c73
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVF0cRAAoJEJGRpfGTSRu4xdQH/086+HyG4OvV9dejsdEwQZTo
-wM2sbGyzbNaYmPQif9X+nfyAASO0TuZNqT1h1YQqvXtFUBYXvRW1tuxqrh8zO4Gg
-Ox6hSXH8g5vArNg16+N76tAyUM8KZN10Hg83UU3WwqhejyTI+pSUfvNdZ7+CVyVF
-LX5Qg45zLZiaWkYJLnv6zX97phTULmtbpIClCOrrZifdx6I4ya2XIuZ+jgT2pnpH
-Q0ZEP4/E/5UnZkIFDMoOv2utRyvzl9rUldK9XeF8TxcNpX4HliAu0oF52TJV+V51
-qtH+XyeJI1AAGpQBC+ZjDNH6J3EqYtVHzh50P2APQddziOn0G2ky8o2bO1BLTKk=
-=ZEHe
+iQJ8BAEBCABmBQJVHb8HXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kstsP/RYgnA6yME0h4kne0p3QCEOs
+2hu5cSkZ5ViDQ6Fo0rQNL6rtnVobXukQwsWdh9eNTd5aCiR16JvrC9FyLjWKsyXe
+8LIlFlg9TN7UUujfe09oZjeW37Op6YdIxwDoxlQSNO8hyuB8dX5q2jIPUoOwaAg7
+orZ5E4K2DpKkxc4x+AMBuKjFSWnds27VEgXN1QhyH9ofo/UKURPyerzy2SYBBYk/
+Ksb9HAG8i/a7Ms6e0lHckFOrXUzKLEt52WmZEghz0RJcH4/D3YKgZqDuLPaDkxPW
+AMTNALpVJzaM9qR62xNGN03e9mAJSH6wliGnlaxruQZY5ODwuK7o8T6nJEbFHJ+l
+YNV9h+MOGIoW5cAjd0kmYiezWWq2nGfDTrIrN7arvg9cnzU5hVrsUIzrjRTR/upV
+WJ0lGB1mP+7X+I8xK45ZVa8XCMgpNeVw0Ch2ghTh/tZNCTxsiBP+n7V2wWhmxDRA
+4ajtwcMHpYnc8E/p58vb3gmHBkV6TuAAEz/fGNj+aBZkZLTn8ye17r+uKuI1hTj5
+L54WFJMWrqhungePDyQBI7qB94HNCVmsTfjU9Twb5F1sN5eZ93nepMc6f3+ItEFx
+joCNCQ5wB8ZKSkYb9sxgercWW2ROTmO6Qv1x4iruObh359paShLIJIWWhl049vTE
+7kDPfNe2V0+0Ur8Gh01/
+=N9tb
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild b/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
index bf78106b7b9d..61d3a8131b07 100644
--- a/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild,v 1.3 2015/03/29 00:27:57 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild,v 1.4 2015/04/02 22:13:15 chewi Exp $
 
 EAPI="5"
 
@@ -31,12 +31,8 @@ DEPEND="${COMMON_DEP}
 		>=dev-java/junit-4.8:4
 	)"
 
-# Yeah, well.. don't ask me why.
-S="${WORKDIR}/jnr-${PN}-c0b5ebf"
-
 java_prepare() {
 	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-
 	epatch "${FILESDIR}"/${PN}-1.0.6-junit48.patch
 }
 
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
index fda924319fee..35e3d096fb77 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild,v 1.2 2015/03/29 00:27:57 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild,v 1.3 2015/04/02 22:13:15 chewi Exp $
 
 EAPI="5"
 
 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="2"