Prune out old versions, update remaining with git URLs/hashes

39 files changed, 49 insertions, 1067 deletions

diff --git a/dev-cpp/libjsonpp/Manifest b/dev-cpp/libjsonpp/Manifest
index 85a0c69..e2bb9af 100644
--- a/dev-cpp/libjsonpp/Manifest
+++ b/dev-cpp/libjsonpp/Manifest
@@ -1,4 +1,4 @@
-DIST libjsonpp-986.tar.bz2 4544 SHA256 948c541dc7c837f3bf393925ea07a770788f0d28700e56297daae5f14a9c9c1e SHA512 bb7cae380d8c08ed7ce3da4e748cb4ee845ce9c3bb34ee86af146e79a2d920d3ca4140ee8aadd6e172e228279a28e28405278021136f29160c793674938c8694 WHIRLPOOL 5f32081f476aebc1d9dc2433f87e7cabea7ccb732a9b24b5e029a2491b476748cfe9ce0032419f150887df07763a2b57dac6346a1dc562d5f2d44318b5a697ca
-DIST libjsonpp-996.tar.bz2 6169 SHA256 1a8d623535ca48f37832c8d578e890fb3787b4edffde16d721f907f1c40018c8 SHA512 d1ab34276deb7313677ba2650ce1dff318685895145ef7b452e8afdc5b86eafee01dee574224e6bc3fd2c4a16b592672633169dcff309b10002407f060dd62bc WHIRLPOOL c706f301a7187ec514f239e20e01b3fc06c2abac256b163be4ece200b64acb3346631da656ba762b720a41c3e8111ce52125a4dc4528d25fb60988d8a5956a3f
-EBUILD libjsonpp-986.ebuild 739 SHA256 e4c7e05032c7298c8666138fc014b1f0ea7c32e91f528127baff9b62e4f4591c SHA512 822abc6aac08a0d077da093611a69ececc70d89c6713eb23979303e627f9b92df603d6f48390d6aab8cc5a742ab8ce1b66e603ee8741a2acf09aa4fa13153a18 WHIRLPOOL a6e1974669bfdf09836224355dfa0348bebdd2b23b699dd9243201a9da99592845055b818f2c286e84863e5175eea5896c7a1cd9bbe1b4808bff74c0b7e9069b
-EBUILD libjsonpp-996.ebuild 746 SHA256 53cd23aff76e220a70549fdf9c0f1cfb8e3720f3ce7c429336e068c47b26f78b SHA512 17756f0c056b83995071ee95de6c387348358936cd87bc7b14cd1144b090365f076f64f3f7b4cca16dbc1ed5eb146670a99dfbd7927c502733a333808dcc5e80 WHIRLPOOL 2ee75a691c2823181bdbbdab1200b35d096828c24a9bec02f2946a785ce5520e66cad0f90835cc55211d83820d74ab5ffd99c3641d4b79cb01bd29265d02c860
+DIST libjsonpp-986.tar.bz2 3229 SHA256 1ddef3385ce573ce2a272fb57c9117d9e1578ae2fe4ff54f7cc5c022cd72acce SHA512 85a9a3c1e43ac7f742bee28f818f1b08a3ba3a3c9436f0604e53468546d118982fe166aac9a07dce1dec1c2312c82d0580cad1127a8545a31ac5542f5ceab729 WHIRLPOOL 4a220e78a03cd7d50872f572e8697a67b030bf8b9c8194b678daac2b920018283c97f608309cc35c7767949f56f77c0a23191909f1408ae6941b0cc3b363ea35
+DIST libjsonpp-996.tar.bz2 4893 SHA256 08d20ecfa271f4f59993f41e0a016bd47e6634518430af4f59decc3fbe512745 SHA512 fbfaa89e9627d4bbab65f6b90e87b81acedaa4d146c881c78ed12861bfa00248b51d38afa348d186a5e864a560111c92783e90d3a5038c543013c53a3dd46de3 WHIRLPOOL ba0988b2881c2bd9563df157e16cbc232f2898ca8b3c682fb07efdef51e918bdeb6ff289066ec5f210f2d883b9196d36b1ac2b851d4f012d74b377c71755defb
+EBUILD libjsonpp-986.ebuild 734 SHA256 1d2cabc5337095863901b9f1904b71dcd3fcd90166793817d4ce3e69ffa1e461 SHA512 9af03fb7e1c723447adde4a14f09c0b6c0a7327aac6384c9652dc00102ed0a468f4fb275a59a56a993ecac7cc1c62a24c55fb3ad00e81c0afd5e4a241c46b757 WHIRLPOOL f1fcce69437413e07b1f420f1577da51dfbc4c18a0b364401871aa04e30ed1ca8408df3bff4f969905c752a11a987295b653fc67f4a88fc78bb3ea148bf5c5fc
+EBUILD libjsonpp-996.ebuild 741 SHA256 00e7122dba77f420fcd56245b9dad50d93c80b7d3370304cd618c93121b1cb9d SHA512 940ec9c065a74587c719cf118e279ae692402d609f3d689103f39cb6040c54f9ac6241de92b7796c22671fefb80d5d7b5cc351ed6790493739603c40bde9c936 WHIRLPOOL 7c97b2d5a69efdb8b239afcf808f66447328a3fb1554748bcd67000e5109e6e5a5e4a0f4335c0c28ca2997a5bdbbc23b743ab5a97447439dafc63119f0876cb1
diff --git a/dev-cpp/libjsonpp/libjsonpp-986.ebuild b/dev-cpp/libjsonpp/libjsonpp-986.ebuild
index ae8088f..2d66071 100644
--- a/dev-cpp/libjsonpp/libjsonpp-986.ebuild
+++ b/dev-cpp/libjsonpp/libjsonpp-986.ebuild
@@ -3,7 +3,7 @@ EAPI="3"
 DESCRIPTION="Lightweight native C++ JSON library"
 HOMEPAGE="http://libjsonpp.randomdan.homeip.net/"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="x86 amd64"
diff --git a/dev-cpp/libjsonpp/libjsonpp-996.ebuild b/dev-cpp/libjsonpp/libjsonpp-996.ebuild
index 2019add..a7aab85 100644
--- a/dev-cpp/libjsonpp/libjsonpp-996.ebuild
+++ b/dev-cpp/libjsonpp/libjsonpp-996.ebuild
@@ -3,7 +3,7 @@ EAPI="5"
 DESCRIPTION="Lightweight native C++ JSON library"
 HOMEPAGE="http://libjsonpp.randomdan.homeip.net/"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="x86 amd64"
