From 96b178ab65ddd8f564c673e372b9fd4e6a4b90cc Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sun, 19 Mar 2017 13:59:04 +0100 Subject: [PATCH 1/7] www-apps/gitlab-ce: Added ebuild for Gitlab CE 9.0.0 RC4 Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- www-apps/gitlab-ce/ChangeLog | 8 ++ www-apps/gitlab-ce/Manifest | 8 +- ...itlab-ce-9.0.0-fix-redis-config-path.patch | 12 +++ ...tlab-ce-9.0.0-replace-sys-filesystem.patch | 80 +++++++++++++++++++ ..._rc3.ebuild => gitlab-ce-9.0.0_rc4.ebuild} | 45 ++++++++--- 5 files changed, 139 insertions(+), 14 deletions(-) create mode 100644 www-apps/gitlab-ce/files/02-gitlab-ce-9.0.0-fix-redis-config-path.patch create mode 100644 www-apps/gitlab-ce/files/05-gitlab-ce-9.0.0-replace-sys-filesystem.patch rename www-apps/gitlab-ce/{gitlab-ce-8.17.0_rc3.ebuild => gitlab-ce-9.0.0_rc4.ebuild} (91%) diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog index fb527d7..a7794bb 100644 --- a/www-apps/gitlab-ce/ChangeLog +++ b/www-apps/gitlab-ce/ChangeLog @@ -1,3 +1,11 @@ +*gitlab-ce-9.0.0_rc4 (19 Mar 2017) + + 19 Mar 2017; Manuel Friedli + +files/02-gitlab-ce-9.0.0-fix-redis-config-path.patch, + +files/05-gitlab-ce-9.0.0-replace-sys-filesystem.patch, + +gitlab-ce-9.0.0_rc4.ebuild, -gitlab-ce-8.17.0_rc3.ebuild: + www-apps/gitlab-ce: Added ebuild for Gitlab CE 9.0.0 RC4 + *gitlab-ce-8.17.3 (13 Mar 2017) 13 Mar 2017; Manuel Friedli +gitlab-ce-8.17.3.ebuild, diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index d01f20b..2d677ad 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -1,10 +1,12 @@ AUX 01-gitlab-ce-8.7.5-fix-sendmail-config.patch 705 SHA256 cfc4ffd896e03cc763601aca5cdd5ac43f85152705cbf5a4e9144a6156d6f77e SHA512 a92659db8cab022185d87f321b037b1731612bf5f89b9df4552dd49b843bb49b6019f8ddda96a6fd6cb6544664a1c3d52ca5fee2c11be8b33698cc713219510f WHIRLPOOL 81a6504a8583bc46ea4005d9f8a2113802439161c40f11d3da46332b8980fc6b9520d81d9e32a6555bcdc893245448ba9151a271c511ae87f6468f588d4804b0 AUX 02-gitlab-ce-8.11.0-fix-redis-config-path.patch 423 SHA256 4878d37082c7e5c0aba239d4432ddec23c083230b816cf1ed6792bfd8f6c56fa SHA512 81a543af308bcd11a93a73368aedc89604078f60c0cacf4f614ff18dc5975b2c0d030ad6565fbb134188c8f6fceb74f2767f706d6f5701092252513f5e18de11 WHIRLPOOL 81f6258f03d234c6298b7bfe2982bdfd5f86dea3405ce03d4391b484a4802f7cbe33606ce4561ca67c16a5826dec131a185fa3189c2115b4a9ec8a3b87a2ee16 +AUX 02-gitlab-ce-9.0.0-fix-redis-config-path.patch 423 SHA256 9de3711c1f06a0561001166f2a44b4c1dc5fa3fa57a5230eb1dcc2b5d394449c SHA512 ae89fa3c6fde777e844e777862415450787ebf83653435cea329d66810c5805d2126d41cb1ce40b15c42371543bc182a59305b8b1b6a7433121340a625300370 WHIRLPOOL d97962907bb1fc610ebc52665a6ce51f40ee932e7ac715279f3c0554f2880a7b220ecbac2c4c97bd4d3dac22b9a025aa729805221ed5e6d15f04f6cd8e210d22 AUX 03-gitlab-ce-8.14.0-database.yml.patch 2172 SHA256 8435bf632aab03057342d5d6d75f016b006da00157c0cce2661416b752f8b75d SHA512 048aa5877ef30e702727b917cf7fb6bd534c497a7c24ab55640635598af293b0567bb9f356c4b91d55291341ced50847909f117f46d3fc9962c2f7a0f7b6bfb9 WHIRLPOOL 87b62f5e326211c2ff9001742a04b71bd94b21f4851778a513f7e1981da193dc16718559be42a0ba21aaa0c2f5b65a2571bc20174c063aa13e6436f0b422f057 AUX 03-gitlab-ce-8.17.0-database.yml.patch 2238 SHA256 c5ec9e8a11fb60a7749b9f8cf553949e78aacf9a8233b39c4986980851196c8e SHA512 1668e2c1d00ef485d2bc5af8d343c9be19f291a627d0041d42b268ec1ad8aedecba99336998e6b1b3ac2f4cd617556d17ab5f1f11f95d696205e3d10d6b74e1c WHIRLPOOL c91a6604f050113c9f584d7bf34ebe660263beb88879382873952d6b1b136ad5b576b813bf9f2f66ee49d6656fb1d24437dca395c2574bd7dab07cd1a3a36a99 AUX 04-gitlab-ce-8.12.7-fix-check-task.patch 917 SHA256 e1adffbd59a418d5e14cbd51ae14d5c1f0364af759c77b6cb485079e0233e90f SHA512 226c3892768dc526dbc9f109aaecdee1eb27c0acb5060ba6db8222410c500336ebcf7184437228480da04ce5de149a14bbb5c1471aed853a280d7f371f271d88 WHIRLPOOL 3ec22dc4d12b5025bddfccdea27a816aca1f818d5138b3dc9a6362e56ec4cd14e5c38c76b64b468f3797e0d2718d38aad4f910abf3f3328a7983832babb7f231 AUX 05-gitlab-ce-8.12.7-replace-sys-filesystem.patch 2387 SHA256 dd0e9987ed4bb3a9c73c6aee1d89434afc51ff663fef2ee4ac93adf1b73b944a SHA512 afa82fb8c8d57633c99373f31678760fa6ecca5e459a9059f5b460b458d1dbf3230108a6b4f394780c26a697881c9b2319f15804cb8d04ad3139127e7c0f4ff8 WHIRLPOOL 90ce708f8cde0a4bcaef9fc002ca00b97a1211559bcabf5481ec71c608bc5b772ecd518ff07a8d626a27e4b21c0f0f51fa37a65503e79664ececd78d5f19e87b AUX 05-gitlab-ce-8.16.0-replace-sys-filesystem.patch 2379 SHA256 cf5e0ea55c99996744422312a46914a8e54b6ab68ac5e67abda444e1170bcd4b SHA512 eb5ea3a9f040c3df64bd8ebb20ed873fb6af17322867c0f5714e3d9ad5ac26b79e9ffaaa4720617513123b651ceccedeb992b64c87b9b945338614c9eeec1468 WHIRLPOOL 2591c1d439447f3e08fe413ab8127b9945f8e4813480093af1da796675903bbb2b8a2205bd1480d383402ef861c348cfa0bd45305e7c1fa20458bfd6b6b327a5 +AUX 05-gitlab-ce-9.0.0-replace-sys-filesystem.patch 2436 SHA256 53fcd9fc123a0fcb671a8cbcb3b2dc61765e32be6836206ae0edea8cf0ae8203 SHA512 21636f298df7e762f59595f39fb50266f8737311f37aa2b9ba96bc29190b8a67eea01b09e3b589d0885da6b27beaa136fa66c7d98408a8e3ecb3ac6baf20d891 WHIRLPOOL e0c709dfc5f72e33207fd7d62a7db5a85c0ed4b6064d5d6a13bcce7d660d9ba144fe09d0985c16c313f06a4e02911729be132086735eac47ddff981874f31acc AUX 06-gitlab-ce-8.17.0-fix-webpack-config.patch 614 SHA256 0c1cdc25032322eff6c279435ba5f3fc349b30de0d55d86fad2616bd2bb7fef4 SHA512 f5ccb4d1849ab395ba4ec3c80735a1fedd9fa7f790c8b114d8dc8d1fc2c431d7b9e5645247485f0b8c1061a00ed61c21a5e50f49af0d76e232182c68868a163f WHIRLPOOL 6968ddefed74607c36cc66dc133dbf4942979d2ae867f819cf2e7e5c9701fe8dd86b266d923e6343971e6904f0ad1f35200971660df139edabcc9e0790fc107c AUX gitlab-8.13.0-sidekiq.service 990 SHA256 183ccbdb19a3dcc74cf1f1f865bf396466e06f7408ff7d3e92359b2a0e83f24c SHA512 c356baf65337739b08a0a4bfe24d3b68f557e9d6d95f479b39ec954ee6c2077e380f99d1e9e9390f5b038e093c0a46562f651512a6578dfa86977580159470a2 WHIRLPOOL 81d9ea9febf47d5fdb9c49a54bbc499bd796fc56bc1c16404fe4c74d00c4bb9fa9631e4cd4cf88d3c30a44c04b74b35a61cd4da9f2139a4abf61e758b4e5949a AUX gitlab-8.13.3-sidekiq.init 1459 SHA256 fdf808f9c0a92d7a77ae8be27c8fc11cec571ec6b5b94e31639028eec19546f1 SHA512 ec2130483b603f2be423c288fd0d55615c831ce995a8a5509f0240f149b3464d8f0a75cade1c736d085fb5f898d109368af62d8fdfb280aa00c4df8c06abb1e9 WHIRLPOOL d3493ac268257386e22c677337c8f9b1050212fce4aa855119b2ccd5f56850a5288d0cdd74e3c2f34552f59f9431c9ab5080e372766b88de003cad5dab015100 @@ -19,18 +21,18 @@ DIST gitlab-ce-8.16.4.tar.gz 20899790 SHA256 0ee69f010f2306a6b1d7fda377a07809515 DIST gitlab-ce-8.16.5.tar.gz 20900898 SHA256 74a73992d18d97b426ea36ca2c975f4d1d44d7e66602b2fa76a18b267e90bbe2 SHA512 cf77252542571104c74b9ad932812f9fc36dd31703ff653bf23933c7e2165cc9927482025d63ca1863af17634785c22be944a8ac17c27cc06924cf832ef0b591 WHIRLPOOL bb916c79a33158160754348ec8227c84303850a525781422a1fc718330cc34baad5efbb111165df0e0e14a6ee7f6c89c19c976708116b2fecb3e686f281330e9 DIST gitlab-ce-8.16.6.tar.gz 20901900 SHA256 5b88dd855afc44da2b8f059056321fc0dd4cb7c2a97811c6c3ec65c3b44e1d8d SHA512 b6fdf4e8df787ea5812c9c6baf29cf86fcc440be7f1c8fd31410ccc93459208999f25956d8561d3a789ff75c6e112e396db79cd0fa3d959dd8b1b382ccb5d7b4 WHIRLPOOL 17b2203a1d1b36f814df781aaee1faafcf336794fa7c1792868685cb6ab4e7e7eb1de916b34fb28ba72be38d760187de48b8ac2b36bf4b722bf799f60e6b1c96 DIST gitlab-ce-8.17.0.tar.gz 22991847 SHA256 3883c2e505e511f83072f950b9d211783148b97e29f34144e57c8b180d7f4518 SHA512 e0ee1b1ab21a6ad262cccbb2abf544ccb18dafcaf61e83aa02bac0182bdd35a47a725741382876f3bb79f6f42764c59b7a992c16a916a1673a716417b34d8a87 WHIRLPOOL fe3c36e41d0fe3c3420a3e52dc61fc30f424d2832cd82587a6e50b6c6450ee9e99bb2897f87cc949b4663055a35e159cf7b6f471b6aa9046c6bb8b1fae526ab7 -DIST gitlab-ce-8.17.0_rc3.tar.gz 23031572 SHA256 13ac75ce0737e9e9f46fea59828a0a71f3ad9fc4436859bc68938d4719190ba9 SHA512 c5998f7aeefd65ea46ee6357f15bc6e60253742f6007252bf9a1543f29f8973951f8d0f8d60dba87b08dbf5256427e9bf28198274a9dadb92b30b7f5adc76cd1 WHIRLPOOL 86380fedcacbd18f13b12f4792b506421726c4226512471eeeda8d085abc89e6b43f54b0301e0cbdb1f3afe6dade84452690576435220c0afc559bcd5f341df3 DIST gitlab-ce-8.17.2.tar.gz 22995277 SHA256 6819b8e289b7c23ee1880d935f443bb63896e45f62e2d203dfd87f9b8f90d3ae SHA512 b66b3ee0233641aee27d6cd1748069df8b7a705414f7e5b41875d861f425382f4a7f31639219660db1811fdd0e0655526f7760fb49b4847efb486b37ced11205 WHIRLPOOL ab8c986a08c5cf86b5d4a3a56059827b6c1e561c7c76e72ba3433c589bd3514177019db587eee68aadc1ac0ed8b748e813ccdc2fea3fae9b773979e7829562d0 DIST gitlab-ce-8.17.3.tar.gz 22821238 SHA256 85299a2e10e57ae988483d1a10503e17703d767f6b757f8b07093f0011c58fe5 SHA512 3d73d2b7d48237777871c0c062e8568e083389fae9ba75a0b648bb96ae638e6f4d1f9f0bddc6ab15c5ba21b5d92da792b0fdb83b94cb89b95824a0c937a32de8 WHIRLPOOL 8532172fd004d9b7831299ebcaa165eabbc732af21ace334f903a894ffd673b078be423f13de1734b1170f5e5c4b104847ae27a11d12802048dab1ba77b755b2 +DIST gitlab-ce-9.0.0_rc4.tar.gz 26270878 SHA256 f47ddcf6f4f0336228dd1ef03085c9ea6116157887e8216038d23b69cf7a4d89 SHA512 f4694ebf4ffe38e6c5495f3658eb8003d28b3ac5d67f4533ddc1932afca412a40ea786cd8d99e2891fdf9bacd7b198b29493b97d6d02455d4f4139d4e60a0d63 WHIRLPOOL 81f47820043445e9ff69ae0ad3bcd1e094ab1e3527eec279096ae16a767cec5451b2d94af4dd87cd2939eb2e64368a1a0e543ce40e0e9fd5a716eeef04741c54 EBUILD gitlab-ce-8.15.4.ebuild 11982 SHA256 db794f18bc0d023a8b6adf49b82c2e37fd38b7206b064a7700289c0cfa16961c SHA512 ca30780d28ffc0242ac5f6ccad178cc44464a81f2d44cb13e53ddf06700d0f39b9fee9b77e356735435079b34090049d50d9019af71e92d6d8faaf3767a39dc5 WHIRLPOOL 42ee8b8e5a2c6fba69ecdbf6e306a87f369fa193f721c73481edc744953bfd210cb4495bc603ba01566efb2b0869ec71284a1f1b1c34d1a124bd08546829ca37 EBUILD gitlab-ce-8.15.7.ebuild 11982 SHA256 fab225a8a8a9373898b5c604ce41ed65c4648c46131798315df833326b006fb7 SHA512 ea17dc9927336aed09ba21e0e1c9c4df2998f941a05ff30e9ef9951b5318bcdfb1d332fa8d285a27f26356a9fa9a5f72da45882ab8edbfa6046ec96764dae47f WHIRLPOOL d51629d3c67f8be2636a2e5cb4bb4d4a7b0402394f47aaa01fc182c29f1d3ee916a2d5bb8086bbe871f41294e348ec024d81a775ba9c30028d8b97d93d637620 EBUILD gitlab-ce-8.16.4.ebuild 11982 SHA256 91875777d0953bffddd31318d9c5d4666ba59bd3446804d063c1199c603bd5a6 SHA512 7112bf185f25d90a11ee2a6e9d197c1ce781b49c486cc1afaff002ad66dcec7c9b43c3b9b6c26c62d23bb7e8c0fdd4c527e53a99f9674bb4af1e404454960227 WHIRLPOOL 76bd66e8b7d4ff04f02354cb6cdf3fa0b92ccf2cdcad26cf117f12330b3f3588713fd0d0465da2515750348975eb81daa6e02f984025804b7db50da99f4e8e5e EBUILD gitlab-ce-8.16.5.ebuild 11982 SHA256 fd2648d0a2df06b5aa46435061f6d12b1d0d8b6958c2367b96c2f4a11dbf58f1 SHA512 de82deca3c9163959d6c4c2e41e57549506e49a6a1125d37fa7277e4ca00adb74a331dad4c103f8d1b2e80ebbe1511220c23aabc8889005dcc37684c5b3373c3 WHIRLPOOL 1f80a27148caf3b570df9b5c19849e453001ddc2fc78add1040c53cae249feafcb3a0343ad61d22135ba578f9d92137c048dad0f0744737ae326ac74bf08ce7d EBUILD gitlab-ce-8.16.6.ebuild 11982 SHA256 2cc7b8f06153f28ebcc34a5ff8e24be791689c41fc8a780149cdaeb61ffc70d3 SHA512 f9d43d16cac2edbcbc3d144133265b94bbb7dac8ed5266a7ba641cfa6f154eb62462ffff8a37b977559ca892eb20c968eb6f82c2aafbd20ce293f6a6bd7b7e29 WHIRLPOOL 5682849083932171dff509c2142e225992e2724b09987da47bab258fdf45eebaf615cb07739709da2c421eed6fc66f705d6ce35a8d956130598168908ee2f061 EBUILD gitlab-ce-8.17.0.ebuild 12831 SHA256 9556fe5712044ebe473b7ff8b847a4daa5ca1818a0ac714f22afc5725199da72 SHA512 4aaa00f4eac87a4bbe598cde792997e25b137eea9fdaf7e7c8394ec5e2abc54302ed5432efe1c7055dc195ca2599f9027463480c943f108bb399daa2eee833f5 WHIRLPOOL aec29db1dc7236f60d2723ec97444fa437a4f8b3092cbf53305f3cddbb6851a40b1a77a306daf4c9780ffe9a8eed760c580371bf95da66b18d884a32c3e48cd5 -EBUILD gitlab-ce-8.17.0_rc3.ebuild 12258 SHA256 179da162a7ff3ab1fc9f3173aff30c59a73005622ccb0fe8ada57f950c9d0dd7 SHA512 b5f244a7a7ac980b1e1c1595b88613cf6f3649591a9430dac0db3a174432648b05707b0e3e79450f5882fb7044aca6bb3778a19566ad6c83c5fd30ee8c09893e WHIRLPOOL 49cfbbfedfcafecfa8a775bf0e3a8a9daa2fcce3a819ce92ab07ccaaa4b3881221cce5ebf4ec9333b9ed7a884717d037336dc644d359137e06fe5df3f51e9aaa EBUILD gitlab-ce-8.17.2.ebuild 12831 SHA256 b57a4f683a5eafaa5d0149b0256833e329a757ad470e24bba163c57ba841eeeb SHA512 ed84da9ab62d0893b36a2ade744248b663634c5b05b8e8b608d064068c31a3d19a0e4917f932a0a2caee48a8f509359e50cc982c43bd5d1d958343ea5c5637d9 WHIRLPOOL dfb96d29b45adf5d03313fd9dd6cbc39c70a1736272867737f0bf8d429510add4e3fcd77b329690b9393cc506c9387f4342bed001c2bda50901ba9480fe241d5 EBUILD gitlab-ce-8.17.3.ebuild 12928 SHA256 8e79b5c6724ef50b00f1c6eb607af6c4dc44a8ea5a7b2735c016726247043c3e SHA512 7d32ef8db701c1d4570b4071a55e61611f3bbff3f308adee84594c43f4089befc1a8ade8d66f7f36a4f9f6fd0f1f3c8fe6172eda663a5e2bd277646d4e1fdfa7 WHIRLPOOL 36a8c32bddeb51e89da1e314375bec1765e238d4fc1f658a492601b2a46d838993dde921570956e6c43086d9d3e09727b83f99e99168cfe95ef2e4fba6b69e6b +EBUILD gitlab-ce-9.0.0_rc4.ebuild 12927 SHA256 c89be252161b337dd0a9bf41c07136e84884c6b6358324fc793bfe2888004588 SHA512 cb46b20245fb761a9a9a98f41a5a474a8e337e5bae60fb74cb3cf29a2a8fd9d99cc17d51d4c4d5179102d78648f176d41658192d216a54135d4f24bd1249086b WHIRLPOOL 927e830e387fdd20dbe8b72abec38be3fbfeef390e4324ad56f525c68f423668b18370547389e54aec8d3781e7b1fc45a2c9f7c387e3f44830413cd6460788f4 EBUILD gitlab-ce-9999.ebuild 12864 SHA256 ae1c00758e08c97414d3fea2ad636be6f01a6d61bac25dad441834316e48152e SHA512 7ee796c04f450733603569cbb7eb351ae145313dec19fbf333563eaad9721af4b03bedd5415471f40bcf42367cdc3eb0cfd6940da6e42284d6e7dae4baebb451 WHIRLPOOL fd1504cf829fdfefc341627f63d3c583304a0b9b7bcfa39b53452f02b13ce859ec3250f0d439711035ef46c7e8adf41c7414fa2a0bb5479fb71c17be8f1340eb -MISC ChangeLog 14662 SHA256 943f84ad5c20e417960eabc5d9ff3013d1e89f289afcfa7c81c12c979257946c SHA512 f3e60d56c5e0166e5ee2990313dc8541bd7570fbb332cfddfb588f24506f0360812e5e45eea820000438fdbaed027e07ca9dc5feb0438568a57c52ecd816e319 WHIRLPOOL 2096d793258acea414ed84f8d892d315f3fd7bf6f1fe6d25d7f75364ddffd964e8ff27bb6a8467051cac9d26ebee70162f3f043143317fd90e7d1fa63faa1fde +MISC ChangeLog 14987 SHA256 efc51b428142ae7f78a8a5050df9771fae9a4cf785268862ef7a7dbaa1e5dd89 SHA512 d9f1e845e5cc8b5909624934567636901f9acd194f7512c098abf8e858c630822f97989ef8c67d471b596307c4ff5a344f583c1cdc12fedfcb7ba301bf543f8d WHIRLPOOL 05979465333e6102b346e7141fbfdb55ed4a9713de2feb03e9b8e1bdfb4c01276bad2178f75888976dd571a900548954143cc55dc1576fb69b62468f4835157f MISC metadata.xml 665 SHA256 2a0cd67ad42f0cc6d8b88391cf6e3153a9883dab31aae8227c57c95f3f68890d SHA512 64b8fbae373d0a057f705f64c1d097dbfab893bd585e1db65ccdb06cda9569211c9b63fa168ac8de9f6d512a17759ecd20b54d818d2790a6f4c99d0ca73fddc3 WHIRLPOOL a81b21bb46aad9757a502628033eba546c686b83bbf1d651ecabba273c454cfb64574affc180db8358ced87eb638e8ad13d7c79c4cfb9a31e72c577d21ab433e diff --git a/www-apps/gitlab-ce/files/02-gitlab-ce-9.0.0-fix-redis-config-path.patch b/www-apps/gitlab-ce/files/02-gitlab-ce-9.0.0-fix-redis-config-path.patch new file mode 100644 index 0000000..65c7aaf --- /dev/null +++ b/www-apps/gitlab-ce/files/02-gitlab-ce-9.0.0-fix-redis-config-path.patch @@ -0,0 +1,12 @@ +diff --git a/config/mail_room.yml b/config/mail_room.yml +index 88d93d4..688d663 100644 +--- a/config/mail_room.yml ++++ b/config/mail_room.yml +@@ -1,6 +1,6 @@ + :mailboxes: + <% +- require_relative "../lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom) ++ require_relative "/opt/gitlab/lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom) + config = Gitlab::MailRoom.config + + if Gitlab::MailRoom.enabled? diff --git a/www-apps/gitlab-ce/files/05-gitlab-ce-9.0.0-replace-sys-filesystem.patch b/www-apps/gitlab-ce/files/05-gitlab-ce-9.0.0-replace-sys-filesystem.patch new file mode 100644 index 0000000..08e3d3a --- /dev/null +++ b/www-apps/gitlab-ce/files/05-gitlab-ce-9.0.0-replace-sys-filesystem.patch @@ -0,0 +1,80 @@ +diff --git a/Gemfile b/Gemfile +index 2f81332..8d1b7d6 100644 +--- a/Gemfile ++++ b/Gemfile +@@ -349,7 +349,7 @@ gem 'health_check', '~> 2.6.0' + + # System information + gem 'vmstat', '~> 2.3.0' +-gem 'sys-filesystem', '~> 1.1.6' ++gem 'sys-filesystem', '~> 1.1.6', group: :exclude + + # Gitaly GRPC client + gem 'gitaly', '~> 0.2.1' +diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb +index 9903972..41af5a2 100644 +--- a/app/controllers/admin/system_info_controller.rb ++++ b/app/controllers/admin/system_info_controller.rb +@@ -1,3 +1,5 @@ ++require 'open3' ++ + class Admin::SystemInfoController < Admin::ApplicationController + EXCLUDED_MOUNT_OPTIONS = [ + 'nobrowse', +@@ -29,10 +31,14 @@ class Admin::SystemInfoController < Admin::ApplicationController + 'vfat' + ].freeze + ++ MOUNT_REGEX = /(\S+) on (\S+) type (\S+) \(([^)]+)\)/ ++ ++ Mount = Struct.new('Mount', :name, :mount_point, :mount_type, :options) ++ FsStat = Struct.new('FsStats', :path, :bytes_total, :bytes_used) ++ + def show + @cpus = Vmstat.cpu rescue nil + @memory = Vmstat.memory rescue nil +- mounts = Sys::Filesystem.mounts + + @disks = [] + mounts.each do |mount| +@@ -42,15 +48,38 @@ class Admin::SystemInfoController < Admin::ApplicationController + next if (EXCLUDED_MOUNT_TYPES & [mount.mount_type]).any? + + begin +- disk = Sys::Filesystem.stat(mount.mount_point) ++ disk = fs_stat(mount.mount_point) + @disks.push({ + bytes_total: disk.bytes_total, + bytes_used: disk.bytes_used, + disk_name: mount.name, + mount_path: disk.path + }) +- rescue Sys::Filesystem::Error ++ rescue IOError + end + end + end ++ ++ def mounts ++ stdout, stderr, status = Open3.capture3('mount') ++ fail IOError, stderr unless status.success? ++ ++ stdout.lines ++ .map { |line| MOUNT_REGEX.match(line) } ++ .compact ++ .map { |match| Mount.new(*match.captures) } ++ end ++ ++ def fs_stat(mount_point) ++ stdout, status = Open3.capture2('stat', '-c', '%s %b %a', '-f', mount_point) ++ fail IOError unless status.success? ++ ++ block_size, blocks_total, blocks_free = stdout.split(' ').map(&:to_i) ++ ++ bytes_total = blocks_total * block_size ++ bytes_free = blocks_free * block_size ++ bytes_used = bytes_total - bytes_free ++ ++ FsStat.new(mount_point, bytes_total, bytes_used) ++ end + end diff --git a/www-apps/gitlab-ce/gitlab-ce-8.17.0_rc3.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.0.0_rc4.ebuild similarity index 91% rename from www-apps/gitlab-ce/gitlab-ce-8.17.0_rc3.ebuild rename to www-apps/gitlab-ce/gitlab-ce-9.0.0_rc4.ebuild index 90f5859..d9a84ac 100644 --- a/www-apps/gitlab-ce/gitlab-ce-8.17.0_rc3.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9.0.0_rc4.ebuild @@ -16,10 +16,11 @@ USE_RUBY="ruby21 ruby23" inherit eutils ruby-ng user systemd MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="f947ed54392d77c66ff5f972b8a9d94dc8d1310b" +MY_GIT_COMMIT="461ea1e425979eaaea12c8ca7c767918c5b4ba54" -GITLAB_SHELL_VERSION="4.1.1" -GITLAB_WORKHORSE_VERSION="1.3.0" +GITLAB_PAGES_VERSION="0.4.0" +GITLAB_SHELL_VERSION="5.0.0" +GITLAB_WORKHORSE_VERSION="1.4.1" DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://about.gitlab.com/" @@ -31,7 +32,7 @@ RESTRICT="mirror" LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries" +IUSE="kerberos mysql +postgres +unicorn systemd pages rugged_use_system_libraries" ## Gems dependencies: # charlock_holmes dev-libs/icu @@ -60,8 +61,11 @@ COMMON_DEPEND=" ~dev-vcs/gitlab-shell-${GITLAB_SHELL_VERSION} >=dev-vcs/git-2.8.4 ~dev-vcs/gitlab-workhorse-${GITLAB_WORKHORSE_VERSION} + >=net-libs/nodejs-4.3.0 + >=sys-apps/yarn-0.17.0 kerberos? ( !app-crypt/heimdal ) - rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )" + rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 ) + pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )" DEPEND=" ${CDEPEND} ${COMMON_DEPEND}" @@ -70,6 +74,7 @@ RDEPEND=" >=dev-db/redis-2.8 virtual/mta systemd? ( sys-apps/systemd:0= )" +# required bundler >= 1.14.2 ruby_add_bdepend " virtual/rubygems >=dev-ruby/bundler-1.13.7" @@ -82,10 +87,11 @@ ruby_add_bdepend " # RUBY_PATCHES=( "01-${PN}-8.7.5-fix-sendmail-config.patch" - "02-${PN}-8.11.0-fix-redis-config-path.patch" + "02-${PN}-9.0.0-fix-redis-config-path.patch" "03-${PN}-8.17.0-database.yml.patch" "04-${PN}-8.12.7-fix-check-task.patch" - "05-${PN}-8.16.0-replace-sys-filesystem.patch" + "05-${PN}-9.0.0-replace-sys-filesystem.patch" + "06-${PN}-8.17.0-fix-webpack-config.patch" ) MY_NAME="gitlab" @@ -333,8 +339,11 @@ pkg_config() { einfo "Migrating iids ..." exec_rake migrate_iids + einfo "Installing npm modules ..." + exec_npm install + einfo "Cleaning old precompiled assets ..." - exec_rake assets:clean + exec_rake gitlab:assets:clean einfo "Cleaning cache ..." exec_rake cache:clear @@ -350,10 +359,13 @@ pkg_config() { einfo "Initializing database ..." exec_rake gitlab:setup + + einfo "Installing npm modules ..." + exec_npm install fi einfo "Precompiling assests ..." - exec_rake assets:precompile + exec_rake gitlab:assets:compile if [ "${update}" = 'true' ]; then ewarn @@ -387,12 +399,23 @@ ryaml() { } exec_rake() { - local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}" + local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV} NODE_ENV=${RAILS_ENV}" echo " ${command}" su -l ${MY_USER} -c " - export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8 + export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules cd ${DEST_DIR} ${command}" \ || die "failed to run rake $@" } + +exec_npm() { + local command="npm $@ --${RAILS_ENV}" + + echo " ${command}" + su -l ${MY_USER} -c " + export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules + cd ${DEST_DIR} + ${command}" \ + || die "failed to run npm $@" +} From 71d43050e584b484ca8d4160af96262119398eba Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sun, 19 Mar 2017 14:04:47 +0100 Subject: [PATCH 2/7] www-apps/gitlab-ce: Updated ebuild for gitlab-ce-9999 and also cleaned dependencies for gitlab-9.0.0_rc4 Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- www-apps/gitlab-ce/ChangeLog | 5 +++++ www-apps/gitlab-ce/Manifest | 6 +++--- www-apps/gitlab-ce/gitlab-ce-9.0.0_rc4.ebuild | 5 ++--- www-apps/gitlab-ce/gitlab-ce-9999.ebuild | 8 ++++---- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog index a7794bb..7b75535 100644 --- a/www-apps/gitlab-ce/ChangeLog +++ b/www-apps/gitlab-ce/ChangeLog @@ -1,3 +1,8 @@ + 19 Mar 2017; Manuel Friedli gitlab-ce-9.0.0_rc4.ebuild, + gitlab-ce-9999.ebuild: + www-apps/gitlab-ce: Updated ebuild for gitlab-ce-9999 and also cleaned + dependencies for gitlab-9.0.0_rc4 + *gitlab-ce-9.0.0_rc4 (19 Mar 2017) 19 Mar 2017; Manuel Friedli diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index 2d677ad..f28e2a1 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -32,7 +32,7 @@ EBUILD gitlab-ce-8.16.6.ebuild 11982 SHA256 2cc7b8f06153f28ebcc34a5ff8e24be79168 EBUILD gitlab-ce-8.17.0.ebuild 12831 SHA256 9556fe5712044ebe473b7ff8b847a4daa5ca1818a0ac714f22afc5725199da72 SHA512 4aaa00f4eac87a4bbe598cde792997e25b137eea9fdaf7e7c8394ec5e2abc54302ed5432efe1c7055dc195ca2599f9027463480c943f108bb399daa2eee833f5 WHIRLPOOL aec29db1dc7236f60d2723ec97444fa437a4f8b3092cbf53305f3cddbb6851a40b1a77a306daf4c9780ffe9a8eed760c580371bf95da66b18d884a32c3e48cd5 EBUILD gitlab-ce-8.17.2.ebuild 12831 SHA256 b57a4f683a5eafaa5d0149b0256833e329a757ad470e24bba163c57ba841eeeb SHA512 ed84da9ab62d0893b36a2ade744248b663634c5b05b8e8b608d064068c31a3d19a0e4917f932a0a2caee48a8f509359e50cc982c43bd5d1d958343ea5c5637d9 WHIRLPOOL dfb96d29b45adf5d03313fd9dd6cbc39c70a1736272867737f0bf8d429510add4e3fcd77b329690b9393cc506c9387f4342bed001c2bda50901ba9480fe241d5 EBUILD gitlab-ce-8.17.3.ebuild 12928 SHA256 8e79b5c6724ef50b00f1c6eb607af6c4dc44a8ea5a7b2735c016726247043c3e SHA512 7d32ef8db701c1d4570b4071a55e61611f3bbff3f308adee84594c43f4089befc1a8ade8d66f7f36a4f9f6fd0f1f3c8fe6172eda663a5e2bd277646d4e1fdfa7 WHIRLPOOL 36a8c32bddeb51e89da1e314375bec1765e238d4fc1f658a492601b2a46d838993dde921570956e6c43086d9d3e09727b83f99e99168cfe95ef2e4fba6b69e6b -EBUILD gitlab-ce-9.0.0_rc4.ebuild 12927 SHA256 c89be252161b337dd0a9bf41c07136e84884c6b6358324fc793bfe2888004588 SHA512 cb46b20245fb761a9a9a98f41a5a474a8e337e5bae60fb74cb3cf29a2a8fd9d99cc17d51d4c4d5179102d78648f176d41658192d216a54135d4f24bd1249086b WHIRLPOOL 927e830e387fdd20dbe8b72abec38be3fbfeef390e4324ad56f525c68f423668b18370547389e54aec8d3781e7b1fc45a2c9f7c387e3f44830413cd6460788f4 -EBUILD gitlab-ce-9999.ebuild 12864 SHA256 ae1c00758e08c97414d3fea2ad636be6f01a6d61bac25dad441834316e48152e SHA512 7ee796c04f450733603569cbb7eb351ae145313dec19fbf333563eaad9721af4b03bedd5415471f40bcf42367cdc3eb0cfd6940da6e42284d6e7dae4baebb451 WHIRLPOOL fd1504cf829fdfefc341627f63d3c583304a0b9b7bcfa39b53452f02b13ce859ec3250f0d439711035ef46c7e8adf41c7414fa2a0bb5479fb71c17be8f1340eb -MISC ChangeLog 14987 SHA256 efc51b428142ae7f78a8a5050df9771fae9a4cf785268862ef7a7dbaa1e5dd89 SHA512 d9f1e845e5cc8b5909624934567636901f9acd194f7512c098abf8e858c630822f97989ef8c67d471b596307c4ff5a344f583c1cdc12fedfcb7ba301bf543f8d WHIRLPOOL 05979465333e6102b346e7141fbfdb55ed4a9713de2feb03e9b8e1bdfb4c01276bad2178f75888976dd571a900548954143cc55dc1576fb69b62468f4835157f +EBUILD gitlab-ce-9.0.0_rc4.ebuild 12910 SHA256 8851160b4454845fb33ce0b9a9dd3e070bed07d3a0e5c5f753c77b0ef301ded0 SHA512 9d109a3ea8fa7a7bb33440b4b21bf988745c4eefb62b834ad88825f3ffa28881eceaf402ec09241b74d91e778258c1a18daae6c86254625af4f54bf6189b32f2 WHIRLPOOL 67aa480b4cf1209a3d7af3bffb1f7f774bf2c6d18bf40960478e13459813ebb9472adc5aec3b84252157b0c3e74f9e7f74cb0d57395983c02ba4c976ffae106f +EBUILD gitlab-ce-9999.ebuild 12869 SHA256 4a1e486e7386aa942bbd22c29457850584dab007b64715fc6f316ce5c98fcaf8 SHA512 ed66b809ca6e04956a9d4f5ef027aa9e174bad5cd80131a30fc34a1011f0221483b6fb52e893394b429d70919fc65496711a9c700c630c2ff31665827912df82 WHIRLPOOL b1b2582dcb1f600f199216c1bb532eac524ff3cce594e052039be29547164557997c65573f943c00240ab0986b0f1c1315602c3a65a0986e9f64a2df1827288e +MISC ChangeLog 15202 SHA256 7c046e4a1eb5758af274515808d274d4bc661347a0816c4eba2d0aa2f37ca6c3 SHA512 f0010ab40b1aa883dda0276e9ed056e8db3a57a51ed5dc9b9072668fead23750f80ed8e9e1518550f3d1d0b1c25908bd73a2fd5440ed15217bc916ad72ba5b4c WHIRLPOOL 7bd06cafa247df448c64bc6f3b02f2c63cb825aa6a2347bef18112f91c007a13457678bf829ac90f5a031af8a329a935459554a87ea9b0fb92631f6c2606dda6 MISC metadata.xml 665 SHA256 2a0cd67ad42f0cc6d8b88391cf6e3153a9883dab31aae8227c57c95f3f68890d SHA512 64b8fbae373d0a057f705f64c1d097dbfab893bd585e1db65ccdb06cda9569211c9b63fa168ac8de9f6d512a17759ecd20b54d818d2790a6f4c99d0ca73fddc3 WHIRLPOOL a81b21bb46aad9757a502628033eba546c686b83bbf1d651ecabba273c454cfb64574affc180db8358ced87eb638e8ad13d7c79c4cfb9a31e72c577d21ab433e diff --git a/www-apps/gitlab-ce/gitlab-ce-9.0.0_rc4.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.0.0_rc4.ebuild index d9a84ac..3d9809b 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9.0.0_rc4.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9.0.0_rc4.ebuild @@ -49,7 +49,8 @@ GEMS_DEPEND=" dev-libs/libxml2 dev-libs/libxslt dev-util/ragel - net-libs/nodejs + >=net-libs/nodejs-4.3.0 + >=sys-apps/yarn-0.17.0 postgres? ( >=dev-db/postgresql-9.1:* ) mysql? ( virtual/mysql ) kerberos? ( virtual/krb5 )" @@ -61,8 +62,6 @@ COMMON_DEPEND=" ~dev-vcs/gitlab-shell-${GITLAB_SHELL_VERSION} >=dev-vcs/git-2.8.4 ~dev-vcs/gitlab-workhorse-${GITLAB_WORKHORSE_VERSION} - >=net-libs/nodejs-4.3.0 - >=sys-apps/yarn-0.17.0 kerberos? ( !app-crypt/heimdal ) rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 ) pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )" diff --git a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild index 19c5063..a150c0c 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild @@ -48,7 +48,8 @@ GEMS_DEPEND=" dev-libs/libxml2 dev-libs/libxslt dev-util/ragel - net-libs/nodejs + >=net-libs/nodejs-4.3.0 + >=sys-apps/yarn-0.17.0 postgres? ( >=dev-db/postgresql-9.1:* ) mysql? ( virtual/mysql ) kerberos? ( virtual/krb5 )" @@ -60,7 +61,6 @@ COMMON_DEPEND=" >=dev-vcs/gitlab-shell-${GITLAB_SHELL_VERSION} >=dev-vcs/git-2.8.4 >=dev-vcs/gitlab-workhorse-${GITLAB_WORKHORSE_VERSION} - >=net-libs/nodejs-4.3.0 kerberos? ( !app-crypt/heimdal ) rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 ) pages? ( >=www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )" @@ -85,10 +85,10 @@ ruby_add_bdepend " # RUBY_PATCHES=( "01-${PN}-8.7.5-fix-sendmail-config.patch" - "02-${PN}-8.11.0-fix-redis-config-path.patch" + "02-${PN}-9.0.0-fix-redis-config-path.patch" "03-${PN}-8.17.0-database.yml.patch" "04-${PN}-8.12.7-fix-check-task.patch" - "05-${PN}-8.16.0-replace-sys-filesystem.patch" + "05-${PN}-9.0.0-replace-sys-filesystem.patch" "06-${PN}-8.17.0-fix-webpack-config.patch" ) From 1a82c72d5685bc953610f38a74d5a9400edf6760 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sun, 19 Mar 2017 15:21:21 +0100 Subject: [PATCH 3/7] dev-go/gax-go: Added ebuild for gax-go, a dependency of gitlab-ci-multi-runner-9.0.0_rc2 Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- dev-go/gax-go/ChangeLog | 6 ++++++ dev-go/gax-go/Manifest | 4 ++++ dev-go/gax-go/gax-go-0_pre20170306.ebuild | 24 +++++++++++++++++++++++ dev-go/gax-go/metadata.xml | 8 ++++++++ 4 files changed, 42 insertions(+) create mode 100644 dev-go/gax-go/ChangeLog create mode 100644 dev-go/gax-go/Manifest create mode 100644 dev-go/gax-go/gax-go-0_pre20170306.ebuild create mode 100644 dev-go/gax-go/metadata.xml diff --git a/dev-go/gax-go/ChangeLog b/dev-go/gax-go/ChangeLog new file mode 100644 index 0000000..1547446 --- /dev/null +++ b/dev-go/gax-go/ChangeLog @@ -0,0 +1,6 @@ +*gax-go-0_pre20170306 (19 Mar 2017) + + 19 Mar 2017; Manuel Friedli +gax-go-0_pre20170306.ebuild, + +metadata.xml: + dev-go/gax-go: Added ebuild for gax-go, a dependency of gitlab-ci-multi- + runner-9.0.0_rc2 diff --git a/dev-go/gax-go/Manifest b/dev-go/gax-go/Manifest new file mode 100644 index 0000000..718752f --- /dev/null +++ b/dev-go/gax-go/Manifest @@ -0,0 +1,4 @@ +DIST gax-go-0_pre20170306.tar.gz 9958 SHA256 61c9719e97469e24797a3549ad31892a3584253231ee870e314e87d6b549bd75 SHA512 174643d82d8d013d520c2d2c093939f6561948102489d61130521a1763c66831a2b1438ab83a6b2ac86106cef6955d09f17f51a9a71b430fb1f9557ffa54b850 WHIRLPOOL c411aa52762e9a542a983c6317898204041623ccbaab8eef006b771b1cf91ecc2213219ee9ea5b447086feb30d9630633df090bebb2ccb70718485a5c63168ac +EBUILD gax-go-0_pre20170306.ebuild 595 SHA256 24c5141e6880ac3a5d0fd96838e5aef5e2f3e39604b0d2b923dd72ad5c1435e1 SHA512 4fe31489242ab76af5f364e53ae2cab2537057d113368aeffa5b7ade2aead15e162ff1d475c9da202959d1397657852e5c255b4067dc19459bb22619c8d416d3 WHIRLPOOL a590d470426b565f87fd8598687b1886f40b5469452165bb10b67fc98a3af3e0e162b73b4a3b367eb0c6389d0976338ad05ff94af5c01c9cf7a74a0e0db9a8bd +MISC ChangeLog 231 SHA256 fc510eaa050bb503a4bf0d0fcc79eb1e3f4e6107418f749562cf9cc43304e86e SHA512 1c000422ab0f73915f3fe64d1c3858e33ddd6fc7ea988a3c14179c50ad1a975cb4b7db3fead8263a61bc49c727bc068a4b5dd4dfedbe2ea6f190a23ff367ed17 WHIRLPOOL 2a6fdedd0735f762c6e231eff505ed57b65ebd025423b99b981ddd552f001ce8678d8a01aa53cb8e129f4e78e7f5bd04703efa0168ab04123e0201a5673ab195 +MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/dev-go/gax-go/gax-go-0_pre20170306.ebuild b/dev-go/gax-go/gax-go-0_pre20170306.ebuild new file mode 100644 index 0000000..de11df5 --- /dev/null +++ b/dev-go/gax-go/gax-go-0_pre20170306.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit golang-build golang-vcs-snapshot + +EGO_PN="github.com/googleapis/gax-go/..." +EGIT_COMMIT="8c5154c0fe5bf18cf649634d4c6df50897a32751" +ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~arm" + +DESCRIPTION="Google API Extensions for Go" +HOMEPAGE="https://github.com/googleapis/gax-go" +SRC_URI="${ARCHIVE_URI}" +LICENSE="BSD" +SLOT="0/${PVR}" +IUSE="" +DEPEND=" + dev-go/go-net" + +src_install() { + golang-build_src_install + dobin bin/* +} diff --git a/dev-go/gax-go/metadata.xml b/dev-go/gax-go/metadata.xml new file mode 100644 index 0000000..67a771c --- /dev/null +++ b/dev-go/gax-go/metadata.xml @@ -0,0 +1,8 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + From 997c30f16a78d2160eee5a70f983e0a13baa07e3 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sun, 19 Mar 2017 16:55:56 +0100 Subject: [PATCH 4/7] dev-vcs/gitlab-ci-multi-runner: Added preliminary ebuild for gitlab-ci-multi-runner-9.0.0_rc2. It still needs some love and doesn't even compile yet. Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- dev-vcs/gitlab-ci-multi-runner/ChangeLog | 8 ++ dev-vcs/gitlab-ci-multi-runner/Manifest | 7 +- .../files/0001-fix-Makefile-9.0.0.patch | 70 +++++++++++ .../gitlab-ci-multi-runner-9.0.0_rc2.ebuild | 119 ++++++++++++++++++ 4 files changed, 203 insertions(+), 1 deletion(-) create mode 100644 dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-9.0.0.patch create mode 100644 dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.0.0_rc2.ebuild diff --git a/dev-vcs/gitlab-ci-multi-runner/ChangeLog b/dev-vcs/gitlab-ci-multi-runner/ChangeLog index 7f2a75f..b256027 100644 --- a/dev-vcs/gitlab-ci-multi-runner/ChangeLog +++ b/dev-vcs/gitlab-ci-multi-runner/ChangeLog @@ -1,3 +1,11 @@ +*gitlab-ci-multi-runner-9.0.0_rc2 (19 Mar 2017) + + 19 Mar 2017; Manuel Friedli + +files/0001-fix-Makefile-9.0.0.patch, + +gitlab-ci-multi-runner-9.0.0_rc2.ebuild: + dev-vcs/gitlab-ci-multi-runner: Added preliminary ebuild for gitlab-ci- + multi-runner-9.0.0_rc2. It still needs some love and doesn't even compile yet. + *gitlab-ci-multi-runner-1.11.1 (16 Mar 2017) 16 Mar 2017; Manuel Friedli diff --git a/dev-vcs/gitlab-ci-multi-runner/Manifest b/dev-vcs/gitlab-ci-multi-runner/Manifest index 4c3d99a..3986836 100644 --- a/dev-vcs/gitlab-ci-multi-runner/Manifest +++ b/dev-vcs/gitlab-ci-multi-runner/Manifest @@ -1,6 +1,7 @@ AUX 0001-fix-Makefile-1.10.4.patch 3308 SHA256 c87a85a704ee054f85343d01e187933e67a6cca989adcf686a6f16a37406340d SHA512 bcd746a39997287334a77847322f11cbdc55c790540061f3bc9d9ac60ddc19683abf431e558c3e1a033f3ac3b5de0404da8ab82d2a3c254a214c1e0e80bfd76d WHIRLPOOL 71ec341a2e79a431062eb99c96bb2c7286858417e62c10082af48d5cd90de88a0eefd91a2bdda351e0bdbceea7452b79e88f83d566a79432c45ceaea5b7476c9 AUX 0001-fix-Makefile-1.11.1.patch 3376 SHA256 1c8123815ed8df86942b4cfd11b8c91e7a08945664e97df11b6f34cc583a093e SHA512 2bb4dd17cd47f85799932e09294244d899361b152ff47b0883c985b989b1c222a0bec8090e7692d1eea0655969883fad400d0c5a68c07dde0cefe67f6775654d WHIRLPOOL da952b735599208091b028aaf3b32077c63e24c4796226975b22aef7c57bb7d1b2872a96b21ce877bdf46b761295b6e602a5eacdb7e3c4e58c07b34801f650e7 AUX 0001-fix-Makefile-1.8.0.patch 3281 SHA256 70db95de830679916f1a0c446a5eb42ebdc77446d2a46e31f919107ea452d0a0 SHA512 d73db4e0122741da7bd7be9fd5a2b36c4aaeb0b3b0789604cefe1e98a613c0e5141299d7764b694080ccd8ff9094e8f0b134c950339e2f4ced31d8851f2fe63f WHIRLPOOL 24a3459cf882281b57bfbfb8471fc0f6ce1d0630ecd360d1fd813663f35a500f9f3cc826b89df0069d62d23f6d8cf0d0405254e967fc4c2eba0abf635f5da29b +AUX 0001-fix-Makefile-9.0.0.patch 3376 SHA256 1c8123815ed8df86942b4cfd11b8c91e7a08945664e97df11b6f34cc583a093e SHA512 2bb4dd17cd47f85799932e09294244d899361b152ff47b0883c985b989b1c222a0bec8090e7692d1eea0655969883fad400d0c5a68c07dde0cefe67f6775654d WHIRLPOOL da952b735599208091b028aaf3b32077c63e24c4796226975b22aef7c57bb7d1b2872a96b21ce877bdf46b761295b6e602a5eacdb7e3c4e58c07b34801f650e7 AUX 0001-fix-Makefile.patch 3401 SHA256 d764379ad6b027eaab6e6f8a3874befad9567e5114caa247843d9abad29bf10e SHA512 12a44684aa05df41dea29e66bf42ec6a6b40f06b1a9c8a2682c5ce7a62264b1135df3a69f98cd9bf10bc05da062c61cfa02f803226d022ed9ebaf0bf6469449b WHIRLPOOL cdab4d9382f522ef136e77eeb38c7532172bc538e95254c4e57dfdf9b277d10f469211350994a228529142dc07d04f1df89a81acac01665ca2c9c9961f7da65a AUX gitlab-ci-multi-runner.conf 44 SHA256 0b93ba53d557fbf603b50f6d78eb2c4415b9a79f056142b6edf4a63fc6612d6e SHA512 1f5ff480740b18fc985ae9337b8dc4ddd1bde5253e09042b5542cb9a3db54b9cef1f7b24445c829eb83fcfd8751b693018154f6b97ce0a6e723d5d71d9a27429 WHIRLPOOL fc5218c55917b3303baf649fbafaf1dc50cf52d0ee04852716defe4f21b806f4f313071b1c55920d89da66180405d35da0f7cca73c2617b70bcaa67f725cab2a AUX gitlab-ci-multi-runner.init 662 SHA256 faf47cdc02b78527d98cd044f2d2aed38a44e39fc6aa5ccc6249c6bce7b979b2 SHA512 9a2f6bcac4c1b992aa5f046cc2cf8f379d2b1f5b6d8065793996828be1527fb5e9131b2967131c292003319f2b27c0cb1229a147236279027e11d13f73e9bd76 WHIRLPOOL 7ffb5d25cb5bd66459981fb71a79d4690b1efaff41e5873431b8ec9cae62783c9fb71ea426a0a1d8f0bf9fdd7dbcb569136dc38f7736296565258a0dcfa3536f @@ -19,10 +20,14 @@ DIST gitlab-ci-multi-runner-1.8.0.tar.gz 3541906 SHA256 0636134f34fd03b1e1407374 DIST gitlab-ci-multi-runner-1.9.2-prebuilt-arm.tar.xz 16002708 SHA256 c4f7297865fafa4e7841e513a26b334cf9f29ad6d7ec4b12381d6031fa6f9648 SHA512 e1d905048bbfb1415f93a443e457ae47cd7f969eeae82f6dc5bcbdce37e2aa4219a97b97080c8b7767523490017cd8ec0fbf681375e27348e87c4d230db844ae WHIRLPOOL 0b76317c29b81dd53c7ae4c2b9f6bcdc7bcb28e6d5101a45f8c4eccf11259e88f2eac7751e84e6f5b3e91298e32980cabd1a1fd07c0cc260dfdde9e479f9c116 DIST gitlab-ci-multi-runner-1.9.2-prebuilt-x86_64.tar.xz 8717016 SHA256 7d0759dd04f930a231c1a713d8e44a149666112ff1d841c5173847a373496278 SHA512 aaf1b859dd353bca3810ebb85dca0fadbf7f728b262ef00f6a793e9eaf100a05466f26a8bd55acc0270876e5725519941f6086bb375d9f9285fce7f5bf66351c WHIRLPOOL 7e5af9b63feb36ba4e09b12faaa05cb31b453f8f98ded396005429db1f392cb370c75f0c9ddfc07e169cf77f9dceb4abac5abd195a30e2a3ccb03819275f55a5 DIST gitlab-ci-multi-runner-1.9.2.tar.gz 3563622 SHA256 ed480b29f5dd305758e1158a7a2d60ad892bf3b39fc48903861b241c7391e920 SHA512 7721cc80cd9abaf5ab44f53836e7718eb2df360cea378f4898ef6e9d6b671a09df1e69b70ac99ed8c6c042af9da6415e614db52b5c1e9476bbfe72e146628f04 WHIRLPOOL accb7458dd7ce1334e66f76ed90d970c5e6974505a2376a3e0c9e42d7169986aa18ed9dc64f11dac1366b42b4efddd18e1baa072d4f56e57d3a6c6300ee1f3bb +DIST gitlab-ci-multi-runner-9.0.0_rc2-prebuilt-arm.tar.xz 8671408 SHA256 14cb54459f83caf053bcdd5a9299d6fc654d215eab46412b2a351f431861500f SHA512 4bd279f6a7394fa0b2bf6e25e041a8f85e4062242ebc801e06c9e0ee225c9a6ee7be8154f52c13a1058da1ace4e5113cbd6cc26838b0036f55046aaefde8bf64 WHIRLPOOL 408bcf6465a9e72a6946914ca62513fb0e14e248c2bcf95525745bc7fd37615d3a6fa05a766d75d6d03f3dafe779d97c1f19ce7b258b95938d2a9f98a152084c +DIST gitlab-ci-multi-runner-9.0.0_rc2-prebuilt-x86_64.tar.xz 8317360 SHA256 0e8877cab24e6dc91363950a388a34391f30caffc958416beae8771d72ee4b13 SHA512 b7e31b75cafece202f285927fc9c54a6bfe7ded7cec0febcd0f22f9d7c2097f94f3380a8a860e359ca6f02785f5719d191514ff0090512e5d4a12986d3dc349a WHIRLPOOL 8c104dd91bc6428fb30693401145969df44adf5d28bcf7f658b9d1206d3bcc596e9a71771e0b83fc04caafd9dc642e4547c2e4b51df5e64a4ec99f1d195b3fad +DIST gitlab-ci-multi-runner-9.0.0_rc2.tar.gz 3140263 SHA256 09f4d370dbcfe9b54acd8679733a4e6cebe43808c205a5159a71a7db372c0f30 SHA512 b4e5aa5784beb5cdcde1b3f8cdcb1aff1171bd3ca4fd76e8fb5059ea62ebbb930c98efc148cb496ddcf635ecfce7bfeefd2c6fb6f33defde3e574a59194c90ab WHIRLPOOL 181ee8c02ef17e2034a0454af37c44198bbc950cf96f61a628a56469e4b375970db55b58c8ed3aeb39e2be75a393e1f923d90389a610b06ed6761dbd7145c33c EBUILD gitlab-ci-multi-runner-1.10.4.ebuild 3266 SHA256 403a1b8eafa8bc74582cbdf7cd90b9c18ee72e1a386bae07fecb6adfcd56fece SHA512 802c5fafcdf7b997115bf70c01b168499bfd1b0cf78195a414ccb0ca1c5f58da3eeb5c8eb3d1960b049b0509e92682e13dac7a80549bf5f9f7c818d0f931ffd0 WHIRLPOOL 616be2cfd835f9912f0698321a230b2d242251556a519541dea18b9673f3b84d32d4095104d5620d326dc5db7934a9c222ca1d92cc157bcca341dd5862f03723 EBUILD gitlab-ci-multi-runner-1.11.1.ebuild 3267 SHA256 a63c1a0112653c298ed03bda0108d013563dbf70399628c48106af4a2564aa66 SHA512 65ca42ea46321ee37fc9e5683c923c0f1f3670d79c1ea9ec3b876de8962ef665c66bf38d19462981f689b3db3b4c46d1bef58dce0bab20c39ad30009db3a6ebe WHIRLPOOL bdf42cc264767ccbbbbda661edb61529d60951f8774a001cfea3900c670ff3310747fa86b1fd588e39d14851d018fa9d5a7fc1973e37e1a7a85489b5d5f69fc5 EBUILD gitlab-ci-multi-runner-1.7.0.ebuild 3250 SHA256 fc9f976619ff9ddedaceee812dd2babcb1fb7d7236868368d23a5b67b60bd08b SHA512 276835a37b5be71c8663f92bb093c568ecdcae69d45a88a9ce3ccf896cefd3d59a7f8bfce43eed7de72744e4a60b110b8ca9ae8c2fed94f62c0da475e5c40a50 WHIRLPOOL cc4796822e8443f81f958c8fa39475fb1b168ca06b7e8c38f148b91b77da033c1113c88dd818aaf14265ea07ade5de367235168cdf6e2ccb276ffd45538e9812 EBUILD gitlab-ci-multi-runner-1.8.0.ebuild 3258 SHA256 d54d70f365868526144decb5671c834bf259d8b8659ec57a8ed9cd55cb6589da SHA512 7023a29d0615b986ef6d0fb0f2ca3ba9f0c0cca095b739cb7da63eb13cb4bee413978807032a674bd5876da9eda198a8fbb11be44c5fe43099e8e98148524b10 WHIRLPOOL c77aaa33c1d24a278cf53d63aa54052c5bddc5c671d2189457b209dcd8a8bf4c911f50be6478c613ba111a709f500f2fb4ba98399fc78a5ece897c852b79d4a4 EBUILD gitlab-ci-multi-runner-1.9.2.ebuild 3258 SHA256 2d753e9effbba47ddce697875a94572ea44a866fd4988924d38c5f3e87030f14 SHA512 7e691285841aad5fd200e83ed039cf24f3185d18d4b55545f2f325b9fbb6affc30e54ec1aa104799d3cdbfbdbfc4ad96c481485e8f5ce40753ad17b4dc5084d9 WHIRLPOOL 6b00e7b8446c6b78502f2fca6dcf752273245a8a71830fb968a286ae6cf1f0029285a547e0c568ae668315006a39cf9880e0db384504f428538c4810e11805f6 -MISC ChangeLog 1527 SHA256 f69fb48fa08aff1dc4e751af5dc0035289aaf39c4fb4511b680a938a30bbc311 SHA512 e94da9dd3a9cadf9461e3536a1ea632b16e5704735f30fa47da08652c7bada1d6d0823dde5cdeffeef0787a8ec6a8fe357b841cb4a59e9c345702c113a4a0f10 WHIRLPOOL 50cbf5c714f6a4dc8203a588095e9540157ef3f8d9e406910b93cdc46402bfbdf76a0e5f23e90d4fb25142a222b4c95004c893657d7e73cb3fedeeb0dcd2fe57 +EBUILD gitlab-ci-multi-runner-9.0.0_rc2.ebuild 3314 SHA256 0e608a0925fdca1116eca9fc6355fdc930770223dc1779884b66fb7b55cb0d41 SHA512 03dc52b488b6173e32610c3a8dfeb860edbf9b7336f532f9f8c407889f9e2afdf42a7b336d2b3a173172d6f57c3c5e67a73b10bf171dcf3c05bb5d3c399a25e3 WHIRLPOOL 4fb8d064b6a81b126f558946125e8cb96f2d54a74601819305fa012ace75674292164bd949679509d4bbb3fa9f63819fe76b361db429ebe2ed63efb394dda024 +MISC ChangeLog 1869 SHA256 0548d0cac95fbaddfed475355f791128f07270c8e6812745ad8a4c1360addd7e SHA512 cf5495ad836bd6b623daee529711e98a900f7756857cc55d83c364d3fdd448d0fa880edb94b20a2f9be29f0d39c85ead90452a81a871af2facd1f956cfd16abc WHIRLPOOL 306973a7d309ff80d6a0d0484ae493baebc97b74db6cc02c0a6a6f55f19d4fa2cdf7a6b6664f41c78e9a888bfeda95c884a916dc799b220305a5fe4cafa89795 MISC metadata.xml 329 SHA256 f0ae08a64aa32a07486e744ce11ac5448770b7320454015bcd065e312fcb5e9c SHA512 11e4eaf25633c5979e5243350bdf2ddc6d9dca06ab54ec38359591f1d002ea2a224e53b3e6c4ac53b5b2e795a87769fdbd97c547b008272e0a1491141f422e5d WHIRLPOOL ab2c1cb3d9aff1f757b49633f94d4b98da4b83dadab12ab8d869f9e1f6763b3125010147472e58e910e7fc42da262dbd69a1bf3939f3720a79ab4329184b4c35 diff --git a/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-9.0.0.patch b/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-9.0.0.patch new file mode 100644 index 0000000..53fca69 --- /dev/null +++ b/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-9.0.0.patch @@ -0,0 +1,70 @@ +diff --git a/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile b/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile +index b300c5e..8b05931 100644 +--- a/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile ++++ b/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile +@@ -1,30 +1,21 @@ + NAME ?= gitlab-ci-multi-runner + PACKAGE_NAME ?= $(NAME) + PACKAGE_CONFLICT ?= $(PACKAGE_NAME)-beta +-export VERSION := $(shell ./ci/version) +-REVISION := $(shell git rev-parse --short HEAD || echo unknown) +-BRANCH := $(shell git show-ref | grep "$(REVISION)" | grep -v HEAD | awk '{print $$2}' | sed 's|refs/remotes/origin/||' | sed 's|refs/heads/||' | sort | head -n 1) ++export VERSION := @@VERSION@@ ++REVISION := @@REVISION@@ ++BRANCH := @@BRANCH@@ + BUILT := $(shell date +%Y-%m-%dT%H:%M:%S%:z) + +-LATEST_STABLE_TAG := $(shell git -c versionsort.prereleaseSuffix="-rc" -c versionsort.prereleaseSuffix="-RC" tag -l "v*.*.*" --sort=-v:refname | awk '!/rc/' | head -n 1) +-export IS_LATEST := +-ifeq ($(shell git describe --exact-match --match $(LATEST_STABLE_TAG) >/dev/null 2>&1; echo $$?), 0) + export IS_LATEST := true +-endif + + PACKAGE_CLOUD ?= ayufan/gitlab-ci-multi-runner + PACKAGE_CLOUD_URL ?= https://packagecloud.io/ +-BUILD_PLATFORMS ?= -os '!netbsd' -os '!openbsd' ++BUILD_PLATFORMS ?= -osarch '@@OSARCH@@' + S3_UPLOAD_PATH ?= master +-DEB_PLATFORMS ?= debian/wheezy debian/jessie debian/stretch debian/buster \ +- ubuntu/precise ubuntu/trusty ubuntu/utopic ubuntu/vivid ubuntu/wily ubuntu/xenial ubuntu/yakkety ubuntu/zesty \ +- raspbian/wheezy raspbian/jessie raspbian/stretch raspbian/buster \ +- linuxmint/petra linuxmint/qiana linuxmint/rebecca linuxmint/rafaela linuxmint/rosa linuxmint/sarah linuxmint/serena +-DEB_ARCHS ?= amd64 i386 armel armhf +-RPM_PLATFORMS ?= el/6 el/7 \ +- ol/6 ol/7 \ +- fedora/20 fedora/21 fedora/22 fedora/23 fedora/24 fedora/25 +-RPM_ARCHS ?= x86_64 i686 arm armhf ++DEB_PLATFORMS ?= debian/wheezy ++DEB_ARCHS ?= amd64 ++RPM_PLATFORMS ?= fedora/25 ++RPM_ARCHS ?= x86_64 + COMMON_PACKAGE_NAMESPACE=$(shell go list ./common) + + # Packages in vendor/ are included in ./... +@@ -77,7 +68,7 @@ verify: fmt vet lint complexity test + deps: + # Installing dependencies... + go get -u github.com/golang/lint/golint +- go get github.com/mitchellh/gox ++ go get github.com/fritteli/gox + go get golang.org/x/tools/cmd/cover + go get github.com/fzipp/gocyclo + go get -u github.com/jteeuwen/go-bindata/... +@@ -108,7 +99,7 @@ else + $(warning WARNING: and remove out/docker/prebuilt-x86_64.tar.xz) + $(warning =============================================) + curl -o out/docker/prebuilt-x86_64.tar.xz \ +- https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-x86_64.tar.xz ++ https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/$(VERSION)/docker/prebuilt-x86_64.tar.xz + endif + + out/docker/prebuilt-arm.tar.xz: $(GO_FILES) +@@ -136,7 +127,7 @@ else + $(warning WARNING: and remove out/docker/prebuilt-arm.tar.xz) + $(warning =============================================) + curl -o out/docker/prebuilt-arm.tar.xz \ +- https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-arm.tar.xz ++ https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/$(VERSION)/docker/prebuilt-arm.tar.xz + endif + + executors/docker/bindata.go: out/docker/prebuilt-x86_64.tar.xz out/docker/prebuilt-arm.tar.xz diff --git a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.0.0_rc2.ebuild b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.0.0_rc2.ebuild new file mode 100644 index 0000000..25630d8 --- /dev/null +++ b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.0.0_rc2.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit eutils golang-build golang-vcs-snapshot user + +EGO_PN="gitlab.com/gitlab-org/gitlab-ci-multi-runner/..." + +MY_PV="${PV/_/-}" +MY_PV="v${MY_PV/-rc/-rc.}" +#MY_BRANCH="9-0-stable" +MY_BRANCH="master" +MY_GIT_HASH="0f9ba5fc" + +DESCRIPTION="Official GitLab CI Runner written in Go" +HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner" +SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz + !docker-build? ( + https://${PN}-downloads.s3.amazonaws.com/${MY_PV}/docker/prebuilt-x86_64.tar.xz -> ${P}-prebuilt-x86_64.tar.xz + https://${PN}-downloads.s3.amazonaws.com/${MY_PV}/docker/prebuilt-arm.tar.xz -> ${P}-prebuilt-arm.tar.xz + )" + +KEYWORDS="~amd64" +LICENSE="MIT" +SLOT="0/${PVR}" +IUSE="docker-build" + +DEPEND=">=dev-go/gox-0.3.1_alpha + >=dev-go/go-bindata-0_pre20151023 + docker-build? ( >=app-emulation/docker-1.5 ) + !dev-vcs/gitlab-ci-multi-runner-bin" + +RESTRICT="test mirror" + +MY_USER="gitlab_ci_multi_runner" +MY_HOME_DIR="/opt/gitlab-ci-multi-runner" + +pkg_setup() { + enewgroup ${MY_USER} + enewuser ${MY_USER} -1 /bin/bash ${MY_HOME_DIR} ${MY_USER} +} + +src_prepare() { + if ! use docker-build; then + mkdir -p src/${EGO_PN%/*}/out/docker || die + cp "${DISTDIR}"/${P}-prebuilt-x86_64.tar.xz src/${EGO_PN%/*}/out/docker/prebuilt-x86_64.tar.xz || die + cp "${DISTDIR}"/${P}-prebuilt-arm.tar.xz src/${EGO_PN%/*}/out/docker/prebuilt-arm.tar.xz || die + else + einfo "You need to have docker running on your system during build time" + einfo "$(docker info)" + fi + + epatch "${FILESDIR}/0001-fix-Makefile-1.11.1.patch" + local arch="$(usev amd64)$(usev x86)$(usev arm)$(usev arm64)" + + sed -i -E \ + -e "s/@@VERSION@@/${MY_PV}/" \ + -e "s/@@REVISION@@/${MY_GIT_HASH}/" \ + -e "s/@@BRANCH@@/${MY_BRANCH}/" \ + -e "s|@@OSARCH@@|linux/${arch}|" \ + src/gitlab.com/gitlab-org/${PN}/Makefile + + eapply_user +} + +src_compile() { + emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} build +} + +src_install() { + golang-build_src_install + dobin bin/* + dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG.md + + # set up dirs + # here be the builds + diropts -m755 + dodir ${MY_HOME_DIR} + + # here be my home and my castle + local conf="/etc/gitlab-runner" + diropts -m750 + dodir ${conf} + + dosym ${conf} ${MY_HOME_DIR}/.gitlab-runner + + # fix permissions + fowners -R ${MY_USER}:${MY_USER} ${MY_HOME_DIR} ${conf} + + # rc script + local rcscript="${PN}.init" + + cp "${FILESDIR}/${rcscript}" "${T}" || die + sed -i \ + -e "s|@USER@|${MY_USER}|" \ + -e "s|@HOME@|${MY_HOME_DIR}|" \ + "${T}/${rcscript}" \ + || die "failed to filter ${rcscript}" + + newinitd "${T}/${rcscript}" "${PN}" + newconfd "${FILESDIR}/${PN}.conf" "${PN}" +} + +pkg_postinst() { + elog + elog "If this is a fresh install of GitLab CI Multi Runner, please configure it" + elog "with the following command:" + elog " emerge --config \"=${CATEGORY}/${PF}\"" +} + +pkg_config() { + einfo "You need to register the runner with your GitLab CI instance. Please" + einfo "Follow the instructions at" + einfo + einfo "https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/install/linux-manually.md" + einfo + einfo "Perhaps I'll improve the ebuild later ... kthxbye." +} From b260e3f36b115550a5e85f9ab9b7a68443b7fb17 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 28 Mar 2017 11:37:12 +0200 Subject: [PATCH 5/7] Revert "dev-vcs/gitlab-ci-multi-runner:" This reverts commit 997c30f16a78d2160eee5a70f983e0a13baa07e3. --- dev-vcs/gitlab-ci-multi-runner/ChangeLog | 8 -- dev-vcs/gitlab-ci-multi-runner/Manifest | 7 +- .../files/0001-fix-Makefile-9.0.0.patch | 70 ----------- .../gitlab-ci-multi-runner-9.0.0_rc2.ebuild | 119 ------------------ 4 files changed, 1 insertion(+), 203 deletions(-) delete mode 100644 dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-9.0.0.patch delete mode 100644 dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.0.0_rc2.ebuild diff --git a/dev-vcs/gitlab-ci-multi-runner/ChangeLog b/dev-vcs/gitlab-ci-multi-runner/ChangeLog index b256027..7f2a75f 100644 --- a/dev-vcs/gitlab-ci-multi-runner/ChangeLog +++ b/dev-vcs/gitlab-ci-multi-runner/ChangeLog @@ -1,11 +1,3 @@ -*gitlab-ci-multi-runner-9.0.0_rc2 (19 Mar 2017) - - 19 Mar 2017; Manuel Friedli - +files/0001-fix-Makefile-9.0.0.patch, - +gitlab-ci-multi-runner-9.0.0_rc2.ebuild: - dev-vcs/gitlab-ci-multi-runner: Added preliminary ebuild for gitlab-ci- - multi-runner-9.0.0_rc2. It still needs some love and doesn't even compile yet. - *gitlab-ci-multi-runner-1.11.1 (16 Mar 2017) 16 Mar 2017; Manuel Friedli diff --git a/dev-vcs/gitlab-ci-multi-runner/Manifest b/dev-vcs/gitlab-ci-multi-runner/Manifest index 3986836..4c3d99a 100644 --- a/dev-vcs/gitlab-ci-multi-runner/Manifest +++ b/dev-vcs/gitlab-ci-multi-runner/Manifest @@ -1,7 +1,6 @@ AUX 0001-fix-Makefile-1.10.4.patch 3308 SHA256 c87a85a704ee054f85343d01e187933e67a6cca989adcf686a6f16a37406340d SHA512 bcd746a39997287334a77847322f11cbdc55c790540061f3bc9d9ac60ddc19683abf431e558c3e1a033f3ac3b5de0404da8ab82d2a3c254a214c1e0e80bfd76d WHIRLPOOL 71ec341a2e79a431062eb99c96bb2c7286858417e62c10082af48d5cd90de88a0eefd91a2bdda351e0bdbceea7452b79e88f83d566a79432c45ceaea5b7476c9 AUX 0001-fix-Makefile-1.11.1.patch 3376 SHA256 1c8123815ed8df86942b4cfd11b8c91e7a08945664e97df11b6f34cc583a093e SHA512 2bb4dd17cd47f85799932e09294244d899361b152ff47b0883c985b989b1c222a0bec8090e7692d1eea0655969883fad400d0c5a68c07dde0cefe67f6775654d WHIRLPOOL da952b735599208091b028aaf3b32077c63e24c4796226975b22aef7c57bb7d1b2872a96b21ce877bdf46b761295b6e602a5eacdb7e3c4e58c07b34801f650e7 AUX 0001-fix-Makefile-1.8.0.patch 3281 SHA256 70db95de830679916f1a0c446a5eb42ebdc77446d2a46e31f919107ea452d0a0 SHA512 d73db4e0122741da7bd7be9fd5a2b36c4aaeb0b3b0789604cefe1e98a613c0e5141299d7764b694080ccd8ff9094e8f0b134c950339e2f4ced31d8851f2fe63f WHIRLPOOL 24a3459cf882281b57bfbfb8471fc0f6ce1d0630ecd360d1fd813663f35a500f9f3cc826b89df0069d62d23f6d8cf0d0405254e967fc4c2eba0abf635f5da29b -AUX 0001-fix-Makefile-9.0.0.patch 3376 SHA256 1c8123815ed8df86942b4cfd11b8c91e7a08945664e97df11b6f34cc583a093e SHA512 2bb4dd17cd47f85799932e09294244d899361b152ff47b0883c985b989b1c222a0bec8090e7692d1eea0655969883fad400d0c5a68c07dde0cefe67f6775654d WHIRLPOOL da952b735599208091b028aaf3b32077c63e24c4796226975b22aef7c57bb7d1b2872a96b21ce877bdf46b761295b6e602a5eacdb7e3c4e58c07b34801f650e7 AUX 0001-fix-Makefile.patch 3401 SHA256 d764379ad6b027eaab6e6f8a3874befad9567e5114caa247843d9abad29bf10e SHA512 12a44684aa05df41dea29e66bf42ec6a6b40f06b1a9c8a2682c5ce7a62264b1135df3a69f98cd9bf10bc05da062c61cfa02f803226d022ed9ebaf0bf6469449b WHIRLPOOL cdab4d9382f522ef136e77eeb38c7532172bc538e95254c4e57dfdf9b277d10f469211350994a228529142dc07d04f1df89a81acac01665ca2c9c9961f7da65a AUX gitlab-ci-multi-runner.conf 44 SHA256 0b93ba53d557fbf603b50f6d78eb2c4415b9a79f056142b6edf4a63fc6612d6e SHA512 1f5ff480740b18fc985ae9337b8dc4ddd1bde5253e09042b5542cb9a3db54b9cef1f7b24445c829eb83fcfd8751b693018154f6b97ce0a6e723d5d71d9a27429 WHIRLPOOL fc5218c55917b3303baf649fbafaf1dc50cf52d0ee04852716defe4f21b806f4f313071b1c55920d89da66180405d35da0f7cca73c2617b70bcaa67f725cab2a AUX gitlab-ci-multi-runner.init 662 SHA256 faf47cdc02b78527d98cd044f2d2aed38a44e39fc6aa5ccc6249c6bce7b979b2 SHA512 9a2f6bcac4c1b992aa5f046cc2cf8f379d2b1f5b6d8065793996828be1527fb5e9131b2967131c292003319f2b27c0cb1229a147236279027e11d13f73e9bd76 WHIRLPOOL 7ffb5d25cb5bd66459981fb71a79d4690b1efaff41e5873431b8ec9cae62783c9fb71ea426a0a1d8f0bf9fdd7dbcb569136dc38f7736296565258a0dcfa3536f @@ -20,14 +19,10 @@ DIST gitlab-ci-multi-runner-1.8.0.tar.gz 3541906 SHA256 0636134f34fd03b1e1407374 DIST gitlab-ci-multi-runner-1.9.2-prebuilt-arm.tar.xz 16002708 SHA256 c4f7297865fafa4e7841e513a26b334cf9f29ad6d7ec4b12381d6031fa6f9648 SHA512 e1d905048bbfb1415f93a443e457ae47cd7f969eeae82f6dc5bcbdce37e2aa4219a97b97080c8b7767523490017cd8ec0fbf681375e27348e87c4d230db844ae WHIRLPOOL 0b76317c29b81dd53c7ae4c2b9f6bcdc7bcb28e6d5101a45f8c4eccf11259e88f2eac7751e84e6f5b3e91298e32980cabd1a1fd07c0cc260dfdde9e479f9c116 DIST gitlab-ci-multi-runner-1.9.2-prebuilt-x86_64.tar.xz 8717016 SHA256 7d0759dd04f930a231c1a713d8e44a149666112ff1d841c5173847a373496278 SHA512 aaf1b859dd353bca3810ebb85dca0fadbf7f728b262ef00f6a793e9eaf100a05466f26a8bd55acc0270876e5725519941f6086bb375d9f9285fce7f5bf66351c WHIRLPOOL 7e5af9b63feb36ba4e09b12faaa05cb31b453f8f98ded396005429db1f392cb370c75f0c9ddfc07e169cf77f9dceb4abac5abd195a30e2a3ccb03819275f55a5 DIST gitlab-ci-multi-runner-1.9.2.tar.gz 3563622 SHA256 ed480b29f5dd305758e1158a7a2d60ad892bf3b39fc48903861b241c7391e920 SHA512 7721cc80cd9abaf5ab44f53836e7718eb2df360cea378f4898ef6e9d6b671a09df1e69b70ac99ed8c6c042af9da6415e614db52b5c1e9476bbfe72e146628f04 WHIRLPOOL accb7458dd7ce1334e66f76ed90d970c5e6974505a2376a3e0c9e42d7169986aa18ed9dc64f11dac1366b42b4efddd18e1baa072d4f56e57d3a6c6300ee1f3bb -DIST gitlab-ci-multi-runner-9.0.0_rc2-prebuilt-arm.tar.xz 8671408 SHA256 14cb54459f83caf053bcdd5a9299d6fc654d215eab46412b2a351f431861500f SHA512 4bd279f6a7394fa0b2bf6e25e041a8f85e4062242ebc801e06c9e0ee225c9a6ee7be8154f52c13a1058da1ace4e5113cbd6cc26838b0036f55046aaefde8bf64 WHIRLPOOL 408bcf6465a9e72a6946914ca62513fb0e14e248c2bcf95525745bc7fd37615d3a6fa05a766d75d6d03f3dafe779d97c1f19ce7b258b95938d2a9f98a152084c -DIST gitlab-ci-multi-runner-9.0.0_rc2-prebuilt-x86_64.tar.xz 8317360 SHA256 0e8877cab24e6dc91363950a388a34391f30caffc958416beae8771d72ee4b13 SHA512 b7e31b75cafece202f285927fc9c54a6bfe7ded7cec0febcd0f22f9d7c2097f94f3380a8a860e359ca6f02785f5719d191514ff0090512e5d4a12986d3dc349a WHIRLPOOL 8c104dd91bc6428fb30693401145969df44adf5d28bcf7f658b9d1206d3bcc596e9a71771e0b83fc04caafd9dc642e4547c2e4b51df5e64a4ec99f1d195b3fad -DIST gitlab-ci-multi-runner-9.0.0_rc2.tar.gz 3140263 SHA256 09f4d370dbcfe9b54acd8679733a4e6cebe43808c205a5159a71a7db372c0f30 SHA512 b4e5aa5784beb5cdcde1b3f8cdcb1aff1171bd3ca4fd76e8fb5059ea62ebbb930c98efc148cb496ddcf635ecfce7bfeefd2c6fb6f33defde3e574a59194c90ab WHIRLPOOL 181ee8c02ef17e2034a0454af37c44198bbc950cf96f61a628a56469e4b375970db55b58c8ed3aeb39e2be75a393e1f923d90389a610b06ed6761dbd7145c33c EBUILD gitlab-ci-multi-runner-1.10.4.ebuild 3266 SHA256 403a1b8eafa8bc74582cbdf7cd90b9c18ee72e1a386bae07fecb6adfcd56fece SHA512 802c5fafcdf7b997115bf70c01b168499bfd1b0cf78195a414ccb0ca1c5f58da3eeb5c8eb3d1960b049b0509e92682e13dac7a80549bf5f9f7c818d0f931ffd0 WHIRLPOOL 616be2cfd835f9912f0698321a230b2d242251556a519541dea18b9673f3b84d32d4095104d5620d326dc5db7934a9c222ca1d92cc157bcca341dd5862f03723 EBUILD gitlab-ci-multi-runner-1.11.1.ebuild 3267 SHA256 a63c1a0112653c298ed03bda0108d013563dbf70399628c48106af4a2564aa66 SHA512 65ca42ea46321ee37fc9e5683c923c0f1f3670d79c1ea9ec3b876de8962ef665c66bf38d19462981f689b3db3b4c46d1bef58dce0bab20c39ad30009db3a6ebe WHIRLPOOL bdf42cc264767ccbbbbda661edb61529d60951f8774a001cfea3900c670ff3310747fa86b1fd588e39d14851d018fa9d5a7fc1973e37e1a7a85489b5d5f69fc5 EBUILD gitlab-ci-multi-runner-1.7.0.ebuild 3250 SHA256 fc9f976619ff9ddedaceee812dd2babcb1fb7d7236868368d23a5b67b60bd08b SHA512 276835a37b5be71c8663f92bb093c568ecdcae69d45a88a9ce3ccf896cefd3d59a7f8bfce43eed7de72744e4a60b110b8ca9ae8c2fed94f62c0da475e5c40a50 WHIRLPOOL cc4796822e8443f81f958c8fa39475fb1b168ca06b7e8c38f148b91b77da033c1113c88dd818aaf14265ea07ade5de367235168cdf6e2ccb276ffd45538e9812 EBUILD gitlab-ci-multi-runner-1.8.0.ebuild 3258 SHA256 d54d70f365868526144decb5671c834bf259d8b8659ec57a8ed9cd55cb6589da SHA512 7023a29d0615b986ef6d0fb0f2ca3ba9f0c0cca095b739cb7da63eb13cb4bee413978807032a674bd5876da9eda198a8fbb11be44c5fe43099e8e98148524b10 WHIRLPOOL c77aaa33c1d24a278cf53d63aa54052c5bddc5c671d2189457b209dcd8a8bf4c911f50be6478c613ba111a709f500f2fb4ba98399fc78a5ece897c852b79d4a4 EBUILD gitlab-ci-multi-runner-1.9.2.ebuild 3258 SHA256 2d753e9effbba47ddce697875a94572ea44a866fd4988924d38c5f3e87030f14 SHA512 7e691285841aad5fd200e83ed039cf24f3185d18d4b55545f2f325b9fbb6affc30e54ec1aa104799d3cdbfbdbfc4ad96c481485e8f5ce40753ad17b4dc5084d9 WHIRLPOOL 6b00e7b8446c6b78502f2fca6dcf752273245a8a71830fb968a286ae6cf1f0029285a547e0c568ae668315006a39cf9880e0db384504f428538c4810e11805f6 -EBUILD gitlab-ci-multi-runner-9.0.0_rc2.ebuild 3314 SHA256 0e608a0925fdca1116eca9fc6355fdc930770223dc1779884b66fb7b55cb0d41 SHA512 03dc52b488b6173e32610c3a8dfeb860edbf9b7336f532f9f8c407889f9e2afdf42a7b336d2b3a173172d6f57c3c5e67a73b10bf171dcf3c05bb5d3c399a25e3 WHIRLPOOL 4fb8d064b6a81b126f558946125e8cb96f2d54a74601819305fa012ace75674292164bd949679509d4bbb3fa9f63819fe76b361db429ebe2ed63efb394dda024 -MISC ChangeLog 1869 SHA256 0548d0cac95fbaddfed475355f791128f07270c8e6812745ad8a4c1360addd7e SHA512 cf5495ad836bd6b623daee529711e98a900f7756857cc55d83c364d3fdd448d0fa880edb94b20a2f9be29f0d39c85ead90452a81a871af2facd1f956cfd16abc WHIRLPOOL 306973a7d309ff80d6a0d0484ae493baebc97b74db6cc02c0a6a6f55f19d4fa2cdf7a6b6664f41c78e9a888bfeda95c884a916dc799b220305a5fe4cafa89795 +MISC ChangeLog 1527 SHA256 f69fb48fa08aff1dc4e751af5dc0035289aaf39c4fb4511b680a938a30bbc311 SHA512 e94da9dd3a9cadf9461e3536a1ea632b16e5704735f30fa47da08652c7bada1d6d0823dde5cdeffeef0787a8ec6a8fe357b841cb4a59e9c345702c113a4a0f10 WHIRLPOOL 50cbf5c714f6a4dc8203a588095e9540157ef3f8d9e406910b93cdc46402bfbdf76a0e5f23e90d4fb25142a222b4c95004c893657d7e73cb3fedeeb0dcd2fe57 MISC metadata.xml 329 SHA256 f0ae08a64aa32a07486e744ce11ac5448770b7320454015bcd065e312fcb5e9c SHA512 11e4eaf25633c5979e5243350bdf2ddc6d9dca06ab54ec38359591f1d002ea2a224e53b3e6c4ac53b5b2e795a87769fdbd97c547b008272e0a1491141f422e5d WHIRLPOOL ab2c1cb3d9aff1f757b49633f94d4b98da4b83dadab12ab8d869f9e1f6763b3125010147472e58e910e7fc42da262dbd69a1bf3939f3720a79ab4329184b4c35 diff --git a/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-9.0.0.patch b/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-9.0.0.patch deleted file mode 100644 index 53fca69..0000000 --- a/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-9.0.0.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile b/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile -index b300c5e..8b05931 100644 ---- a/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile -+++ b/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile -@@ -1,30 +1,21 @@ - NAME ?= gitlab-ci-multi-runner - PACKAGE_NAME ?= $(NAME) - PACKAGE_CONFLICT ?= $(PACKAGE_NAME)-beta --export VERSION := $(shell ./ci/version) --REVISION := $(shell git rev-parse --short HEAD || echo unknown) --BRANCH := $(shell git show-ref | grep "$(REVISION)" | grep -v HEAD | awk '{print $$2}' | sed 's|refs/remotes/origin/||' | sed 's|refs/heads/||' | sort | head -n 1) -+export VERSION := @@VERSION@@ -+REVISION := @@REVISION@@ -+BRANCH := @@BRANCH@@ - BUILT := $(shell date +%Y-%m-%dT%H:%M:%S%:z) - --LATEST_STABLE_TAG := $(shell git -c versionsort.prereleaseSuffix="-rc" -c versionsort.prereleaseSuffix="-RC" tag -l "v*.*.*" --sort=-v:refname | awk '!/rc/' | head -n 1) --export IS_LATEST := --ifeq ($(shell git describe --exact-match --match $(LATEST_STABLE_TAG) >/dev/null 2>&1; echo $$?), 0) - export IS_LATEST := true --endif - - PACKAGE_CLOUD ?= ayufan/gitlab-ci-multi-runner - PACKAGE_CLOUD_URL ?= https://packagecloud.io/ --BUILD_PLATFORMS ?= -os '!netbsd' -os '!openbsd' -+BUILD_PLATFORMS ?= -osarch '@@OSARCH@@' - S3_UPLOAD_PATH ?= master --DEB_PLATFORMS ?= debian/wheezy debian/jessie debian/stretch debian/buster \ -- ubuntu/precise ubuntu/trusty ubuntu/utopic ubuntu/vivid ubuntu/wily ubuntu/xenial ubuntu/yakkety ubuntu/zesty \ -- raspbian/wheezy raspbian/jessie raspbian/stretch raspbian/buster \ -- linuxmint/petra linuxmint/qiana linuxmint/rebecca linuxmint/rafaela linuxmint/rosa linuxmint/sarah linuxmint/serena --DEB_ARCHS ?= amd64 i386 armel armhf --RPM_PLATFORMS ?= el/6 el/7 \ -- ol/6 ol/7 \ -- fedora/20 fedora/21 fedora/22 fedora/23 fedora/24 fedora/25 --RPM_ARCHS ?= x86_64 i686 arm armhf -+DEB_PLATFORMS ?= debian/wheezy -+DEB_ARCHS ?= amd64 -+RPM_PLATFORMS ?= fedora/25 -+RPM_ARCHS ?= x86_64 - COMMON_PACKAGE_NAMESPACE=$(shell go list ./common) - - # Packages in vendor/ are included in ./... -@@ -77,7 +68,7 @@ verify: fmt vet lint complexity test - deps: - # Installing dependencies... - go get -u github.com/golang/lint/golint -- go get github.com/mitchellh/gox -+ go get github.com/fritteli/gox - go get golang.org/x/tools/cmd/cover - go get github.com/fzipp/gocyclo - go get -u github.com/jteeuwen/go-bindata/... -@@ -108,7 +99,7 @@ else - $(warning WARNING: and remove out/docker/prebuilt-x86_64.tar.xz) - $(warning =============================================) - curl -o out/docker/prebuilt-x86_64.tar.xz \ -- https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-x86_64.tar.xz -+ https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/$(VERSION)/docker/prebuilt-x86_64.tar.xz - endif - - out/docker/prebuilt-arm.tar.xz: $(GO_FILES) -@@ -136,7 +127,7 @@ else - $(warning WARNING: and remove out/docker/prebuilt-arm.tar.xz) - $(warning =============================================) - curl -o out/docker/prebuilt-arm.tar.xz \ -- https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-arm.tar.xz -+ https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/$(VERSION)/docker/prebuilt-arm.tar.xz - endif - - executors/docker/bindata.go: out/docker/prebuilt-x86_64.tar.xz out/docker/prebuilt-arm.tar.xz diff --git a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.0.0_rc2.ebuild b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.0.0_rc2.ebuild deleted file mode 100644 index 25630d8..0000000 --- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.0.0_rc2.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit eutils golang-build golang-vcs-snapshot user - -EGO_PN="gitlab.com/gitlab-org/gitlab-ci-multi-runner/..." - -MY_PV="${PV/_/-}" -MY_PV="v${MY_PV/-rc/-rc.}" -#MY_BRANCH="9-0-stable" -MY_BRANCH="master" -MY_GIT_HASH="0f9ba5fc" - -DESCRIPTION="Official GitLab CI Runner written in Go" -HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner" -SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz - !docker-build? ( - https://${PN}-downloads.s3.amazonaws.com/${MY_PV}/docker/prebuilt-x86_64.tar.xz -> ${P}-prebuilt-x86_64.tar.xz - https://${PN}-downloads.s3.amazonaws.com/${MY_PV}/docker/prebuilt-arm.tar.xz -> ${P}-prebuilt-arm.tar.xz - )" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/${PVR}" -IUSE="docker-build" - -DEPEND=">=dev-go/gox-0.3.1_alpha - >=dev-go/go-bindata-0_pre20151023 - docker-build? ( >=app-emulation/docker-1.5 ) - !dev-vcs/gitlab-ci-multi-runner-bin" - -RESTRICT="test mirror" - -MY_USER="gitlab_ci_multi_runner" -MY_HOME_DIR="/opt/gitlab-ci-multi-runner" - -pkg_setup() { - enewgroup ${MY_USER} - enewuser ${MY_USER} -1 /bin/bash ${MY_HOME_DIR} ${MY_USER} -} - -src_prepare() { - if ! use docker-build; then - mkdir -p src/${EGO_PN%/*}/out/docker || die - cp "${DISTDIR}"/${P}-prebuilt-x86_64.tar.xz src/${EGO_PN%/*}/out/docker/prebuilt-x86_64.tar.xz || die - cp "${DISTDIR}"/${P}-prebuilt-arm.tar.xz src/${EGO_PN%/*}/out/docker/prebuilt-arm.tar.xz || die - else - einfo "You need to have docker running on your system during build time" - einfo "$(docker info)" - fi - - epatch "${FILESDIR}/0001-fix-Makefile-1.11.1.patch" - local arch="$(usev amd64)$(usev x86)$(usev arm)$(usev arm64)" - - sed -i -E \ - -e "s/@@VERSION@@/${MY_PV}/" \ - -e "s/@@REVISION@@/${MY_GIT_HASH}/" \ - -e "s/@@BRANCH@@/${MY_BRANCH}/" \ - -e "s|@@OSARCH@@|linux/${arch}|" \ - src/gitlab.com/gitlab-org/${PN}/Makefile - - eapply_user -} - -src_compile() { - emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} build -} - -src_install() { - golang-build_src_install - dobin bin/* - dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG.md - - # set up dirs - # here be the builds - diropts -m755 - dodir ${MY_HOME_DIR} - - # here be my home and my castle - local conf="/etc/gitlab-runner" - diropts -m750 - dodir ${conf} - - dosym ${conf} ${MY_HOME_DIR}/.gitlab-runner - - # fix permissions - fowners -R ${MY_USER}:${MY_USER} ${MY_HOME_DIR} ${conf} - - # rc script - local rcscript="${PN}.init" - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - -e "s|@HOME@|${MY_HOME_DIR}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${PN}" - newconfd "${FILESDIR}/${PN}.conf" "${PN}" -} - -pkg_postinst() { - elog - elog "If this is a fresh install of GitLab CI Multi Runner, please configure it" - elog "with the following command:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" -} - -pkg_config() { - einfo "You need to register the runner with your GitLab CI instance. Please" - einfo "Follow the instructions at" - einfo - einfo "https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/install/linux-manually.md" - einfo - einfo "Perhaps I'll improve the ebuild later ... kthxbye." -} From ea8632d0d8f24b3ae91b536d28ac7e997d94c96f Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 28 Mar 2017 11:37:25 +0200 Subject: [PATCH 6/7] Revert "dev-go/gax-go:" This reverts commit 1a82c72d5685bc953610f38a74d5a9400edf6760. --- dev-go/gax-go/ChangeLog | 6 ------ dev-go/gax-go/Manifest | 4 ---- dev-go/gax-go/gax-go-0_pre20170306.ebuild | 24 ----------------------- dev-go/gax-go/metadata.xml | 8 -------- 4 files changed, 42 deletions(-) delete mode 100644 dev-go/gax-go/ChangeLog delete mode 100644 dev-go/gax-go/Manifest delete mode 100644 dev-go/gax-go/gax-go-0_pre20170306.ebuild delete mode 100644 dev-go/gax-go/metadata.xml diff --git a/dev-go/gax-go/ChangeLog b/dev-go/gax-go/ChangeLog deleted file mode 100644 index 1547446..0000000 --- a/dev-go/gax-go/ChangeLog +++ /dev/null @@ -1,6 +0,0 @@ -*gax-go-0_pre20170306 (19 Mar 2017) - - 19 Mar 2017; Manuel Friedli +gax-go-0_pre20170306.ebuild, - +metadata.xml: - dev-go/gax-go: Added ebuild for gax-go, a dependency of gitlab-ci-multi- - runner-9.0.0_rc2 diff --git a/dev-go/gax-go/Manifest b/dev-go/gax-go/Manifest deleted file mode 100644 index 718752f..0000000 --- a/dev-go/gax-go/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST gax-go-0_pre20170306.tar.gz 9958 SHA256 61c9719e97469e24797a3549ad31892a3584253231ee870e314e87d6b549bd75 SHA512 174643d82d8d013d520c2d2c093939f6561948102489d61130521a1763c66831a2b1438ab83a6b2ac86106cef6955d09f17f51a9a71b430fb1f9557ffa54b850 WHIRLPOOL c411aa52762e9a542a983c6317898204041623ccbaab8eef006b771b1cf91ecc2213219ee9ea5b447086feb30d9630633df090bebb2ccb70718485a5c63168ac -EBUILD gax-go-0_pre20170306.ebuild 595 SHA256 24c5141e6880ac3a5d0fd96838e5aef5e2f3e39604b0d2b923dd72ad5c1435e1 SHA512 4fe31489242ab76af5f364e53ae2cab2537057d113368aeffa5b7ade2aead15e162ff1d475c9da202959d1397657852e5c255b4067dc19459bb22619c8d416d3 WHIRLPOOL a590d470426b565f87fd8598687b1886f40b5469452165bb10b67fc98a3af3e0e162b73b4a3b367eb0c6389d0976338ad05ff94af5c01c9cf7a74a0e0db9a8bd -MISC ChangeLog 231 SHA256 fc510eaa050bb503a4bf0d0fcc79eb1e3f4e6107418f749562cf9cc43304e86e SHA512 1c000422ab0f73915f3fe64d1c3858e33ddd6fc7ea988a3c14179c50ad1a975cb4b7db3fead8263a61bc49c727bc068a4b5dd4dfedbe2ea6f190a23ff367ed17 WHIRLPOOL 2a6fdedd0735f762c6e231eff505ed57b65ebd025423b99b981ddd552f001ce8678d8a01aa53cb8e129f4e78e7f5bd04703efa0168ab04123e0201a5673ab195 -MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/dev-go/gax-go/gax-go-0_pre20170306.ebuild b/dev-go/gax-go/gax-go-0_pre20170306.ebuild deleted file mode 100644 index de11df5..0000000 --- a/dev-go/gax-go/gax-go-0_pre20170306.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit golang-build golang-vcs-snapshot - -EGO_PN="github.com/googleapis/gax-go/..." -EGIT_COMMIT="8c5154c0fe5bf18cf649634d4c6df50897a32751" -ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~arm" - -DESCRIPTION="Google API Extensions for Go" -HOMEPAGE="https://github.com/googleapis/gax-go" -SRC_URI="${ARCHIVE_URI}" -LICENSE="BSD" -SLOT="0/${PVR}" -IUSE="" -DEPEND=" - dev-go/go-net" - -src_install() { - golang-build_src_install - dobin bin/* -} diff --git a/dev-go/gax-go/metadata.xml b/dev-go/gax-go/metadata.xml deleted file mode 100644 index 67a771c..0000000 --- a/dev-go/gax-go/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - manuel@fritteli.ch - Manuel Friedli - - From 2f8fa80d02e00c8ce5901f2e7a9d5e3839793939 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 28 Mar 2017 14:37:43 +0200 Subject: [PATCH 7/7] www-apps/gitlab-ce: Added ebuild for Gitlab CE 9.0.0, dropping the ~arm keyword due to the dependency to yarn, which is not available on unstable arm. Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- www-apps/gitlab-ce/ChangeLog | 6 + www-apps/gitlab-ce/Manifest | 4 +- www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild | 420 ++++++++++++++++++++++ 3 files changed, 429 insertions(+), 1 deletion(-) create mode 100644 www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog index 7b75535..202d72d 100644 --- a/www-apps/gitlab-ce/ChangeLog +++ b/www-apps/gitlab-ce/ChangeLog @@ -1,3 +1,9 @@ +*gitlab-ce-9.0.0 (28 Mar 2017) + + 28 Mar 2017; Manuel Friedli +gitlab-ce-9.0.0.ebuild: + www-apps/gitlab-ce: Added ebuild for Gitlab CE 9.0.0, dropping the ~arm + keyword due to the dependency to yarn, which is not available on unstable arm. + 19 Mar 2017; Manuel Friedli gitlab-ce-9.0.0_rc4.ebuild, gitlab-ce-9999.ebuild: www-apps/gitlab-ce: Updated ebuild for gitlab-ce-9999 and also cleaned diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index f28e2a1..dde7db5 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -23,6 +23,7 @@ DIST gitlab-ce-8.16.6.tar.gz 20901900 SHA256 5b88dd855afc44da2b8f059056321fc0dd4 DIST gitlab-ce-8.17.0.tar.gz 22991847 SHA256 3883c2e505e511f83072f950b9d211783148b97e29f34144e57c8b180d7f4518 SHA512 e0ee1b1ab21a6ad262cccbb2abf544ccb18dafcaf61e83aa02bac0182bdd35a47a725741382876f3bb79f6f42764c59b7a992c16a916a1673a716417b34d8a87 WHIRLPOOL fe3c36e41d0fe3c3420a3e52dc61fc30f424d2832cd82587a6e50b6c6450ee9e99bb2897f87cc949b4663055a35e159cf7b6f471b6aa9046c6bb8b1fae526ab7 DIST gitlab-ce-8.17.2.tar.gz 22995277 SHA256 6819b8e289b7c23ee1880d935f443bb63896e45f62e2d203dfd87f9b8f90d3ae SHA512 b66b3ee0233641aee27d6cd1748069df8b7a705414f7e5b41875d861f425382f4a7f31639219660db1811fdd0e0655526f7760fb49b4847efb486b37ced11205 WHIRLPOOL ab8c986a08c5cf86b5d4a3a56059827b6c1e561c7c76e72ba3433c589bd3514177019db587eee68aadc1ac0ed8b748e813ccdc2fea3fae9b773979e7829562d0 DIST gitlab-ce-8.17.3.tar.gz 22821238 SHA256 85299a2e10e57ae988483d1a10503e17703d767f6b757f8b07093f0011c58fe5 SHA512 3d73d2b7d48237777871c0c062e8568e083389fae9ba75a0b648bb96ae638e6f4d1f9f0bddc6ab15c5ba21b5d92da792b0fdb83b94cb89b95824a0c937a32de8 WHIRLPOOL 8532172fd004d9b7831299ebcaa165eabbc732af21ace334f903a894ffd673b078be423f13de1734b1170f5e5c4b104847ae27a11d12802048dab1ba77b755b2 +DIST gitlab-ce-9.0.0.tar.gz 26260333 SHA256 73012a8d31b2d92a49f0957c78525069e11d5d7bf19ca67bcbabd44b37c8c36a SHA512 b8a48bf538691d0bb1b636f4be6b71010583b4784093ec5f5b3196bebeefd9e7fcfc05cfd48523eb2139ff9e0bd458e20e8174d8c8892cb510d55c2fb154ee32 WHIRLPOOL 5d10e6fed7a9de5db7513afaf29940cadf41a37397249a78b2f3dc0aadde25f73e9f4eb3d18f913c8ad13cbdfecec811cf2246c2ef377017dfe3f021b09a2125 DIST gitlab-ce-9.0.0_rc4.tar.gz 26270878 SHA256 f47ddcf6f4f0336228dd1ef03085c9ea6116157887e8216038d23b69cf7a4d89 SHA512 f4694ebf4ffe38e6c5495f3658eb8003d28b3ac5d67f4533ddc1932afca412a40ea786cd8d99e2891fdf9bacd7b198b29493b97d6d02455d4f4139d4e60a0d63 WHIRLPOOL 81f47820043445e9ff69ae0ad3bcd1e094ab1e3527eec279096ae16a767cec5451b2d94af4dd87cd2939eb2e64368a1a0e543ce40e0e9fd5a716eeef04741c54 EBUILD gitlab-ce-8.15.4.ebuild 11982 SHA256 db794f18bc0d023a8b6adf49b82c2e37fd38b7206b064a7700289c0cfa16961c SHA512 ca30780d28ffc0242ac5f6ccad178cc44464a81f2d44cb13e53ddf06700d0f39b9fee9b77e356735435079b34090049d50d9019af71e92d6d8faaf3767a39dc5 WHIRLPOOL 42ee8b8e5a2c6fba69ecdbf6e306a87f369fa193f721c73481edc744953bfd210cb4495bc603ba01566efb2b0869ec71284a1f1b1c34d1a124bd08546829ca37 EBUILD gitlab-ce-8.15.7.ebuild 11982 SHA256 fab225a8a8a9373898b5c604ce41ed65c4648c46131798315df833326b006fb7 SHA512 ea17dc9927336aed09ba21e0e1c9c4df2998f941a05ff30e9ef9951b5318bcdfb1d332fa8d285a27f26356a9fa9a5f72da45882ab8edbfa6046ec96764dae47f WHIRLPOOL d51629d3c67f8be2636a2e5cb4bb4d4a7b0402394f47aaa01fc182c29f1d3ee916a2d5bb8086bbe871f41294e348ec024d81a775ba9c30028d8b97d93d637620 @@ -32,7 +33,8 @@ EBUILD gitlab-ce-8.16.6.ebuild 11982 SHA256 2cc7b8f06153f28ebcc34a5ff8e24be79168 EBUILD gitlab-ce-8.17.0.ebuild 12831 SHA256 9556fe5712044ebe473b7ff8b847a4daa5ca1818a0ac714f22afc5725199da72 SHA512 4aaa00f4eac87a4bbe598cde792997e25b137eea9fdaf7e7c8394ec5e2abc54302ed5432efe1c7055dc195ca2599f9027463480c943f108bb399daa2eee833f5 WHIRLPOOL aec29db1dc7236f60d2723ec97444fa437a4f8b3092cbf53305f3cddbb6851a40b1a77a306daf4c9780ffe9a8eed760c580371bf95da66b18d884a32c3e48cd5 EBUILD gitlab-ce-8.17.2.ebuild 12831 SHA256 b57a4f683a5eafaa5d0149b0256833e329a757ad470e24bba163c57ba841eeeb SHA512 ed84da9ab62d0893b36a2ade744248b663634c5b05b8e8b608d064068c31a3d19a0e4917f932a0a2caee48a8f509359e50cc982c43bd5d1d958343ea5c5637d9 WHIRLPOOL dfb96d29b45adf5d03313fd9dd6cbc39c70a1736272867737f0bf8d429510add4e3fcd77b329690b9393cc506c9387f4342bed001c2bda50901ba9480fe241d5 EBUILD gitlab-ce-8.17.3.ebuild 12928 SHA256 8e79b5c6724ef50b00f1c6eb607af6c4dc44a8ea5a7b2735c016726247043c3e SHA512 7d32ef8db701c1d4570b4071a55e61611f3bbff3f308adee84594c43f4089befc1a8ade8d66f7f36a4f9f6fd0f1f3c8fe6172eda663a5e2bd277646d4e1fdfa7 WHIRLPOOL 36a8c32bddeb51e89da1e314375bec1765e238d4fc1f658a492601b2a46d838993dde921570956e6c43086d9d3e09727b83f99e99168cfe95ef2e4fba6b69e6b +EBUILD gitlab-ce-9.0.0.ebuild 12928 SHA256 55c3b39745547beac38b04d52b1c41caf2965179fa6d23cb0856f886fbe20431 SHA512 1557d9be66a033e1a9e94eb657342035f47f044cc4defd7eff35701554e47372794de5d7e1d1a94aa7ba7355990845ef8ac779aa449f06276ef52cafc9294d55 WHIRLPOOL e665021ba141205db52a8cf4be5a7f38c897967393a6f122fcbe93789008a991bfd2e6ced57873315434183898f21a5f13dc44a662e5cea309fd2f710895235b EBUILD gitlab-ce-9.0.0_rc4.ebuild 12910 SHA256 8851160b4454845fb33ce0b9a9dd3e070bed07d3a0e5c5f753c77b0ef301ded0 SHA512 9d109a3ea8fa7a7bb33440b4b21bf988745c4eefb62b834ad88825f3ffa28881eceaf402ec09241b74d91e778258c1a18daae6c86254625af4f54bf6189b32f2 WHIRLPOOL 67aa480b4cf1209a3d7af3bffb1f7f774bf2c6d18bf40960478e13459813ebb9472adc5aec3b84252157b0c3e74f9e7f74cb0d57395983c02ba4c976ffae106f EBUILD gitlab-ce-9999.ebuild 12869 SHA256 4a1e486e7386aa942bbd22c29457850584dab007b64715fc6f316ce5c98fcaf8 SHA512 ed66b809ca6e04956a9d4f5ef027aa9e174bad5cd80131a30fc34a1011f0221483b6fb52e893394b429d70919fc65496711a9c700c630c2ff31665827912df82 WHIRLPOOL b1b2582dcb1f600f199216c1bb532eac524ff3cce594e052039be29547164557997c65573f943c00240ab0986b0f1c1315602c3a65a0986e9f64a2df1827288e -MISC ChangeLog 15202 SHA256 7c046e4a1eb5758af274515808d274d4bc661347a0816c4eba2d0aa2f37ca6c3 SHA512 f0010ab40b1aa883dda0276e9ed056e8db3a57a51ed5dc9b9072668fead23750f80ed8e9e1518550f3d1d0b1c25908bd73a2fd5440ed15217bc916ad72ba5b4c WHIRLPOOL 7bd06cafa247df448c64bc6f3b02f2c63cb825aa6a2347bef18112f91c007a13457678bf829ac90f5a031af8a329a935459554a87ea9b0fb92631f6c2606dda6 +MISC ChangeLog 15468 SHA256 9b1d58203f8bed64a16e907729532cfa77161c49e3bb0738fe6f658e1366de86 SHA512 9f5197f4738b168864932ea485e2cb7231eb7666c66a7cd9062bcb2e7e13d929c2c9fefbcca4c87554da537d2001419519836517ebf7ab895e799e8b8acf40e4 WHIRLPOOL e2cb644de2d3928ac354fbbb0e4b72a01133c491fcc4b8f85054c359f5ce4a26d4e67db4d91ddcd4212acefddb8d9d1a8ec423f4d009f0ea07013a7ced846b3e MISC metadata.xml 665 SHA256 2a0cd67ad42f0cc6d8b88391cf6e3153a9883dab31aae8227c57c95f3f68890d SHA512 64b8fbae373d0a057f705f64c1d097dbfab893bd585e1db65ccdb06cda9569211c9b63fa168ac8de9f6d512a17759ecd20b54d818d2790a6f4c99d0ca73fddc3 WHIRLPOOL a81b21bb46aad9757a502628033eba546c686b83bbf1d651ecabba273c454cfb64574affc180db8358ced87eb638e8ad13d7c79c4cfb9a31e72c577d21ab433e diff --git a/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild new file mode 100644 index 0000000..54a483a --- /dev/null +++ b/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild @@ -0,0 +1,420 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +# Maintainer notes: +# - This ebuild uses Bundler to download and install all gems in deployment mode +# (i.e. into isolated directory inside application). That's not Gentoo way how +# it should be done, but GitLab has too many dependencies that it will be too +# difficult to maintain them via ebuilds. +# + +USE_RUBY="ruby21 ruby23" + +inherit eutils ruby-ng user systemd + +MY_PV="v${PV/_/-}" +MY_GIT_COMMIT="cf020e66dff606f6ea2d2dbaeb7bef43d446c536" + +GITLAB_PAGES_VERSION="0.4.0" +GITLAB_SHELL_VERSION="5.0.0" +GITLAB_WORKHORSE_VERSION="1.4.1" + +DESCRIPTION="GitLab is a free project and repository management application" +HOMEPAGE="https://about.gitlab.com/" +SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz" +RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}" + +RESTRICT="mirror" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm64" +IUSE="kerberos mysql +postgres +unicorn systemd pages rugged_use_system_libraries" + +## Gems dependencies: +# charlock_holmes dev-libs/icu +# grape, capybara dev-libs/libxml2, dev-libs/libxslt +# rugged dev-util/cmake, virtual/pkgconfig +# json dev-util/ragel +# pygments.rb python 2.7+ +# execjs net-libs/nodejs, or any other JS runtime +# pg dev-db/postgresql +# mysql virtual/mysql +# +GEMS_DEPEND=" + dev-libs/icu + dev-libs/libxml2 + dev-libs/libxslt + dev-util/ragel + >=net-libs/nodejs-4.3.0 + >=sys-apps/yarn-0.17.0 + postgres? ( >=dev-db/postgresql-9.1:* ) + mysql? ( virtual/mysql ) + kerberos? ( virtual/krb5 )" +CDEPEND=" + dev-util/cmake + virtual/pkgconfig" +COMMON_DEPEND=" + ${GEMS_DEPEND} + ~dev-vcs/gitlab-shell-${GITLAB_SHELL_VERSION} + >=dev-vcs/git-2.8.4 + ~dev-vcs/gitlab-workhorse-${GITLAB_WORKHORSE_VERSION} + kerberos? ( !app-crypt/heimdal ) + rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 ) + pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )" +DEPEND=" + ${CDEPEND} + ${COMMON_DEPEND}" +RDEPEND=" + ${COMMON_DEPEND} + >=dev-db/redis-2.8 + virtual/mta + systemd? ( sys-apps/systemd:0= )" +# required bundler >= 1.14.2 +ruby_add_bdepend " + virtual/rubygems + >=dev-ruby/bundler-1.13.7" + +# +# fix-sendmail-config: +# Fix default settings to work with ssmtp that doesn't know '-t' argument. +# fix-redis-config-path: +# Point to the absolute location of redis_config.rb +# +RUBY_PATCHES=( + "01-${PN}-8.7.5-fix-sendmail-config.patch" + "02-${PN}-9.0.0-fix-redis-config-path.patch" + "03-${PN}-8.17.0-database.yml.patch" + "04-${PN}-8.12.7-fix-check-task.patch" + "05-${PN}-9.0.0-replace-sys-filesystem.patch" + "06-${PN}-8.17.0-fix-webpack-config.patch" +) + +MY_NAME="gitlab" +MY_USER="git" # should be same as in gitlab-shell + +DEST_DIR="/opt/${MY_NAME}" +CONF_DIR="/etc/${MY_NAME}" +LOGS_DIR="/var/log/${MY_NAME}" +TEMP_DIR="/var/tmp/${MY_NAME}" + +all_ruby_prepare() { + # fix paths + local satellites_path="${TEMP_DIR}/repo_satellites" + local repos_path=/var/lib/git/repositories + local shell_path=/usr/share/gitlab-shell + sed -i -E \ + -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \ + -e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \ + -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \ + -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \ + config/gitlab.yml.example || die "failed to filter gitlab.yml.example" + + local run_path=/run/${MY_NAME} + sed -i -E \ + -e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \ + -e "s|/home/git/gitlab/log|${LOGS_DIR}|" \ + -e "s|/home/git/gitlab|${DEST_DIR}|" \ + config/unicorn.rb.example || die "failed to filter unicorn.rb.example" + + sed -i \ + -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \ + lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" + + # modify default database settings for PostgreSQL + sed -i -E \ + -e 's|(username:).*|\1 gitlab|' \ + -e 's|(password:).*|\1 gitlab|' \ + -e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \ + config/database.yml.postgresql \ + || die "failed to filter database.yml.postgresql" + + # rename config files + mv config/gitlab.yml.example config/gitlab.yml + mv config/unicorn.rb.example config/unicorn.rb + + local dbconf=config/database.yml + if use postgres && ! use mysql; then + mv ${dbconf}.postgresql ${dbconf} + rm ${dbconf}.mysql + elif use mysql && ! use postgres; then + mv ${dbconf}.mysql ${dbconf} + rm ${dbconf}.postgresql + fi + + # remove useless files + rm -r lib/support/{deploy,init.d} + use unicorn || rm config/unicorn.rb +} + +all_ruby_install() { + local dest=${DEST_DIR} + local conf=${CONF_DIR} + local logs=${LOGS_DIR} + local temp=${TEMP_DIR} + + # prepare directories + diropts -m750 + dodir ${logs} ${temp} + + diropts -m755 + dodir ${conf} ${dest}/public/uploads + + dosym ${temp} ${dest}/tmp + dosym ${logs} ${dest}/log + + # install configs + insinto ${conf} + doins -r config/* + dosym ${conf} ${dest}/config + + echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile" + + # remove needless dirs + rm -Rf config tmp log + + # install the rest files + # using cp 'cause doins is slow + cp -Rl * "${D}/${dest}"/ + + # install logrotate config + dodir /etc/logrotate.d + cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF + ${logs}/*.log { + missingok + delaycompress + compress + copytruncate + } + EOF + + ## Install gems via bundler ## + + cd "${D}/${dest}" + + local without="development test aws" + local flag; for flag in mysql postgres unicorn kerberos; do + without+="$(use $flag || echo ' '$flag)" + done + local bundle_args="--deployment ${without:+--without ${without}}" + + use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES" + + einfo "Running bundle install ${bundle_args} ..." + ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed" + + einfo "Cleaning old gems ..." + ${RUBY} /usr/bin/bundle clean + + # clean gems cache + rm -Rf vendor/bundle/ruby/*/cache + rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git + + ## RC script ## + + if use systemd ; then + ewarn "Beware: systemd support has not been tested, use at your own risk!" + systemd_newunit "${FILESDIR}/gitlab-8.13.0-sidekiq.service" "gitlab-sidekiq.service" + systemd_dounit "${FILESDIR}/gitlab-unicorn.service" + systemd_dounit "${FILESDIR}/gitlab-workhorse.service" + systemd_dounit "${FILESDIR}/gitlab-mailroom.service" + systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" + else + local rcscript=gitlab-8.13.3-sidekiq.init + use unicorn && rcscript=gitlab-8.13.3-unicorn.init + + cp "${FILESDIR}/${rcscript}" "${T}" || die + sed -i \ + -e "s|@USER@|${MY_USER}|" \ + -e "s|@GITLAB_BASE@|${dest}|" \ + -e "s|@LOGS_DIR@|${logs}|" \ + "${T}/${rcscript}" \ + || die "failed to filter ${rcscript}" + + newinitd "${T}/${rcscript}" "${MY_NAME}" + fi + + # fix permissions + fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} +} + +pkg_postinst() { + elog "If this is an update from a previous version, stop your GitLab" + elog "instance and issue the following command to perform all required" + elog "migrations:" + elog " emerge --config \"=${CATEGORY}/${PF}\"" + elog "PLEASE NOTE: It's HIGHLY recommended to backup your database" + elog "before running the config phase. Run these commands (as root):" + elog + elog " cd /opt/gitlab" + elog " sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production" + elog + elog "If this was a fresh install, follow these steps:" + elog + elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml." + elog + elog "2. Configure your database settings in ${CONF_DIR}/database.yml" + elog " for \"production\" environment." + elog + elog "3. Then you should create a database for your GitLab instance, if you" + elog " haven't done so already." + elog + if use postgres; then + elog "If you have local PostgreSQL running, just copy&run:" + elog " su postgres" + elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" + elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" + elog " createdb -E UTF-8 -O gitlab gitlabhq_production" + elog " Note: You should change your password to something more random..." + elog + fi + elog "4. Finally execute the following command to initialize the environment:" + elog " emerge --config \"=${CATEGORY}/${PF}\"" + elog " Note: Do not forget to start Redis server first!" + elog + elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and" + elog "you can't login after the upgrade, be sure to read the section about the" + elog "verification of the CSRF token in GitLab's trouble-shooting guide at" + elog "http://goo.gl/5XGRGv." + if use postgres; then + elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the" + elog "`pg_trgm` extension by running the following command as a PostgreSQL" + elog "super user for *every* GitLab database:" + elog " CREATE EXTENSION IF NOT EXISTS pg_trgm;" + elog "For details, see the documentation at the GitLab website." + fi +} + +pkg_config() { + einfo "Checking configuration files" + + if [ ! -r "${CONF_DIR}/database.yml" ]; then + eerror "Copy ${CONF_DIR}/database.yml.* to" + eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" + eerror "database settings for \"production\" environment."; die + fi + + local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)" + local git_home="$(egethome ${MY_USER})" + + # configure Git global settings + if [ ! -e "${git_home}/.gitconfig" ]; then + einfo "Setting git user" + su -l ${MY_USER} -c " + git config --global user.email '${email_from}'; + git config --global user.name 'GitLab'" \ + || die "failed to setup git name and email" + fi + + su -l ${MY_USER} -c "git config --global repack.writeBitmaps true" + + # determine whether this is an update or a fresh install. we do this by + # checking whether the ${DEST_DIR}/.git directory exists or not + # + if [ -d "${DEST_DIR}/.git" ]; then + local update=true + else + local update=false + fi + + ## Initialize app ## + + local RAILS_ENV="production" + local RUBY=${RUBY:-/usr/bin/ruby} + local BUNDLE="${RUBY} /usr/bin/bundle" + + # FIXME: this line existed in older ebuilds, but the variable is + # never used. what was it for!? + # local dbname="$(ryaml ${CONF_DIR}/database.yml production database)" + + if [ "${update}" = 'true' ]; then + einfo "Migrating database ..." + exec_rake db:migrate + + # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 + einfo "Migrating iids ..." + exec_rake migrate_iids + + einfo "Installing npm modules ..." + exec_npm install + + einfo "Cleaning old precompiled assets ..." + exec_rake gitlab:assets:clean + + einfo "Cleaning cache ..." + exec_rake cache:clear + else + # create dummy git repo as workaround for + # https://github.com/bundler/bundler/issues/2039 + einfo "Initializing dummy git repository to avoid false errors from bundler" + su -l ${MY_USER} -c " + cd ${DEST_DIR} + git init + git add README.md + git commit -m 'Dummy repository'" >/dev/null + + einfo "Initializing database ..." + exec_rake gitlab:setup + + einfo "Installing npm modules ..." + exec_npm install + fi + + einfo "Precompiling assests ..." + exec_rake gitlab:assets:compile + + if [ "${update}" = 'true' ]; then + ewarn + ewarn "This configuration script runs only common migration tasks." + ewarn "Please read guides on" + ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" + ewarn "for any additional migration tasks specific to your previous GitLab" + ewarn "version." + if use mysql ; then + ewarn "PLEASE also read this document about needed migrations on MySQL:" + ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md" + fi + fi + elog + elog "If you want to make sure that the install/upgrade was successful, start" + elog "Gitlab now and then run these commands (as root):" + elog + elog " cd /opt/gitlab" + elog " sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production" + elog " sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production" + elog + if ! use systemd ; then + elog "You may also run" + elog " /etc/init.d/gitlab check" + elog " for convenience." + fi +} + +ryaml() { + ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@" +} + +exec_rake() { + local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV} NODE_ENV=${RAILS_ENV}" + + echo " ${command}" + su -l ${MY_USER} -c " + export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules + cd ${DEST_DIR} + ${command}" \ + || die "failed to run rake $@" +} + +exec_npm() { + local command="npm $@ --${RAILS_ENV}" + + echo " ${command}" + su -l ${MY_USER} -c " + export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules + cd ${DEST_DIR} + ${command}" \ + || die "failed to run npm $@" +}