Revision bump to fix a bug where includes are not properly parsed.

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

8 files changed, 65 insertions, 142 deletions

diff --git a/dev-vcs/gitolite-gentoo/ChangeLog b/dev-vcs/gitolite-gentoo/ChangeLog
index b9188b6f99af..53f82a2658b6 100644
--- a/dev-vcs/gitolite-gentoo/ChangeLog
+++ b/dev-vcs/gitolite-gentoo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-vcs/gitolite-gentoo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.17 2011/08/30 17:12:56 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.18 2011/09/10 17:52:10 idl0r Exp $
+
+*gitolite-gentoo-2.0.3-r1 (10 Sep 2011)
+
+  10 Sep 2011; Christian Ruppert <idl0r@gentoo.org>
+  -gitolite-gentoo-2.0.1.ebuild, -gitolite-gentoo-2.0.3.ebuild,
+  +gitolite-gentoo-2.0.3-r1.ebuild,
+  +files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch:
+  Revision bump to fix a bug where includes are not properly parsed.
 
 *gitolite-gentoo-2.0.3 (30 Aug 2011)
 
diff --git a/dev-vcs/gitolite-gentoo/files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch b/dev-vcs/gitolite-gentoo/files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch
new file mode 100644
index 000000000000..dd2ebdfad15b
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch
@@ -0,0 +1,21 @@
+From 63f18a5adfbfa1f62427f02e347a1e0942d4d615 Mon Sep 17 00:00:00 2001
+From: Sitaram Chamarty <sitaram@atc.tcs.com>
+Date: Sat, 10 Sep 2011 18:57:42 +0530
+Subject: [PATCH] fix a rather large typo/thinko in 1006eba
+
+If you look at this change, and the same lines in 1006eba, you can
+easily see what I missed...
+
+diff --git a/src/gl-compile-conf b/src/gl-compile-conf
+index 2c4ac82..6521215 100755
+--- a/src/gl-compile-conf
++++ b/src/gl-compile-conf
+@@ -267,7 +267,7 @@ sub parse_conf_line
+     elsif ($line =~ /^include "(.+)"/)
+     {
+         my $include_glob = $1;
+-        for my $file (glob($include_glob =~ m(^/) ? $include_glob : "conf/$include_glob")) {
++        for my $file (glob($include_glob =~ m(^/) ? $include_glob : "$GL_ADMINDIR/conf/$include_glob")) {
+             die "$ABRT $fragment attempting to include configuration\n" if $fragment ne 'master';
+             die "$ABRT included file not found: '$file'\n" unless -f $file;
+ 
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.0.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.0.3-r1.ebuild
index 921b62be8ee8..33ea91680549 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.0.1.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.0.1.ebuild,v 1.1 2011/06/14 13:21:08 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.0.3-r1.ebuild,v 1.1 2011/09/10 17:52:10 idl0r Exp $
 
 EAPI=3
 
@@ -31,6 +31,8 @@ src_prepare() {
 	rm Makefile doc/COPYING || die
 	rm -rf contrib/{gitweb,vim} || die
 
+	epatch "${FILESDIR}/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch"
+
 	echo "${PF}-gentoo" > conf/VERSION
 }
 
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.0.3.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.0.3.ebuild
deleted file mode 100644
index 17b161edfa1b..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.0.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.0.3.ebuild,v 1.1 2011/08/30 17:12:56 idl0r Exp $
-
-EAPI=3
-
-inherit eutils perl-module
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=summary"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib vim-syntax"
-
-DEPEND="dev-lang/perl
-	>=dev-vcs/git-1.6.2"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	dev-perl/Net-SSH-AuthorizedKeysFile
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitolite git
-}
-
-src_prepare() {
-	rm Makefile doc/COPYING || die
-	rm -rf contrib/{gitweb,vim} || die
-
-	echo "${PF}-gentoo" > conf/VERSION
-}
-
-src_install() {
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
-
-	./src/gl-system-install "${D}"/usr/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
-	ewarn
-	elog "If you use the umask feature and upgrade from <=gitolite-gentoo-1.5.9.1"
-	elog "then please check the permissions of all repositories using the umask feature"
-	ewarn
-}
diff --git a/dev-vcs/gitolite/ChangeLog b/dev-vcs/gitolite/ChangeLog
index 88f59fdc697f..66e14db23fe5 100644
--- a/dev-vcs/gitolite/ChangeLog
+++ b/dev-vcs/gitolite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/gitolite
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.8 2011/08/30 17:13:44 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.9 2011/09/10 17:50:33 idl0r Exp $
+
+*gitolite-2.0.3-r1 (10 Sep 2011)
+
+  10 Sep 2011; Christian Ruppert <idl0r@gentoo.org> -gitolite-2.0.1.ebuild,
+  -gitolite-2.0.3.ebuild, +gitolite-2.0.3-r1.ebuild,
+  +files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch:
+  Revision bump to fix a bug where includes are not properly parsed.
 
 *gitolite-2.0.3 (30 Aug 2011)
 
diff --git a/dev-vcs/gitolite/files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch b/dev-vcs/gitolite/files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch
new file mode 100644
index 000000000000..dd2ebdfad15b
--- /dev/null
+++ b/dev-vcs/gitolite/files/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch
@@ -0,0 +1,21 @@
+From 63f18a5adfbfa1f62427f02e347a1e0942d4d615 Mon Sep 17 00:00:00 2001
+From: Sitaram Chamarty <sitaram@atc.tcs.com>
+Date: Sat, 10 Sep 2011 18:57:42 +0530
+Subject: [PATCH] fix a rather large typo/thinko in 1006eba
+
+If you look at this change, and the same lines in 1006eba, you can
+easily see what I missed...
+
+diff --git a/src/gl-compile-conf b/src/gl-compile-conf
+index 2c4ac82..6521215 100755
+--- a/src/gl-compile-conf
++++ b/src/gl-compile-conf
+@@ -267,7 +267,7 @@ sub parse_conf_line
+     elsif ($line =~ /^include "(.+)"/)
+     {
+         my $include_glob = $1;
+-        for my $file (glob($include_glob =~ m(^/) ? $include_glob : "conf/$include_glob")) {
++        for my $file (glob($include_glob =~ m(^/) ? $include_glob : "$GL_ADMINDIR/conf/$include_glob")) {
+             die "$ABRT $fragment attempting to include configuration\n" if $fragment ne 'master';
+             die "$ABRT included file not found: '$file'\n" unless -f $file;
+ 
diff --git a/dev-vcs/gitolite/gitolite-2.0.1.ebuild b/dev-vcs/gitolite/gitolite-2.0.3-r1.ebuild
index 2d43183f7783..3b8999296bcf 100644
--- a/dev-vcs/gitolite/gitolite-2.0.1.ebuild
+++ b/dev-vcs/gitolite/gitolite-2.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-2.0.1.ebuild,v 1.1 2011/05/21 16:30:44 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-2.0.3-r1.ebuild,v 1.1 2011/09/10 17:50:33 idl0r Exp $
 
 EAPI=3
 
@@ -30,6 +30,8 @@ src_prepare() {
 	rm Makefile doc/COPYING || die
 	rm -rf contrib/{gitweb,vim} || die
 
+	epatch "${FILESDIR}/0001-fix-a-rather-large-typo-thinko-in-1006eba.patch"
+
 	echo "${PF}" > conf/VERSION
 }
 
diff --git a/dev-vcs/gitolite/gitolite-2.0.3.ebuild b/dev-vcs/gitolite/gitolite-2.0.3.ebuild
deleted file mode 100644
index 08bab989aa7f..000000000000
--- a/dev-vcs/gitolite/gitolite-2.0.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-2.0.3.ebuild,v 1.1 2011/08/30 17:13:44 idl0r Exp $
-
-EAPI=3
-
-inherit eutils perl-module
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="http://github.com/sitaramc/gitolite"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib vim-syntax"
-
-DEPEND="dev-lang/perl
-	>=dev-vcs/git-1.6.2"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite-gentoo
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitolite git
-}
-
-src_prepare() {
-	rm Makefile doc/COPYING || die
-	rm -rf contrib/{gitweb,vim} || die
-
-	echo "${PF}" > conf/VERSION
-}
-
-src_install() {
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
-
-	# install using upstream method
-	./src/gl-system-install "${D}"/usr/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
-}