gentoo resync : 15.12.2019

12 files changed, 52 insertions, 206 deletions

diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 323e26a76b5b..6c0cb476dd76 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,9 +1,8 @@
 AUX 18.2.1-wx3.0.patch 3849 BLAKE2B 02912cf61094d8217eab7181a4cc35aead224df7872c412db0b40b072778cfb900bf18219baf52e29f609b72305d3a11ea1079b2e873cf56a0a3bd42e3303d2f SHA512 33d8b67542266ae224ffb2bc86fbf36fff6737252810cfb445662ecc418fb30b0b00cbddd2f706ca836f1a8809c505e61edfe221d29dbe91c78c371bff6cec15
 AUX 50erlang-gentoo.el 134 BLAKE2B df2da5c0c4be3e6855b51b820e3304f5c212a92d13ec48aa5d73ea3a0e801a8dddd371fd8894d49aa9d5573def56b3a864e463734d72fcf5356d39753dbda1ba SHA512 7a862e0ef1e96e88a484e80aeb92eb4465c7e8661efb0291c28abc13225eb3aa69442fe29417f5ad0d264e54399d645d9cd4713bc9869b48e87a91e50b9b2473
-AUX epmd.confd 91 BLAKE2B 37d036d9ab96deaf9d309656120a247fab8bbe731b97d24a1de445828c72d9a4c4113f92fbfe588252183c5d7c08eabe8b341cfdde6b326ebf790ce45f794708 SHA512 5af63c87fd86d88da2695d3e29c184fe4e979e78122701a77b3e5b659ce9cb41c0c90ac9efdf201b78b12af9be8fbbe874fdf12c952d2714f32c4dd93be58eb1
 AUX epmd.confd-r1 83 BLAKE2B 0056643f0530bf648b5db96c348d26d7b89a0bbe3fce451d8cdb463d4b5d6022f16f6bbc58fc7a86805184fb87f3a5e378a317b29260df11859477d12a98874b SHA512 c3fd3eba8ec4fc81bdb9bc959003008387ba1a8414d91459049263126ae4f4ec7b5ce8f18f5d64516aaefe71c5011aa7a3bbc27a1d02798890de1a40d092a724
+AUX epmd.confd-r2 60 BLAKE2B 6d4c0ecc74218941281dd7235b34ef2fcca32fc26f3f282551a6d551153b53f77f42b5139dfbee2b02a966cdea03fa350270e6897a57405ca2ac256d1b7eae50 SHA512 e594ccdfef8473f9fccbdee6fe084c43a4fadd5ac47ffb98aaa223902e74290e749f28b88952aa83eb207de1393d44184f81244c233b7d6afde04fc8615dfd91
 AUX epmd.init 534 BLAKE2B 34230f6c6edaed48123369df02f5fb71deb90491ebbb6d17984220dfd4615e029fa14aeb15c01ced15f98ec42aee256896a9b9680a4cce5d93e815c2a674efc3 SHA512 d11ef840a0edddd111da6a3c378756663f7337cb79713c475ccfec7e8a828fb4ef9f19f85d836ed0761cd9341d1242d687cf38ed5bbe267b4db5618c03ae6141
-AUX epmd.init-r1 457 BLAKE2B 1aa451203bf629a1d4f752ab87a91c0a27ade1a74f8edbd69b9dfe7d667bf68e4d41fc369f4aa1b67e7773ee96882cc0c95721a53b43122abf25b69600009527 SHA512 e0e507feae94bd3b6897c46c67c5a74a28771c3c9c367662d297faef52a1336c202c532a0c04f84464bd1829076bd8272244cd018e0badaa4f81872de00d89d7
 AUX epmd.init-r2 388 BLAKE2B cf8f1b3bfaf5c0bb1a7acebf41e1c1138b880e91a5c732cf3f8ddcaea469f0bcb32c9b3bb1fc5c923a3d7d1f77ca419ae3b4c25223d6da9499c627d2cd20b545 SHA512 110dc6575eaecf88164283042210a8580642fa5c9f49a3529bb0d5cda683f9ae024f1c7da791c0d7bfa8aabc3baf29bb821b5640804b313bb6ffee41401a8eb2
 AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab557e3f71cab48baf59b5a9533a4dccb2cb61a4434e3a51d44eae06010718dbf9a732d605c40f73 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28
 AUX epmd.service-r1 159 BLAKE2B ec50e4bfd89dc2d35fc2e549c695f9aae163d3df4d3c7a0d3f85f0f747c13a8aed9c8e9e57f3898ab31aec6795d7cd0565a7c563dc77f3f6154e53be88ec326d SHA512 4b99b2092fe447fa01e3badfce261bca6400ebda70f890efbacc40570019adfe9fc349a6d024955e2f1909c9068f37415b64d0a104399f2696eff6ccf6ad06ab
