Preserve libncursesw.so.5 when building with USE=-unicode #106820 by Harald van Dijk.

(Portage version: 2.1.2-r10)

4 files changed, 16 insertions, 38 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 5093cace2cad..9cf0d5d10ea5 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.130 2007/01/17 20:25:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.131 2007/02/21 06:52:44 vapier Exp $
+
+  21 Feb 2007; Mike Frysinger <vapier@gentoo.org> ncurses-5.4-r6.ebuild,
+  ncurses-5.5-r3.ebuild, ncurses-5.6.ebuild:
+  Preserve libncursesw.so.5 when building with USE=-unicode #106820 by Harald
+  van Dijk.
 
 *ncurses-5.6 (17 Jan 2007)
 
diff --git a/sys-libs/ncurses/ncurses-5.4-r6.ebuild b/sys-libs/ncurses/ncurses-5.4-r6.ebuild
index 644692c72d33..97203984e6d2 100644
--- a/sys-libs/ncurses/ncurses-5.4-r6.ebuild
+++ b/sys-libs/ncurses/ncurses-5.4-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r6.ebuild,v 1.12 2006/06/07 18:46:54 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r6.ebuild,v 1.13 2007/02/21 06:52:44 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -158,18 +158,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	if [[ ! -f ${ROOT}/etc/env.d/50ncurses ]] ; then
-		mkdir -p "${ROOT}"/etc/env.d
-		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > \
-			"${ROOT}"/etc/env.d/50ncurses
-	fi
+	use unicode || preserve_old_lib /$(get_libdir)/libncursesw.so.5
 }
 
 pkg_postinst() {
-	# Old ncurses may still be around from old build tbz2's.
-	rm -f "${ROOT}"/lib/libncurses.so.5.[23] "${ROOT}"/usr/lib/lib{form,menu,panel}.so.5.[23]
-	if [[ $(get_libdir) != "lib" ]] ; then
-		rm -f "${ROOT}"/$(get_libdir)/libncurses.so.5.[23] \
-			"${ROOT}"/usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23]
-	fi
+	use unicode || preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
 }
diff --git a/sys-libs/ncurses/ncurses-5.5-r3.ebuild b/sys-libs/ncurses/ncurses-5.5-r3.ebuild
index a68a6e460567..281dbf535b30 100644
--- a/sys-libs/ncurses/ncurses-5.5-r3.ebuild
+++ b/sys-libs/ncurses/ncurses-5.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.5-r3.ebuild,v 1.12 2007/01/16 22:36:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.5-r3.ebuild,v 1.13 2007/02/21 06:52:44 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -166,18 +166,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	if [[ ! -f ${ROOT}/etc/env.d/50ncurses ]] ; then
-		mkdir -p "${ROOT}"/etc/env.d
-		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > \
-			"${ROOT}"/etc/env.d/50ncurses
-	fi
+	use unicode || preserve_old_lib /$(get_libdir)/libncursesw.so.5
 }
 
 pkg_postinst() {
-	# Old ncurses may still be around from old build tbz2's.
-	rm -f "${ROOT}"/lib/libncurses.so.5.[23] "${ROOT}"/usr/lib/lib{form,menu,panel}.so.5.[23]
-	if [[ $(get_libdir) != "lib" ]] ; then
-		rm -f "${ROOT}"/$(get_libdir)/libncurses.so.5.[23] \
-			"${ROOT}"/usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23]
-	fi
+	use unicode || preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
 }
diff --git a/sys-libs/ncurses/ncurses-5.6.ebuild b/sys-libs/ncurses/ncurses-5.6.ebuild
index 6f322e7e1c4e..464cfafa9f2e 100644
--- a/sys-libs/ncurses/ncurses-5.6.ebuild
+++ b/sys-libs/ncurses/ncurses-5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6.ebuild,v 1.1 2007/01/17 20:25:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6.ebuild,v 1.2 2007/02/21 06:52:44 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -164,18 +164,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	if [[ ! -f ${ROOT}/etc/env.d/50ncurses ]] ; then
-		mkdir -p "${ROOT}"/etc/env.d
-		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > \
-			"${ROOT}"/etc/env.d/50ncurses
-	fi
+	use unicode || preserve_old_lib /$(get_libdir)/libncursesw.so.5
 }
 
 pkg_postinst() {
-	# Old ncurses may still be around from old build tbz2's.
-	rm -f "${ROOT}"/lib/libncurses.so.5.[23] "${ROOT}"/usr/lib/lib{form,menu,panel}.so.5.[23]
-	if [[ $(get_libdir) != "lib" ]] ; then
-		rm -f "${ROOT}"/$(get_libdir)/libncurses.so.5.[23] \
-			"${ROOT}"/usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23]
-	fi
+	use unicode || preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
 }