diff --git a/dev-cpp/slicer/Manifest b/dev-cpp/slicer/Manifest
index 883ab19..f41ac55 100644
--- a/dev-cpp/slicer/Manifest
+++ b/dev-cpp/slicer/Manifest
@@ -1,24 +1,10 @@
-DIST slicer-1000.tar.bz2 15224 SHA256 2ba46a0f50a585056d35ca684adf72e93eac72d10f2f355caa22787df343b997 SHA512 c551553b92f140ebe35468da39f0e25ea2495e98afd20156ea7dc2e74d69f983ba25f61e8064655a58abd7b36f8fb4f5372d688cc078319ca073d3c55a08ac94 WHIRLPOOL 18756c7b8d296f37d0ed11b3e169878d6a48afe951215a19b2a702d403f4ae8b2456f56cd14acaf6192ad78d3c7295ebcb0791fdad53beb4d7f4b408345e2068
-DIST slicer-1002.tar.bz2 15352 SHA256 0fda121de3c915bb22e36f5428568bdfc0c369244eee3e1f0693c287c00d1061 SHA512 076dc3089e2fbfc32f09fbfb1c3091fa3e779efcd74baf2fa6058bdc5d3f8de86a0d86e773baa6290686b6bbd4458b01308a6545948e3c01adcc0eb408a86553 WHIRLPOOL 46b63dba70e2d8c195347ad9620d5346e6efc6d05f8d0c823d85cce50015f7d0d49af443bf48af9784534e3e3fef7f2a8fa007ed178d28ac81495028cdef8025
-DIST slicer-1014.tar.bz2 15654 SHA256 ad7f5b2c448810aec0cdcd9851e08b7421eb64998489846af389f0e0d4654eeb SHA512 78d78ef9493e35a5be1e435825047ef9b638ab04841da22f6000705b6627031cff47c404b165ac986368dde802c47242a563e1094305d893256402fa4194fb41 WHIRLPOOL bde78c408a36724b01aa9d6eb0c9a975bf4a54ff67e287716fa7345464223795ac7107bcc8c35845f66a855f3d96b41ca63f28fd6517ead28c8a7d16facb3889
-DIST slicer-1018.tar.bz2 16279 SHA256 e931706495be7ff37c0bf004ad78ed460b2f3a2730d72223419349a2e7fd747d SHA512 4b2ff918d0983aa6f306fb51181914225e5e452206a3926b1303618527ab41f281552d02234245de4755dce95c4a2d084ca0949eb3aa24a7bef4c9e15f51c650 WHIRLPOOL f29dcf627a703e4d15aa4f4662e79b4146de6cb8fe607db4946850304ac60e0bcb6f412d4a6c3bc9fa25ac7cc5787a3293faea7cc49e1dd8e637ab77475cfed2
-DIST slicer-1019.tar.bz2 1673149 SHA256 1d0fe250717fba34958aa11a40a6f1fd40ba5c9f9854e12451aa0d1d72ad147d SHA512 102e123e84cda0d6b0a748be629139b24e0a065163c66869eb669ab7193bc4ac0041cd2d323a56ed4155f1036d844f842b38df50253a47a7fda703e898b4bdbd WHIRLPOOL 0add3ff68d559370b10d78faf226779728ab3c27ca9c4526fd8f6ca5d0df3da74414cf5d1203810fad5c0b428e04a82c1f3223c58bacc8d705b02b0363aa7f4b
-DIST slicer-970.tar.bz2 6500 SHA256 e2522178cf1406f6c6b80048331f89d4e70deca621673e6b4e657621258c8918 SHA512 ee3a66c1fa5275518ded4c0681f7c92327b5c52a6f229b19a0adaf6beebdfa77e15cc3eb4b2b363922b564178c58f65433ce73d5129f91a0e9d43acccca04beb WHIRLPOOL 4fc204a999a336ded71e999ffc426e3b4b467b3094673cfe265db5cff63ddd7d0ced1bc4534521b939f255646a8eb3a3e731d6d0be0fd68baecd657cfd0931a5
-DIST slicer-979.tar.bz2 9809 SHA256 c0df8481e449cf68832c8f420e429a92c4a3a0e8777ed37e645f96c2aa42ade6 SHA512 f913f766df1d47321be78f5ef210945175a924b8fedd2a388c644e14907dd425276e0523e017e7f5dddb35f256618c591249c280f2f27fd7c3312cfb09736421 WHIRLPOOL 2a6b2d50702503c87717cb2812c6da0c42c96563817d7a507c12703ad82e57d3af4613ecee811d83ff2844e135e66cbf4b40ac4de9ed576bd62982ad69076b80
-DIST slicer-982.tar.bz2 10672 SHA256 8b91e9649e3fca707367de8f36996c390d9566591bfddb40e5d5a1bf00fe6dc3 SHA512 6d394c086ca7fd23986d24ff24c9dc610e32db08aac972a521abba153da837bcc68a0ca534c0208229d54302d29f907d5804a65108ecb983f00a056861419356 WHIRLPOOL 3d0c118226f84ef0561063f5dcaeffaca249b274a8f484bce82dcd5a2ce58002e7d794223cb1c4b5322057afe0ea8025e3ea11faa3329ef4426bdd6ec46c53e0
-DIST slicer-987.tar.bz2 12153 SHA256 8764f0fe3a84245e2ab70d4a011efa7383008d10964d1dffb4b70c88653e9bd0 SHA512 f0e988e80d0af9d6b61a7f5b6b2904e393bcd175c8eb44f7da927878240db64a9797ab45139062381e0e3e7e48a37cc49b665a80b81bb7213167b5d3e49deeca WHIRLPOOL 47a98cded5fc10e8142b8aa3b97118bfa43ebbf18d0f477dcfef02902027746bafdef5355e2c0886d4fd7b4d7211b9066fa8af3db2aca55b36bf606a419dc821
-DIST slicer-990.tar.bz2 12176 SHA256 6c920cbb045b584ddcf9380b5290657fc5e7b1541a6f270c65eded2001cb4c05 SHA512 5de3a3c96be3ebd7b1f64f05e2b6c9172732ec1aa8864d795cad43c1434d9f9cb108ceb2483a8bbca5207ad9cb2082f2fbaac50fe59baeaf1c2460f712822cd5 WHIRLPOOL 76114dd1ec76c8c975ba9b683b4a1e2abd2eae295e13b4e53ede2af85e738948e1e7d58804bf2358ab4bdbd25a4e8b0f774b3975971737b6c40dc8dc7ff665f4
-DIST slicer-991.tar.bz2 12189 SHA256 e1716b17341b57c6d13cf485c4b884f208717ce6049efc71e50528a53d3ca458 SHA512 669c9ac3bb5066261ef4274778511fdebcb5cb9e33ae774946d2b8727bcb107ed918eb8faab31866e7bdadca8a78bf033933ddfe15181ea3c584f753b8d1ed41 WHIRLPOOL efe943a26af572010a91d70fb035ec2578c7c828205588e7901910cfda55b7db759eeed239f3ee659bbb6f8a8c1815e94ca695e5c9b49bbee20c0aac43e6bbef
-DIST slicer-994.tar.bz2 14200 SHA256 7918ec344384c188de0830be9b2333656f0bccaa05b292cb1d1bf4e792f2ce78 SHA512 a6f2b7226a1a8d71c326ef2a1e5ba5d9b847f9675819f22a2f06aeb265bc58aba921b0d119de0ee13d2912322541940b6f61b2aa2b13dd8734d5024b47e037d5 WHIRLPOOL ad916ca102362d1972b0fae592424e80aad676e6e6b5b6d7459843d4e27da2bc0651e50818e331cddd8273341fcf837c99191b76db7480d33721ec0d172dfbb5
-EBUILD slicer-1000.ebuild 1391 SHA256 5deda06cc04e8fb23c030a9f71de7ed8fec76f6cd251cb38936ef7d190948862 SHA512 4b7093b65954076b01e542976901e4b1248c2ea9237572f6d10c574eebe73b33aaf6222c8c234e37e20780b281e8b2598600151d7362ac51240a5641c450ac38 WHIRLPOOL 8ffc0f4ba19865f33be5b9ba0e015e39cfb47c1b410e1d362b60842343138877dcbb88e8dc8b3e4b233e7aba0a431bb95944bf0e2027fc2e10810a689cfebc77
-EBUILD slicer-1002.ebuild 1391 SHA256 5deda06cc04e8fb23c030a9f71de7ed8fec76f6cd251cb38936ef7d190948862 SHA512 4b7093b65954076b01e542976901e4b1248c2ea9237572f6d10c574eebe73b33aaf6222c8c234e37e20780b281e8b2598600151d7362ac51240a5641c450ac38 WHIRLPOOL 8ffc0f4ba19865f33be5b9ba0e015e39cfb47c1b410e1d362b60842343138877dcbb88e8dc8b3e4b233e7aba0a431bb95944bf0e2027fc2e10810a689cfebc77
-EBUILD slicer-1014.ebuild 1391 SHA256 5deda06cc04e8fb23c030a9f71de7ed8fec76f6cd251cb38936ef7d190948862 SHA512 4b7093b65954076b01e542976901e4b1248c2ea9237572f6d10c574eebe73b33aaf6222c8c234e37e20780b281e8b2598600151d7362ac51240a5641c450ac38 WHIRLPOOL 8ffc0f4ba19865f33be5b9ba0e015e39cfb47c1b410e1d362b60842343138877dcbb88e8dc8b3e4b233e7aba0a431bb95944bf0e2027fc2e10810a689cfebc77
+DIST slicer-1000.tar.bz2 13841 SHA256 4015cd6051751a0042b1d9b7d3967ae22027681b203ad44e1a7ea347e5c8ce5e SHA512 089826542d88a04302b561e767abad7ffa3f42689d63ce3da0beda6f3e6c99dc268cbe54e1e2e5510ca1daadfca197f4825d0d6b3c9f82097f84b329c2d2d6ab WHIRLPOOL ab5b0d0c9cbac844f98b4f4d75df221c2e43ecf4519793d0233c763cbdddcaa6b5925f9c7b9523b494c26d324257dfe45d9520f464ef128c5d161c425a85579e
+DIST slicer-1002.tar.bz2 13980 SHA256 935f82e7117abf589f0ce9cd2acd4a46bf1fe6f88478454197e9d3d543575402 SHA512 b7138d2898b14c10d4e9d82c27e0202f815f5ce6b86a3529139b275662b6bb28f667645a5d85af1d949ce6219b04988915f5e379a04153552b533614429bc440 WHIRLPOOL 142a615ba4e02703efa7fd4d894bd05117ff48b3c8a2a94356acf6d2a7a583361d26e4d552c29611aec2a680d0629ae1d0147eb35faf4677b1d09dbd587afc23
+DIST slicer-1014.tar.bz2 14242 SHA256 7b793613f975fd8b1b5c845bb828d58c65892e83a5870043089026291d577df7 SHA512 284956a21e9857599ef8d5022fdc2e964c7ec42fa1650897a8f5e9a4bfcabeb018335b23e3f9921895bae762ae903f90a25a889f60406e1d5a329b182c69f7a7 WHIRLPOOL 206fecbcdae29d0b7495a9051abf3ba47b7fe5c30b37000d8cb0be4a259054f14a2f1065edf1296b67fb5204712a13f7cdc45698b7ce1d231c06acc7495681f8
+DIST slicer-1018.tar.bz2 14972 SHA256 c3800d471b8ea97c43af3af335d77fb9e60583ef5eabe698e7e3fd8d065dbe1a SHA512 aa7b0221e5b502bfb74a43e9e1cae6956cfbde1493bd5bdf9e4ebe28e39dbffc755ed3b70886ceb368e8afac8e003a0c2f508899286bfb21c37d10d9c35dd1a2 WHIRLPOOL 2f8ef46ed250e40b19366ac19fae357a72ed9b38c1a2040cfa36e54bd2ce9ab2892b806a9aa4d9d581ad8ff3f5881cf9d8447efc5d38dad5152dfe2cae3342b7
+DIST slicer-1019.tar.bz2 15200 SHA256 4a1c2247b1b1a8e4023ec8285d7673b4dfc3c0f829bae5d33d76df6a7cda25d5 SHA512 b6530a44d355ac8319ae76fed7a0978b7d1827515523a194890c27c4a4ab43692a6d9b8f7552bc35cb71c0735b406364687eecb5d3d8b43777baec146374f934 WHIRLPOOL 71f2f5cfd845758cd2b925f949783dfd76705f9c0a158e5c9ba5c28dc57b7f26e3bddd7a7098232bdaaf301dc02e194c969dbc0961c372acdb0637db61cef87d
+EBUILD slicer-1000.ebuild 1386 SHA256 9967d3196c19b1c3c0d317a3e0f80d1ed3e566664061526ad3a3ba71b58f5330 SHA512 aea894903b3bf59656fc46d4e0d41a1fad150e5af623e7202318c2fd10df8b989a2c0dfd74f01e6034b6304950c71f0f4d336025d8c898864974a8364d65d72e WHIRLPOOL c6f075616643d8120258cd33a893d42239a812e9f655a2be60f451e837c80df0a076d0d8e0f8e59498d7b915716be076f991f69c5f8377bd14b7203da817d13e
+EBUILD slicer-1002.ebuild 1386 SHA256 9967d3196c19b1c3c0d317a3e0f80d1ed3e566664061526ad3a3ba71b58f5330 SHA512 aea894903b3bf59656fc46d4e0d41a1fad150e5af623e7202318c2fd10df8b989a2c0dfd74f01e6034b6304950c71f0f4d336025d8c898864974a8364d65d72e WHIRLPOOL c6f075616643d8120258cd33a893d42239a812e9f655a2be60f451e837c80df0a076d0d8e0f8e59498d7b915716be076f991f69c5f8377bd14b7203da817d13e
+EBUILD slicer-1014.ebuild 1386 SHA256 9967d3196c19b1c3c0d317a3e0f80d1ed3e566664061526ad3a3ba71b58f5330 SHA512 aea894903b3bf59656fc46d4e0d41a1fad150e5af623e7202318c2fd10df8b989a2c0dfd74f01e6034b6304950c71f0f4d336025d8c898864974a8364d65d72e WHIRLPOOL c6f075616643d8120258cd33a893d42239a812e9f655a2be60f451e837c80df0a076d0d8e0f8e59498d7b915716be076f991f69c5f8377bd14b7203da817d13e
 EBUILD slicer-1018.ebuild 1374 SHA256 93c035ecdc35c15b95c8a7a91f46d5f54f66a0bcdf3a53d20ee8d9c3dd2c30b3 SHA512 3e635135a222b4ca7aeaa75b75f5007f61e153828fcc83de149c03a1267f3072366b2bd2c30484f41be526b9cb78d11a5ddfab13b38aa6c7be02f1d73dfce153 WHIRLPOOL ca5517d2dd8167645939eeb5316b6a678251fc641866e19cf62e590c5dac51bf672638a2411a0c0ea6eae0db415627cb65720fb193a50f7693fbf285610ec772
 EBUILD slicer-1019.ebuild 1374 SHA256 93c035ecdc35c15b95c8a7a91f46d5f54f66a0bcdf3a53d20ee8d9c3dd2c30b3 SHA512 3e635135a222b4ca7aeaa75b75f5007f61e153828fcc83de149c03a1267f3072366b2bd2c30484f41be526b9cb78d11a5ddfab13b38aa6c7be02f1d73dfce153 WHIRLPOOL ca5517d2dd8167645939eeb5316b6a678251fc641866e19cf62e590c5dac51bf672638a2411a0c0ea6eae0db415627cb65720fb193a50f7693fbf285610ec772
