Do not delete C++ libs when USE=-static-libs since there are only static libs for that #421241 by Keepun.

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

6 files changed, 35 insertions, 30 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index fa0d28e03301..0624a3577f68 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.209 2012/06/14 03:39:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.210 2012/06/24 00:24:08 vapier Exp $
+
+  24 Jun 2012; Mike Frysinger <vapier@gentoo.org> ncurses-5.7-r7.ebuild,
+  ncurses-5.9-r1.ebuild, ncurses-5.9-r2.ebuild, ncurses-5.9.ebuild:
+  Do not delete C++ libs when USE=-static-libs since there are only static libs
+  for that #421241 by Keepun.
 
   14 Jun 2012; Mike Frysinger <vapier@gentoo.org> ncurses-5.9-r2.ebuild:
   Export all BUILD_xxx variables for cross-compiling #391363 by Marcin Mirosław.
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 25eb24e7a3ff..f0172147b7e2 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -15,26 +15,26 @@ AUX ncurses-5.9-fix-clang-build.patch 1291 RMD160 ece30834a435e177eb9cd6a3116a82
 AUX ncurses-5.9-rxvt-unicode-9.15.patch 3804 RMD160 016d385921afbcb08d1e75f2edbab4849ef53fb4 SHA1 5d83d9f7813885194ee1fd2727e7aca89fa85724 SHA256 ae684be42600ac3bbbf6e7be61e085524f65d86c20da8c453b10c27516e30b27
 DIST ncurses-5.7.tar.gz 2445052 RMD160 a19ca026d32255f5a4d22eb006d65182041e0234 SHA1 8233ee56ed84ae05421e4e6d6db6c1fe72ee6797 SHA256 0a9bdea5c7de8ded5c9327ed642915f2cc380753f12d4ad120ef7da3ea3498f4
 DIST ncurses-5.9.tar.gz 2826473 RMD160 dd7dffe38fcc908230ce3e036b71ced2d270ac9e SHA1 3e042e5f2c7223bffdaac9646a533b8c758b65b5 SHA256 9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b
