Cleanup

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

6 files changed, 14 insertions, 275 deletions

diff --git a/dev-vcs/gitolite/ChangeLog b/dev-vcs/gitolite/ChangeLog
index ea351d5d9a2b..d882c86cd747 100644
--- a/dev-vcs/gitolite/ChangeLog
+++ b/dev-vcs/gitolite/ChangeLog
@@ -1,6 +1,11 @@
 # 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.25 2012/10/10 18:51:22 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.26 2012/10/30 20:11:41 idl0r Exp $
+
+  30 Oct 2012; Christian Ruppert <idl0r@gentoo.org> -gitolite-2.1.0.ebuild,
+  -gitolite-2.2.ebuild, -gitolite-2.3.ebuild,
+  -files/gitolite-2.2-gl-system-setup-exit.patch:
+  Cleanup
 
 *gitolite-3.1 (10 Oct 2012)
 
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 67ec21696a85..1cc773c3f0ed 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -1,27 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gitolite-2.2-gl-system-setup-exit.patch 1418 SHA256 44242f30693f7aff22c04870651331af2985233ba57cf90c6019b6ac27c6b54b SHA512 c34d4ad55e92d590549859e3afc05833fb98ddcf884a591c765ef1a1912165395fddd8b318faa7b98894f4ad7ddb21ceff484da50882e68d4a01358c03daed0d WHIRLPOOL e58b933a10f8681e69f7e825e3c64fe28d01dca4c1105bbbbb0fd70a94f2a4bfab0fa8176dd7cedcec70498f98050eef048d4abaea1c6b4054370ad286d629c3
-DIST gitolite-2.1.0.tar.bz2 189726 SHA256 c55ca02932893f3f6a76a2e31d53d847c2fd5ccb768831db123c2f80d1b8eaa3 SHA512 eb6c7837843f5c46ab434dfb63f400dc575c1467e2255eb364bc8a414db87207fbc03995c32ed52f7d0213e47dbb4dd5c1a830717873ff6c622cc4c60303f256 WHIRLPOOL ab0aee4053049ccd32413a0df4ad78b5917495c3d15323531f5da62f2d22aecb34836fa7748b93b416fc7a71fab6007a67dcfef392aaf0441353ca93612d70d3
-DIST gitolite-2.2.tar.bz2 186414 SHA256 b43a735af62dbb2b05ed679029f3eafd8aa0c0e8041399f2c4dad796f87d6ccc SHA512 ae1bab7cd1433cc6a1dc2635535012c919ba201efaf015d51bc0b256994711054b135b23cf3d644f9ff5570c5f943088b394a7a23decd71488b1031091959808 WHIRLPOOL 39bd7c5f19c0e78a105bb213ffb6d0feac0e1c8778f36b2c67a2937a0fe04c02ee3ba0a63de0dbbf10d2a38ad554bef35f29a4297f9453fbfacb7d81b0107e71
 DIST gitolite-2.3.1.tar.gz 255807 SHA256 53303fea0154914356830202d3de23f94682bab26197ead8ca05d58818c56e82 SHA512 a658104b54ff6668022a6010b961fbe13b8e7a66242d547e0e4cf685574d8a1fd60065112095b0d73b826f6346973cb3a5db307d84fd5aceba852f2ddd0c86ee WHIRLPOOL 5d08b9c22e6a07478836cca3b7190b61729ef89e181e4746286a4cf48f253fe07647b165f22483d983bae1767d83b39f231414dc96b4e803140f64eb244fc241
-DIST gitolite-2.3.tar.bz2 189284 SHA256 19a01127012930ae59231a898e045bf1eb15df209decc452fb31d71d86a5053d SHA512 90443cadba829f43fceb0b706d6f2dad8f4e2b397bdcc2a633098342969cd4952c8c06f980f77d1ae104661b5649ef56f19e7fe2b7828c23eb3ee2f35ae59c32 WHIRLPOOL 3d1978096b3c4ac174c29d29be045c295e0f2520eddd6db9e8abe67fa74cc02654fb5c0bd45730d7f3b60f07fd29d05c06884e95a1a5d5733fa77b88ef0207f6
 DIST gitolite-3.1.tar.gz 119322 SHA256 36fc270c29e980f7217c203656373d1c44f73035fe18053163301cd10a4e0f04 SHA512 4b6a5a7fc558f4428350af7960e9f8ef923c114c2772c523d44c968a8c7d78dd52f2ae906f70d0f86fb1eab2c09f70a32df42c7cc24c002bec96dd654b904ec4 WHIRLPOOL 477f69bfcd2d5eff45f336fe569fd2b73c4349dd45d124cb0841a849b9f68b732afb3d1ddb497bf980bb3fd902b872b9c1018f09325a77e9eb1a16d0d4a94c3d
