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

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

5 files changed, 17 insertions, 12 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/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