summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-05-21 17:36:11 +0000
committerMike Frysinger <vapier@gentoo.org>2013-05-21 17:36:11 +0000
commit30198b62014f3fd3da6296f944ac754ec1b2f401 (patch)
treef575053890eccf66185f111a3c6fbd6f03c0c22c /sys-devel/patch
parentAuto-remove .la. (diff)
downloadhistorical-30198b62014f3fd3da6296f944ac754ec1b2f401.tar.gz
historical-30198b62014f3fd3da6296f944ac754ec1b2f401.tar.bz2
historical-30198b62014f3fd3da6296f944ac754ec1b2f401.zip
Do not let $ED from the EAPI mess up the search for `ed` #470210 by Roman Žilka.
Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64 Manifest-Sign-Key: 0xFB7C4156
Diffstat (limited to 'sys-devel/patch')
-rw-r--r--sys-devel/patch/ChangeLog6
-rw-r--r--sys-devel/patch/Manifest20
-rw-r--r--sys-devel/patch/patch-2.7.1-r1.ebuild6
3 files changed, 24 insertions, 8 deletions
diff --git a/sys-devel/patch/ChangeLog b/sys-devel/patch/ChangeLog
index 16b563259ddb..8707bf90b5bb 100644
--- a/sys-devel/patch/ChangeLog
+++ b/sys-devel/patch/ChangeLog
@@ -1,6 +1,10 @@
# 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.62 2013/02/19 05:05:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/ChangeLog,v 1.63 2013/05/21 17:35:57 vapier Exp $
+
+ 21 May 2013; Mike Frysinger <vapier@gentoo.org> patch-2.7.1-r1.ebuild:
+ Do not let $ED from the EAPI mess up the search for `ed` #470210 by Roman
+ Žilka.
19 Feb 2013; Zac Medico <zmedico@gentoo.org> patch-2.7.1-r1.ebuild:
Add ~arm-linux keyword.
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index fd650a58484a..6efa4d5ee3fc 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -9,14 +9,24 @@ DIST patch-2.7.1.tar.xz 675896 SHA256 9124ba46db0abd873d0995c2ca880e81252676bb6c
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 1018 SHA256 c0823fed8b4bdf33a913e2c8dc4bb1299836fe2c4093ec65bcd65905dc4b46c3 SHA512 699e062979fa6db4398caafdb4adfcd4da61240590ee196df37ecce1abc755fdda3fd17e35676649236396c62b5d5bebf1d95c91a25948312bcb4cb1169c80f8 WHIRLPOOL 2cd4069eba6f8c027f912b67ec8280d846a054d8d12c3cac9ef8bd83c293b0397594d2bef664906247cd5bb1d8e48beefd60208ca32b59399f360b92134980fa
+EBUILD patch-2.7.1-r1.ebuild 1093 SHA256 127a37218d96e2cef495da440cfaa291ac460c72d8b2963218747e25afde7754 SHA512 d0db92bd60a38db8b6ea585504bcec188cc72d1a6f99c3837cdafb6ba210763e66effdeb6bb5cc88b4258b1a41c0c23805f74c785c59a7faf20dff539113a126 WHIRLPOOL c2f4437f1713c85dc1808e81c6404d1e1ade6bf1469e165e1af0713b184bf9e84853e2863b7b9466693ffbd95f974f1fea02d4e393921e3eaca1ba96b8453811
EBUILD patch-2.7.1.ebuild 930 SHA256 e288f4d1e5d824096d64ef5493000e67da80403d7fb9a463fe09a26c38477a90 SHA512 6038c9ff27152e3a045942bc7f0df9f1297ed186a3985fc0eae981ba44f74e0942f478aa2e18f56cfa3c2c77f081edb63b66a4797d968af9e2132cec5c0945bc WHIRLPOOL 7730b563834b4a01844ad778d600f2b6f88616789d81978ecd40e2ba1f5fe0b4be41c37715e6d3f44ed15ee9b21c76b1c8adf7456258ff14d4af25da5c102f85
-MISC ChangeLog 6679 SHA256 ef620aa810bdb6e3f6596490ddb902dc518a28e54f00cab98dc4ac357bf2c4ce SHA512 3bdb54089da9750da49f95455da2c2758a3f20f2c2e3c5e24a2df4877e7e41665f583b0110087b0fe299664c92345fe297406942157c145605d323efc0e1a635 WHIRLPOOL ca83d71ede510cf5d5f0ae9b0bd6b3d881c1f3f9429450b9c244b4d8132d734a9cb636c991062384d737ffb52d4bbbeb9700742ae14a949438d483349bf42986
+MISC ChangeLog 6838 SHA256 4e483f86240c2b50952d1aab3adb277b3217effa9307974d926a1f9e43b1536f SHA512 fcf11caf4212b92979ad232d7a8e76e1adbfaa7dcd1a5321f9f73904f49c071e59e281216140f299d10ffd9140bce15fa09198749b102377c0a56fa26bf9e69c WHIRLPOOL 8556fed49162410b7a445f9723cee877acee02a5d69a127129ef863559b2b48afdf0dba236ee59a3e52f938e5882108d6bb2d55fb0d891f8efe0f77586ace0f7
MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlEjCDAACgkQ/ejvha5XGaPT6ACggFpA4yaeO1W6cJQHKb/A2ZUY
-TcYAoJUu4l7R0LCGRg9imjtQ9c6a7n2F
-=iIwg
+iQIcBAEBCAAGBQJRm7CCAAoJELEHsLL7fEFWC6AP/i2KpJ4BEVrRB4SkPKuyI+qX
+e0TAPEF3XQrTWDAEaZZH2AcTbR+vID+IF8EGt1NyFPgI4kxaTo4ShsN/4ntE5n8t
+Hvu8G65QPoIxlqha21VHuNb1Z7N4LNW26iHu3JzdWJFldAlKB7T3CMAzlXSwJo3T
+1tGL6tPwVKl8rCKf4kDrRB/WvAr//Io9idkaViENdvLHsOlWMvKj2Zsq420tTMK7
+uk2V4UQDMOcqq3CmlazI1pmqMGn8Q6Y0JNv7LnHaOU9dRstfztltAdJxcb+l6EiQ
+O0I+oZ85Gzk9yCas/6tvowJlsuLADQHfwRTJLgricnYNxue9yV7Hob1qQo+iusux
+Bok4ZY/bwzqUq/2J6AkV40q1ZO5J93Z0lG9Mkssc4oTD/riqW/itFnIpH5Fldw8+
+BZYx3x8kUQWuA/s0iA/sdcUCtzLqdVZQdnmjRtweJjEw/RiqeFmiUbULpgOMRwwL
+hw0sCXtonEj6uVS8+xx4zpn6boEsACYaTIyoH5lbVs0H5YGM4CtXDjaADJaWEv9/
+ZSbTAf8or9FEUoHhUTI1GDT+/9k8n6TdBqDcPn+U1bS/sNi+6Jtq1JyIypowmQvI
+26WhWq5JPR33u+OOXWeIYaIu73cKY7rQiXOeFmtfgPUvtELjPnaQ9s2oAzTFzhTb
+9gtXLoxits9VF+kGbwgo
+=As2i
-----END PGP SIGNATURE-----
diff --git a/sys-devel/patch/patch-2.7.1-r1.ebuild b/sys-devel/patch/patch-2.7.1-r1.ebuild
index ff0d491adc13..dc2ad0f6d830 100644
--- a/sys-devel/patch/patch-2.7.1-r1.ebuild
+++ b/sys-devel/patch/patch-2.7.1-r1.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.3 2013/02/19 05:05:51 zmedico Exp $
+# $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 $
EAPI=4
-inherit flag-o-matic unpacker
+inherit flag-o-matic
DESCRIPTION="Utility to apply diffs to files"
HOMEPAGE="http://www.gnu.org/software/patch/patch.html"
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
src_configure() {
use static && append-ldflags -static
+ # Do not let $ED mess up the search for `ed` 470210.
+ ac_cv_path_ED=$(type -P ed) \
econf \
$(use_enable xattr) \
--program-prefix="$(use userland_BSD && echo g)"