-EBUILD gitolite-2.1.0.ebuild 1623 SHA256 22cf29a1ced7305a836ac8b4798537254c361ba6fcb80be01b84188029c9d4e1 SHA512 7bbacc1050a133d4546be412b1ccfa09c67b2f4f9154ab291a0038121508aceb78b2521d70560f8bacb7f5709a706478004545b54243902c4207f39092f34a06 WHIRLPOOL 0f971cb6759d688aef828e99449775690db9acac49cf0bea61a7df7b5a1e8bec18cc385987eb8db9c71e6239c96d3bb39e36bd0ba15786b98b4cc30580b07ec3
-EBUILD gitolite-2.2.ebuild 1745 SHA256 5812001619e193ff5788f3e68540644c6db604f056b0861e31fe38edf45f3f6d SHA512 d6a17084ba7811073735ecb33ea9145ce459cbb39b4485cf8251b24a99f4f91c9f1148c975a5193ef52cb4c679d245b248cf0755b4d9821d3239b750e5facdc2 WHIRLPOOL c324d8e243b4bfdf9e0d759cf3e03abe66502a50ad39bbcade5cde74db952b4a5e0eaa51c4f463e4f1128fe9dfb742ef532246c6ccbb47335325f93c7ab3b9d2
 EBUILD gitolite-2.3.1.ebuild 1762 SHA256 f137729a5f313809bf987c31089ed5aaa1e16d426b75b625a21875e6a09f14d5 SHA512 a214ee52168ddae51477b9f16e849e3d78d40b595a54600fe47400e21e4c849499baed68efb57fb6d51ed433f87f6c494a4000cb3ac1f0253295f3652e71a0ba WHIRLPOOL 3388b1e698d11a36dae9194e98401f126fee3d786e24eadfcc50bfdfd34f92907dbb7839a6376104f51d8db2253378e6ad0e4c67ae60079e5934fef7631717b0
-EBUILD gitolite-2.3.ebuild 1751 SHA256 6cd10fe0235d7b6e2015a38e017d48a4004c7fb5d1c1eff3bf352027d3c81bbe SHA512 da64fee2b8a1ab227b821c2111f44796dd9fc026ecbbab0319d5bc1f57726a81c76edf033976dc7b92494518a98e736730df817250ea4d2dc8c93f5380f152ef WHIRLPOOL b9bb84ff314a41a52b621fd045082aa0dbb021f710ffcf2c47abafc3fbbcea39f5edc803b937aa26e59f1c2c238bee9e0b48258470d2d8fb1866d2b2e1c6be67
 EBUILD gitolite-3.1.ebuild 1940 SHA256 7451928a5d548617713e19816b70f6329ffeb2a7f9cbc98075f55de5f555aeeb SHA512 7af7af3ad8c8cdf8731824b7a20d498c3ec71b464422b8eaba85cae15b54cb0c29063fd0a47e5f3a2961a71c702535b48f5ab320995cce811b06f01d96cfb523 WHIRLPOOL da772af3c5b98c2ba49c104386b02e186b152de5db3c21104ff0c052e1ef4b718bf1bc2fcf590ea382954b9c54748b4d4f6bd84276d910955a214761d6901384
-MISC ChangeLog 3970 SHA256 8a2471380f7d174d52cac926c2f8276a7cf89ee2ac61dcb81a4bd1dbc1e80e6b SHA512 fa95a6563533ac959c1822a9cb55479482859369393ee0399851b55254f342d4ccb431f9157cafa11ea0c15ad3c23b0ffd6d7e70c79c638fbe2547757ad81126 WHIRLPOOL beba96e3dd8b2f6bf0a1d7ea52c210194d0a0be3eb426e12bc92fa6e39eefa66a5eadc98128087c652850eccd88c3300751a39aba60aa6f3553df680b876f790
+MISC ChangeLog 4153 SHA256 3dc4bc84f9feb13b3b5a20c435a16abbe72e7bce62bcf93fce69bcd195ab8662 SHA512 980982187958056305f779f0dc38e8b1df1e3ac5319d752d828d2a1cc8e4cfd68f12640810f9366bb94d90f93003b3dc3d673e58531b3187d272df730061e4e2 WHIRLPOOL f550cb41fc64da961e6aeaa287d19b6baf2f35e61ccd950bceede4c509c1f0ba55db4354c3e2e0055dd1e3830e5a64a0739af69ab642a06e13322710ea38d06a
 MISC metadata.xml 779 SHA256 b4ffa2d440bbd0bad5a09952ae8b0240b7056ad2773cd36c617d89ac0b589e8b SHA512 119a713d329854b20633d292fddd5e38f2292a81c76de4fe776cb06168ba03a2bde59b954b5453ec5232645516a62b2d0a2ec68ad27f9d011dbc309ebd1d123a WHIRLPOOL 1abe55643411d0c9a0750d221784ecd085916a3f806af052b6c5c8dc93844bed9897400535545d387697663cd1bec73b37f7fbc25956d517583eef156b945cf7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQdcOuAAoJEMOx0zmdw4Z1yY8IAJX47V5HCbp5W11TcHui6OzV
