--- python-2.3.5.ebuild.orig	2005-03-11 14:43:54.000000000 +0000
+++ python-2.3.5.ebuild	2005-03-11 14:56:34.000000000 +0000
@@ -56,7 +56,7 @@
 	epatch ${FILESDIR}/${PN}-2.3-mimetypes_apache.patch
 	epatch ${FILESDIR}/${PN}-2.3-db4.2.patch
 	# installs to lib64
-	[ "${CONF_LIBDIR}" == "lib64" ] && epatch ${FILESDIR}/python-2.3.4-lib64.patch
+	[ "$(get_libdir)" == "lib64" ] && epatch ${FILESDIR}/python-2.3.4-lib64.patch
 	# fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
 	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure
 }
@@ -164,21 +164,13 @@
 
 	# seems like the build do not install Makefile.pre.in anymore
 	# it probably shouldn't - use DistUtils, people!
-	if [ "${CONF_LIBDIR}" == "lib64" ] ;then
-		insinto /usr/lib64/python${PYVER}/config
-	else
-		insinto /usr/lib/python${PYVER}/config
-	fi
+	insinto /usr/$(get_libdir)/python${PYVER}/config
 	doins ${S}/Makefile.pre.in
 
 	# While we're working on the config stuff... Let's fix the OPT var
 	# so that it doesn't have any opts listed in it. Prevents the problem
 	# with compiling things with conflicting opts later.
-	if [ "${CONF_LIBDIR}" == "lib64" ] ;then
-		dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib64/python${PYVER}/config/Makefile
-	else
-		dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib/python${PYVER}/config/Makefile
-	fi
+	dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/$(get_libdir)/python${PYVER}/config/Makefile
 
 	# install python-updater in /usr/sbin
 	dosbin ${FILESDIR}/python-updater
@@ -194,8 +186,7 @@
 
 pkg_postrm() {
 	python_makesym
-	python_mod_cleanup /usr/lib/python2.3
-	[ "${CONF_LIBDIR}" == "lib64" ] && python_mod_cleanup /usr/lib64/python2.3
+	python_mod_cleanup /usr/$(get_libdir)/python2.3
 }
 
 pkg_postinst() {
@@ -205,9 +196,7 @@
 
 	python_makesym
 	python_mod_optimize
-	python_mod_optimize -x site-packages -x test ${myroot}/usr/lib/python${PYVER}
-	[ "${CONF_LIBDIR}" == "lib64" ] && \
-		python_mod_optimize -x site-packages -x test ${myroot}/usr/lib64/python${PYVER}
+	python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then