dev-vcs/gitolite: Add patch to handle the use of macros in config category

See: https://groups.google.com/d/topic/gitolite/KhbDBUdSozE/discussion

Package-Manager: portage-2.1.12.4
RepoMan-Options: --force

5 files changed, 120 insertions, 0 deletions

diff --git a/dev-vcs/gitolite/ChangeLog b/dev-vcs/gitolite/ChangeLog
new file mode 100644
index 00000000..dbda4b3f
--- /dev/null
+++ b/dev-vcs/gitolite/ChangeLog
@@ -0,0 +1,7 @@
+*gitolite-2.3.1 (11 Jun 2013)
+
+  11 Jun 2013; Bertrand Jacquin <beber@meleeweb.net>
+  +files/gitolite-2.3.1-CREATOR-in-config.diff, +gitolite-2.3.1.ebuild,
+  +metadata.xml:
+  dev-vcs/gitolite: Add patch to handle the use of macros in config category
+  See: https://groups.google.com/d/topic/gitolite/KhbDBUdSozE/discussion
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
new file mode 100644
index 00000000..8a20901f
--- /dev/null
+++ b/dev-vcs/gitolite/Manifest
@@ -0,0 +1,5 @@
+AUX gitolite-2.3.1-CREATOR-in-config.diff 493 SHA256 46edca22f90c4420e7c83cedb136a229bb9b48f3ba3c0465f4ef3b538ca698c5 WHIRLPOOL 49b83e573f875c6cb536a2228d2b381da595feefb87740a93a7224ee685a61090fc18dacab9d359c8288e3bbea7c0395e0f13b0b72329c265fb786a155efd2b8
+DIST gitolite-2.3.1.tar.gz 255807 SHA256 53303fea0154914356830202d3de23f94682bab26197ead8ca05d58818c56e82 WHIRLPOOL 5d08b9c22e6a07478836cca3b7190b61729ef89e181e4746286a4cf48f253fe07647b165f22483d983bae1767d83b39f231414dc96b4e803140f64eb244fc241
+EBUILD gitolite-2.3.1.ebuild 1812 SHA256 b5438986392ee1bf1f3a58ea34a23c33d039fe1e7f64500ab8c66cf0ee3b0e5a WHIRLPOOL 5a9ea5181ea463cdbfe5619ac1245d087d8d28a79c2e6ff416cdc4ebf0905fa68c0482f47a1b944ad2030967d5ecdacebd5d0f40146f979511fc8f88019e964e
+MISC ChangeLog 323 SHA256 4be0f697999531ed9c9cf7719f801ebf9d0b46c087a49414c9c507789344f819 WHIRLPOOL 8e5c71ee3a51221a9be690576b91084f9dd827afb21c6149c60c5d5ba8bbc30a4a1ada7cc7378683868338ffe0a3ef2aa006ab0d67b0bdd7f8611006398cd0dd
+MISC metadata.xml 629 SHA256 d91cefaa604035b0a9796fc1c205c8cbb7a5d9fa74c646352dc56d79f24d4f1c WHIRLPOOL 00e211e81e589b765c88347f467fbfbb13680f69216ca48bc33cdd709b55f01eb789d72b0901b6773524b3691bfb07b1e0821f4db6418bc6b74595bfb1014faf
diff --git a/dev-vcs/gitolite/files/gitolite-2.3.1-CREATOR-in-config.diff b/dev-vcs/gitolite/files/gitolite-2.3.1-CREATOR-in-config.diff
new file mode 100644
index 00000000..a05dd6de
--- /dev/null
+++ b/dev-vcs/gitolite/files/gitolite-2.3.1-CREATOR-in-config.diff
@@ -0,0 +1,12 @@
+See: https://groups.google.com/d/topic/gitolite/KhbDBUdSozE/discussion
+
+--- src/gl-compile-conf	2013-04-30 13:21:15.420000000 -0700
++++ src/gl-compile-conf	2013-04-30 13:04:40.230000000 -0700
+@@ -253,6 +253,7 @@
+ 
+         for my $repo (@{ $repos_p })       # each repo in the current stanza
+         {
++	    s/\bCREAT[EO]R\b/\$creator/g for $value;
+             $git_configs{$repo}{$config_seq++}{$key} = $value;
+ 
+             # force entry in %repos.  Without this, a repo para with just a
diff --git a/dev-vcs/gitolite/gitolite-2.3.1.ebuild b/dev-vcs/gitolite/gitolite-2.3.1.ebuild
new file mode 100644
index 00000000..f5c86306
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-2.3.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-2.3.1.ebuild,v 1.5 2013/04/05 06:17:31 radhermit Exp $
+
+EAPI=4
+
+inherit perl-module user
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="http://github.com/sitaramc/gitolite"
+SRC_URI="http://milki.github.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="contrib vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	epatch "${FILESDIR}/${P}-CREATOR-in-config.diff"
+
+	echo "${PF}" > conf/VERSION
+}
+
+src_install() {
+	local gl_bin="${D}/usr/bin"
+	gl_bin=${gl_bin/\/\//\/}
+
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	# install using upstream method
+	export PATH="${gl_bin}:${PATH}"
+	./src/gl-system-install ${gl_bin} \
+		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.pm || die
+
+	dodoc README.mkd doc/*
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib/ || die
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+}
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/metadata.xml b/dev-vcs/gitolite/metadata.xml
new file mode 100644
index 00000000..03a2dc83
--- /dev/null
+++ b/dev-vcs/gitolite/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+	</maintainer>
+	<maintainer>
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
+	<longdescription lang="en">
+	Gitolite is an access control layer on top of git, which allows access
+	control down to the branch level, including specifying who can and cannot
+	rewind a given branch.
+	</longdescription>
+	<use>
+		<flag name="contrib">Install user-contributed files</flag>
+	</use>
+</pkgmetadata>
+