-EBUILD ncurses-5.7-r7.ebuild 5126 RMD160 9292a311c2eee95af143369891be944d8f1c7995 SHA1 53bd7470945a2fdf3d760c4d8b6aad27bba5b4a4 SHA256 768d9c817523e94b07aa031e95466bee13bcbedf0bb96115a8a2eab67fc84c6e
-EBUILD ncurses-5.9-r1.ebuild 5245 RMD160 52a9207cf00490931ac7fa8cef0a1d3ceb183fb8 SHA1 49d71a1a7517c8566480e130955e6d020d78e581 SHA256 8e234b5c9604475f64f07824c0356797edf5ffe6761f37a389dfb7c781671090
-EBUILD ncurses-5.9-r2.ebuild 5343 RMD160 7de23ddd06ac385927e6ec9a178b9d0bedb93595 SHA1 b92bad8fa796dc8fd0197b2a3965b8b60d12a8eb SHA256 f36583c0ee976e85b1f046be9c750838072ede98fb8abee5ed8647b1ddb0b39b
-EBUILD ncurses-5.9.ebuild 4878 RMD160 a64accdf045f6198e8ca4530acc33e7e691a4236 SHA1 27152c98305d0c573f25073d512717763a765cb9 SHA256 4e123a8bf06f4d7bc92c03bd75fe8f28ecab2d636dc20ab53a66277811b6839d
-MISC ChangeLog 29875 RMD160 44f9ca60887eb9c9f53664c0a939eeae568b0bb3 SHA1 90a45b690a126f11aad141dca568772d4f10c3b2 SHA256 d99bbcb8adcf4244f8d685ce34341e01c1d520f9df664e90c74346d76cf7f80a
+EBUILD ncurses-5.7-r7.ebuild 5156 RMD160 48782bf350cfe54662ad8f3e9d69fb02c46cdd1d SHA1 1c1c3b5a8c8adde8ab0456d79ddc71213ecebc07 SHA256 3c1f3374af972166fd9418035accd4b06702aaf4de0880cba7bdfcf3083cd598
+EBUILD ncurses-5.9-r1.ebuild 5278 RMD160 bdc132392079a979be06024e2d4a447e944b51df SHA1 51cfeb698820cb0fbfc2aae9bb4d461d6aca2e70 SHA256 a0b4642b95cef0e696c65ef4ba12324fe528777a2ee249627d33ea723146928e
+EBUILD ncurses-5.9-r2.ebuild 5376 RMD160 ff7e9eec4a392a9566df2dd4e2af348244ac5888 SHA1 ddeea78828d22a6cee48b5e052533ddf2d3c64af SHA256 0dcfae1869b0eee1b00c2e293bd950fc6accf56544f125f7e35b06204bfea3a1
+EBUILD ncurses-5.9.ebuild 4910 RMD160 9b16a60801b4eec75f9c485c7ad5e64787b8caf7 SHA1 39065d5cfc9a894fd56ebf1b6c5e43321d86a084 SHA256 0e95316b82ce63227e20f2653d239b289b527100459ab995efa370beeb798e3b
+MISC ChangeLog 30127 RMD160 b7193695d63fe7b0c538e34064986ca0dc1aca64 SHA1 ce6a74363cb5db5112a5d9e49847ae9917ebd0cb SHA256 b5408d89280341bc7f69ccc42825ac87baf0b243935fd2a85882cbe0200bceec
 MISC metadata.xml 320 RMD160 cd60b146f09101932293157c33ac98f273c92783 SHA1 47c720e1ec7ce4a1c4de36edeac9cfd10004bbae SHA256 906f778ea6ad65cad63404d3bd4126d32dcaef8fa0dd81d0108fd20630594779
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP2V0WAAoJELEHsLL7fEFW4e0P/ixJSmg0zeXvSM54zto7MYiw
-NbYGno/KjGhbFrvF4t3HK6a/2aqbxDPlPu/cmGBm7jTjQA80M0Yymr/1K/rI96ob
-B98YEUNV009CxvBDwJza2JYObe+l8X7VUTyxpk291in9Bj8AUUXHSGluEZxq/FY3
-IIyAkY+6j+/xkuGxiFRUEgAqNOgV8+uYvpmtMZH9tCXLiSJ3rS1S0NwCVq8FKX5D
-vev5LXs8IrvITOG7DpRZAypejiNlyNQazbz8CaR62fiv0ZKKDYMmZSURBZeVvOv/
-qoSBhmIGkHLdU2gscisCXzCYNIIliC8FynQI4QlBPLpRHueOU7TicSz+3uSqR54e
-bqNQjdKHTCyToGSzojioE9w4Ky/Guc1m/nEyJ2wZAx5XLsqb+P5zqVUYtP1ponvt
-RuQRio78wxHdlIGe6/U4YdQ1lGtcN7fnuuQJ4xuFL1KO7S1yFEFQhMFz5N7788cF
-Bzg2tO81xc6bdjN52DWCK+pLZ9tHknUHTCkOS/v62nmWMGpQwkTlIAdYAjHmSA9B
-toRpXPZGOTaWBYGs8JvRkSxx78hbETNIV4Wr8aN2lyeuTDHMYZh4SY0TBL0Bccgv
-Hb7V4Spr1jQGt+S8nAbUt5KM9Fq5AyqxujARcd+ZzvC8qb9J/qqVaqlvSrz9jp2Z
-9nyg88O0P+tQ4QiZY3Ed
-=EiMO
+iQIcBAEBAgAGBQJP5l5RAAoJELEHsLL7fEFWFhIP/RsdXYa90hWKH9qg5qXjARzP
+JeCxx/S0HsHby3e66qUGARv3l1bV1VpOSPocSG43FazMEXDmuQo4XOpcoUNJk3Ph
+pns/m8llns3l3zWAYoy/PazOBNX2QnaGDnmjwCp4TYLPuyBu+itbokT4oOWegEs2
+s8xzmtQajyYiIvP3u9woYW4j6j9o20XR6R/JFelU2kdXoz7uIGKWxD4Z0D6G+NnK
+2MaoYY+bLiWfjmZ4/Vw4mUgM/gbAmioeayPqudPoMD58QI/aGsahEDYU1Oi64fjf
+wEsBUUiOud/aVBFUzXUP+RB+PoNDJoDMNy+Ng0/s1kRzGzD7hweUCXe/QwXPLDwf
+HB3XnwzdYkBTqt03Udz7hIlcC24dJbZAq6+jaUVNJDWUKKIjs/Zjo/lDlkzvOupV
+dN95ANgxymBI0Vxf4ftno1dLPAXdPcpaB6frpWFiD8LKhMxNwkyZiv0wN/SU1uCN
+OHS+h2SNEjHk+kiDx6gQVG7LA+Y42LY4E1fxnA4neO4gYKxZPJL1PJrWf5NKF9NL
+nkv+4LVxtU64ZYW+b9HP+40QwasjugkjlPdEN+5n5KSCGIrYmkYJYwOsvbuuHmg9
+ri3s05VoLHkEEk310JyFz0g3EQgwe2PD6pMirhIBXexmjCrjNt2JUQ0ZujTnEr6e
+JMoR4o5VP7+R0NHtucol
+=WJEJ
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/ncurses-5.7-r7.ebuild b/sys-libs/ncurses/ncurses-5.7-r7.ebuild
index ea8bee57cac0..1c57c5f4f271 100644
--- a/sys-libs/ncurses/ncurses-5.7-r7.ebuild
+++ b/sys-libs/ncurses/ncurses-5.7-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r7.ebuild,v 1.9 2011/05/22 18:19:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r7.ebuild,v 1.10 2012/06/24 00:24:08 vapier Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic toolchain-funcs
@@ -131,7 +131,7 @@ src_install() {
 	gen_usr_ldscript -a ncurses
 	use unicode && gen_usr_ldscript -a ncursesw
 	ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die
-	use static-libs || rm "${D}"/usr/$(get_libdir)/*.a
+	use static-libs || find "${D}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
 
 #	if ! use berkdb ; then
 		# We need the basic terminfo files in /etc, bug #37026
diff --git a/sys-libs/ncurses/ncurses-5.9-r1.ebuild b/sys-libs/ncurses/ncurses-5.9-r1.ebuild
index 0da4732aac14..63df0808e82f 100644
--- a/sys-libs/ncurses/ncurses-5.9-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r1.ebuild,v 1.1 2011/11/21 22:08:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r1.ebuild,v 1.2 2012/06/24 00:24:08 vapier Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic toolchain-funcs
@@ -136,7 +136,7 @@ src_install() {
 	gen_usr_ldscript -a ncurses
 	use unicode && gen_usr_ldscript -a ncursesw
 	ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die
-	use static-libs || rm "${D}"/usr/$(get_libdir)/*.a
+	use static-libs || find "${D}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
 
 #	if ! use berkdb ; then
 		# We need the basic terminfo files in /etc, bug #37026
diff --git a/sys-libs/ncurses/ncurses-5.9-r2.ebuild b/sys-libs/ncurses/ncurses-5.9-r2.ebuild
index f6e25b7b6585..c52751b18029 100644
--- a/sys-libs/ncurses/ncurses-5.9-r2.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.13 2012/06/14 03:39:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.14 2012/06/24 00:24:08 vapier Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic toolchain-funcs
@@ -138,7 +138,7 @@ src_install() {
 	gen_usr_ldscript -a ncurses
 	use unicode && gen_usr_ldscript -a ncursesw
 	ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die
-	use static-libs || rm "${D}"/usr/$(get_libdir)/*.a
+	use static-libs || find "${D}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
 
 #	if ! use berkdb ; then
 		# We need the basic terminfo files in /etc, bug #37026
diff --git a/sys-libs/ncurses/ncurses-5.9.ebuild b/sys-libs/ncurses/ncurses-5.9.ebuild
index 4e8b35faf9dd..82e4cb10d1ca 100644
--- a/sys-libs/ncurses/ncurses-5.9.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9.ebuild,v 1.7 2011/12/28 19:26:42 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9.ebuild,v 1.8 2012/06/24 00:24:08 vapier Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic toolchain-funcs
@@ -127,7 +127,7 @@ src_install() {
 	gen_usr_ldscript -a ncurses
 	use unicode && gen_usr_ldscript -a ncursesw
 	ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die
-	use static-libs || rm "${D}"/usr/$(get_libdir)/*.a
+	use static-libs || find "${D}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
 
 #	if ! use berkdb ; then
 		# We need the basic terminfo files in /etc, bug #37026