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

Package-Manager: portage-2.1.2-r10

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 5093cace2cad9a9c1db170817dff51bdc83c4c16..9cf0d5d10ea5364884987dd3cf08c1cfa4fced67 100644 (file)
--- 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/Manifest b/sys-libs/ncurses/Manifest
index 7224ac6a45020dc0e2605c68988b61504f90457d..abd8f1cde4a32153892cdbb4e78dc0a1dd9d5e7b 100644 (file)
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -28,22 +28,22 @@ SHA256 d9e94c5068a22d32f52c5db6aadc3793af11bb0c08b006e375921726931e0065 files/nc
 DIST ncurses-5.4.tar.gz 2154022 RMD160 36369f4e2c76c396de51809deb8a671d8ca3d19e SHA1 c0dfaf2c4d383915f898a97c8caeace8a0a2c8b7 SHA256 5abce063cf431790f4e6a801a96c7eea0b33a41ecd0970f6312f52575c083b36
 DIST ncurses-5.5.tar.gz 2314030 RMD160 aac34d2530519fbb0fde7af87a365205339ba230 SHA1 46414a72e91a62f63a8c9af00f0d65497f5ecc5a SHA256 27a63f3a2ac9d13c1ed9a0a33ee4497c19a6b5810b8f9738e7654a0e12225b93
 DIST ncurses-5.6.tar.gz 2402592 RMD160 1a878819c43e6426500fd74ccedf0a032ef399d8 SHA1 4d54d8ad0b90fffa2780a0a45edb6fcb027ef18d SHA256 f9cac2b31683a37d65bc37119599752198a0691e462d0d1a252cf9815f5724d5
