Version bump to 3.x, bug 413335

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

3 files changed, 99 insertions, 1 deletions

diff --git a/dev-vcs/gitolite/ChangeLog b/dev-vcs/gitolite/ChangeLog
index 54ed21df4b56..ed5c77327d92 100644
--- a/dev-vcs/gitolite/ChangeLog
+++ b/dev-vcs/gitolite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/gitolite
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.16 2012/05/19 15:14:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.17 2012/05/20 15:57:42 idl0r Exp $
+
+*gitolite-3.02 (20 May 2012)
+
+  20 May 2012; Christian Ruppert <idl0r@gentoo.org> +gitolite-3.02.ebuild,
+  metadata.xml:
+  Version bump to 3.x, bug 413335
 
   19 May 2012; Agostino Sarubbo <ago@gentoo.org> gitolite-2.3.ebuild:
   Stable for amd64, wrt bug #416569
diff --git a/dev-vcs/gitolite/gitolite-3.02.ebuild b/dev-vcs/gitolite/gitolite-3.02.ebuild
new file mode 100644
index 000000000000..897893416b25
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.02.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.02.ebuild,v 1.1 2012/05/20 15:57:42 idl0r Exp $
+
+EAPI=4
+
+inherit eutils perl-module
+
+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="doc tools 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() {
+	echo $PF > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.mkd doc/CHANGELOG
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use doc; then
+		dodoc doc/*.mkd
+
+		docinto extras
+		dodoc doc/extras/*.mkd
+	fi
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if has_version "=dev-vcs/gitolite-2*"; then
+		ewarn
+		elog "***NOTE** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!"
+		elog "Alternatively there's a local and probably older copy in /usr/share/doc/${PF}"
+		elog "in case you have the \"doc\" useflag set."
+	fi
+	# 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
index 03a2dc83283e..10380057979c 100644
--- a/dev-vcs/gitolite/metadata.xml
+++ b/dev-vcs/gitolite/metadata.xml
@@ -16,6 +16,8 @@
 	</longdescription>
 	<use>
 		<flag name="contrib">Install user-contributed files</flag>
+		<flag name="tools">Install tools to e.g. convert a Gitosis config to
+			gitolite or one to check if your setup is gitolite >= 3.x compatible</flag>
 	</use>
 </pkgmetadata>