added CONF_LIBDIR support for installing to lib64/lib32

4 files changed, 65 insertions, 25 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 298268c906d2..12b68b91254c 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.71 2004/08/12 00:48:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.72 2004/08/15 03:26:23 lv Exp $
+
+  14 Aug 2004; Travis Tilley <lv@gentoo.org> ncurses-5.4-r1.ebuild,
+  ncurses-5.4-r2.ebuild, ncurses-5.4-r3.ebuild:
+  added CONF_LIBDIR support for installing to lib64/lib32
 
   11 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> ncurses-5.3-r5.ebuild,
   ncurses-5.4-r1.ebuild, ncurses-5.4-r2.ebuild, ncurses-5.4-r3.ebuild:
diff --git a/sys-libs/ncurses/ncurses-5.4-r1.ebuild b/sys-libs/ncurses/ncurses-5.4-r1.ebuild
index a6a49c624ad7..321b54451618 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.23 2004/08/12 00:48:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r1.ebuild,v 1.24 2004/08/15 03:26:23 lv Exp $
 
 inherit eutils flag-o-matic 64-bit gnuconfig
 
@@ -29,6 +29,14 @@ 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=
 
@@ -56,7 +64,7 @@ src_compile() {
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
 	econf \
-		--libdir=/lib \
+		--libdir=/${CONF_LIBDIR} \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--disable-termcap \
 		--with-shared \
@@ -81,10 +89,10 @@ src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
 	# Move static and extraneous ncurses libraries out of /lib
-	cd ${D}/lib
-	dodir /usr/lib
-	mv libform* libmenu* libpanel* ${D}/usr/lib
-	mv *.a ${D}/usr/lib
+	cd ${D}/${CONF_LIBDIR}
+	dodir /usr/${CONF_LIBDIR}
+	mv libform* libmenu* libpanel* ${D}/usr/${CONF_LIBDIR}
+	mv *.a ${D}/usr/${CONF_LIBDIR}
 	# bug #4411
 	gen_usr_ldscript libncurses.so || die "gen_usr_ldscript failed"
 
@@ -105,7 +113,7 @@ src_install() {
 	done
 
 	# Build fails to create this ...
-	dosym ../share/terminfo /usr/lib/terminfo
+	dosym ../share/terminfo /usr/${CONF_LIBDIR}/terminfo
 
 	dodir /etc/env.d
 	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > ${D}/etc/env.d/50ncurses
@@ -127,7 +135,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/lib:${D}/lib \
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/${CONF_LIBDIR}:${D}/${CONF_LIBDIR} \
 			TERMINFO=${D}/usr/share/terminfo \
 			${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti
 
@@ -151,4 +159,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]
+	fi
 }
diff --git a/sys-libs/ncurses/ncurses-5.4-r2.ebuild b/sys-libs/ncurses/ncurses-5.4-r2.ebuild
index b26433e1026f..1167a19cd68e 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.6 2004/08/12 00:48:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r2.ebuild,v 1.7 2004/08/15 03:26:23 lv Exp $
 
 inherit eutils flag-o-matic 64-bit gnuconfig
 
@@ -29,6 +29,14 @@ 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=
 
@@ -56,7 +64,7 @@ src_compile() {
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
 	econf \
-		--libdir=/lib \
+		--libdir=/${CONF_LIBDIR} \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--disable-termcap \
 		--with-shared \
@@ -81,10 +89,10 @@ src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
 	# Move static and extraneous ncurses libraries out of /lib
-	cd ${D}/lib
-	dodir /usr/lib
-	mv libform* libmenu* libpanel* ${D}/usr/lib
-	mv *.a ${D}/usr/lib
+	cd ${D}/${CONF_LIBDIR}
+	dodir /usr/${CONF_LIBDIR}
+	mv libform* libmenu* libpanel* ${D}/usr/${CONF_LIBDIR}
+	mv *.a ${D}/usr/${CONF_LIBDIR}
 	# bug #4411
 	gen_usr_ldscript libncurses.so || die "gen_usr_ldscript failed"
 
@@ -107,7 +115,7 @@ src_install() {
 	done
 
 	# Build fails to create this ...
-	dosym ../share/terminfo /usr/lib/terminfo
+	dosym ../share/terminfo /usr/${CONF_LIBDIR}/terminfo
 
 	dodir /etc/env.d
 	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > ${D}/etc/env.d/50ncurses
@@ -136,7 +144,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/lib:${D}/lib \
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/${CONF_LIBDIR}:${D}/${CONF_LIBDIR} \
 			TERMINFO=${D}/usr/share/terminfo \
 			${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti
 
@@ -165,4 +173,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]
+	fi
 }
diff --git a/sys-libs/ncurses/ncurses-5.4-r3.ebuild b/sys-libs/ncurses/ncurses-5.4-r3.ebuild
index 10772fa12842..6deb46f76fb0 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.4 2004/08/12 00:48:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r3.ebuild,v 1.5 2004/08/15 03:26:23 lv Exp $
 
 inherit eutils flag-o-matic 64-bit gnuconfig
 
@@ -29,6 +29,14 @@ 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=
 
@@ -56,7 +64,7 @@ src_compile() {
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
 	econf \
-		--libdir=/lib \
+		--libdir=/${CONF_LIBDIR} \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--disable-termcap \
 		--with-shared \
@@ -81,10 +89,10 @@ src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
 	# Move static and extraneous ncurses libraries out of /lib
-	cd ${D}/lib
-	dodir /usr/lib
-	mv libform* libmenu* libpanel* ${D}/usr/lib
-	mv *.a ${D}/usr/lib
+	cd ${D}/${CONF_LIBDIR}
+	dodir /usr/${CONF_LIBDIR}
+	mv libform* libmenu* libpanel* ${D}/usr/${CONF_LIBDIR}
+	mv *.a ${D}/usr/${CONF_LIBDIR}
 	# bug #4411
 	gen_usr_ldscript libncurses.so || die "gen_usr_ldscript failed"
 
@@ -107,7 +115,7 @@ src_install() {
 	done
 
 	# Build fails to create this ...
-	dosym ../share/terminfo /usr/lib/terminfo
+	dosym ../share/terminfo /usr/${CONF_LIBDIR}/terminfo
 
 	dodir /etc/env.d
 	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > ${D}/etc/env.d/50ncurses
@@ -136,7 +144,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/lib:${D}/lib \
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/${CONF_LIBDIR}:${D}/${CONF_LIBDIR} \
 			TERMINFO=${D}/usr/share/terminfo \
 			${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti
 
@@ -165,4 +173,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]
+	fi
 }