Drop old patches

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

5 files changed, 20 insertions, 96 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index f9eefd4e85bf..ec2db4121739 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/git-cola
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.48 2015/05/27 16:44:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.49 2015/05/27 17:00:39 jlec Exp $
+
+  27 May 2015; Justin Lecher <jlec@gentoo.org> -files/1.3.8-disable-tests.patch,
+  -files/1.8.1-system-ssh-askpass.patch, -files/1.9.1-disable-tests.patch:
+  Drop old patches
 
   27 May 2015; Justin Lecher <jlec@gentoo.org> -git-cola-2.0.7.ebuild:
   Drop old; obsoletes bug #526088
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 97e83b508e4d..f48f64f69508 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,33 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX 1.3.8-disable-tests.patch 855 SHA256 cb0d81baa5385d1f394b756b9bf21a2ee9b35bb3765ae5a47216519a1e1b6465 SHA512 dca674aeaa4a69fe0fe5cbdc119e796ab346365748a72c09c505bd27f0d1be6355da47a4a3e5ff70d5bbba6d9a28a8ec4b0437e562e0ad6b741c0890d74526bb WHIRLPOOL 92b42085e4a17cf50dd5368c4d96a1858edaf325576208a58f4482c0926a36025baaafb87ec70acebde069ceee9e05840c042e46974e6e2895ce1dc93d5a0b98
-AUX 1.8.1-system-ssh-askpass.patch 1152 SHA256 b686e77bc3ddd67747d6bd8738d8b787a4677db4e15491a2d5698da1cb74f9b9 SHA512 9c71224090df518d9643405a7dafc4dbe730385c0d104472394a620e270cf51669403cd47a6ee1bab27627b63b467654c6200f058971e5059dd4c2b5a3ca2cdc WHIRLPOOL 8c83c9ecab7a646c57c538f1e36531eb7c87b901758b0340869dd5b8ef1dc46f0be40690ef2f6ae07f069eb74cd4de2455585367b3581b032c87c4bbb8695858
-AUX 1.9.1-disable-tests.patch 879 SHA256 2ca46f7800b025dbe9f7a89896105e001407a4a44097bc10186ca50ac6e3d297 SHA512 25630e8af0cf7f20e197a458a73ba8251ecd34e9e87667059d2f569167a1cb252297e87d0f69cb0d6568527d2308c92a44b2503edf2049f784fd49c8c7c254b4 WHIRLPOOL e64c4930862032f1b87560c001cdf32cd4f57577ac9471b1740d33212c5851eef52123c7d1cd3914157f723de91b695f32a860353c185ca7d81b3a4feaaa8b93
 AUX README.gentoo 227 SHA256 c95560b961a37e9c7b731599c9eb85fff9f9a45262747a498ae5034dca2c49cb SHA512 9e8b672fe6998a255dea761e186d5a9031895e8ec0eb14d4942c81a462a238ef1eec0431671da8be3ee4bbacd7f81cec6ec1f9e75e2f4429c3472faad5ba2c2d WHIRLPOOL a1ea204d2353fee42dfdc3880dd2689a7f7b4f12ba2d5d048b86ca29ecf29f34f970b84e5fde30110dfb6f029a8ffd41dc84cff80f1bf652a18ad5db4820958b
 AUX git-cola-1.9.1-system-ssh-askpass.patch 581 SHA256 77afe1bc2c2dac04cc7e4a1a904dff198d7c0c4807b775a6dd84c4a76cf0cdca SHA512 ca342ab6b00580708fce8f33e8c628d743e8b18ae6b1a568540fbef076377e6c94ae577edf8e1888da44692b72f1d59429344dd9b62106b7481369a735c84ca4 WHIRLPOOL 9e519bf2f7c789efed07721fcfc301ba5ec18e867a848380eb43a6b04f6428034cdebdad57c894839e712802dd3686ec374fe12863c09b3fb39c4223e44bde69
 AUX git-cola-1.9.3-disable-tests.patch 859 SHA256 cf6e9410e0b3ddef9b40ce00906fc49dbf667b3f2eb72929c7320decac676c2a SHA512 ca5b44a5a3ebaaf2c0518293554d3edc1d395dc82ad7f908096315083089c9c509ed24c9d1a1d6f266626a32b264d5826df645d6e65b4977f307973e304f8006 WHIRLPOOL 89b3b127a75db955d5a03f71c5c49701f6a9b913e276f6e4cf241c6cf158ab2e493ef477af4a5764826587b93d5aa6ba9aea5f361216c5d1df33577c5ffdf872
 AUX index.html 355 SHA256 9b092445f2da302365c22fae670ad75f8d0a57ca64b4c99bf5662b9999869a60 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac WHIRLPOOL fd3d058f2d57dd9664bc498d6b8bfa749d219d44bef7cbf64624abe16e019062108f52f8cc18ebf580e70d2eb20cdb89f760d380a83b932712a689e921201f7f
 DIST git-cola-2.1.2.tar.gz 960514 SHA256 f0465f74858fc78b1b30e06856cdd6b5fa5f0cb9587b5c7e9b489f4d0e4d8f8d SHA512 79eae7937db148cde22b3d5dc1564180c3919965c35c11853270525be4eb19c7f223ddc215ba8122ed8bcb70e0e6ec57948f1e02aeeae1a9c3e7c98efef1e42d WHIRLPOOL 8797f0f0d02eaea1c7e1ef5544fc7e5e2bf6ca738cff721ce56db194de8cd94a3e825bf557f478237d75c5cf782ed43cdafc7a7afdaf1417fa4f3d8b65bcb756
 EBUILD git-cola-2.1.2.ebuild 2509 SHA256 c32b98d98b6935f82f4907da7ad41b91d6fb832d241c17e31782f90b0b38c50a SHA512 1f8fb9aa7ae0b1a7d3a4c57786842fd4d4af1a994ee950c451ce0fafd137a3b3ead39ed791cb1ea93c783c6bb09845ce6d6b3262084b10d9747734ea85281e56 WHIRLPOOL 241ae40c1e7ffa737aa13f041e47a00f3286f23b172769d6ae1ea279161f2a7d50b85c65e2c528caaf2d9666e00b568702cca3d46dbec6f1e11c5a690a0280e3
