From 4176069e6e0421083dcfee27a97420264db05410 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Sat, 14 Mar 2015 09:39:09 +0000 Subject: [PATCH] Long overdue version bump. Drop cache size patch as requested by Bobby Kent. Strip DOS line endings from source to stop upstream from breaking our patches every release. Signed-off-by: Ryan Hill Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x957A8463 --- net-p2p/vuze/ChangeLog | 15 +- net-p2p/vuze/Manifest | 37 ++--- net-p2p/vuze/files/build.xml | 136 ++++++++-------- .../vuze/files/vuze-5.3.0.0-cache-size.patch | 11 -- net-p2p/vuze/files/vuze-5.3.0.0-java5.patch | 16 +- .../files/vuze-5.3.0.0-remove-classpath.patch | 14 +- .../vuze-5.6.0.0-commons-lang-entities.patch | 51 ++++++ .../vuze-5.6.0.0-invalid-characters.patch | 26 ++++ net-p2p/vuze/vuze-5.3.0.0.ebuild | 12 +- net-p2p/vuze/vuze-5.6.0.0.ebuild | 145 ++++++++++++++++++ 10 files changed, 342 insertions(+), 121 deletions(-) delete mode 100644 net-p2p/vuze/files/vuze-5.3.0.0-cache-size.patch create mode 100644 net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch create mode 100644 net-p2p/vuze/files/vuze-5.6.0.0-invalid-characters.patch create mode 100644 net-p2p/vuze/vuze-5.6.0.0.ebuild diff --git a/net-p2p/vuze/ChangeLog b/net-p2p/vuze/ChangeLog index ae7c92506984..9e9f839f4d97 100644 --- a/net-p2p/vuze/ChangeLog +++ b/net-p2p/vuze/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for net-p2p/vuze -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.63 2014/08/09 12:10:15 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.64 2015/03/14 09:39:07 rhill Exp $ + +*vuze-5.6.0.0 (14 Mar 2015) + + 14 Mar 2015; Ryan Hill vuze-5.3.0.0.ebuild, + +vuze-5.6.0.0.ebuild, -files/vuze-5.3.0.0-cache-size.patch, + files/vuze-5.3.0.0-java5.patch, files/vuze-5.3.0.0-remove-classpath.patch, + +files/vuze-5.6.0.0-commons-lang-entities.patch, + +files/vuze-5.6.0.0-invalid-characters.patch, files/build.xml: + Long overdue version bump. Drop cache size patch as requested by Bobby Kent. + Strip DOS line endings from source to stop upstream from breaking our patches + every release. 09 Aug 2014; Agostino Sarubbo vuze-4.8.1.2-r1.ebuild: Stable for ppc, wrt bug #432146 diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest index a91dd8a755d7..74a9e3a20536 100644 --- a/net-p2p/vuze/Manifest +++ b/net-p2p/vuze/Manifest @@ -1,42 +1,39 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX build.xml 2343 SHA256 56fe791e654e16bafdac9783a1290576fa39fc3e83af162475937a76bfcc8469 SHA512 30a1a2ddd67122352edc9f212acdb3ebff32a6418904903115a8a7bf83ef4298c9fc602881cbfb7c37cc57384bf649cd02e32597ce16a5c6fcb0b09dadad8fa5 WHIRLPOOL dfaeaefd65d410428287454a9161f553edd186947bd65c82b80351b2bb9316cbaf7ecdad3d21e487afa1fca3f3852e905d06e8c5db7d691b4e70439a7dddb64b +AUX build.xml 2275 SHA256 9fb2a2f672a8a8aaede04b178c8c593132cc12bd8fcd6f3eee0421037411b542 SHA512 bdec7c10548ed2fda57235d14f0ae67e00e548a84b88855b5b683c947015b52bcf7011fb5952b4225370db54541614c0402fe6c77e723d310358a502837b40a3 WHIRLPOOL 67c11cd6d36178a68c784632e9bba040d0cf3d55b67f409fdb97af8f1d874d5b71099ed6671067170336894d46837041203eff35152916fb6e8c8e518043c97f AUX vuze-4.1.0.0-pre 1850 SHA256 aae3963e55330eb292176052a2cd72b8a9c322fd63fb71bb0fe6456df7d329e5 SHA512 04c5a77bff69e50963f3122c46f549dec78e462bfa0697b32ffe8630d22612a64f1adc52bc8d7d8868d972c4bdac3082a1e9b513459d9f97915ad87d05ab2b4a WHIRLPOOL 8d20a2850dc9724f3e02bc69158faaee931035fd98d7c902c6973e7197db17908e6bc67deeb516bba1fd4b4ff8defc4ca67beb8b11a6305fa09e8296d06f9c19 -AUX vuze-5.3.0.0-cache-size.patch 503 SHA256 f7548d2dc970d4111c41f4f780a65415ab7050db842b89a3155f6920c7bd1afb SHA512 2d28e172edd38f8394d392578e6e15c9a43743db54527b088d384b804fb8106d19bc325ff7e8bc1667a06c921b40c61e3831fbcea38eabe5fe31322f11f6d392 WHIRLPOOL 14b84d9d3973b3a7421b3b1910d6f8d970da39e57c242da8e8872dfec6055d2b3df857894076320b31a0d971f9b1ac6ff155343d4488ec176dcdf80342e5e9d1 AUX vuze-5.3.0.0-disable-osx.patch 1841 SHA256 8d37e1090e938d91fc539d043f0b82dd9106dfd38c6c621824f6041d7137cee3 SHA512 f5c60b188eb5e4c48dfd73c9de03c4eb0884dfb36f147d6ef4be6d2e26602d7de6f80de4be4a64d94c1d9ad9cdbbd928b1cd4e00f09c57e8eb72d7d0f623e1c7 WHIRLPOOL b931704e6cad2f2f03b67bd00bab31243fe73055416da575782e8fe642705f0ed97a3707dcf1fadfbda412b11835f900bf6d4fd443ff5aeb5b327bf6d95290fc AUX vuze-5.3.0.0-disable-shared-plugins.patch 1069 SHA256 248f5a570e6099def1d155c2aab1dff4c2aa1fea81fac8f53a1da4900b9b360f SHA512 ee9e6513b2dd1d4e986f4c57fd5ace3593f98f7eaeb5e454fc7b5fb3c6876b86b85b511981c951ead96b1a106abb18a2e01047b2063d55c98300ed6356c0460b WHIRLPOOL 9ef8f3e640f8d7d5b62dcbb14013eb6193b42d0b884b1189124350d9678dcc748971d3260808b1939dbc2e2204f3d58526fc87f25df4d8f1946e5c40cbf75d8d AUX vuze-5.3.0.0-disable-updaters.patch 1726 SHA256 fac23c094c3ab83cbcb89ce77d5123737729817f53d60ecefd7498df6f0e2bde SHA512 743d48eeeac4534fc66463c0989a88d97117d988227b6cce77abdaa97c9cb9813aa1228f81a607af09e07fdf95ce02a3981f7f083fba0d9875d0951b8bbf29a3 WHIRLPOOL 2a4a78694043d651c5c072dd43607809cad0e528ab5741a4ddf2cf440a0649f1394c08420e35359b271567c7e933a4d1792c92224a64eeadb26778cbc33f49d2 AUX vuze-5.3.0.0-invalid-characters.patch 945 SHA256 38c27cf4b7b143140cfb430b87205fa597d47ee97ba12262f64948aeba97e9f1 SHA512 cdde620a54c2ca084a44d4b7dda147960f17324aa4003cc70282f2f3b761727d2053ebd00bbd2380c43ddfcc60b231f71a2f8d8b2e64b059c50f98816f96fe48 WHIRLPOOL f0c55f3a0338deefb7cf0b2998115890bbfcfc94ec63c9bfbd5590d1f6bc3f1f34718e500d8a5426c1dfe6c6a189c93f8ab06aece041ebfc835d59990532f8a2 -AUX vuze-5.3.0.0-java5.patch 626 SHA256 e9538f674fd59f41f0874ccbeda4a655df27df61acc6e53ff667289929cabd5a SHA512 1e4d1122e4eb27599b150b80d49cba670bd992baa3ffb504d58a6d2451a382150471f5b98a745ee84349a704fcf19cc6cd71aea29a0552714171eb473225d998 WHIRLPOOL c39771fa61ddcd2ab06acac500d0888520cfe85fd394ef5e7d7b8be33664bd31a2c5f46403c740e19050401abaa6a7a432930c4763d0f213cf0197967e59dec4 -AUX vuze-5.3.0.0-remove-classpath.patch 552 SHA256 03d62f17876dc98b10fee128a2d551c05c10ea7e11277e2edb2e3d6bf11cbacd SHA512 2de68c3aba1f3fc2af1b077eb0ea40949d6260b9be0f3afadb865f5f76e69fd4b1d8414b2b1cf0dc6a8073ca9dffbca48f5285f03b535679721681b006d9d7e5 WHIRLPOOL 1708dd2cb17141264ed7c9b01ac2aa8d0d5f04af03c81caead402292339cfb8a3d54fde9888e75650247f409e5f81d2d57e5a689cdaeafd0979b4090ab7fdd0e +AUX vuze-5.3.0.0-java5.patch 618 SHA256 58f30c1c20ae73048b222dbbfa169f2f200dc11be735f099cf375f06b0a1abce SHA512 0ecddf69a7fdd72860262cc73dd4a0852ba8e31d73dfc7ad1d96ad18eaa41ec23ca977207d6bff32e183d95c1a6918909ef3cab697d0c9d754345613544eb90c WHIRLPOOL 77bb1707d77605822c904e35c7fa40f5f2c29a04340cadb203631c4a0ba6cda3898f53beea105ea4d2614eda40d3374903f7ccd88ba69375e73b905a705c659c +AUX vuze-5.3.0.0-remove-classpath.patch 545 SHA256 9bf7ebca70dc2eee23f8747295abfab1d68cdb11311de3e83add4557cfa1a4d5 SHA512 867e932eab1f33af6a8320cbe1f1cf565b68f39c6e1c0188dada018de4b50823047a7e9a53d558c00fe2253c48e4e6276e7725681b33a115de694c43265cf42c WHIRLPOOL 28f0912f002b481f9ab4dac182cf201518c727193438e88e3c04fc8200fa50b4edf6a6a5ccb7375cbb655827689132aec6a7f1b2e845eac933ddf03785f1b175 AUX vuze-5.3.0.0-unbundle-commons.patch 4741 SHA256 b7aea040bd7b307ac19b1937bf46691cfd37c73721fa459d4ca6a40f13645fcd SHA512 b6ea60f966e5c5d5c1118bf4d479175eb890c231c5c7324a7216b7791882217803d06de4780f63818aac34bd95172a211bbbe559843e9a89cc511fac29bc307d WHIRLPOOL b4ea72019bf4528b73cd21bdcbab584ead025ccbf1dc11857e4c7d6175c13fe8e68af2d68034b9e0718b56f14910f0804db52ba60f8e84981bdd354369c008a1 AUX vuze-5.3.0.0-unbundle-json.patch 1322 SHA256 61c0df3a1ecbfdec9845a3e4789030e014a700138caaa761dd430f45936dd91f SHA512 60b8dc8216f5f51a4cb6c6b793d1b31b686f63d03e373741d76856a594468fa5c97781fc99fc9af30f2db8173bb86414cd52cb30ea7ebeac5a018633f661ce26 WHIRLPOOL 52d5da03ee31316d0a6c4ebc2d3e4d59ee88ca228d74345171ef90909f25bcaafeb36594cec16f427bf32524a0c4da7b0726313dcfc856690eca61d9f4bb2c23 AUX vuze-5.3.0.0-use-jdk-cipher-only.patch 1594 SHA256 f5912134e4f3548fe1dd48b9387c3ad3c71b1089c2b5acfad6cbcad7334a5dd7 SHA512 151469d6ac3c93166491c6ffb75361dd7b47a274d2fe50b72a7a916ddf42c8214aae6e293fab17b9cc36139c846660f90b075d1b9e9dd042e65fdd7da924f9fc WHIRLPOOL 1fb11e6aceb0e460c349938146fbc1268447d59bbc6ed15ce0ff43889f5c0b92d9db7c94ade918b271d5f8099a6f5f5630997ec49d72ff0274118a433125e9f3 +AUX vuze-5.6.0.0-commons-lang-entities.patch 2085 SHA256 52515b513089e549d488d84b2c88f160735d9b7ef75da1e998df8f616e3fe9f6 SHA512 a08d23a1947ad668048f49c8137d4494da662d65f5cf98acd5e44656f7d6a2bf691eebba4fd8033996594d1c4edc1a2eec3ce3f92d23b1818c03b405fc081899 WHIRLPOOL a6447983dc9e7ff0e26ced10f5298b6ee1996549643c67aa693e7eff58b77a9708574066823ed0110d08603fa12eaa017fdb43738166007f49f75f116c3a6788 +AUX vuze-5.6.0.0-invalid-characters.patch 1121 SHA256 8f00bc2477c01853a352b6afc1e186dacb97161c3d9d199205e2d68e3bef6a2a SHA512 718c64a892aa860455db4c23f97d403c77bbba0fd1ecf957761f7c7dfcb9c8b42ed75b1f3e706f3d67335ed38599fbc6f9e2731941bdf819d956e830a8227344 WHIRLPOOL 9b432134579a88c5bdac0942ec019172583f2292453e09d3584e73079e9601992b08672e6e5d2d989fa11562d74bc569143309ead78a26dcf8f9eff6f51762b5 AUX vuze.desktop 164 SHA256 4fbc293d66810bcd4eec210d00d5ea97f5e49acdd10197a52e361ed11b8718ed SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480 WHIRLPOOL 822e059e377141864f465d4de7915651a609ef69c8d67eedc85bd1c60a2b605882cad0c63b592329b369e34f8877e1c36bc344f414be20818bccf39d1f88ec25 DIST Vuze_4510_source.zip 9181967 SHA256 f92360f48e87c3a1d3edcfc2239ef69276792584292e00a48eac1eac4bd22e7f SHA512 cbac307372cfa6b09db0b7d3f3e73c8039db7a6e0dd270513bc8f9e96721c88e024b5998e0d133883c6f701e76f1b36fc9c7bfc7573c6b6c1c82b3179be429c5 WHIRLPOOL bd6fd25b75b4cc16213d478588b313ba69ff4ee4eaf1c11ad0e01ee4074222cb77739f13001ddd881a5b77002ac3cb0a9e3accc44691c2720f94ea7df499a158 DIST Vuze_4812_source.zip 9530217 SHA256 8ad02ae61ac1c515cb3226b95b34d4fe036faa64e725b64fdcb5ef7d1cb9633d SHA512 7007c91f829c57d0f08b9da4ea3fcc8820efe14aeec7286cf764e5ac2d7d165f3a14abc6b0e92a617e21b45803f7c121fb00ddd8c5e8d9664509eb3337fc65bf WHIRLPOOL bc8823e053fa2f86161234c77f4873f2035a111361d60ee8c75937710774defec577651a10acf909bb170e600dc2775a5dbe2cf626649729e86f4a04e02a46d9 DIST Vuze_5300_source.zip 10015198 SHA256 556149f09f48c533a37d80526ac655f0bc067f3a6bf3f3c4483f5273ac74ebc7 SHA512 44bad9f04707ae37acb66f16ae94afd7ad24d245f0371f60241442f460277c5b8dd29476640eb1e04b468b3ebd0100a159d1027764445ab526e3e0c0c544296d WHIRLPOOL 801e398eaf8b8457dc02336039bc8a64e535544ff1ea99ff100b623f734a499147e9abd8ce3031ebb0f1e5bb0e04a9c160e06fe5c0b16f12b31caf920f711d4a +DIST Vuze_5600_source.zip 10398501 SHA256 1aa6148311969ce6c51333b7ef51bcc8713e222fa5d14b2448e97aebbd25ea5e SHA512 dfe557cb1f50be935c78ee4431bc14db5f0107eebab8545cf925de8b0d48bb91ca77f7feab54a5fd91aaaf50bd3c68c1519cf49c2eb4d145ff7794bf9f22cfd7 WHIRLPOOL 62b637b5fc8145c31bdfb0ca2f63bdd9ee9c70d3afde3cb693ede66c0ab6db593f412ab124ac1230f1bbf33ff9ce635e29a0cea7556f013fcb7144aacb98c0d0 DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 SHA256 972cf16d88d8605f93b77a84770b6512d54ae8281a0d4c06b66890a69deb6c49 SHA512 aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d WHIRLPOOL a7dd533676c428a00caddc2d4d4c008feec1a1201bb9aef7b7ed9c25d41405344d89bc9f70d442f043beb7aaf6db7d73582cc46edfa3665d599b2635e51b1ee7 EBUILD vuze-4.5.1.0-r1.ebuild 3993 SHA256 7ecd564c4ac093577426525490f075d7941454a3843c81b12042a3122780c358 SHA512 45471f3301525748689e59d4f1ea873502e34e704c63288c678927b99fdf16457ac641b57dcf41043213dc1f1fd2aa6480cbbb0d4127e0e054f820870ad7da00 WHIRLPOOL 5c65c6f4f7e0f9fc479ae051d7c90ef6789584344c1fed853f7ce25d632248cc499d8085c05358ded8e5cbade7810620ad2684ea87a8aff5f344d4d6a020712d EBUILD vuze-4.8.1.2-r1.ebuild 4385 SHA256 d57c2f0ed2c2a7ca4fb8e036d7fd9e345dc76aa0952be6a7c721bd6f06f894ff SHA512 cf0eac9c9fa7da15158f6f709bd0e8d1872467233ee48be969627278b5048379f0b3b822aa658c042dfebe13bc4b06c9eca2ac781369170c601d07557d160fda WHIRLPOOL 2b32c4036cfd37895b5b8fa879bf68f1c7465556e1f6c4892cc38e9142400271d573021d17c99ab6ee4f38a5e377e94ac67c3496397b650e17adc10828692f04 -EBUILD vuze-5.3.0.0.ebuild 4290 SHA256 5c84f9fe31d0bdab151a072adf884ae3f3eecae73f7ec1e07bef46ba41338a08 SHA512 b3e8bd84e55130df5fadead6fcadca95c8cad60ac7242786803b334eab54011391a1e4d58bdc975764ba0543a7d273b7930f05ac935bbe9ac35833a191227c43 WHIRLPOOL df7ad4b6cc122e23b9c2224f8f1c0b650893e60ff214383d6f929648fece56c3ece5c1f6e3282a05f3704eb61822ac99f4eef8641515a65c0bbb82920fe2a2b0 -MISC ChangeLog 28377 SHA256 17ad53bdcf9f8d6ca40c19d824bce42c8b922b207e36ba0351d1f3b1293afd5d SHA512 829a9a503e877ecff5969b675e7b08bf846586bb44844cfd802a521cc3b4a22f6e26501a9233e078b3208ca9ce517bf45510ac4c8865854d521e3c6395978cb5 WHIRLPOOL 6ed327fd0b7c9dff17f277a01890c7dca1bc27f40e6ae10c84140623da606975a1909536011f8ed22cea56b4f062a180cff75822353397195b4ec146f44ca9d2 +EBUILD vuze-5.3.0.0.ebuild 4376 SHA256 4636b13e21cf2d6729930eb2a1a73908cc2aa007194dba53c6b2c77bf59de4fd SHA512 19df9c5337969d4b23b7303935081bc444505459e9cfaeef6567ad96869c1cb6f7f8fe80c743eb9c9a090b1a9a1b18284d5b6da1ca572439de0ec7589da54793 WHIRLPOOL 9880b54f8ead62c5f3ed4bc364b80f721e0a4d60982aa92d9103b6fd2522ac8cc3c021b207ff485570d7e16d024a9548d73bf0c6ce7cf3e97367abf1b708715c +EBUILD vuze-5.6.0.0.ebuild 4512 SHA256 605cdc8c83c7e13e503f6a7aaafbceaf93e3acbbd7dd073801c6af3d7e846884 SHA512 ed4aafeb6ed803f945a5c506ad3957fe6b47dc2700da910879d0c1f9ad9f3557b5a33c1986e1d81a246620a32a525e9b82b01c232df9aa3f56e021c9bf31a7ce WHIRLPOOL ffd354ae72c2935790ec01626e03027abd61fb937c64066a893953e3a62df392408262f9aed3f16faffb4449eb3ffd393f5ecd625cd29f52ed233d7ad09cd867 +MISC ChangeLog 28905 SHA256 bd63beba8ea7cb088b7fffa5215570b6735b84b388823dd3f97932effe8f0f58 SHA512 45f36a69a7d379e05e4fbb2c7eee1e3bb931fb259b6d35fbfbf526ab5b78830c0f8f273247c99376b6f958143c956b496e6bf4da6caf701cca01b8923d63485a WHIRLPOOL 77779d13cf308630822aa4d1c712db9721df961a616d769f1b8f9cc6001ff9603ba3aa3ce352557880ca0ae6757786673f489706ec1744e288adcc8c8a49449b MISC metadata.xml 246 SHA256 904c21f9fa2947f92f79cce43db178f3d14362d6180ec0503f206086ab083a0c SHA512 756b73a6283fd01672e9a6ccf1fb9656f5596a660e2c3ed6ea767338f082f2a516f2e736ca34932c98e454bddd0fcffc045cfc740474c36849d6d4009b9444d2 WHIRLPOOL 0c63202860bfc9050faa22d7f75094e43ad5188483e04462f0aa4f50839b870ffe1fed4d516c8105f05e401c0e84bef0fc52883685c548324f8693fcfa1a49b8 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQIcBAEBCAAGBQJT5g+oAAoJELp701BxlEWf5XsQAMBheFbcNdPMXLiIkdqEG0Vm -+XqYDQ4hvFo/AJ82ct1FHS+MGgL3/8Tb8T8gm7pKCF+VhtO0W6W8UVDD6JBhANFp -088o3zLDBJfQjifA5QS00uPQbwn3caXByOlq0GSwxuEf3kFUUsUXU2uCH2f5jZ1d -GTFrilLVtmjArk5iBaDNjuOCNPTeM1TKpkRLYQB/e2mjJUIuihjn+/z+p/8jPJUl -zPW+Gzxge1DHBPgAQb/Z6mcJKlERBnfVszr5O5ryDOlZ4YOMcp2lF/wIFGO+c5Jp -qEpZklVw0IO71DHV/wdMt6uV3Uoezn9B3q2S2/czxRoErqqfns6RSeQPt84YHijm -MXJL3BZSdZ3wn6dIGYFeKjb/ujjGY5Pni4gCJ7duw4IDK+wr6onXsFt9GZrMTEIr -o51TJ6IoFTowDrh74xD60JuA8tNaRXBqyWTrZWwxvtOzq6TZqB6Rppt/n8X3YSeh -AAjRnIbBn7OMne9+pAiV346vY/oL/WjQWcyOhJEeCJp6cpWrTOKGEGs0nG6isF7l -1V1TLCr3ZZe9mIX7Gt1gpI7bVBU+VYgo1duN69lnhAaDGdwk1ywYP5D9jHizg9O2 -3qp6tOLSBubt23fNy+E8b7t4fsUiVxrU9mXnuwYV8xnHf4p2NRVIJoI4i5tPwDEo -3zI9qHBY6PyvkB/12+RZ -=AuqI +iQEcBAEBCAAGBQJVBAIOAAoJEO04vUmVeoRjBokH/35Q2JpvAjJRB7MCUxICTSDl +4E32lv8GBeai/xb4EMznjojqIR+daYPv6v3elilu5FdTjRAdp/9J2UgQfNoyz8Qe +14Trapckwzq7yzB909+owfjlNzogwCqJAUFXdSdI/52GdOJX0ahaZCYLYcK7iyri +mrFgyHeRGjqTEVNkOIT6Q/XMklvbVB41di8EHyib0L9fyc/bU7Oxqb6PLYC202Nk +cg8u3GTodbn4IE3ECrex66HX1V3Gd/+a+jrNztA8w2Fv4GXvfM3+6jr5U+7qn1/r +Ojp3N4cBHiZc7c+WsWTxSak9A0JEEKofw5JDK8aVddKpdysnLhTCSXqdT0qHOHE= +=6FPP -----END PGP SIGNATURE----- diff --git a/net-p2p/vuze/files/build.xml b/net-p2p/vuze/files/build.xml index ee83cf995f63..7b060c14b2f2 100644 --- a/net-p2p/vuze/files/build.xml +++ b/net-p2p/vuze/files/build.xml @@ -1,68 +1,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-cache-size.patch b/net-p2p/vuze/files/vuze-5.3.0.0-cache-size.patch deleted file mode 100644 index 16f9ffa7374d..000000000000 --- a/net-p2p/vuze/files/vuze-5.3.0.0-cache-size.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/org/gudy/azureus2/core3/config/COConfigurationManager.java -+++ b/org/gudy/azureus2/core3/config/COConfigurationManager.java -@@ -52,7 +52,7 @@ COConfigurationManager - public static final int CONFIG_CACHE_SIZE_MAX_MB; - - static{ -- long max_mem_bytes = Runtime.getRuntime().maxMemory(); -+ long max_mem_bytes = Math.min (Runtime.getRuntime().maxMemory(), 64*1024*1024); - long mb_1 = 1*1024*1024; - long mb_32 = 32*mb_1; - int size = (int)(( max_mem_bytes - mb_32 )/mb_1); diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch b/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch index 9b19015f3b36..b6d2a59c43a2 100644 --- a/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch +++ b/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch @@ -1,11 +1,11 @@ --- a/build.xml +++ b/build.xml @@ -36,7 +36,7 @@ NOTE: You may need to set the ANT_OPTS="-Xmx512m" env prop in order to compil - - - -- -+ - - - + + + +- ++ + + + diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch b/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch index 607b84a46d51..290b902203a8 100644 --- a/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch +++ b/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch @@ -1,10 +1,10 @@ --- a/build.xml +++ b/build.xml @@ -46,7 +46,6 @@ NOTE: You may need to set the ANT_OPTS="-Xmx512m" env prop in order to compil - - - -- - - - + + + +- + + + diff --git a/net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch b/net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch new file mode 100644 index 000000000000..c58d475995ee --- /dev/null +++ b/net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch @@ -0,0 +1,51 @@ +diff --git a/org/gudy/azureus2/core3/util/AddressUtils.java b/org/gudy/azureus2/core3/util/AddressUtils.java +index 6691951..38f14ee 100644 +--- a/org/gudy/azureus2/core3/util/AddressUtils.java ++++ b/org/gudy/azureus2/core3/util/AddressUtils.java +@@ -494,11 +494,11 @@ AddressUtils + try{ + // unfortunately we have an incompatible base64 standard in i2p, they replaced / with ~ and + with - + +- char[] encoded = to_decode.toCharArray(); ++ byte[] encoded = to_decode.getBytes(); + + for ( int i=0;i=virtual/jre-1.6:*" DEPEND="${RDEPEND} app-arch/unzip dev-util/desktop-file-utils - >=virtual/jdk-1.6" + >=virtual/jdk-1.6:*" PDEPEND="~net-p2p/vuze-coreplugins-${PV}" @@ -55,7 +55,9 @@ src_unpack() { } java_prepare() { - epatch "${FILESDIR}"/${P}-cache-size.patch + # upstream likes randomly changing a subset of files to CRLF every release + edos2unix $(find "${S}" -type f -name "*.java") + epatch "${FILESDIR}"/${P}-java5.patch epatch "${FILESDIR}"/${P}-remove-classpath.patch epatch "${FILESDIR}"/${P}-disable-shared-plugins.patch diff --git a/net-p2p/vuze/vuze-5.6.0.0.ebuild b/net-p2p/vuze/vuze-5.6.0.0.ebuild new file mode 100644 index 000000000000..5f21ee825db6 --- /dev/null +++ b/net-p2p/vuze/vuze-5.6.0.0.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-5.6.0.0.ebuild,v 1.1 2015/03/14 09:39:07 rhill Exp $ + +EAPI="5" + +JAVA_PKG_IUSE="source" + +inherit eutils fdo-mime java-pkg-2 java-ant-2 versionator + +MY_PV=$(replace_all_version_separators "") +MY_SRC="Vuze_${MY_PV}" + +DESCRIPTION="BitTorrent client in Java, formerly called Azureus" +HOMEPAGE="http://www.vuze.com/" +SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip" +LICENSE="GPL-2 BSD" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +# bundles parts of http://www.programmers-friend.org/ +# bundles bcprov - 1.37 required but not in the tree +RDEPEND=" + dev-java/commons-cli + dev-java/commons-lang:2.1 + dev-java/json-simple + dev-java/log4j + dev-java/swt:3.8[cairo] + >=virtual/jre-1.6:*" + +DEPEND="${RDEPEND} + app-arch/unzip + dev-util/desktop-file-utils + >=virtual/jdk-1.6:*" + +PDEPEND="~net-p2p/vuze-coreplugins-${PV}" + +pkg_pretend() { + if ! has_version dev-java/swt:3.8[webkit]; then + echo + ewarn "dev-java/swt:3.8 was built without webkit support." + ewarn "Web features such as Vuze HD Network will be disabled." + fi +} + +src_unpack() { + mkdir -p "${S}" && cd "${S}" + unpack ${A} + + # build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4 + [[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite" + cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml" +} + +java_prepare() { + # upstream likes randomly changing a subset of files to CRLF every release + edos2unix $(find "${S}" -type f -name "*.java") + + epatch "${FILESDIR}"/${PN}-5.3.0.0-java5.patch + epatch "${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch + epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch + epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-osx.patch + epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch + epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-commons.patch + epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch + epatch "${FILESDIR}"/${PN}-5.6.0.0-commons-lang-entities.patch + epatch "${FILESDIR}"/${PN}-5.6.0.0-invalid-characters.patch +# epatch "${FILESDIR}"/${P}-use-jdk-cipher-only.patch # bcprov + + # OSX / Windows + rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java + rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java + rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java + + # Tree2 file does not compile on linux + rm -rf "${S}"/org/eclipse || die + # Bundled apache + rm -rf "${S}"/org/apache || die + # Bundled json + rm -rf "${S}"/org/json || die + # Bundled bcprov + # currently disabled - requires bcprov 1.37 + #rm -rf "${S}"/org/bouncycastle || die + + rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die + mkdir -p "${S}"/build/libs || die +} + +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH="swt-3.8,json-simple,log4j,commons-cli-1 commons-lang-2.1" + +src_compile() { + local mem + use amd64 && mem="320" + use x86 && mem="192" + use ppc && mem="192" + use ppc64 && mem="256" + use sparc && mem="320" + export ANT_OPTS="-Xmx${mem}m" + java-pkg-2_src_compile + + # bug #302058 - build.xml excludes .txt but upstream jar has it... + jar uf dist/Azureus2.jar ChangeLog.txt || die +} + +src_install() { + java-pkg_dojar dist/Azureus2.jar + dodoc ChangeLog.txt + + java-pkg_dolauncher "${PN}" \ + --main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \ + --java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \ + --pkg_args '--ui=${UI}' + dosym vuze /usr/bin/azureus + + # https://bugs.gentoo.org/show_bug.cgi?id=204132 + java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins + + newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png + domenu "${FILESDIR}"/${PN}.desktop + + use source && java-pkg_dosrc "${S}"/{com,edu,org} +} + +pkg_postinst() { + ewarn "Running Vuze as root is not supported and may result in untracked" + ewarn "updates to shared components and then collisions on updates" + echo + elog "Vuze was formerly called Azureus and many references to the old name remain." + elog + elog "After running Vuze for the first time, configuration options will be" + elog "placed in '~/.azureus/gentoo.config'." + elog + elog "If you need to change some startup options, you should modify this file" + elog "rather than the startup script. You can enable the console UI by" + elog "editing this config file." + echo + fdo-mime_desktop_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} -- 2.26.2