Easy to use 9999 version for testing, and a non-9999 version based on the same ebuild

Package-Manager: portage-2.2.10/cvs/Linux x86_64

4 files changed, 222 insertions, 16 deletions

diff --git a/dev-vcs/gitolite-gentoo/ChangeLog b/dev-vcs/gitolite-gentoo/ChangeLog
index 3a0d439d1c63..302ba99c12c8 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.39 2014/11/15 21:04:03 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.40 2014/11/29 23:03:39 robbat2 Exp $
+
+*gitolite-gentoo-3.6.1-r1 (29 Nov 2014)
+*gitolite-gentoo-9999 (29 Nov 2014)
+
+  29 Nov 2014; Robin H. Johnson <robbat2@gentoo.org>
+  +gitolite-gentoo-3.6.1-r1.ebuild, +gitolite-gentoo-9999.ebuild:
+  Easy to use 9999 version for testing, and a non-9999 version based on the same
+  ebuild
 
   15 Nov 2014; Christian Ruppert <idl0r@gentoo.org>
   gitolite-gentoo-3.5.3.1.ebuild, gitolite-gentoo-3.6.1.ebuild:
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 7a51b7843b82..149e17205e20 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST gitolite-gentoo-2.3.1.tar.bz2 198849 SHA256 65c4646b5609f987b3004dbc44ebf9a76d3f1791414fbe13eacea25460b966ae SHA512 994ee759d87659eb4f4bfbe6618d1bd74e83df2e6c8d710ca1c929d86e05b1152639bf5c99b906f7d20f9585163f872f04d9710e29b1d73ada998595553d294e WHIRLPOOL 9d4effd46f5953bb330f799962a79fb999ada0c6ba8cf0b536275f3c56f1178f76730b6ab659e8adf3378c2fbe8ba6ff602eec15e32822192cd0d07f8637aa8d
 DIST gitolite-gentoo-2.3.3.tar.bz2 199370 SHA256 41680cd9ff0999a945498749022360101dd33d4195161912418e8002bbabc9a8 SHA512 f9720effa816400544bf5526d896b9db734828c46356d0188e2ddb8fa8f175efb0f60b30c9e9c80a0624f6cb6dc5c5a301d8dfa35f13ad08fcd0538a0b8f77c3 WHIRLPOOL 1e3edc9bc7a66d51c205b1bca516620248cb31e78ab1cd5bf455a07096948a208825858ce11eb21b82ed825bfff043d59215a1257641557fd6ffe869924b4896
 DIST gitolite-gentoo-3.5.3.1.tar.bz2 127391 SHA256 0a7025e597f9e50b15bf181c34e7851b68e449400ebfbcc96be7d307760cb726 SHA512 f36a270f651b2b8d4ae02fd7b3841a599b7c66d36a6f92df8974897fdec863b4c09064c384ede9309150a4a487186ba3c3079cd0037d5fd39852b452115933bb WHIRLPOOL 0cb2b06a13f6a57e335556c68861bb1cf7ea907901cf3cb9479757775b1e8636856b889f12cecb5dff10200afbd66ad810e450a81739f6ce7b399e6fe6685afe
@@ -8,17 +5,8 @@ DIST gitolite-gentoo-3.6.1.tar.bz2 140554 SHA256 db138b8f616322f0b9c5fb466c579f6
 EBUILD gitolite-gentoo-2.3.1-r1.ebuild 2009 SHA256 09ef40acc32b005b03fd8412e45cb973c91fa711d2ae04406e9c469fd5b0630c SHA512 9bb6364cf68a4666ae9b4d86f2677b701df1c2570749c52869a7b84baea4b8e1fe6b300344905f4ecbc3b952e2746a3813db64608f1ae91d512cc80c08758984 WHIRLPOOL 21fa2109cbb97e28bbfa64191dea9336fbdbc56f67f05f150554ce796fe01ba75928539d0a3940ab2cc0ca27d70c24f5df3739711931fa80270f685ee118f8b0
 EBUILD gitolite-gentoo-2.3.3-r1.ebuild 2011 SHA256 edd5cb88cb5704b03817d9110921db8dcefb2361a4fc153d1602c339dbf299f0 SHA512 908da7e14fa10b6272bc8599fdfbc3834f91e933233717d24bdc65aea4d5017d0853f59d4058ae44834aebc3f77bebe10654253c00fb63385de6f8ac0a1f1dc4 WHIRLPOOL 813242ff7f3a328c49994d82c59b0cc933b50abe2806e1f0365acdd4ccdb3b34d87c1633debfd9f2a8446ebbaac7c5f9dc24fdc9cd0605dca21626b2836d8835
 EBUILD gitolite-gentoo-3.5.3.1.ebuild 2432 SHA256 fe397a4f27589560c13e1299cf61fc0cc06c98837722777f224ace20ae9851c9 SHA512 75f34ace1f34cb1915dd0635e476baf552f9a7c4e9d2ca002a053b704b3d15a89e2804a100fac5039da844799d12c5b2474b4d7fc9cc32e67d5322d843911fc9 WHIRLPOOL d3d324cf3e66c9523a0c3cfdd1b7e5905e8f3f69a324425b963d9e8a1d2667bf6105ba194387e1e2558dc0c617c459cfba9cbb44106a9258c82769e4462051b2
