diff options
| author |   Brian Harring <ferringb@gentoo.org> | 2012-05-21 02:09:19 +0000 |
|---|---|---|
| committer | Brian Harring <ferringb@gentoo.org> | 2012-05-21 02:09:19 +0000 |
| commit | 84f127e45dea9c13f53701a14de7f5b5b506c5af (patch) | |
| tree | 0567718279cd1c2b28447c93bf5030d4798dad4e /sys-apps/pkgcore | |
| parent | fix assumption of assert's return code; unpacker eclass relies on this (pms m... (diff) | |
| download | historical-84f127e45dea9c13f53701a14de7f5b5b506c5af.tar.gz historical-84f127e45dea9c13f53701a14de7f5b5b506c5af.tar.bz2 historical-84f127e45dea9c13f53701a14de7f5b5b506c5af.zip | |
Tweak the last commit; drop NEWS from the patch since it won't apply cleanly.
Package-Manager: portage-2.1.10.52/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/pkgcore')
| -rw-r--r-- | sys-apps/pkgcore/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/pkgcore/Manifest | 10 | ||||
| -rw-r--r-- | sys-apps/pkgcore/files/pkgcore-0.7.7.8-ebuild-envs-assert.patch | 15 |
3 files changed, 10 insertions, 21 deletions
diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog index f2a32e065ab4..ef1d9b1d8e8a 100644 --- a/sys-apps/pkgcore/ChangeLog +++ b/sys-apps/pkgcore/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/pkgcore # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.153 2012/05/21 02:07:40 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.154 2012/05/21 02:09:19 ferringb Exp $ + + 21 May 2012; Brian Harring <ferringb@gentoo.org> + files/pkgcore-0.7.7.8-ebuild-envs-assert.patch: + Tweak the last commit; drop NEWS from the patch since it won't apply cleanly. *pkgcore-0.7.7.8-r2 (21 May 2012) diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest index 9584b41f6c49..761e9a20bb5c 100644 --- a/sys-apps/pkgcore/Manifest +++ b/sys-apps/pkgcore/Manifest @@ -1,19 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX pkgcore-0.7.7.8-ebuild-envs-assert.patch 1329 RMD160 204cfcae5172a90f750c3b7dd0bc03cca7d6437c SHA1 9115a103bf934a515bae934e9665a221c8f8a6d5 SHA256 6f072a5af46b18382bf6754dca1082a601cca9eb19fd95c2896821677ddc3612 +AUX pkgcore-0.7.7.8-ebuild-envs-assert.patch 878 RMD160 e930d27b6b878bf07fc837e9d69f791bcc8301a0 SHA1 c9604b9eaf711333f19f760162a65743aab5e8cb SHA256 c25b07f88bcf99d12479e69da39ed4753a8cfbcc151669d952be8a45209f237b AUX pkgcore-0.7.7.8-fix-resolver-assert.patch 4386 RMD160 c3524c54b52d3542f867b8cde3e469764a60a108 SHA1 47008bd4c946812947cd89ba5a0e08378555dcc2 SHA256 ac33f503aacdc379d81022a658b4c3e0802fafcfe9ef7eb0efec3aebae7b422d DIST pkgcore-0.7.7.8.tar.bz2 439499 RMD160 ec9c10e3095f8a529223d98786e4111b7a6e538e SHA1 bcaaea0f920c4ae1caa6cb4cc18a5248a71a31a6 SHA256 ad90b71a1cd2e7aefcab77893396a483cf7c2b9fc08cbcd55711d1985e048116 EBUILD pkgcore-0.7.7.8-r1.ebuild 1205 RMD160 db3bf4f2672da6b794758fc93ba44ae1a46f0a4e SHA1 741312dd4c13f4a9c0cabfc99f16e87c1b7b5aff SHA256 ba1f4cd2f020d13eb5557daf4808f6a022fccd1dbfdda32d41d6eb1186029672 EBUILD pkgcore-0.7.7.8-r2.ebuild 1264 RMD160 00b326f9acfc8ceb61a45a0b0c9d41ac096b4d55 SHA1 5c2611493f289e66cad63cc00da0473e667a4059 SHA256 634ce1558ef1e826d178ed1b37db129f7db408ec00a270e2b3da869f4696d408 EBUILD pkgcore-0.7.7.8.ebuild 1123 RMD160 961626f383acdf3efd750aed66a75679fe81fe6a SHA1 12dc8730ad023dd34b7b2ef5c0d5d74231ede486 SHA256 88753d0b8804f7960fae0c0cf986478ea1fce6ba292684e34c03211538d57bd8 EBUILD pkgcore-9999.ebuild 1068 RMD160 bc8a2a0a6bd5bfd833229fdd7f275debbd024d9d SHA1 b7cf48faa047e11876a9bdd7d7959c6265c14ea4 SHA256 5deb75699ba0d4faed469441327f331d9031006ea90084e4a4e5b9afc8842631 -MISC ChangeLog 26166 RMD160 aa8a0e1a5e8fe9d0f6be7e956ed631d67b120f2e SHA1 23566792e0ee2d14c4e12c6f39c2770421ded684 SHA256 e7fa43336565d9b3b2d9d9390688823c66f5772b5ee800f4e24f228bc93053a8 +MISC ChangeLog 26348 RMD160 4c82edd2af89df239fc515ce24990d9ea50331f6 SHA1 17aeb3b9fe2a0e903014f7385aac4f5bb1b7c180 SHA256 332951e1e3f7403d48a0bba8cc51cfab9190724a806b570ace637eb3c4a5f3cd MISC metadata.xml 358 RMD160 86c4bed397308bd927abe5b46b53bef8bb4f4726 SHA1 ef2cdb1191d68aa1f5e10d630a6cdd15b8ea4327 SHA256 9cd29ff0b62fdc004f8a686675df1175b7605ce6ad099d5aa278dfb212aced88 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk+5o3IACgkQsiLx3HvNzgdkuACg4Ff5/0AQlFrcBI4UUZ1KRgQZ -P/8AoK+zqAXl75OrONw9fex3rDIQZgw4 -=tWAh +iEYEARECAAYFAk+5o9QACgkQsiLx3HvNzgdHYgCcDNUiHaoE2tRJSqYBAPCAOHhQ +lPAAnAp/C8YC+FTRKQ8+lnrX01n6JNjd +=UZ4S -----END PGP SIGNATURE----- diff --git a/sys-apps/pkgcore/files/pkgcore-0.7.7.8-ebuild-envs-assert.patch b/sys-apps/pkgcore/files/pkgcore-0.7.7.8-ebuild-envs-assert.patch index 26b39bd157c3..4b4268471472 100644 --- a/sys-apps/pkgcore/files/pkgcore-0.7.7.8-ebuild-envs-assert.patch +++ b/sys-apps/pkgcore/files/pkgcore-0.7.7.8-ebuild-envs-assert.patch @@ -10,21 +10,6 @@ match portage behaviour. pkgcore/ebuild/eapi-bash/exit-handling.lib | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) -diff --git a/NEWS b/NEWS -index 268b79a..dace98a 100644 ---- a/NEWS -+++ b/NEWS -@@ -5,6 +5,10 @@ See ChangeLog for full commit logs; this is summarized/major changes. - - pkgcore trunk: - -+* Gentoo's unpacker eclass is sensitive to the return code of -+ assert; this is outside of pms rules, but we've matched portage -+ behaviour to keep things working -+ - * Fixed pinspect portageq envvar support. - - * Added `pconfig world` for world file manipulation. diff --git a/pkgcore/ebuild/eapi-bash/exit-handling.lib b/pkgcore/ebuild/eapi-bash/exit-handling.lib index bf2fcdb..c02b2db 100644 --- a/pkgcore/ebuild/eapi-bash/exit-handling.lib |