diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-07-23 01:09:35 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-07-23 01:09:35 +0000 |
| commit | aa5355e8d47607f7ae55dd41cf1945e65b1236d5 (patch) | |
| tree | 838b0700a473e0c3cde0def978507573f87b64d9 /sys-process/procps | |
| parent | Revbump for all testing versions of Python wrt bug #374579 and linux-3 (diff) | |
| download | gentoo-2-aa5355e8d47607f7ae55dd41cf1945e65b1236d5.tar.gz gentoo-2-aa5355e8d47607f7ae55dd41cf1945e65b1236d5.tar.bz2 gentoo-2-aa5355e8d47607f7ae55dd41cf1945e65b1236d5.zip | |
Delete Debian unicode patches when USE=-unicode.
(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)
Diffstat (limited to 'sys-process/procps')
| -rw-r--r-- | sys-process/procps/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-process/procps/procps-3.2.8_p10.ebuild | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog index 19febf263def..3c9258a91628 100644 --- 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/procps-3.2.8_p10.ebuild b/sys-process/procps/procps-3.2.8_p10.ebuild index 92209f588512..f1eca1bb46d6 100644 --- 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 |