Merge branch 'master' into feature/cleanup-gitlab

dev-libs/libgit2/Manifest

@@ -1,5 +1,3 @@
-AUX libgit2-0.24.0_rc1-fix-version.patch 529 SHA256 b1726938ed7ac9dc744bad1c3894816defcf652e080f354f6e90253c1387d754 SHA512 a8db6a63781ce4fdc40f9f9eca193e8b4e8a6cc6a9fb547632f1d53483005cbae06fe35cf96768c0c577a4de1226e06c8a003cee4e1c6e1f3a328dbd7f44798b WHIRLPOOL ce13a604c0a555e05b10269c35b24eba3d0286254fc4c132d244b61479dc1d98f293babe7b3fbf24ee5cc0f6bef33db0ebc238a8e6078bd40e641b2077f8189c
 DIST libgit2-0.24.0_rc1.tar.gz 4165326 SHA256 e956fb569ddaf2d1d29307b4dc361121160ea7ab052eb3dc1c07b95175cb842d SHA512 c73bee9aaba3a36fca35fa0e3183e5636fa9be2ba98b1b93562f390e5f74b0be817ba73781a13e7ae5f880411465877864ca244ad6ac52ccd89d905d5b103e6c WHIRLPOOL 9d442e2894548462e3bda477bbacf4ac2190e8b9cb8c2b34e443568249b6ab63dd316d267e12fad84acfbfbc0af8aa3674e9c5dd717fa8deac4d07e586f82377
 EBUILD libgit2-0.24.0_rc1-r1.ebuild 1778 SHA256 8a11b0d2430f71863d7036e919700cae0afa5422acda67876a720518c12d1be6 SHA512 b67bee4c60fb380548a43bcd91b66613e0ea7a8634d721753493708975e97e989e467645b904b7acead1663353b589731f1524f8cabebac3407341ad55660a8a WHIRLPOOL fd9e1a15d3fdf820f4faf77b35bb61ffdd6147edd67d46f47f10a864ca3fc10a91b927d83e6e8eae4c14c1e858d2f0ea2da8cd0f6b59d1d2d8ce69b3f06ed2f0
-EBUILD libgit2-0.24.0_rc1.ebuild 1814 SHA256 82e78bfa430101fc9bbcd70c1bfe2e25d01c9a76660bfbb99e136ed0429be437 SHA512 be35530b70c13cfc357824c16a5c5d040ab9bfc1ad81dc512eca4fd97dda80c66e252ebc3eb7ff3c97c816901dd79f45b093d1b6a7d8e48dfa9f198433fd2672 WHIRLPOOL b8b75699a970323e18f236fbafaedabd0cac8d6b57ab5c2a722fad65faf3962e53b87dd54921f935cb8c97ec8bb640abeef34f71e5659cb72e5acfff5a0958bc
 MISC metadata.xml 802 SHA256 446c2a35f3209339e906828d8250d3d784cb3796c4da5740cbd6ebf301d92f4a SHA512 9d2dba83bfd1791e2cf2afd2b939ed66456e4db0723f2789ea3b1227e14b0a7d685d9a7adcaae050b6574e99a9301ff1c484b024dbf8e3dcd44e56a14d84ee99 WHIRLPOOL 268fb7c0d932e4c7b8ce4554c2d04341c77eba94ba25066746b7289111e76446f3c411efc454b3a639aaa98b67c030392c6fab77185f8bc9dac4dce9b4a47e36

dev-libs/libgit2/files/libgit2-0.24.0_rc1-fix-version.patch

@@ -1,20 +0,0 @@
-diff --git a/include/git2/version.h b/include/git2/version.h
-index 6837e90..7572da1 100644
---- a/include/git2/version.h
-+++ b/include/git2/version.h
-@@ -7,12 +7,12 @@
- #ifndef INCLUDE_git_version_h__
- #define INCLUDE_git_version_h__
- 
--#define LIBGIT2_VERSION "0.23.0"
-+#define LIBGIT2_VERSION "0.24.0-rc1"
- #define LIBGIT2_VER_MAJOR 0
--#define LIBGIT2_VER_MINOR 23
-+#define LIBGIT2_VER_MINOR 24
- #define LIBGIT2_VER_REVISION 0
- #define LIBGIT2_VER_PATCH 0
- 
--#define LIBGIT2_SOVERSION 23
-+#define LIBGIT2_SOVERSION 24
- 
- #endif

dev-libs/libgit2/libgit2-0.24.0_rc1.ebuild

