summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-02-26 20:54:43 +0000
committerZac Medico <zmedico@gentoo.org>2006-02-26 20:54:43 +0000
commit9668778f3d1832db158e0ef378b4fe7b0a29dd42 (patch)
tree052a73562a055f326b1ce5480859aeadb05f1dc3
parent2.1_pre5-r1 regression fix release (diff)
downloadgentoo-2-9668778f3d1832db158e0ef378b4fe7b0a29dd42.tar.gz
gentoo-2-9668778f3d1832db158e0ef378b4fe7b0a29dd42.tar.bz2
gentoo-2-9668778f3d1832db158e0ef378b4fe7b0a29dd42.zip
Bump 2.1_pre5 to 2.1_pre5-r1 in portage.py.
-rw-r--r--sys-apps/portage/ChangeLog6
-rw-r--r--sys-apps/portage/Manifest22
-rw-r--r--sys-apps/portage/files/2.1_pre5-r1.patch11
3 files changed, 21 insertions, 18 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 835e85661270..939788ca740d 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.81 2006/02/26 20:33:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.82 2006/02/26 20:54:43 zmedico Exp $
+
+ 26 Feb 2006; Zac Medico <zmedico@gentoo.org>
+ files/2.1_pre5-r1.patch:
+ Bump 2.1_pre5 to 2.1_pre5-r1 in portage.py.
26 Feb 2006; Zac Medico <zmedico@gentoo.org>
+portage-2.1_pre5-r1.ebuild:
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2e934b7224bc..7c9779e2a1a1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9ef39b57da3616553971e0857da41dd1 ChangeLog 5394
-RMD160 f289ac6a256c7c44faa3b2977c7835ef3f92199f ChangeLog 5394
-SHA256 30cf8605169dc701259a899390526a9d0e87e0fa1d31aa49aef2af3e4b6bd876 ChangeLog 5394
+MD5 f6ed3ac6c188b42ef523fb7bfb593c36 ChangeLog 5515
+RMD160 f65e4687224a22bc04c37bbf207b25403efe5d5b ChangeLog 5515
+SHA256 fd46eb2bd0bbcf93bf0bcf1359bd0d7d0fa8818f54ec55b6cf8ca42788573a9e ChangeLog 5515
MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05portage.envd 34
@@ -13,9 +10,9 @@ SHA256 a6ae22f6513e9c5160204d9ba2ca8bab00091a88089139ff64bee68aaf63a95c files/2.
MD5 e3d8f54d06dce6fa8c4b9a9ff660f96e files/2.1_pre4-r1.patch 1581
RMD160 6bb0f83e5c562b71ce63b2ab51af89144f28cce4 files/2.1_pre4-r1.patch 1581
SHA256 057f3599ccda5f07091b3e9da51575fe56f3e9307e51224c68b9e63887ff99da files/2.1_pre4-r1.patch 1581
-MD5 5e3dc02edd54f963800ceb1ff1f1a611 files/2.1_pre5-r1.patch 1703
-RMD160 5c3eeb917b88a885289a6c838dab1131686d3051 files/2.1_pre5-r1.patch 1703
-SHA256 fb5bd88d027102f15a943898dc49d77668e4078070dfcf5dcd89f267180869ff files/2.1_pre5-r1.patch 1703
+MD5 cdf408c2a0d06623385bcd915ec21214 files/2.1_pre5-r1.patch 2028
+RMD160 0ba502dac72d1507034a8f449ad96fae033c5587 files/2.1_pre5-r1.patch 2028
+SHA256 d11a4b2ef7917052e42e3df40241696e4cfa8152048cb43a7106203f246c36ed files/2.1_pre5-r1.patch 2028
MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
@@ -61,10 +58,3 @@ SHA256 eec24ea13ee7ad39ad41e2a98488c4a7ff0c71a146112fbf806e9d24ee77ae23 portage-
MD5 6ab066ae354f81d5b70d80500ed9eef2 portage-2.1_pre5-r1.ebuild 4766
RMD160 92a8b4b2663dc4a4ebe160651aca21e3c57c81a3 portage-2.1_pre5-r1.ebuild 4766
SHA256 47f633949a8074e019a3ce8441d693a5a44970b997199b4e8f359bb3c603b026 portage-2.1_pre5-r1.ebuild 4766
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEAhCl/ejvha5XGaMRAtmJAJ9mreT30X/9oBBkUBLzc04fY/hDKQCg5NOo
-00Xud2yGUKXRgXcd4XZGoMw=
-=rH0G
------END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1_pre5-r1.patch b/sys-apps/portage/files/2.1_pre5-r1.patch
index ddaea3e73541..126de28588e7 100644
--- a/sys-apps/portage/files/2.1_pre5-r1.patch
+++ b/sys-apps/portage/files/2.1_pre5-r1.patch
@@ -25,7 +25,16 @@ diff -Nur portage-2.1_pre5/pym/portage_locks.py portage-2.1_pre5-r1/pym/portage_
portage_util.writemsg("lockfile recurse\n",1)
diff -Nur portage-2.1_pre5/pym/portage.py portage-2.1_pre5-r1/pym/portage.py
--- portage-2.1_pre5/pym/portage.py 2006-02-21 02:01:08.000000000 -0800
-+++ portage-2.1_pre5-r1/pym/portage.py 2006-02-26 03:39:28.000000000 -0800
++++ portage-2.1_pre5-r1/pym/portage.py 2006-02-26 12:46:20.000000000 -0800
+@@ -4,7 +4,7 @@
+ # $Id: 2.1_pre5-r1.patch,v 1.2 2006/02/26 20:54:43 zmedico Exp $
+
+
+-VERSION="2.1_pre5"
++VERSION="2.1_pre5-r1"
+
+ # ===========================================================================
+ # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
@@ -5334,6 +5334,8 @@
return 1