okay, nothing works, but i won't push this branch anyway.

2015-10-16 19:18:09 +02:00 · 2015-10-16 19:18:09 +02:00 · 46393f1488
parent 9fa273fd0d
commit 46393f1488
3 changed files with 62 additions and 6 deletions
--- a/www-apps/gitlabhq/Manifest
+++ b/www-apps/gitlabhq/Manifest
@ -8,20 +8,20 @@ AUX gitlab-unicorn.service 773 SHA256 010c9e223a30400d9155b39499eb0d7efad23b66ba
 AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c101f43ca263 SHA512 909c49fee6d050c1e94b2559ff2a9d54c5c346492be0e2920b50d56d69eaddbed67e3ac12e012d2a9601b5596640ebf33c8dc68fc588a03ca370d963294be37f WHIRLPOOL fa436e8d7d2643d450259d26b6e7b24dae69df47ed22e5ef2a567f37aa785fbf3b0eb1129ae7c8bf8986c29559fc3b744a34064375e5245dce2b10053cd715d9
 AUX gitlabhq-7.13.1-fix-gemfile.patch 1478 SHA256 99050e17841670f03e9430e1f0409cb0194b49ef3235b90c13a4bd66a2648ad6 SHA512 9b0ef71867d4049970295f1ac015e3a4917a24c61edab3452f75f9652e21b94f3dd859247bb28622cd032fe33d4ebcec7b262488841540b48e387f11399c9a8b WHIRLPOOL 9db14e3339e1038dbaff9344f3472c6e23209fa6edbeca35c3108723fd39cb93420361ffdade21fc7019a1e873283524db6e38868ee247ca11a5814832083aa0
 AUX gitlabhq-8.0.2-fix-gemfile.patch 1586 SHA256 c91945e0e639b1297519d7165a3aa03fe203a29cde1d195f277be6cba71c67e1 SHA512 6eb15935292902b3090e856e00a972ee2e442eadbf2e42fbde1e4727d75d65e0e06c6be54be8fcd7aeebb5e0616c8d5123f60ebabebd7e02531f0fbc7b03d760 WHIRLPOOL 985e86c5bcb1ea059b41f1f08d3528afd3ab31d71eb81df79a2b454a0e2fb24dbf08b4a1c9197e56864550842baa60599db631bbd2a3603caaea9b7d6743e3d1
