Merge branch 'master' into geoip-php7

2016-06-07 10:25:14 +02:00 · 2016-06-07 10:25:14 +02:00 · 3ae77824b3
commit 3ae77824b3
parent 628714e9e4 f69fb04693
30 changed files with 879 additions and 64 deletions
--- a/app-backup/duplicati/Manifest
+++ b/app-backup/duplicati/Manifest
@ -0,0 +1,6 @@
+AUX duplicati-1.3.4-filenames-casesensitive.patch 3852 SHA256 2b21530fad665c56377041b2cd4403303e552d3396c27c720eef730c2ccce35a SHA512 b8a5b0993c484d358bcd0bd5619bce4bf991afadc2b4c393a0272900fbb5bc9112bf1a12ea92385538558b587ec3369ef0fce168d1ed04183f14c00582e88523 WHIRLPOOL 74d18427ce64d608b31d172cfcd3c95538cb971635f98b6cc67cc4df282cb0856f9864e23a6d1c12ff8237627241fb1a1e413f329f20722e70e6b20835c00495
+AUX duplicati-1.3.4-patch-Makefile.patch 2311 SHA256 4ad674ebae52262422ed91a32ed214260179e17cdd44c51c24d493fb4f26fc04 SHA512 399a3e733c3fa688e653a7e1c4000d56a464d3b38f75283ba856ae74c8c6f9c977cbd5f7e61feb8e04f00459e6bbbebbdecf224195532627f4f99ee527ef1b28 WHIRLPOOL 3cf84ea2bc4d98f532d3e97d7dc98c10d58f07f6e25ffb05e775a7bdcc692eb983af83ef07b71a894cabff964a877f1b1fd7b93af90a9f5a33cf6067f22c1683
+AUX duplicati-1.3.4-remove-unsigned-backends.patch 1899 SHA256 cc962d1b4243d7f8a6f18f541eb9d6a503add0d95b67e384f1a611b875a7e973 SHA512 960e45e8f8bd0a59bbd1b9adb9f60758957916158b7e6609e5c3a7fdae4b120842ee14a8ae3152ca00999798c9c1e3bb953fcff4dc4e8d748d8942cb669c1090 WHIRLPOOL 9bb46c12dd8bf4298a59cba25616a05624f6eab2027ddbc43be1bf9cd617795d7fdcc2303e3e18f114d6daa2698560856dd3a00c4b11d243d8fd2a8cf7078cf5
+DIST duplicati-1.3.4.tar.gz 11840281 SHA256 abae8876b536d4f1e63b07297ea0b26ad9a2026e46593be661d45f95d2348581 SHA512 e92c178715df0d6d5794720988ccb4342aaf9d6e92813316b7c9214364d7735eaeb178d2dc413a91acc3e7e7a1a4ba1821e8ef7989897a55add66f63adcbc7a5 WHIRLPOOL 3d1d70e44f662adb7e24324bc82bbfd1c9b8e6596136ffd69dec78cd60ecee908b604110e52ddc79104e071db97efc27bb30d45f78464043d11d1259b3672b6b
+EBUILD duplicati-1.3.4.ebuild 842 SHA256 0cbfd36674993d05c9b77009b4dc8d0ce70bc0e11ee822d41f303c18c6a5b839 SHA512 324bb5ee20ba2bee9708073945866fd411c1ee19299cb51b2bcbc27c3039aa2fe503a146a9708dc9d950cb7475d0858e3cd5084c08589663e1f4c6bdfa9678ca WHIRLPOOL 3e267834472843371a15004b19033e81639e68ee986a86aaaeb8dbf3eb92b622ceb6413dd8074097a4c154786eda97e626709c3a66ac39e67616e14323199fda
+MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/app-backup/duplicati/duplicati-1.3.4.ebuild
+++ b/app-backup/duplicati/duplicati-1.3.4.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils mono-env
+
+DESCRIPTION="A backup client that securely stores encrypted, incremental, compressed backups."
+HOMEPAGE="http://www.duplicati.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND=""
+DEPEND=">=dev-lang/mono-4.4.0.40"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-filenames-casesensitive.patch"
+	"${FILESDIR}/${P}-remove-unsigned-backends.patch"
+	"${FILESDIR}/${P}-patch-Makefile.patch"
+)
+
+MY_MAKE_DIR="${S}/Installer/Makefile"
+
+src_prepare() {
+	for p in "${PATCHES[@]}" ; do
+		epatch "${p}"
+	done
+}
+
+src_compile() {
+	cd "${MY_MAKE_DIR}"
+	emake translations
+}
+
+src_install() {
+	cd "${MY_MAKE_DIR}"
+	emake package
+}
--- a/app-backup/duplicati/files/duplicati-1.3.4-filenames-casesensitive.patch
+++ b/app-backup/duplicati/files/duplicati-1.3.4-filenames-casesensitive.patch
@ -0,0 +1,78 @@
+diff --git a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj
+index 2b4c161..10902eb 100644
+--- a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj
+++ b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj
+@@ -64,7 +64,7 @@
+     <Compile Include="FTPUI.cs">
+       <SubType>UserControl</SubType>
+     </Compile>
+-    <Compile Include="FTPUI.designer.cs">
+    <Compile Include="FTPUI.Designer.cs">
+       <DependentUpon>FTPUI.cs</DependentUpon>
+     </Compile>
+     <Compile Include="Properties\AssemblyInfo.cs" />
+diff --git a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj
+index 0b03e11..5e5ce7f 100644
+--- a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj
+++ b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj
+@@ -64,7 +64,7 @@
+     <Compile Include="FileUI.cs">
+       <SubType>UserControl</SubType>
+     </Compile>
+-    <Compile Include="FileUI.designer.cs">
+    <Compile Include="FileUI.Designer.cs">
+       <DependentUpon>FileUI.cs</DependentUpon>
+     </Compile>
+     <Compile Include="Properties\AssemblyInfo.cs" />
+diff --git a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj
+index ddc0f47..4dfadfc 100644
+--- a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj
+++ b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj
+@@ -77,7 +77,7 @@
+     <Compile Include="S3UI.cs">
+       <SubType>UserControl</SubType>
+     </Compile>
+-    <Compile Include="S3UI.designer.cs">
+    <Compile Include="S3UI.Designer.cs">
+       <DependentUpon>S3UI.cs</DependentUpon>
+     </Compile>
+     <Compile Include="S3Wrapper.cs" />
+diff --git a/Duplicati/Library/Backend/SSH/Duplicati.Library.Backend.SSH.csproj b/Duplicati/Library/Backend/SSH/Duplicati.Library.Backend.SSH.csproj
+index 4c3fae1..111ece8 100644
+--- a/Duplicati/Library/Backend/SSH/Duplicati.Library.Backend.SSH.csproj
+++ b/Duplicati/Library/Backend/SSH/Duplicati.Library.Backend.SSH.csproj
+@@ -78,7 +78,7 @@
+     <Compile Include="SSHUI.cs">
+       <SubType>UserControl</SubType>
+     </Compile>
+-    <Compile Include="SSHUI.designer.cs">
+    <Compile Include="SSHUI.Designer.cs">
+       <DependentUpon>SSHUI.cs</DependentUpon>
+     </Compile>
+     <Compile Include="OutputStreamWrapper.cs" />
+diff --git a/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj b/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj
+index 1e13958..37d51dc 100644
+--- a/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj
+++ b/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj
+@@ -113,7 +113,7 @@
+     <Compile Include="TahoeUI.cs">
+       <SubType>UserControl</SubType>
+     </Compile>
+-    <Compile Include="TahoeUI.designer.cs">
+    <Compile Include="TahoeUI.Designer.cs">
+       <DependentUpon>TahoeUI.cs</DependentUpon>
+     </Compile>
+   </ItemGroup>
+diff --git a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj
+index 6ac8c03..9b945e6 100644
+--- a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj
+++ b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj
+@@ -76,7 +76,7 @@
+     <Compile Include="WebDAVUI.cs">
+       <SubType>UserControl</SubType>
+     </Compile>
+-    <Compile Include="WebDAVUI.designer.cs">
+    <Compile Include="WebDAVUI.Designer.cs">
+       <DependentUpon>WebDAVUI.cs</DependentUpon>
+     </Compile>
+   </ItemGroup>
--- a/app-backup/duplicati/files/duplicati-1.3.4-patch-Makefile.patch
+++ b/app-backup/duplicati/files/duplicati-1.3.4-patch-Makefile.patch
@ -0,0 +1,64 @@
+diff --git a/Installer/Makefile/Makefile b/Installer/Makefile/Makefile
+index 5528c7e..0dfa485 100644
+--- a/Installer/Makefile/Makefile
+++ b/Installer/Makefile/Makefile
+@@ -2,20 +2,14 @@ BUILD_TOOL=xbuild
+ BUILD_ARGS=/property:Platform=Any\ CPU /property:Configuration=Release
+ OUTPUT_ARGS=/property:OutputPath=bin/Release
+ SOURCE_DIR=../../.
+-PACKAGE_DIR=./pkg
+PACKAGE_DIR=${D}/.
+ PKG_TARGET=$(PACKAGE_DIR)/usr/lib/duplicati
+ LOCALIZATION_TOOL=mono $(SOURCE_DIR)/Duplicati/Localization/LocalizationTool.exe
+ 
+ all: package
+ 
+-Duplicati-v1.sln:
+-	patch -d "$(SOURCE_DIR)" -i patch-1-remove-scheduler -o Duplicati-v1.sln Duplicati.sln
+-
+-Duplicati-v2.sln: Duplicati-v1.sln
+-	patch -d "$(SOURCE_DIR)" -i patch-2-remove-unsigned-backends -o Duplicati-v2.sln Duplicati-v1.sln
+-
+-build: Duplicati-v2.sln
+-	$(BUILD_TOOL) $(BUILD_ARGS) "$(SOURCE_DIR)/Duplicati-v2.sln"
+build:
+	$(BUILD_TOOL) $(BUILD_ARGS) "$(SOURCE_DIR)/Duplicati.sln"
+ 	$(BUILD_TOOL) $(BUILD_ARGS) $(OUTPUT_ARGS) "$(SOURCE_DIR)/Duplicati/Library/Backend/SSH/Duplicati.Library.Backend.SSH.csproj"
+ 	$(BUILD_TOOL) $(BUILD_ARGS) $(OUTPUT_ARGS) "$(SOURCE_DIR)/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj"
+ 	$(BUILD_TOOL) $(BUILD_ARGS) "$(SOURCE_DIR)/BuildTools/LocalizationTool/LocalizationTool.sln"
+@@ -31,10 +25,6 @@ translations: build
+ 	$(LOCALIZATION_TOOL) build
+ 
+ package:
+-	if [ -e "$(PACKAGE_DIR)" ]; then \
+-		rm -rf "$(PACKAGE_DIR)"; \
+-	fi
+-	mkdir "$(PACKAGE_DIR)"
+ 	mkdir "$(PACKAGE_DIR)/usr"
+ 	mkdir "$(PACKAGE_DIR)/usr/lib"
+ 	mkdir "$(PACKAGE_DIR)/usr/bin"
+@@ -51,7 +41,6 @@ package:
+ 	cp -R "$(SOURCE_DIR)/Duplicati/Localization/compiled/"* "$(PKG_TARGET)"
+ 
+ 	rm -rf "$(PKG_TARGET)/alphavss"
+-	rm -rf "$(PKG_TARGET)/SQLite"
+ 	rm -rf "$(PKG_TARGET)/win-tools"
+ 	rm -rf "$(PKG_TARGET)/"*.mdb
+ 	rm -rf "$(PKG_TARGET)/AlphaFS.dll"
+@@ -79,16 +68,6 @@ package:
+ 	
+ 	chmod +x "$(PACKAGE_DIR)/usr/bin/duplicati"
+ 	chmod +x "$(PACKAGE_DIR)/usr/bin/duplicati-commandline"
+-	
+-	if [ -e "duplicati.tar" ]; then \
+-		rm -rf "duplicati.tar"; \
+-	fi
+-	if [ -e "duplicati.tar.gz" ]; then \
+-		rm -rf "duplicati.tar.gz"; \
+-	fi
+-	
+-	tar -C "$(PACKAGE_DIR)" -cf "duplicati.tar" .
+-	gzip --best "duplicati.tar"
+ 
+ clean:
+ 	rm -rf "$(SOURCE_DIR)/Duplicati-v1.sln"
--- a/app-backup/duplicati/files/duplicati-1.3.4-remove-unsigned-backends.patch
+++ b/app-backup/duplicati/files/duplicati-1.3.4-remove-unsigned-backends.patch
@ -0,0 +1,20 @@
+--- Duplicati.sln.old	2011-12-06 18:21:00.000000000 +0100
+++ Duplicati.sln	2011-12-06 20:15:33.000000000 +0100
+@@ -11,8 +11,6 @@
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.FTP", "Duplicati\Library\Backend\FTP\Duplicati.Library.Backend.FTP.csproj", "{F61679A9-E5DE-468A-B5A4-05F92D0143D2}"
+ EndProject
+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.SSH", "Duplicati\Library\Backend\SSH\Duplicati.Library.Backend.SSH.csproj", "{6BA21DCB-1701-4936-B177-3B6D4DE3474E}"
+-EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Compression", "Duplicati\Library\Compression\Duplicati.Library.Compression.csproj", "{19ECCE09-B5EB-406C-8C57-BAC66997D469}"
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Encryption", "Duplicati\Library\Encryption\Duplicati.Library.Encryption.csproj", "{94484FDB-2EFA-4CF0-9BE6-A561157B4F87}"
+@@ -49,8 +47,6 @@
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Modules.Builtin", "Duplicati\Library\Modules\Builtin\Duplicati.Library.Modules.Builtin.csproj", "{52826615-7964-47FE-B4B3-1B2DBDF605B9}"
+ EndProject
+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.TahoeLAFS", "Duplicati\Library\Backend\TahoeLAFS\Duplicati.Library.Backend.TahoeLAFS.csproj", "{C0270709-2A40-43B5-8CF1-69581B9FA2A1}"
+-EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.SkyDrive", "Duplicati\Library\Backend\SkyDrive\Duplicati.Library.Backend.SkyDrive.csproj", "{CCD76347-7DC7-4B42-B7E1-E500E624CAC3}"
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.GoogleDocs", "Duplicati\Library\Backend\GoogleDocs\Duplicati.Library.Backend.GoogleDocs.csproj", "{42C91180-11EB-4590-82EA-80FE9D4DEBEC}"
--- a/app-crypt/letsencrypt-apache/metadata.xml
+++ b/app-crypt/letsencrypt-apache/metadata.xml
@ -3,6 +3,6 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>manuel@fritteli.ch</email>
-		<name>Manuel Friedlir</name>
+		<name>Manuel Friedli</name>
 	</maintainer>
 </pkgmetadata>
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@ -0,0 +1,3 @@
+DIST certbot-apache-0.6.0.tar.gz 686826 SHA256 58eaa6be4ae90af07d682296e42dbac924b5602c51002445059596313e182a09 SHA512 966fdbff13ac9651ebb5fafae86a58a45538d57a43eb6d157358bbecef4286634bb61dd13b94e0ca5b006980a35cc5fe55b4a12efdeadc2530653d844516c926 WHIRLPOOL 0bd424395b9002a04f6c900b208aea758f74e9864d75f6aa87fc30573f046c63f9791aa8bcce0a5452831192d1579e9b52fda5ed77befd6e4f361dab976d6369
+EBUILD certbot-apache-0.6.0.ebuild 1051 SHA256 ead789957c63cb1d0951bca583256109f5deb55c52b58a9b3772afceb5a0f64b SHA512 ca49a904ed44ec950bea4c3864cb7f8e8c61d5a3d74111fe5be5a3f478a5a9a4c4f9d2beb7d216dfb86dfd05020236bce7c4e0c9f81c52a68316b88e152b8bbf WHIRLPOOL 5f21a34c264de958564ee199a6b819211339a0280b22b1447005d72b5a8f1f538af729180b20dadf6c49ffa98e841e0b568f3cd85e26da66d5a7f4c27de98134
+MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/app-crypt/letsencrypt-apache/letsencrypt-apache-0.5.0.ebuild
+++ b/app-crypt/letsencrypt-apache/letsencrypt-apache-0.5.0.ebuild
@ -5,11 +5,11 @@
 EAPI=5
 PYTHON_COMPAT=(python2_7)