@@ -12,25 +11,22 @@ AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f
 AUX erlang-add-epmd-pid-file-creation-for-openrc.patch 2359 BLAKE2B 54a3148144bcbb9a4dd68e89fd609a09a9e9a0a9c7a71a4e9eaafc12632e23da44411d72c1590e482fda73d5464b1071386aa564b8d9a73b032b62c474d20570 SHA512 301aed1980a8638a8cd069ecb6e968e5c15d3e82b38580861a0ed6a2fc7a9505d99525a53a6ac19c2d9b786703aac6bf51751275a6a7fafd8f530c07ea0c7e8c
 AUX erlang-custom-autoconf.patch 398 BLAKE2B c99d3bc311bbca379786b9e4d29ee4983354a069508328c95e99a62bdfb8d15dbf372124acdf66c603f64acd9cabeb146e5bd5ec1e1ffd09af125fc4a076abdc SHA512 b82e09d0cd686c07b9d370e397edda10bd96435e70f4a0995ec06638e237e3b8fd0e1195ecc036b51367ffa36a0b4db5a2b1fe5d389a0b97e19d32aec51755d9
 DIST erlang-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c573966e7565d98aa6ba986ce42eb955a46130b9f33dbb415f48de5c179b308a8b06b345a844afcb2700f7e3f257f27e SHA512 dc11aace126aad5411b0d583579fe95a7263be328612fdc9f9c02d917aef7ea7a128b1e54ddcf7a52232980d2c81fc8e90ae5a8806ee5ae6ea97f00a9cf3faab
-DIST erlang-22.0.2.tar.gz 54805264 BLAKE2B d30fd8a7a4ada892f4b8e14c82ab7e20f77caa78573774d0b591a1abcc26c63ae5e0a65ae5c30f0f5cc8a6e4c5e13d167929eb049cbb172fcf2899d61f5ec8dc SHA512 6dbc3705a8b9ba5c8b6694e256c226c882521d87c3af4deb9212c33fff83b510191ea547888d15ced17dd66857fb1d7ba72d9fbd54a5c63091aa86680b960436
-DIST erlang-22.0.7.tar.gz 54814307 BLAKE2B 0f44c225bd4d762a529b5c154a086636a3677d0ff44df619ce4cc17eb168b5fdc0d33e1a82c85e9f3daafa1313fede22d702021323252380c76dacde91a3f204 SHA512 cf84cc20b97ed46f9ab3c7f1d77bcf6254ac3ebbb5c1e4e5202f4d5ba3d9c3bf5542567b047edaa68c204bc67ca667b1d96eb8153ac660e628c78fe271b6a8d9
 DIST erlang-22.1.1.tar.gz 54951145 BLAKE2B 917813f750eacd3dc7da25f1fa9e1f9c55e6cf1b88ba4e5576caae8554bbac667c87830935c7ddd58723f61e54f3c99ae4ef08660344035dea460e92a40832cc SHA512 ee1a3bb355ffd083c3355caf60189799d322cff2a01314ba5df141ccdc4de45dbfe3967e661e3dfbcf14fc04dc1f855d7a3660f9b2daa2451a83422eda7cba39
-DIST erlang-22.1.3.tar.gz 54957002 BLAKE2B 4ae843b871dec2c365b55380484fd434eac7d97189b94568985154fb524bb99bf4240925b64cccb7ac7dfc9168e731a29db69d90278162f7dda51077ee6441fc SHA512 72e71d7a78a4881d85ebb13a4443385efbf0233f5221c6322a0a28be363f511037aa657ae021f642eafb3983192d3a23c4bf8b6bc3545aa1cc2b27285e9974c7
 DIST erlang-22.1.4.tar.gz 54957524 BLAKE2B 8960dd63eb7ae18544d8b6809760543b276ec230d5a9051d1888269770f6c44b379b6ba85ce9106f7d37b76c41b7683a545ba80569e33195e3e9211f6ced4ee3 SHA512 271a188d46a79cd1c43c3b8059b77c0802af624ff88c6916e0b84994040750d9792f0416937ed98e874256562f27d858916239d79f93b545c98b9703e5018f7b
