summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2012-09-22 15:17:47 +0000
committerChristian Ruppert <idl0r@gentoo.org>2012-09-22 15:17:47 +0000
commit3329e912fa5472288bf8df73fae132e9537d34cf (patch)
treec48144db93a38a992af1658a164bea6fc19ec47a /dev-vcs/gitolite
parentstable ppc, bug #433219 (diff)
downloadhistorical-3329e912fa5472288bf8df73fae132e9537d34cf.tar.gz
historical-3329e912fa5472288bf8df73fae132e9537d34cf.tar.bz2
historical-3329e912fa5472288bf8df73fae132e9537d34cf.zip
Fix upgrade warning when upgrading from 2.x to 3.x, bug 435816.
Package-Manager: portage-2.1.11.9/cvs/Linux i686
Diffstat (limited to 'dev-vcs/gitolite')
-rw-r--r--dev-vcs/gitolite/ChangeLog5
-rw-r--r--dev-vcs/gitolite/Manifest18
-rw-r--r--dev-vcs/gitolite/gitolite-3.04.ebuild7
3 files changed, 17 insertions, 13 deletions
diff --git a/dev-vcs/gitolite/ChangeLog b/dev-vcs/gitolite/ChangeLog
index c9881298707b..6240f99294db 100644
--- a/dev-vcs/gitolite/ChangeLog
+++ b/dev-vcs/gitolite/ChangeLog
@@ -1,6 +1,9 @@
# 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.23 2012/08/26 13:00:38 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.24 2012/09/22 15:17:47 idl0r Exp $
+
+ 22 Sep 2012; Christian Ruppert <idl0r@gentoo.org> gitolite-3.04.ebuild:
+ Fix upgrade warning when upgrading from 2.x to 3.x, bug 435816.
*gitolite-3.04 (26 Aug 2012)
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 9512fa6ce3e7..a7ac61054b4f 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -13,17 +13,17 @@ EBUILD gitolite-2.2.ebuild 1745 SHA256 5812001619e193ff5788f3e68540644c6db604f05
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.03.ebuild 2142 SHA256 b1c9135b18d59365c001a7bed8dead20e31a30ffe8dc66d8f7c13507a6291c47 SHA512 1e98ca35a57f7b54d69732d8a0f4f77c0d4ec1e2f0400c24220d7abe678efb09914904fcc64d7b0b0f685a50708b33c87743b8b0407843676e409c06689caec6 WHIRLPOOL 0d024e779f54db03019e572110a153c5e0879adf626ff83566e2d395cddaa662fba9d25bd1e66e1e15ec424d6249c007e921f79471861fdad39919bcb4a1707c
-EBUILD gitolite-3.04.ebuild 1910 SHA256 1252345655ec281a031213169c50855ceadc16ee254d19fc92d79fdd7dc163aa SHA512 279dd85d56c7a6e194ce41faafb5c6d43c2ee0adeef143522e063872c9bf36aa54072465f3fc9fa5050d85587147336d1153622cf9ae4abf21cf6311893d444c WHIRLPOOL af8293a377f5a3e7c0648c54e09c3db7fccc3a7e76a34cfb7eee4263d77f29006da0607d9c31a26a66843fb83470204f19a0e8b0012ce238d0b333f612595e4e
-MISC ChangeLog 3629 SHA256 14971669cf2ad5b60b5a2803f4765642e9e8fc7dfa2b6638b3fa59362f411cab SHA512 3c3c545cd707721c8c59dc138a120a2bfafd7169cd870b4dadfb7dcf1b172810c2555ea46ba74f5d2591c3d299c11c9fdc227d63f00708e54fa6199932bfc7a5 WHIRLPOOL 46d821240b89fcb9866e130929b4341ad8d11f3f6683b479e1c04968be8e3c5b09b48ad12af7b535fc1fc48f46077792acf201160f8526bd3bf585d624d4439b
+EBUILD gitolite-3.04.ebuild 1941 SHA256 24b5a98fc6fdd4a33c695e4cd4044254819449f61d4c8574c20253d8074e4b0f SHA512 3297b680fc16ae4459fd723eded713930fe885133ad7f0aa920c1314b52c5215d103085f55a8878d3b7b5556ec466d7f554e523a421bfc8784c04472d4e1a15b WHIRLPOOL 88d8ff1e10591aa417c014a3f21ea9eb7f8862b2119b7bde7d2bec27986b5c1e085b2a555acc07d6266dc5640f02986d4a8802395b2b92df3ed32add603d19af
+MISC ChangeLog 3770 SHA256 30718d9cbc3f89f11d0d3b7ed07f0f2c8531d75a5ea4fe27deba1220320fb2aa SHA512 77b8e491cdcf3e1c0d5374493c9887f2a83b2c09c63723a9b6d06a451deffb2b4244c50d99c647ed329e4d9adfcaec74e5ce802082b33cf42ee0396715dc7cdf WHIRLPOOL 180e8df28a4f922630e6d2405a03e56da346e9b0b1f40e5c0f5824e398ba02ffe972b6d7423079140b80c6a14ad5ebf5d3cbdd760aebf675c059c65420ee5bbc
MISC metadata.xml 779 SHA256 b4ffa2d440bbd0bad5a09952ae8b0240b7056ad2773cd36c617d89ac0b589e8b SHA512 119a713d329854b20633d292fddd5e38f2292a81c76de4fe776cb06168ba03a2bde59b954b5453ec5232645516a62b2d0a2ec68ad27f9d011dbc309ebd1d123a WHIRLPOOL 1abe55643411d0c9a0750d221784ecd085916a3f806af052b6c5c8dc93844bed9897400535545d387697663cd1bec73b37f7fbc25956d517583eef156b945cf7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJQOh38AAoJEMOx0zmdw4Z1mcgIALWD1qXnVncueB7psro5+EeY
-QTRkRb1oYGxNSvdqEBOLi5lLJzFqyCh3hSWcbB7NZU+fd+yJ8jY+k3IKpquTLRqB
-gWsqS5Tr0yuYRMB/rUNmHidXLv4+PC/2g5M4u4tfbRlAqy0ZcrCKwyeVwHy9czMd
-OSIJBwEATPOQZaidSB+xOCTO3oU1lRysqRXnPbEXf2QQ8HzrOFXoBil8l4l6CYmJ
-Z+ut90/k1qN02EK2Dh3CCyhjK6IBPK89Ca82xZg398lzOt5SXObuZt40dhEPaoPP
-iKgLyfUHgj151XWNub0TzPYD2aY/kha2KCxaYDE3kpYMROlpdA8Dc4x2B2zM60Y=
-=fNJI
+iQEcBAEBCAAGBQJQXdahAAoJEMOx0zmdw4Z1qaYIALLW/2DlVO3mZx/tgfcEmvet
+QoME2DE9mLF/GH6eDijKldQ27V2MRHJyidbmqwJIIWYay6yzoNQgSSWXqjwDAbGf
+Etxt5VtDt8tm2ylP2rFbW3wQfK3OByxx+2IPNRWx0JNHrH9oZ1Bb6Lce3EcnpcF/
+clNW3DUe4CW7iigFxTM7642XDrxhCIXsAjLY4yKhf60rU1xxEgwAXTjQ801E27qC
+ICnbhoE3GJC8Ns9/oqLupQ714nWvJA/LUEZ5AByL1WjvV/O1cHMWXaDIygqeEBW1
+akl02xbJ1mHL7Acp+O3adTXb7ADsZw0FaF1UTTm+CQ20SgTYvfRLDwMHgcU0CLA=
+=Wxa2
-----END PGP SIGNATURE-----
diff --git a/dev-vcs/gitolite/gitolite-3.04.ebuild b/dev-vcs/gitolite/gitolite-3.04.ebuild
index 3edf5fd87d0c..ade0376182a3 100644
--- a/dev-vcs/gitolite/gitolite-3.04.ebuild
+++ b/dev-vcs/gitolite/gitolite-3.04.ebuild
@@ -1,10 +1,10 @@
# 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.04.ebuild,v 1.1 2012/08/26 13:00:38 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.04.ebuild,v 1.2 2012/09/22 15:17:47 idl0r Exp $
EAPI=4
-inherit eutils perl-module user
+inherit eutils perl-module user versionator
DESCRIPTION="Highly flexible server for git directory version tracker"
HOMEPAGE="http://github.com/sitaramc/gitolite"
@@ -68,11 +68,12 @@ src_install() {
}
pkg_postinst() {
- if has_version "=dev-vcs/gitolite-2*"; then
+ 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://sitaramc.github.com/gitolite/install.html#migr first!"
fi
+
# bug 352291
ewarn
elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."