+EBUILD gitolite-gentoo-3.6.1-r1.ebuild 2899 SHA256 3b1fa72d26d0045d73d440e47a2fca7986cff7ff4a77a601956564faa1bf8130 SHA512 d08b5cb7b270995ef284cc311589161d07dd9d3065f44f38e328762334524da787b2154472e431aa88400d4833639404605f5a31ac53b0f33d1bbea7520b59e0 WHIRLPOOL 53e18f5df0b41f7dc3b0c1c7549fcef1979dd9f4d08a96bfab492f2fa02da301becb7a8555a0db03668fe1c76b38493a5ecbe8f70143af045eed3e8b15a46e19
 EBUILD gitolite-gentoo-3.6.1.ebuild 2430 SHA256 a6f28322722091693b8acbaddccbf6aad3eaff52dbd58d2027a5f4b296af190b SHA512 c254aac0cf0d5413a1b405b7392785c76ea958e354736547538e0a6d2e3ee0869c5ac0134c74aa9a96fab8490bb9719c42b3b4e0df89ce35ac07059173b87a74 WHIRLPOOL 990ea22f10ab0480b93b7ab7c487ca8a159303d4ad8d2046837ca0527311ca94f98a59e4d11885ff1c4b04cff6adb7b7c729712db38e7736c0d6378d438a040d
-MISC ChangeLog 7146 SHA256 a7291ab49a7c3d341077ae6bd6a51a0658f8ac66f197d00ad74a8c6620ddf931 SHA512 376b8db6a62f92a9e319cf335438ef8b256e2dc2984882e66506dd7696c8a50a71b402e1d91b317594e39b73a58a90983e75fc041ec36529be0b9b1739a2a08f WHIRLPOOL 81344e03c2116d665f5b2793bf1377a38aff3f840e6805d2d42b50955ac90d81c40bfed298569501d4ef9a6066589a9282ee7976ab0c9027c29daa94137ac3de
+EBUILD gitolite-gentoo-9999.ebuild 2895 SHA256 d6ba5064c868cf8cc4d529524f7205e8e4e970644fb4e7a8cca4c32cb23aa46e SHA512 0467d7322d8343dc350765c80dadfb88d7e7db7f3926867c5c7ac0c7c5e500c490d0242f6b0efabcc199853452e082eefb0324a09626d863faf4606c2f8bf45b WHIRLPOOL bb8939b12441f8dd054ac85f01137455e55f9c1f7e3755c5ce9bd40ae8e59813fd9e7e9de234c3362e99985d80c2e26c10d4dfbdc8f4bb56ce26eda146944eb7
+MISC ChangeLog 7435 SHA256 589b5c7cced38d16528fc31987cfaa66527ab795e8a0bde20a264eda341780f9 SHA512 da062ae2236cb9c45b5647d4b7bf26df561313139191d78ea89339e07d43c9f96bbf6a776a7d9e72482ccb7d0e00709eaa8ab457d866086f64e0bb7af8e606d7 WHIRLPOOL 0404521edff601940ed100b7260c0ae79550a7169e4636dd405e95a6ee5e9b157cabaf0b6e3e8660e0e910bb1f24ede1230013a374737f65a2cb2c8f51afbc36
 MISC metadata.xml 462 SHA256 4f254ca85d9f1691c416f549328464a3156b5a5524d893b7444891be779d6de8 SHA512 8e35ba2c2682cc77565deb411dfff100423e21774ce4c7f4d5e93b6a0c355c2407413e73409824169160a0d76292758bdf120a289d3f500553932a70101181db WHIRLPOOL 0a78421d60535d27362e62dcc3f4c8b28b6dc8db6d6b8616ec8576bfa964b313dad656ed8849234dd61cff2cffd00d7eb798bb56fdf002dcc1033c02886abf81
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJUZ7/EAAoJEMOx0zmdw4Z1s/AH/A02QdkfT+tfhcO6y/Tc3i6x
-Z6zmu19Zg8g4IOLCL1kzkH0ie+T5/PGmZY4WTxteSy9QwzLsOoMUgd4V0QBNb8dP
-/rWa+gnxJdvIRTRsgvEvI7EZCimNCufLyF+Ws4DTdyNz3d79Hz+ntq6PIHLiKDd2
-WDAzRQuIkmuC5x9JeTh/3LAl8aviWZMKRNVsDTL8wsCBXo1MgSEb8AZ39IUayz+E
-V21BSUwqmqz1zQiFBxg9zfaaim54YtVqe0CYM4CPx90+pwV98C999YiFyujPYiHl
-58ZPCA7PiouNgINvNMCNnq6b2CtidSH8hjfThXXCe+5JbRdVM0m5iQcd20PXQl8=
-=W9z0
------END PGP SIGNATURE-----
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..40acf51b5204
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1-r1.ebuild,v 1.1 2014/11/29 23:03:39 robbat2 Exp $
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+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"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="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 )
+	dev-perl/Net-SSH-AuthorizedKeysFile
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > 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.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	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 tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	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 [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		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
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild
new file mode 100644
index 000000000000..1cc036438c08
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild,v 1.1 2014/11/29 23:03:39 robbat2 Exp $
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+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"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="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 )
+	dev-perl/Net-SSH-AuthorizedKeysFile
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > 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.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	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 tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	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 [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		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
+	fi
+}