-DIST erlang-22.1.6.tar.gz 54961413 BLAKE2B e1881d35bd54cf0c0ade6a1cff1d78d29f0e1540f02c6ca26e97fbc09bd2c72ccd7ab3147193dcffad6e4944c96c2b0caaf22cce5cc6c7e6ee561063c043f70d SHA512 9a64036faa9e380d4ceaff5eef287839784840fc7923b14bf58ac53302aabc9407b195b19460c780cd9b6f75abeaa2245759f85bb1f16a6e977fa6f95d9081ee
 DIST erlang-22.1.7.tar.gz 54969082 BLAKE2B 4168b93e146de3dd22ec0d6088d2a2b62dc1a3d96d3c2859f65ef721a32f24ef74fb6baf3467da7b2c5b13a3b8d62602d3e94ddd359f091f548f958d9b8a77ea SHA512 72660ea481ac647a091b713a4a9240d1d008336152a41fd5f9f191c6050d42a67ddc0ff8bc51addc2e1d6f9a244516883df5025f005ae575fa101d941ac0bd05
+DIST erlang-22.1.8.tar.gz 54967877 BLAKE2B cb022e3c5f577605872e7689639fced6c1f6cb7600314f5939107605f0767ca080c65c2f9e0695a04bf53a9e0727553d854a9df57f09ce5f4a958ebd035756e7 SHA512 4260fab3f6cd9338ca167371cd982bcf9557729e93d58c3911e485529ed8ee97089e1de3466745d21206c94276f9865ac4fddcb2803afe915494b43feda46dda
+DIST erlang-22.2.tar.gz 55736930 BLAKE2B bcd67ea4ef5c358d4f0bcbec977e2c60a3b0f1ccccb2d38c35ba1908ed9d96727c83ab6cb6dc69ce90ffc6772e34de68014cc66ec8c3bfcda852844a4f6b1548 SHA512 a192da8ee02588c44e5c04bf2933c95672f596ca10f485c2c41d0c97563c90b5ea24fa02da61e007595f25a80557e6513372db3059bb7e394647a4c11f4cd41e
 DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f
-DIST erlang_doc_html_22.0.tar.gz 33737075 BLAKE2B f49aba36e9b84e5bc4422052e33aab5cb407dfcf2086ddb8a2370003dc63842acc79a67d9d453ee9e59d7b69416b23527e2d9f564b2d8a58d4c46bc3a93881c4 SHA512 89229a97fb5c78246ce9fa6a2d23446c6c3c2de15617911739e133b7e58714a91b1360af64bf61659d96808a816d84e4c410f8c8efe1e544930f88d73242b6e7
 DIST erlang_doc_html_22.1.tar.gz 33824830 BLAKE2B 2d50802fff81eba8bcf5f630da49d68d7cb2098175012e12f13941e69949a109c9f601c3cfaa2700b669415cd0c6c15961d8e4dd94b9b228cee17b661fe5400a SHA512 cc24927a4ff98b04d8f93fbc46bb36ffb34570521e4f31154b778dc17cf1cff60869239c26c327d7a9360c06528f9b380a302b39fa47285e50dfd4656b508202
+DIST erlang_doc_html_22.2.tar.gz 33943680 BLAKE2B 4a0df88fe99c882272b07b928541f4d1be5b3b0faceb6463a02f627df1a3b8571c26bfb28967c5824879db987d0afa6a11e9487c3ef7d67a9c8206f4987a3608 SHA512 6d57422839d9270129c7eec440c3670c7f075b2b1ccc4ed4c7c08e79104cc4eff1bf788add14be170c94e5d0faad5d153d107844c5a373b5e01c7d03fc6646a8
 DIST erlang_doc_man_21.1.tar.gz 1317726 BLAKE2B 5e5c2b77a41da6ab9ae1264ba5824a9f3bda6d3b7a824b372e01356888db437ed9e45bf987d678aca3fd8d0f0e6dce25080c7a2aaa4e061936f1e6ac4717e843 SHA512 94c6191ba9f42bffeb398e865026fbc79f3b233389c7d471f0c680799aa3669e97ab5305cd53f26d6525aed33d738ebfc4eb79a8f1a0b29dc4b79a2a37a29a4f
