Version bump. #452168

Remove obsolete.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

12 files changed, 30 insertions, 555 deletions

diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog
index 5a5880fd2ec6..7033db9068ef 100644
--- a/dev-java/jffi/ChangeLog
+++ b/dev-java/jffi/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-java/jffi
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.25 2012/09/25 10:41:34 sera Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.26 2013/02/07 13:15:36 sera Exp $
+
+*jffi-1.2.6 (07 Feb 2013)
+
+  07 Feb 2013; Ralph Sennhauser <sera@gentoo.org>
+  -files/0.3-makefile-flags.patch, -jffi-0.6.0.2.ebuild,
+  -jffi-0.6.0.2-r1.ebuild, -jffi-0.7_pre20100131.ebuild,
+  -files/jffi-0.7-makefile-flags.patch, -jffi-1.2.2.ebuild,
+  -files/0.4.1-makefile-flags.patch, -files/jffi-1.2.2_no-werror.patch,
+  +jffi-1.2.6.ebuild, +files/jffi-1.2.6_no-werror.patch,
+  -files/0.5-makefile-flags.patch, -files/0.6.0.2-makefile-flags.patch:
+  Version bump. #452168
+  Remove obsolete.
 
 *jffi-1.2.5 (25 Sep 2012)
 
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 816908bffda6..95424f82df29 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,40 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 0.3-makefile-flags.patch 1081 SHA256 1ad484484c226704c5d4f70c027fe2124cb63ec9721ab09ab239080b5b027840 SHA512 33627531b5085ac7dc413b9564586f42a9349932ad9f4413468d9dd7421e4e423d91b871eb838c692c3cdd24e781a1f94ffea659dcb91a4679d4a8d9b9c8fcbf WHIRLPOOL ded3c751eced666e542df590b0063fb566e7ebaee582be9df7169860775ecf971962d9fd279dc4f05b41ef5d3f2c4e50eaeb1de04d44d77a5f71a4beb5b32268
-AUX 0.4.1-makefile-flags.patch 1004 SHA256 da66a889fa0500c1242a40cf7568b61943171d60586498cd16026081a89530bd SHA512 c6a8f0df808d5931fbb1454acd3ffbc9a8c981ce78cc6317a863183f08ab96bd91d37c5331905e7b2149027c301a001bc3b44274a76f2d96647e60c3f420b69a WHIRLPOOL 01b56b5249ef91d1e813cfc9244027ba3989cd14a2d4d34ea53563fd247a7b2a50193f56e89665ebd899439bc911b91296074483f8390c0379271571e9b7f7ea
-AUX 0.5-makefile-flags.patch 1004 SHA256 b8ac57a9d7474dc31d154edcfd9a081297afbb49a3b1b5c35ae60f4b1b6e0ad1 SHA512 3b38d89e03e8afa34a03347101da879345dbf0368eebd2d29870df29467088bb936bcfd50f4a0ee5d95a9e4074fcc6e5ce702d94a138b5cb718a37e4bb4b11fb WHIRLPOOL 2dbd791ade07f34aacde2b55f1b0cfd74316ca1c2fdf02b0f94479dc236e9de3656bfd37f57dabce22a1e59b0d14d5ff5470521e701e2ab5631b86c62571e217
-AUX 0.6.0.2-makefile-flags.patch 1818 SHA256 29c50591f0b656184c94862fa262b273176c61c1aec40cbf5cf79c6c36fa894a SHA512 f0a7fa25f4b55c214f51ac0c7ebceae8ebb61d9074157814de68258ba24d2beb394be87d9e0ec69024ff9508bcd450c4798b2ce307a9ae422719e09733f06376 WHIRLPOOL 42dffc9fe2575fd858e7e27d2fd11aa492ae98bea19d9c0b898a6769acffe57c4ca4a1876342152ed12d690f97771e322eb3816a6a5bf47f244b517beaa426d5
 AUX 1.0.0-gcc-3.4.patch 327 SHA256 13328b03fd69a2934f1266446b6ae62e614e112ba305d92a73008d620be52339 SHA512 73eb24d37dfa5f05ec42729cad98c96dad078d249c08c44e2cb40598421ce294e37ae1276fccb57221f3a0e0e48184fe32bc8c95fdf51887e456576d59f053db WHIRLPOOL 22a033fbc9ed7684d655b74455183401668fc3bc520918e394c2c57602e0d89f6880f6f63c873706fddc9ecdce943f29e5efc06163cb4db1c1c1abd89ae2be07
-AUX jffi-0.7-makefile-flags.patch 6079 SHA256 cbe88df14f6cc99367e1d5140483d4f6c0b3f057e6a8a7e6a1d15eea91f89105 SHA512 946d9fbb61d6ad2189237f4528a340c1d8597954e5f2af6edf43f8816ba7c2a5af268fdba41688ecf3734ee0fa0c8946b17c86a48461193143765a0d5e8c5b3c WHIRLPOOL e558f5dd689083223b3824f38cea207feabef2b1385f5b159608f0df0bfd3f898d5f7fb62dc98c0d32d483215db41863f68523b3edef552e806f9efd30d0c14c
 AUX jffi-1.0.0-makefile.patch 3196 SHA256 51d5299b057924f37727baf34cf4ba8915fe967e5ad1a60e673d6c241c6c4740 SHA512 11fed72fbb2a6ec379afd7d3bf5a4a82d655787343ab024158a52eae3b803bbba8aa117654d6d56362805132ae45a9ab88babb0c70abf998bc61339dea5d8254 WHIRLPOOL af00b48c7d8b768072fe6d5a14ba47d80d33a7b69d531bf7024fb70f8493480dcea7d947509536287cc9cbace43c50857a7cc5143c2835fd252d6fa23ea4fb91
 AUX jffi-1.0.11_no-werror.patch 382 SHA256 24fb274a3ec39eb94d6f9d3401df2127518b00a30d1f06276cb880b70f769f63 SHA512 cef3690413d0e5e9687ba29e7aa54082ee9e8f9021a210eec2ca1169e19749a8ca797a50698142f6811dd9939306a1e840262518523dc1f60e45fa4a62321b94 WHIRLPOOL 2346f974ad15e729b98427d9ec8782465d3ae77271c78f3440d8818f529357c81606df319f0aa3d49e47d202db43e867810234ecb8c5936b7221f383fe21f780
