Adjust SLOTs and ${S}. Fix bug 544778 and bug 544780.

Signed-off-by: monsieurp@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

4 files changed, 22 insertions, 15 deletions

diff --git a/dev-java/jnr-ffi/ChangeLog b/dev-java/jnr-ffi/ChangeLog
index db71759fe3b0..b3794751401b 100644
--- a/dev-java/jnr-ffi/ChangeLog
+++ b/dev-java/jnr-ffi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.15 2015/03/21 19:04:42 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/ChangeLog,v 1.16 2015/03/29 00:27:57 monsieurp Exp $
+
+  29 Mar 2015; Patrice Clement <monsieurp@gentoo.org> jnr-ffi-1.0.10.ebuild,
+  jnr-ffi-2.0.2.ebuild:
+  Adjust SLOTs and ${S}. Fix bug 544778 and bug 544780.
 
 *jnr-ffi-2.0.2 (21 Mar 2015)
 
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index e6489a40cc76..e793385fcf1d 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -19,19 +19,19 @@ EBUILD jnr-ffi-0.7.11-r1.ebuild 1824 SHA256 f82d37e1833c772d208776529ca52a83733f
 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 1574 SHA256 b2bace5c4da7ef9b68cc3bd671363d2498c978cfbc0432c2c79d3041ee12eb88 SHA512 73c6f941f2711d83d481399b7b0eb3760ad6230aa6c039239d7734afcc9bf6cc69443a1caa00070a9ba5b71bcd5ce9d196c4bd0fd69ffd163a9e9672f4520ac8 WHIRLPOOL 8b1e3780ce724759ca4d42711208f16a42ea6250dbb16019158536160dad39faf3419c7a1143788f56c5adcd594195b7f1e2aed091545f1a9f3ce92a7e6dc1ee
 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
-MISC ChangeLog 2794 SHA256 82c17abdc1298318351470778ddae6c055b9e94b586c84a5c6dd212f5dc979d8 SHA512 2de91d116e39ba7e413082f23bf87a4c335898d2034e9efa70dc6d60c0b91aaacb8ebd1b5755b851914f7276c3aa452c78379b8c19cbbcd56ed2215288fc6a3a WHIRLPOOL b52ddd01a9d1120c2007888964bfe676479b557957268712f5e7646246025f11759ed0a265fd339c4d75ba62b4a8a02078814c833d7e09d2c7eac98933865ff5
+EBUILD jnr-ffi-2.0.2.ebuild 1619 SHA256 79102c51fc070a6aa235b72c07f0625d9ff49b5d17403895353f5948c621f64a SHA512 efc127d722f8469ff78fa2915b3338ef018ce3f1806294d9a390eb44ad067db09359898ed18d899cad23e5637920b4c0fa59e512dccf4669898d87032f11a9ea WHIRLPOOL 9e2478b00a4f37acdb116111420417817721c55d788ce326b012bd385fe6890b8ff33b7ffcd73c0864b31fe792dae9db25b9bb93586c95ecbb5a82ae7d5bf64a
+MISC ChangeLog 2952 SHA256 f0c61ed24dbb2ae43e0acf64bac85845ff16675c4ed6b9d4a7de4a3ee6ae0564 SHA512 4d8fab91afef6a84364395c1c8cc600d11b38db34307137bcb4eff1b462683e7221248f26a1716320a869526882da6b0c005b0fc8f93667b8e24ec4ee2604094 WHIRLPOOL 11d4d5f345054f887aececc7993e2d8a29e46d49ede131b5c66ed4f6ba07a0c98b6257d3c1289ca8b58e83f8ca773d79464502d86cdcbab9ac06133d342f077f
 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
+iQEcBAEBCAAGBQJVF0cRAAoJEJGRpfGTSRu4xdQH/086+HyG4OvV9dejsdEwQZTo
+wM2sbGyzbNaYmPQif9X+nfyAASO0TuZNqT1h1YQqvXtFUBYXvRW1tuxqrh8zO4Gg
+Ox6hSXH8g5vArNg16+N76tAyUM8KZN10Hg83UU3WwqhejyTI+pSUfvNdZ7+CVyVF
+LX5Qg45zLZiaWkYJLnv6zX97phTULmtbpIClCOrrZifdx6I4ya2XIuZ+jgT2pnpH
+Q0ZEP4/E/5UnZkIFDMoOv2utRyvzl9rUldK9XeF8TxcNpX4HliAu0oF52TJV+V51
+qtH+XyeJI1AAGpQBC+ZjDNH6J3EqYtVHzh50P2APQddziOn0G2ky8o2bO1BLTKk=
+=ZEHe
 -----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 5af7ae1182f7..bf78106b7b9d 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.2 2015/03/21 19:04:42 monsieurp Exp $
+# $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 $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/jnr/jnr-ffi"
 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="
@@ -31,6 +31,9 @@ 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
 
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 40374fb5d1a1..fda924319fee 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.0.2.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-2.0.2.ebuild,v 1.1 2015/03/21 19:04:42 monsieurp Exp $
+# $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 $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/jnr/jnr-ffi"
 SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="1"
+SLOT="2"
 KEYWORDS="~amd64 ~x86"
 
 COMMON_DEP="