+AUX gitlabhq-8.1.0_rc1-fix-gemfile.patch 1585 SHA256 5e5a17fe241547f79e9992a43dc87c2be09ef5021072002c5172f9bc84858ab6 SHA512 f7de8760a1da1d8829b8b481fe0dafe0c379476406d2e0eac92b3085d4a95bbaa75124e592e724dd78add6cc603c3622ddffed6a337ac93ed510ec96045d7345 WHIRLPOOL 3dde3a4aad28d70cfcc3f379e6c3e29aa86fb508e18e01722877cb1d842ee8580d1a74ed6d2325f8790e27e38bb7b5ffc50adc265337e1557156c9806314a750
 AUX gitlabhq-fix-sendmail-config.patch 731 SHA256 51f0d0af2a7c048d7cff56cf27955632f340ca67f9d460af840cf34ed60ca574 SHA512 b10d5b8d89927404d25345e17ba37ca4e7848b04c2ca20c5eef14eaac43d9ba14b62ae4c0d532eefaf6f9a2944578e84eb65a3420335d32495855c4807eec356 WHIRLPOOL 66f6443f311f2355ffd4efaea914f462816a1966a715b3b5ffaaa26b41bdced928b9905b8606f06fac3c2ccf20741553cfed2615430287bede01cf376aae2a60
 DIST gitlabhq-7.14.3.tar.gz 6393535 SHA256 3814a3bdff9610b269be15b8cf35701fcdd78a5a80fb1b366269acc49b23f5e4 SHA512 f2088c151b424cbca0fbc65073c1198ea9c3619570ca3543cf5f0ddd193a6105941608df418eeb506bde83f2c0bbd34cea267caaed70092afcca54219e84004d WHIRLPOOL 70574a135eb426e93086502ad7a0d5b73e1070a19c529852fe2aa60c2081d27bbb4289340b73b469ecfd489779cc409bb56de263e47aaa07859ed0a14dd51f44
 DIST gitlabhq-8.0.2.tar.gz 8238940 SHA256 e17a889f33c85b86744ea7be7cabb69feb340b82a4f01706360a985ceb6fd0f3 SHA512 901d0841075514af6e5f1a5a1064f81347769d024b1d0a5527de069ba29de1746ec3c27045529acd7fd993ad53ea65a08d24f3fc3fcbb2fafebc4b7c75490f97 WHIRLPOOL 19e9c1f4ea7e0106dea552bc875e2bfd1f518fe6aeefa6934772ebb29ba388eaad0715e36fa53f22fdc7e90203eea380ae62fc0dc8b7ce999efb2ee05d0cc63b
 DIST gitlabhq-8.0.3.tar.gz 8238927 SHA256 b299b100f8963f86aaeab01ad4ba49ac034cf77e803cff0fa710065e3464a049 SHA512 e247b3677ca86f43e665623c3a2602ab33843860537813fa64e3cd33b408698f0482e1ce437a4a30976b0656977f86890173ca044b7d07bfdfda3d269d311802 WHIRLPOOL 710f473d8b6c06fff9e72258102653f24035d5533f257d2d6d842ae0598fb048c6e76f9706e3662a93a9d1ec34ef67a67686fdee7439fb776de686eae19120ea
 DIST gitlabhq-8.0.4.tar.gz 8238901 SHA256 644b4bc98907bb171a1281ae73ac510f1bc6d379d39020f61e1697bb73547ae8 SHA512 41d4e8088221beb4aab731cf0ddccba0be2e4746ece0e33f92ec5488a4ed759f1e18788efed2351f5a643c31f47b4138a33077313b27e4e4567c9e9ad8dc79e5 WHIRLPOOL 08157b0f82150a5245cb2985b704026dab5f6342ab9e080c3149850ea37be5482d2dfc330a8d441957c1d8383528d3e65eb41c70ccfbb4a49e4a442f6f24a56e
 DIST gitlabhq-8.0.5.tar.gz 8238566 SHA256 476185a191bfe8757ca1a981419ff5d31449136e76029daa77e89086539d30c6 SHA512 af9d11f0ed744d0c92c9329ba94fe51534996f18dbb2c110d70912cd3ce9e60c3a127b7c8597c95b010b0e2251f98aabdddc314ddae53ab26a44c19b4ba7a7d7 WHIRLPOOL 6e4bc8c43cbfe215efd21a87a5d0395abde4f9998564fc0295d946ffa6a7021d2b5bc2ea625482fb400088bcc57431b3969a6c9dfa0f2121420356d153d297f0