-AUX jffi-1.2.2_no-werror.patch 382 SHA256 24fb274a3ec39eb94d6f9d3401df2127518b00a30d1f06276cb880b70f769f63 SHA512 cef3690413d0e5e9687ba29e7aa54082ee9e8f9021a210eec2ca1169e19749a8ca797a50698142f6811dd9939306a1e840262518523dc1f60e45fa4a62321b94 WHIRLPOOL 2346f974ad15e729b98427d9ec8782465d3ae77271c78f3440d8818f529357c81606df319f0aa3d49e47d202db43e867810234ecb8c5936b7221f383fe21f780
 AUX jffi-1.2.5_no-werror.patch 382 SHA256 24fb274a3ec39eb94d6f9d3401df2127518b00a30d1f06276cb880b70f769f63 SHA512 cef3690413d0e5e9687ba29e7aa54082ee9e8f9021a210eec2ca1169e19749a8ca797a50698142f6811dd9939306a1e840262518523dc1f60e45fa4a62321b94 WHIRLPOOL 2346f974ad15e729b98427d9ec8782465d3ae77271c78f3440d8818f529357c81606df319f0aa3d49e47d202db43e867810234ecb8c5936b7221f383fe21f780
+AUX jffi-1.2.6_no-werror.patch 382 SHA256 24fb274a3ec39eb94d6f9d3401df2127518b00a30d1f06276cb880b70f769f63 SHA512 cef3690413d0e5e9687ba29e7aa54082ee9e8f9021a210eec2ca1169e19749a8ca797a50698142f6811dd9939306a1e840262518523dc1f60e45fa4a62321b94 WHIRLPOOL 2346f974ad15e729b98427d9ec8782465d3ae77271c78f3440d8818f529357c81606df319f0aa3d49e47d202db43e867810234ecb8c5936b7221f383fe21f780
 AUX jffi_maven-build.xml 11287 SHA256 fa81bee544d5304731268fd807c5176ffeca6d50c0882aebd2d9510118782a0b SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7 WHIRLPOOL 42f50c85cad6673cff32b41593c3b30c5193b1ce204a1df6a97d68d70ee6a6cd61f2b6d887bc36002e516849d91139fa1254a76b8951e839a483865e875964a5
-DIST jffi-0.6.0.2.tar.bz2 1855529 SHA256 a2e5cd14484027807a2ab757d8010fb9903d33a4a0e5e1f045ad8de806a0cb24 SHA512 46b8d73e9ec61ebefbc289f3608e505cc77670c50eab681b202802fd8a9c4c7e49948764156b0b2b69ca25c73ace7e5471f698125fbbed6044987a8020df602b WHIRLPOOL bf1bfff7ad0a172152e17e4882ca773a85e241848ebd7e5d11daa450b4fffc8c2fcb6ee9b1dd660bd5033b9a75de7710c1c326a9c3279af6669819198b20eadb
 DIST jffi-1.0.0.tar.gz 1627422 SHA256 9950edbaf897cc1fa10fb944336a86ceba92674f54a1eaf59b2ab4881825d25e SHA512 cb37052d0a2dc719d1f2ab2620c1a1908cf51c5d1e04d13caaecb3659916a59e8e46fa90c2b6ddb9a63f7b78f224233b9316908456aaf9ebbc1432e7592006c7 WHIRLPOOL fba9c40a55cef900ccb5207f5d93345869693fd7ba027388797499cf65bc584260c37fd0962c0037a83c2d05eb7958c193482a8967501bedbaa2f1465644494f
 DIST jffi-1.0.11.tar.gz 1899655 SHA256 b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a SHA512 0f98c1aa55dfd9fd9338399e173f118ef12d01a65429a49ed5264a23fa6700e7ebdf13ffb6b6318fcd8ea9dce66a47524c5cefa50f3f11a251ca44a4f38fd6aa WHIRLPOOL aa8c3f88b75a26221b3c41ed552fdd83c551ae05fc7455f072b8a3d7f3190cad26a638d1800a67b09d8074b5dfdd04f2be73287a7f22c0cfcc5dbc8df0d2ae12
-DIST jffi-1.2.2.tar.gz 1759433 SHA256 c4afe6e3c67f600f9f838c8526a711c5c7859d3d05f7ccb6e7926ef5e484edbd SHA512 d62e2de80703fad6fdf4ca758d7813389cdb1d7e0e8316f790d440a421df95f7a6a301c7b2f49f81ed76b17abde3031f755f6c69fa5cd3a6339b378ccf8c4a55 WHIRLPOOL 69fbf8c88f5ad60ef1a6f7ace917c3245c1eaed6e4cc0c0950f933635e31d8480b53286c5b7f8c8bf3aed9b87ce61e75ecc8a3b0af1288bee448206db3e2cdaf
 DIST jffi-1.2.5.tar.gz 1798081 SHA256 2101c48855558902f2e21baacd0b2c8b7098feb3ca1487a195c2bc3d9116ebd4 SHA512 2613a1874899e1a734ad54d68f7d969fe3bc12bd1ae1aaf5a63a17d63ac6ac6b9812740b7c7a771e66ba0e4ff02105c6a2427771d4571be40ae869f3d6f077e3 WHIRLPOOL 174303fc9f10cf295e009ef2320f9b13295f5e96187ab2ae4599de891b27e1279645ea47409eb8aec9a8b247a5568cddd6f8566950b64be37e399cb0eda0219f