-MISC ChangeLog 10175 SHA256 0eca85623051bfc18daa168eadf7279348eb25c8668e5e7982ebefec43860561 SHA512 502afe8da159fe6ad9ff94f338fcb964d4e1c42b5375404374361168fd1af8b9d02d54394f22327c7da2479b1762ef535321368074fbd0ab62c06d9cef322432 WHIRLPOOL 478cbea86f5627ee68e8d557de064eb495d02a9787d90afc7102eef6db00adfed828b8964c6452da2b7b1fd60a8302ec934777500a9bd1a00b016ec526faae18
+MISC ChangeLog 10351 SHA256 0a6397fedfde72d113463402a3f1acf310ba4f653182eaf2916266de9ddc82fa SHA512 e2f88e7291553fdd2d5e437fccb914a086203382c7e35e7d589a6ba1e1d24b07737f3535ce215cafda62cd421868894074d6273400469cfb7c4c3193fc8a009d WHIRLPOOL 15989a863e2785ff0ec54175b75c0eb03a64844345603a15bd651dd346d2530b6638cc1a8656597adedd4db6130f7392d83101d3e4c93e4d1b993c41896b4098
 MISC metadata.xml 339 SHA256 5d6def42fd0ce0e9d5c0aa784a1d2bad275c6efce6e3d617b92cfca27372744a SHA512 f9e797ec792d7db14d697fa4ac0ec32c0d164529b466c98069e0cd40baeeb21b84ce395e8a5974fdb454eed2dc74a4a829459a189caabc3f9203a3f9cd3ecdeb WHIRLPOOL 7cb339ffb3ab6b5f1f9105127d2d24cf59c930474f5b412a9bf26cfa7c0369d976d99774de16e4d046c5bcffb5c0664bce3741cafc39c3dd717f97865d5bdb9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVZfRSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVZfg4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivQYP/2pUlvCjmtL5hPrjhKiuAUyF