-qP83zMQjIGY09EkJREtOygxP4t/2ojL1KNOFQOER3vNmLioOzkwtcEn8pPiFmvXK
-HmKt6XwEN/gZFL6FQhrnjdZbJxHRhoaIqtuidgGSZHZk4yJZ68bh+YVJ1JwGMIIZ
-MwBgcFV7lYSYqw7EJypkBZU6tDPHS4muEdFO54oqEBdhJFPNyY858DDbhbXrfARu
-U+1xuWdj5cgBCL8Q3+DvGVTrFyq/oCno+MZwGbmECxHjXlVuxcNJ4QT4s+YI3CgH
-HG//T4ap1LyrJjHwWWGO7DLeOffqIqElmsC9whRCzma2xnDb7+eETW2uGdBXhI0=
-=8QgZ
+iQEcBAEBCAAGBQJQkDR+AAoJEMOx0zmdw4Z1ewcIAJZCnoPofZvt+3PcwmfxlkyB
+d5lm96yVIjvwgG99ttFQi9J3CrMtMlXUeR9hpr47k0vbWEKNDsjlzzVb3yZP15EO
+2PcbYb5dvS+DhwFKCx0neEVLbFSTM7RhPaK95rg0P2YtItSE8ZarHtC3gSRw76Jq
+rc5bDhiyvS5+Q5ZBxajIPvLX7KeQA2ueBHQm6SrwN4ZLFsitZAsveo7gXzBIjeTB
+NCPqNFL7t8v1rBTMOuFAlXVyZzyPL8W1SUcY4LRxIKDYjQ8MfClB4wvIlkQCbxdi
+LWJedKIIpeo3q2u+nfueXJqEowfI03PLA6YfSe4IM8bE+bU4c1437Gy4I8XLGsQ=
+=5OUp
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch b/dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch
deleted file mode 100644
index 1d3e12aca05e..000000000000
--- a/dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ab9d0d2f57ed84c01513053b88587dac82d9ed66 Mon Sep 17 00:00:00 2001
-From: Sitaram Chamarty <sitaram@atc.tcs.com>
-Date: Thu, 17 Nov 2011 18:49:24 +0530
-Subject: [PATCH] a couple of very minor oopsies
-
-(1) c5f342a forgot authkeys can have blank lines also
-
-(2) f0cedeb ended gl-system-install on a non-0 ret code
-
-both caught by matthewtdawson at gmail
----
- src/gl-system-install |    4 +++-
- src/sshkeys-lint      |    2 +-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/gl-system-install b/src/gl-system-install
-index 0eec005..d7df7e4 100755
---- a/src/gl-system-install
-+++ b/src/gl-system-install
-@@ -108,8 +108,10 @@ gl-setup is not in your \$PATH.
- $path_advice"
- 
- which=`dirname $which`
--[ "$which" != "$gl_bin_dir" ] && die "                ***** WARNING *****
-+[ "$which" = "$gl_bin_dir" ] || die "                ***** WARNING *****
- $which precedes $gl_bin_dir in your \$PATH,
- and it *also* contains gl-setup.  This is almost certainly going to confuse
- you or me later.
- $path_advice"
-+
-+exit 0
-diff --git a/src/sshkeys-lint b/src/sshkeys-lint
-index bcb8f7b..96c027f 100755
---- a/src/sshkeys-lint
-+++ b/src/sshkeys-lint
-@@ -119,7 +119,7 @@ sub ak_comment {
-     $in_gl_section = 1 if /^# gitolite start/;
-     $in_gl_section = 0 if /^# gitolite end/;
-     die "gitosis?  what's that?\n" if /^#.*gitosis/;
--    return /^\s*#/;
-+    return /^\s*(#|$)/;
- }
- 
- sub fprint {
--- 
-1.7.5.4
-
diff --git a/dev-vcs/gitolite/gitolite-2.1.0.ebuild b/dev-vcs/gitolite/gitolite-2.1.0.ebuild
deleted file mode 100644
index a2fd4b6c7f09..000000000000
--- a/dev-vcs/gitolite/gitolite-2.1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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-2.1.0.ebuild,v 1.4 2012/06/07 21:53:43 zmedico Exp $
-
-EAPI=4
-
-inherit eutils perl-module user
-
-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.6"
-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
-}
diff --git a/dev-vcs/gitolite/gitolite-2.2.ebuild b/dev-vcs/gitolite/gitolite-2.2.ebuild
deleted file mode 100644
index c1829c31f9b5..000000000000
--- a/dev-vcs/gitolite/gitolite-2.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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-2.2.ebuild,v 1.2 2012/06/07 21:53:43 zmedico Exp $
-
-EAPI=4
-
-inherit eutils perl-module user
-
-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.6"
-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
-
-	epatch "${FILESDIR}/${P}-gl-system-setup-exit.patch"
-}
-
-src_install() {
-	local gl_bin="${D}/usr/bin"
-
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
-
-	# install using upstream method
-	export PATH="${D}"/usr/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/gitolite-2.3.ebuild b/dev-vcs/gitolite/gitolite-2.3.ebuild
deleted file mode 100644
index 6409251e6ed9..000000000000
--- a/dev-vcs/gitolite/gitolite-2.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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-2.3.ebuild,v 1.5 2012/06/07 21:53:43 zmedico Exp $
-
-EAPI=4
-
-inherit eutils perl-module user
-
-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
-	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
-
-	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
-}