changed CONF_LIBDIR to $(get_libdir), since the get_libdir function has sane defaults when using a version a portage without CONF_LIBDIR support

7 files changed, 81 insertions, 115 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 57542db4b144..fac3caa8be65 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,12 @@
 # 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.77 2004/08/30 10:33:50 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.78 2004/09/02 13:37:40 lv Exp $
+
+  02 Sep 2004; Travis Tilley <lv@gentoo.org> ncurses-5.4-r1.ebuild,
+  ncurses-5.4-r2.ebuild, ncurses-5.4-r3.ebuild, ncurses-5.4-r4.ebuild,
+  ncurses-5.4-r5.ebuild:
+  changed CONF_LIBDIR to $(get_libdir), since the get_libdir function has sane
+  defaults when using a version a portage without CONF_LIBDIR support
 
 *ncurses-5.4-r5 (30 Aug 2004)
 
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 37a7f03b1b91..60b10fccd866 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,22 +1,22 @@
-MD5 3dad7707f82aa56843e7c8e39e196d05 ChangeLog 12510
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 31b0e575ef0e06746b60c74b3e9cdbe8 ncurses-5.3-r5.ebuild 3788
-MD5 5f45832dca8a592ee9b30aa27a26ab3e ncurses-5.4-r1.ebuild 5023
-MD5 b64893113afb0ce133c2d3445394666f ncurses-5.4-r2.ebuild 5672
+MD5 e33855a8d4604d8adc0554d559ba3074 ncurses-5.4-r1.ebuild 4686
+MD5 f82e136c8ceb3cfa29d80e296a9f77d4 ncurses-5.4-r3.ebuild 5285
 MD5 e0cbea07444890f3bd2fa7462ee9b8c9 ncurses-8.1.ebuild 401
-MD5 67809502940dfc2279c85ba964cf9208 ncurses-5.4-r3.ebuild 5628
-MD5 69fdbb1bd156f172aef0960836aa19d3 ncurses-5.4-r4.ebuild 6052
-MD5 cfbcb52adc438af40f0a7561705d0b2c ncurses-5.4-r5.ebuild 6078
-MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r5 64
-MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r1 64
-MD5 143b9126206485a5faeb817fd94b1054 files/ncurses-5.3-coreutils.patch 1581
-MD5 c5b265c81eb2dea26b66cd656c61e99c files/ncurses-5.3-share-sed.patch 686
+MD5 4c3a76f32b840d4e9aac01d50bc628cc ncurses-5.4-r5.ebuild 5734
+MD5 975492d92101d8f876b839531a66aa16 ncurses-5.4-r2.ebuild 5335
+MD5 31b0e575ef0e06746b60c74b3e9cdbe8 ncurses-5.3-r5.ebuild 3788
+MD5 3de099cf04fe15535274f5f8a33af0e9 ChangeLog 12820
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 26f5d24f563c040352508b6eeb95f3e5 ncurses-5.4-r4.ebuild 5712
 MD5 f96d1b4b0bf94f1d38ce950df0efb37e files/ncurses-5.3-xterm.patch 1002
-MD5 1ecbf68a55269d2cebeb997f6973fc1d files/ncurses-5.4-share-sed.patch 686
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ncurses-8.1 0
 MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495
+MD5 c5b265c81eb2dea26b66cd656c61e99c files/ncurses-5.3-share-sed.patch 686
 MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342
+MD5 1ecbf68a55269d2cebeb997f6973fc1d files/ncurses-5.4-share-sed.patch 686
+MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r5 64
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r1 64
 MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r2 64
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ncurses-8.1 0
 MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r3 64
 MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r4 64
 MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r5 64
+MD5 143b9126206485a5faeb817fd94b1054 files/ncurses-5.3-coreutils.patch 1581
diff --git a/sys-libs/ncurses/ncurses-5.4-r1.ebuild b/sys-libs/ncurses/ncurses-5.4-r1.ebuild
index 321b54451618..6c507db3fcbc 100644
--- a/sys-libs/ncurses/ncurses-5.4-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-5.4-r1.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-r1.ebuild,v 1.24 2004/08/15 03:26:23 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r1.ebuild,v 1.25 2004/09/02 13:37:40 lv Exp $
 
 inherit eutils flag-o-matic 64-bit gnuconfig
 