-EBUILD slicer-970.ebuild 1092 SHA256 b8755cc434f960dc6fe4f8be2a7c90cf4db1032ea832735e65a6fe3792017274 SHA512 d9390670ecf68ee8eceecb2348af766c7ab3980aa0eab7ade74b6ff06c4217d79b609c0a881b4d55f781bda3cf5e5757c54e4b9a514829f365b8f4af54cddb2f WHIRLPOOL 5ba8d74902863b3b45eeaa18b25020899b460dccd0c3e2f748a33177cbca50270d5993674614a190397a7f121a4694c996e3d7b5d0ff941318e8d4934090c0ad
-EBUILD slicer-979.ebuild 1092 SHA256 b8755cc434f960dc6fe4f8be2a7c90cf4db1032ea832735e65a6fe3792017274 SHA512 d9390670ecf68ee8eceecb2348af766c7ab3980aa0eab7ade74b6ff06c4217d79b609c0a881b4d55f781bda3cf5e5757c54e4b9a514829f365b8f4af54cddb2f WHIRLPOOL 5ba8d74902863b3b45eeaa18b25020899b460dccd0c3e2f748a33177cbca50270d5993674614a190397a7f121a4694c996e3d7b5d0ff941318e8d4934090c0ad
-EBUILD slicer-982.ebuild 1092 SHA256 b8755cc434f960dc6fe4f8be2a7c90cf4db1032ea832735e65a6fe3792017274 SHA512 d9390670ecf68ee8eceecb2348af766c7ab3980aa0eab7ade74b6ff06c4217d79b609c0a881b4d55f781bda3cf5e5757c54e4b9a514829f365b8f4af54cddb2f WHIRLPOOL 5ba8d74902863b3b45eeaa18b25020899b460dccd0c3e2f748a33177cbca50270d5993674614a190397a7f121a4694c996e3d7b5d0ff941318e8d4934090c0ad
-EBUILD slicer-987.ebuild 1389 SHA256 6fad01ec5aaa1d8f6d36cae9e5efe24014d6f16fe30f3216149ae2d9d51a71bb SHA512 148196333c8b808092bfbab285f6754976a098f17d9d23d4ae947990fd70540900d3a2909c9e97427fb987772379b762de336e8f025ff4bd32a69361e7e9aff5 WHIRLPOOL aefa28b7c0333010245400a38c86ea390c4efab20fe070df1980c637e9e3c6e4f5bc9583ec6230c84be1e531ab11ae441c0caf1762fa4ce6b0ae80f739e05838
-EBUILD slicer-990.ebuild 1391 SHA256 0d799180e59c7a972108af1811e545e34c32b3d787e7a3dabcde935aef55ca7a SHA512 c394fd5fd754ed95931e7f88cdaf23e13e7a93364c227178582f901e2369a775181fbc2bc4cd289008ea96b51e6590c820b00557ca917076d5f01413a100024e WHIRLPOOL cbb117aeccd62716ab12fbc192713248e519ec19f3c21697a44916077146bd24372282a368e83ee607f045470e8975d2e746ba54050a85b3ab3cbebc974a3ca0
-EBUILD slicer-991.ebuild 1391 SHA256 4afdff187bbc07cbd64cb773206d08edb6d99ffe85af8ff7a7ae1a4dbac1f766 SHA512 9952c11f29ac59b70c83f96e4f4659019e8873dcaa79ac18b28187eb5655a22b4fac144c497fdc9f1c63da029eab202e0ce72be95f7734992501d40a791e74c4 WHIRLPOOL afc7ea4a44553a8941ed849e17536defa7ff9e3de0d614ff9714acce629e0be24c8d3f7fc7561a4c5579fc6825dd75456b12c718ae7b6ae689b0889a370b9a06
-EBUILD slicer-994.ebuild 1391 SHA256 68e054527d380917fe1cdef996c5f8528344ccb1636a4b49023caf782b1baf1b SHA512 675b1fe98a9741a3a072b9d76dd73ce354586c626c3d0e0db44b5d6b72e854d4be4f0daad62212142bc4d36b6d834be9823ac46ba8783da7c2ef45f2d6392d16 WHIRLPOOL 6ca8a08ee0cf3457cd24c6fa4716a41cf469b9c4d25bc0def3e6af75a39228e2a68b56eb95c07202d5acb821518d26b3e24e8502a7ff9a27cf546b5a7c1d2f7c
diff --git a/dev-cpp/slicer/slicer-1000.ebuild b/dev-cpp/slicer/slicer-1000.ebuild
index 91ce36b..7f6bf49 100644
--- a/dev-cpp/slicer/slicer-1000.ebuild
+++ b/dev-cpp/slicer/slicer-1000.ebuild
@@ -3,7 +3,7 @@ EAPI="5"
 DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
 HOMEPAGE="http://slicer.randomdan.homeip.net/"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0/3"
 KEYWORDS="x86 amd64"
diff --git a/dev-cpp/slicer/slicer-1002.ebuild b/dev-cpp/slicer/slicer-1002.ebuild
index 91ce36b..7f6bf49 100644
--- a/dev-cpp/slicer/slicer-1002.ebuild
+++ b/dev-cpp/slicer/slicer-1002.ebuild
@@ -3,7 +3,7 @@ EAPI="5"
 DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
 HOMEPAGE="http://slicer.randomdan.homeip.net/"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0/3"
 KEYWORDS="x86 amd64"
diff --git a/dev-cpp/slicer/slicer-1014.ebuild b/dev-cpp/slicer/slicer-1014.ebuild
index 91ce36b..7f6bf49 100644
--- a/dev-cpp/slicer/slicer-1014.ebuild
+++ b/dev-cpp/slicer/slicer-1014.ebuild
@@ -3,7 +3,7 @@ EAPI="5"
 DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
 HOMEPAGE="http://slicer.randomdan.homeip.net/"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0/3"
 KEYWORDS="x86 amd64"
diff --git a/dev-cpp/slicer/slicer-970.ebuild b/dev-cpp/slicer/slicer-970.ebuild
deleted file mode 100644
index d3d3174..0000000
--- a/dev-cpp/slicer/slicer-970.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
-HOMEPAGE="http://slicer.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="xml"
-
-DEPEND="dev-libs/Ice
-	xml? ( dev-cpp/libxmlpp )
-	dev-libs/boost
-	dev-util/boost-build"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/slicer || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q slicer tool || die
-	use xml && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q xml || die)
-}
-
-src_install() {
-	cd ${S}/slicer || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die
-	use xml && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install-xml -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die)
-}
diff --git a/dev-cpp/slicer/slicer-979.ebuild b/dev-cpp/slicer/slicer-979.ebuild
deleted file mode 100644
index d3d3174..0000000
--- a/dev-cpp/slicer/slicer-979.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
-HOMEPAGE="http://slicer.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="xml"
-
-DEPEND="dev-libs/Ice
-	xml? ( dev-cpp/libxmlpp )
-	dev-libs/boost
-	dev-util/boost-build"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/slicer || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q slicer tool || die
-	use xml && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q xml || die)
-}
-
-src_install() {
-	cd ${S}/slicer || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die
-	use xml && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install-xml -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die)
-}
diff --git a/dev-cpp/slicer/slicer-982.ebuild b/dev-cpp/slicer/slicer-982.ebuild
deleted file mode 100644
index d3d3174..0000000
--- a/dev-cpp/slicer/slicer-982.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
-HOMEPAGE="http://slicer.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="xml"
-
-DEPEND="dev-libs/Ice
-	xml? ( dev-cpp/libxmlpp )
-	dev-libs/boost
-	dev-util/boost-build"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/slicer || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q slicer tool || die
-	use xml && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q xml || die)
-}
-
-src_install() {
-	cd ${S}/slicer || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die
-	use xml && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install-xml -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die)
-}
diff --git a/dev-cpp/slicer/slicer-987.ebuild b/dev-cpp/slicer/slicer-987.ebuild
deleted file mode 100644
index e8af9d5..0000000
--- a/dev-cpp/slicer/slicer-987.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
-HOMEPAGE="http://slicer.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="xml json"
-
-DEPEND="dev-libs/Ice
-	xml? ( dev-cpp/libxmlpp )
-	json? ( dev-cpp/libjsonpp )
-	dev-libs/boost
-	dev-util/boost-build"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/slicer || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q slicer tool || die
-	use xml && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q xml || die)
-	use json && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q json || die)
-}
-
-src_install() {
-	cd ${S}/slicer || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die
-	use xml && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install-xml -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die)
-	use json && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install-json -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die)
-}
diff --git a/dev-cpp/slicer/slicer-990.ebuild b/dev-cpp/slicer/slicer-990.ebuild
deleted file mode 100644
index 68af599..0000000
--- a/dev-cpp/slicer/slicer-990.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
-HOMEPAGE="http://slicer.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0/0"
-KEYWORDS="x86 amd64"
-IUSE="xml json"
-
-DEPEND="dev-libs/Ice
-	xml? ( dev-cpp/libxmlpp )
-	json? ( dev-cpp/libjsonpp )
-	dev-libs/boost
-	dev-util/boost-build"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/slicer || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q slicer tool || die
-	use xml && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q xml || die)
-	use json && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q json || die)
-}
-
-src_install() {
-	cd ${S}/slicer || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die
-	use xml && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install-xml -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die)
-	use json && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install-json -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die)
-}
diff --git a/dev-cpp/slicer/slicer-991.ebuild b/dev-cpp/slicer/slicer-991.ebuild
deleted file mode 100644
index f19f983..0000000
--- a/dev-cpp/slicer/slicer-991.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
-HOMEPAGE="http://slicer.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0/1"
-KEYWORDS="x86 amd64"
-IUSE="xml json"
-
-DEPEND="dev-libs/Ice
-	xml? ( dev-cpp/libxmlpp )
-	json? ( dev-cpp/libjsonpp )
-	dev-libs/boost
-	dev-util/boost-build"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/slicer || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q slicer tool || die
-	use xml && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q xml || die)
-	use json && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q json || die)
-}
-
-src_install() {
-	cd ${S}/slicer || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die
-	use xml && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install-xml -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die)
-	use json && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install-json -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die)
-}
diff --git a/dev-cpp/slicer/slicer-994.ebuild b/dev-cpp/slicer/slicer-994.ebuild
deleted file mode 100644
index 773885c..0000000
--- a/dev-cpp/slicer/slicer-994.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
-HOMEPAGE="http://slicer.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0/2"
-KEYWORDS="x86 amd64"
-IUSE="xml json"
-
-DEPEND="dev-libs/Ice
-	xml? ( dev-cpp/libxmlpp )
-	json? ( dev-cpp/libjsonpp )
-	dev-libs/boost
-	dev-util/boost-build"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/slicer || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q slicer tool || die
-	use xml && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q xml || die)
-	use json && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q json || die)
-}
-
-src_install() {
-	cd ${S}/slicer || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die
-	use xml && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install-xml -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die)
-	use json && (setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install-json -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib --includedir=${D}/usr/include/slicer || die)
-}
diff --git a/media-tv/p2pvr/Manifest b/media-tv/p2pvr/Manifest
index 4d39903..06aa451 100644
--- a/media-tv/p2pvr/Manifest
+++ b/media-tv/p2pvr/Manifest
@@ -1,8 +1,8 @@
-DIST p2pvr-1021.tar.bz2 1675659 SHA256 3834d0df70d20c6d06b9c03ad02e03c5c1db7369b4b2e3c43182880b3365e178 SHA512 aadaba1841295134a21e61e37fa6bd3f751d2187235df4acbde632a3ef60f2faacdea23e3cdd4394e27550d5902612bfdef6fc3d19bf3d45b138c0fb0c23a257 WHIRLPOOL ae06452b84b0fd025fe2079b54f21940fe2453172ceb5fdc47bb4a7640486b0047d7979139b95f81e63e7e7380969cefd4a566d17f632ed297ed2daab1acfa34
-DIST p2pvr-915.tar.bz2 1389413 SHA256 6f0bdd80a8da2345817df9d6a3a7f8148d3f1011f6ff47b476a791303f18efee SHA512 f85dbcaa390326631ce9eacc07e3ddf9e87af1abf7a07a4621f65f041d86c8a3b611a424bda88ca7cf4442a2b95182ebbfc02d62d8635898082c0cf310d508fc WHIRLPOOL 36763c1ab59e556b636e820e6a6e3c6aaaf985ccdfd400102522569a569859ed1410457a76a6a29deb099171907275e351e1971997b2952a828bca5e76679455
-DIST p2pvr-926.tar.bz2 1391974 SHA256 2090021a5a91f4f5807ee0417826456f161aa87476078e461422155c4d652a21 SHA512 2c1f644a44bf2e6bf2424659c32bd1abb5d5038ddd8b364e60f2c27526eab81a8f2ba4e092b7b3433498351fb934ae6e2cabba10f017d02753b39d76e324aaa8 WHIRLPOOL cc0ca4df8ab8c53209b8357d9bbc1acbfcd037f69ea2019869d50a1dd4b3ac770b8825f4227ae1e54cac0270171cbc3605bb9e9a71a0bc4bff73703509212a1a
-DIST p2pvr-957.tar.bz2 1394539 SHA256 d2c10903c0d33f2c528c4522cc0578595f9929fd569a70883b286bf4c522b447 SHA512 08217745a43101bdc6a79ca41bee1770f4c9f9f05281e863c90a60c3180f586a67a8d04b96180e41ee2178f59151b363cb19b49f4dc33b22c5546098d8e509e5 WHIRLPOOL 97e359e30f60e81502b7d375a219c9b0f7ccc469e7dcdbd1e8b315330dd7be8e5a1860e231d16a98355be637a5d2313d6c607ec3994090ca62b0536fe63134eb
+DIST p2pvr-1021.tar.bz2 1407232 SHA256 a36ff5d17148e0697973f6bec421a2b2a52c0c4e1506a5dcb5dc35b8f8d0995d SHA512 2a5dec7ee36acd8b60e8c48daf3323085780885d454592837d99c5a3106b11988d18280729bca3428ead5d1fa65fee1e5b14a0377b9fde0c21294cab63aac210 WHIRLPOOL c022bbf40e3cb4580c67f452d030856a9ba6432961652b96414c2a3623798616b42ca4546c4e53fe66ce8734aaae105d135d70dc193a47ceaa028fec7e0d4f59
+DIST p2pvr-915.tar.bz2 1389049 SHA256 cdf9a4ca5e37c5bdce94b4f6e88452e8889076446094533f7ee9cd3321f81d10 SHA512 fca2a988830903c7df570231ddd5d6335ceba62c51e22e54fd505f18cf0d04ab22eb30dd010606065c7bc941dbf3c263dd80e067d062294539bc223cd2be92cf WHIRLPOOL e0f59f6d83dc72d4d5724d4b7f069ba822fa0770bb66ddca0d9a6165d9a48003c9caedd87b98bb1b396f67df1d8fd402e08f306cb96e307b21d79359f3c1584d
+DIST p2pvr-926.tar.bz2 1391871 SHA256 2bc6a97262a86ec5cc8479aa6784e84effc327d83fc2e034b31a12092aed16c8 SHA512 7ec3bc794e2f232e0a4a89d32d3b801150315d1405995981543d6dfb652dd355e1db3e65c3d6bf65eb334bf3ee5aa2fa37579eca9dfc5c777f26471343ea4fed WHIRLPOOL a6fee8c0306c7f0cac2596871c4a0d1dc8a5d87b0b2a4c88598faa4a1f41799b559efafe3a6bcc974a0911eae450c0cd0f21dcb6e421ca2a33d705de76ffa69a
+DIST p2pvr-957.tar.bz2 1394060 SHA256 faa7aa433682d3087633b4bd0e34cb74b4b02cc9d1ff899b4f5a022825ebc0fc SHA512 a2c570a791c73de9b48ba753e62b35f63e770413e2a54972fdb3e0d4e4191ecdab0ec29db28c6ab48e822f88d0c133cab5ac852bbf578ea2a38ced8bc27f1bab WHIRLPOOL bc359778dc75a2c812042bb9a2479410ba662a3179d76fe5f3ebe9e172a6c14e33c62fb1ab1b2a96a920045e6ebd6e953d22f08e04ec5ccf89568218feb0a8ab
 EBUILD p2pvr-1021.ebuild 1160 SHA256 e0c5b6cd12a616e967f1d189db16ad0f714c3e8108296cbb74918bd931a5c4a0 SHA512 dfb2495b85cde3a8a19c85730079c39cefa4c947f7cd684fe6a48e26dba84e7ea92059e0261a21ffe7e9faabc35cba766185bf8ddf436c954c52f958370ec6f5 WHIRLPOOL 9ca3e3bf4782952d3256ad160c47dffb1b5204ea84c75c10087b439377f739bee607ad4b099b2efaef57ea5bf0b8dd1cb59b52105632b6eadc0a5f97ca9e646c
