Fix handling of leaks option #305889 by Nikolas Garofil.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index a17a156e50a432976853a3945511434e3c4d6e9e..edad486840e39c0ee1e1b4b47f5fe19539f6f097 100644 (file)
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.174 2010/01/21 19:51:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.175 2010/03/06 23:12:41 vapier Exp $
+
+  06 Mar 2010; Mike Frysinger <vapier@gentoo.org> ncurses-5.7-r3.ebuild:
+  Fix handling of leaks option #305889 by Nikolas Garofil.
 
   21 Jan 2010; Raúl Porcel <armin76@gentoo.org> ncurses-5.7-r3.ebuild:
   arm/ia64/m68k/sh/sparc stable wrt #299159

diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index bfa4b75b1ae59dc26ef3fd945026c80335549e12..607b378c0654ebd4af9db0bc8a023766561ad258 100644 (file)
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -14,13 +14,13 @@ DIST ncurses-5.7.tar.gz 2445052 RMD160 a19ca026d32255f5a4d22eb006d65182041e0234
 EBUILD ncurses-5.6-r2.ebuild 4746 RMD160 2d0c4b141d8bc51c7bbe0745817e2d5b4b51147b SHA1 ed1e10beb9f436b298b9f59e6b0b7fdfd3ae144c SHA256 57d0c3a8058ddbb1bbed9d3d65be56b7947aa1e3459fe847de3cce456fa7a61e
 EBUILD ncurses-5.7-r1.ebuild 4511 RMD160 337ebf710ea03791b4a13aa52615cd03ccf9c7b4 SHA1 4c4e091d14dd481011d7911c1e5ec6bb41d33848 SHA256 8e771b299a6b87e6fb8597fcf3756b5890aeb92d002f18fe9eafd04b0f9ed40b
 EBUILD ncurses-5.7-r2.ebuild 5156 RMD160 c17433a3f1c086c6b423ea4b8327b4f23036da20 SHA1 77e9f6919a433afb36d8cd6b72a3ed383bdeb091 SHA256 8e6c75149cc8cba1f672eb71b14cc9b1794ab213e65218c4508372b047c97951
-EBUILD ncurses-5.7-r3.ebuild 5298 RMD160 6a3efd529a4d6fca9da26128229558b7c6fc6f00 SHA1 871ba514a45fe86cfdcf4a7a69c08e3236f786a8 SHA256 d07ef29c70c0e7dd3db695ca7c4613271268a3639948013a06db214d13353603
-MISC ChangeLog 25360 RMD160 39d944e9187c646c326b15f343b73ec578d4ee7d SHA1 8f1041960c722e289f8696bcdc70331eec1e3845 SHA256 5c70d6c8d03329e2847eaf880feeab640474fed4e7115afba83df0bcc7ff11c6
+EBUILD ncurses-5.7-r3.ebuild 5367 RMD160 a21be510f13353c36ac20b04258c1e996a618102 SHA1 b67f404968a91da5b7e6b4ea01346ad13ebcf0da SHA256 73d761ad50ddf9bd1c904f59c0bdb85c5e6450aa662a3af75dc99f664326ba3c
+MISC ChangeLog 25492 RMD160 41873a28da41f56abcd8b53608b03d3c223d04b3 SHA1 421f456c3aae4e58902347713237bdc77b57bb34 SHA256 0345863d9ced3969a5a9021d95c60e9ca25d09dec940ba692b9dfd8cd69d16f2
 MISC metadata.xml 320 RMD160 cd60b146f09101932293157c33ac98f273c92783 SHA1 47c720e1ec7ce4a1c4de36edeac9cfd10004bbae SHA256 906f778ea6ad65cad63404d3bd4126d32dcaef8fa0dd81d0108fd20630594779
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAktpALwACgkQTwhj9JtAlp7kVQD/dnV+A7qdUwLwiGobeV75seVj
-9iEZT3FCTY7LjmC2YtIA/i5ruzxmBoo4TVs2EyM8bC0JRdVdqGX509M9gd53vITI
-=x3th
+iF4EAREIAAYFAkuS4XEACgkQTwhj9JtAlp7BzwEAyM/0mDOKduPxp7T01SGxn9zB
+w7gD1V2+SZ0CeYeh4+4A/A3impwRZ6rpD6eB0YBaWhaZasaut3lXqv/bQVs4ZExc
+=zQ02
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/ncurses/ncurses-5.7-r3.ebuild b/sys-libs/ncurses/ncurses-5.7-r3.ebuild
index 02ff63796914729ea4c84967baccaf9e28f9438f..f60e989947a01ca7fe74b1a674835d90fe92666b 100644 (file)
--- a/sys-libs/ncurses/ncurses-5.7-r3.ebuild
+++ b/sys-libs/ncurses/ncurses-5.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r3.ebuild,v 1.9 2010/02/03 04:40:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r3.ebuild,v 1.10 2010/03/06 23:12:41 vapier Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic toolchain-funcs
@@ -33,6 +33,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-5.7-tic-cross-detection.patch #288881
        epatch "${FILESDIR}"/${PN}-5.7-rxvt-unicode.patch #192083
        epatch "${FILESDIR}"/${P}-hashdb-open.patch #245370
+       sed -i '/with_no_leaks=yes/s:=.*:=$enableval:' configure #305889
 }
 
 src_compile() {
@@ -98,7 +99,7 @@ do_compile() {
                --enable-echo \
                $(use_enable !ada warnings) \
                $(use_with debug assertions) \
-               $(use_with !debug leaks) \
+               $(use_enable !debug leaks) \
                $(use_with debug expanded) \
                $(use_with !debug macros) \
                $(use_with trace) \