diff options
author | Travis Tilley <lv@gentoo.org> | 2004-08-19 21:46:59 +0000 |
---|---|---|
committer | Travis Tilley <lv@gentoo.org> | 2004-08-19 21:46:59 +0000 |
commit | 4a8d89e0f075a878f61397bc95d566ffee8327f4 (patch) | |
tree | dbe49889693fea84373edc2ecc27a00fb9371979 /sys-libs | |
parent | Arg, moved RDEPEND'S to DEPENDS as it makes more sense.. (diff) | |
download | historical-4a8d89e0f075a878f61397bc95d566ffee8327f4.tar.gz historical-4a8d89e0f075a878f61397bc95d566ffee8327f4.tar.bz2 historical-4a8d89e0f075a878f61397bc95d566ffee8327f4.zip |
fix utf-8 support so that it doesnt totally bork installs with a /lib64 directory. fixes bug 60920
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/ncurses/ChangeLog | 6 | ||||
-rw-r--r-- | sys-libs/ncurses/Manifest | 4 | ||||
-rw-r--r-- | sys-libs/ncurses/ncurses-5.4-r4.ebuild | 10 |
3 files changed, 12 insertions, 8 deletions
diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog index 801495fcf377..aac1120d6674 100644 --- a/sys-libs/ncurses/ChangeLog +++ b/sys-libs/ncurses/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/ncurses # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.75 2004/08/19 14:48:26 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.76 2004/08/19 21:46:59 lv Exp $ + + 19 Aug 2004; Travis Tilley <lv@gentoo.org> ncurses-5.4-r4.ebuild: + fix utf-8 support so that it doesnt totally bork installs with a /lib64 + directory. fixes bug 60920 *ncurses-5.4-r4 (19 Aug 2004) diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest index 3e75bc590a9b..565c3aea6caf 100644 --- a/sys-libs/ncurses/Manifest +++ b/sys-libs/ncurses/Manifest @@ -3,9 +3,9 @@ MD5 67809502940dfc2279c85ba964cf9208 ncurses-5.4-r3.ebuild 5628 MD5 e0cbea07444890f3bd2fa7462ee9b8c9 ncurses-8.1.ebuild 401 MD5 b64893113afb0ce133c2d3445394666f ncurses-5.4-r2.ebuild 5672 MD5 31b0e575ef0e06746b60c74b3e9cdbe8 ncurses-5.3-r5.ebuild 3788 -MD5 0341d95d620e7e4e63a8e4270362ef4b ChangeLog 12198 +MD5 575814274aca1311cac34115ce3b8ab6 ChangeLog 12366 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 d3a368b6570d79cba6df8b3257ab8ad3 ncurses-5.4-r4.ebuild 6012 +MD5 69fdbb1bd156f172aef0960836aa19d3 ncurses-5.4-r4.ebuild 6052 MD5 f96d1b4b0bf94f1d38ce950df0efb37e files/ncurses-5.3-xterm.patch 1002 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ncurses-8.1 0 MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495 diff --git a/sys-libs/ncurses/ncurses-5.4-r4.ebuild b/sys-libs/ncurses/ncurses-5.4-r4.ebuild index f80762d0c8f9..0c55cb457d73 100644 --- a/sys-libs/ncurses/ncurses-5.4-r4.ebuild +++ b/sys-libs/ncurses/ncurses-5.4-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r4.ebuild,v 1.1 2004/08/19 14:48:26 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r4.ebuild,v 1.2 2004/08/19 21:46:59 lv Exp $ inherit eutils flag-o-matic 64-bit gnuconfig @@ -98,11 +98,11 @@ src_install() { if use unicode ; then gen_usr_ldscript libncursesw.so - for i in ${D}/usr/lib/*w.*; do + for i in ${D}/usr/${CONF_LIBDIR}/*w.*; do local libncurses=${i/${D}/} dosym ${libncurses} ${libncurses/w./.} done - for i in ${D}/lib/libncursesw.so*; do + for i in ${D}/${CONF_LIBDIR}/libncursesw.so*; do local libncurses=${i/${D}} dosym ${libncurses} ${libncurses/w./.} done @@ -151,11 +151,11 @@ src_install() { # need to remove libncurses.a from the build image manually. # cd ${D}/usr/lib; rm *.a # remove extraneous ncurses libraries - cd ${D}/usr/lib; rm -f lib{form,menu,panel}* + cd ${D}/usr/${CONF_LIBDIR}; rm -f lib{form,menu,panel}* cd ${D}/usr/include; rm -f {eti,form,menu,panel}.h else if use bootstrap ; then - cd ${D}/usr/lib; rm -f lib{form,menu,panel,ncurses++}* + cd ${D}/usr/${CONF_LIBDIR}; rm -f lib{form,menu,panel,ncurses++}* cd ${D}/usr/include; rm -f {eti,form,menu,panel}.h cursesapp.h curses?.h cursslk.h etip.h fi # Install xterm-debian terminfo entry to satisfy bug #18486 |