diff --git a/app-admin/consul-replicate/Manifest b/app-admin/consul-replicate/Manifest
index 03b72fd86a44..572eb4a27762 100644
--- a/app-admin/consul-replicate/Manifest
+++ b/app-admin/consul-replicate/Manifest
@@ -1,3 +1,4 @@
+DIST consul-0.6.3.tar.gz 2224536 SHA256 5cdc21d6f20f9b703d38e19d3d2ed1c037dcbb236b80bff6a9b9c481ded74435 SHA512 c80b96e18c283f8d2dc7542393e9d788c8247200890b1f2ecdf292b545c01c971f1452f6b37b23b92654409a191fbd4608710b1ca31d6c426ff77b53c4840c4b WHIRLPOOL b021bb7ecc97c2a99e88a8dd17dc1958fe7b2d17848c9e629edb0627d72d5651f96ef625cda4280989463e66c4b48880690b5e4a1180117bc762062be3b0566a
DIST consul-replicate-0.2.0.tar.gz 24575 SHA256 64028b79994407f8d0d0b858a064d0bb9cbecf1e889f55b74a0f6a2c0cb63f6e SHA512 af1bdc0747524996a1cffe989d05a265c0fbcfac9d4d7c4b4bcf94dbd3db6f7635cb013cf542e1cdad049975a8dfad2bca417dd5566c922b7f86e7fd451ea0a2 WHIRLPOOL efac8709e6efa87b8aca5342d5bfaf752a22bca42a9a38cb9c4bada6855302a02140ef5bb06c27bf178081f7aef570a773c64b67ecec5f1e57c15c5a4d9c86c4
DIST consul-template-0.8.0.tar.gz 63281 SHA256 ac12bdde35e88184d5e3f2201c2f46e2dd7b301d4f31b51945905d1b2c456064 SHA512 4a738aa70a291df6e7a48e40fd73c70e279bb957d988de1277b1223dfe151867e06de28542fdbd9fd7f816650b150ed53989fc061fc228b930551fcd0b3005fb WHIRLPOOL e8e48972350d9bb617c72ba07b86823359b8e997494671a23d8d897861e9cfcf429d6edb4ce3fc117849a2fbf6a56aee35809b9db6d738460da34671cfc9c4a7
DIST errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz 8320 SHA256 e77d6aa78ef6342b21358d689edcd043778c5623af5a9b2690ed8e3fa4ea7db0 SHA512 da45b1696253bebe012f3d0e624a63dd11ad1a613d81cc302f2ea6f096f29a8d81015b9c00363bd2590c4cacc59de52a27e84435a7b4ad6512485cdd87df11c0 WHIRLPOOL 5c6013d852711e001a0eca6a3ad11f64e006be527cfc0b46db21049af97506730b48cfe1b2fac10bcfc66f61dce69023f20b06c83558e80ce337d75a127aa90d
diff --git a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
index fd943a87f439..ef70f35a0686 100644
--- a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
+++ b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
@@ -20,6 +20,7 @@ RDEPEND=""
SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://github.com/hashicorp/consul-template/archive/v0.8.0.tar.gz -> consul-template-0.8.0.tar.gz
https://github.com/fatih/structs/archive/a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz -> structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz
+ https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz
https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz
https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index 323df50ab4ac..c8215bc09624 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -6,6 +6,7 @@ DIST copystructure-6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz 4028 SHA256 4
DIST errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz 8320 SHA256 e77d6aa78ef6342b21358d689edcd043778c5623af5a9b2690ed8e3fa4ea7db0 SHA512 da45b1696253bebe012f3d0e624a63dd11ad1a613d81cc302f2ea6f096f29a8d81015b9c00363bd2590c4cacc59de52a27e84435a7b4ad6512485cdd87df11c0 WHIRLPOOL 5c6013d852711e001a0eca6a3ad11f64e006be527cfc0b46db21049af97506730b48cfe1b2fac10bcfc66f61dce69023f20b06c83558e80ce337d75a127aa90d
DIST etcd-5099bf6f7ab92181158cc2f0f0db1bb6056e9aeb.tar.gz 2171596 SHA256 72f642f10d014dff089b7a0fe66168639d30ed0e1586cec43a88b2bd7311cc11 SHA512 cc1d75d73c46f7c8438ddec8f0cf6829936e4ecb58efcaae958f818bbdd777751b393406e6c89784d9234080766ea67d71e660aa973f409ce4319768e76f4dad WHIRLPOOL 7f645f6ae41769e8bf0e4f35e4ac399df385bd1693f3c49d0f3e2859cfbf58e0cbd6f9be8c7de101e37720514828e56ae996cbf8a89e665a867ae083457bf9e8
DIST go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz 6595 SHA256 b0a0282baa30df0e77ebd0902c5f0043f9af3460172ff61070927c270fa8139d SHA512 bfdeea0c0aad4160729bb023c9c908ff56c7faa64a820b16e982efede0389365987343b2a227cac95edaa4c9096f2dfcb1fd3f7d55510328dfdb284cfbf7600a WHIRLPOOL 1cd82ed8a82a2cb1de58a9a0177fead214e63908e880b2d57a4434c024a49d05579ea77142aa9d5ecca370adc4539bfb7db1d9d4a2cc27fc41d83a350c4fce39
+DIST go-crypto-0_pre20150808.tar.gz 876947 SHA256 9ff25a17515c6c7ff0d13fb076ba7a1df868ce30fca105277b3f0356ce801518 SHA512 86826102ff7242259d79a31e543a03192d6b68a06635b46ebac349111bb8451605df1ad9b249c08d75895c38fb4ebbbfc716d40c8c981485395164e87db5a519 WHIRLPOOL 5e1a0372d0a2f493e68c213ce866237cab316c1bf712f2c58a95c16c6864c48ea795e5a6e1346aad7459f666802170aeb0db8f781423fb1d8e252e5bced2e435
DIST go-gatedio-8b8de1022221dde1fb52fa25d0caab46e59c8c14.tar.gz 8209 SHA256 d2283d24b1ea8e7b9520c022eb2530150eed03b6e72f698c9371658654777fea SHA512 2b2cf5ee8adf3dc3e106b3882812ecf925e4bfa7a43962eab70e106fdb46d6928414e1da741f713e1001b50a3ccefb7a1814997f6c3a4f5a1956fba7c40abbb4 WHIRLPOOL fddaa5ce23e418c7e099ba089256f591115e4667e86450454be6040502d94faa52160f6f77f1805299ff82e44a04d225165ef4d98a11f342c2ede0ccf35c3dfc
DIST go-ini-1.8.6.tar.gz 26600 SHA256 66a1328c8dfc21a3b1657177e60681b2b6fa0ab4fce4b6e861c059bff0507511 SHA512 802c4ad56a2ba2f1a543bed8bdd1970557d973d10d3eff7fc69a406af52484943f7d20f91ccfca4cc8364ac438da7b464b05fae30f04b930717cb58f5fc55676 WHIRLPOOL f6a34a8a7bb07b7fc1aaa43ac422eb5e6c1c6b081b065023cc37584ceecd74489001b25af39d70de22e28919bcb410dda7b0fb52cef914889a023db22947208f
DIST go-jmespath-0.2.2.tar.gz 47588 SHA256 d0a918ec689c3997077960c30d2ab6c1f93e3722684940d19286f85274cf56dd SHA512 93d1b64f6a0c658d832c065ddcd006b1d521a71c154a55a818a20063a9f9777640fa077a29e476c4e31f0b208a3c765a32aacf65d44d65d80702dccb7faed2a6 WHIRLPOOL 3f07a5f76117a9c54fe6a6ab6c94d29dff15176909904ba437a48f743e7b4189238428e1ca0080c572a3105855bf740769d65e6d1bb0014e12d335601bdafb43
@@ -15,10 +16,12 @@ DIST go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz 49485 SHA256 c32
DIST go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz 49488 SHA256 eeffbd458f4996334275f828cfd3549d32a2ba6eda359e5c9be09f091548781f SHA512 7e60a122cca007bf5455d6e15f77c24eaa5739deedc9e0c158282249e84698f873628bffa9eb7d23c1c59bda7632b1968ca770c8e1796e2d50750ac86e80fcb2 WHIRLPOOL 41745e39256ef510d42c4da413609e3bdd0621cc2acccfddabb4c8774e47b73ad46656639bed3fac2335cf1b6a2a245d3b8b4f3831cfafb2c6e7ecb90293475d
DIST go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz 8792 SHA256 734fdf39b7fb299ecf18e65f72ac3f1929bd978618af575e8bcad9e5ca55b494 SHA512 8a3e37ac07bbd571dd8b76bd8c119e5dbc620444e78a6f9fe2c4d28b0171a46704a0b088380ca201a08f7235698f07de4e4881691aef5370739c8bfe2db9e85b WHIRLPOOL 7b501d47880ad570dd79d2da79cc10373b03426f7f89b513f3b3b195682b0b36aeefac675a56070c262ee7e0d31ff9a564a9667924b1da66957ad0f97ab2d46c
DIST go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz 8058 SHA256 af90f9be029c091eb011ff25d270772fdb51edf3c6396cf99f224c4e7ad724c3 SHA512 f5cb12407f9bc986867a274c623037edab04f8e2b664c7d4db3bb7e32f970dd073a3d233d18549a5f01b5e88abff0eb0c1fcf79b6696a531c208e6fe8137080e WHIRLPOOL c997792a5c1b3029b32d0fad3a55a281b5ced2bef306367a1fd49df75cab831b93a3752e76f8a18ce5d08e155f66b3826aa5d9878fb9655821cef7a69b71de31
+DIST go-net-0_pre20150804.tar.gz 539435 SHA256 77fb87becd3ddb68ff06acd3a1bf1246b390e7489b3e25a9ee9314f7457ccf60 SHA512 02a9734f8335909a15280e925b11ff03b96fbedd6e48fa5c3f869ab1a8b3062971d634f7043f92cee685c618222b147fdee915f1d5d83bd82cdde171970287e3 WHIRLPOOL a63befad593737449f393d7f4490b1680d8cba808f6163b9723b0d1d228480cdcbf9e2fb091ffc96f9121aabde1e24b06f3ddcb7b30e4bffa6e39dece5a8b3e0
DIST go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz 5446 SHA256 f4e628adceee06d7717dce0bf566d5ebd8c009599807f2436b3cda259011b331 SHA512 350904076752e2fda17e9c2891a50b037d2ca165924880d6d5e466b8ed76685d79ff00bbbfbe9a665668e0ebde23c87129d3c1c4bf27ffe0c034df160db9d08f WHIRLPOOL 8571b9e818904a56ea16c35883725013d2009dc294acfdf4f28920a03baff36ffcd3d4d6d8be0ecfc78eefbfeef57e4b2ca224f2ce37d665caae724389346f88
DIST go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz 5484 SHA256 4b5ac4fe94fb221c849b0e9694301eba2dc91ac1a6b79cee48da038cb1a3d2aa SHA512 e76b6eb6e23f3f1872486e1ad0cfe9e4dcd676a1bee62cfb2e2de28ead2defb8997adadfc48781d910b327fc777c4b38acca1e983a0fb14dd73142f4edb97337 WHIRLPOOL 391097c2c1f7e2a170b41d752595480454d036e9c35dd4ff08678d103a5bd2baddedb3a4a7ce89ca938408fa234be3a63bc74461c09bbfea212d016efa7c3028
DIST go-reap-2d85522212dcf5a84c6b357094f5c44710441912.tar.gz 8469 SHA256 919b889e2fa550e97b6b2254983cb4e826772ebf5237a787c65217caa244efa0 SHA512 aec1ab90bf1a461e0031f4e3015585129be095896bc40c4188f01d3295b95565f544271ee51d284936d504097831bfee979ba9002bf2749805e565ae6991b066 WHIRLPOOL cda564739e7f49621eb1fb26eecd1b2bc22df673206ffe1877b78eaf08b587fcab80976cfc1452349111d519cae1e46e07fc8f00578355f67741b0dec1c37a18
DIST go-sql-driver-mysql-1.2.tar.gz 45364 SHA256 3b59eeb0a61146877a0e48eb894d1bf3965b691ae7ee370a9ee84d24417c7dcb SHA512 3e85325a962e8567ad0340b8ac816927df8d794a1f4066599f094de8b362aba411f5f4a1bf406285757680631ee8ec000ffd392e8d5ebe85c82dd10611096df4 WHIRLPOOL 901075f39347928023a144af98b827d573eb9a241fd3f7d47fade4301e1b98cd4ab40355b039cd30c5ac79182f68bcea92b691fc7129d88ba375c9844ee51911
+DIST go-sys-0_pre20150729.tar.gz 529002 SHA256 9f9e4a2bca96d9f9708770607e21395c3f4f873f9b6266cae1ba1da526729528 SHA512 f80afa938977f3945ab3f08462eaf5d8db430013240a11b1f8a43911948fd2a8a390192ea9ebf79434b348b2ca520267a0441b922110e70603fff4849e57c487 WHIRLPOOL 0b269666650f285521c9fd3486959957ad9279544baac7ab5caa21158fb10ed4de2b2e7c080ffca9aa352c8e5685f2035612d40a04c8f6c5f7093daf1a020029
DIST go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz 4397 SHA256 378f5249729661db9d0c65030fbf636f6ec1d60ee926e67abf8c6dd7921d3907 SHA512 42257d0599936bb215f4a9f9189518418f02bc43e4d7417823ea460bfc45c6fd1f9b0bf5a35dd73881b57cd9e892c702b813a68fe6e417e82dd31c6635c1b24e WHIRLPOOL 26cf1464bf0899ae9bad0067481f57a121433c5fe7c93fef92523a157d7906b8c1c4216c2a4fe738222e4afaa85fc0a7b7b29149254125a3e8b2e7064add6cb1
DIST go-uuid-36289988d83ca270bc07c234c36f364b0dd9c9a7.tar.gz 6491 SHA256 3faf76788a69f6558882170746003bbd430ef617a0f433e93b6ab6d457ad4270 SHA512 f9d7807a27d17d4e7d0b53f43d7e3561492fb0669fd4f1e610f4e39309c8759e3e5d8e061feabae5c60e1a87f9ed989309bd9a796c5811012ee347631c3fbd73 WHIRLPOOL 2b18286b50186c10f2f7cf5ce53354878c6bb3ea77e0c91cde7fadba4df82bb90460847f82775a515ac9de6fb7819e758cbaeb3ada061f29710a17c3e596de98
DIST go-yaml-v2-f7716cbe52baa25d2e9b0d0da546fcf909fc16b4.tar.gz 63079 SHA256 d2044d0801b9f1da380f5a957404ca95454057a213c46182e2db08dc10cf287b SHA512 52129998e308c0a6033a0da6872759cf30cce3220af4ccd821fcb071f9165ee4f126f080726bbeac2bcacb20c2710dc66f936f8763c19ba5e182b8592700e6c0 WHIRLPOOL b34e0da03adaa61b37432300ec1d03953e220c4a3dd1d8af89ccccad752ba01286d71427e4354e6672d4ac5bde4cfab74e99de66414f02fe555f5c246decf244
diff --git a/app-admin/consul-template/consul-template-0.12.2.ebuild b/app-admin/consul-template/consul-template-0.12.2.ebuild
index 139f640da6ed..6e7190dce9b9 100644
--- a/app-admin/consul-template/consul-template-0.12.2.ebuild
+++ b/app-admin/consul-template/consul-template-0.12.2.ebuild
@@ -20,6 +20,8 @@ RDEPEND=""
SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://github.com/fatih/structs/archive/a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz -> structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz
https://github.com/go-yaml/yaml/archive/f7716cbe52baa25d2e9b0d0da546fcf909fc16b4.tar.gz -> go-yaml-v2-f7716cbe52baa25d2e9b0d0da546fcf909fc16b4.tar.gz
+ https://github.com/golang/sys/archive/58da1121af381632b48b2843aeb16299f2e1dc50.tar.gz -> go-sys-0_pre20150729.tar.gz
+ https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz
https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz
https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz
@@ -28,6 +30,7 @@ SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz
https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz
https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz
+ https://github.com/hashicorp/vault/archive/145041757cee09193b0d132b816f72bc1e846107.tar.gz -> vault-145041757cee09193b0d132b816f72bc1e846107.tar.gz
https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz
test? (
https://github.com/armon/go-metrics/archive/345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz -> go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz
@@ -36,13 +39,14 @@ SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://github.com/coreos/etcd/archive/5099bf6f7ab92181158cc2f0f0db1bb6056e9aeb.tar.gz -> etcd-5099bf6f7ab92181158cc2f0f0db1bb6056e9aeb.tar.gz
https://github.com/go-ini/ini/archive/v1.8.6.tar.gz -> go-ini-1.8.6.tar.gz
https://github.com/go-sql-driver/mysql/archive/v1.2.tar.gz -> go-sql-driver-mysql-1.2.tar.gz
+ https://github.com/golang/crypto/archive/83f1503f771a82af8a31f358eb825e9efb5dae6c.tar.gz -> go-crypto-0_pre20150808.tar.gz
+ https://github.com/golang/net/archive/1bc0720082d79ce7ffc6ef6e523d00d46b0dee45.tar.gz -> go-net-0_pre20150804.tar.gz
https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz
https://github.com/hashicorp/go-gatedio/archive/8b8de1022221dde1fb52fa25d0caab46e59c8c14.tar.gz -> go-gatedio-8b8de1022221dde1fb52fa25d0caab46e59c8c14.tar.gz
https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz
https://github.com/hashicorp/go-uuid/archive/36289988d83ca270bc07c234c36f364b0dd9c9a7.tar.gz -> go-uuid-36289988d83ca270bc07c234c36f364b0dd9c9a7.tar.gz
https://github.com/hashicorp/golang-lru/archive/5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz -> golang-lru-5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz
https://github.com/hashicorp/uuid/archive/2951e8b9707a040acdb49145ed9f36a088f3532e.tar.gz -> uuid-2951e8b9707a040acdb49145ed9f36a088f3532e.tar.gz
- https://github.com/hashicorp/vault/archive/145041757cee09193b0d132b816f72bc1e846107.tar.gz -> vault-145041757cee09193b0d132b816f72bc1e846107.tar.gz
https://github.com/jmespath/go-jmespath/archive/0.2.2.tar.gz -> go-jmespath-0.2.2.tar.gz
https://github.com/mitchellh/copystructure/archive/6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz -> copystructure-6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz
https://github.com/mitchellh/reflectwalk/archive/eecf4c70c626c7cfbb95c90195bc34d386c74ac6.tar.gz -> reflectwalk-eecf4c70c626c7cfbb95c90195bc34d386c74ac6.tar.gz
@@ -59,6 +63,12 @@ pkg_setup() {
get_archive_go_package() {
local archive=${1} uri x
+ case ${archive} in
+ go-crypto-*) echo "crypto-* golang.org/x/crypto"; return;;
+ go-net-*) echo "net-* golang.org/x/net"; return;;
+ go-sys-*) echo "sys-* golang.org/x/sys"; return;;
+ go-yaml-v2-*) echo "yaml-* gopkg.in/yaml.v2"; return;;
+ esac
for x in ${SRC_URI}; do
if [[ ${x} == http* ]]; then
uri=${x}
@@ -67,17 +77,20 @@ get_archive_go_package() {
fi
done
uri=${uri#https://}
- echo ${uri%/archive/*}
+ uri=${uri%/archive/*}
+ echo "${uri##*/}-* ${uri}"
}
unpack_go_packages() {
- local go_package x
+ local go_package pattern x
# Unpack packages to appropriate locations for GOPATH
for x in ${A}; do
unpack ${x}
go_package=$(get_archive_go_package ${x})
+ pattern=${go_package%% *}
+ go_package=${go_package##* }
mkdir -p src/${go_package%/*}
- mv ${go_package##*/}-* src/${go_package} || die
+ mv ${pattern} src/${go_package} || die
done
}
@@ -92,9 +105,6 @@ src_prepare() {
-e 's:-ldflags.*:\\:' \
-i scripts/build.sh || die
- sed -e 's:gopkg.in/yaml.v2:github.com/go-yaml/yaml:' \
- -i template_functions.go || die
-
# Create a writable GOROOT in order to avoid sandbox violations.
export GOROOT="${WORKDIR}/goroot"
cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
diff --git a/app-admin/emacs-updater/metadata.xml b/app-admin/emacs-updater/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-admin/emacs-updater/metadata.xml
+++ b/app-admin/emacs-updater/metadata.xml
@@ -1,5 +1,8 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
diff --git a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
index 6f833116f937..f06070f4beee 100644
--- a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
+++ b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
@@ -2,8 +2,8 @@ Fixes --as-needed support(bug #294834)
Verbose build
Fixes underlinking(bug #463684) - patch went upstream
---- src/Makefile.in.orig 2011-11-11 22:19:12.000000000 +0400
-+++ src/Makefile.in 2013-08-19 13:30:16.186082295 +0400
+--- fsvs-1.2.5/src/Makefile.in.orig 2011-11-11 22:19:12.000000000 +0400
++++ fsvs-1.2.5/src/Makefile.in 2013-08-19 13:30:16.186082295 +0400
@@ -18,7 +18,7 @@
CFLAGS := @CFLAGS@ @NEED_FNESTED_FUNCTIONS@
CFLAGS += -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"'
diff --git a/app-admin/fsvs/fsvs-1.2.5-r2.ebuild b/app-admin/fsvs/fsvs-1.2.5-r2.ebuild
new file mode 100644
index 000000000000..feef5d4335f2
--- /dev/null
+++ b/app-admin/fsvs/fsvs-1.2.5-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Backup/restore for subversion backends"
+HOMEPAGE="http://fsvs.tigris.org/"
+SRC_URI="http://download.fsvs-software.org/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-vcs/subversion
+ dev-libs/libpcre
+ sys-libs/gdbm
+ dev-libs/apr-util
+ dev-util/ctags"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-as-needed.patch"
+)
+
+src_prepare() {
+ # fix #570596 by restoring pre-GCC5 inline semantics
+ append-cflags -std=gnu89
+ default
+}
+
+src_compile() {
+ # respect compiler
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin src/fsvs
+ dodir /etc/fsvs
+ keepdir /var/spool/fsvs
+ doman doc/*5 doc/*1
+ dodoc doc/{FAQ,IGNORING,PERFORMANCE,USAGE}
+}
+
+pkg_postinst() {
+ elog "Remember, this system works best when you're connecting to a remote"
+ elog "svn server."
+ elog
+ elog "Go to the base path for versioning:"
+ elog " cd /"
+ elog "Tell fsvs which URL it should use:"
+ elog " fsvs url svn+ssh://username@machine/path/to/repos"
+ elog "Define ignore patterns - all virtual filesystems (/proc, /sys, etc.),"
+ elog "and (assuming that you're in / currently) the temporary files in /tmp:"
+ elog " fsvs ignore DEVICE:0 ./tmp/*"
+ elog "And you're ready to play!"
+ elog "Check your data in:"
+ elog " fsvs commit -m \"First import\""
+}
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index f6959dfff8e6..ef1d037bb500 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,2 +1 @@
-DIST glance-11.0.0.tar.gz 1565001 SHA256 35abd3af08b97a56556fdd1a68c61fcfa99ead6354f746f8f7cdc4517e90084e SHA512 33ceab2c7f52f5ce92b2bb33732697a85e4bdf552ca9d08bb7b21430ef942b545614de9b834bdd455b0544474217675731b77cded7218c56ef44274c29a97f47 WHIRLPOOL a256b0525f8a42e588a1d7cce4a6add919b9bd31752560dc7664814178fb4b3c952bfd7ec5d0d40932dc39c380c866561f9cb5ed1383482d4320f5417179c028
DIST glance-11.0.1.tar.gz 1571617 SHA256 357d8cc17b23aefce8c53c9230a26db504d8039baf7e07d8ab9448ce2ceaccf3 SHA512 d43e79700179bbef39d82f8baa378c377f391e7bbd9022ec9e399379fb026be36b06b7ad7b89e39cb0b2a876111b451ad1acf3ad27cead5b58ce02106867bfa6 WHIRLPOOL bbd70deae3ac5b3d549fcca20e666d1ee3f240d59556712783ff4bb8fe780c0c06ff1344476a7a036aa5e99afcdc3a369a7bf322227717f17c42cc02e5f3b477
diff --git a/app-admin/glance/glance-11.0.0.ebuild b/app-admin/glance/glance-11.0.0.ebuild
deleted file mode 100644
index b1cab1329a5b..000000000000
--- a/app-admin/glance/glance-11.0.0.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 user
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc mysql postgres +sqlite +swift test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- test? (
- ${RDEPEND}
- >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
- <=dev-python/Babel-2.0[${PYTHON_USEDEP}]
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- <=dev-python/coverage-4.0[${PYTHON_USEDEP}]
- ~dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
- >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
- <=dev-python/mox3-0.10.0[${PYTHON_USEDEP}]
- >=dev-python/mock-1.2[${PYTHON_USEDEP}]
- <=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
- =dev-python/requests-2.5.2[${PYTHON_USEDEP}]
- <=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
- >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
- <=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- <=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
- >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
- <=dev-python/testtools-1.8.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
- =dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
- <=dev-python/oslotest-1.11.0[${PYTHON_USEDEP}]
- >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
- <=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
- >=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
- <=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
- >=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
- <=dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
- <=dev-python/qpid-python-0.26[$(python_gen_usedep 'python2_7')]
- >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
- <=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}]
- )"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
- ${CDEPEND}
- sqlite? (
- >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
- =dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
- =dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
- =dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
- <=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
- >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
- !~dev-python/routes-2.0[${PYTHON_USEDEP}]
- !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
- <=dev-python/routes-2.2[${PYTHON_USEDEP}]
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
- <=dev-python/webob-1.4.1[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
- <=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
- >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
- <=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
- <=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
- >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
- <=dev-python/iso8601-0.1.10[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
- <=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
- <=dev-python/oslo-concurrency-2.6.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
- <=dev-python/oslo-context-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
- <=dev-python/oslo-service-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
- <=dev-python/oslo-utils-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
- <=dev-python/stevedore-1.8.0[${PYTHON_USEDEP}]
- >=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
- <=dev-python/futurist-0.5.0[${PYTHON_USEDEP}]
- >=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
- <=dev-python/taskflow-1.21.0[${PYTHON_USEDEP}]
- >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
- <=dev-python/keystonemiddleware-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/WSME-0.7[${PYTHON_USEDEP}]
- <=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
- <=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
- =dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
- <=dev-python/python-keystoneclient-1.7.2-r9999[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
- <=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
- ~dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
- <=dev-python/oslo-db-2.6.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
- <=dev-python/oslo-i18n-2.6.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
- <=dev-python/oslo-log-1.11.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
- <=dev-python/oslo-messaging-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
- <=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
- <=dev-python/oslo-policy-0.11.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
- <=dev-python/oslo-serialization-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
- !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
- <=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
- ~dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
- >=dev-python/glance_store-0.7.1[${PYTHON_USEDEP}]
- !~dev-python/glance_store-0.9.0[${PYTHON_USEDEP}]
- <=dev-python/glance_store-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
- <=dev-python/semantic_version-2.4.2[${PYTHON_USEDEP}]
- >=dev-python/castellan-0.2.0[${PYTHON_USEDEP}]
- <=dev-python/castellan-0.2.1[${PYTHON_USEDEP}]
- >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
- <=dev-python/cryptography-1.1-r9999[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-)
-
-pkg_setup() {
- enewgroup glance
- enewuser glance -1 -1 /var/lib/glance glance
-}
-
-python_prepare_all() {
- sed -i '/xattr/d' test-requirements.txt || die
- sed -i '/pysendfile/d' test-requirements.txt || die
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
- # https://bugs.launchpad.net/glance/+bug/1251105
- # https://bugs.launchpad.net/glance/+bug/1242501
- testr init
- testr run --parallel || die "failed testsuite under python2.7"
-}
-
-python_install() {
- distutils-r1_python_install
-
- for svc in api registry scrubber; do
- newinitd "${FILESDIR}/glance.initd" glance-${svc}
- done
-
- diropts -m 0750 -o glance -g glance
- dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
- keepdir /etc/glance
- keepdir /var/log/glance
- keepdir /var/lib/glance/images
- keepdir /var/lib/glance/scrubber
-
- insinto /etc/glance
- insopts -m 0640 -o glance -g glance
- doins etc/*.ini
- doins etc/*.conf
- doins etc/*.sample
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/app-admin/glance/glance-11.0.1.ebuild b/app-admin/glance/glance-11.0.1.ebuild
index c875e4f7db38..95dad05169b3 100644
--- a/app-admin/glance/glance-11.0.1.ebuild
+++ b/app-admin/glance/glance-11.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc mysql postgres +sqlite +swift test"
REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index bea749ee1b2b..648084c15dfa 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,4 +1,4 @@
DIST cdrtools-3.01a17.tar.bz2 2061522 SHA256 3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa SHA512 34a0579c536028b030cf828441ad55a705472646bc3a1ae962aad234fbe0b12c2bcb670511487c17086f5ba7643d1b8ae42a4a86bfe2940dc94f9744377daa8b WHIRLPOOL b718d559e0b36a576a42a38f84b3917891450d0bbab47b084eb1e906a396cf28ce47b79fd16565d4e0697311ee0c3d5abdd95b52ba2d7ae4e9f32d9b26bc26e1
DIST cdrtools-3.01a24.tar.bz2 2075400 SHA256 4d9907b84f5b65dc6ca278b6202b90b8eb68652b01aa4dda978ffede8bdd4a5b SHA512 19be30de77fca00bb06fa6325149421304c1d5ff7d40a9d842496058494fcf0e798678c661ff3ae9ebc9e4c5971917f7aabfd813a6d88ff863d7e2e5f1456766 WHIRLPOOL 4533288dffef2b702eeef2a44fd702aff3e66283d5d90c810eb177ee4f1f1aa7cfd75238bf1f2a406e9b8ccaa43c7a77fb401825f8ce806e73fdc80abcc0a45a
-DIST cdrtools-3.01a31.tar.bz2 2097584 SHA256 183b5c12777779e78d8b69461aae52401f863768e7e7391d60730006f8cadc5a SHA512 455d7f3e1f4bbe79bb53f2fba4a8d5d8737eef8ce477a447d8687282dd2404a93cab07da1141292f8c26dd70963a26901486448db3c6a70a89aad47908fdf81c WHIRLPOOL 7a70464254645a0ce9ffaafbdb14a6ebb53a638310748a22c4a20c904059c92df746997fbd9b07d9a16876917bfd3b8b318acc5cd5494eac5e6b5d0ef66215e9
DIST cdrtools-3.02a02.tar.bz2 2096499 SHA256 b5c33d6cfbe265806f24f365bdb885dfe35194ef716f4b6f809b4377ec159c05 SHA512 f61241006464b7055994ee040ec498e4cd47254501e55ea1e570a7ebc9db1422b46b47398373f7227904bcf6cc785fa1c8ae913cbb297cf839250ceccea18330 WHIRLPOOL 757c80f9b05697f0479edea61b74d2bc2c945f292fcef04ab3a41dda14d096881751d0e9b796b8ad73e227336a295c97182a91e37c48372718440509bbc2bfb7
+DIST cdrtools-3.02a05.tar.bz2 2115386 SHA256 4c79ae080c334854ee8ea04a2e36e15f15709d8c3da2df22e818ab91639b6bba SHA512 86dadff90da5a90340d6c0f06367d0285e180fddc98fd009b8d18b67c6d81895359ee9293c38036ccfbbf479e8ea73225da8149dffb4cddb919c85226a63ddea WHIRLPOOL c5b9b9e694b1e69d0bd172d6976ac7c55cf1864d7eb32f86d867d6f75cad5eb971efd11056274790551eb24fbb0d500edaf7dd1e50c90cf9534b441226360723
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild
index 8a54b5f1043b..17f064ca8bbf 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
index fa531ad3e816..1a2dcec4d88c 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha02.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha02.ebuild
index 4e86b4bb4d32..8dd03a2ec8ab 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha02.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha31.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha05.ebuild
similarity index 97%
rename from app-cdr/cdrtools/cdrtools-3.01_alpha31.ebuild
rename to app-cdr/cdrtools/cdrtools-3.02_alpha05.ebuild
index ddb0da5d7245..8dd03a2ec8ab 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha31.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -84,10 +84,6 @@ src_prepare() {
sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
rules.cnf || die "sed rules.cnf"
- # Add support for arm64
- ln -sf i586-linux-cc.rul aarch64-linux-cc.rul
- ln -sf i586-linux-gcc.rul aarch64-linux-gcc.rul
-
# Schily make setup.
cd "${S}"/DEFAULTS
local os=$(cdrtools_os)
diff --git a/app-doc/casting-spels-emacs/metadata.xml b/app-doc/casting-spels-emacs/metadata.xml
index b81c3b2a076a..39488bbc3dc0 100644
--- a/app-doc/casting-spels-emacs/metadata.xml
+++ b/app-doc/casting-spels-emacs/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
Ever wonder what makes Lisp so powerful? Now you can find out for yourself -
And you can do it right inside your GNU Emacs text editor! If you've spent
diff --git a/app-doc/elisp-manual/metadata.xml b/app-doc/elisp-manual/metadata.xml
index b47e13bb88ac..fe3660e451d1 100644
--- a/app-doc/elisp-manual/metadata.xml
+++ b/app-doc/elisp-manual/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
Most of the GNU Emacs text editor is written in the programming language
called Emacs Lisp. You can write new code in Emacs Lisp and install it as an
diff --git a/app-editors/e3/metadata.xml b/app-editors/e3/metadata.xml
index ddec4ff80d90..52ffbf8545d5 100644
--- a/app-editors/e3/metadata.xml
+++ b/app-editors/e3/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ emacs@gentoo.org
+ Gentoo Emacs project
+
e3 is a full-screen, user-friendly text editor with an interface similar to
that of either WordStar, Emacs, Pico, Nedit, or vi. It's heavily optimized
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index 88ecff51f01c..c5e623f1989b 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
GNU Emacs is an extensible, customizable text editor - and more. At its core
is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 88ecff51f01c..c5e623f1989b 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
GNU Emacs is an extensible, customizable text editor - and more. At its core
is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
diff --git a/app-editors/emact/metadata.xml b/app-editors/emact/metadata.xml
index f0b7b2b3c64c..1bb638a7aa07 100644
--- a/app-editors/emact/metadata.xml
+++ b/app-editors/emact/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ emacs@gentoo.org
+ Gentoo Emacs project
+
This product is an original development made to provide an emacs-like editor
on the PC for the purpose of writing Lisp code with the same features found
diff --git a/app-editors/ersatz-emacs/metadata.xml b/app-editors/ersatz-emacs/metadata.xml
index 21a5d93d303f..28debfc51377 100644
--- a/app-editors/ersatz-emacs/metadata.xml
+++ b/app-editors/ersatz-emacs/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ emacs@gentoo.org
+ Gentoo Emacs project
+
Ersatz Emacs is a very minimal imitation of the famous GNU Emacs editor.
Unlike most popular Emacs derivatives, Ersatz strives to use as little
diff --git a/app-editors/fe/metadata.xml b/app-editors/fe/metadata.xml
index f2371402a162..d9eb40b9481a 100644
--- a/app-editors/fe/metadata.xml
+++ b/app-editors/fe/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ emacs@gentoo.org
+ Gentoo Emacs project
+
Fe is a small and easy to use folding editor.
diff --git a/app-editors/jasspa-microemacs/metadata.xml b/app-editors/jasspa-microemacs/metadata.xml
index 4f5375ba4582..35a586253dba 100644
--- a/app-editors/jasspa-microemacs/metadata.xml
+++ b/app-editors/jasspa-microemacs/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ emacs@gentoo.org
+ Gentoo Emacs project
+
* An Emacs editor biased towards UNIX users, working across platforms by
providing a consistent interface under UNIX, Microsoft Windows '95/'98/NT
diff --git a/app-editors/jed/metadata.xml b/app-editors/jed/metadata.xml
index 36be58a2be04..47f4effcefc6 100644
--- a/app-editors/jed/metadata.xml
+++ b/app-editors/jed/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ emacs@gentoo.org
+ Gentoo Emacs project
+
Jed is a powerful editor, terminal and X11 interface. Color syntax
highlighting is one of its strong suits, along with emulation of GNU Emacs,
diff --git a/app-editors/jove/metadata.xml b/app-editors/jove/metadata.xml
index 5c7a37a88b60..2821cca37db3 100644
--- a/app-editors/jove/metadata.xml
+++ b/app-editors/jove/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ emacs@gentoo.org
+ Gentoo Emacs project
+
Jove is a compact, powerful, Emacs-style text-editor. It provides the common
emacs keyboard bindings, together with a reasonable assortment of the most
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 59d457bd8e9f..b7b8243b9364 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,3 +1,4 @@
DIST mg-20110905.tar.gz 138805 SHA256 1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229 SHA512 b490a5a3526d35839353e138f33ac924c5afbbf7e5c9faa20ceccb82e1dc1e6a3f0726b32bac7d43dcf8a410b1b8525067da5557cf669c52a9e32d1d2f45a8a4 WHIRLPOOL 64dd179462a8c9e53946c756a4975ffd2e5bf1758a300fa699032542a6e2470f9ed03f9fe1a88ac441cf17ac20c2575f9b6c5c1c396c5a7915564fbedfb1c854
DIST mg-20150323.tar.gz 142105 SHA256 d71b24d47d3e1426f162e446d92dfa457df96dd47c1289419cba9fd14c2c3afb SHA512 747a04c203509cdbe84d9cea6c5be93585cdd5cb855b556ea5dee273a2923a4a68bee3f952cf92d584fcdd682049cb4442c21888304ba036851127174457351f WHIRLPOOL bdba74b62034a6613434fc3efea7b56fa1599b6059ab97dbd760b013be7dc50ab13dfcee3f5fb1f41f4c26c3f0146583680134d3809ec7977a14a28cb345c6db
DIST mg-20160115.tar.gz 145374 SHA256 968c212d720b76d42cf1b42806ca3c7ca9f7b72b06f16171694a9fc50ef8db77 SHA512 afe75f7c453552dd6ce65772a82155e328f7a4557072b5a1d5dca031a3d4e1e524bfeac2fdc8c76de9cb337770a77f71f96cc762db29518408579fccb25e1d71 WHIRLPOOL a647e999ae6cffe53fb17d460398b2967968a6f2de62db503eeb79f449d720836c0efb997ac70033a9c0b0ca1fb74c3096d370b45dcca3a4c6bf5c587bb68016
+DIST mg-20160118.tar.gz 144823 SHA256 26450b2564bec0b0afc465fd24a1917dc31508c5500c3a36823b9c763a2b8636 SHA512 ed4805d27a7a16b931767ab3af084491d219b6262ce18b43af019eb6a4f07d28d203aeab02c1dab8326bfe464eee1d6009bbf82b30ebd38945c446e7bf766ce8 WHIRLPOOL 4abd59bbfe33e91a3e3ee0bb4763c77298994c6ce51f0338ef6c186ae675c3accfa72e0421b4dbd62fd150880b7bf0346710a4c0ce3cd54b55dc5a0b345cff66
diff --git a/app-editors/mg/metadata.xml b/app-editors/mg/metadata.xml
index 41e5f9b7b110..a86fa59f0b14 100644
--- a/app-editors/mg/metadata.xml
+++ b/app-editors/mg/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ emacs@gentoo.org
+ Gentoo Emacs project
+
mg is Micro GNU/emacs, this is a portable version of the mg maintained by
the OpenBSD team.
diff --git a/app-editors/mg/mg-20160118.ebuild b/app-editors/mg/mg-20160118.ebuild
new file mode 100644
index 000000000000..197182edb717
--- /dev/null
+++ b/app-editors/mg/mg-20160118.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
+HOMEPAGE="http://homepage.boetes.org/software/mg/"
+SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="livecd"
+
+RDEPEND="sys-libs/ncurses:0
+ !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ # remove OpenBSD specific easter egg
+ sed -i -e 's/theo\.o//' GNUmakefile || die
+ sed -i -e '/theo_init/d' main.c || die
+
+ # fix path to tutorial in man page
+ sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
+
+ eapply_user
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_install() {
+ dobin mg
+ doman mg.1
+ dodoc README tutorial
+ # don't compress the tutorial, otherwise mg cannot open it
+ docompress -x /usr/share/doc/${PF}/tutorial
+}
+
+pkg_postinst() {
+ if use livecd; then
+ [[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
+ fi
+}
diff --git a/app-editors/qemacs/metadata.xml b/app-editors/qemacs/metadata.xml
index c0162f066ce4..6ba8754897fe 100644
--- a/app-editors/qemacs/metadata.xml
+++ b/app-editors/qemacs/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ emacs@gentoo.org
+ Gentoo Emacs project
+
QEmacs (for Quick Emacs) is a very small but powerful text editor. It has
the following features:
diff --git a/app-editors/uemacs-pk/metadata.xml b/app-editors/uemacs-pk/metadata.xml
index 62e65fab2924..86800a9b5223 100644
--- a/app-editors/uemacs-pk/metadata.xml
+++ b/app-editors/uemacs-pk/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ emacs@gentoo.org
+ Gentoo Emacs project
+
WHAT IS uEmacs/PK?
diff --git a/app-editors/zile/metadata.xml b/app-editors/zile/metadata.xml
index 077afb685940..8a7000bae256 100644
--- a/app-editors/zile/metadata.xml
+++ b/app-editors/zile/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ emacs@gentoo.org
+ Gentoo Emacs project
+
Zile is a small, fast, and powerful Emacs clone. It is useful for small
footprint installations (e.g. on floppy disk), machines with little memory,
diff --git a/app-emacs/actionscript-mode/metadata.xml b/app-emacs/actionscript-mode/metadata.xml
index e6ac0b24adb7..2e0acac81fbd 100644
--- a/app-emacs/actionscript-mode/metadata.xml
+++ b/app-emacs/actionscript-mode/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
austinhaas/actionscript-mode
diff --git a/app-emacs/analog/metadata.xml b/app-emacs/analog/metadata.xml
index a055ee9b776d..7d01ef42903e 100644
--- a/app-emacs/analog/metadata.xml
+++ b/app-emacs/analog/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
Emacs mode to monitor lists of files or command output.
diff --git a/app-emacs/anything/metadata.xml b/app-emacs/anything/metadata.xml
index 1574e79ead43..5abd82fad5cb 100644
--- a/app-emacs/anything/metadata.xml
+++ b/app-emacs/anything/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
diff --git a/app-emacs/apache-mode/metadata.xml b/app-emacs/apache-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/apache-mode/metadata.xml
+++ b/app-emacs/apache-mode/metadata.xml
@@ -1,5 +1,8 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
diff --git a/app-emacs/apel/metadata.xml b/app-emacs/apel/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/apel/metadata.xml
+++ b/app-emacs/apel/metadata.xml
@@ -1,5 +1,8 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
diff --git a/app-emacs/auctex/metadata.xml b/app-emacs/auctex/metadata.xml
index f36206c93577..5376b5c38754 100644
--- a/app-emacs/auctex/metadata.xml
+++ b/app-emacs/auctex/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
tex
AUCTeX is an extensible package for writing and formatting TeX files
diff --git a/app-emacs/auto-complete/metadata.xml b/app-emacs/auto-complete/metadata.xml
index 8ad6abfbb6ee..46c40b7e8661 100644
--- a/app-emacs/auto-complete/metadata.xml
+++ b/app-emacs/auto-complete/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
m2ym/auto-complete
diff --git a/app-emacs/autoconf-mode/metadata.xml b/app-emacs/autoconf-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/autoconf-mode/metadata.xml
+++ b/app-emacs/autoconf-mode/metadata.xml
@@ -1,5 +1,8 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
diff --git a/app-emacs/bbdb/metadata.xml b/app-emacs/bbdb/metadata.xml
index a71dd9eb2fad..551404c7fd2d 100644
--- a/app-emacs/bbdb/metadata.xml
+++ b/app-emacs/bbdb/metadata.xml
@@ -1,17 +1,20 @@
-
+
- emacs
-
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
The Insidious Big Brother Database (BBDB) is a contact management utility
for use with GNU Emacs and XEmacs. It can hook into Emacs-based mail- and
news-readers and automatically collect information on messages therein.
-
-
-
- bbdb
-
+
+
+
+ bbdb
+
diff --git a/app-emacs/binclock/metadata.xml b/app-emacs/binclock/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/binclock/metadata.xml
+++ b/app-emacs/binclock/metadata.xml
@@ -1,5 +1,8 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
diff --git a/app-emacs/bison-mode/metadata.xml b/app-emacs/bison-mode/metadata.xml
index 485301c7a4ab..56ca2ca54395 100644
--- a/app-emacs/bison-mode/metadata.xml
+++ b/app-emacs/bison-mode/metadata.xml
@@ -1,11 +1,14 @@
-emacs
nicolasbock@gentoo.org
Nicolas Bock
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
Wilfred/bison-mode
diff --git a/app-emacs/blogmax/metadata.xml b/app-emacs/blogmax/metadata.xml
index 152470076db1..9cc274f6b23a 100644
--- a/app-emacs/blogmax/metadata.xml
+++ b/app-emacs/blogmax/metadata.xml
@@ -1,8 +1,11 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
-BlogMax is an Emacs package that aids in the creation of a weblog.
+ BlogMax is an Emacs package that aids in the creation of a weblog.
diff --git a/app-emacs/bm/metadata.xml b/app-emacs/bm/metadata.xml
index 0587eac4d913..6a0b3ee13e4f 100644
--- a/app-emacs/bm/metadata.xml
+++ b/app-emacs/bm/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
This package provides visible, buffer local, bookmarks and the ability to
jump forward and backward to the next bookmark.
diff --git a/app-emacs/bongo/metadata.xml b/app-emacs/bongo/metadata.xml
index a65893303f93..d4c63ed45218 100644
--- a/app-emacs/bongo/metadata.xml
+++ b/app-emacs/bongo/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
Bongo is a buffer-oriented media player for Emacs, contemporary with and
comparable to app-emacs/emms.
diff --git a/app-emacs/boxquote/metadata.xml b/app-emacs/boxquote/metadata.xml
index b71e9e1351cd..e4b5613ae141 100644
--- a/app-emacs/boxquote/metadata.xml
+++ b/app-emacs/boxquote/metadata.xml
@@ -1,7 +1,10 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
Boxquote provides a set of functions for using a text quoting style that
partially boxes in the left hand side of an area of text, such a marking
diff --git a/app-emacs/browse-kill-ring/metadata.xml b/app-emacs/browse-kill-ring/metadata.xml
index 883209f9d133..f4e37eb671bd 100644
--- a/app-emacs/browse-kill-ring/metadata.xml
+++ b/app-emacs/browse-kill-ring/metadata.xml
@@ -1,8 +1,11 @@
-emacs
-
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
Are you tired of using the endless keystrokes of 'C-y M-y M-y M-y ...' to
get at that bit of text you killed thirty-seven kills ago? Ever wish you
could just look through everything you've killed recently to find out if you
diff --git a/app-emacs/bubblet/metadata.xml b/app-emacs/bubblet/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/bubblet/metadata.xml
+++ b/app-emacs/bubblet/metadata.xml
@@ -1,5 +1,8 @@
-emacs
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
diff --git a/app-emacs/calfw/metadata.xml b/app-emacs/calfw/metadata.xml
index bd25ab175ab2..3a7d30c6a667 100644
--- a/app-emacs/calfw/metadata.xml
+++ b/app-emacs/calfw/metadata.xml
@@ -1,10 +1,13 @@
-emacs
naota@gentoo.org
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+