-DIST jffi-git-0.7_pre20100131.tgz 1484965 SHA256 b2256550a38cd120cd61bebd61a76dd373994b62a1c31191c74aec3a0970e30a SHA512 772ca01f187245f524ab7f2b1ac712ed4d44d87237b222e6bc0357721ecb7a1cc2ec93e1556136db3b5dffa85d2bd4eb935e5610dddd8d03d84629afcce84c1e WHIRLPOOL 746557adee3a96ef82d8a459bc9d6bc5c9508b88bee539dfe07a9defdd40c8a55da8945493fbfe44a2125a92039f3754dd9da5fcf55d145176a67e7f44a93b9d
-EBUILD jffi-0.6.0.2-r1.ebuild 2230 SHA256 d641164d207c6cf6c76f2a0756a75b778229a7034d74603fd04318fdb547ee5c SHA512 45f8341d2b7dfe34f3895e778e33b6c3fb982bf70a55b885ae238c03a62f75f754decfc37de769a53a0c5ac3a3df8330d71ce5d39bdf1c3cbc14d62ac23247ae WHIRLPOOL 317ced716d87bc4a6adc4691a10c7693b88a26e590cfd7e990c266c8f6663c0a8ca64f55f1726cbd2f757faada08282c7c26d4d8c710a6c3a74b440da0eeadeb
-EBUILD jffi-0.6.0.2.ebuild 2092 SHA256 bc871ead6b4881d8a050d2aefa4031aeccdf6b65a7e4d4f82c0f24b6e2ffdcc3 SHA512 6b94f8e445c3a3c7eda60264541e44bade8618b1c091a56fd92ade040f8ad71e1791afd7b7dde204ac99eba32b9ba831997fbd378b742beeb068c67d17da405e WHIRLPOOL c863e7b1f445c4a2f93c2fd591f994a12c8010723ede46009b207f21d8f5ca0421a0f38789c0b27a7cde0244c3cae768f81ce4b2f23c09781dde67761837b491
-EBUILD jffi-0.7_pre20100131.ebuild 2611 SHA256 edeef1882353285c5d42a2bc19b1ee323a061f6f8a01562a202fdd3f935bad67 SHA512 0f96d16e0cadd4f50b97158d013adaf1b617c09d7978bc2774afc6ee8ac0a00079104cc073cdc9c260c89cead5855f6504b83bc124529bff641bb6b3a0b411e1 WHIRLPOOL 8184f494145ec5bb40cddaf9b48a42f0dbb790341287d6553df5f93553b7c4052e596a831d5c8f16518915318c6e7b0897dab811435738cfece96f3f2dfb6e3d
+DIST jffi-1.2.6.tar.gz 1850410 SHA256 b568d832828bf0cb980c545e8fd16147034048ca2d3ffc62cae4f844c8cc6cec SHA512 df178691e6894599f2a45146950cca7e4c81e92c38fc751c40b39e660970c19d0dce41c9192053dddf07f42317d28033f59b7140c904784c477526e7471b6938 WHIRLPOOL adb57b9ac981177ae7d697aae41bbaaff3a38dab4c4364258b13272023076dacdd93a751eb24a339ae17a4162d4511685a4aa67afd5d8fab2f852e0403ee73f1
 EBUILD jffi-1.0.0.ebuild 2274 SHA256 a5fe1144dacf4f666105ef56cec8a8bf7b246a68dbde639ec4a0c9c867a2d4b1 SHA512 35894dc27f8b0d0f672d1d39548af68057f79e252663cf2c9ec8802e7dabb6d721afd3e1d030b37f7c7c37e395c39cbf5cda2a5b4b97f95d17fa3aa9b4d642cc WHIRLPOOL 986db534860b62f5dce5a12667410dfeb7c120a0a3f9e4fc5c57dca37d694204a4ac2b4b3d2b76bc7a961d15a88c7868c2290eab253a46f0f1b64a32d48191b8
 EBUILD jffi-1.0.11.ebuild 2493 SHA256 affcd6d55af34b30b83074a675ccea2cc571df0eaf1b837e6c5e484f80acc021 SHA512 2a3e8ceeeb6dfd7bafe7bc1d53a12ec35b204cc10bb833412076b219fd506275f5e5d8cba8608de2cf80730d6bef1438f184a241dbda50290066420f7646240a WHIRLPOOL 0e5000088b97a8e6e5d1a42a819f80219f6837170a9534115cfe0203cf6706eb5a1d37fcf6fd2e7cab04904452edafda6c4a9254cf07e7de8b4ee917257b5744
-EBUILD jffi-1.2.2.ebuild 2358 SHA256 602ea19a322ce6a1977dc9fa757e8a4037814e7980fa67b12078e8da0ac0d4e5 SHA512 b4b0fae935671963573ad62056fc418b46195f342fb86e58b24bfd8a74f5d7fa232d584abe134f88ef3f11e4e3fd9451b84e81093f6d91faf67b119eb30225e7 WHIRLPOOL 19a5bd2614c4e7711ff29c6263c49c538706a78630c7bb72c222a89f5ff78d22c4a64da13cbb217a2ad5b27a154806c5feb7af44f35f7733038ddda29c148902
 EBUILD jffi-1.2.5.ebuild 2358 SHA256 89636672db08de6b69c64d1da78cad1e05679323d812900be1325202e9540707 SHA512 6df150b5bb15f94f937676b93a720c407a07dcaa646a6f72fd9bb706b61729da2332deec464f7cff0ef99c6d5716ca26dfc8ce4e821f9733db37e6387ab12a98 WHIRLPOOL 6c82cdc180b1cf9fce413facb9b4bdfcbc649f25fb5ae573b840d4deed72d0f3c66f5d459eedb1afb5b3dbf8cd873d8e6fc680c4eb944989605ec23e3914f737