-EBUILD ncurses-5.4-r6.ebuild 5465 RMD160 94046d6c0c855ebacfd0815a9dc68a576d8bac72 SHA1 c2190dd1fcf260c3312394111482bbef728a7fe4 SHA256 64c5e129d6d1c8f42cb4b973e300f212916c2b7335d342844acb04cbb3083dbd
-MD5 3a23bee1fd81e1d279ec4632e9cc383e ncurses-5.4-r6.ebuild 5465
-RMD160 94046d6c0c855ebacfd0815a9dc68a576d8bac72 ncurses-5.4-r6.ebuild 5465
-SHA256 64c5e129d6d1c8f42cb4b973e300f212916c2b7335d342844acb04cbb3083dbd ncurses-5.4-r6.ebuild 5465
-EBUILD ncurses-5.5-r3.ebuild 5524 RMD160 06488893ddbc85178781d33ed224a942a5518cb3 SHA1 919c494fbd4873dd861888464b6d014809605d15 SHA256 906c28e44f0826941107ea00913b0257ca2e8cca7bff97d601d60ad756f7e927
-MD5 1261a5cc58730bf871eee272225ed1e0 ncurses-5.5-r3.ebuild 5524
-RMD160 06488893ddbc85178781d33ed224a942a5518cb3 ncurses-5.5-r3.ebuild 5524
-SHA256 906c28e44f0826941107ea00913b0257ca2e8cca7bff97d601d60ad756f7e927 ncurses-5.5-r3.ebuild 5524
-EBUILD ncurses-5.6.ebuild 5489 RMD160 c7f9ae1eed5c8abd093cc553a2faeb8342487b19 SHA1 fc2a8af50c7ebf9ec409d8b21498e120dded1910 SHA256 0ec9a24d8775e0a8812d4d03211a25c7825d32e9154e4b3e4b9661fa43e7e3ae
-MD5 263bdb6296f78a892159dba7a9d2eecc ncurses-5.6.ebuild 5489
-RMD160 c7f9ae1eed5c8abd093cc553a2faeb8342487b19 ncurses-5.6.ebuild 5489
-SHA256 0ec9a24d8775e0a8812d4d03211a25c7825d32e9154e4b3e4b9661fa43e7e3ae ncurses-5.6.ebuild 5489
-MISC ChangeLog 19363 RMD160 bf3a505f22f898a979efbc318ddec52b268ca1ce SHA1 be9ec36d6b5001329bae16e3aa153ed894117be0 SHA256 3d2b8a0ab64d320353a0b8b6fc0040ba3f8deec9438fe9be3209d4f97db6ecd5
-MD5 3246699fec9098c9b1a67291849aa324 ChangeLog 19363
-RMD160 bf3a505f22f898a979efbc318ddec52b268ca1ce ChangeLog 19363
-SHA256 3d2b8a0ab64d320353a0b8b6fc0040ba3f8deec9438fe9be3209d4f97db6ecd5 ChangeLog 19363
+EBUILD ncurses-5.4-r6.ebuild 5124 RMD160 8c540cd6237a96b1401d699dbcc5e86eec55b155 SHA1 f5a77e57fb6c05c238e6716217ddf2360d77e874 SHA256 ec2f8548bfa7d06d7864aa75b3ed0dc39105e81ae30eba9d2ae4ab5f6e24a534
+MD5 47e7874d33d298fbde33a5ca1619e310 ncurses-5.4-r6.ebuild 5124
+RMD160 8c540cd6237a96b1401d699dbcc5e86eec55b155 ncurses-5.4-r6.ebuild 5124
+SHA256 ec2f8548bfa7d06d7864aa75b3ed0dc39105e81ae30eba9d2ae4ab5f6e24a534 ncurses-5.4-r6.ebuild 5124
+EBUILD ncurses-5.5-r3.ebuild 5182 RMD160 2de95f8ccab8b55b31b4c6586e0e7abd093bb849 SHA1 3945b68b13d7fb0257fbce0e0cb7db00012ddcdf SHA256 8f3be68353140139258b2b8c89977570f12cfa965b7285471400e0cd95b6fb85
+MD5 d7731cdd31e23c571c54b783ccefe16d ncurses-5.5-r3.ebuild 5182
+RMD160 2de95f8ccab8b55b31b4c6586e0e7abd093bb849 ncurses-5.5-r3.ebuild 5182
+SHA256 8f3be68353140139258b2b8c89977570f12cfa965b7285471400e0cd95b6fb85 ncurses-5.5-r3.ebuild 5182
+EBUILD ncurses-5.6.ebuild 5147 RMD160 dbe22918e36ebadbed3c18c348860767de2b8b10 SHA1 27f11145dadc4cb06317fef102ae5aed55351c4e SHA256 53a93ed71f0f5299c1cb13af164faf41642bb0fe3959561377a4c26e38ae6418
+MD5 72ccb769eb0d748c584cca4bc856eebd ncurses-5.6.ebuild 5147
+RMD160 dbe22918e36ebadbed3c18c348860767de2b8b10 ncurses-5.6.ebuild 5147
+SHA256 53a93ed71f0f5299c1cb13af164faf41642bb0fe3959561377a4c26e38ae6418 ncurses-5.6.ebuild 5147
+MISC ChangeLog 19572 RMD160 4cdf2275e55a305a104911a3e6d35b7f4ce31b2c SHA1 b5b863dd0b5dc309cc60767a9749de3e36df92da SHA256 eefc17978971543df894f06373815b6f0b6652bf6a3e526121f150bb863a9cca
+MD5 0cd67f4928165c1a0a7c6aea0fabe3a9 ChangeLog 19572
+RMD160 4cdf2275e55a305a104911a3e6d35b7f4ce31b2c ChangeLog 19572
+SHA256 eefc17978971543df894f06373815b6f0b6652bf6a3e526121f150bb863a9cca ChangeLog 19572
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -58,9 +58,9 @@ MD5 815d6657066cf2f88061b6542dc5bfe0 files/digest-ncurses-5.6 238
 RMD160 dbf4e20e60f6247945ffbefcf00a455920d0c1b1 files/digest-ncurses-5.6 238
 SHA256 aeae266804b5463f9acb8a7ece8f88dfcb520a6b7705011e727b1c0cbe83632d files/digest-ncurses-5.6 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFroZf8bi6rjpTunYRAi0BAJ9bRQhsDcmIXr7ifEn+GyZIJbulbwCgljNB
-V98RJJmDZnuuA70d+skfUro=
-=yCHx
+iD8DBQFF2+x78bi6rjpTunYRAufmAJ98awgLLEp3Rf1VO0ay56LY4f+80ACgjDBS
+r4bwK2Wr2r3A6VZhRnXCS/w=
+=EoYw
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/ncurses/ncurses-5.4-r6.ebuild b/sys-libs/ncurses/ncurses-5.4-r6.ebuild
index 644692c72d33dfae0f63b5ddb4410d89e3e807b2..97203984e6d2e587b3a22c793250af30bc44b4b9 100644 (file)
--- 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 a68a6e4605675c166aab49aa9ac7b2c9065f9d2e..281dbf535b30a14249d7a9c69ac7c047bdf49d76 100644 (file)
--- 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 6f322e7e1c4e77f1cfbcaf8ced2797a43bd14f28..464cfafa9f2ecef45c8d909bee66b22a43bf7eb9 100644 (file)
--- 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
 }