-EBUILD p2pvr-915.ebuild 1252 SHA256 e30c6c9989979b54329e13a88fca3ed3a3f46f63ccbc60a0317a32b89a67cb05 SHA512 9b30ce11877c847aa1280ca08f505204637a7fa8b23f7d23c134d6e4a207207f5329f7378e541976dbc3482aa113224b811f5fa34e6cc7dc2a11a83f8b0d57f3 WHIRLPOOL 414d689931d80b20a284190586b55d1ae7a278461864b8c8dd836e4a97f2a7659378365a8c8d9fad72e5c6e02db9f1d35ef96cf6d378cbd2e1af837aee8db114
-EBUILD p2pvr-926.ebuild 1252 SHA256 ba28fc891eb07de81ebe0b326ae16bef90db065ce4ac03694231c019efa9c3b9 SHA512 a8dd5f262a82075e64d4c9221cbf8ff587c9074078fc9caebd3891ac948c7bfe67746bc084105e762784c8a052ec1f527333e9e128cd7e3c094cf812f8b4ffb4 WHIRLPOOL 39ac039833ea44e30976c92e788219622c2ec54733953e7ce858251b052ffea88e5a17918fcc10b2ca405aae0ed0bc2f32e0cee41488237145ddc86fc3ce8182
-EBUILD p2pvr-957.ebuild 1252 SHA256 d806353ebe8a08e23e08aeba712db07b6c2f61142f2d6e15e3f59209f075cfa4 SHA512 e7624e78dd851340391f6036cafb9ae5b128f9c03105c057da00246da3596c5cb54979d019f82368aae9cb011697fe21881ff3096198d6d9a4613d67db946d32 WHIRLPOOL d37316fab666dfaf4567a47028378543cb5abd6de4fca42e96c2134953bde938f0dde63c673ce6cff52979e28413fc6d6557125a85e49edc359207508c33eba2
+EBUILD p2pvr-915.ebuild 1247 SHA256 ddf078db77391d2d6d4558499cb29c17f8bc0ce281d9e0ac277c80e5e010501a SHA512 83dbf0af295acf923a0da71c97c055097c6bf317e91b1523590b833f9b67be0aa15fa4ca556e4a26915aacfb4d8251429784e4ac72cc3da67863b93fbfa0c7db WHIRLPOOL b1a04e721ae1d0b0b46259a515eebbd73fbfdb666d9e7f19dca08de934c3ec9cfaa85c084ed7961172c95779b612fe8b119e69aaba373bd726456a39a48d791d
+EBUILD p2pvr-926.ebuild 1247 SHA256 5105c612aca12292025def4d8cd28fe97fb8fd44a7f973dbc8d0e57c302543cf SHA512 903b3e17c96579e54d81ca80efa5de561bba665d4042b2d63d86b9f95b57dcd31d5f52d3d47e8601fe0bee876c0b9487a08d8af1508fefd5d82deff93e728e2d WHIRLPOOL 1f86a02e386d462a1966629f7fadd3351f3640f73d139a158defacf56fc500ea72b04463d3d6c1dc19da665029378654a5f1b79e85ed3251b7e35098befd5bf6
+EBUILD p2pvr-957.ebuild 1247 SHA256 113b45aa3942e067f1ae4c6eba14a8bcd48bf9a8cf5c636b0a4793d562cb9e7a SHA512 61f15b80faae91fc19d313e5343beed9e4cfaadb3a15dcf598c6c69ea27013ba6160b948199a8498e0363a62bd71f60a787ea57ad39384d9a54d65625431691f WHIRLPOOL 960ec1b3fb2712acef53c668a44e192999bd87f7ba78255102962abf4cbe5164c28d08915dc9f5729e66e679700586e2539d5d9a9e37deaa60313517dcd8396e
diff --git a/media-tv/p2pvr/p2pvr-915.ebuild b/media-tv/p2pvr/p2pvr-915.ebuild
index 7ae3480..c18a0f0 100644
--- a/media-tv/p2pvr/p2pvr-915.ebuild
+++ b/media-tv/p2pvr/p2pvr-915.ebuild
@@ -5,7 +5,7 @@ inherit user
 DESCRIPTION="Project2 based lightweight PVR"
 HOMEPAGE="http://p2pvr.randomdan.homeip.net"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="~amd64 ~x64"
diff --git a/media-tv/p2pvr/p2pvr-926.ebuild b/media-tv/p2pvr/p2pvr-926.ebuild
index ed25268..2488a2f 100644
--- a/media-tv/p2pvr/p2pvr-926.ebuild
+++ b/media-tv/p2pvr/p2pvr-926.ebuild
@@ -5,7 +5,7 @@ inherit user
 DESCRIPTION="Project2 based lightweight PVR"
 HOMEPAGE="http://p2pvr.randomdan.homeip.net"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="~amd64 ~x64"
diff --git a/media-tv/p2pvr/p2pvr-957.ebuild b/media-tv/p2pvr/p2pvr-957.ebuild
index 283428f..5a7fcb1 100644
--- a/media-tv/p2pvr/p2pvr-957.ebuild
+++ b/media-tv/p2pvr/p2pvr-957.ebuild
@@ -5,7 +5,7 @@ inherit user
 DESCRIPTION="Project2 based lightweight PVR"
 HOMEPAGE="http://p2pvr.randomdan.homeip.net"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="~amd64 ~x64"