-MISC ChangeLog 4211 SHA256 638d00e18676a1149c093b68a1b9520fd437c6d03881e66520aa002ebeb1d498 SHA512 b21d509ef6531271fe9742ed868ea6c4478bb6a605521ccd8606177f08d38572d36cc03997947c74c2a39adb8842a34e68cd0a6f2795ddb7a31114fe3e9853b1 WHIRLPOOL 2266845ae358c96a2c9d04a281b2e09b89afb8efa18eff66247be096fb779d68d019a6dd2a319ef1fe58c8ad31e567ef55500991a8087e54fefc0c45da6537b3
+EBUILD jffi-1.2.6.ebuild 2358 SHA256 d7b4e29598f7e71a1235279c6f04aadaa41167ebde25fb520980c2b1a5f23084 SHA512 5b30160dace64ab895426c397223f7f9208f0600d20cac3bac5684400a244941437880a51d6637029a7e8f95b0c430c6ff9ce6156323baf63a7b55bbb667cdff WHIRLPOOL e397fcb8fb9f56334c4ee14907e56a0f6b2935e167b627f88255b88a7b1c5fc7f2ce2ff1d95fdf527117dc1d29e49009bef3711596c588aa360b0b6455675064
+MISC ChangeLog 4707 SHA256 b714752443bb721d95752176ea05570fb52ec0c7fb013a7fb115972724bb1360 SHA512 ad7378924c1cb6ab91c6831af4da553b7d7dc1dd3c6e1883589a539595ab65fd8892b6e81bd2568f491aedc7e122f778fbadb213c4cc487a48da6694581e35a9 WHIRLPOOL cfe9422e690e99ca12bfffaf3abcb0fc089038f21e0d514d89b4f469da88752ed59db270d24a46200fd65152173cfdd6cf61ec5eeb789583e33318c890d98a56
 MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQYYpuAAoJEIUJ+svaV163/HUIAJvyuB4HyiEL0Mh8cnnh1hvO