-DIST erlang_doc_man_22.0.tar.gz 1347830 BLAKE2B 52fd7adf46c9727dba70edc73150b2c7e9b96728ccb0af6d717ab9881bcb38fd98cd1d9d8ff9b28688889cf162230dc0f054377446a21d9114ad70e706aef863 SHA512 f980439d21aea6e1487afbd2e22a1a909cee40bd2464569219159bd38048d7d8d7adc9c5c639c04d5fe3160d090b51f2fd33b3ef479969731ce1861338278e41
 DIST erlang_doc_man_22.1.tar.gz 1355169 BLAKE2B eca02e36709587d59099dd87263b3ffcea55002cbcbf0a9980fface3cc30cb4ce0210fbdf80c8957da7a09a3b866ca81be22fd577f7f948562ef4e4ca516cbf5 SHA512 4f590f82293c97529c827c042bce673e6777c577e52e0e1876a8d6c1a0dc774c09637e85e3562f9a8af44372219d57174c002cc12a9646ae015c7bb1da34c750
-EBUILD erlang-21.1.1.ebuild 4412 BLAKE2B 32415a56c156eb60cefe2576d02c8ad0d4d1b32ba20319a5d23c497b632e5d7a075294268a14ddea608822a943b84347d21e4c55d558b028983bf95c10bd7dcc SHA512 775f3e3b6351050d0eb8793137645a1b8a881860306e0fcedb8ba8ba97013d5de404d6577c8c22c612898be040691b5633a67ebf861d983378b4c4f03db6c9b6
-EBUILD erlang-22.0.2-r2.ebuild 4123 BLAKE2B 0bd2f89a8aa30590aa3e64c152a430aff47179804b0c5cf08f3c1f2fc6483a235011b24d4ee633af8f47129da4fb9d59a695209547e47f8a0faf197886459ba9 SHA512 7df9f4c238b3b2d6d179ddd0664a137d275821e8667440fa8f7ac353db27d67f9ed344d4543bc7ee9a25ebadb95fa19060e8599c924dcddeb2c763b4c24af02b
-EBUILD erlang-22.0.7.ebuild 4147 BLAKE2B dc1de55fe1f971c1fe3dd7db1741fc2fbbce88a265b4cb09aed9becf5677bd93e1dc29823c3324ecb957bff8ded8d792fe642c36bff4f0feb917c81bd64800a4 SHA512 02f19b9f460b7d42f5fb6f212f09084841e5d2c1903c7292ea6245800f827457e2902ac9f98731fbe3572785b944619fe466244c1e877c9c962ac4e7a6d99d11
-EBUILD erlang-22.1.1.ebuild 4127 BLAKE2B 76e072e160a76b8c107ef3f8283e6a4cf08e455fdbd3a59dbf1e846672c2eb105127eb7157e236155225d89f4ededaab061bb4227e94522860993abcf631aeda SHA512 70ac4e790eda73536bb32820637f84dff09d515ecf0f8b4129e2840567ec5811f37ae5cfb8ea950730a6f357c2aa0fce3fd0dc5f0e9e620db8e9ffdd616c3878
-EBUILD erlang-22.1.3.ebuild 4132 BLAKE2B e20375dc0709dd5779a04badba42bef6924d936e65fa2231c99a3997acc1e16b7cba74f9c7576661797993f54482b19137349091d3995da2f646417889ee5e61 SHA512 cd4725b221de87250aa92efb412a267038ab505c4baa524dd366e42bc18beb6a13c3217c8e0a8a3234c5d7551991fbe82fcf28995bb47e28e187062af0c1b43a
-EBUILD erlang-22.1.4.ebuild 4132 BLAKE2B e20375dc0709dd5779a04badba42bef6924d936e65fa2231c99a3997acc1e16b7cba74f9c7576661797993f54482b19137349091d3995da2f646417889ee5e61 SHA512 cd4725b221de87250aa92efb412a267038ab505c4baa524dd366e42bc18beb6a13c3217c8e0a8a3234c5d7551991fbe82fcf28995bb47e28e187062af0c1b43a
-EBUILD erlang-22.1.6.ebuild 4132 BLAKE2B e20375dc0709dd5779a04badba42bef6924d936e65fa2231c99a3997acc1e16b7cba74f9c7576661797993f54482b19137349091d3995da2f646417889ee5e61 SHA512 cd4725b221de87250aa92efb412a267038ab505c4baa524dd366e42bc18beb6a13c3217c8e0a8a3234c5d7551991fbe82fcf28995bb47e28e187062af0c1b43a
-EBUILD erlang-22.1.7.ebuild 4132 BLAKE2B e20375dc0709dd5779a04badba42bef6924d936e65fa2231c99a3997acc1e16b7cba74f9c7576661797993f54482b19137349091d3995da2f646417889ee5e61 SHA512 cd4725b221de87250aa92efb412a267038ab505c4baa524dd366e42bc18beb6a13c3217c8e0a8a3234c5d7551991fbe82fcf28995bb47e28e187062af0c1b43a
+DIST erlang_doc_man_22.2.tar.gz 1359216 BLAKE2B 943d8ac1d0ceab41e252cab18248b74592d90305a39a41c21421efb1a0c031b5b2dd430274bb6f23a5334aba87df65975549c83778afa6334826552b1e42e8b0 SHA512 94cdceda3f8710bf44e78eef854e9399a802d82051a49544abd75d9367240b268c5e58b4d62170fa044d850fc04f998594cd1fc312bec867ac6395b292c94ad4
+EBUILD erlang-21.1.1.ebuild 4633 BLAKE2B dbfcd2e556fa00ff7c1c0b442b234465a9876e98769132081fdcd05f13960a4ea5cba2c68776fa435f09ef91533538808569a25046706178df0d7a3477341c56 SHA512 68789a64ab677d7215f7796d3d4a1c1dd7001101174fc948c2c596fff01dbf3d3233407c88c21f19991c2390d51f8388da9fb3abccebec2697c6677c63adc7fb
+EBUILD erlang-22.1.1.ebuild 4348 BLAKE2B 5dc3c69cec88ba337f41e7b3ee8cff509069f7eb5ed63876121585b7acf94dc37ff59ae5f0ada079d3233eca2f44d6c1c50b01a35a79bded7490ac60eaa582d5 SHA512 0883d5b255b900b793ddbb75e232b5fe78a5395735d06d373bdc79eeac74bb541d71f09d0dd8b52efa48f7ccb3a5804b7fe2c623988effbddc8bc6901f7c17fe
+EBUILD erlang-22.1.4.ebuild 4348 BLAKE2B 5dc3c69cec88ba337f41e7b3ee8cff509069f7eb5ed63876121585b7acf94dc37ff59ae5f0ada079d3233eca2f44d6c1c50b01a35a79bded7490ac60eaa582d5 SHA512 0883d5b255b900b793ddbb75e232b5fe78a5395735d06d373bdc79eeac74bb541d71f09d0dd8b52efa48f7ccb3a5804b7fe2c623988effbddc8bc6901f7c17fe
+EBUILD erlang-22.1.7.ebuild 4353 BLAKE2B 8b85b20bae49936fce217a2417672545eb2fb8b3c7b536511d66c51ab13e79e6cd409fc6c99dbedf5d307d3629f9f06ccf0ace5df33eec3fb8d535681c6db4a7 SHA512 340923ad048e0dea4851efd8951d0073bcb8973570d091324bb02b4b007b329a67e6242c9aad74023f920118dbcbc219395842a00e4fbd465ed7817d8f88b042
+EBUILD erlang-22.1.8-r1.ebuild 4353 BLAKE2B 3742467938825c56aa48ba67d754348214c668b609d3b20d6d195a4e9bee427d0259ead08152298ac6614a5045718ef91bd82b65ff5f662a597df108fd2de6db SHA512 b5cb897fd7916fcf509e14182e94d65b99fc92329d8ceaf855060373e1d9f6e6aa27f4c11a41eb65d59b2b555cb2c45a2f091344ba90af74459dc49437458108
+EBUILD erlang-22.1.8.ebuild 4353 BLAKE2B 8b85b20bae49936fce217a2417672545eb2fb8b3c7b536511d66c51ab13e79e6cd409fc6c99dbedf5d307d3629f9f06ccf0ace5df33eec3fb8d535681c6db4a7 SHA512 340923ad048e0dea4851efd8951d0073bcb8973570d091324bb02b4b007b329a67e6242c9aad74023f920118dbcbc219395842a00e4fbd465ed7817d8f88b042
+EBUILD erlang-22.2.ebuild 4353 BLAKE2B 3742467938825c56aa48ba67d754348214c668b609d3b20d6d195a4e9bee427d0259ead08152298ac6614a5045718ef91bd82b65ff5f662a597df108fd2de6db SHA512 b5cb897fd7916fcf509e14182e94d65b99fc92329d8ceaf855060373e1d9f6e6aa27f4c11a41eb65d59b2b555cb2c45a2f091344ba90af74459dc49437458108
 MISC metadata.xml 684 BLAKE2B fff20139a02c18f3bc978ed0b3920f32fc9b54ef58c809fe504284e74fdb490a6534d90d7835159a57065cd2a0404e1468c5c925ebdc65968c61ba09926f4dbf SHA512 0e85aeb8b4e13fcdd98bb2547bf448504d9cd86399d1afc580629c7f0364595b15f96a05a4727fd7ceee615111c2e533b126548389222945f6c61190d77b215c
