diff options
| author |   Victor Ostorga <vostorga@gentoo.org> | 2009-09-05 00:08:48 +0000 |
|---|---|---|
| committer | Victor Ostorga <vostorga@gentoo.org> | 2009-09-05 00:08:48 +0000 |
| commit | 86371b8e2ef66e241bec5f813a2b3889d21a86e9 (patch) | |
| tree | 341890bf1bc97cddbaa6f9eefe40c2d1f201ee0f /dev-util/svk | |
| parent | Marking dnsmasq-2.50 ppc64 for bug 280613 (diff) | |
| download | historical-86371b8e2ef66e241bec5f813a2b3889d21a86e9.tar.gz historical-86371b8e2ef66e241bec5f813a2b3889d21a86e9.tar.bz2 historical-86371b8e2ef66e241bec5f813a2b3889d21a86e9.zip | |
Cleaning out unused patch
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'dev-util/svk')
| -rw-r--r-- | dev-util/svk/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/svk/Manifest | 13 | ||||
| -rw-r--r-- | dev-util/svk/files/svk-1.07-xxdiff.patch | 29 |
3 files changed, 6 insertions, 42 deletions
diff --git a/dev-util/svk/ChangeLog b/dev-util/svk/ChangeLog index f8f4488e00cc..04ec11c12d81 100644 --- a/dev-util/svk/ChangeLog +++ b/dev-util/svk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/svk # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/svk/ChangeLog,v 1.38 2009/07/19 17:49:13 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/svk/ChangeLog,v 1.39 2009/09/05 00:08:47 vostorga Exp $ + + 05 Sep 2009; Víctor Ostorga <vostorga@gentoo.org> + -files/svk-1.07-xxdiff.patch: + Cleaning out unused patch 19 Jul 2009; Torsten Veller <tove@gentoo.org> svk-1.08.ebuild, svk-2.0.2.ebuild: diff --git a/dev-util/svk/Manifest b/dev-util/svk/Manifest index fbb8fb7531dc..a2383a155966 100644 --- a/dev-util/svk/Manifest +++ b/dev-util/svk/Manifest @@ -1,18 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX svk-1.07-xxdiff.patch 1020 RMD160 627e9081588cd8a6f834679e8bfc40234e4dfac7 SHA1 9f606352873185531d4048ba330852d9d0a51502 SHA256 7af4e6d62ffb8aaaef5a14747e61a459f7be01b7806c1b57e77f35d0672eb035 AUX svk-1.08-xxdiff.patch 1020 RMD160 d83e4859028b3c85809dedef065ba802748cab22 SHA1 a2c168975c24b40bceff9408a7c97367d807226c SHA256 af56f8df413b812a2a21cbc072022e473c02da3753cbcade9631103c5fc76cfd DIST SVK-1.08.tar.gz 265976 RMD160 517fb2000cdf462eaa2587874e5ddf713dae773c SHA1 a917d1cd036cede766f7daf0856b0d0cb619e160 SHA256 12d6ca2eee779e200123c9cf3679938c9ef87e91623ee9621f6276edd65928d4 DIST SVK-v2.0.2.tar.gz 445041 RMD160 5eeaa465355cd3026f7230b120d83051705fc86d SHA1 8d691c6e6b914e5b8e71ba75dee60b61fe90e54f SHA256 405b59c6398c50356f036292668bd653f43e296a3b301be64c90ffcd0e169530 EBUILD svk-1.08.ebuild 2008 RMD160 4236eb11b5577f4144ef386041360cd5a4f9f721 SHA1 f155ff256b75ff85f0e4f986c01450463c603ecb SHA256 d06db0fe53d2e5871349568a8ee2ec9c32c0b4316c000c3f2e44871d3882002a EBUILD svk-2.0.2.ebuild 1894 RMD160 7abaf967ec69e7a7352b01d758e4f28960c917a0 SHA1 ccbba18d0518fc96d3811e199b14218133decf67 SHA256 33d3a18d711b791d3a0362c51c1b30040f2f0bb53f9aefd95c5f2087b45ff99e -MISC ChangeLog 5728 RMD160 0c0cd463000c6ded5f1a6400ab19530cbf3df9f4 SHA1 78cda2c0cf3b8f901029030a204b68d80d2db06c SHA256 9a92024b54c455744a1569579fc95e6b8dc5eca5ab2bc5fdb57f3b6345799b7c +MISC ChangeLog 5846 RMD160 6f9a1cd96a455f2d31d1c416bc225f22fbe61af5 SHA1 48089580dd9db2daea4f92078218825bba1e0136 SHA256 99e38c58dd1ad283b5bcfeb4c2bf5f2efc9a45c124652dc50ada46209fae19ef MISC metadata.xml 449 RMD160 9398e8519bf0b3ddf12901e50398785ae6614eca SHA1 7cc42b966dec09d468a51d77d0c8d04733f14d54 SHA256 7ef530ec861b3ee1693104edb0a1aca0f860c04c38bcce66d43674fff82ff20d ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkpjXKIACgkQV3J2n04EauwsSwCgixrQv+zgWTjeTF+lemFnXY9i -DEwAoLqe/IQuI8jZh3NRgYieSZ8tKxeJ -=x+Jy ------END PGP SIGNATURE----- diff --git a/dev-util/svk/files/svk-1.07-xxdiff.patch b/dev-util/svk/files/svk-1.07-xxdiff.patch deleted file mode 100644 index 63789dfdecab..000000000000 --- a/dev-util/svk/files/svk-1.07-xxdiff.patch +++ /dev/null @@ -1,29 +0,0 @@ -Date: Sat, 4 Mar 2006 00:40:28 -0500 -From: Aron Griffis <agriffis gentoo org> -To: svk-dev lists openfoundry org -Subject: patch for SVK/Resolve/XXDiff.pm -Message-ID: <20060304054028.GA3958@olive.flatmonk> - -The following patch fixes svk smerge with xxdiff. Here is the -problem, from xxdiff --help: - - --exit-with-merge-status, -X If all diff hunks are selected and no - unsaved selections exist, then exit - with code of 0. Normally, xxdiff will - pass back the diff return code. - -Since diff returns an exit code of 1 when there are differences, svk -believes that the merge always fails. - ---- SVK-1.07/lib/SVK/Resolve/XXDiff.pm.old 2005-03-28 20:46:18.000000000 -0500 -+++ SVK-1.07/lib/SVK/Resolve/XXDiff.pm 2006-03-04 00:39:53.000000000 -0500 -@@ -5,7 +5,7 @@ - sub arguments { - my $self = shift; - return ( -- qw( -m -O -M ), -+ qw( -X -m -O -M ), - @{$self}{qw( merged yours base theirs )} - ); - } - |