-DIST gitlabhq-8.1.0.tar.gz 8501331 SHA256 3611ceb7030c18b0bdc07eddb93ebc2f34fddadd9b6efb8c36bdf3cd9edab73f SHA512 eed11eb70c18004d8827583eb3f4073b2eb73e0b84865674edf8ab02e60a6eda31ce6d23a200c3ba851e6bed7d76a0eaf9e481ef0b0c901fb4a7e6624f4229ec WHIRLPOOL f9b70b96af4d936209ff6dec6a596a8504857ed867b08ce4c2b73df5ca949805d2c3273e22f9f352bf8383139daf3292bf0afe3a234798bf8cca1daf9092d9eb
+DIST gitlabhq-8.1.0_rc1.tar.gz 8501331 SHA256 3611ceb7030c18b0bdc07eddb93ebc2f34fddadd9b6efb8c36bdf3cd9edab73f SHA512 eed11eb70c18004d8827583eb3f4073b2eb73e0b84865674edf8ab02e60a6eda31ce6d23a200c3ba851e6bed7d76a0eaf9e481ef0b0c901fb4a7e6624f4229ec WHIRLPOOL f9b70b96af4d936209ff6dec6a596a8504857ed867b08ce4c2b73df5ca949805d2c3273e22f9f352bf8383139daf3292bf0afe3a234798bf8cca1daf9092d9eb
 EBUILD gitlabhq-7.14.3.ebuild 11037 SHA256 41ef6da353b308ddf94dea245cee85b8fa0a16d15d20cfd210ec8b908ea1a123 SHA512 c88df7c472fef7fc609bc4c4f622dfb7c9d7288a21859b3794305a100be013153a1058cd111c0e880094626b620cda72cc29632661e0c3c4f2b325beec555e97 WHIRLPOOL 795038d6d9443e242175132638bf32bf3bb191ec876f6abc3874ee68fce15c32b86e6574158ab6561c3693ecfce6457a0da619c9405fc447cbebf1c8732ac0e8
 EBUILD gitlabhq-8.0.2.ebuild 11109 SHA256 802e5ec6fdc8a2219d8f812b0541916807fe0793b5874b7cdbafa760ee62e14f SHA512 a70346d7dafc62ccdd5a5fe11b55845d056f0c2fc8ca7c2dd0a6e67d80f91398ce5fda2c7b5f61bb5bf5bc65dd1c5e27d3959dc47de793475e98009c483b25a0 WHIRLPOOL 0df933fe9c57d9b8cca6cf2a8334c91443481942593b214c6ba4781eca70002181367095aa66e50ddce754751c1c71ea8c071d7766a815337a48cb9d7bb1c5fa
 EBUILD gitlabhq-8.0.3.ebuild 11116 SHA256 7e5335681c66070aacecb1d64f58ef09e8cbd1934e8f7bea4d457c380fbe5029 SHA512 9c77b4ec65ccae2451f47fa50c443e3f6647268f8d6570e9c4f6ced1dfe881ff9f385404545c2db02f93eda8adba898a12eac27276f216da2dea2a164b27b6cd WHIRLPOOL 1bc6d1e7e6d89f03fec11696a905ac26792acc6be2115b348090d499c2dfdeb9cc1db8f257af316d38de6a770e9ebba2a5e6c529013a35f75863a56751a24c2b
 EBUILD gitlabhq-8.0.4-r1.ebuild 11192 SHA256 3f4ec010d0d19d331921ceaf49ed197d0ed359cdebc49e44edfcd135ef837ae6 SHA512 f916c54d3891568361aadddf5827e4f631af84e4534399e3e98ec7456d2554d3d817527ee5dd043ab658fc17ee65f91337ad8aa115937b4451afa8f22a15ad66 WHIRLPOOL 5afbebf340525ee64ec8e15f8a6142abe7873d14e09f16cac3a2f0706e3fdf993e39d76c3931d8cecc379aacd28162e7db38e822bc9bd403e84a37653f4b9abc
 EBUILD gitlabhq-8.0.4.ebuild 11116 SHA256 7e5335681c66070aacecb1d64f58ef09e8cbd1934e8f7bea4d457c380fbe5029 SHA512 9c77b4ec65ccae2451f47fa50c443e3f6647268f8d6570e9c4f6ced1dfe881ff9f385404545c2db02f93eda8adba898a12eac27276f216da2dea2a164b27b6cd WHIRLPOOL 1bc6d1e7e6d89f03fec11696a905ac26792acc6be2115b348090d499c2dfdeb9cc1db8f257af316d38de6a770e9ebba2a5e6c529013a35f75863a56751a24c2b
 EBUILD gitlabhq-8.0.5.ebuild 11179 SHA256 9bda7c4e16f049eba1a2cdc8cb269891ca2759bc530ba0e1d1e76e79dec00bf8 SHA512 1e2c9bc26c98ffde2fd22a482d50c29b7b1c169ba62bdbbf2a6f8007bf77428b2282e076d9431e537d7ae31e70f98cac99e884336942bd3555ea346816c275d4 WHIRLPOOL 49219725b625dfedb6d918c98bfa3ca2cbeeef5851f03953d9fd34bee141f4a0eaf2f8262c42603e7b0f1408e3af6b5ffc56ff1764f6afe6217650fbc58ab378
-EBUILD gitlabhq-8.1.0.ebuild 11192 SHA256 24b90067539d9f0fed12fb63cf9a2c088380cb8f43e17959532f6d0936c1bb82 SHA512 36c96f7e93d79e071aee5166c095861d191213d88d9c5cea948d384289c0152aaf6fcce2924275de113916ac8d406a3c49187af2f7bbec978e189322edf3ce37 WHIRLPOOL 53e76f3f34456afc192078baf716044e72bfcf99b0eeedcc8f4ae5ee82317a14642ff9ddfdd9d1aaea3a7d1b6fbe57f1ca562db00888fafa4d444bdb3f49cfbe
+EBUILD gitlabhq-8.1.0_rc1.ebuild 11182 SHA256 dc1edde63c16a112a4edfe073a7c5e0bd7e8a2aafc1a24df900f3f9784da846c SHA512 2b764dab7d81f6883cdce0be8a19bc209b112f2dc4fb6d416028564599354d9cd4b7ba83198e6e68117dd523012358e57874c920c0dc52b389fbf512239bcb44 WHIRLPOOL 6632cec2467bbbf0c06bcf389f112eb812b2d5265d9910a7377fa8f9020eecf4e489c40084277cbfa3385e2baad8ea3677328fb64460c25caa34e0b840515e84
 EBUILD gitlabhq-9999.ebuild 11087 SHA256 565d2f2a530d232bed74ab7c9699788e186d69159e5b201a2b9e9990f558083d SHA512 c8eb9b1a667e78404949835ef92d8ca9ef74738379a0b2de9d64ce3dc0510635f575d43fc13efc52076afd8b85a3955e8614a41503e6ca1deb0847d1f23c2ad2 WHIRLPOOL a9889adc7f162bfc032914252f4f689e417e06b06149695f2f370daa7806bc33ccba6a2767f79d512cd9cc7dcbd8ffbfbdb2a71ec40cb16c2dfbec4900804dc6
