Revbump to fix segfault on nonexisting dir (bug #485182). Removed old versions

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

7 files changed, 159 insertions, 54 deletions

diff --git a/sys-devel/patch/ChangeLog b/sys-devel/patch/ChangeLog
index cba6bf676308..731c42500074 100644
--- a/sys-devel/patch/ChangeLog
+++ b/sys-devel/patch/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/patch
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/ChangeLog,v 1.64 2013/08/02 13:25:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/ChangeLog,v 1.65 2013/10/15 08:32:57 polynomial-c Exp $
+
+*patch-2.7.1-r3 (15 Oct 2013)
+
+  15 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> -patch-2.7.1.ebuild,
+  -patch-2.7.1-r1.ebuild, patch-2.7.1-r2.ebuild, +patch-2.7.1-r3.ebuild,
+  +files/patch-2.7.1-initialize_data_structures_early_enough.patch,
+  +files/patch-2.7.1-prevent_depend_on_autotools.patch:
+  Revbump to fix segfault on nonexisting dir. Thanks to Martin von Gagern for
+  reporting this in bug #485182. Removed old versions.
 
 *patch-2.7.1-r2 (02 Aug 2013)
 
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index e37b260de52f..e05b59a379eb 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -6,27 +6,32 @@ AUX patch-2.5.9-cr-stripping.patch 1355 SHA256 d148aa25b3fd9059d04b7d40061c13145
 AUX patch-2.7.1-Fix-removing-empty-directories-automake.patch 977 SHA256 662ff35280d1dd1f3aba1c914b441abead037091c7d27fd5b558db3bce965f56 SHA512 eb95233b6368921a56ee7225ff1f5ecdc50e0b73e7da3e34f04cd3463168cfe804f73b5975e380abf23c74e4e04cf6c222ca4dc8f61ebcbd5c204e638f1f41a1 WHIRLPOOL ce2a59c262ae714f376a14c406b12d4ea506bb52e560d4f4240a4a4574282d0a383f6eb2ea0d7f149b4c76db72bbdc3dd9591dcbe378b39daa01ee146411f9ed
 AUX patch-2.7.1-Fix-removing-empty-directories.patch 2094 SHA256 9e1a576fedac307346048f5047c4cf9d6af7c00704a60c4dc15a44526da46526 SHA512 445fd2e50f536e9d5c06bf129e700e2854d445d83286b450519d9d7909922023ce976d9d5cda4f87e0ddc19ea00a1567af17c314cce2338cb2b6b574150c1112 WHIRLPOOL f84f9c8e8dc924b8ebf2e895a0d8aa772389a99be710f1e929213c09762a3b57ecbf33ece7bc62ed72a536ca6568e11655dd0183d06e74a47cce2c814d657da8
 AUX patch-2.7.1-dry-run-mode-create-temp-files-in-temp-dir.patch 815 SHA256 1b9c214bb21ce98e0205161110b27ce7c3fade80f1c5af799ee064b33f3cd1e8 SHA512 fbb7adfafedda770c4662c31004b87c1184bc52025d71f0500af8494fccdceb9a21ebdf9d4bfb7429318a3b3d4766c74f26bca250cba88242e5624618a83e058 WHIRLPOOL 67d7adfb7a1ebcb889801942c504c1f1d17e1729d5e791a70010b5969712e313671c6c9617b576294d699572baed487a435d70419100fdd6c3d94cb469e8a012
+AUX patch-2.7.1-initialize_data_structures_early_enough.patch 2148 SHA256 62aacb522251df87f4882533f68d09a42022461c76491e0560aa4e25ddcdbab0 SHA512 57ffb7a22056b1e37d442b63aff2df7df041c6950b7d437b726c3021224bf81035fbbee88a815ba98d9449229a5426f1aa7cbf9265f8fb8ef6e9b608b0f9841a WHIRLPOOL 083ac9efb2445afbfb645da86873a13a06b869c77499d6870e332175c33d7d89de03e85bcae749c5755b9b888592604e4f894eeb1b998ddd856f4ad32f346858
+AUX patch-2.7.1-prevent_depend_on_autotools.patch 1602 SHA256 0988b3e0bb9d192fe3e6923c4d8e3550e6f290dac8d44bddcc0505b6bd2d67d0 SHA512 ec639c2a21216501822b49395596e2139ad2f7570bb75a393f4591501d56ae05c3376a712c0ad4984d715a3410da4113298bca5a571a005762d73069cc45bfca WHIRLPOOL 9a197ba472f08e5978b81c1ee04318ef367bb5bc9f439c97d511aa7653429a1da8e0967e55ab243a1003f786cd79f7939f1cc6aba7e5540b2fd09b0353e37bec
 DIST patch-2.5.9.tar.gz 201926 SHA256 ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a SHA512 660341c9ace986fd7849ea75b50be0fa0a174bbad1381690f70d9ea90161fe88faeb51bb866eae14324b7e0a8b67526d5bfb6331e043f17315a33f79f278f0dc WHIRLPOOL 20e150f479160ae3fdb53b31305086c04ba71f22a2ffda284a3b85ec6f24498a97e352b03e32fd5ed66fd4f6962d2b3bf4870f1f92c9d7d56b69788265b6a5a7
 DIST patch-2.6.1.tar.bz2 253719 SHA256 1d1441380c92ed8572049411406964a0a987aefd228be3abb8623eca1f3ced8a SHA512 a751bd9d14c82e047c9e914bf03f3296f76e2ebc3f9fb4c3f480590c303d492235a6b340056c612afef6c6b2c8d8de794189b5ba933f53687effb6acb2c5b187 WHIRLPOOL c93833d02d981fa417f5389638ec4731b5addfc0314f92709deb992ad6bab86e67b68b5ee704ed46627944469f1c4e58df51b316c1f4539e196077639013c600
 DIST patch-2.7.1.tar.xz 675896 SHA256 9124ba46db0abd873d0995c2ca880e81252676bb6c03e0a37dfc5f608a9b0ceb SHA512 e10274bd59875d4ec5b02960d23f54e5b2a94ac19554c4a013fdb1df48f01012ce418627c74f7a6bd0a416527dd2ead347642878a057048ede9ee2d9c76a51b0 WHIRLPOOL 5e9d4f2f3ea0fe6d4c9ca577a1ca9103b78d7429e7f67cce4eb2cdea00c71cb9bfe9882101c04be3a5fa6a9ad5e05ff3f1d851a5ef2ae4b80f03696d1c13c6f9
 EBUILD patch-2.5.9-r1.ebuild 1158 SHA256 a5a3d19cbf56ee7f212f9186a4dc684104644d74f695b81e140e5855107e0820 SHA512 29865130b667d35ebd3d28b2acc24551d39c31e95d0bf168db8f19a66ee374db7f48672e65755f00007e2867c1f8e521556fd62d3c671cfd40aa32a0fcc3b98c WHIRLPOOL 5d0f67f0135eea9360be0fa5354f4a2b9004c94b841089beb0fa18decb56db1d5784342053e6f003d5d531099e2c6035a91d648dd1aedd65bc8da8d3aac9bfb8
 EBUILD patch-2.5.9.ebuild 970 SHA256 b236062faaf1a10172f50ddfa99dd5cb4a622d64127a7f4ee6519f7b70baddd4 SHA512 01cb916d45f5660b0076bb8b2332de98a3e4c66acaa59c57c3962600c5f304646201ffbf3cad2e7831bbb7f202f6586df14be8b7e8e8c6dc19a62defc787e196 WHIRLPOOL 2ea911121bcbc511f32900514f65d7671becfc930422d0744e8899f49b0fa6b3a75c4812f033041107ab49cc35908f2a3556e1f5ef75596ca17318b72f8e8e82
 EBUILD patch-2.6.1.ebuild 1009 SHA256 055dd995b8dc0022b927954776cb22f9bd2791f4e8ce025955c03b472d648477 SHA512 58fff5efabb151b102b4e3253af6addea805dbf66ad7ee805266a40b808fbeaf50e172228bae090ef928086162f0e68b5d700fddaacc39c58814ea58c4c01a01 WHIRLPOOL 9b881da803487e9c653b6ea78c446a6aabbc69e595b8c7e83c02d1b1057ed031d9c3e1d6659d2653801d853af24b49c61d50b1140567f91c10df7f2ad76d9ac7
-EBUILD patch-2.7.1-r1.ebuild 1093 SHA256 127a37218d96e2cef495da440cfaa291ac460c72d8b2963218747e25afde7754 SHA512 d0db92bd60a38db8b6ea585504bcec188cc72d1a6f99c3837cdafb6ba210763e66effdeb6bb5cc88b4258b1a41c0c23805f74c785c59a7faf20dff539113a126 WHIRLPOOL c2f4437f1713c85dc1808e81c6404d1e1ade6bf1469e165e1af0713b184bf9e84853e2863b7b9466693ffbd95f974f1fea02d4e393921e3eaca1ba96b8453811
-EBUILD patch-2.7.1-r2.ebuild 1342 SHA256 30fbd648f56aa9618f9e94ac4f8bc10733fbd4b4ac809d8fe72e812b0d37ed67 SHA512 3072a801872369d7e550284f3eaf9fb145dfc82b03818a60afbf87284376d278778188cd63d96d3f75a8b707c2f063147cff1a1383376ebc3f3cc51bf8c39f4f WHIRLPOOL cb561ec6b43c94196c7ebd3c9723cd6c10af2db390fc41c1f2599e1b4374d15b36e8ccd01d4269dc194220159010af167f3a620fd29cb971915c7e0b520d79dc
-EBUILD patch-2.7.1.ebuild 930 SHA256 e288f4d1e5d824096d64ef5493000e67da80403d7fb9a463fe09a26c38477a90 SHA512 6038c9ff27152e3a045942bc7f0df9f1297ed186a3985fc0eae981ba44f74e0942f478aa2e18f56cfa3c2c77f081edb63b66a4797d968af9e2132cec5c0945bc WHIRLPOOL 7730b563834b4a01844ad778d600f2b6f88616789d81978ecd40e2ba1f5fe0b4be41c37715e6d3f44ed15ee9b21c76b1c8adf7456258ff14d4af25da5c102f85
-MISC ChangeLog 7275 SHA256 b602d6447639a1405811d39f45acfe2db2f0ed1c90874312bec069e8b8897ee7 SHA512 3831bb08a64c40386f8859fc100086d0273e8485d8d0d384bd1a1ce2fca4de2dadf4b948e4f11173131c762da47767248ad10f45851b5328d48d321228a9112a WHIRLPOOL a45465d01442e366b493fd3c3762ec757250f947b95d4dd47eaa420cc173650b7fbdb34fe94a14f93d886a82939ec3dfa426a5c1907b0106a9f6ac2e39190651
+EBUILD patch-2.7.1-r2.ebuild 1338 SHA256 e74006a19ac9ebd1ba398fc41555ce15ccf06d5ed87ff6beaa73f347443c02b6 SHA512 04b33f3f3be22d837634634368eb14d65bd89bdee554cc81dd40739a2f720365cac9cf3dcfd7b440ebf9c06808db0b3e70fde77851d70cfae7b0d55309b317e2 WHIRLPOOL 13a947a8d2f23b07a4c2cfd0eafedd594fd5fa3d2aabbbdd2953a28786dee0480e84ce8e8748274ad6c9ef40f3c1630bbda06aea95eeecf909cdd2c92194f889
+EBUILD patch-2.7.1-r3.ebuild 1387 SHA256 b8f4997264b382794779cda827e127cb93c2733f7409ec73dadd5c08f428b817 SHA512 7707a0b74f0cbd3617b4dcd40386f1fad53db4e5290ab6797c92ea1e02a165dad198171813e38a084101a8836ef2406a6e199c23b577cea451daf6e57a9ae377 WHIRLPOOL 39dfc1fd646a39e64d82f201d43472970214fe80f39f7e72c1fe2ecca47681539f6d5a1b714fe2c844b9b03688909ef5f4c5f4049741db55c1c9dd922b386256
+MISC ChangeLog 7718 SHA256 4c3c78323e0180c40d2f1fdc39f33a23c9f8fc8e4b4446fb4ea7bfc977a64c8b SHA512 9d51204d73f18756020bb2233e0da5d225e4e31c6f2f3ae65094fed15818d12a46b3279a3ebcef71414e981a034990848427c047ea625996a36723822230db1e WHIRLPOOL d6541fa0279271918f2b210467ebf161d35b44e87f4ef99b72048f4af9581ce52a871a4a5a7f35f4d9ec67bb8d9ec98b4aaef3d1ac29f5ae5bc66e70ecdd3bd5
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQF8BAEBCABmBQJR+7NSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
-N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvQvkH/RGDuR9QmoCQpgiV7ZVge2Lk
-9+RUQkxGofZWsi0I5a4S/1yuxSZrE6lFqVSjAODBtUSn0wzmib+Nchcas5jUi+q/
-R6cDu8AecHelCPE1aysBQbcUlXS/7l7f8iJ4dd7qZ5kOrkiJrA+4sXEQ7l0WzupK
-eQ7ge6U+lYDgd8LTpfF45GyoMr49lpfYEBIFjvPEL5Xm5wiBf+dLzQ8lRbxGRYSI
-xc7Eo1LiUYZUp3JkXOUsRW+dvlGRGflkUKBdbkSj2wCtQMWsWaLnlsrLkYM7NEhM
-RdIE30VbJvL7dPDvSpGblGQaV6b41JUrI2jJQ26WgOy3HSBhwMtpZsPxu1s3nbs=
-=o5vh
+iQIcBAEBCAAGBQJSXP26AAoJEPiazRVxLXTFi1oP/1AJhn8oGwtNNA8Nm1osBZM7
+FuHmCpo4dAXBDHV09wq0RvgqDGvdL2exJ4xPYIIhSLJ7XzNs//LFbGfpTurxIWu7
+0lzA5cY+uzWH53t2WsYeu96WEIL/hDhzhODeVwyxadjs1D1V7pilxwEgHn8GIbgD
+gRJqr7YAeNx8MDxoG7hqgIqeLF+JA1xT3idWlOM5xa6WGm+AkrfzqDMLcc/TO3gD
+Ji7BpBl2SIUBAWfUcLlFq5dM+wuXCrkNWXUolunMC8+bB1oS57uWpNgBxd4kZ88w
+MeB7OtVwHjssrpIluxXg/sjY9K/dOAVBwWpPdLdZGkGns1hZQPMs8Mt/1CCi8R6v
+6/GUf5rgZ1oS3WUpcsQdNb6pmzmz3IbrfyJn2I17iv23DxHHJI8/7QWNgH4h+w7N
+ZFCboJrm6TPdK2n8lH4bPEqJAdBOc6sSgXlnIoohQFH69bljmGxL7lUDdaDEaVGt
+SSG5ZfUdUiVObO3s5O468sx1jWpEmwzt9T/3WP3E2yUxqYk3f19jdi5ujujT439d
+RlvsYUHjH1a0xLspaYbEjltNG3+lptPAaixh2j4HnFkXvCZ+edt6r5lfzuWHeywn
+fKaK3LiS5FgrlBGE8WPsjuU3zcjGg5w9GlgTwKeTMPQgjEYX8flvNsmZ1OVF1faL
+tvlc/SmWa11JvioE2A2j
+=V+eB
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/patch/files/patch-2.7.1-initialize_data_structures_early_enough.patch b/sys-devel/patch/files/patch-2.7.1-initialize_data_structures_early_enough.patch
new file mode 100644
index 000000000000..90da0d1b2c59
--- /dev/null
+++ b/sys-devel/patch/files/patch-2.7.1-initialize_data_structures_early_enough.patch
@@ -0,0 +1,74 @@
+From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen@linbit.com>
+Date: Thu, 04 Oct 2012 10:33:09 +0000
+Subject: Initialize data structures early enough
+
+* src/patch.c (main): Initialize data structures early enough, before error
+paths can access them.
+* tests/bad-usage: Test bad command line usage.
+* tests/Makefile.am (TESTS): Add bad-usage here.
+---
+diff --git a/src/patch.c b/src/patch.c
+index 828943b..0255fbb 100644
+--- a/src/patch.c
++++ b/src/patch.c
+@@ -150,6 +150,10 @@ main (int argc, char **argv)
+     else if ((version_control = getenv ("VERSION_CONTROL")))
+       version_control_context = "$VERSION_CONTROL";
+ 
++    init_backup_hash_table ();
++    init_files_to_delete ();
++    init_files_to_output ();
++
+     /* parse switches */
+     Argc = argc;
+     Argv = argv;
+@@ -162,10 +166,6 @@ main (int argc, char **argv)
+     if (make_backups | backup_if_mismatch)
+       backup_type = get_version (version_control_context, version_control);
+ 
+-    init_backup_hash_table ();
+-    init_files_to_delete ();
+-    init_files_to_output ();
+-
+     init_output (&outstate);
+     if (outfile)
+       outstate.ofp = open_outfile (outfile);
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 02fc6de..5cea52d 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -20,6 +20,7 @@ TESTS = \
+ 	asymmetric-hunks \
+ 	backup-prefix-suffix \
+ 	bad-filenames \
++	bad-usage \
+ 	concat-git-diff \
+ 	copy-rename \
+ 	corrupt-reject-files \
+diff --git a/tests/bad-usage b/tests/bad-usage
+new file mode 100644
+index 0000000..022eeda
+--- a/dev/null
++++ b/tests/bad-usage
+@@ -0,0 +1,18 @@
++# Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc.
++#
++# Copying and distribution of this file, with or without modification,
++# in any medium, are permitted without royalty provided the copyright
++# notice and this notice are preserved.
++
++. $srcdir/test-lib.sh
++
++require_cat
++use_local_patch
++use_tmpdir
++
++# ==============================================================
++
++check 'patch -px || echo "status: $?"' <<EOF
++$PATCH: **** strip count x is not a number
++status: 2
++EOF
+--
+cgit v0.9.0.2
diff --git a/sys-devel/patch/files/patch-2.7.1-prevent_depend_on_autotools.patch b/sys-devel/patch/files/patch-2.7.1-prevent_depend_on_autotools.patch
new file mode 100644
index 000000000000..72cf62d768f0
--- /dev/null
+++ b/sys-devel/patch/files/patch-2.7.1-prevent_depend_on_autotools.patch
@@ -0,0 +1,45 @@
+Simple patch to prevent sys-devel/patch needing to depend on autotools to
+be built, which would likely make stage1 people unhappy.
+
+By: Doug Goldstein <cardoe@gentoo.org>
+Ref: bug #478548
+
+By: Lars Wendler <polynomial-c@gentoo.org>
+Ref: bug #485182
+---
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -1075,6 +1075,7 @@
+ 	asymmetric-hunks \
+ 	backup-prefix-suffix \
+ 	bad-filenames \
++	bad-usage \
+ 	concat-git-diff \
+ 	copy-rename \
+ 	corrupt-reject-files \
+@@ -1104,6 +1105,7 @@
+ 	reject-format \
+ 	remember-backup-files \
+ 	remember-reject-files \
++	remove-directories \
+ 	symlinks \
+ 	unmodified-files
+ 
+@@ -1294,6 +1296,8 @@
+ 	@p='backup-prefix-suffix'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+ bad-filenames.log: bad-filenames
+ 	@p='bad-filenames'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
++bad-usage.log: bad-usage
++	@p='bad-usage'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+ concat-git-diff.log: concat-git-diff
+ 	@p='concat-git-diff'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+ copy-rename.log: copy-rename
+@@ -1352,6 +1356,8 @@
+ 	@p='remember-backup-files'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+ remember-reject-files.log: remember-reject-files
+ 	@p='remember-reject-files'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
++remove-directories.log: remove-directories
++	@p='remove-directories'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+ symlinks.log: symlinks
+ 	@p='symlinks'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+ unmodified-files.log: unmodified-files
diff --git a/sys-devel/patch/patch-2.7.1-r2.ebuild b/sys-devel/patch/patch-2.7.1-r2.ebuild
index 5268e9f048bd..b6602fcdaf4e 100644
--- a/sys-devel/patch/patch-2.7.1-r2.ebuild
+++ b/sys-devel/patch/patch-2.7.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.7.1-r2.ebuild,v 1.1 2013/08/02 13:25:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.7.1-r2.ebuild,v 1.2 2013/10/15 08:32:57 polynomial-c Exp $
 
 EAPI=4
 
-inherit flag-o-matic eutils autotools
+inherit flag-o-matic eutils
 
 DESCRIPTION="Utility to apply diffs to files"
 HOMEPAGE="http://www.gnu.org/software/patch/patch.html"
diff --git a/sys-devel/patch/patch-2.7.1-r1.ebuild b/sys-devel/patch/patch-2.7.1-r3.ebuild
index dc2ad0f6d830..80b53aa68d90 100644
--- a/sys-devel/patch/patch-2.7.1-r1.ebuild
+++ b/sys-devel/patch/patch-2.7.1-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.7.1-r1.ebuild,v 1.4 2013/05/21 17:35:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.7.1-r3.ebuild,v 1.1 2013/10/15 08:32:57 polynomial-c Exp $
 
 EAPI=4
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
 DESCRIPTION="Utility to apply diffs to files"
 HOMEPAGE="http://www.gnu.org/software/patch/patch.html"
@@ -19,6 +19,13 @@ RDEPEND="xattr? ( sys-apps/attr )"
 DEPEND="${RDEPEND}
 	test? ( sys-apps/ed )"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Fix-removing-empty-directories.patch" \
+		"${FILESDIR}/${P}-dry-run-mode-create-temp-files-in-temp-dir.patch" \
+		"${FILESDIR}/${P}-initialize_data_structures_early_enough.patch" \
+		"${FILESDIR}/${P}-prevent_depend_on_autotools.patch"
+}
+
 src_configure() {
 	use static && append-ldflags -static
 
diff --git a/sys-devel/patch/patch-2.7.1.ebuild b/sys-devel/patch/patch-2.7.1.ebuild
deleted file mode 100644
index 6a222172c9ff..000000000000
--- a/sys-devel/patch/patch-2.7.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.7.1.ebuild,v 1.1 2012/09/28 22:16:50 vapier Exp $
-
-inherit flag-o-matic unpacker
-
-DESCRIPTION="Utility to apply diffs to files"
-HOMEPAGE="http://www.gnu.org/software/patch/patch.html"
-SRC_URI="mirror://gnu/patch/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="static test xattr"
-
-RDEPEND="xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/ed )"
-
-src_compile() {
-	use static && append-ldflags -static
-
-	local myconf=""
-	[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
-	econf \
-		$(use_enable xattr) \
-		${myconf}
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}