-Ko+ocsxRIjAkYTNNN2nmRCd7qlPH5F4sPab7Qp7BqGkjbChWTMxcAiN6pf7ipa59
-+cl6dBdo9osYR51J+LPI6OxGNuz6pN2WZSYj1C86PlP5hmgkb319/9pHQIJc1M0J
-pgs5FuEEdN1sE8AjQkxfPz6JjDlwAJ0Ugp2w0INYqefiz4DuyqowO7e73c2HaxPB
-NDyy+3t+AsbowDrizpmoNsZcEh4mth/C3kxjcEAaiFlU1ATPkIgmMQU8aLWCLkvu
-YjEE7c4YS0BG1BuRHsOcTaDy9LIxNbVPDgN8Gi5Sq8ASmofCNMajPWzsknkaDS87
-9EmiGNA0bz5whN20J+ovCxCObA5cagXr4HAELqQO8FL5jaTn2dRTwiKMo5Hpg0AI
-KvhPDx9wD61QYNedLiA+Y1mDXoEdPFdX/UJjR8ETjZaEqNSolQRp3k3S0Ea9LCZl
-nwFDR5P1BTxSzgV1UGYdK/vYNrohhCn9QkrQN15+Xh/rjhx/idGQv2d2doQQCUHS
-3cGzv9DeaElZc/Vg6Puxds/BFmFK2NQkPBHK4kqBh2RZn6NAB1gk+tgkzvwZmkeh
-S6ZGKBo3boG3vzVh+eZvhAA6dOQu+X+1RaEnZxv5ManNtHns/hwT478toXFGcsXC
-XmSYEmOLbSqmOSk3/Qm8
-=nrqm
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiakYP/jKaONVs4GEnFNwpHOH5v+gh
+TGj/zjfV5cPixxn+t7f/qAywFj0tLyQDXX9Hw7yb5M2clMd4SaWLgbPYHaWmaLjb
+Lh3MYWuWhg80HiP7KJSiHBTkv5Ms7vzb5xOkimEzSBqsqQn7vSiCR3g3M11xGP8w
+8rMfyL3SbJTtZTHiyxCPPhB6tbpNxIIfBtyIyDG88yznR77zO+UOgmdTAZNsKKao
++znMzoxvPti98xBI8nUauN5JhK92HE0p8+VL9rgn4w1Zbp81RkxCqmamzxC/6t3V
+aq9gop/DFckfcVJE0DXuuia00ehwGRlNDQfu/d+jC2hJ6mDvIXC92F54I1jxsPsP
+kvoeyCcGx/M3nIrFdvdEmfjmMmDNZ6er0ep412c93PVw62xpFi+aBqbibzgVwJTA
+SIIk2HXRQdhkVGqtQz/tl1h2YNoygEt1cEsl+rErTWEp9mEV4BB6YOc0yPhXQCf1
+xoI/t1c05JcHfnmZ6Fn2BqrTHzeMffoemLUP0A3jfFgpoNFGwF8JrnUcq3IGj+QV
+PjxjQ/m/PdfnrXzNmJJSWVK9ga5Bl9xFbIpRlsdBzTk5kTM/MEC+jxuIol2DuqdZ
+2Xe28HdUNv5c195Z4vvwcB7s5YUkREEo7h0HY5/y2aeCBjS+FcGdi2SIT4TZjtcd
+r+03BAO2ATPqiKCswgW8
+=sjVu
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/files/1.3.8-disable-tests.patch b/dev-vcs/git-cola/files/1.3.8-disable-tests.patch
deleted file mode 100644
index 25462c2a37d7..000000000000
--- a/dev-vcs/git-cola/files/1.3.8-disable-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur cola-1.3.7.21.orig/test/test_cola_git.py cola-1.3.7.21/test/test_cola_git.py
---- cola-1.3.7.21.orig/test/test_cola_git.py	2009-04-30 13:56:22.352319047 +0200
-+++ cola-1.3.7.21/test/test_cola_git.py	2009-04-30 13:56:53.123149963 +0200
-@@ -24,17 +24,6 @@
-         version = self.git.version()
-         self.failUnless(version.startswith('git version'))
- 
--    def test_tag(self):
--        """Test running 'git tag'"""
--        tags = self.git.tag().splitlines()
--        self.failUnless( 'v1.0.0' in tags )
--
--    def test_show(self):
--        """Test running 'git show'"""
--        sha = '1b9742bda5d26a4f250fa64657f66ed20624a084'
--        contents = self.git.show(sha).splitlines()
--        self.failUnless(contents[0] == '/build')
--
-     def test_stdout(self):
-         """Test overflowing the stdout buffer"""
-         # Write to stdout only
diff --git a/dev-vcs/git-cola/files/1.8.1-system-ssh-askpass.patch b/dev-vcs/git-cola/files/1.8.1-system-ssh-askpass.patch
deleted file mode 100644
index 8b9923245742..000000000000
--- a/dev-vcs/git-cola/files/1.8.1-system-ssh-askpass.patch
+++ /dev/null
@@ -1,35 +0,0 @@
- cola/app.py | 4 ++--
- setup.py    | 4 ----
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/cola/app.py b/cola/app.py
-index bc7906a..972eaa7 100644
---- a/cola/app.py
-+++ b/cola/app.py
-@@ -65,9 +65,9 @@ def setup_environment():
-     elif ssh_askpass:
-         askpass = ssh_askpass
-     elif sys.platform == 'darwin':
--        askpass = resources.share('bin', 'ssh-askpass-darwin')
-+        askpass = resources.prefix('bin', 'ssh-askpass-darwin')
-     else:
--        askpass = resources.share('bin', 'ssh-askpass')
-+        askpass = resources.prefix('bin', 'ssh-askpass')
- 
-     compat.putenv('GIT_ASKPASS', askpass)
-     compat.putenv('SSH_ASKPASS', askpass)
-diff --git a/setup.py b/setup.py
-index e202edc..81765a1 100755
---- a/setup.py
-+++ b/setup.py
-@@ -101,10 +101,6 @@ def cola_data_files():
-     data.extend([_app_path(localedir, 'git-cola.mo')
-                  for localedir in glob('share/locale/*/LC_MESSAGES')])
- 
--    if sys.platform == 'darwin':
--        data.append(_app_path('share/git-cola/bin', 'ssh-askpass-darwin'))
--    else:
--        data.append(_app_path('share/git-cola/bin', 'ssh-askpass'))
-     return data
- 
- 
diff --git a/dev-vcs/git-cola/files/1.9.1-disable-tests.patch b/dev-vcs/git-cola/files/1.9.1-disable-tests.patch
deleted file mode 100644
index e5768cc079b1..000000000000
--- a/dev-vcs/git-cola/files/1.9.1-disable-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur cola-1.3.7.21.orig/test/test_cola_git.py cola-1.3.7.21/test/test_cola_git.py
---- cola-1.3.7.21.orig/test/test_cola_git.py	2009-04-30 13:56:22.352319047 +0200
-+++ cola-1.3.7.21/test/test_cola_git.py	2009-04-30 13:56:53.123149963 +0200
-@@ -24,17 +24,6 @@
-         version = self.git.version()[STDOUT]
-         self.failUnless(version.startswith('git version'))
- 
--    def test_tag(self):
--        """Test running 'git tag'"""
--        tags = self.git.tag()[STDOUT].splitlines()
--        self.failUnless( 'v1.0.0' in tags )
--
--    def test_show(self):
--        """Test running 'git show'"""
--        sha = '1b9742bda5d26a4f250fa64657f66ed20624a084'
--        contents = self.git.show(sha)[STDOUT].splitlines()
--        self.failUnless(contents[0] == '/build')
--
-     def test_stdout(self):
-         """Test overflowing the stdout buffer"""
-         # Write to stdout only