-MISC Manifest.orig 11464 SHA256 1d619097e0316f2e1de8f3a79b89c1f0ae7fcdcd779269347b0875a30cab5dd7 SHA512 b527ca3dae3b3cac0ab471339549a784899346a14f7598866a93ef21a56df5a8addec2ff2b7ff2bfb2dc10f7b9a5d668b7c076e5855286326c32860ef2a6f167 WHIRLPOOL 14dd65cdf02ab3c345a5a8316edd348303cba0f586b75f23e369e92e2ec336077490d79d5e3c01f88f592ab6eb1419185e183e4edee5288b04eaeb839eee2630
 MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1
--- a/www-apps/gitlabhq/files/gitlabhq-8.1.0_rc1-fix-gemfile.patch
+++ b/www-apps/gitlabhq/files/gitlabhq-8.1.0_rc1-fix-gemfile.patch
@ -0,0 +1,56 @@
+diff --git a/Gemfile b/Gemfile
+index 9254ce2..94acb3d 100644
+--- a/Gemfile
+++ b/Gemfile
+@@ -174,6 +174,9 @@ gem "underscore-rails", "~> 1.4.4"
+ # Sanitize user input
+ gem "sanitize", '~> 2.0'
+ 
+# The newer revision of charlock_holmes that is finally fixed to be compatible with Gentoo
+gem "charlock_holmes", git: "https://github.com/brianmario/charlock_holmes.git", ref: "dde194609b3513b0d2369ce8f916ae52566154b4"
+
+ # Protect against bruteforcing
+ gem "rack-attack", '~> 4.3.0'
+ 
+@@ -183,9 +186,6 @@ gem 'ace-rails-ap', '~> 2.0.1'
+ # Keyboard shortcuts
+ gem 'mousetrap-rails', '~> 1.4.6'
+ 
+-# Detect and convert string character encoding
+-gem 'charlock_holmes', '~> 0.6.9.4'
+-
+ gem "sass-rails", '~> 4.0.5'
+ gem "coffee-rails", '~> 4.1.0'
+ gem "uglifier", '~> 2.7.2'
+diff --git a/Gemfile.lock b/Gemfile.lock
+index 5312289..586bd90 100644
+--- a/Gemfile.lock
+++ b/Gemfile.lock
+@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/brianmario/charlock_holmes.git
+  revision: dde194609b3513b0d2369ce8f916ae52566154b4
+  ref: dde194609b3513b0d2369ce8f916ae52566154b4
+  specs:
+    charlock_holmes (0.6.9.4)
+
+ GEM
+   remote: https://rubygems.org/
+   specs:
+@@ -108,7 +115,6 @@ GEM
+       json (>= 1.7)
+     celluloid (0.16.0)
+       timers (~> 4.0.0)
+-    charlock_holmes (0.6.9.4)
+     chunky_png (1.3.4)
+     cliver (0.3.2)
+     coderay (1.1.0)
+@@ -800,7 +806,7 @@ DEPENDENCIES
+   capybara (~> 2.4.0)
+   capybara-screenshot (~> 1.0.0)
+   carrierwave (~> 0.9.0)
+-  charlock_holmes (~> 0.6.9.4)
+  charlock_holmes!
+   coffee-rails (~> 4.1.0)
+   colored (~> 1.2)
+   colorize (~> 0.5.8)
--- a/www-apps/gitlabhq/gitlabhq-8.1.0_rc1.ebuild
+++ b/www-apps/gitlabhq/gitlabhq-8.1.0_rc1.ebuild
@ -19,8 +19,8 @@ inherit eutils python-r1 ruby-ng user systemd
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://github.com/gitlabhq/gitlabhq"
 #SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v8.1.0.rc1.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-8.1.0"
+SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.rc1.tar.gz -> ${P}.tar.gz"
+RUBY_S="${P}.rc1"

 RESTRICT="mirror"

@ -75,7 +75,7 @@ ruby_add_bdepend "
 #     Fix default settings to work with ssmtp that doesn't know '-t' argument.
 #
 RUBY_PATCHES=(
-	"${PN}-8.0.2-fix-gemfile.patch"
+	"${P}-fix-gemfile.patch"
 	"${PN}-fix-sendmail-config.patch"
 )