diff --git a/sys-cluster/netfs/Manifest b/sys-cluster/netfs/Manifest
index 783e991..d9cdfef 100644
--- a/sys-cluster/netfs/Manifest
+++ b/sys-cluster/netfs/Manifest
@@ -1,14 +1,8 @@
-DIST netfs-1003.tar.bz2 22020 SHA256 bc6687973d6c1bab01d2be2693b0482f606765d0ad9626598f04010f13255bb1 SHA512 e9c238d18a98bbe16f41e3d2165e3133b4471060056286b7d4e7fdafc466f3b1b85c0b0fc6d76f9b53d4e3fd080dba6c96660185eee4845afa166394f95ab99d WHIRLPOOL 22a08b8bc1c87e265deb8866dbd9873555f96c34f22ea3447b52253f2305c04e12e4e33258da3afdf44ef0983c3665b9d1ac768f993910ddb8a004a7c6ce8254
-DIST netfs-1005.tar.bz2 22090 SHA256 90229ffabe69c84860020c7af1bec63eaf7edaa5d79b3562d9d23640edf2a52e SHA512 4280437b767e2667035501c1e167d70c6c1115518b436a863164c1467a982e196a49e89381297a62f21d88befb69294b102eef57d11f3b87e7f3d1097e236525 WHIRLPOOL 8a4ec4247243b1fab981a7b78a79f529db111d64a01240d4de7e177f7de079b3a564bd901bd4ab7bafcfdae9f26e88c9d4f417d709d15ec1f6435b963ffe0f36
-DIST netfs-829.tar.bz2 18453 SHA256 2be7f51e37457600422b908a2050c693973a5b4f7505239e19b32e60aed0a65a SHA512 caa0d32d461364b74707d668464d420a7c81e39014eb06047ec9658c6622f9b1cfffc04c1854655dc2184dfe5f33f3c4ab690de2d61b3139bbb86f2d9f9f6916 WHIRLPOOL c5eb3a2836e649bc084df92a7616e8deb3bf37ee4f69a34e2f79388975e8cb201b0dc0b3c9a9a490a7f8ccd0dcef555f1f1bd389bbeb2176f00fd31d66cf28e7
-DIST netfs-938.tar.bz2 18223 SHA256 5d1a414ff58fcff84ca1f4de70847c0eefcc48a2e04a01c689d53065cc635635 SHA512 ddf7d1cb843dff794f85fbdb1566c4d591847b1d9d98eaa5714b3688aa17c9c67967850cafdf6eb623468f09a879cddc88be7e1dca4759abf19491f98ad3fd5b WHIRLPOOL 579fbf53f8333d8a2557e493a4f9966d95b521342dd2119cc82e36bff7f471b64c224d1adcfb7a703ea043c37e371e9e95bbe4e87f4d2f977734cd1b9b515c37
-DIST netfs-967.tar.bz2 20172 SHA256 8f3807368145388f204125bdc02afaeeb13db3f05ccf3aa793a4a2aee4784671 SHA512 3c4834a4557d64710f076eefe83b68695bcf40986a64a6a5a4397e4d6909c42bf84dcb2dde74baa69aa04e2c156733d2c58d95b92e544a4dd1d3bfc59f30399d WHIRLPOOL d85f6741fbd4cff5995707dbc2661942d889f16a274fda479b59c664da2a48ac41340baecb68e82ef32de7b924d7a8d0ee6da45d7a8975a0b3be9ab0939b6995
-DIST netfs-984.tar.bz2 22013 SHA256 ae0cf5da471f59a4ec18465986bb5a1978a863355004f9eac25298c6bc67137f SHA512 9acbeed99b18cc32cf248c67c6d950ea958888662f082e78e23c57735d91fa9887d93ec954252a7883e85649206c47a604b9737ca32dc1bc7f9bc3d88a81d478 WHIRLPOOL 597bded657a3baacdbdbc6c41961a9c94a3619dac8d04e779694a556fadedeca86213a6945404913443fc786f41819ee48ff43cbb64ad0deafec704dbdaa9695
-DIST netfs-995.tar.bz2 22009 SHA256 467f6a435fc4c1eceda7ecd81bb89fcac12adec124386e8b6f93354542fc99b9 SHA512 efece23e8ff893f8d1f9da14ff1857cf7f0ef9bfc4cb3229f20c493a0657c367913f37885a175e9b78eebbf6ece486a2b9bd47b19bfa43a70df3ea8918f449bd WHIRLPOOL 553fc8671b08096040913011a4a424b58b810c6426bb163d6bd619818568a75af13aeca62c23f65ea533c60e03997d22aab409a259398404a7fe5b480fc24c80
-EBUILD netfs-1003.ebuild 1238 SHA256 43ee9ae435b9df5274f522425336b7fbc2c46b8590665e93e6b10f06aea6fe40 SHA512 c986e84396643ff3a61d91664472fbe4a0f856e5a2a25481ecda0dfe5695d9b5a059a60faf57b2f2a614f6ab75fb9716ba91e7b43375b4257e986979bb35e982 WHIRLPOOL 3ed713a7229f071169f5439f35708b03726a65cce9e93b56be3e13c009712961728c7c5f4ee5bb8e6eb8a5947eff849549f6afc14e80d87fad5cdaa3b87d89c0
-EBUILD netfs-1005.ebuild 1238 SHA256 43ee9ae435b9df5274f522425336b7fbc2c46b8590665e93e6b10f06aea6fe40 SHA512 c986e84396643ff3a61d91664472fbe4a0f856e5a2a25481ecda0dfe5695d9b5a059a60faf57b2f2a614f6ab75fb9716ba91e7b43375b4257e986979bb35e982 WHIRLPOOL 3ed713a7229f071169f5439f35708b03726a65cce9e93b56be3e13c009712961728c7c5f4ee5bb8e6eb8a5947eff849549f6afc14e80d87fad5cdaa3b87d89c0
-EBUILD netfs-829.ebuild 1052 SHA256 d687c057439158fc1b429867273a1a7541134a57407bb660a8228e042cea9f49 SHA512 c9160820a830a8b3c3d73aed6ce5b6a5d3936786182d62810d7732e49ea09654e8ec78b80f8dd884ac537398366c769bee6e95ba301fe0998ec57471021cf9b3 WHIRLPOOL b9f2605507fab1871a1a89bf37da167d0e26ad27f3fa7b54529e94583aa0e43b9305b46bd1095d5e767ebb151c3995e1da8f83e4e57b0eb836ee00bb04a27d21
-EBUILD netfs-938.ebuild 1222 SHA256 a42f2821d46b77046a1ad98c6e314e85df0cb23fc74146cfaa52c64ca070603f SHA512 e454a571f6be98b0fe4f538723766e328bee7e93074e28f2ec1ed062e163fb9357a7182b88771a00e0943b555f430936398b2197f0f3b883b6181b923a01601d WHIRLPOOL cad908fb5d804f3d1b6e226d4128bc7839824632c261c7315ab8d924f168d15814c22c6ba66f6eddc0a6962fe31c8004e2de56db221f31c3056d1c9d6ccd2e11
-EBUILD netfs-967.ebuild 1222 SHA256 a42f2821d46b77046a1ad98c6e314e85df0cb23fc74146cfaa52c64ca070603f SHA512 e454a571f6be98b0fe4f538723766e328bee7e93074e28f2ec1ed062e163fb9357a7182b88771a00e0943b555f430936398b2197f0f3b883b6181b923a01601d WHIRLPOOL cad908fb5d804f3d1b6e226d4128bc7839824632c261c7315ab8d924f168d15814c22c6ba66f6eddc0a6962fe31c8004e2de56db221f31c3056d1c9d6ccd2e11
-EBUILD netfs-984.ebuild 1265 SHA256 7d79d2c446ab3e245b863e0e3e6deafe1ad99c568f38440f01e017b30b9f6cdb SHA512 92827b2160daa772cd4b9e6812260a02b2b98cc191e08aa807233a238060ab22960364278160b05afe93c335fb274e8320e20cdaa99d08a6fcc80740a1cba30e WHIRLPOOL 265c29ba3fd92dfad4ea79269b6870be1272d5de4cd4c353086080830b722c22eef5b276ec054c7e7e299b810dd4f1475c5b6365ed95e2d0fa02e003715d48a0
-EBUILD netfs-995.ebuild 1237 SHA256 08c13ad7801ca21301ba81ef3b4dd439146bd008a2e80bff0ab7e11d31eb6309 SHA512 0af4e58d49e55638f56eca73d664d1c7c92ba431c16178eda97774903d6638ff87ccb4248d7f5fd9350bd77f2f998f1969d87e37fa4b26fabc8ff6af9b935022 WHIRLPOOL 7092eafcd09b20a144356e0d841a076fc41a6124f61455a46881bf02c6692653c189dba34d93b887645bdfd2e8765031b0b2a7a377e6ed72b28bb995b4ce6793
+DIST netfs-1003.tar.bz2 21518 SHA256 f8364b707465579b574ff35d94cd891ccc24901eb48235162aa2e8a6c695e083 SHA512 1c94516668a5e08c0dde4c46385933965819eab6e50849f63b700ae4b01a906625d0e1af8f5c7f6b95175b22f027f4bbd96aaa4e18db5089bddd4632ed2e3ecb WHIRLPOOL 5eddc1c78353a9779405852ae3404bd7c4236d255fc50a1c577d91121718d05431bac97843ffdf464c9389d6dfe3206866988ab8ba36b270ec1dfe3dd8ebb1d4
+DIST netfs-1005.tar.bz2 21527 SHA256 0bfa714f468d9939d18de962fc0dd81b2bf9e3cc2d013d4d3e788159ee1b0fd7 SHA512 6b81e71be11121d4831b1b8530dd4acfd0dba015ebdac4c384001e593076794576e96cda545c32605a1703c896349e413a883f522186e9149e3ef2e4fbaf8fcd WHIRLPOOL ccd9eee3288a942a50d9ddae3e026170ae9f6f7b8db4102b68d907083b2abe1575bd96ca702977ea0cf1c30d4e5eb5c0d48f664264d1b23f8eb816c7bbed1b90
+DIST netfs-984.tar.bz2 21473 SHA256 15846141af16c090fce4fe0971286f0319047dd91070d802c38fb7e39491f8ec SHA512 4ac93c94acce79a8604cbd1cb30e8398328a2f3ce161410f7239db56e088f16ebbc3f522a5747f9bfc05e6b2e797dd5489aa9531e07f816d6ffe5a587d5f2de1 WHIRLPOOL eda899bf6f2825a8537f38ff97e2a595a255868558a02ce61adec351bb2fba16a0a65aab2a73a72ebccadc9a422efd374f57283ed9052c2f1bd26d31554f1e01
+DIST netfs-995.tar.bz2 21482 SHA256 200ecc0b125aedc44d96d72dab0e62cc4569c76a692fb9c0568a3a7c9f0c8cec SHA512 8e3c283c47d213332ef54b09d4a8dd125cef47584e756b55741ec1c5aa7084e048de10000428938f859ee1b32a71d3a23a8d19c17dab0808ea5a1f58a5ea742d WHIRLPOOL cd93a8de1bce9a0bce35bb927a6a71cab1b791192052480b244ec64389122a2a05c8f95d6685806c6a5ca12850816ea7a55b614d367799f1dce8b5356451c0ac
+EBUILD netfs-1003.ebuild 1233 SHA256 99679c698fde123a261c17f80109ca2d7bdffabdd0bd9ecd2689d2d7a4fff1a7 SHA512 30bf162ff2f5f935106b8dff2f7c3504c7e097b924a409e9c996bbd69e9d1cddbe1ba96c565bb6ecd540edaacfc16f7c87e0ece7881ebb74d00c3be75e26195f WHIRLPOOL 6717e66fe90a6229c8f80b330fa8233f58ccf92f944271fb16624cd108d48d7ab2eaf85d0a3c476137be55accbf4e686ebf0f93b42e25065ed554787277f3e53
+EBUILD netfs-1005.ebuild 1233 SHA256 99679c698fde123a261c17f80109ca2d7bdffabdd0bd9ecd2689d2d7a4fff1a7 SHA512 30bf162ff2f5f935106b8dff2f7c3504c7e097b924a409e9c996bbd69e9d1cddbe1ba96c565bb6ecd540edaacfc16f7c87e0ece7881ebb74d00c3be75e26195f WHIRLPOOL 6717e66fe90a6229c8f80b330fa8233f58ccf92f944271fb16624cd108d48d7ab2eaf85d0a3c476137be55accbf4e686ebf0f93b42e25065ed554787277f3e53
+EBUILD netfs-984.ebuild 1260 SHA256 1578f8baeb3813590f295ccfa30f267ab6e5a40867eef2b9a1bf20c80673b40a SHA512 cdcc18c59398ada31a5b504681605abe6c5c2abeb6a9fb25ec0e633edd99a0cfd4ce03e2e209e3a5c23d0c6f14745adf78ff316d083fea085948ceaa4e5b5f4e WHIRLPOOL 1cd698689637b5bb35ca966c019666baabeb64483abacca1b6ac7ad3dfe0201eefa584d60e9e0d2d21f3db78ea0ac080ab122aef71979bc86c58fc4101af26a9
+EBUILD netfs-995.ebuild 1232 SHA256 7e49e31180735f6bbd1f016b56d686bb8eb256d6ea7bf07f4b119caf34409283 SHA512 21a446880ed6fa2b7a9575e0da74ce64ec1dcffe97c9cffd087b638fa52d32db21424baf1a6d0615581e4b89b3a5f66483c349ecd5a791edd2b191f10175d7c0 WHIRLPOOL 1738a714146056bc69ecfc365c5691929e6cb9bd3803186f157b82f2c81cdddfd4da8a118396f1e83087565c996d1d3cf02bb310f4be7340a8c97b123a0e1918
diff --git a/sys-cluster/netfs/netfs-1003.ebuild b/sys-cluster/netfs/netfs-1003.ebuild
index 5f7b811..78a2a8f 100644
--- a/sys-cluster/netfs/netfs-1003.ebuild
+++ b/sys-cluster/netfs/netfs-1003.ebuild
@@ -3,7 +3,7 @@ EAPI="5"
 DESCRIPTION="Cluster capable network filesytem"
 HOMEPAGE="http://netfs.randomdan.homeip.net/"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="x86 amd64"
