linux
/
gentoo-overlay
1
1
Fork 0
Code Issues 1 Pull Requests Actions Releases Wiki Activity

Merge branch 'master' into feature/gitlab-6.9.2 

Conflicts:
	www-apps/gitlabhq/Manifest
This commit is contained in:
Manuel Friedli 2014-07-20 23:40:39 +02:00
parent d0434ed0c9 85153a4a2e
commit e81c4ea462
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www-apps/gitlabhq/Manifest
View File

@ -29,11 +29,12 @@ AUX gitlabhq-6.7.5-fix-gemfile-lock.patch 830 SHA256 11fccb5c51e49e7994cfce5b9e4
AUX gitlabhq-6.7.5-fix-gemfile.patch 2161 SHA256 7f1f6fef287a00a0f794ad31a81cced87a5ac6a31e79e27be6530f92d66a2598 SHA512 24bb78ea36886764911af7825c0ade796dbd24ee99ee19e418d4478bc4d4dcbdb4ffcfd63b615a842a320234c4e6b0b851094abdd0c5be0a5cd80308a00d380a WHIRLPOOL 6345e2ec96c52f79545f21fb330e8517925c04f162dc2cbad959c1eb59fd65e89be4cc45d1510ef662e43a26541e840e02742adb9474569a44e80771df773d7f
AUX gitlabhq-6.7.5-fix-project-name-regex.patch 1148 SHA256 bb0e175e56412aaef647fb0a3cc31f0e1dfdc12983d4195ab9375b2ecd929c46 SHA512 7b9db9068edbf99c9226fecf4ac3154110481a7b69020ee05d1318ee6f4105d53c45ca14317f917825c9769d317a8815830638a371fd8f5d6af031b361bef65a WHIRLPOOL 0c333f523230ec49089017087dce328e79e646efeaec5c9520f541775d717c45cabf3173199405b55b836285d0fa9c27764f250eb7f19fe4f1909514caf879e9
AUX gitlabhq-6.7.5-ldap-custom-mapping.patch 2992 SHA256 0fa8d8225552b0a2305f2876399272ced64ae7c3c7af1fed9b59a4b74448d5b7 SHA512 d62c7560c4472faf2c08c5a6700f0dfe58e945f376c0bccef4593849c16d30c8adf3ce8b856fe69c944afbaf75b1d957ae411bba766d87b0fdbba8c8c8172d2d WHIRLPOOL 8e0e2165adb5d3a87ca254550d8072829c74e3bdb34e86bcbb47af3009bb0a2d21e24cda91e489148d20d543c4d8310267527233d57dcc4fe94770167f4fef11
AUX gitlabhq-6.8.2-fix-gemfile-lock.patch 340 SHA256 524b7524b61c61978430442e0d13bc39f1e324ad7d1bc33308f82094e53acfa2 SHA512 d60c42f11b32bc87de84a4ddf122339ae39bf29d5e921175b510c86fb02a0f216c9f4a55d4653618893f82fca1b28eb77ad4fa35a0cdbf9f5275c004cb91e41b WHIRLPOOL ce9a734daa468e55ddb69193f8c1bfd84462167bbd0b921c79636de916e11bef986df39a3d51a1188e3bb0b83084966d36fc8f8cc6501dc21ab78d0c8b0d98da
AUX gitlabhq-6.8.2-fix-gemfile.patch 2073 SHA256 6cccaba8d4483e4e8390ec518e474e2137985d490163cfcc0cef090fc80e0277 SHA512 75c21c7c5103d13009427739d591a268b7d9d43add0a3d0c2f3188a054c0963a4b525c024664732ad6ff5429adddfde49d98b74285a0de21c351143692839b73 WHIRLPOOL 4ec488ae566c5781eff17cead6c83002ef4a5055c02f3bf07ed8955985a8e3b7fe61fd4b5b116e4cb74787fb4b3f9caa820a9c67b297c007eed7f0be2d461261
AUX gitlabhq-6.8.2-ldap-custom-mapping.patch 2579 SHA256 82aaae2c64554e9c00dfb8f1d66884512f509752c74b03fe430d3ba7e7a5c18d SHA512 82e1900473b96d0067b477f76fae7445dc000a520bebe0f9cbdd7e02063b146005aa63594f508e3a592e89b04ac26b425b8a186bbd474b538c918d74c6abb9a7 WHIRLPOOL 953ddf4b70a9caf29afeaee50939c3bc3ec4a4f53cb484f50f151e7a8d6ab2d03303deb4c26c931fa836fa84b5935522630ffed7d266fcd9cb6982a6148e6882
DIST gitlabhq-6.7.5.tar.gz 10229484 SHA256 547ed2807cccf08c11450a9df035dad8db66ab9f9d693db29e3aa1ee65edbae0 SHA512 a90c0cd3954bf20ece9e98626216a42afcb0cc07e0cb23874ab2065757805ac38a8dcf4e93d804a33caeecaf2c6e94d8566f5700cd4161ef9a0aaac089b9ded8 WHIRLPOOL 4d8f5ff3a1245c5e13fc3ff8f819160017dd4dba9f6a48c0f851272da5c97f45162d3e53f327002f1ecde7f31dd5f392bed8503b1b306d913bf63827777cdbcd
DIST gitlabhq-6.8.2.tar.gz 10558471 SHA256 db9400d5ffadd3564bbee6e388c90d7f4c8f88450e67213aad11df2d137534ec SHA512 0f57c6bb3b9e89a5bbf7ae4c774e54480518f185f2e50270a7dd921eb2a2322f3e6866ca70741582fad4f99b372ba025fbab15108c291d53ebf04cfaec2f9b75 WHIRLPOOL 73ebd0fb0faef7afd48398ec4e73c8f4175f3dc2a9450ae391b4d3a66b54e0d77f901f518738eb98cc267691559094d4ebecd4c0a7c18fa671c3a1aee4dfe4d2
DIST gitlabhq-6.9.2.tar.gz 10566288 SHA256 2c01b223c3e889c7a45d3815f352c0546a337286d395e4d49df5ecedc1a57dc0 SHA512 b51b4e261666c14f782ce7edbbda24b6d32bb080c5444249f5c38e5233398b30f50a17cc8cbee18d75e57ba11ec3deeab4ffd1a6d6257c1858f8fe63e5138e54 WHIRLPOOL a3b9a8149fab69443b769aa145eb2c9a99bfc9f4a080edf0a6bd46c4771247b6f1c729bf5185e63bf63a02d654145362b7c8e9fefef6f0cdf1f4f30a32cf9dcb
EBUILD gitlabhq-6.7.5.ebuild 10983 SHA256 79fe5e03f1f03625a27d5ef398bb4d40e991c71490eda27913529bcdebf03b5d SHA512 73d035742868747f4d1dbbdce0d2892e29bbea3fd2938a66d16c9c72e3ec6075c9faa855b8a46b7970a8879e9633a25b65d70f3cc9eb77a2656bcbcca64f6008 WHIRLPOOL b8a9531f544799a141b7c6ddfaea6cce5d2643832c38326ff13bb3ed37f009b0bb1aeeba3d1d2434d2e59b43747c380ea505fbebb1a082da94a4e2322f20f4bf
EBUILD gitlabhq-6.8.2.ebuild 10574 SHA256 01e27412382c97f98ac275bdf34fba3492c568039a8863a1b67ede49f64208c8 SHA512 4175ab3407c7c927cd041706232c7f525948ebef0722f420981de2145c3f8be5aca2a6d0cd1b6d17d0944d5f3a53d621013174793193c9dcb8cac9cfa075c799 WHIRLPOOL 0e59c26150b2f162a42191ca1400ee79e5b2654c6a7f5696ea7f9bf2d6236e14439626125e66d0c8b1cb56c704e55c1b31a6e7cb65fa63be83a97032cfa72030
EBUILD gitlabhq-6.8.2.ebuild 10605 SHA256 5a7e869aee5481f5c610c81a130ea677de4977d4fc184839b3f7ce16152dacb4 SHA512 3f63b20e111e74d183e36acaa9499287801b18e53f4a1f0e0271f2d93625bf9b311e3a1634e2426965cefd7fe9d2a86114b71ba32f91abded11bd0234ebc87f8 WHIRLPOOL 3f77d6e351f6552932efbe40af389069bda3e44933a0ab426663574ff490665e7ae9a8cfc2726e378073816de7423e8c8269e3cee01b0a64299044a1f99d4811
EBUILD gitlabhq-6.9.2.ebuild 10587 SHA256 b6ecde09ca853838e097abfae46a3ab15f7e01c84e03eb1d35e47cee57e62f3f SHA512 5b4615e807d5788e3f424eda19f88b5f523137bafaada466fee281e1816ba0f2ef9316ace7ed69de2e22234804f1255a09ec93219253532d582ad6fb36d00477 WHIRLPOOL b6b30bf01aa4d11424c0cdbff019260f5f992f89a5b8360c6055c199870f3b9b621891894f1d7d5001b63a2ba6d199d9b5dda7acfd51cef8603d86c671871c26

11
www-apps/gitlabhq/files/gitlabhq-6.8.2-fix-gemfile-lock.patch Normal file
View File

@ -0,0 +1,11 @@
--- Gemfile.lock.orig 2014-07-20 23:01:25.111641645 +0200
+++ Gemfile.lock 2014-07-20 23:00:43.898976942 +0200
@@ -5,7 +5,7 @@
specs:
charlock_holmes (0.6.9.4)
- GIT
+GIT
remote: https://github.com/jirutka/omniauth-ldap.git
revision: b55852bfc9b46ecf790a2c5526386702350eab89
ref: b55852bfc9b46ecf790a2c5526386702350eab89

1
www-apps/gitlabhq/gitlabhq-6.8.2.ebuild
View File

@ -72,6 +72,7 @@ RUBY_PATCHES=(
"${PN}-6.0.2-fix-sendmail-config.patch"
"${P}-ldap-custom-mapping.patch"
"${PN}-6.7.5-email-custom-reply_to.patch"
"${P}-fix-gemfile-lock.patch"
)
MY_NAME="gitlab"