-MY_PN="letsencrypt"
+MY_PN="certbot"
 MY_P="${MY_PN}-${PV}"

 if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
 	inherit git-r3 distutils-r1
 	KEYWORDS=""
 else
@ -19,13 +19,13 @@ else
 fi

 DESCRIPTION="Apache plugin for letsencrypt"
-HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"

 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"

-RDEPEND="app-crypt/letsencrypt[${PYTHON_USEDEP}]
+RDEPEND="app-crypt/certbot[${PYTHON_USEDEP}]
 	app-crypt/acme[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
--- a/app-crypt/certbot-apache/metadata.xml
+++ b/app-crypt/certbot-apache/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>manuel@fritteli.ch</email>
+		<name>Manuel Friedli</name>
+	</maintainer>
+</pkgmetadata>
--- a/app-crypt/letsencrypt-apache/Manifest
+++ b/app-crypt/letsencrypt-apache/Manifest
@ -1,3 +0,0 @@
-DIST letsencrypt-apache-0.5.0.tar.gz 650853 SHA256 503535fa356c45b46a166ea84875bb1fd43e994afee1485bbc3b6849d46c5d43 SHA512 bffa5123a702c02d74c21453a5f5583055986132eb4ae58b72d066c1c5514a1b6832fc381490998c107fbfc1ac8cd403b19b9a1c87006db4e6081e686c2a2fd0 WHIRLPOOL cd72b3f5d6aa95fe983c16d2c71038777ec37a5fdd74a4b51b31cfb72e16e5868c9dc3ec701a30da80e7b99e9409a0fb183f4eba76c58a86434bae0a32dd8169
-EBUILD letsencrypt-apache-0.5.0.ebuild 1073 SHA256 4cc5babd749a2e6c7b77770a3563b254d98b6e62782a1e73fa184fa84de611ae SHA512 835f8e0abffa227960e0fb7e49d06c7ea0db8ef2fe4936df358e258b9e1ebfca98721038685165f764a057bab4ff35c67c7f5a6c80b482edca63cd88a2fef055 WHIRLPOOL 4b2156390df62b59fea5180036c6add21e7484426360f12efca838d46aabcecb260b6fa5ea70d2acb8a41eac5791bb8011316bf9bd9459ef3a80345cd6088747
-MISC metadata.xml 249 SHA256 115c610dd9584e34b88bae272abb3bc8d0088f9980406491ecb01d2ad470647e SHA512 17fba255d5a76a284ce046103fcc05c4c8a217d5fe3c2f2c0cf78fb2271c641256b2e1fb5d3dc6c09d5522a16e0759ac3d15d70e4e55b27b4f317247f39480ba WHIRLPOOL 6c83046dea413ce20248f3d8ba57174559154dec2901fff530051eddeeb970280b87e8ee0052312fce6f430139881392574e3f64b6b954135bb630ed8df1cc70
--- a/dev-java/nexus-oss-bin/Manifest
+++ b/dev-java/nexus-oss-bin/Manifest
@ -3,6 +3,8 @@ AUX nexus-wrapper-2.11.2.patch 1193 SHA256 f77229f2dddaae7205eec13188487ff73a663
 AUX nexus-wrapper-2.11.4.patch 1193 SHA256 031a5caf1355ab11ec474a77ca2b972b441a61caabeca14ad409ab53f2743549 SHA512 c6f3f978a0b96bd696bb5e1a12f67eb81063e98e2552169597f3c944e0e6ea42c734f398712959936538ac5f9d5f5eb6c7f1fc3e43a489325e5f3a69a7543bd7 WHIRLPOOL eff81fa1037b105096e10a940d51b5288d559a2a66fa852987c2f3aa072957c7e81d60d173de26c6f9302efbe52c667c2bdcbd7e745fb590ceb208945dbde875
 DIST nexus-2.11.2-06-bundle.tar.gz 70793247 SHA256 e3fe7811d932ef449fafc4287a27fae62127154297d073f594ca5cba4721f59e SHA512 31b33afad7f31d33af78f9430c04c20ea6a9f4c7391c014493ecd0d02837f9eef99443012682ac0f463ae113b11fb2736078a36f25c1e69f510abc2c5c3a7f7d WHIRLPOOL c4ad2eb6bf1c78ae60de923e741e99bc85c61a68799f8329194648cc6669d0c6a411d0440620069637b480f7cd79ebbbba507a9ef846c678e218c81a084a37f1
 DIST nexus-2.11.4-01-bundle.tar.gz 70938260 SHA256 2901d00c7a5c287d0ab51980b0ea8ad6a3db936e6a9bc7aea573ec4e2b516719 SHA512 6d44422cb87d9b229b21ed564a9275cc3cda38ecf32de1002909750b421787c196702a811eb9f6e15726662ea13614c9d2715a8f944c8a67d5e9162b1e4eae93 WHIRLPOOL a73c37b4126f72b6b83ff9d043da46b01bb41342c7bf28a53503dd44a4c22a2da6e8af33aeb7e7229ed5b01c873576b955d5a7b9c536ed79a050ce49b0c1aa3d
+DIST nexus-3.0.0-03-unix.tar.gz 79751162 SHA256 0666769effc200a520825cce22d59a5a296d03795f72f57d0a97fbe61836d0ca SHA512 e4f728097f0b7e1232538cca2077a20cbd3ed487d86d6360cfb947a9439c9eab82fb286acb1d167f909bb158ef5914d0752e9c26f02bcce60864b7a6cec0ebe7 WHIRLPOOL 2cddeb27ed44ffd844a2c724f2db33206a331eb7dd9ad3e3de42a23afc703bed0eb8c5b76e3363f7c71c4f5897ae49a07a9801aaf424ec44baeff5c2a1c1450c
 EBUILD nexus-oss-bin-2.11.2.ebuild 1077 SHA256 a6764695b07366aaebb582698277df84897a958a5476222549da496e3997287b SHA512 5a312b18e201bd46cb26dd7de974b01c58d11cc15665d4c9e5192f915dbf41fcf7ebad5985198d9061825d1ea929c701586260493f708eeb996c2f255387dbdb WHIRLPOOL abd2162cd46c2e0ca09cdb048a5297eaa1600cdf77945405154e00fa517c26a70c89c7e67225c89b5c77bade9ed6ce5974fec9e2cff1eae3e1e058ee3cb9898c
 EBUILD nexus-oss-bin-2.11.4.ebuild 1077 SHA256 960db2f4b017aeee080298e6bebc6bc599cfe5fa3fae1f4295392f422ad0fc70 SHA512 880a7762fdad21284c82b876cd862b61200b56ac8e0678c69dc7e2517166a5e29f8f2b280990f2c1e6600d8b08975643e9d363c7a4742067847e1e894957fcf4 WHIRLPOOL 35016da52fae3d885981475f592b444bda726c0e353ed2e506aa7deeb057a233d3eaabd8c1b78f54757dbfb4ed2c95060d664dc66e39d11978809c62d4fbf446
+EBUILD nexus-oss-bin-3.0.0.ebuild 918 SHA256 821a3da74ed4429b90058d1bf3f0a8071ad5fd3b2fcc7507fd0404b7e54a600f SHA512 ba2c052e08b4a7f22283ed527125e35c55af5d9811b3eac7af9090120951ebe9cf6b1c6d631c2b9c6eab6815cf2b893f67bb119b14a803fa2b3ba74cab148cba WHIRLPOOL 82320b9d5579aa6cb45f7077166227ce1496fe8d8d93ec410594fa96eba652275fcd5fa2a4cd5d07db9bcda5f7e9a5601535c674ad0fbd6ad6f94614bc2a2c7f
 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431
--- a/dev-java/nexus-oss-bin/nexus-oss-bin-3.0.0.ebuild
+++ b/dev-java/nexus-oss-bin/nexus-oss-bin-3.0.0.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user
+
+DESCRIPTION="Maven Repository Manager"
+HOMEPAGE="http://nexus.sonatype.org/"
+LICENSE="GPL-3"
+MAJOR_VERSION="3"
+SUB_VERSION="-03"
+SRC_URI="http://download.sonatype.com/nexus/${MAJOR_VERSION}/nexus-${PV}${SUB_VERSION}-unix.tar.gz"
+RESTRICT="mirror"
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+IUSE=""
+
+S="${WORKDIR}"
+
+RDEPEND=">=virtual/jdk-1.8"
+
+INSTALL_DIR="/opt/nexus"
+
+WEBAPP_DIR="${INSTALL_DIR}/nexus-oss-webapp"
+
+pkg_setup() {
+	enewgroup nexus
+	enewuser nexus -1 /bin/bash /opt/nexus "nexus"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+}
+
+src_install() {
+	insinto ${WEBAPP_DIR}
+	doins -r nexus-${PV}${SUB_VERSION}/*
+	doins -r nexus-${PV}${SUB_VERSION}/.install4j
+
+	newinitd "${FILESDIR}/init.sh" nexus
+
+	fowners -R nexus:nexus ${INSTALL_DIR}
+	fperms 755 "${WEBAPP_DIR}/bin/nexus"
+}
--- a/dev-vcs/gitlab-ci-multi-runner/Manifest
+++ b/dev-vcs/gitlab-ci-multi-runner/Manifest
@ -3,5 +3,9 @@ AUX gitlab-ci-multi-runner.init 696 SHA256 03fc8cf6f5d8883b69122362202779f1ef8c8
 DIST gitlab-ci-multi-runner-1.1.3-amd64 35154568 SHA256 0ea28a7d53857d31e736f282c3309a6cb89f63ef636834542098e734c6b7c073 SHA512 57f8ecb233d18cd3ebe48d7c1342cad3129ca171ee5b918323ed04ab9433bc9ac7a770e60be1c722be4b94049484757c6bf08a770362b2a8321bba8fca5ad8f6 WHIRLPOOL 4d653523bafaf62da3ab7bfe4671b3ff13d6126b86daee850eca73beaf5e2877357b3f7327395864e4963babee11d79f7c7776b23e34c9a07b3d2ce7b4767cba
 DIST gitlab-ci-multi-runner-1.1.3-arm 32274360 SHA256 6d4bc687580c1847b0bd5a231b5f511bb3dd3ad56bba57551ffd95367398cb56 SHA512 bccebb2311a10e96ad6170e381ab41c3bc4e8127c7605e9ae667363b52e87d37719ddb368eea649cfb765e6a7a5619eb3941ef9aaef685422527175abb9c805a WHIRLPOOL 3eb9f7f9c7792aaa1d983c96a2eb515ae0139f487a69d903038155ba9d188c7f1e6c2d0e5ba69502b8130e3d7fb25c09b629aafa44766f484e469c0915222aaa
 DIST gitlab-ci-multi-runner-1.1.3-x86 32445128 SHA256 961a232106d3faaed528d3aabe7b023b8bf1f622bb13dc4408808fe238699cdb SHA512 3dadb3d7bad25029fe42f5136caacf656db9662b52ebc2f94b9a2c844dd922cde87a93682854073a038ff82b3fb5f1310ed10e8bc8b0e19cee6c2d6461736f65 WHIRLPOOL d8d67012a916812a5a01e5749118851ed972fd0a82fdd92a776504ae1e86bec619c29e6cf672d99e94ac7e9f063174882e641a039fa5a67aba6638d966d79f82
+DIST gitlab-ci-multi-runner-1.1.4-amd64 35350128 SHA256 0674fb0669a7de3c20ed70b94206ba0f2e2e90058458a8df2818f78700ed21a4 SHA512 0a7c1fc6530f28d6b0d6e804a5cea44c49c204d0e5f3a7fbd51ad9ddf61b5e6d3e7d3ee2360b746c421fe351705cf7e2fed2d983afc68383bdca2fd8f1686a23 WHIRLPOOL 274caad86300d0c564e13cdc9d236b621ec768ecd9605e620a6401958d84757c7cc104ac93a93d007b08913d84163d630fe0bff97404132f6505c5384acd856e
+DIST gitlab-ci-multi-runner-1.1.4-arm 32386448 SHA256 e5986b65a642124d355aa25822b12f46f81b5ab3a4922f99693788072f8fb4a1 SHA512 e202da365233adbc817036a1a80fea703185985f1ffb4d1d47d4c4efda111cf39d638801873b4bda734aca0708d9f247f5e62a711db4511141b69e4e0b297653 WHIRLPOOL 478bfd2fec6eb2f9825e40b79dbe9b84d88b3728621d9686f9a1c642d9b0ccd762ddc03a8f52855c7b9313ee3e07bbd817e9ff7bd9ea362623bb2397e3c7f491
+DIST gitlab-ci-multi-runner-1.1.4-x86 32562200 SHA256 4b5cc4a70d7f8fdb5c389c7525aba24a1cff82f8e76dd01cd7f94c4a053e457d SHA512 c46fae0766b863fb8e41abbf74bf5d6dfdc94daa412850a65711ab97113bd62c2c1c4685d5d12b5508a245aac9448ea4c5da0b0cc925bc525ec22f5d04157a1d WHIRLPOOL c2ca6d6465469a37c1567681638122f401db48b0cc81c5e507a89c90c2a74f25631d0b1b77c00d22868b6392c085c55c7b3b5fa95aabcd927555a0d906520be8
 EBUILD gitlab-ci-multi-runner-1.1.3.ebuild 2349 SHA256 6432c48b3a7a36c0b28ccab7fb79382061fa9296df9b6dc9ca32d4caa5f20702 SHA512 2a7674d506e79d8570fa8527dd10b87e775a75b4daf41458bcca28f5ad9863145571d4ebf9d9e0d9df015e48c89a7bd4a05d1bc7928223fdc2b7fd528d5282d8 WHIRLPOOL 6df8346401d631b58a3a6e1ce9f2c0e3e8b871e99880099463dcb9b5639d08b3725c7c83e7f96dfe7e8cba4e60abe77e2afbeb2c7ae8ec13cf02b05d1723fd9f
+EBUILD gitlab-ci-multi-runner-1.1.4.ebuild 2349 SHA256 6432c48b3a7a36c0b28ccab7fb79382061fa9296df9b6dc9ca32d4caa5f20702 SHA512 2a7674d506e79d8570fa8527dd10b87e775a75b4daf41458bcca28f5ad9863145571d4ebf9d9e0d9df015e48c89a7bd4a05d1bc7928223fdc2b7fd528d5282d8 WHIRLPOOL 6df8346401d631b58a3a6e1ce9f2c0e3e8b871e99880099463dcb9b5639d08b3725c7c83e7f96dfe7e8cba4e60abe77e2afbeb2c7ae8ec13cf02b05d1723fd9f
 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431
--- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.1.4.ebuild
+++ b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.1.4.ebuild
@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user
+
+DESCRIPTION="GitLab CI Multi Runner is the new build processor needed for GitLab CI >= 7.12"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner"
+SRC_URI="x86? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-386 -> ${P}-x86 )
+	amd64?    ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 )
+	arm?      ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-arm -> ${P}-arm )"
+
+RESTRICT="mirror"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm"
+
+DEPEND="dev-vcs/git"
+RDEPEND="${DEPEND}
+	net-libs/nodejs
+	virtual/mta"
+
+MY_NAME="${PN}"
+MY_USER="gitlab_ci_multi_runner"
+
+DEST_DIR="/opt/${MY_NAME}"
+LOGS_DIR="/var/log/${MY_NAME}"
+TEMP_DIR="/var/tmp/${MY_NAME}"
+RUN_DIR="/run/${MY_NAME}"
+
+pkg_setup() {
+	enewgroup ${MY_USER}
+	enewuser ${MY_USER} -1 /bin/bash ${DEST_DIR} ${MY_USER}
+}
+
+src_unpack() {
+	local a="$(usev amd64)$(usev arm)$(usev x86)"
+	mkdir -p "${S}"
+	cp "${DISTDIR}/${P}-${a}" "${S}/${PN}"
+}
+
+src_prepare() {
+	chmod +x "${S}/${PN}"
+}
+
+src_compile() {
+	# nothing to compile, binary all-in-one goodness! (?)
+	:
+}
+
+src_install() {
+	local dest=${DEST_DIR}
+	local conf="/etc/gitlab-runner"
+
+	diropts -m755
+	dodir ${dest}
+
+	exeinto ${dest}
+	doexe "${S}/${PN}"
+
+	disopts -m750
+	dodir ${conf}
+
+	dosym ${conf} ${dest}/.gitlab-runner
+
+	# fix permissions
+	fowners -R ${MY_USER}:${MY_USER} ${dest} ${conf}
+
+	## RC script ##
+
+	local rcscript="${MY_NAME}.init"
+
+	cp "${FILESDIR}/${rcscript}" "${T}" || die
+	sed -i \
+		-e "s|@USER@|${MY_USER}|" \
+		"${T}/${rcscript}" \
+		|| die "failed to filter ${rcscript}"
+
+	newinitd "${T}/${rcscript}" "${MY_NAME}"
+	newconfd "${FILESDIR}/${MY_NAME}.conf" "${MY_NAME}"
+}
+
+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 on"
+	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."
+}
--- a/dev-vcs/gitlab-shell/Manifest
+++ b/dev-vcs/gitlab-shell/Manifest
@ -1,6 +1,6 @@
 AUX gitlab-shell-2.0.0-config-paths.patch 1356 SHA256 442a8e18b4d8e6092db0d39659cba5e41404e90f21070ed50b5460177f28f1b2 SHA512 0445cd42086b2d77825c487d604ddcb11f8fdf4eb8dcdfa1fe1b8e8c24d7b8f273834dbec0bfbb763a35a74605d558cc8d3feaa056eb02a113d18124a764551e WHIRLPOOL 0e3367b229ea4f13818fe2e485dc8da83ad695aec496881cb5eb918b183029b0013518ca64acba1568d93dc418dfaf083c2a86b9f2e3adf9fe15cad038011b30
-DIST gitlab-shell-2.6.12.tar.gz 36201 SHA256 b8d88ffe414d9e61ad4fd3942d19675de03521ce32a56558fc860ac2840ff98e SHA512 b22af5983d2406834e486a784958eadef501020165d7f3c4162a248afa4b9a42ce8169e0a6c7fd35d9e5160a0634d01e3a44e3d3a4231918ddb1a308f2de0415 WHIRLPOOL c40325cbfeef2e06e3f3724d0bb8bad3fb7380079e7ea453b75826206c0d202f235c6dc02bfe7fd469f64cc72018c9de6620fbdca589f7b4ba6ee8c821031176
 DIST gitlab-shell-2.7.2.tar.gz 37901 SHA256 2cb4bac3d5888154f39a51b717ad2ae0795c6c59ecbc97deb9c94f51b1c9af27 SHA512 7b28d6593f8752e79f78f24c1be216eb94a5bed827e12ef96fe3f04f57e55e9eabfcf66259df8191d5eee7932a788d0f9f36e4d1658a296547c4c9021f6d7662 WHIRLPOOL c1211d5195e9c92325dc0cc706cbfad29f3df91ce63e8926bb91112846739f65249fcec511c54fc1c52cb8ac123f695010ffbc360e11c5ab7e289c93902cb2fe
-EBUILD gitlab-shell-2.6.12.ebuild 3516 SHA256 5ae386bd0f8960b1d068530a5b8502651c76cb43195502f76551a4249a510efc SHA512 ed9d009a894ee3ae2f1d140aec64f8c9ad4013178419f87f96e57f5cda4dbd7b099436568cf3d718d25753e405d859bb7bc8aea2c4683a14b024b942503eaa13 WHIRLPOOL b325873e31a1b5b8afaa4ba3678ae8435c20678b5ad720482283f48ba217f48cfe50c533b13c7e9bfb4e32719dc8155512d743b7f7db3dae6262e07612519331
+DIST gitlab-shell-3.0.0.tar.gz 68088 SHA256 3b00daa0e003b73a34f20ed06b4c0298b33099600de7832bec25bfbce525d779 SHA512 97874a4a76240b73e3dac93510910fde847d0ccb8906011412091769345a2efef82bd187609ea2596b6a7b1838fa144eb62f9e246f4aea396df96316f18121e9 WHIRLPOOL 378b9f9a879e4c011fb0714387aa0f24616e6cb8c19084431923cc24853212e0319dffe5081a0b556dca41712e5015538a7038548bcd737cd9116fecbb2421c9
 EBUILD gitlab-shell-2.7.2.ebuild 3516 SHA256 5ae386bd0f8960b1d068530a5b8502651c76cb43195502f76551a4249a510efc SHA512 ed9d009a894ee3ae2f1d140aec64f8c9ad4013178419f87f96e57f5cda4dbd7b099436568cf3d718d25753e405d859bb7bc8aea2c4683a14b024b942503eaa13 WHIRLPOOL b325873e31a1b5b8afaa4ba3678ae8435c20678b5ad720482283f48ba217f48cfe50c533b13c7e9bfb4e32719dc8155512d743b7f7db3dae6262e07612519331
+EBUILD gitlab-shell-3.0.0.ebuild 3516 SHA256 5ae386bd0f8960b1d068530a5b8502651c76cb43195502f76551a4249a510efc SHA512 ed9d009a894ee3ae2f1d140aec64f8c9ad4013178419f87f96e57f5cda4dbd7b099436568cf3d718d25753e405d859bb7bc8aea2c4683a14b024b942503eaa13 WHIRLPOOL b325873e31a1b5b8afaa4ba3678ae8435c20678b5ad720482283f48ba217f48cfe50c533b13c7e9bfb4e32719dc8155512d743b7f7db3dae6262e07612519331
 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431
--- a/dev-vcs/gitlab-shell/gitlab-shell-2.6.12.ebuild
+++ b/dev-vcs/gitlab-shell/gitlab-shell-2.6.12.ebuild
--- a/dev-vcs/gitlab-workhorse/Manifest
+++ b/dev-vcs/gitlab-workhorse/Manifest
@ -1,7 +1,10 @@
 AUX fix-Makefile-0.6.5.patch 377 SHA256 e96f13b11f1e05042542dd9bbf507954634b23674e15ea76a97503d484fee7c0 SHA512 13282a291239425aa4de8186dc0db2f8e06c3c1441b71042b3885ff9621ce2f7391e06f08463e671a134022bda74fbe8c836625eb3f8dd38c54b875810afab2f WHIRLPOOL 9d926bef63fc66f08d0b0235116540d6ba8d8a4d071b4305227090e90cf4a5ae58cf720f1c5a93680f391fc8cc818fe72e2c12f19ae004fd7a18df788c64c4ea
 AUX fix-Makefile-0.7.1.patch 377 SHA256 10fa5bfbf9d61de4f07d0f117a0d2e2498f97b7a23a04f37e0a0bcfdf87c69c1 SHA512 c25175937b18a153f63990d37fb3161aa55428df3f7f3d9e1bc22836c055511cee649a998239c9765adbc1273ba8059ac2b1b1e2b3c4d016d762ccb78834a5bf WHIRLPOOL 85ecc6518b540a8cee0189e67c0cf3b67ca1943e4ed3433ea6827fe37fda11d1ac741b142d7d43ccc2afe5d4b85b6a02b9c603c21bc4df1b107e4a411cafc898
+AUX fix-Makefile-0.7.4.patch 397 SHA256 99b860adbb10866a9c9891c567d322c61a521e37b4e8f0861414aa03a09e459d SHA512 497c1102aeb348629b79245de421eca2284e96ea29f0037bda13933a2519c43bdf40baa0d2ef7833fac7638b6b8f8159623ee87b2d8ec9369f250ade549f92af WHIRLPOOL fe2f63c8a7560b43811419ca5f56a7f633fd88c78a7c5266c13b08a58364fdd015296dd15ea1dd90da9a38126fb9a3a54e585f3c8dcd6ecbf0e2f1bc29c2191f
 AUX gitlab-workhorse.conf 248 SHA256 6d11d63aa869cfd8c6f77c3a875984c226db633be899ad7ce97fafe94236eee7 SHA512 234213c8361702bdfeea40bd306b5899de19f34ce985e090a86e01aa601cf4ed23da4dfb75f74fe5986bbea5535a7a6a745406b4f67f79d352bd1c863777c7f1 WHIRLPOOL 8ac1134cde3aee942466d206e703ebd5330f83537d7e29641447f812d857bcc57b07fbf82eab086c0d622750694f64fabf8ffca2ba26a725f61b40fd1941e963
 AUX gitlab-workhorse.init 653 SHA256 f38c37ed818cb8c25fb800bfcb5448f659e876b78ea33ea7a1ba3c80e73ea95e SHA512 2667997def39e6dc17e6a1d9be06d6e855d5d3e956e64d93bb3e74bbad0a1d427dc034f9c139f3b05e2666abab014404b2c8013c5347f4ec25fbf5ef86e7e88e WHIRLPOOL 63cd7ff80d88676b44c2d6ccdadf74907d5f8e4268f03ee11775c423bf95955f9d3aaeedd79fa6e0486b2d225336eb2ffa165dd7b9ac87ed0c2d403dc7e5afb4
 DIST gitlab-workhorse-0.7.1.tar.bz2 26792 SHA256 3f00a7813d84a86980d739fad30e527257ff186fd0e3df069d42760b6b056ae7 SHA512 7d9a02a37a6e4612c07a7ced022151a19d783e902fa21bd1a401066101ff07e61ed281217bf01bd7f51ae5cd329eea212ebff1c01d30e80d52d4a8b71bb94eb3 WHIRLPOOL edf291bbf981b58543169c839b449e92b95ecfda0be127429c6490981380e00e1cefc0a0684dc38dbe9f573e93e37f51f0d4b5385418b10af16a5a12c77f9b80
+DIST gitlab-workhorse-0.7.4.tar.bz2 27353 SHA256 61f0b4e6a786ce24101283f14d863d58b9b0703897b8967dd81b571a0dde54ca SHA512 f00b92ed25956f5af1db1c58c0ea8bdd9a36744d258dbdbaedf2f6c9ddd1b0a552667c20f2265ffd0f95c1abf73644743d39829f123a41466b1270c208f88684 WHIRLPOOL 5f3aab30d4acbc70604cb08c3b26d865d055441384de25c1d03e9d69633d8ee0be57169784422a17e2603efb0aeb1d1c9afc1a67aa10e834e7d53db444db496b
 EBUILD gitlab-workhorse-0.7.1.ebuild 854 SHA256 c9e78983856490f7b638453356da30d6396f96ea3960f990e9cbb5dbef249eef SHA512 3c490abda76ed861ac7c126a656b91c4dac72f70ac99688865ec8a90a5aabb34f6d767899445510b9bbbc4edd30ba6b756668bb8d7c529dc000ba7fd570801e1 WHIRLPOOL e03f624cb7eceb56d45e638f772b935086bda3c21ec9e7e804aaf2449a2f6546da6d3143fe8499343b0fa7dc489a9413f1720a757d09e0803d8105af34116151
+EBUILD gitlab-workhorse-0.7.4.ebuild 918 SHA256 e7466db698fae0bc0aa112fe9698bc94a862f07575df0dfbd098c9125382d058 SHA512 48757189f18c1c6cbeb5ede420cce8adc4fbb807cf8f1c06e937dfca212fee1dc7bc20cf52d6ecf58bd872f2d7c0e821f0e41fd4ad042c0e857221a9265959d2 WHIRLPOOL 26a76aa4900e4a231b52c6ff3230ebcb72fba697fc13ccff893c5fda66bc2b75f7f87a391eb6cf6e15bb8b0bb1079917c34f9ea90667c2b3ae421d59a74327ce
 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431
--- a/dev-vcs/gitlab-workhorse/files/fix-Makefile-0.7.4.patch
+++ b/dev-vcs/gitlab-workhorse/files/fix-Makefile-0.7.4.patch
@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index 9b3146d..b3c0630 100644
+--- a/Makefile
+++ b/Makefile
+@@ -1,5 +1,5 @@
+-PREFIX=/usr/local
+-VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
+PREFIX=${DESTDIR}/usr
+VERSION=v0.7.4-$(shell date -u +%Y%m%d.%H%M%S)
+ export GOPATH=$(shell pwd)/_build
+ GOBUILD=go build -ldflags "-X main.Version=${VERSION}"
+ PKG=gitlab.com/gitlab-org/gitlab-workhorse
--- a/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.4.ebuild
+++ b/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.4.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user
+
+DESCRIPTION="This is the new backend for Git-over-HTTP communication needed for GitLab >= 8.4"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-workhorse"
+SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
+S="${WORKDIR}/${PN}-v${PV}-dc9b6c39cf725129662413ec29d115b500be935f"
+RESTRICT="mirror"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+
+DEPEND=">=dev-lang/go-1.5.1"
+
+src_prepare() {
+	epatch "${FILESDIR}/fix-Makefile-${PV}.patch"
+}
+
+src_install() {
+	local dest=/usr/bin
+
+	diropts -m755
+	dodir ${dest}
+
+	exeinto ${dest}
+	for f in "${PN}" gitlab-zip-cat gitlab-zip-metadata ; do
+		doexe "${S}/${f}"
+	done
+
+	## RC script ##
+	newinitd "${FILESDIR}/${PN}.init" "${PN}"
+	newconfd "${FILESDIR}/${PN}.conf" "${PN}"
+}
--- a/profiles/updates/2Q-2016
+++ b/profiles/updates/2Q-2016
@ -0,0 +1 @@
+move app-crypt/letsencrypt-apache app-crypt/certbot-apache
--- a/www-apps/gitlab-ce/Manifest
+++ b/www-apps/gitlab-ce/Manifest
@ -1,6 +1,6 @@
-AUX gitlab-ce-8.7.0-fix-redis-config-path.patch 781 SHA256 61210486d4d73f442b9fe3e38367ce278a2a476ffe78b39813436dc03ac346ae SHA512 d027e1cb081226488c899046eaa283dd03de802a39780ce99a69a6620ed79e4b8f85b40b496f925f89b5406c54be294f0fded8c4fa346c703779bb9f68f703a3 WHIRLPOOL bfd1cd51197d30bfc2e7f99b36b554738d08505652f492a02254ed6369f2654ce762265d2bfb93aec398c35b1888d0900c8e9d463cf1565c3d4d8b5be9248d4e
-AUX gitlab-ce-fix-redis-config-path.patch 809 SHA256 10518b34b43b934f60f4b4d36c3570d75e62f7cd4fe84a720c93d952eb739566 SHA512 9e3a607ebebdd2b2ba33835facb185217ff3b7c1930a748598419f0a7f2f49d01a73071984ccb6e46ee3333cd654b6fc189bc04346b49544a108d49fec18beeb WHIRLPOOL b015028fffce5f0e97a273e6578e5d34a034cafb65a0518a6664a60a571dee89d99fc2f776069653046e7c01d3f786201b31cd04d1ba606dd30108b4c07cceb3
-AUX gitlab-ce-fix-sendmail-config.patch 731 SHA256 51f0d0af2a7c048d7cff56cf27955632f340ca67f9d460af840cf34ed60ca574 SHA512 b10d5b8d89927404d25345e17ba37ca4e7848b04c2ca20c5eef14eaac43d9ba14b62ae4c0d532eefaf6f9a2944578e84eb65a3420335d32495855c4807eec356 WHIRLPOOL 66f6443f311f2355ffd4efaea914f462816a1966a715b3b5ffaaa26b41bdced928b9905b8606f06fac3c2ccf20741553cfed2615430287bede01cf376aae2a60
+AUX gitlab-ce-8.7.5-fix-redis-config-path.patch 781 SHA256 61210486d4d73f442b9fe3e38367ce278a2a476ffe78b39813436dc03ac346ae SHA512 d027e1cb081226488c899046eaa283dd03de802a39780ce99a69a6620ed79e4b8f85b40b496f925f89b5406c54be294f0fded8c4fa346c703779bb9f68f703a3 WHIRLPOOL bfd1cd51197d30bfc2e7f99b36b554738d08505652f492a02254ed6369f2654ce762265d2bfb93aec398c35b1888d0900c8e9d463cf1565c3d4d8b5be9248d4e
+AUX gitlab-ce-8.7.5-fix-sendmail-config.patch 705 SHA256 cfc4ffd896e03cc763601aca5cdd5ac43f85152705cbf5a4e9144a6156d6f77e SHA512 a92659db8cab022185d87f321b037b1731612bf5f89b9df4552dd49b843bb49b6019f8ddda96a6fd6cb6544664a1c3d52ca5fee2c11be8b33698cc713219510f WHIRLPOOL 81a6504a8583bc46ea4005d9f8a2113802439161c40f11d3da46332b8980fc6b9520d81d9e32a6555bcdc893245448ba9151a271c511ae87f6468f588d4804b0
+AUX gitlab-ce-8.8.1-fix-redis-config-path.patch 349 SHA256 df585c942ecfa71968e90521f5621af59befbe3bbe48ffbf49a49ddeae989e93 SHA512 af95d7bb4909ca1205098a791f97cf00126ad3407a9bb5c4e8d699ed7ca46843af2fa38cf148c8575b48617ecaa8822e65dad612bda5716acac0dbf10592df6f WHIRLPOOL 40193ae35cbe620d79fb7eb816efaa5a6bef870b4962d81ed6d9267045b2514f6ef4ae129893e06a2c9b06ae695735e50381595eaa1eabd1cea1e5d72711df73
 AUX gitlab-mailroom.service 773 SHA256 39cea460db7fc505b136a2106902d0515890180e74913bf364aa499368fc5f2e SHA512 f82c63a180add1103e2bd115e67826ad7362a844991ef16f1de7fc6c78bf1955155ecf278fc0d759e674ab85736f3ba2a6650d00e9b3ce683316875efd9efa3c WHIRLPOOL 683c67b12f9666d1c1df5ec61e0072acaecd3aff43d0ff475037e178bc58fd9036ae6d8cd45e922098c842abd057231afd4767ce229d4581356f153b48a06208
 AUX gitlab-sidekiq.init 989 SHA256 72f9acb269b2e60f7571b2c658f7f29e9c36c6987c9fc8f1d02b9a1bae8ba747 SHA512 cc6ab63f238507bb4a66f48f8df487a8c493afc0e0433ed82c09a7b6dec984a45f465c526cf7be70f485222607af0baa04e7057183f16badcf04950b43fc02f8 WHIRLPOOL 0cda6727f0f0a7a15eb4476c9d651fb5aa6f7ccf9c23a24d040576309c8a30aa6e1790974c82de9656f316c2d9beaf0d1fdd100cab1b7ac7f8cebf2079a13dbe
 AUX gitlab-sidekiq.service 1066 SHA256 b9a15ee7498cc5ebecfd51a037ab1e32e66723a1612d5ce9365eefd890b5670e SHA512 33ece22389637b7b4591f4dceedb488fb43a92ca47facb19432f87772bbbf1774d4fb737ace52a6d55533c9e291e343dc56971c6f70fed285a10429d6d97d318 WHIRLPOOL b5a81751b8317bb9244018f9ed82f9793734adbad9983c244429a33d710169eeeed25cdf868d724032866d83bb9676ccbbf616b53363491e15a80e474443f331
@ -8,11 +8,13 @@ AUX gitlab-unicorn.init 2553 SHA256 9f6d3276d52589a5224c1a9b5a117a0d5d3e83317d75
 AUX gitlab-unicorn.service 773 SHA256 010c9e223a30400d9155b39499eb0d7efad23b66baab9fcd9e365c689086b9bd SHA512 0bf9630aa91ed8f590a7bfa42d09b7ba33f6342b43b3d191c792c11157f8926c2a2ac2390eebd8179637e29b5bf68233d4699d62463497a0fd45b9bdbdd9167b WHIRLPOOL fbc709a5550dcc548a35c22c812dafe52ee507f5678b57c22c709ee89a399ae9109e2f56b7a13135d4140f1e024ebc4effe4aa4de13e0f36691da2a0737d9792
 AUX gitlab-workhorse.service 930 SHA256 09348a52fec333b4b19828752e0484400c1efa9dfb644723fcf8e80537e294b6 SHA512 6332024fe0049287899cf482b6e4439e9dd90da14e489d08aa8e5e79cb7872efcc517d99b69fa23b011b382acb1e5926496a78f08af5d2d64daa515b869a0c6a WHIRLPOOL 3749c6719b2a35c7de29763cd616e1e9cc30a85aa1630ffc46440334459b5922503d52629556c125a6dd6574bdc5f23f1b2a7f2a85e2270a415b22246e0b6bae
 AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c101f43ca263 SHA512 909c49fee6d050c1e94b2559ff2a9d54c5c346492be0e2920b50d56d69eaddbed67e3ac12e012d2a9601b5596640ebf33c8dc68fc588a03ca370d963294be37f WHIRLPOOL fa436e8d7d2643d450259d26b6e7b24dae69df47ed22e5ef2a567f37aa785fbf3b0eb1129ae7c8bf8986c29559fc3b744a34064375e5245dce2b10053cd715d9
-DIST gitlab-ce-8.6.6.tar.gz 16092738 SHA256 f133304669238c339bd6e112371e8c50c54c1e7459685c2ff316bf5f7e10958b SHA512 cbf1601e7c16f8154f6d86134d7cc8e80644d28872e81e9e15d039222dc17e544cc0c15b932fd9ad402e3e5919b0f74154cde0b4bd675e070c36de20fa515aa8 WHIRLPOOL a39ea8e31585081420938102a0ba8f89ba0e68ca1c6dd40714bca43a0245846922f7cd47c70c149cd95e6229d0150aa76ddaac467c9308b62d2f7428baa9311c
-DIST gitlab-ce-8.6.7.tar.gz 16091899 SHA256 2771c5eac15e035eb50bd19da7cdd926499faeaec670827324a1e0f13a8d7e68 SHA512 c6dc93b94fa78f80a66f3f9308f97ded5aa7ae55c82c477573537fd73dd57934b30d477e8f245affef4bafd809b1f3a94c837e3e1c64948cbee03a7c334766cb WHIRLPOOL 6fb2b84545d171f637740c6cc27eddb667afc55690ea735ab330f202e971014de8abffcabe7c60e7072f303a08d3685bfd9c217035482303111e57a94006285d
-DIST gitlab-ce-8.7.0.tar.gz 17637673 SHA256 1dd06bd5ff44787ca501e6d567e962dac27d5e08c91631a60f7dce7453b0acdc SHA512 9d31b2ce618400e0da26a578a14b04ff8750a2759e2c04884823ed4a895b4de2cc33dd7d879fe831fb157783e970ef5df6ae10663202cb426eef26aeee48f925 WHIRLPOOL 5cabcd3f958a3e48c557cf2e2f53486945975afae8af27cfabcfdbbbb174aefb540611eb69257aefac42093dca583df38cbe38dba88214835a185f29dd6c5c7b
-EBUILD gitlab-ce-8.6.6.ebuild 12332 SHA256 d604c907120b37873c20f2e20e603f27e36edd729e1addf7a773d15cc3ad509c SHA512 a613ba77d75f6964e8c8c0fff6c45eef52874dfbed5303004cfc5ecb697134f16aa57f8a29ad0ae46a74035fde4a3de19122af16013db2a9da29cb6b92c82b20 WHIRLPOOL fca18db3b2bc1f5b9e1835555b1766f15142a070374d533e8383c206b4c424568b80bba1b27cf91a6814b4bf287be2c6cdbdadb474770efc396bbdac801089fe
-EBUILD gitlab-ce-8.6.7.ebuild 12332 SHA256 d604c907120b37873c20f2e20e603f27e36edd729e1addf7a773d15cc3ad509c SHA512 a613ba77d75f6964e8c8c0fff6c45eef52874dfbed5303004cfc5ecb697134f16aa57f8a29ad0ae46a74035fde4a3de19122af16013db2a9da29cb6b92c82b20 WHIRLPOOL fca18db3b2bc1f5b9e1835555b1766f15142a070374d533e8383c206b4c424568b80bba1b27cf91a6814b4bf287be2c6cdbdadb474770efc396bbdac801089fe
-EBUILD gitlab-ce-8.7.0.ebuild 12330 SHA256 7be51d548e4a21f9358c2a601c3df8be601a3c306ddb9396d2d83b0e268b7756 SHA512 30e34bbd17c868c3fdb076ac226abc36ef04e16e8c57c566a8a521a7244112039b020e2c93d578ecd4c2ea82c7646b1831402fbd67ff4e568108e5c17302b454 WHIRLPOOL 4007dfb1ab2e0eb4a45a4681b7a7ab23d6724844bc9f1f13cf77e76ef27133dfa3ed4b6a40975de27c77da581901a2d91194ca74b8be97cf4ec52d2896bc5629
-EBUILD gitlab-ce-9999.ebuild 12341 SHA256 89c4254f8fcef178ecec1d9078b04ca27fdf6cfe2c2425475aa3b43d399c287f SHA512 3ec28bda4a1e25435abbe1f498ac051befbce6361b5dd2c875603b049a55f2c386366e618d148726374669911023ed6711b7ed6893ae868ff308f5ea4c3ecc35 WHIRLPOOL 7eb9c656019fdf15a602f79337532dfa71551e373b62509475aedcae4dfc542181b91683e6e007d1808822e4214dd0803748917895793dff80fcf5b146f27115
+DIST gitlab-ce-8.7.5.tar.gz 17642879 SHA256 170029e20425b070b1c96c0480f5a2dc09bc4bc361e487b6572f67b138d6f6cc SHA512 138f2d2523aeb4f1dd5130720c0856c74b504463f0b16aaf9217f5dd982a84f93f7dcc684e3719cee9a0e64fc246d10249bea65068a3687f46b76821580c8a4d WHIRLPOOL ca157eeee5b68d3d4327593f6e15ccdf4728ebc4833ac2994b6ecf0379aeb6eec9a851f6bf42a0f09971365849b0fa06b8fe9acde2194bcc818c89b4b871b950
+DIST gitlab-ce-8.8.1.tar.gz 17813843 SHA256 842519d8bcff1e7e056c83fdfded8dc042e34d8d8402a5ec2b748b155e0522c0 SHA512 19c0e84c896ac2af3794f9b5fb1a6b66bf466ffff32eb97628fe21e2b27ca3e608729203affa9007e61be5dbcaeaccd80532ab465a8947e3b2d225b5374cc802 WHIRLPOOL 29aa229baaa5e41a0d79315c23d65e770b1a732bbde6f9af7e3afd43e2857424d40f10ab51f28dbbefb3ab9edca06be10651dc22b590ad03e27bf45c1bcea25d
+DIST gitlab-ce-8.8.2.tar.gz 18475752 SHA256 a726fe8439a85f3a22fd3df31b2ab6d8ff9ab4301090a399c439ec27dbd6d3e0 SHA512 57d1b0874657b225b34ff7421cd2a1f3b5bcd0261bd9f44a761302fb81622f47296c896d726abb94530337b2a529bd7a1504896e5240252015d4eaa4c0993cc3 WHIRLPOOL 0ed528deecb909c4bae253be7b5066ff14c864efb9f0f6ae8d8a3649d3f2f84887caa57b385d7ae58e1fc6cb59e72d9da3847310e11e139134b06374361af1ea
+DIST gitlab-ce-8.8.3.tar.gz 18477429 SHA256 afacbb6ab40b8eb02825d3ec82125c3f23cbb28d816cda2f7b24e8b3e3cf1861 SHA512 d8907a1c3ac4e98e2332100b72b3a4a1c804590873ac8b115b0f76fd9b7d275db4ee0474be9343b053fcc602512f0e0537f90f10533375da1c829a648d172904 WHIRLPOOL f8c9e326714da3fd791ecf452c88ff91ef95bc1d8cdf104fc8facbd855cf9345f51b86f612225915c04da474f3879fa80797a718c187c975309c5f22cc140b7d
+EBUILD gitlab-ce-8.7.5.ebuild 12328 SHA256 19aa6d76fa724ed44c5518edcb2fe48c351047b2a57ed632d3b9427c96776232 SHA512 1f3a250061e46b3d4eec7ecb089b0d57c5cabc093d992aef26b05d29be39432868d2d3e64abe10294dd68dc8fc5de8d4a464332e66d1dafe9af88e2d305909e9 WHIRLPOOL 6f9887e1914297e41daa34c8792a5c2cdf8dea6092dedf5aa151f023190473db45782dba30f17c7c03d62a496a20aa3d576a7029b970122806a9b7e0913308d8
+EBUILD gitlab-ce-8.8.1.ebuild 12335 SHA256 3b0889b1560663ec37f63a67c0191baef646d1858769ac4bba20f2ecbb0a43c6 SHA512 3867329ef7b310b412935cb27d6650ba4d1f32d373196d21e8255510283304dcd7fe9cfcafc1ca6f17ee195c4eeb9440f848a00ded50148374c47d4805e41aff WHIRLPOOL 4ce78d0e2b653848159f231bf89802cd1e9d83269994362b5dfb1ce2b27d12eafdd0d8961294d0f943231eb38a5e78a3c7b66547d2d875e410bd23aafb8968b6
+EBUILD gitlab-ce-8.8.2.ebuild 12342 SHA256 0b528722bb3bc7d232dc6a272973bf8da77992fefa308dabf4b7a9fba8548c18 SHA512 430ee8b469bf43bd8889e9375c49ca83a35d2956c6964e0f1dd07921fbb124a8d7decf60950fbbbc836025d74e73da1e7c89119da2348090d163eb6062739fb4 WHIRLPOOL 3730bf6b32dbc0c3605b15a953114aca56faf859f83672f05ad0b92251697a9cc0778b13d3ba3fd25ddb0858e8ce43b400573f68a605e063ad9bed8597c29fc5
+EBUILD gitlab-ce-8.8.3.ebuild 12342 SHA256 0b528722bb3bc7d232dc6a272973bf8da77992fefa308dabf4b7a9fba8548c18 SHA512 430ee8b469bf43bd8889e9375c49ca83a35d2956c6964e0f1dd07921fbb124a8d7decf60950fbbbc836025d74e73da1e7c89119da2348090d163eb6062739fb4 WHIRLPOOL 3730bf6b32dbc0c3605b15a953114aca56faf859f83672f05ad0b92251697a9cc0778b13d3ba3fd25ddb0858e8ce43b400573f68a605e063ad9bed8597c29fc5
+EBUILD gitlab-ce-9999.ebuild 12347 SHA256 709ccae7ec6c98868c8a054da2cfc0f68745bdd6e3cb600b5a2e473a0dc95703 SHA512 51191da52049563da5569132e652688bec7c4cc2c4d9267f751b6b13f3028762632d991b80d22f481532308a088d0f287060da04736cdbec5f6990d1fd9b7d53 WHIRLPOOL 6c3aefe4c3d35d7c0d984a51608e72d106f06d5fd93a5e22a56cb8345c212660b3d8d6758b3a6d2941961f0a4880b755b6558447a34f8615b44c1145246826bf
 MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1
--- a/www-apps/gitlab-ce/files/gitlab-ce-8.7.5-fix-redis-config-path.patch
+++ b/www-apps/gitlab-ce/files/gitlab-ce-8.7.5-fix-redis-config-path.patch
--- a/www-apps/gitlab-ce/files/gitlab-ce-8.7.5-fix-sendmail-config.patch
+++ b/www-apps/gitlab-ce/files/gitlab-ce-8.7.5-fix-sendmail-config.patch
@ -1,9 +1,9 @@
-diff --git a/config/environments/production.rb b/gitlab-6/environments/production.rb
-index 82eb250..10e25e5 100644
+diff --git a/config/environments/production.rb b/config/environments/production.rb
+index a9d8ac4..256770a 100644
 --- a/config/environments/production.rb
 +++ b/config/environments/production.rb
-@@ -73,11 +73,10 @@ Gitlab::Application.configure do
-   # config.active_record.auto_explain_threshold_in_seconds = 0.5
+@@ -69,11 +69,10 @@ Rails.application.configure do
+   config.active_support.deprecation = :notify
 
   config.action_mailer.delivery_method = :sendmail
 -  # Defaults to:
@ -17,4 +17,4 @@ index 82eb250..10e25e5 100644
 +  }
   config.action_mailer.perform_deliveries = true
   config.action_mailer.raise_delivery_errors = true
- end
+ 
--- a/www-apps/gitlab-ce/files/gitlab-ce-8.8.1-fix-redis-config-path.patch
+++ b/www-apps/gitlab-ce/files/gitlab-ce-8.8.1-fix-redis-config-path.patch
@ -0,0 +1,13 @@
+diff --git a/config/mail_room.yml b/config/mail_room.yml
+index 761a32a..1e2cbbb 100644
+--- a/config/mail_room.yml
+++ b/config/mail_room.yml
+@@ -2,7 +2,7 @@
+ <%
+ require "yaml"
+ require "json"
+-require_relative "lib/gitlab/redis"
+require_relative "/opt/gitlab/lib/gitlab/redis"
+ 
+ rails_env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
+ 
--- a/www-apps/gitlab-ce/files/gitlab-ce-fix-redis-config-path.patch
+++ b/www-apps/gitlab-ce/files/gitlab-ce-fix-redis-config-path.patch
@ -1,26 +0,0 @@
-diff --git a/config/application.rb b/config/application.rb
-index 5a0ac70..5a2ab43 100644
--- a/config/application.rb
-+++ b/config/application.rb
-@@ -4,7 +4,7 @@ require 'rails/all'
- require 'devise'
- I18n.config.enforce_available_locales = false
- Bundler.require(:default, Rails.env)
-require_relative '../lib/gitlab/redis_config'
-+require_relative '/opt/gitlab/lib/gitlab/redis_config'
- 
- module Gitlab
-   REDIS_CACHE_NAMESPACE = 'cache:gitlab'
-diff --git a/config/mail_room.yml b/config/mail_room.yml
-index aed55f7..dace83f 100644
--- a/config/mail_room.yml
-+++ b/config/mail_room.yml
-@@ -2,7 +2,7 @@
- <%
- require "yaml"
- require "json"
-require_relative "lib/gitlab/redis_config"
-+require_relative "/opt/gitlab/lib/gitlab/redis_config"
- 
- rails_env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
- 
--- a/www-apps/gitlab-ce/gitlab-ce-8.7.5.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.7.5.ebuild
@ -55,7 +55,7 @@ COMMON_DEPEND="
 	${GEMS_DEPEND}
 	>=dev-vcs/gitlab-shell-2.7.2
 	>=dev-vcs/git-2.7.4
-	>=dev-vcs/gitlab-workhorse-0.7.1
+	=dev-vcs/gitlab-workhorse-0.7.1
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
 DEPEND="
@ -77,7 +77,7 @@ ruby_add_bdepend "
 #     Point to the absolute location of redis_config.rb
 #
 RUBY_PATCHES=(
-	"${PN}-fix-sendmail-config.patch"
+	"${P}-fix-sendmail-config.patch"
 	"${P}-fix-redis-config-path.patch"
 )

--- a/www-apps/gitlab-ce/gitlab-ce-8.8.1.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.8.1.ebuild
@ -53,9 +53,9 @@ CDEPEND="
 	virtual/pkgconfig"
 COMMON_DEPEND="
 	${GEMS_DEPEND}
-	>=dev-vcs/gitlab-shell-2.6.12
+	>=dev-vcs/gitlab-shell-2.7.2
 	>=dev-vcs/git-2.7.4
-	>=dev-vcs/gitlab-workhorse-0.7.1
+	=dev-vcs/gitlab-workhorse-0.7.1
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
 DEPEND="
@ -77,8 +77,8 @@ ruby_add_bdepend "
 #     Point to the absolute location of redis_config.rb
 #
 RUBY_PATCHES=(
-	"${PN}-fix-sendmail-config.patch"
-	"${PN}-fix-redis-config-path.patch"
+	"${PN}-8.7.5-fix-sendmail-config.patch"
+	"${P}-fix-redis-config-path.patch"
 )

 MY_NAME="gitlab"
--- a/www-apps/gitlab-ce/gitlab-ce-8.8.2.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.8.2.ebuild
@ -53,9 +53,9 @@ CDEPEND="
 	virtual/pkgconfig"
 COMMON_DEPEND="
 	${GEMS_DEPEND}
-	>=dev-vcs/gitlab-shell-2.6.12
+	>=dev-vcs/gitlab-shell-2.7.2
 	>=dev-vcs/git-2.7.4
-	>=dev-vcs/gitlab-workhorse-0.7.1
+	=dev-vcs/gitlab-workhorse-0.7.1
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
 DEPEND="
@ -77,8 +77,8 @@ ruby_add_bdepend "
 #     Point to the absolute location of redis_config.rb
 #
 RUBY_PATCHES=(
-	"${PN}-fix-sendmail-config.patch"
-	"${PN}-fix-redis-config-path.patch"
+	"${PN}-8.7.5-fix-sendmail-config.patch"
+	"${PN}-8.8.1-fix-redis-config-path.patch"
 )

 MY_NAME="gitlab"
--- a/www-apps/gitlab-ce/gitlab-ce-8.8.3.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.8.3.ebuild
@ -0,0 +1,399 @@
+# Copyright 1999-2016 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"
+
+inherit eutils ruby-ng user systemd
+
+MY_PKGNAME="gitlabhq"
+
+DESCRIPTION="GitLab is a free project and repository management application"
+HOMEPAGE="https://about.gitlab.com/"
+SRC_URI="https://github.com/${MY_PKGNAME}/${MY_PKGNAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${MY_PKGNAME}-${PV}"
+
+RESTRICT="mirror"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+IUSE="kerberos mysql +postgres +unicorn systemd 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
+	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-2.7.2
+	>=dev-vcs/git-2.7.4
+	=dev-vcs/gitlab-workhorse-0.7.1
+	kerberos? ( !app-crypt/heimdal )
+	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
+DEPEND="
+	${CDEPEND}
+	${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	>=dev-db/redis-2.8
+	virtual/mta
+	systemd? ( sys-apps/systemd:0= )"
+ruby_add_bdepend "
+	virtual/rubygems
+	>=dev-ruby/bundler-1.0"
+
+#
+# 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=(
+	"${PN}-8.7.5-fix-sendmail-config.patch"
+	"${PN}-8.8.1-fix-redis-config-path.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}"
+
+# When updating ebuild to newer version, check list of the queues in
+# https://gitlab.com/gitlab-org/gitlab-ce/blob/v${PV}/bin/background_jobs
+SIDEKIQ_QUEUES="post_receive,mailers,archive_repo,system_hook,project_web_hook,gitlab_shell,incoming_email,runner,common,default"
+
+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
+
+	# fix permissions
+	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
+
+	## RC script ##
+
+	if use systemd ; then
+		ewarn "Beware: systemd support has not been tested, use at your own risk!"
+		systemd_dounit "${FILESDIR}/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-sidekiq.init
+		use unicorn && rcscript=gitlab-unicorn.init
+
+		cp "${FILESDIR}/${rcscript}" "${T}" || die
+		sed -i \
+			-e "s|@USER@|${MY_USER}|" \
+			-e "s|@GITLAB_BASE@|${dest}|" \
+			-e "s|@LOGS_DIR@|${logs}|" \
+			-e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \
+			"${T}/${rcscript}" \
+			|| die "failed to filter ${rcscript}"
+
+		newinitd "${T}/${rcscript}" "${MY_NAME}"
+	fi
+}
+
+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() {
+	local shell_conf='/etc/gitlab-shell.yml'
+
+	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
+
+	# check gitlab-shell configuration
+	if [ -r ${shell_conf} ]; then
+		local shell_repos_path="$(ryaml ${shell_conf} repos_path)"
+		local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \
+			production gitlab_shell repos_path)"
+
+		if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then
+			eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}"
+			eerror "must points to the same location! Fix the repos_path location and"
+			eerror "run this again."; die
+		fi
+	else
+		ewarn "GitLab Shell checks skipped, could not find config file at"
+		ewarn "${shell_conf}. Make sure that you have gitlab-shell properly"
+		ewarn "installed and that repos_path is the same as in GitLab."
+	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
+
+	if [ ! -d "${DEST_DIR}/.git" ]; then
+		# 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
+	fi
+
+	## Initialize app ##
+
+	local RAILS_ENV="production"
+	local RUBY=${RUBY:-/usr/bin/ruby}
+	local BUNDLE="${RUBY} /usr/bin/bundle"
+
+	local dbname="$(ryaml ${CONF_DIR}/database.yml production database)"
+
+	if [ -f "${DEST_DIR}/.secret" ]; then
+		local update=true
+
+		einfo "Migrating database ..."
+		exec_rake db:migrate
+
+		# https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496
+		einfo "Migrating iids ..."
+		exec_rake migrate_iids
+
+		einfo "Cleaning old precompiled assets ..."
+		exec_rake assets:clean
+
+		einfo "Cleaning cache ..."
+		exec_rake cache:clear
+	else
+		local update=false
+
+		einfo "Initializing database ..."
+		exec_rake gitlab:setup
+	fi
+
+	einfo "Precompiling assests ..."
+	exec_rake assets:precompile
+
+	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."
+	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
+}
+
+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}"
+
+	echo "   ${command}"
+	su -l ${MY_USER} -c "
+		export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8
+		cd ${DEST_DIR}
+		${command}" \
+		|| die "failed to run rake $@"
+}
--- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
@ -52,9 +52,9 @@ CDEPEND="
 	virtual/pkgconfig"
 COMMON_DEPEND="
 	${GEMS_DEPEND}
-	>=dev-vcs/gitlab-shell-2.7.2
+	>=dev-vcs/gitlab-shell-3.0.0
 	>=dev-vcs/git-2.7.4
-	>=dev-vcs/gitlab-workhorse-0.7.1
+	>=dev-vcs/gitlab-workhorse-0.7.4
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
 DEPEND="
@ -76,7 +76,7 @@ ruby_add_bdepend "
 #     Point to the absolute location of redis_config.rb
 #
 RUBY_PATCHES=(
-	"${PN}-fix-sendmail-config.patch"
+	"${PN}-8.7.3-fix-sendmail-config.patch"
 	"${PN}-8.7.0-fix-redis-config-path.patch"
 )
				`@ -0,0 +1 @@`
				`move app-crypt/letsencrypt-apache app-crypt/certbot-apache`