-D80eKAAK47xQOqkUjBS0d1+vftJAKgFGD3mWBVUJQ+/5UzcBDhnKkfkZfdSwaDwC
-k3bk2sRCFTUYKxUJft5JOZThAaAZ6Vqnh0mrsiaXpoPsv+EtV+9CL+QmaTT4mUqB
-+74AzH9bSobvVJqcIjjbKbtgKrJP2aB9z5uEhtWGkkTgVD+ZvxzTUjZItOf1k3Po
-uy5oZE6n+PQbGMra7odUOlWVTJ22TeR66IE4wWsK0LY0ooXUWqllpC+qZ70+1Qxw
-7dh4APRE7j60QuJOtMhAOO8D1W2zQwzIFzawuz4T7vpjgLl5cG90iLx7OeteBVI=
-=so+1
+iQEcBAEBCAAGBQJRE6oUAAoJELjwI6Q8XPdaBrMIAJFP9ufDo1OVnSI9fyB4qxV8
+pATEmjwd5LejBXKyXi9NdfHlMjbbmxpb6Eul+5nfPu5FqRu5+XFLWR6/KPPaH79U
+vL3XHY7iKPYlRNvYONJrYKSkgHeeM3YtiUw+UDnFYzzEwZNmWYRaMN9KJ6zJGytF
+5IFiavd3RVzNn01MwMs66VnyXznwuJSp86+kLZ6ONcoJbL1p5IJMELIX0LwBLy+l
+xq3qnehJz0nUH7DrOwMRi6f3p6sdfSw1QPeG+BrAPJK8Wv54vFXJLwJmle6zUhwZ
+bBv7rNnxy86ak9jmpncmmklj3rUMtVwgGeENcSbsZprMz64hVZrzXdtMTGUERs4=
+=0ZlO
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jffi/files/0.3-makefile-flags.patch b/dev-java/jffi/files/0.3-makefile-flags.patch
deleted file mode 100644
index 780e4c5e62cf..000000000000
--- a/dev-java/jffi/files/0.3-makefile-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- jni/GNUmakefile.orig	2009-06-03 21:32:31.000000000 +0200
-+++ jni/GNUmakefile	2009-06-03 21:34:56.000000000 +0200
-@@ -43,7 +43,7 @@
- #   http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
- JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
- OFLAGS = -O2 $(JFLAGS)
--WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses
-+WFLAGS = -Wall -Wno-unused -Wno-parentheses
- PICFLAGS = -fPIC
- SOFLAGS = # Filled in for each OS specifically
- LDFLAGS += $(SOFLAGS)
-@@ -55,7 +55,7 @@
- 
- JDK_INCLUDES= -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
- IFLAGS = -I"$(BUILD_DIR)" -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)/include"
--CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
-+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
- CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
- 
- ifeq ($(OS),mingw32)
-@@ -65,9 +65,6 @@
-   ifneq ($(OS),$(BUILD_OS))
-     CC ?= i386-mingw32-gcc
-     LD ?= i386-mingw32-ld
--  else
--    CC = gcc
--    LD = ld
-   endif
- endif
- ifneq ($(findstring cygwin,$(BUILD_OS)),)
diff --git a/dev-java/jffi/files/0.4.1-makefile-flags.patch b/dev-java/jffi/files/0.4.1-makefile-flags.patch
deleted file mode 100644
index 11694b26eccc..000000000000
--- a/dev-java/jffi/files/0.4.1-makefile-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- jni/GNUmakefile.orig	2009-06-03 21:52:34.000000000 +0200
-+++ jni/GNUmakefile	2009-06-03 21:51:50.000000000 +0200
-@@ -42,7 +42,7 @@
- 
- # MacOS headers aren't completely warning free, so turn them off
- ifneq (($OS),darwin)
--  WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef
-+  WFLAGS = -Wall -Wno-unused -Wno-parentheses -Wundef
- endif
- PICFLAGS = -fPIC
- SOFLAGS = # Filled in for each OS specifically
-@@ -54,7 +54,7 @@
- 
- JDK_INCLUDES= -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
- IFLAGS = -I"$(BUILD_DIR)" -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)/include"
--CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
-+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
- CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
- 
- ifeq ($(OS),mingw32)
-@@ -64,9 +64,6 @@
-   ifneq ($(OS),$(BUILD_OS))
-     CC ?= i386-mingw32-gcc
-     LD ?= i386-mingw32-ld
--  else
--    CC = gcc
--    LD = ld
-   endif
- endif
- ifneq ($(findstring cygwin,$(BUILD_OS)),)
diff --git a/dev-java/jffi/files/0.5-makefile-flags.patch b/dev-java/jffi/files/0.5-makefile-flags.patch
deleted file mode 100644
index 712ec3d0c33e..000000000000
--- a/dev-java/jffi/files/0.5-makefile-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- jni/GNUmakefile.orig	2009-08-07 07:44:41.000000000 +1200
-+++ jni/GNUmakefile	2009-08-07 07:47:59.000000000 +1200
-@@ -42,7 +42,7 @@
- 
- # MacOS headers aren't completely warning free, so turn them off
- ifneq ($(OS),darwin)
--  WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef
-+  WFLAGS = -Wall -Wno-unused -Wno-parentheses -Wundef
- endif
- PICFLAGS = -fPIC
- SOFLAGS = # Filled in for each OS specifically
-@@ -54,7 +54,7 @@
- 
- JDK_INCLUDES= -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
- IFLAGS = -I"$(BUILD_DIR)" -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)/include"
--CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
-+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
- CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
- 
- ifeq ($(OS),mingw32)
-@@ -64,9 +64,6 @@
-   ifneq ($(OS),$(BUILD_OS))
-     CC ?= i386-mingw32-gcc
-     LD ?= i386-mingw32-ld
--  else
--    CC = gcc
--    LD = ld
-   endif
- endif
- ifneq ($(findstring cygwin,$(BUILD_OS)),)
diff --git a/dev-java/jffi/files/0.6.0.2-makefile-flags.patch b/dev-java/jffi/files/0.6.0.2-makefile-flags.patch
deleted file mode 100644
index 08f51acb4280..000000000000
--- a/dev-java/jffi/files/0.6.0.2-makefile-flags.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- jni/GNUmakefile.orig	2009-12-30 18:59:22.000000000 +1300
-+++ jni/GNUmakefile	2009-12-30 19:02:10.000000000 +1300
-@@ -42,7 +42,7 @@
- 
- # MacOS headers aren't completely warning free, so turn them off
- ifneq ($(OS),darwin)
--  WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef
-+  WFLAGS = -Wno-unused -Wno-parentheses -Wundef
- endif
- PICFLAGS = -fPIC
- SOFLAGS = # Filled in for each OS specifically
-@@ -54,8 +54,8 @@
- STRIP = strip -S
- 
- JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
--IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)"/include
--CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
-+IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I"$(JFFI_SRC_DIR)"
-+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
- CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
- 
- ifeq ($(OS),cross-mingw32)
-@@ -147,11 +147,11 @@
- endif
- 
- LIBJFFI = $(BUILD_DIR)/$(PREFIX)$(LIBNAME)-$(VERSION).$(JNIEXT)
--FFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \
--	--with-pic=yes --disable-dependency-tracking
--ifdef CONFIGURE_HOST
--	FFI_CONFIGURE += --host=$(CONFIGURE_HOST)
--endif
-+#FFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \
-+#	--with-pic=yes --disable-dependency-tracking
-+#ifdef CONFIGURE_HOST
-+#	FFI_CONFIGURE += --host=$(CONFIGURE_HOST)
-+#endif
- all:	$(LIBJFFI)
- 
- debug:
-@@ -211,12 +211,6 @@
- else
- $(LIBFFI):		
- 	@mkdir -p $(LIBFFI_BUILD_DIR)
--	@if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \
--	    echo "Configuring libffi for $(PLATFORM)"; \
--	    cd $(LIBFFI_BUILD_DIR) && env CC="$(FFI_CC)" LD="$(FFI_LD)" CFLAGS="$(FFI_CFLAGS)" \
--		$(FFI_CONFIGURE) > /dev/null; \
--	fi
--	$(MAKE) -C $(LIBFFI_BUILD_DIR)
- endif
- clean::
- 	# nothing to do - ant will delete the build dir
diff --git a/dev-java/jffi/files/jffi-0.7-makefile-flags.patch b/dev-java/jffi/files/jffi-0.7-makefile-flags.patch
deleted file mode 100644
index 394d65b44b5b..000000000000
--- a/dev-java/jffi/files/jffi-0.7-makefile-flags.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Index: wmeissner-jffi-6c5fb4a/jni/GNUmakefile
-===================================================================
---- wmeissner-jffi-6c5fb4a.orig/jni/GNUmakefile
-+++ wmeissner-jffi-6c5fb4a/jni/GNUmakefile
-@@ -58,7 +58,7 @@ OFLAGS = -O2 $(JFLAGS)
- 
- # MacOS headers aren't completely warning free, so turn them off
- ifneq ($(OS),darwin)
--  WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef
-+  WFLAGS = -W -Wall -Wno-unused -Wno-parentheses -Wundef
- endif
- PICFLAGS = -fPIC
- SOFLAGS = # Filled in for each OS specifically
-@@ -70,8 +70,8 @@ FFI_CFLAGS = $(FFI_MMAP_EXEC) $(OFLAGS)
- STRIP = strip -S
- 
- JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
--IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)"/include
--CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
-+IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)"
-+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
- CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
- CXXFLAGS = $(OFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
- 
-@@ -204,15 +204,15 @@ ifneq ($(strip $(findstring $(OS), linux
- endif
- 
- LIBJFFI = $(BUILD_DIR)/$(PREFIX)$(LIBNAME)-$(VERSION).$(JNIEXT)
--FFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \
--	--with-pic=yes --disable-dependency-tracking
--ifdef CONFIGURE_HOST
--	FFI_CONFIGURE += --host=$(CONFIGURE_HOST)
--endif
--
--ifdef CONFIGURE_BUILD
--	FFI_CONFIGURE += --build=$(CONFIGURE_BUILD)
--endif
-+#FFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \
-+#	--with-pic=yes --disable-dependency-tracking
-+#ifdef CONFIGURE_HOST
-+#	FFI_CONFIGURE += --host=$(CONFIGURE_HOST)
-+#endif
-+#
-+#ifdef CONFIGURE_BUILD
-+#	FFI_CONFIGURE += --build=$(CONFIGURE_BUILD)
-+#endif
- 
- all:	$(LIBJFFI)
- 
-@@ -245,55 +245,55 @@ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.cpp $(wi
- 	$(CCACHE) $(CXX) $(CXXFLAGS) -c $< -o $@
- 
- 
--ifeq ($(OS), darwin)
--build_ffi = \
--	mkdir -p $(BUILD_DIR)/libffi-darwin-$(1); \
--	(if [ ! -f $(BUILD_DIR)/libffi-darwin-$(1)/Makefile ]; then \
--	    echo "Configuring libffi for $(1)"; \
--	    cd $(BUILD_DIR)/libffi-darwin-$(1) && \
--	      env CC="$(CCACHE) $(CC)" CFLAGS="-arch $(1) $(FFI_CFLAGS)" LDFLAGS="-arch $(1)" \
--		$(FFI_CONFIGURE) --host=$(1)-apple-darwin > /dev/null; \
--	fi); \
--	env MACOSX_DEPLOYMENT_TARGET=10.5 $(MAKE) -C $(BUILD_DIR)/libffi-darwin-$(1)
--	
--$(LIBFFI):
--	@mkdir -p $(@D)
--	@for arch in $(ARCHES); do $(call build_ffi,$$arch);done
--	
--	# Assemble into a FAT (i386, x86_64, ppc) library
--	@mkdir -p $(BUILD_DIR)/libffi/.libs
--	@env MACOSX_DEPLOYMENT_TARGET=10.5 /usr/bin/libtool -static -o $@ \
--	    $(foreach arch, $(ARCHES),$(BUILD_DIR)/libffi-darwin-$(arch)/.libs/libffi_convenience.a)
--	@mkdir -p $(LIBFFI_BUILD_DIR)/include
--	$(RM) $(LIBFFI_BUILD_DIR)/include/ffi.h
--	@( \
--		printf "#if defined(__i386__)\n"; \
--		printf "#include \"libffi-darwin-i386/include/ffi.h\"\n"; \
--		printf "#elif defined(__x86_64__)\n"; \
--		printf "#include \"libffi-darwin-x86_64/include/ffi.h\"\n";\
--		printf "#elif defined(__ppc__)\n"; \
--		printf "#include \"libffi-darwin-ppc/include/ffi.h\"\n";\
--		printf "#endif\n";\
--	) > $(LIBFFI_BUILD_DIR)/include/ffi.h
--	@( \
--		printf "#if defined(__i386__)\n"; \
--		printf "#include \"libffi-darwin-i386/include/ffitarget.h\"\n"; \
--		printf "#elif defined(__x86_64__)\n"; \
--		printf "#include \"libffi-darwin-x86_64/include/ffitarget.h\"\n";\
--		printf "#elif defined(__ppc__)\n"; \
--		printf "#include \"libffi-darwin-ppc/include/ffitarget.h\"\n";\
--		printf "#endif\n";\
--	) > $(LIBFFI_BUILD_DIR)/include/ffitarget.h
--else
--$(LIBFFI):		
--	@mkdir -p $(LIBFFI_BUILD_DIR)
--	@if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \
--	    echo "Configuring libffi for $(PLATFORM)"; \
--	    cd $(LIBFFI_BUILD_DIR) && env CC="$(FFI_CC)" LD="$(FFI_LD)" CFLAGS="$(FFI_CFLAGS)" \
--		$(FFI_CONFIGURE) > /dev/null; \
--	fi
--	$(MAKE) -C $(LIBFFI_BUILD_DIR)
--endif
-+#ifeq ($(OS), darwin)
-+#build_ffi = \
-+#	mkdir -p $(BUILD_DIR)/libffi-darwin-$(1); \
-+#	(if [ ! -f $(BUILD_DIR)/libffi-darwin-$(1)/Makefile ]; then \
-+#	    echo "Configuring libffi for $(1)"; \
-+#	    cd $(BUILD_DIR)/libffi-darwin-$(1) && \
-+#	      env CC="$(CCACHE) $(CC)" CFLAGS="-arch $(1) $(FFI_CFLAGS)" LDFLAGS="-arch $(1)" \
-+#		$(FFI_CONFIGURE) --host=$(1)-apple-darwin > /dev/null; \
-+#	fi); \
-+#	env MACOSX_DEPLOYMENT_TARGET=10.5 $(MAKE) -C $(BUILD_DIR)/libffi-darwin-$(1)
-+#	
-+#$(LIBFFI):
-+#	@mkdir -p $(@D)
-+#	@for arch in $(ARCHES); do $(call build_ffi,$$arch);done
-+#	
-+#	# Assemble into a FAT (i386, x86_64, ppc) library
-+#	@mkdir -p $(BUILD_DIR)/libffi/.libs
-+#	@env MACOSX_DEPLOYMENT_TARGET=10.5 /usr/bin/libtool -static -o $@ \
-+#	    $(foreach arch, $(ARCHES),$(BUILD_DIR)/libffi-darwin-$(arch)/.libs/libffi_convenience.a)
-+#	@mkdir -p $(LIBFFI_BUILD_DIR)/include
-+#	$(RM) $(LIBFFI_BUILD_DIR)/include/ffi.h
-+#	@( \
-+#		printf "#if defined(__i386__)\n"; \
-+#		printf "#include \"libffi-darwin-i386/include/ffi.h\"\n"; \
-+#		printf "#elif defined(__x86_64__)\n"; \
-+#		printf "#include \"libffi-darwin-x86_64/include/ffi.h\"\n";\
-+#		printf "#elif defined(__ppc__)\n"; \
-+#		printf "#include \"libffi-darwin-ppc/include/ffi.h\"\n";\
-+#		printf "#endif\n";\
-+#	) > $(LIBFFI_BUILD_DIR)/include/ffi.h
-+#	@( \
-+#		printf "#if defined(__i386__)\n"; \
-+#		printf "#include \"libffi-darwin-i386/include/ffitarget.h\"\n"; \
-+#		printf "#elif defined(__x86_64__)\n"; \
-+#		printf "#include \"libffi-darwin-x86_64/include/ffitarget.h\"\n";\
-+#		printf "#elif defined(__ppc__)\n"; \
-+#		printf "#include \"libffi-darwin-ppc/include/ffitarget.h\"\n";\
-+#		printf "#endif\n";\
-+#	) > $(LIBFFI_BUILD_DIR)/include/ffitarget.h
-+#else
-+#$(LIBFFI):		
-+#	@mkdir -p $(LIBFFI_BUILD_DIR)
-+#	@if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \
-+#	    echo "Configuring libffi for $(PLATFORM)"; \
-+#	    cd $(LIBFFI_BUILD_DIR) && env CC="$(FFI_CC)" LD="$(FFI_LD)" CFLAGS="$(FFI_CFLAGS)" \
-+#		$(FFI_CONFIGURE) > /dev/null; \
-+#	fi
-+#	$(MAKE) -C $(LIBFFI_BUILD_DIR)
-+#endif
- clean::
- 	# nothing to do - ant will delete the build dir
- 
diff --git a/dev-java/jffi/files/jffi-1.2.2_no-werror.patch b/dev-java/jffi/files/jffi-1.2.6_no-werror.patch
index 25b7e4f8ec00..25b7e4f8ec00 100644
--- a/dev-java/jffi/files/jffi-1.2.2_no-werror.patch
+++ b/dev-java/jffi/files/jffi-1.2.6_no-werror.patch
diff --git a/dev-java/jffi/jffi-0.6.0.2-r1.ebuild b/dev-java/jffi/jffi-0.6.0.2-r1.ebuild
deleted file mode 100644
index 6e66f46e9563..000000000000
--- a/dev-java/jffi/jffi-0.6.0.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-0.6.0.2-r1.ebuild,v 1.3 2012/08/25 19:09:47 thev00d00 Exp $
-
-# Probably best to leave the CFLAGS as they are here. See...
-# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
-
-EAPI="2"
-JAVA_PKG_IUSE="source test"
-WANT_ANT_TASKS="ant-nodeps"
-inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic versionator
-
-DESCRIPTION="An optimized Java interface to libffi"
-HOMEPAGE="http://kenai.com/projects/jffi"
-SRC_URI="mirror://gentoo//${P}.tar.bz2"
-LICENSE="LGPL-3"
-SLOT="0.4"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5
-	virtual/libffi"
-
-DEPEND=">=virtual/jdk-1.5
-	virtual/libffi
-	test? ( dev-java/ant-junit4 )"
-
-JAVA_PKG_BSFIX_NAME="build-impl.xml"
-JAVA_PKG_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5"
-
-java_prepare() {
-	# Delete the bundled JARs.
-	find lib -name "*.jar" -delete || die
-	# Delete the bundled libffi
-	rm -rf jni/libffi || die
-
-	# bug #271533 and #272058
-	epatch "${FILESDIR}/${PV}-makefile-flags.patch"
-
-	# bug #272058
-	append-cflags $(pkg-config --cflags-only-I libffi)
-
-	# any better function for this, excluding get_system_arch in java-vm-2 which is incorrect to inherit ?
-	local arch=""
-	use x86 && arch="i386"
-	use amd64 && arch="x86_64"
-	use ppc && arch="ppc"
-
-	# Fetch our own prebuilt libffi.
-	mkdir -p "build/jni/libffi-${arch}-linux/.libs" || die
-
-	ln -snf "/usr/$(get_libdir)/libffi.so" \
-		"build/jni/libffi-${arch}-linux/.libs/libffi_convenience.a" || die
-
-	# Don't include prebuilt files for other archs.
-	sed -i '/<zipfileset src="archive\//d' custom-build.xml || die
-	sed -i '/libs.CopyLibs.classpath/d' lib/nblibraries.properties || die
-	sed -i '/copylibstask.jar/d' lib/nblibraries.properties || die
-
-	# Fix build with GCC 4.7 #421501
-	sed -i -e "s|-mimpure-text||g" jni/GNUmakefile || die
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
-	use source && java-pkg_dosrc src/*
-}
-
-src_test() {
-	ANT_TASKS="ant-junit4 ant-nodeps" eant test \
-		-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
-}
diff --git a/dev-java/jffi/jffi-0.6.0.2.ebuild b/dev-java/jffi/jffi-0.6.0.2.ebuild
deleted file mode 100644
index 964b8d2a83ca..000000000000
--- a/dev-java/jffi/jffi-0.6.0.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-0.6.0.2.ebuild,v 1.2 2012/08/25 19:09:47 thev00d00 Exp $
-
-# Probably best to leave the CFLAGS as they are here. See...
-# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
-
-EAPI="2"
-JAVA_PKG_IUSE="source test"
-WANT_ANT_TASKS="ant-nodeps"
-inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic
-
-DESCRIPTION="An optimized Java interface to libffi"
-HOMEPAGE="http://kenai.com/projects/jffi"
-SRC_URI="mirror://gentoo//${P}.tar.bz2"
-LICENSE="LGPL-3"
-SLOT="0.4"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5
-	virtual/libffi"
-
-DEPEND=">=virtual/jdk-1.5
-	virtual/libffi
-	test? ( dev-java/ant-junit4 )"
-
-JAVA_PKG_BSFIX_NAME="build-impl.xml"
-
-java_prepare() {
-	# Delete the bundled JARs.
-	find lib -name "*.jar" -delete || die
-	# Delete the bundled libffi
-	rm -rf jni/libffi || die
-
-	# bug #271533 and #272058
-	epatch "${FILESDIR}/${PV}-makefile-flags.patch"
-
-	# bug #272058
-	append-cflags $(pkg-config --cflags-only-I libffi)
-
-	# any better function for this, excluding get_system_arch in java-vm-2 which is incorrect to inherit ?
-	local arch=""
-	use x86 && arch="i386"
-	use amd64 && arch="x86_64"
-	use ppc && arch="ppc"
-
-	# Fetch our own prebuilt libffi.
-	mkdir -p "build/jni/libffi-${arch}-linux/.libs" || die
-
-	ln -snf "/usr/$(get_libdir)/libffi.so" \
-		"build/jni/libffi-${arch}-linux/.libs/libffi_convenience.a" || die
-
-	# Don't include prebuilt files for other archs.
-	sed -i '/<zipfileset src="archive\//d' custom-build.xml || die
-	sed -i '/libs.CopyLibs.classpath/d' lib/nblibraries.properties || die
-	sed -i '/copylibstask.jar/d' lib/nblibraries.properties || die
-
-	# Fix build with GCC 4.7 #421501
-	sed -i -e "s|-mimpure-text||g" jni/GNUmakefile || die
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	use source && java-pkg_dosrc src/*
-}
-
-src_test() {
-	ANT_TASKS="ant-junit4 ant-nodeps" eant test \
-		-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
-}
diff --git a/dev-java/jffi/jffi-0.7_pre20100131.ebuild b/dev-java/jffi/jffi-0.7_pre20100131.ebuild
deleted file mode 100644
index f2d44debcbe6..000000000000
--- a/dev-java/jffi/jffi-0.7_pre20100131.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-0.7_pre20100131.ebuild,v 1.3 2012/08/25 19:09:47 thev00d00 Exp $
-
-# Probably best to leave the CFLAGS as they are here. See...
-# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
-
-EAPI="2"
-JAVA_PKG_IUSE="source test"
-WANT_ANT_TASKS="ant-nodeps"
-inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic versionator
-
-DESCRIPTION="An optimized Java interface to libffi"
-HOMEPAGE="http://kenai.com/projects/jffi"
-
-TREE_HASH="6c5fb4a241a747f7c8561156ed81fbee52a0174f"
-SRC_URI="http://github.com/wmeissner/jffi/tarball/${TREE_HASH} -> ${PN}-git-${PV}.tgz"
-S="${WORKDIR}/wmeissner-${PN}-${TREE_HASH:0:7}"
-
-LICENSE="LGPL-3"
-SLOT="0.4"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5
-	virtual/libffi"
-
-DEPEND=">=virtual/jdk-1.5
-	virtual/libffi
-	virtual/pkgconfig
-	test? ( dev-java/ant-junit4 )"
-
-JAVA_PKG_BSFIX_NAME="build-impl.xml"
-JAVA_PKG_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5"
-
-java_prepare() {
-	# Delete the bundled JARs.
-	find lib -name "*.jar" -delete || die
-	# Delete the bundled libffi
-	rm -rf jni/libffi || die
-
-	# bug #271533 and #272058
-	epatch "${FILESDIR}/${PN}-0.7-makefile-flags.patch"
-
-	# bug #272058
-	append-cflags $(pkg-config --cflags-only-I libffi)
-
-	# any better function for this, excluding get_system_arch in java-vm-2 which is incorrect to inherit ?
-	local arch=""
-	use x86 && arch="i386"
-	use amd64 && arch="x86_64"
-	use ppc && arch="ppc"
-
-	# Fetch our own prebuilt libffi.
-	mkdir -p "build/jni/libffi-${arch}-linux/.libs" || die
-
-	ln -snf "/usr/$(get_libdir)/libffi.so" \
-		"build/jni/libffi-${arch}-linux/.libs/libffi_convenience.a" || die
-
-	# Don't include prebuilt files for other archs.
-	sed -i '/<zipfileset src="archive\//d' custom-build.xml || die
-	sed -i '/libs.CopyLibs.classpath/d' lib/nblibraries.properties || die
-	sed -i '/copylibstask.jar/d' lib/nblibraries.properties || die
-
-	# Fix build with GCC 4.7 #421501
-	sed -i -e "s|-mimpure-text||g" jni/GNUmakefile || die
-}
-
-src_install() {
-	mkdir -p "${T}"/com/kenai/jffi
-	cat - > "${T}"/com/kenai/jffi/boot.properties <<EOF
-jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
-EOF
-
-	pushd "${T}" &>/dev/null
-	jar -uf "${S}"/dist/${PN}.jar com
-	popd
-
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
-	use source && java-pkg_dosrc src/*
-}
-
-src_test() {
-	ANT_TASKS="ant-junit4 ant-nodeps" eant test \
-		-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
-}
diff --git a/dev-java/jffi/jffi-1.2.2.ebuild b/dev-java/jffi/jffi-1.2.6.ebuild
index fedb1980deb2..f9b1d6a8471f 100644
--- a/dev-java/jffi/jffi-1.2.2.ebuild
+++ b/dev-java/jffi/jffi-1.2.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.2.ebuild,v 1.2 2012/05/28 19:33:58 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.6.ebuild,v 1.1 2013/02/07 13:15:36 sera Exp $
 
-EAPI="4"
+EAPI="5"
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -41,7 +41,7 @@ JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
 src_compile() {
 	# generate Version.java
-	cat <<-EOF > src/main/java/com/kenai/jffi/Version.java
+	cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
 		package com.kenai.jffi;
 		public final class Version {
 			private Version() {}
@@ -83,7 +83,7 @@ src_test() {
 }
 
 src_install() {
-	cat <<-EOF > boot.properties
+	cat > boot.properties <<-EOF
 		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
 	EOF
 	jar -uf target/${PN}.jar boot.properties || die