Bug #313637: Fix versioning of libdb_stl.a. Also clean up the eclass for quoting and a slight refactor.

1 files changed, 28 insertions, 24 deletions

diff --git a/eclass/db.eclass b/eclass/db.eclass
index 726777ec072f..8dd54cbcdeb2 100644
--- a/eclass/db.eclass
+++ b/eclass/db.eclass
@@ -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/eclass/db.eclass,v 1.34 2010/05/03 23:14:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.35 2010/05/04 02:06:16 robbat2 Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@gentoo.org
@@ -13,19 +13,19 @@ DEPEND="test? ( >=dev-lang/tcl-8.4 )"
 
 RDEPEND=""
 
-db_fix_so () {
+db_fix_so() {
 	LIB="${ROOT}/usr/$(get_libdir)"
 
-	cd $LIB
+	cd "${LIB}"
 
 	# first clean up old symlinks
-	find ${LIB} -maxdepth 1 -type l -name 'libdb[1._-]*so' -exec rm \{} \;
-	find ${LIB} -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -exec rm \{} \;
-	find ${LIB} -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \;
+	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so' -exec rm \{} \;
+	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -exec rm \{} \;
+	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \;
 
 	# now rebuild all the correct ones
 	for ext in so a; do
-		for name in libdb libdb_cxx libdb_tcl libdb_java; do
+		for name in libdb libdb_{cxx,tcl,java,stl}; do
 			target=`find . -maxdepth 1 -type f -name "${name}-*.${ext}" |sort -n |tail -n 1`
 			[ -n "${target}" ] && ln -sf ${target//.\//} ${name}.${ext}
 		done;
@@ -38,7 +38,7 @@ db_fix_so () {
 		ln -sf libdb1.so.2 libdb-1.so
 	fi
 	# what do we do if we ever get 3.3 ?
-	for i in libdb libdb_cxx libdb_tcl libdb_java; do
+	for i in libdb libdb_{cxx,tcl,java,stl}; do
 		if [ -f $i-3.2.so ]; then
 			ln -sf $i-3.2.so $i-3.so
 			ln -sf $i-3.2.so $i.so.3
@@ -47,7 +47,7 @@ db_fix_so () {
 
 	# do the same for headers now
 	# but since there are only two of them, just overwrite them
-	cd ${ROOT}/usr/include
+	cd "${ROOT}"/usr/include
 	target=`find . -maxdepth 1 -type d -name 'db[0-9]*' | sort -n |cut -d/ -f2- | tail -n1`
 	if [ -n "${target}" ] && [ -e "${target}/db.h" ] && ( ! [[ -e db.h ]] || [[ -h db.h ]] ); then
 		einfo "Creating db.h symlinks to ${target}"
@@ -58,7 +58,7 @@ db_fix_so () {
 			ewarn "Could not find ${target}/db.h"
 		elif [ -h db.h ]; then
 			einfo "Apparently you just removed the last instance of $PN. Removing the symlinks"
-			rm db.h db_185.h
+			rm -f db.h db_185.h
 		fi
 	fi
 }
@@ -67,10 +67,10 @@ db_src_install_doc() {
 	# not everybody wants this wad of documentation as it is primarily API docs
 	if use doc; then
 		dodir /usr/share/doc/${PF}/html
-		mv ${D}/usr/docs/* ${D}/usr/share/doc/${PF}/html/
-		rm -rf ${D}/usr/docs
+		mv "${D}"/usr/docs/* "${D}"/usr/share/doc/${PF}/html/
+		rm -rf "${D}"/usr/docs
 	else
-		rm -rf ${D}/usr/docs
+		rm -rf "${D}"/usr/docs
 	fi
 
 	db_src_install_examples
@@ -90,16 +90,16 @@ db_src_install_examples() {
 
 db_src_install_usrbinslot() {
 	# slot all program names to avoid overwriting
-	for fname in ${D}/usr/bin/db_*
+	for fname in "${D}"/usr/bin/db_*
 	do
-		mv ${fname} ${fname//\/db_/\/db${SLOT}_}
+		mv "${fname}" "${fname//\/db_/\/db${SLOT}_}"
 	done
 }
 
 db_src_install_headerslot() {
 	# install all headers in a slotted location
 	dodir /usr/include/db${SLOT}
-	mv ${D}/usr/include/*.h ${D}/usr/include/db${SLOT}/
+	mv "${D}"/usr/include/*.h "${D}"/usr/include/db${SLOT}/
 }
 
 db_src_install_usrlibcleanup() {
@@ -111,30 +111,34 @@ db_src_install_usrlibcleanup() {
 		die "Calling clean_links while \$D not defined"
 	fi
 
-	if [ -e ${LIB}/libdb.a ] && [ ! -e ${LIB}/libdb-${SLOT}.a ]; then
+	if [ -e "${LIB}"/libdb.a ] && [ ! -e "${LIB}"/libdb-${SLOT}.a ]; then
 		einfo "Moving libdb.a to a versioned name"
 		mv "${LIB}/libdb.a" "${LIB}/libdb-${SLOT}.a"
 	fi
 
-	if [ -e ${LIB}/libdb_cxx.a ] && [ ! -e ${LIB}/libdb_cxx-${SLOT}.a ]; then
+	if [ -e "${LIB}"/libdb_cxx.a ] && [ ! -e "${LIB}"/libdb_cxx-${SLOT}.a ]; then
 		einfo "Moving libdb_cxx.a to a versioned name"
 		mv "${LIB}/libdb_cxx.a" "${LIB}/libdb_cxx-${SLOT}.a"
 	fi
 
-	find ${LIB} -maxdepth 1 -type l -name 'libdb[1._-]*so' -exec rm \{} \;
-	find ${LIB} -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -exec rm \{} \;
+	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so' -exec rm \{} \;
+	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -exec rm \{} \;
 	einfo "removing unversioned static archives"
-	find ${LIB} -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \;
+	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \;
 
-	rm -f ${D}/usr/include/db.h ${D}/usr/include/db_185.h ${LIB}/libdb.a ${LIB}/libdb_cxx.a
+	rm -f \
+		"${D}"/usr/include/{db,db_185}.h \
+		"${LIB}"/libdb{,_{cxx,stl,java,tcl}}.a
 }
 
 db_src_test() {
 	if [[ $UID -eq 0 ]]; then
-		ewarn "You must run the testsuite as non-root, skipping"
-		elog "You must run the testsuite as non-root, skipping"
+		M="You must run the testsuite as non-root, skipping"
+		ewarn "${M}"
+		elog "${M}"
 		return 0
 	fi
+
 	if useq tcl; then
 		einfo "Running sys-libs/db testsuite"
 		ewarn "This can take 6+ hours on modern machines"