diff --git a/dev-lang/erlang/erlang-21.1.1.ebuild b/dev-lang/erlang/erlang-21.1.1.ebuild
index d04a12e309c4..45a87c37a08e 100644
--- a/dev-lang/erlang/erlang-21.1.1.ebuild
+++ b/dev-lang/erlang/erlang-21.1.1.ebuild
@@ -18,7 +18,10 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets"
 
diff --git a/dev-lang/erlang/erlang-22.0.2-r2.ebuild b/dev-lang/erlang/erlang-22.0.2-r2.ebuild
deleted file mode 100644
index 2591c715e3f6..000000000000
--- a/dev-lang/erlang/erlang-22.0.2-r2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.8:* )
-	odbc? ( dev-db/unixODBC )
-	sctp? ( net-misc/lksctp-tools )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	systemd? ( sys-apps/systemd )
-	tk? ( dev-lang/tk:0 )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/18.2.1-wx3.0.patch"
-	"${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch"
-	"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
-	default
-
-	./otp_build autoconf
-}
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-
-	local myconf=(
-		--disable-builtin-zlib
-		$(use_enable hipe)
-		$(use_enable kpoll kernel-poll)
-		$(use_with java javac)
-		$(use_enable sctp)
-		$(use_with ssl ssl "${EPREFIX}"/usr)
-		$(use_enable ssl dynamic-ssl-lib)
-		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	local path="$1"
-	local var_name="$2"
-	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
-}
-
-src_install() {
-	local erl_libdir_rel="$(get_libdir)/erlang"
-	local erl_libdir="/usr/${erl_libdir_rel}"
-	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
-	local erl_erts_ver="$(extract_version erts VSN)"
-	local my_manpath="/usr/share/${PN}/man"
-
-	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
-	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
-		docompress -x /usr/share/doc/${PF}
-	else
-		local DOCS=("README.md")
-	fi
-
-	einstalldocs
-
-	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
-	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
-	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
-	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
-	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${erl_libdir}/Install" || die
-
-	insinto "${my_manpath}"
-	doins -r "${WORKDIR}"/man/*
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	newenvd - "90erlang" <<-_EOF_
-		MANPATH="${my_manpath}"
-	_EOF_
-
-	if use emacs ; then
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init-r1 epmd
-	newconfd "${FILESDIR}"/epmd.confd epmd
-	use systemd && systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-22.1.1.ebuild b/dev-lang/erlang/erlang-22.1.1.ebuild
index 26e520c173d5..8e47b9bf050d 100644
--- a/dev-lang/erlang/erlang-22.1.1.ebuild
+++ b/dev-lang/erlang/erlang-22.1.1.ebuild
@@ -18,7 +18,10 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 
diff --git a/dev-lang/erlang/erlang-22.1.4.ebuild b/dev-lang/erlang/erlang-22.1.4.ebuild
index edcb9b79b605..8e47b9bf050d 100644
--- a/dev-lang/erlang/erlang-22.1.4.ebuild
+++ b/dev-lang/erlang/erlang-22.1.4.ebuild
@@ -18,8 +18,11 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
 
 LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/erlang/erlang-22.1.7.ebuild b/dev-lang/erlang/erlang-22.1.7.ebuild
index edcb9b79b605..36b698f35975 100644
--- a/dev-lang/erlang/erlang-22.1.7.ebuild
+++ b/dev-lang/erlang/erlang-22.1.7.ebuild
@@ -18,7 +18,10 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 
diff --git a/dev-lang/erlang/erlang-22.1.6.ebuild b/dev-lang/erlang/erlang-22.1.8-r1.ebuild
index edcb9b79b605..9f0146d89695 100644
--- a/dev-lang/erlang/erlang-22.1.6.ebuild
+++ b/dev-lang/erlang/erlang-22.1.8-r1.ebuild
@@ -18,7 +18,10 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 
@@ -137,7 +140,7 @@ src_install() {
 	fi
 
 	newinitd "${FILESDIR}"/epmd.init-r2 epmd
-	newconfd "${FILESDIR}"/epmd.confd-r1 epmd
+	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
 	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
 }
 
diff --git a/dev-lang/erlang/erlang-22.1.3.ebuild b/dev-lang/erlang/erlang-22.1.8.ebuild
index edcb9b79b605..36b698f35975 100644
--- a/dev-lang/erlang/erlang-22.1.3.ebuild
+++ b/dev-lang/erlang/erlang-22.1.8.ebuild
@@ -18,7 +18,10 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 
diff --git a/dev-lang/erlang/erlang-22.0.7.ebuild b/dev-lang/erlang/erlang-22.2.ebuild
index cf826170c80e..9f0146d89695 100644
--- a/dev-lang/erlang/erlang-22.0.7.ebuild
+++ b/dev-lang/erlang/erlang-22.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 WX_GTK_VER="3.0"
 
-inherit eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets
+inherit elisp-common java-pkg-opt-2 systemd wxwidgets
 
 # NOTE: If you need symlinks for binaries please tell maintainers or
 # open up a bug to let it be created.
@@ -18,11 +18,16 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
+	acct-group/epmd
+	acct-user/epmd
 	sys-libs/ncurses:0
 	sys-libs/zlib
 	emacs? ( virtual/emacs )
@@ -46,7 +51,6 @@ S="${WORKDIR}/otp-OTP-${PV}"
 PATCHES=(
 	"${FILESDIR}/18.2.1-wx3.0.patch"
 	"${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch"
-	"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
 )
 
 SITEFILE=50"${PN}"-gentoo.el
@@ -54,7 +58,7 @@ SITEFILE=50"${PN}"-gentoo.el
 src_prepare() {
 	default
 
-	./otp_build autoconf
+	./otp_build autoconf || die
 }
 
 src_configure() {
@@ -135,9 +139,9 @@ src_install() {
 		elisp-site-file-install "${T}/${SITEFILE}"
 	fi
 
-	newinitd "${FILESDIR}"/epmd.init-r1 epmd
-	newconfd "${FILESDIR}"/epmd.confd epmd
-	use systemd && systemd_dounit "${FILESDIR}"/epmd.service
+	newinitd "${FILESDIR}"/epmd.init-r2 epmd
+	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
+	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
 }
 
 pkg_postinst() {
diff --git a/dev-lang/erlang/files/epmd.confd b/dev-lang/erlang/files/epmd.confd
deleted file mode 100644
index ea1deab6e273..000000000000
--- a/dev-lang/erlang/files/epmd.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-#arguments for run erlang
-command_args="-daemon -relaxed_command_check -address 127.0.0.1"
diff --git a/dev-lang/erlang/files/epmd.confd-r2 b/dev-lang/erlang/files/epmd.confd-r2
new file mode 100644
index 000000000000..69fcb0d2aa17
--- /dev/null
+++ b/dev-lang/erlang/files/epmd.confd-r2
@@ -0,0 +1,2 @@
+#arguments for run erlang
+command_args="-address 127.0.0.1"
diff --git a/dev-lang/erlang/files/epmd.init-r1 b/dev-lang/erlang/files/epmd.init-r1
deleted file mode 100644
index eb387a729580..000000000000
--- a/dev-lang/erlang/files/epmd.init-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the Erlang Public License 1.1
-
-pidfile="/var/run/epmd.pid"
-
-depend() {
-	need net.lo
-	before sshd
-}
-
-start() {
-	ebegin "Starting Erlang Port Mapper Daemon"
-	start-stop-daemon --start --quiet \
-		--pidfile "${pidfile}" \
-		--exec /usr/bin/epmd -- $command_args
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Erlang Port Mapper Daemon"
-	/usr/bin/epmd -kill >/dev/null
-	eend $?
-}