@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-MY_PV=${PV/_/-}
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-*"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/24"
-IUSE="examples gssapi libressl ssh test threads trace"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	sys-libs/zlib
-	net-libs/http-parser:=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
-	# skip online tests
-	sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
-
-	epatch "${FILESDIR}/${P}-fix-version.patch"
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		$(cmake-utils_use_build test CLAR)
-		$(cmake-utils_use_enable trace TRACE)
-		$(cmake-utils_use_use gssapi GSSAPI)
-		$(cmake-utils_use_use ssh SSH)
-		$(cmake-utils_use threads THREADSAFE)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake-utils_src_test
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		egit_clean examples
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}

www-apps/gitlab-ce/Manifest

@@ -9,9 +9,10 @@ AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c1
 DIST gitlab-ce-8.4.3.tar.gz 12187867 SHA256 bc11494885c6ad41f2b6a057d7fbec2fd4df10908f591c84c210f4881aa3c23d SHA512 84018eca604ba1639e19cc45b6ef21ad298cf60a66724bc247bf7a7c94ff1131010317d851855f5676687e8c8148602ad199e35f1029ebab24ccbbafd7b866e1 WHIRLPOOL 418afc8ddb262aa7af22bd79cb9febf1a15625f753208fe4f47cbbc3d79df0566e506febe2917bd2176508312d4a5da7245e36233ec2e50c024b811c1d306b00
 DIST gitlab-ce-8.4.4.tar.gz 12186833 SHA256 f8c403d4cecd82aa2021ed5a6d5d7b4ac8526c7ee7a9bb1c7391f8653bf5a01c SHA512 fe8bd002ea164b384e25303e06ab6a6a97c89180a1898bc8a6d6bb07fcfda6be03a057ad7f92e4c192e0c10aa686b897fe18e864b36c314dcd7fee62dd6758bb WHIRLPOOL 8c79ba70f9b56408f70a4b48554114bcad5a4ac2806dfd8fe63ad060b9887bb6cf3d4f5c2d6e7db20aa65a83e2c33879fd32b9cce7277cd6fdd65acbdb399f40
 DIST gitlab-ce-8.5.0.tar.gz 14276001 SHA256 a43dd64cfb1e34bf273d31984b52ada09c5a48d5d077f5bd1f21a79960bb1039 SHA512 499d93767df9d3c9c4b68ac663846d49335bd989ee8e93a8d610cb6106900886913912443f908cd316424312df67658df5d6027fda9a5abd787572d4e23e14d1 WHIRLPOOL 225c40c9a1769dbd13ea736f6bdce2a9a3cd5bfca8b27ce9270f55beebd36f5b233858c0dee5f0d80cdf40c5ccc1af651d152743f5ede1f98a8a8496ba36b6d1
+DIST gitlab-ce-8.5.1.tar.gz 14277708 SHA256 74eca700809ddcbcd3d386ac2042f3b9b85b8f2685df1ef47c253f265096be25 SHA512 107fdeb139cfa7575a9d9c6d0cb27632dbc74b49a178378fd5ca2f7887c847cd5aee96d114f08d7c69ba3c912aaf4f3fed7c03494150819a02acf3edc07e383d WHIRLPOOL 2649d06a908fcc570792f1fac12a18daeb36de08987ef4501b5b756ea785c07b73e01a4a2d4d4eee640619acf209036a4d997b08e302439f96f3675f06949b4a
 EBUILD gitlab-ce-8.4.3.ebuild 11158 SHA256 134fedd2c467d11174a22055e58c822b953f9bdb9902aa0bdf0822c66344d364 SHA512 818c37d814074cb063c91adcfde0f1164fa89cba5a855c442470b5f0e47256f2078326f998b5502c996bf4a2c874cdc068685ad037d1dcf962c2c0bbe683e689 WHIRLPOOL a251afe289ab12dbef9114ebfcb00cf84080766e4d0c1737fa1ece1965210d4544a319af27823b4794c0bddc0cfbf6d3cb896bbe48fa02c623e0b4847b6302d2
 EBUILD gitlab-ce-8.4.4.ebuild 11158 SHA256 134fedd2c467d11174a22055e58c822b953f9bdb9902aa0bdf0822c66344d364 SHA512 818c37d814074cb063c91adcfde0f1164fa89cba5a855c442470b5f0e47256f2078326f998b5502c996bf4a2c874cdc068685ad037d1dcf962c2c0bbe683e689 WHIRLPOOL a251afe289ab12dbef9114ebfcb00cf84080766e4d0c1737fa1ece1965210d4544a319af27823b4794c0bddc0cfbf6d3cb896bbe48fa02c623e0b4847b6302d2
 EBUILD gitlab-ce-8.5.0-r1.ebuild 11726 SHA256 4ff8cf27d461028f82b3c463bb59e0161979018f00c97815245ed962b2470d8d SHA512 66c13b9330c71de051c9ef8a78b25661a2e01fbe787747ce78175e202fbac02dfea42b7cc53b45b6d335d88602491f9e8266d4097c3271f12ed7f2f22ab68dc4 WHIRLPOOL 9abfd5c6839a9f542c96a7987b597ad6cd9c02f326fee18f113823775ffe7b9a6d8f23f5bcaf37e769e6eaf849d5756f945701407e9a90f2316889404e0e7b2f