diff --git a/sys-cluster/netfs/netfs-1005.ebuild b/sys-cluster/netfs/netfs-1005.ebuild
index 5f7b811..78a2a8f 100644
--- a/sys-cluster/netfs/netfs-1005.ebuild
+++ b/sys-cluster/netfs/netfs-1005.ebuild
@@ -3,7 +3,7 @@ EAPI="5"
 DESCRIPTION="Cluster capable network filesytem"
 HOMEPAGE="http://netfs.randomdan.homeip.net/"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="x86 amd64"
diff --git a/sys-cluster/netfs/netfs-829.ebuild b/sys-cluster/netfs/netfs-829.ebuild
deleted file mode 100644
index c6a8651..0000000
--- a/sys-cluster/netfs/netfs-829.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="Cluster capable network filesytem"
-HOMEPAGE="http://netfs.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug"
-
-DEPEND="dev-libs/Ice
-	sys-fs/fuse
-	dev-cpp/libxmlpp
-	dev-libs/boost
-	dev-util/boost-build"
-RDEPEND="${DEPEND}"
-use !debug && var="variant=release"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL ${BJAM} ${BJAMOPTS} ${var} -q || die
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL ${BJAM} ${BJAMOPTS} ${var} install -q --bindir=${D}/usr/sbin --libdir=${D}/usr/lib  || die
-
-	dosym /usr/sbin/netfs /sbin/mount.netfs || die
-
-	newinitd ${S}/netfs/etc/init netfsd || die
-	insinto /etc/netfs || die
-	doins ${S}/netfs/etc/daemon.xml || die
-	doins ${S}/netfs/client.xml || die
-}
diff --git a/sys-cluster/netfs/netfs-938.ebuild b/sys-cluster/netfs/netfs-938.ebuild
deleted file mode 100644
index 08443f0..0000000
--- a/sys-cluster/netfs/netfs-938.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="Cluster capable network filesytem"
-HOMEPAGE="http://netfs.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug"
-
-DEPEND="dev-libs/Ice
-	sys-fs/fuse
-	dev-cpp/libxmlpp
-	dev-libs/boost
-	dev-util/boost-build"
-RDEPEND="${DEPEND}"
-use !debug && var="variant=release"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL ${BJAM} ${BJAMOPTS} ${var} -q || die
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL ${BJAM} ${BJAMOPTS} ${var} install -q --bindir=${D}/usr/sbin --libdir=${D}/usr/lib  || die
-	insinto /usr/include/netfs || die
-	doins ${S}/netfs/ice/*.h || die
-	doins ${S}/netfs/ice/bin/*/*/*.h || die
-
-	dosym /usr/sbin/netfs /sbin/mount.netfs || die
-
-	newinitd ${S}/netfs/etc/init netfsd || die
-	insinto /etc/netfs || die
-	doins ${S}/netfs/etc/daemon.xml || die
-	doins ${S}/netfs/client.xml || die
-	insinto /usr/share/netfs/ice || die
-	doins ice/*.ice || die
-}
diff --git a/sys-cluster/netfs/netfs-967.ebuild b/sys-cluster/netfs/netfs-967.ebuild
deleted file mode 100644
index 08443f0..0000000
--- a/sys-cluster/netfs/netfs-967.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="Cluster capable network filesytem"
-HOMEPAGE="http://netfs.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug"
-
-DEPEND="dev-libs/Ice
-	sys-fs/fuse
-	dev-cpp/libxmlpp
-	dev-libs/boost
-	dev-util/boost-build"
-RDEPEND="${DEPEND}"
-use !debug && var="variant=release"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL ${BJAM} ${BJAMOPTS} ${var} -q || die
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL ${BJAM} ${BJAMOPTS} ${var} install -q --bindir=${D}/usr/sbin --libdir=${D}/usr/lib  || die
-	insinto /usr/include/netfs || die
-	doins ${S}/netfs/ice/*.h || die
-	doins ${S}/netfs/ice/bin/*/*/*.h || die
-
-	dosym /usr/sbin/netfs /sbin/mount.netfs || die
-
-	newinitd ${S}/netfs/etc/init netfsd || die
-	insinto /etc/netfs || die
-	doins ${S}/netfs/etc/daemon.xml || die
-	doins ${S}/netfs/client.xml || die
-	insinto /usr/share/netfs/ice || die
-	doins ice/*.ice || die
-}
diff --git a/sys-cluster/netfs/netfs-984.ebuild b/sys-cluster/netfs/netfs-984.ebuild
index 40cea98..e8c765f 100644
--- a/sys-cluster/netfs/netfs-984.ebuild
+++ b/sys-cluster/netfs/netfs-984.ebuild
@@ -3,7 +3,7 @@ EAPI="5"
 DESCRIPTION="Cluster capable network filesytem"
 HOMEPAGE="http://netfs.randomdan.homeip.net/"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="x86 amd64"
diff --git a/sys-cluster/netfs/netfs-995.ebuild b/sys-cluster/netfs/netfs-995.ebuild
index 90f8cc5..ebc7419 100644
--- a/sys-cluster/netfs/netfs-995.ebuild
+++ b/sys-cluster/netfs/netfs-995.ebuild
@@ -3,7 +3,7 @@ EAPI="5"
 DESCRIPTION="Cluster capable network filesytem"
 HOMEPAGE="http://netfs.randomdan.homeip.net/"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="x86 amd64"
diff --git a/www-apps/project2/Manifest b/www-apps/project2/Manifest
index 17787a7..852a6e7 100644
--- a/www-apps/project2/Manifest
+++ b/www-apps/project2/Manifest
@@ -1,25 +1,8 @@
-DIST project2-1020.tar.bz2 1711218 SHA256 e602ad7039c0b5af9d1e1b129ad5827edf52e5e0aeb317738db00cce867992d1 SHA512 2a355cb67d31512014db874932f1d5a021069485066071c9ce25a4ff663ff587e3ffc69a1f4337441d95c779a818a2ba6fb0ec285ed54d542bd58218c5cd1386 WHIRLPOOL 58a9b45f5ae0bc7137b158ffd49b178bbf081959fa4aaf6e2c0bfbdfe31edb8493f2fdf7498c2fef7d998f764275f84bb8588064ad5c93e9a0a706a10a3c901e
-DIST project2-826.tar.bz2 127047 SHA256 29225dcf386b47146fc1fca1790a5ac432b4198bee5690bf3b736334fb68cc1e SHA512 af50f54b21ae8e0110752abb7849841da174ecf3f4e25445d6499286fa2f3bedd32be1eb4192c987da1664f52749606d07bc945b00ab9e9d76c538201891b25d WHIRLPOOL 38c5ba30327767f9d4abea1582da2567f79699277be6101083433fbb342cc99bae5505099bef5b14824c40067752cde209f169a372bbd29ff825d27d4b995400
-DIST project2-838.tar.bz2 128472 SHA256 f670d7d1ee0c3e0d07b4b60ad404f77a2b0699b83c9693b3a09937e9896de1eb SHA512 dbcbb71a60d00c796b164f257ffff2dbf49b5a2a84768f3ebb13789f13db700e59158de23c3bfdbdf0f618bdc7c9d0cc71a771c72b992b5ba98f738ed7447b69 WHIRLPOOL 0cdbf1de605f7a9b7cb62b8aec9a4d2aad684ebf179d6e46f832e6608da02bd6f55cbfa919ba77788e0af44c95a1ee72127533fb2b27dcb30c5e12275d947ce7
-DIST project2-853.tar.bz2 129255 SHA256 d7b3ae8e893acb9d6a676d4824e58173ca6241c73dd76f69b90f0a602cc8a0f5 SHA512 76bd46e571e3663779a060817e189d83ff37429f0a6f1fc1809960eeb84af9d1ef5302c1a139d5e7a6165fe85faebabede92928d10124e51a961dd791007341b WHIRLPOOL 178e970ccf91f4d8ab381e599fe5d0aecdb3155275ee9c3a39e6f0f840bbfc4645ddd8ee53a4cc14d3d1220671f38565c2d84aa73c95e54d372677228eb1aaac
-DIST project2-861.tar.bz2 129533 SHA256 8c110894f11f2c683cb87d414016103a3df15468c10ca64c38c8ab47de1289ca SHA512 52272992f34469b003c08dbcea6ec376d99e045c30671cbb7d163db01a53a00154a0eed0b323bd9acba79bea92008a5f8b12d4d40fa9cd03769bf4cc6db13c04 WHIRLPOOL 7fa35d42c5cdc0c25201c9a6006e9d302d435ab1ddd180c07652f0306e5e462dc59c3244b4bdce4abd4edcb21f67cb40a7aade436c6fd2dc700526da3ac7bb49
-DIST project2-892.tar.bz2 131547 SHA256 3de7ba0aea49615aa62da0d3a15b15ce8d53e61ad172049663c0d65a81e03aa9 SHA512 2e9e67f0793ad3bc59b503b2e8d8a7f2c6e0e820506b5a79feb74bde5439567c3844a6d5a45c159542f9c65a88103a1279009f92f825079f5364bf7e95a95e82 WHIRLPOOL c044044a4f88b28dc879c13d773c8b65a3a3d975fc85b6372b8ce6f9208eda21797a1102568ba8ff7ce58fac19cc158cd030fc699ed889d35759dc7299b33ebf
-DIST project2-897.tar.bz2 131860 SHA256 6f326629463351957ab7f61fa6292acf337cf2a0fe8551b42cca416f1d80fd68 SHA512 33c82e03a9dc9c38dde8b4b17fabc8e88b9d0884473e6d186e28d5c6f54e7371edd8b140c67b5c8fa84ddb23925093701c643e6c4bdd8d5cef987da2e4b15cc9 WHIRLPOOL 7a922ed3f3992c957ee40afbe4f0d1f44dcf2e8afa099ebbe49aa8b580ea5314bfff3058c3bb2c1352853fe16046b94b5a0e7e44b8e98551e57955e10720d07d
-DIST project2-906.tar.bz2 132139 SHA256 822e479db93381ec9967daf8271fd57f35a17d3f576574dc6071e80bc24e200e SHA512 1e4b56e082717bda644b904233060de2a28bdebcdd67f20aed8445dc5551bd5ad650d0129be6e95b990f4ade21d305aead63b43288c2abccd999c5edadfd80d3 WHIRLPOOL 3e2acbecae0db9be989e1a92d56f954ae7034713bd3fdb7f02da034276a1b0c270bd38b942e9e3cbbc77ba72b0d2091a6866df806d2adb34f2cf4fa3c2d0e42e
-DIST project2-914.tar.bz2 132101 SHA256 5da4780e26486a39925bce089759fd2ef300c2632464ef70363b89b72485c5c3 SHA512 e2c09e60428b672c2edc86191e9f6280ea31f22162fd1ff90af3648852d1ea31b3bc4d8e0c9af30211da72daf77ea5ff91519f1b169e878e5109e382812b7cfd WHIRLPOOL ebbf2799558c5d17ff42d8b8534a3e0144d8243478345189f5d0ad1280423fd24ef30735dd5f89f1cfd4f4bfcf01c946c159f0cc6df47e227a2f3295b79ceae3
-DIST project2-922.tar.bz2 140577 SHA256 4497b52df94950278c276889591cb3df6389a3b256f4763f37589a1c821b61aa SHA512 e6f36989a96c974de9c8bf5e6a77ee16d5cf2c2cf02db43f6ad89908d85a2b7c860053169fa382a920b758bd9d187e1316e51f5f655b88eb737685dec222ade1 WHIRLPOOL 7900fa94443b6a7d2baac92d58bb0c9d63edefeebeeed9ef5a3118322d5fd69ac41156c764a1bfa1e091721481cd74b8350771e186b506e02e4d8b14c7623f81
-DIST project2-953.tar.bz2 142700 SHA256 fe68cf3b312013ea7a83bf1cd8c531d21794449350c4131a3aee2c5803b4e48b SHA512 fff304b2f7fec787134a44dd644f3d0aaca499df16e0c402bff8ea07dbb3f9aa583f31728bfb332a6e5a951359a6e6e5c47f239badfc671d8e9ef23156cd69d0 WHIRLPOOL fcc45ea2f6c122182ff4a4a72940410ce0448ac69aa6cc776ce64f63a6a39974030460e3f641185cb96a58dbff7251d16cc582a1a51a645d66ddf9728eadd6bc
-DIST project2-955.tar.bz2 142782 SHA256 d902c24c9f372ff9fd8cbb0ca7a5b910b2cc410dcf1123083227d7db87c7eb97 SHA512 1f7c9723821664889bed653fb2c8dad831aca4595fd90f45cb2284d503be144f84399414eafec22eef1fd6ea027db088231bbab1a4ceb44812ca4772d00dddd5 WHIRLPOOL 28b9bf44c7ae04f85306be4d0dc72cee76e79856a66959a55422eec6aad304c78ad4db953bede1d05fefd57face49b451bb429bb95cbe4564f5ab75c1dad5907
+DIST project2-1020.tar.bz2 151140 SHA256 45883aba0e8bbc56c8069dfda832cd071b75d4da27ed080007c744eea9d9248c SHA512 e34ab1e0fa05f453f988e056b2d95d002f371b2b7f21e101fa0ff2305013165faa77bc4a367886cf1ad8966645ee9105b59b431f891c6d117f99ad8b672ba21c WHIRLPOOL f785d24a3f465de335f0eef6def30bf9b4ed21fe112d1bed37387c10d7ae82a3d1a3b81cfbf5740a85bf0d1df1c6f883102b95b56eb519f328ade66d9aaa9f26
+DIST project2-922.tar.bz2 139770 SHA256 c82de40313153e31c25c1284a80a75b1fb48baecd322e68360bf9cc2860cde1d SHA512 e6747313c532b748d97bdfd9cb28c7434e976efc8a8307d1e421e3e4842ec98aa21aa470dc5087186475857cef62adbd39db0249196eca455b7d1843e939daeb WHIRLPOOL 796f3a898a51f775763d54e99cea06a9774594a60c604f9c8c621a8c4010be0849fffc9b886d0223dd27613e672fb8289b4f3ddc8279110572ce1574a33bad07
+DIST project2-953.tar.bz2 141783 SHA256 cb57b25b9a71a511a6ed2149951f64b1039539104ade9f8b7219394156184f03 SHA512 f98581b7b70bec00c7d0ed37d8949792c9153a7c5e2771eef2f195d11c8f29655fdb7bfb43cc179733dce7392781a56ada4497819212f0b010bdf135e5abf252 WHIRLPOOL 06b435fef3817d270d1f63c99c2b5370a8ab17d8d3a671f09f89644c0d89a938c07be92f41379c8c532550b43e4e84990c0f6cf8716deb9e1dc57a542b00a4b9
+DIST project2-955.tar.bz2 141883 SHA256 d379eae0c256a4df646371ddc31c06b30c611716d7bb95f851ca967b937fb4c4 SHA512 699ae754e67db4caf1ecf1c7594692fc7ddf75d905e2d175db469f0044b3818a10f3b77d4cf8c13cb864ad5d1d5392d21f8edd0b7ca461b4a6d2497d6f791b24 WHIRLPOOL ba3cb57cc21d3def3c60ddd7af1cfad4564717fc715ae869385d99f4491968f1ddd38810aa4f962a73f09083f3fee55ea6c284d40143e548a0abff08fa72a281
 EBUILD project2-1020.ebuild 2023 SHA256 2538629c67cd1de26f5df2905e74f5955a0f2c921c4ee017ebe08e42282184a8 SHA512 e87cce9ca858faf7632b5cc584b98284dbd6a6b5b0a0c751c2471d9168b47b7355d52542a03f57498c0835ea9bc7e0e84b6aa41688eb5f54881a47a2e104ceea WHIRLPOOL bfad701fe701e120adb247cf15209f3d8cabfa1788735827fa93b296dfdb7ac85741a04478f075bf42d271d532955a152ef1e56c93957b8219cdef3de39c049a
-EBUILD project2-814.ebuild 1801 SHA256 5c2317f047b80802030a72b68587bba95ca0f0fb6f2509a3d289a99c6d351fcd SHA512 83d0df3f14a46cb81e158c7acefc44fbdf4900690778a3d429f325217cfe75ed2073410595ec1f024dce1c2ecf1c86c2020f48fda17d7f0bfaaf4f5982965a1b WHIRLPOOL cf3ba602a97b7bf272bfc15cdb53b8a6837f4a1abe49df30ea95d0c2713c651aa519042aa474fb60a69e7a0a4c3d1f156233a393325f21354b4425b866a4fc67
-EBUILD project2-826.ebuild 1771 SHA256 0c693fb4a9492189676ec1c0dc82a79b78593c7c00c68b705e5c99c7368f5dff SHA512 fe56f0744be390662a61bc8408afdf56c1a6228dfc81f8aa6ccbc3ff45f4ad1c3d2f7c7f3a94e9f35d2a2975bcff10fe9e8cca53fe8394b2b835354deb72484a WHIRLPOOL 266f0295e49b36e07d3771c5c3138447b0dbbc7fa8ab76acf02567fe65f8ed86826058fe7ab5f7b40105b4e7b24e3256a1db65637d606d31eb6234596572effb
-EBUILD project2-838.ebuild 1839 SHA256 a08db0d60ff3e1a30ea406e17baafbcc03dde4a4a7c605bb01209652733f98cb SHA512 e5f85c3c9d6be93b1bd74886f382767267afab3d28bda42a1c2fe1710be4118957d1f717ba968d57dcad3fb4142ab11fc66333cca6da282647e326852c8231a2 WHIRLPOOL 0c62088080bf13dd9c4d68c5dadc360d4d96373a899e011a61617ec9c26d3a695aa1444a84d4a80eeef502516fe2102f0c2014c0ba4067539c209d797bc577ef
-EBUILD project2-853.ebuild 2093 SHA256 5fc1b5722bbada8345c5456839abf81d942ddc810d0e77ae0ce134cefe9162f4 SHA512 7b99e8f5f96b0555b2c508526a0d1484834155429cbb63cadae67698aa4a745332a9593fc6ec07dc36360a91f870db57197b33f5c267cc5d8282c84db5c0dce4 WHIRLPOOL 4fa9c117a5c0d71025d2df2bd71b7df2c6edb1ba252376d3fa99609eb6c3e87a4f96f80bbca76e303dcd9d0187883f2496c5e08802a19660077a115131682444
-EBUILD project2-861.ebuild 2093 SHA256 5fc1b5722bbada8345c5456839abf81d942ddc810d0e77ae0ce134cefe9162f4 SHA512 7b99e8f5f96b0555b2c508526a0d1484834155429cbb63cadae67698aa4a745332a9593fc6ec07dc36360a91f870db57197b33f5c267cc5d8282c84db5c0dce4 WHIRLPOOL 4fa9c117a5c0d71025d2df2bd71b7df2c6edb1ba252376d3fa99609eb6c3e87a4f96f80bbca76e303dcd9d0187883f2496c5e08802a19660077a115131682444
-EBUILD project2-892.ebuild 2093 SHA256 5fc1b5722bbada8345c5456839abf81d942ddc810d0e77ae0ce134cefe9162f4 SHA512 7b99e8f5f96b0555b2c508526a0d1484834155429cbb63cadae67698aa4a745332a9593fc6ec07dc36360a91f870db57197b33f5c267cc5d8282c84db5c0dce4 WHIRLPOOL 4fa9c117a5c0d71025d2df2bd71b7df2c6edb1ba252376d3fa99609eb6c3e87a4f96f80bbca76e303dcd9d0187883f2496c5e08802a19660077a115131682444
-EBUILD project2-897.ebuild 2093 SHA256 5fc1b5722bbada8345c5456839abf81d942ddc810d0e77ae0ce134cefe9162f4 SHA512 7b99e8f5f96b0555b2c508526a0d1484834155429cbb63cadae67698aa4a745332a9593fc6ec07dc36360a91f870db57197b33f5c267cc5d8282c84db5c0dce4 WHIRLPOOL 4fa9c117a5c0d71025d2df2bd71b7df2c6edb1ba252376d3fa99609eb6c3e87a4f96f80bbca76e303dcd9d0187883f2496c5e08802a19660077a115131682444
-EBUILD project2-906.ebuild 2093 SHA256 5fc1b5722bbada8345c5456839abf81d942ddc810d0e77ae0ce134cefe9162f4 SHA512 7b99e8f5f96b0555b2c508526a0d1484834155429cbb63cadae67698aa4a745332a9593fc6ec07dc36360a91f870db57197b33f5c267cc5d8282c84db5c0dce4 WHIRLPOOL 4fa9c117a5c0d71025d2df2bd71b7df2c6edb1ba252376d3fa99609eb6c3e87a4f96f80bbca76e303dcd9d0187883f2496c5e08802a19660077a115131682444
-EBUILD project2-914.ebuild 2093 SHA256 5fc1b5722bbada8345c5456839abf81d942ddc810d0e77ae0ce134cefe9162f4 SHA512 7b99e8f5f96b0555b2c508526a0d1484834155429cbb63cadae67698aa4a745332a9593fc6ec07dc36360a91f870db57197b33f5c267cc5d8282c84db5c0dce4 WHIRLPOOL 4fa9c117a5c0d71025d2df2bd71b7df2c6edb1ba252376d3fa99609eb6c3e87a4f96f80bbca76e303dcd9d0187883f2496c5e08802a19660077a115131682444
-EBUILD project2-922.ebuild 2113 SHA256 7e9771d2e222b9caac2ff7927e15b313b10274a0fe6c9fb5dd3fef32d1d40fd0 SHA512 6fb33b7382a3df92a94ff018a6632f6418c24c1f76200f37a642f1a486f780e38e68d95fceb0ba45eb34589a3cd09fde88b679ed08e15fba1ef9f2db2d1eb2ea WHIRLPOOL 7420b2b595ff81d37dda4fe706b4c0af872fab9e6105a71b26e41f495258f4a1423a5cac646c1a86b235aeff73ef93651d6283d00d0072f6a685d5ffd09225f3
-EBUILD project2-953.ebuild 2113 SHA256 7e9771d2e222b9caac2ff7927e15b313b10274a0fe6c9fb5dd3fef32d1d40fd0 SHA512 6fb33b7382a3df92a94ff018a6632f6418c24c1f76200f37a642f1a486f780e38e68d95fceb0ba45eb34589a3cd09fde88b679ed08e15fba1ef9f2db2d1eb2ea WHIRLPOOL 7420b2b595ff81d37dda4fe706b4c0af872fab9e6105a71b26e41f495258f4a1423a5cac646c1a86b235aeff73ef93651d6283d00d0072f6a685d5ffd09225f3
-EBUILD project2-955.ebuild 2113 SHA256 7e9771d2e222b9caac2ff7927e15b313b10274a0fe6c9fb5dd3fef32d1d40fd0 SHA512 6fb33b7382a3df92a94ff018a6632f6418c24c1f76200f37a642f1a486f780e38e68d95fceb0ba45eb34589a3cd09fde88b679ed08e15fba1ef9f2db2d1eb2ea WHIRLPOOL 7420b2b595ff81d37dda4fe706b4c0af872fab9e6105a71b26e41f495258f4a1423a5cac646c1a86b235aeff73ef93651d6283d00d0072f6a685d5ffd09225f3
+EBUILD project2-922.ebuild 2108 SHA256 1447c741b714d9abb409382e0bdee13a29218b810beffa03adb854af0265fcb1 SHA512 724086525814e57bb24086551d072a3ba38d28444248d19d9c139eec09e1a5d3c8415fcb1a378ba4067785a2adee72a6772106c1689aa3bcf1f3f94947bcde14 WHIRLPOOL 26b05633cd5cb7419eef4cb99c8d091f45dc62ac9910b082ff2b8f050c211fa0cbc781918594fe82c04a78d33ccc2ce9e74d961b2d092d0c83519311eee02054
+EBUILD project2-953.ebuild 2108 SHA256 1447c741b714d9abb409382e0bdee13a29218b810beffa03adb854af0265fcb1 SHA512 724086525814e57bb24086551d072a3ba38d28444248d19d9c139eec09e1a5d3c8415fcb1a378ba4067785a2adee72a6772106c1689aa3bcf1f3f94947bcde14 WHIRLPOOL 26b05633cd5cb7419eef4cb99c8d091f45dc62ac9910b082ff2b8f050c211fa0cbc781918594fe82c04a78d33ccc2ce9e74d961b2d092d0c83519311eee02054
+EBUILD project2-955.ebuild 2108 SHA256 1447c741b714d9abb409382e0bdee13a29218b810beffa03adb854af0265fcb1 SHA512 724086525814e57bb24086551d072a3ba38d28444248d19d9c139eec09e1a5d3c8415fcb1a378ba4067785a2adee72a6772106c1689aa3bcf1f3f94947bcde14 WHIRLPOOL 26b05633cd5cb7419eef4cb99c8d091f45dc62ac9910b082ff2b8f050c211fa0cbc781918594fe82c04a78d33ccc2ce9e74d961b2d092d0c83519311eee02054
diff --git a/www-apps/project2/project2-814.ebuild b/www-apps/project2/project2-814.ebuild
deleted file mode 100644
index f4df997..0000000
--- a/www-apps/project2/project2-814.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-EAPI="3"
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	>=dev-cpp/libxmlpp-2.36
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			fastcgi? (
-				dev-libs/cgicc
-				virtual/httpd-fastcgi
-				dev-libs/fcgi
-				)
-		 )
-	docs? ( app-doc/doxygen )
-	"
-RDEPEND="${DEPEND}"
-ESVN_REPO_URI="http://svn.randomdan.homeip.net/src/trunk"
-ESVN_REVISION="${PV}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=no"
-use !postgres && pq="pq=no"
-use console && bt="$bt p2console" && it="$it installp2con"
-use web && bt="$bt p2cgi" && it="$it installp2cgi"
-use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-826.ebuild b/www-apps/project2/project2-826.ebuild
deleted file mode 100644
index e9a66ab..0000000
--- a/www-apps/project2/project2-826.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	>=dev-cpp/libxmlpp-2.36
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			fastcgi? (
-				dev-libs/cgicc
-				virtual/httpd-fastcgi
-				dev-libs/fcgi
-				)
-		 )
-	docs? ( app-doc/doxygen )
-	"
-RDEPEND="${DEPEND}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=no"
-use !postgres && pq="pq=no"
-use console && bt="$bt p2console" && it="$it installp2con"
-use web && bt="$bt p2cgi" && it="$it installp2cgi"
-use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-838.ebuild b/www-apps/project2/project2-838.ebuild
deleted file mode 100644
index 1cbfc8c..0000000
--- a/www-apps/project2/project2-838.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi +daemon"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	>=dev-cpp/libxmlpp-2.36
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			fastcgi? (
-				dev-libs/cgicc
-				virtual/httpd-fastcgi
-				dev-libs/fcgi
-				)
-		 )
-	docs? ( app-doc/doxygen )
-	"
-RDEPEND="${DEPEND}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=no"
-use !postgres && pq="pq=no"
-use console && bt="$bt p2console" && it="$it installp2con"
-use web && bt="$bt p2cgi" && it="$it installp2cgi"
-use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
-use daemon && bt="$bt p2daemon" && it="$it installp2daemon"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-853.ebuild b/www-apps/project2/project2-853.ebuild
deleted file mode 100644
index c395d1a..0000000
--- a/www-apps/project2/project2-853.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi +daemon"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	>=dev-cpp/libxmlpp-2.36
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			fastcgi? (
-				dev-libs/cgicc
-				virtual/httpd-fastcgi
-				dev-libs/fcgi
-				)
-		 )
-	docs? ( app-doc/doxygen )
-	"
-RDEPEND="${DEPEND}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=no"
-use !postgres && pq="pq=no"
-use console && bt="$bt p2console" && it="$it installp2con"
-use web && bt="$bt p2cgi" && it="$it installp2cgi"
-use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
-use daemon && bt="$bt p2daemon" && it="$it installp2daemon"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--prefix=${D}/usr \
-			|| die "Installed failed"
-	${BJAM} installheaders --includedir=${D}/usr/include/project2 || die "Install headers failed"
-	${BJAM} installheadersmisc --includedir=${D}/usr/include/project2/lib || die "Install headers failed"
-	${BJAM} installheadersdb --includedir=${D}/usr/include/project2/sql || die "Install headers failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-861.ebuild b/www-apps/project2/project2-861.ebuild
deleted file mode 100644
index c395d1a..0000000
--- a/www-apps/project2/project2-861.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi +daemon"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	>=dev-cpp/libxmlpp-2.36
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			fastcgi? (
-				dev-libs/cgicc
-				virtual/httpd-fastcgi
-				dev-libs/fcgi
-				)
-		 )
-	docs? ( app-doc/doxygen )
-	"
-RDEPEND="${DEPEND}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=no"
-use !postgres && pq="pq=no"
-use console && bt="$bt p2console" && it="$it installp2con"
-use web && bt="$bt p2cgi" && it="$it installp2cgi"
-use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
-use daemon && bt="$bt p2daemon" && it="$it installp2daemon"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--prefix=${D}/usr \
-			|| die "Installed failed"
-	${BJAM} installheaders --includedir=${D}/usr/include/project2 || die "Install headers failed"
-	${BJAM} installheadersmisc --includedir=${D}/usr/include/project2/lib || die "Install headers failed"
-	${BJAM} installheadersdb --includedir=${D}/usr/include/project2/sql || die "Install headers failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-892.ebuild b/www-apps/project2/project2-892.ebuild
deleted file mode 100644
index c395d1a..0000000
--- a/www-apps/project2/project2-892.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi +daemon"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	>=dev-cpp/libxmlpp-2.36
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			fastcgi? (
-				dev-libs/cgicc
-				virtual/httpd-fastcgi
-				dev-libs/fcgi
-				)
-		 )
-	docs? ( app-doc/doxygen )
-	"
-RDEPEND="${DEPEND}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=no"
-use !postgres && pq="pq=no"
-use console && bt="$bt p2console" && it="$it installp2con"
-use web && bt="$bt p2cgi" && it="$it installp2cgi"
-use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
-use daemon && bt="$bt p2daemon" && it="$it installp2daemon"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--prefix=${D}/usr \
-			|| die "Installed failed"
-	${BJAM} installheaders --includedir=${D}/usr/include/project2 || die "Install headers failed"
-	${BJAM} installheadersmisc --includedir=${D}/usr/include/project2/lib || die "Install headers failed"
-	${BJAM} installheadersdb --includedir=${D}/usr/include/project2/sql || die "Install headers failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-897.ebuild b/www-apps/project2/project2-897.ebuild
deleted file mode 100644
index c395d1a..0000000
--- a/www-apps/project2/project2-897.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi +daemon"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	>=dev-cpp/libxmlpp-2.36
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			fastcgi? (
-				dev-libs/cgicc
-				virtual/httpd-fastcgi
-				dev-libs/fcgi
-				)
-		 )
-	docs? ( app-doc/doxygen )
-	"
-RDEPEND="${DEPEND}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=no"
-use !postgres && pq="pq=no"
-use console && bt="$bt p2console" && it="$it installp2con"
-use web && bt="$bt p2cgi" && it="$it installp2cgi"
-use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
-use daemon && bt="$bt p2daemon" && it="$it installp2daemon"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--prefix=${D}/usr \
-			|| die "Installed failed"
-	${BJAM} installheaders --includedir=${D}/usr/include/project2 || die "Install headers failed"
-	${BJAM} installheadersmisc --includedir=${D}/usr/include/project2/lib || die "Install headers failed"
-	${BJAM} installheadersdb --includedir=${D}/usr/include/project2/sql || die "Install headers failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-906.ebuild b/www-apps/project2/project2-906.ebuild
deleted file mode 100644
index c395d1a..0000000
--- a/www-apps/project2/project2-906.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi +daemon"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	>=dev-cpp/libxmlpp-2.36
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			fastcgi? (
-				dev-libs/cgicc
-				virtual/httpd-fastcgi
-				dev-libs/fcgi
-				)
-		 )
-	docs? ( app-doc/doxygen )
-	"
-RDEPEND="${DEPEND}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=no"
-use !postgres && pq="pq=no"
-use console && bt="$bt p2console" && it="$it installp2con"
-use web && bt="$bt p2cgi" && it="$it installp2cgi"
-use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
-use daemon && bt="$bt p2daemon" && it="$it installp2daemon"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--prefix=${D}/usr \
-			|| die "Installed failed"
-	${BJAM} installheaders --includedir=${D}/usr/include/project2 || die "Install headers failed"
-	${BJAM} installheadersmisc --includedir=${D}/usr/include/project2/lib || die "Install headers failed"
-	${BJAM} installheadersdb --includedir=${D}/usr/include/project2/sql || die "Install headers failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-914.ebuild b/www-apps/project2/project2-914.ebuild
deleted file mode 100644
index c395d1a..0000000
--- a/www-apps/project2/project2-914.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-EAPI="3"
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi +daemon"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	>=dev-cpp/libxmlpp-2.36
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			fastcgi? (
-				dev-libs/cgicc
-				virtual/httpd-fastcgi
-				dev-libs/fcgi
-				)
-		 )
-	docs? ( app-doc/doxygen )
-	"
-RDEPEND="${DEPEND}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && mysql="mysql=no"
-use !postgres && pq="pq=no"
-use console && bt="$bt p2console" && it="$it installp2con"
-use web && bt="$bt p2cgi" && it="$it installp2cgi"
-use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
-use daemon && bt="$bt p2daemon" && it="$it installp2daemon"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--prefix=${D}/usr \
-			|| die "Installed failed"
-	${BJAM} installheaders --includedir=${D}/usr/include/project2 || die "Install headers failed"
-	${BJAM} installheadersmisc --includedir=${D}/usr/include/project2/lib || die "Install headers failed"
-	${BJAM} installheadersdb --includedir=${D}/usr/include/project2/sql || die "Install headers failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-922.ebuild b/www-apps/project2/project2-922.ebuild
index 703c284..3bfb7a8 100644
--- a/www-apps/project2/project2-922.ebuild
+++ b/www-apps/project2/project2-922.ebuild
@@ -3,7 +3,7 @@ EAPI="3"
 DESCRIPTION="User configured application engine"
 HOMEPAGE="http://project2.randomdan.homeip.net"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="x86 amd64"
diff --git a/www-apps/project2/project2-953.ebuild b/www-apps/project2/project2-953.ebuild
index 703c284..3bfb7a8 100644
--- a/www-apps/project2/project2-953.ebuild
+++ b/www-apps/project2/project2-953.ebuild
@@ -3,7 +3,7 @@ EAPI="3"
 DESCRIPTION="User configured application engine"
 HOMEPAGE="http://project2.randomdan.homeip.net"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="x86 amd64"
diff --git a/www-apps/project2/project2-955.ebuild b/www-apps/project2/project2-955.ebuild
index 703c284..3bfb7a8 100644
--- a/www-apps/project2/project2-955.ebuild
+++ b/www-apps/project2/project2-955.ebuild
@@ -3,7 +3,7 @@ EAPI="3"
 DESCRIPTION="User configured application engine"
 HOMEPAGE="http://project2.randomdan.homeip.net"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="x86 amd64"