Delete Debian unicode patches when USE=-unicode.

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index 19febf263defcf2eeb8ba67455ab08d6ca21755a..3c9258a916283f994f86dc5017709cec422fba8e 100644 (file)
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-process/procps
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.49 2011/07/20 05:47:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.50 2011/07/23 01:09:35 vapier Exp $
+
+  23 Jul 2011; Mike Frysinger <vapier@gentoo.org> procps-3.2.8_p10.ebuild:
+  Delete Debian unicode patches when USE=-unicode.
 
 *procps-3.2.8_p10 (20 Jul 2011)
 

diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 32693d7a647e6f54aefeabcb4991f00e0a27255f..a66d8616a19300660d6e1cccf486ee466467fd41 100644 (file)
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -15,13 +15,13 @@ DIST procps_3.2.8-10.debian.tar.gz 97024 RMD160 140630444577b7349ce6feea84cecf92
 EBUILD procps-3.2.8-r1.ebuild 2297 RMD160 33568cf3dbc91f41dbc77a91e68a629359e438ab SHA1 f8d3285f5bd5e48b7e3012002056499f8524820e SHA256 8792660ca782802a70bebd9209d418d399daa19b86c5f88f3810cb4708d6e843
 EBUILD procps-3.2.8-r2.ebuild 2404 RMD160 6c7555d8704fc852ad796cf964829a4d9a1456b0 SHA1 8b2bcc0c9be52cdd3f76a1220a9c06d9cbc85cf2 SHA256 288127656d1c50ed1a4da866a41179bedc29fa37836e3aefae33bba40edd2107
 EBUILD procps-3.2.8.ebuild 2178 RMD160 137ac755f53942f610174836337d95189278b2c1 SHA1 a2078c1e328c8dcf27323076faf133e590221611 SHA256 aa8bf0982fb584e8bc27cd6fba80871a85db1f818464bb9e7b08f586e10af1be
-EBUILD procps-3.2.8_p10.ebuild 2386 RMD160 dea7fd04d868c3dc34ed39474dc9bb9a7a80d2a5 SHA1 3b1f1d09a22f23dc7320501fe02d940dc937c5ea SHA256 f5b1ae4999e5cff80121a43c5ffd7c00481033aa3753c3ad532cb0971978e20c
-MISC ChangeLog 22952 RMD160 656725cdf99ad4695c2332fe7db88cf6ef08c28e SHA1 67c1c96e12db435739d5f734c1721cf5a9aaf2a7 SHA256 1cd42ff2b16e6811b2687099571846157c1da7893f82c96135a4b30c478c8f39
+EBUILD procps-3.2.8_p10.ebuild 2648 RMD160 e90b48ad71d2a5e39de2e62135e6cecd2b3adb26 SHA1 beca974933f9db4974cfb794944eac8821e9fa63 SHA256 5acaa9b107205af04c098fbd7a9d8acc6c059a28797c56115f2a9afddffb80a5
+MISC ChangeLog 23079 RMD160 e22d317822124b575e8da9c9a48e1ff681b2b9d4 SHA1 d890f49a608a2bb9a7fc7c9cc15f54e7f7326c18 SHA256 8c833cffd902823c5f3d1b1ca8ced4d82105d13f43a956fef92e71ef7d5a7b15
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4mbAMACgkQaC/OocHi7JbSLgD/dXR6MIguyQopBWdQBLuZkY6g
-R/28cAgvm9VSGUXFtToA/3hOw3XDEC6Wy5UxEo5IBQ5dsOthnxbKdFjSa7UTLvdc
-=8PBE
+iF4EAREIAAYFAk4qH1sACgkQaC/OocHi7Jad+QD+KhgN9vwazLQcHzCuBtaziCFT
+BMI2a64J8/ZKn2mZi3EBAIe2rMPoPhd7sIjEZ6Qj+eqOsYbsIfMwnvx8c6E6RzkF
+=+OMs
 -----END PGP SIGNATURE-----

diff --git a/sys-process/procps/procps-3.2.8_p10.ebuild b/sys-process/procps/procps-3.2.8_p10.ebuild
index 92209f5885121bd0ca6b2eebd747ec5fdb7649f1..f1eca1bb46d6a4d8d0857331f016f5ec29aef24b 100644 (file)
--- a/sys-process/procps/procps-3.2.8_p10.ebuild
+++ b/sys-process/procps/procps-3.2.8_p10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8_p10.ebuild,v 1.1 2011/07/20 05:47:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8_p10.ebuild,v 1.2 2011/07/23 01:09:35 vapier Exp $
 
 EAPI="2"
 
@@ -24,7 +24,14 @@ RDEPEND=">=sys-libs/ncurses-5.2-r2"
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-       local d="${WORKDIR}"/debian/patches
+       local p d="${WORKDIR}"/debian/patches
+       pushd "${d}" >/dev/null
+       # makefile_dev_null: this bug is actually in gcc and is already fixed
+       for p in $(use unicode || echo watch_{unicode,ansi_colour}) makefile_dev_null ; do
+               rm ${p}.patch || die
+               sed -i "/^${p}/d" series || die
+       done
+       popd >/dev/null
        EPATCH_SOURCE="${d}" \
        epatch $(<"${d}"/series)
        # fixup debian watch_exec_beep.patch