-EBUILD gitlab-ce-8.5.0.ebuild 11149 SHA256 0ce3cb6cc04cc7bb9a84f4d8b97918d85d6a4716cfd2e6c9f08661708a7c7f6f SHA512 c76172167fb452c920a88b0d946b8ccb88f3899c3f578cfff7b1cc920625a9722ad6785274f6407ee7bf23856eff20c73e2de1a1d61d890bc515cfeb0d4dd64b WHIRLPOOL 97e65d983d0d89715fff6366348a46dffc249d775c9b21fe025be0372a2c362e811e401f0f47d5a2eceffdf28e9cdf2739c05cba6465b29a4efa60d2b52e1f65
+EBUILD gitlab-ce-8.5.1.ebuild 11726 SHA256 4ff8cf27d461028f82b3c463bb59e0161979018f00c97815245ed962b2470d8d SHA512 66c13b9330c71de051c9ef8a78b25661a2e01fbe787747ce78175e202fbac02dfea42b7cc53b45b6d335d88602491f9e8266d4097c3271f12ed7f2f22ab68dc4 WHIRLPOOL 9abfd5c6839a9f542c96a7987b597ad6cd9c02f326fee18f113823775ffe7b9a6d8f23f5bcaf37e769e6eaf849d5756f945701407e9a90f2316889404e0e7b2f
 EBUILD gitlab-ce-9999.ebuild 11742 SHA256 1cf7eb55e970f6530edeaa5d86e7aa9235f4b5774579f63e8e484232e4a57b0c SHA512 f68fccacbcc0aafb379adb74e0c64fe9122a04bffabf5e000dd546a344fc677c90e16cd9f2db199fe61e8660933754cd08ee8c75dc9cd657c7cf2b4f61410b2f WHIRLPOOL cbb8fb6595a5f4bf649b09425181e06e73997934512e58f63ad8be6b164422a244e27c626783185a2f223379aeddff1f83f845c0735c03d301e2703446b22fc6
 MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1

www-apps/gitlab-ce/gitlab-ce-8.5.1.ebuild

@@ -26,18 +26,18 @@ RESTRICT="mirror"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-*"
+KEYWORDS="~amd64 ~x86"
 IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries"
 
 ## Gems dependencies:
-#   charlock_holmes		dev-libs/icu
+#   charlock_holmes     dev-libs/icu
-#   grape, capybara		dev-libs/libxml2, dev-libs/libxslt
+#   grape, capybara     dev-libs/libxml2, dev-libs/libxslt
-#   rugged				dev-util/cmake, virtual/pkgconfig
+#   rugged              dev-util/cmake, virtual/pkgconfig
-#   json				dev-util/ragel
+#   json                dev-util/ragel
-#   pygments.rb			python 2.7+
+#   pygments.rb         python 2.7+
-#   execjs				net-libs/nodejs, or any other JS runtime
+#   execjs              net-libs/nodejs, or any other JS runtime
-#   pg					dev-db/postgresql
+#   pg                  dev-db/postgresql
-#   mysql				virtual/mysql
+#   mysql               virtual/mysql
 #
 GEMS_DEPEND="
 	dev-libs/icu
@@ -229,7 +229,10 @@ pkg_postinst() {
 	elog "migrations:"
 	elog "       emerge --config \"=${CATEGORY}/${PF}\""
 	elog "PLEASE NOTE: It's HIGHLY recommended to backup your database"
-	elog "before running the config phase!"
+	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
@@ -239,7 +242,7 @@ pkg_postinst() {
 	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 "   haven't done so already."
 	elog
 	if use postgres; then
 		elog "If you have local PostgreSQL running, just copy&run:"
@@ -250,7 +253,7 @@ pkg_postinst() {
 		elog "  Note: You should change your password to something more random..."
 		elog
 	fi
-	elog "4. Finally execute the following command to initlize environment:"
+	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
@@ -352,6 +355,14 @@ pkg_config() {
 		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() {