@@ -29,14 +29,6 @@ src_unpack() {
 	gnuconfig_update
 }
 
-pkg_setup() {
-	# this adds support for installing to lib64/lib32. since only portage
-	# 2.0.51 will have this functionality supported in dolib and friends,
-	# and since it isnt expected that many profiles will define it, we need
-	# to make this variable default to lib.
-	[ -z "${CONF_LIBDIR}" ] && export CONF_LIBDIR="lib"
-}
-
 src_compile() {
 	local myconf=
 
@@ -64,7 +56,7 @@ src_compile() {
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
 	econf \
-		--libdir=/${CONF_LIBDIR} \
+		--libdir=/$(get_libdir) \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--disable-termcap \
 		--with-shared \
@@ -89,10 +81,10 @@ src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
 	# Move static and extraneous ncurses libraries out of /lib
-	cd ${D}/${CONF_LIBDIR}
-	dodir /usr/${CONF_LIBDIR}
-	mv libform* libmenu* libpanel* ${D}/usr/${CONF_LIBDIR}
-	mv *.a ${D}/usr/${CONF_LIBDIR}
+	cd ${D}/$(get_libdir)
+	dodir /usr/$(get_libdir)
+	mv libform* libmenu* libpanel* ${D}/usr/$(get_libdir)
+	mv *.a ${D}/usr/$(get_libdir)
 	# bug #4411
 	gen_usr_ldscript libncurses.so || die "gen_usr_ldscript failed"
 
@@ -113,7 +105,7 @@ src_install() {
 	done
 
 	# Build fails to create this ...
-	dosym ../share/terminfo /usr/${CONF_LIBDIR}/terminfo
+	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
 
 	dodir /etc/env.d
 	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > ${D}/etc/env.d/50ncurses
@@ -135,7 +127,7 @@ src_install() {
 		# cd ${D}/usr/lib; rm *.a
 	else
 		# Install xterm-debian terminfo entry to satisfy bug #18486
-		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/${CONF_LIBDIR}:${D}/${CONF_LIBDIR} \
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir):${D}/$(get_libdir) \
 			TERMINFO=${D}/usr/share/terminfo \
 			${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti
 
@@ -159,8 +151,8 @@ pkg_postinst() {
 	# Old ncurses may still be around from old build tbz2's.
 	rm -f /lib/libncurses.so.5.[23]
 	rm -f /usr/lib/lib{form,menu,panel}.so.5.[23]
-	if [ "${CONF_LIBDIR}" != "lib" ] ;then
-		rm -f /${CONF_LIBDIR}/libncurses.so.5.[23]
-		rm -f /usr/${CONF_LIBDIR}/lib{form,menu,panel}.so.5.[23]
+	if [ "$(get_libdir)" != "lib" ] ;then
+		rm -f /$(get_libdir)/libncurses.so.5.[23]
+		rm -f /usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23]
 	fi
 }
diff --git a/sys-libs/ncurses/ncurses-5.4-r2.ebuild b/sys-libs/ncurses/ncurses-5.4-r2.ebuild
index 1167a19cd68e..0eef2d68b3c0 100644
--- a/sys-libs/ncurses/ncurses-5.4-r2.ebuild
+++ b/sys-libs/ncurses/ncurses-5.4-r2.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-r2.ebuild,v 1.7 2004/08/15 03:26:23 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r2.ebuild,v 1.8 2004/09/02 13:37:40 lv Exp $
 
 inherit eutils flag-o-matic 64-bit gnuconfig
 
@@ -29,14 +29,6 @@ src_unpack() {
 	gnuconfig_update
 }
 
-pkg_setup() {
-	# this adds support for installing to lib64/lib32. since only portage
-	# 2.0.51 will have this functionality supported in dolib and friends,
-	# and since it isnt expected that many profiles will define it, we need
-	# to make this variable default to lib.
-	[ -z "${CONF_LIBDIR}" ] && export CONF_LIBDIR="lib"
-}
-
 src_compile() {
 	local myconf=
 
@@ -64,7 +56,7 @@ src_compile() {
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
 	econf \
-		--libdir=/${CONF_LIBDIR} \
+		--libdir=/$(get_libdir) \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--disable-termcap \
 		--with-shared \
@@ -89,10 +81,10 @@ src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
 	# Move static and extraneous ncurses libraries out of /lib
-	cd ${D}/${CONF_LIBDIR}
-	dodir /usr/${CONF_LIBDIR}
-	mv libform* libmenu* libpanel* ${D}/usr/${CONF_LIBDIR}
-	mv *.a ${D}/usr/${CONF_LIBDIR}
+	cd ${D}/$(get_libdir)
+	dodir /usr/$(get_libdir)
+	mv libform* libmenu* libpanel* ${D}/usr/$(get_libdir)
+	mv *.a ${D}/usr/$(get_libdir)
 	# bug #4411
 	gen_usr_ldscript libncurses.so || die "gen_usr_ldscript failed"
 
@@ -115,7 +107,7 @@ src_install() {
 	done
 
 	# Build fails to create this ...
-	dosym ../share/terminfo /usr/${CONF_LIBDIR}/terminfo
+	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
 
 	dodir /etc/env.d
 	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > ${D}/etc/env.d/50ncurses
@@ -144,7 +136,7 @@ src_install() {
 			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
-		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/${CONF_LIBDIR}:${D}/${CONF_LIBDIR} \
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir):${D}/$(get_libdir) \
 			TERMINFO=${D}/usr/share/terminfo \
 			${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti
 
@@ -173,8 +165,8 @@ pkg_postinst() {
 	# Old ncurses may still be around from old build tbz2's.
 	rm -f /lib/libncurses.so.5.[23]
 	rm -f /usr/lib/lib{form,menu,panel}.so.5.[23]
-	if [ "${CONF_LIBDIR}" != "lib" ] ;then
-		rm -f /${CONF_LIBDIR}/libncurses.so.5.[23]
-		rm -f /usr/${CONF_LIBDIR}/lib{form,menu,panel}.so.5.[23]
+	if [ "$(get_libdir)" != "lib" ] ;then
+		rm -f /$(get_libdir)/libncurses.so.5.[23]
+		rm -f /usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23]
 	fi
 }
diff --git a/sys-libs/ncurses/ncurses-5.4-r3.ebuild b/sys-libs/ncurses/ncurses-5.4-r3.ebuild
index e50300580a4a..c7950a3aaf9b 100644
--- a/sys-libs/ncurses/ncurses-5.4-r3.ebuild
+++ b/sys-libs/ncurses/ncurses-5.4-r3.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-r3.ebuild,v 1.7 2004/08/17 20:19:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r3.ebuild,v 1.8 2004/09/02 13:37:40 lv Exp $
 
 inherit eutils flag-o-matic 64-bit gnuconfig
 
@@ -29,14 +29,6 @@ src_unpack() {
 	gnuconfig_update
 }
 
-pkg_setup() {
-	# this adds support for installing to lib64/lib32. since only portage
-	# 2.0.51 will have this functionality supported in dolib and friends,
-	# and since it isnt expected that many profiles will define it, we need
-	# to make this variable default to lib.
-	[ -z "${CONF_LIBDIR}" ] && export CONF_LIBDIR="lib"
-}
-
 src_compile() {
 	local myconf=
 
@@ -64,7 +56,7 @@ src_compile() {
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
 	econf \
-		--libdir=/${CONF_LIBDIR} \
+		--libdir=/$(get_libdir) \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--disable-termcap \
 		--with-shared \
@@ -89,9 +81,9 @@ src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
 	# Move static and extraneous ncurses libraries out of /lib
-	cd ${D}/${CONF_LIBDIR}
-	dodir /usr/${CONF_LIBDIR}
-	mv libform* libmenu* libpanel* *.a ${D}/usr/${CONF_LIBDIR}
+	cd ${D}/$(get_libdir)
+	dodir /usr/$(get_libdir)
+	mv libform* libmenu* libpanel* *.a ${D}/usr/$(get_libdir)
 	# bug #4411
 	gen_usr_ldscript libncurses.so || die "gen_usr_ldscript failed"
 
@@ -114,7 +106,7 @@ src_install() {
 	done
 
 	# Build fails to create this ...
-	dosym ../share/terminfo /usr/${CONF_LIBDIR}/terminfo
+	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
 
 	dodir /etc/env.d
 	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > ${D}/etc/env.d/50ncurses
@@ -143,7 +135,7 @@ src_install() {
 			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
-		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/${CONF_LIBDIR}:${D}/${CONF_LIBDIR} \
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir):${D}/$(get_libdir) \
 			TERMINFO=${D}/usr/share/terminfo \
 			${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti
 
@@ -170,8 +162,8 @@ pkg_preinst() {
 pkg_postinst() {
 	# Old ncurses may still be around from old build tbz2's.
 	rm -f /lib/libncurses.so.5.[23] /usr/lib/lib{form,menu,panel}.so.5.[23]
-	if [ "${CONF_LIBDIR}" != "lib" ] ;then
-		rm -f /${CONF_LIBDIR}/libncurses.so.5.[23] \
-			/usr/${CONF_LIBDIR}/lib{form,menu,panel}.so.5.[23]
+	if [ "$(get_libdir)" != "lib" ] ;then
+		rm -f /$(get_libdir)/libncurses.so.5.[23] \
+			/usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23]
 	fi
 }
diff --git a/sys-libs/ncurses/ncurses-5.4-r4.ebuild b/sys-libs/ncurses/ncurses-5.4-r4.ebuild
index 0c55cb457d73..5f910b8f46e4 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.2 2004/08/19 21:46:59 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r4.ebuild,v 1.3 2004/09/02 13:37:40 lv Exp $
 
 inherit eutils flag-o-matic 64-bit gnuconfig
 
@@ -29,14 +29,6 @@ src_unpack() {
 	gnuconfig_update
 }
 
-pkg_setup() {
-	# this adds support for installing to lib64/lib32. since only portage
-	# 2.0.51 will have this functionality supported in dolib and friends,
-	# and since it isnt expected that many profiles will define it, we need
-	# to make this variable default to lib.
-	[ -z "${CONF_LIBDIR}" ] && export CONF_LIBDIR="lib"
-}
-
 src_compile() {
 	local myconf=
 
@@ -67,7 +59,7 @@ src_compile() {
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
 	econf \
-		--libdir=/${CONF_LIBDIR} \
+		--libdir=/$(get_libdir) \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--disable-termcap \
 		--with-shared \
@@ -92,17 +84,17 @@ src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
 	# Move static and extraneous ncurses libraries out of /lib
-	cd ${D}/${CONF_LIBDIR}
-	dodir /usr/${CONF_LIBDIR}
-	mv libform* libmenu* libpanel* *.a ${D}/usr/${CONF_LIBDIR}
+	cd ${D}/$(get_libdir)
+	dodir /usr/$(get_libdir)
+	mv libform* libmenu* libpanel* *.a ${D}/usr/$(get_libdir)
 
 	if use unicode ; then
 		gen_usr_ldscript libncursesw.so
-		for i in ${D}/usr/${CONF_LIBDIR}/*w.*; do
+		for i in ${D}/usr/$(get_libdir)/*w.*; do
 			local libncurses=${i/${D}/}
 			dosym ${libncurses} ${libncurses/w./.}
 		done
-		for i in ${D}/${CONF_LIBDIR}/libncursesw.so*; do
+		for i in ${D}/$(get_libdir)/libncursesw.so*; do
 			local libncurses=${i/${D}}
 			dosym ${libncurses} ${libncurses/w./.}
 		done
@@ -130,7 +122,7 @@ src_install() {
 	done
 
 	# Build fails to create this ...
-	dosym ../share/terminfo /usr/${CONF_LIBDIR}/terminfo
+	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
 
 	dodir /etc/env.d
 	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > ${D}/etc/env.d/50ncurses
@@ -151,15 +143,15 @@ 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/${CONF_LIBDIR}; rm -f lib{form,menu,panel}*
+		cd ${D}/usr/$(get_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/${CONF_LIBDIR}; rm -f lib{form,menu,panel,ncurses++}*
+			cd ${D}/usr/$(get_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
-		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/${CONF_LIBDIR}:${D}/${CONF_LIBDIR} \
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir):${D}/$(get_libdir) \
 			TERMINFO=${D}/usr/share/terminfo \
 			${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti
 
@@ -186,8 +178,8 @@ pkg_preinst() {
 pkg_postinst() {
 	# Old ncurses may still be around from old build tbz2's.
 	rm -f /lib/libncurses.so.5.[23] /usr/lib/lib{form,menu,panel}.so.5.[23]
-	if [ "${CONF_LIBDIR}" != "lib" ] ;then
-		rm -f /${CONF_LIBDIR}/libncurses.so.5.[23] \
-			/usr/${CONF_LIBDIR}/lib{form,menu,panel}.so.5.[23]
+	if [ "$(get_libdir)" != "lib" ] ;then
+		rm -f /$(get_libdir)/libncurses.so.5.[23] \
+			/usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23]
 	fi
 }
diff --git a/sys-libs/ncurses/ncurses-5.4-r5.ebuild b/sys-libs/ncurses/ncurses-5.4-r5.ebuild
index 87c9c378d4f1..08bbcd624648 100644
--- a/sys-libs/ncurses/ncurses-5.4-r5.ebuild
+++ b/sys-libs/ncurses/ncurses-5.4-r5.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-r5.ebuild,v 1.1 2004/08/30 10:33:50 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r5.ebuild,v 1.2 2004/09/02 13:37:40 lv Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
@@ -29,14 +29,6 @@ src_unpack() {
 	gnuconfig_update
 }
 
-pkg_setup() {
-	# this adds support for installing to lib64/lib32. since only portage
-	# 2.0.51 will have this functionality supported in dolib and friends,
-	# and since it isnt expected that many profiles will define it, we need
-	# to make this variable default to lib.
-	[ -z "${CONF_LIBDIR}" ] && export CONF_LIBDIR="lib"
-}
-
 src_compile() {
 	local myconf=
 
@@ -68,7 +60,7 @@ src_compile() {
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
 	econf \
-		--libdir=/${CONF_LIBDIR} \
+		--libdir=/$(get_libdir) \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--disable-termcap \
 		--with-shared \
@@ -93,17 +85,17 @@ src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
 	# Move static and extraneous ncurses libraries out of /lib
-	cd ${D}/${CONF_LIBDIR}
-	dodir /usr/${CONF_LIBDIR}
-	mv libform* libmenu* libpanel* *.a ${D}/usr/${CONF_LIBDIR}
+	cd ${D}/$(get_libdir)
+	dodir /usr/$(get_libdir)
+	mv libform* libmenu* libpanel* *.a ${D}/usr/$(get_libdir)
 
 	if use unicode ; then
 		gen_usr_ldscript libncursesw.so
-		for i in ${D}/usr/${CONF_LIBDIR}/*w.*; do
+		for i in ${D}/usr/$(get_libdir)/*w.*; do
 			local libncurses=${i/${D}/}
 			dosym ${libncurses} ${libncurses/w./.}
 		done
-		for i in ${D}/${CONF_LIBDIR}/libncursesw.so*; do
+		for i in ${D}/$(get_libdir)/libncursesw.so*; do
 			local libncurses=${i/${D}}
 			dosym ${libncurses} ${libncurses/w./.}
 		done
@@ -131,7 +123,7 @@ src_install() {
 	done
 
 	# Build fails to create this ...
-	dosym ../share/terminfo /usr/${CONF_LIBDIR}/terminfo
+	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
 
 	dodir /etc/env.d
 	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > ${D}/etc/env.d/50ncurses
@@ -152,15 +144,15 @@ 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/${CONF_LIBDIR}; rm -f lib{form,menu,panel}*
+		cd ${D}/usr/$(get_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/${CONF_LIBDIR}; rm -f lib{form,menu,panel,ncurses++}*
+			cd ${D}/usr/$(get_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
-		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/${CONF_LIBDIR}:${D}/${CONF_LIBDIR} \
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir):${D}/$(get_Libdir) \
 			TERMINFO=${D}/usr/share/terminfo \
 			${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti
 
@@ -187,8 +179,8 @@ pkg_preinst() {
 pkg_postinst() {
 	# Old ncurses may still be around from old build tbz2's.
 	rm -f /lib/libncurses.so.5.[23] /usr/lib/lib{form,menu,panel}.so.5.[23]
-	if [ "${CONF_LIBDIR}" != "lib" ] ;then
-		rm -f /${CONF_LIBDIR}/libncurses.so.5.[23] \
-			/usr/${CONF_LIBDIR}/lib{form,menu,panel}.so.5.[23]
+	if [ "$(get_libdir)" != "lib" ] ;then
+		rm -f /$(get_libdir)/libncurses.so.5.[23] \
+			/usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23]
 	fi
 }