[gentoo-commits] gentoo-x86 commit in eclass: db.eclass

[gentoo-commits] gentoo-x86 commit in eclass: db.eclass

[Paul de Vrieze (pauldv)]

pauldv      09/07/29 20:25:26

  Modified:             db.eclass
  Log:
  Remove silly, and wrong, test for test in FEATURES

Revision  Changes    Path
1.31                 eclass/db.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?r1=1.30&r2=1.31

Index: db.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- db.eclass	15 Aug 2006 19:43:17 -0000	1.30
+++ db.eclass	29 Jul 2009 20:25:25 -0000	1.31
@@ -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.30 2006/08/15 19:43:17 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.31 2009/07/29 20:25:25 pauldv Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@gentoo.org
@@ -116,17 +116,15 @@
 }
 
 db_src_test() {
-	if has test $FEATURES; then
-		if useq tcl; then
-			einfo "Running sys-libs/db testsuite"
-			ewarn "This can take 6+ hours on modern machines"
-			cd ${S}
-			echo 'source ../test/test.tcl' >testrunner.tcl
-			echo 'run_std' >>testrunner.tcl
-			tclsh testrunner.tcl
-			egrep -qs '^FAIL' ALL.OUT && die "Some tests failed, please see ${S}/ALL.OUT"
-		else
-			eerror "You must have USE=tcl to run the sys-libs/db testsuite."
-		fi
+	if useq tcl; then
+		einfo "Running sys-libs/db testsuite"
+		ewarn "This can take 6+ hours on modern machines"
+		cd ${S}
+		echo 'source ../test/test.tcl' >testrunner.tcl
+		echo 'run_std' >>testrunner.tcl
+		tclsh testrunner.tcl
+		egrep -qs '^FAIL' ALL.OUT && die "Some tests failed, please see ${S}/ALL.OUT"
+	else
+		eerror "You must have USE=tcl to run the sys-libs/db testsuite."
 	fi
 }

[gentoo-commits] gentoo-x86 commit in eclass: db.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/05/03 22:03:38

  Modified:             db.eclass
  Log:
  Bug #263797: Do not run the sys-libs/db testsuite as root.

Revision  Changes    Path
1.32                 eclass/db.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?r1=1.31&r2=1.32

Index: db.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -p -w -b -B -u -u -r1.31 -r1.32
--- db.eclass	29 Jul 2009 20:25:25 -0000	1.31
+++ db.eclass	3 May 2010 22:03:38 -0000	1.32
@@ -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.31 2009/07/29 20:25:25 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.32 2010/05/03 22:03:38 robbat2 Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@gentoo.org
@@ -116,6 +116,11 @@ db_src_install_usrlibcleanup() {
 }
 
 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"
+		return 0
+	fi
 	if useq tcl; then
 		einfo "Running sys-libs/db testsuite"
 		ewarn "This can take 6+ hours on modern machines"

[gentoo-commits] gentoo-x86 commit in eclass: db.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/05/03 22:13:39

  Modified:             db.eclass
  Log:
  Bug #253312: implement parallel tests for sys-libs/db.

Revision  Changes    Path
1.33                 eclass/db.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?r1=1.32&r2=1.33

Index: db.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -p -w -b -B -u -u -r1.32 -r1.33
--- db.eclass	3 May 2010 22:03:38 -0000	1.32
+++ db.eclass	3 May 2010 22:13:39 -0000	1.33
@@ -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.32 2010/05/03 22:03:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.33 2010/05/03 22:13:39 robbat2 Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@gentoo.org
@@ -124,11 +124,23 @@ db_src_test() {
 	if useq tcl; then
 		einfo "Running sys-libs/db testsuite"
 		ewarn "This can take 6+ hours on modern machines"
-		cd ${S}
+		# Fix stuff that fails with relative paths
+		sed -ri \
+			-e '/regsub {test_path }/s,regsub,#regsub,g' \
+			-e '/regsub {src_root }/s,regsub,#regsub,g' \
+			"${S}"/test/parallel.tcl
+		cd "${S}"
 		echo 'source ../test/test.tcl' >testrunner.tcl
+		testJobs=`echo "${MAKEOPTS}" | \
+				sed -e "s/.*-j\([0-9]\+\).*/\1/"`
+		if [[ ${testJobs} =~ [[:digit:]]+ ]]; then
+			echo "run_parallel ${testJobs} run_std" >> testrunner.tcl
+		else 
 		echo 'run_std' >>testrunner.tcl
+		fi
+
 		tclsh testrunner.tcl
-		egrep -qs '^FAIL' ALL.OUT && die "Some tests failed, please see ${S}/ALL.OUT"
+		egrep -qs '^FAIL' ALL.OUT* && die "Some tests failed, please see ${S}/ALL.OUT*"
 	else
 		eerror "You must have USE=tcl to run the sys-libs/db testsuite."
 	fi

[gentoo-commits] gentoo-x86 commit in eclass: db.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/05/03 23:14:16

  Modified:             db.eclass
  Log:
  Bug #275652: Install examples with USE=examples.

Revision  Changes    Path
1.34                 eclass/db.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?r1=1.33&r2=1.34

Index: db.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -p -w -b -B -u -u -r1.33 -r1.34
--- db.eclass	3 May 2010 22:13:39 -0000	1.33
+++ db.eclass	3 May 2010 23:14:16 -0000	1.34
@@ -1,11 +1,11 @@
 # 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.33 2010/05/03 22:13:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.34 2010/05/03 23:14:16 robbat2 Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@gentoo.org
 
-IUSE="doc test"
+IUSE="doc test examples"
 
 EXPORT_FUNCTIONS src_test
 
@@ -72,6 +72,20 @@ db_src_install_doc() {
 	else
 		rm -rf ${D}/usr/docs
 	fi
+
+	db_src_install_examples
+}
+
+db_src_install_examples() {
+	if use examples ; then
+		local langs="c cxx stl"
+		use java && langs="${langs} java"
+		for i in $langs ; do
+			destdir="/usr/share/doc/${PF}/"
+			dodir "${destdir}"
+			cp -ra "${S}/../examples_${i}/" "${D}${destdir}/"
+		done
+	fi
 }
 
 db_src_install_usrbinslot() {

[gentoo-commits] gentoo-x86 commit in eclass: db.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/05/04 02:06:16

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

Revision  Changes    Path
1.35                 eclass/db.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?r1=1.34&r2=1.35

Index: db.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -p -w -b -B -u -u -r1.34 -r1.35
--- db.eclass	3 May 2010 23:14:16 -0000	1.34
+++ db.eclass	4 May 2010 02:06:16 -0000	1.35
@@ -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
@@ -16,16 +16,16 @@ RDEPEND=""
 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"

[gentoo-commits] gentoo-x86 commit in eclass: db.eclass

[Torsten Veller (tove)]

tove        10/05/04 08:03:41

  Modified:             db.eclass
  Log:
  Fix db_src_install_usrbinslot to proper SLOT again (#318367) and add a die

Revision  Changes    Path
1.36                 eclass/db.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/db.eclass?r1=1.35&r2=1.36

Index: db.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- db.eclass	4 May 2010 02:06:16 -0000	1.35
+++ db.eclass	4 May 2010 08:03:40 -0000	1.36
@@ -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.35 2010/05/04 02:06:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.36 2010/05/04 08:03:40 tove Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@gentoo.org
@@ -92,7 +92,8 @@
 	# slot all program names to avoid overwriting
 	for fname in "${D}"/usr/bin/db_*
 	do
-		mv "${fname}" "${fname//\/db_/\/db${SLOT}_}"
+		mv "${fname}" "${fname//\/db_//db${SLOT}_}" || \
+			die "Failed to rename ${fname}"
 	done
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: db.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/05/11 07:58:43

  Modified:             db.eclass
  Log:
  Improve binary renaming to NOT rename all elements in the path, and also pick up binaries that match the prefix of 'db' but not 'db_'.

Revision  Changes    Path
1.37                 eclass/db.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?r1=1.36&r2=1.37

Index: db.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -p -w -b -B -u -u -r1.36 -r1.37
--- db.eclass	4 May 2010 08:03:40 -0000	1.36
+++ db.eclass	11 May 2010 07:58:43 -0000	1.37
@@ -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.36 2010/05/04 08:03:40 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.37 2010/05/11 07:58:43 robbat2 Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@gentoo.org
@@ -90,10 +90,13 @@ 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}_}" || \
-			die "Failed to rename ${fname}"
+		dn="$(dirname "${fname}")"
+		bn="$(basename "${fname}")"
+		bn="${bn/db/db${SLOT}}"
+		mv "${fname}" "${dn}/${bn}" || \
+			die "Failed to rename ${fname} to ${dn}/${bn}"
 	done
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: db.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/05/11 08:00:20

  Modified:             db.eclass
  Log:
  sys-libs/db-5 has changed some of the test scripts slightly, so we need to look a little wider for parallel.tcl. Also improve the regex we run on it for relative directories.

Revision  Changes    Path
1.38                 eclass/db.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?r1=1.37&r2=1.38

Index: db.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -p -w -b -B -u -u -r1.37 -r1.38
--- db.eclass	11 May 2010 07:58:43 -0000	1.37
+++ db.eclass	11 May 2010 08:00:20 -0000	1.38
@@ -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.37 2010/05/11 07:58:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.38 2010/05/11 08:00:20 robbat2 Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@gentoo.org
@@ -147,10 +147,17 @@ db_src_test() {
 		einfo "Running sys-libs/db testsuite"
 		ewarn "This can take 6+ hours on modern machines"
 		# Fix stuff that fails with relative paths
+		local test_parallel=''
+		for t in \
+			"${S}"/test/parallel.tcl \
+			"${S}"/../test/parallel.tcl ; do
+			[[ -f "${t}" ]] && test_parallel="${t}" && break
+		done
+
 		sed -ri \
-			-e '/regsub {test_path }/s,regsub,#regsub,g' \
-			-e '/regsub {src_root }/s,regsub,#regsub,g' \
-			"${S}"/test/parallel.tcl
+			-e '/regsub .test_path ./s,(regsub),#\1,g' \
+			-e '/regsub .src_root ./s,(regsub),#\1,g' \
+			"${test_parallel}"
 		cd "${S}"
 		echo 'source ../test/test.tcl' > testrunner.tcl
 		testJobs=`echo "${MAKEOPTS}" | \

[gentoo-commits] gentoo-x86 commit in eclass: db.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/05/11 08:19:44

  Modified:             db.eclass
  Log:
  Bug #318389: check for each examples directory before trying to use it. Also avoid QA warning on "use java" on ebuilds where java was not available.

Revision  Changes    Path
1.39                 eclass/db.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?r1=1.38&r2=1.39

Index: db.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -p -w -b -B -u -u -r1.38 -r1.39
--- db.eclass	11 May 2010 08:00:20 -0000	1.38
+++ db.eclass	11 May 2010 08:19:44 -0000	1.39
@@ -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.38 2010/05/11 08:00:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.39 2010/05/11 08:19:44 robbat2 Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@gentoo.org
@@ -79,11 +79,16 @@ db_src_install_doc() {
 db_src_install_examples() {
 	if use examples ; then
 		local langs="c cxx stl"
-		use java && langs="${langs} java"
+		[[ "${IUSE/java}" != "${IUSE}" ]] \
+			&& use java \
+			&& langs="${langs} java"
 		for i in $langs ; do
 			destdir="/usr/share/doc/${PF}/"
+			src="${S}/../examples_${i}/"
+			if [ -f "${src}" ]; then
 			dodir "${destdir}"
-			cp -ra "${S}/../examples_${i}/" "${D}${destdir}/"
+				cp -ra "${src}" "${D}${destdir}/"
+			fi
 		done
 	fi
 }

[gentoo-commits] gentoo-x86 commit in eclass: db.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/10/18 17:39:02

  Modified:             db.eclass
  Log:
  Bug #341559: avoid conflict on new db-5 libdb_sql* libraries.

Revision  Changes    Path
1.41                 eclass/db.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?r1=1.40&r2=1.41

Index: db.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -p -w -b -B -u -u -r1.40 -r1.41
--- db.eclass	6 Oct 2010 00:13:11 -0000	1.40
+++ db.eclass	18 Oct 2010 17:39:02 -0000	1.41
@@ -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.40 2010/10/06 00:13:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.41 2010/10/18 17:39:02 robbat2 Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@gentoo.org
@@ -25,7 +25,7 @@ db_fix_so() {
 
 	# now rebuild all the correct ones
 	for ext in so a; do
-		for name in libdb libdb_{cxx,tcl,java,stl}; do
+		for name in libdb libdb_{cxx,tcl,java,sql,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,tcl,java,stl}; do
+	for i in libdb libdb_{cxx,tcl,java,sql,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
@@ -137,7 +137,7 @@ db_src_install_usrlibcleanup() {
 
 	rm -f \
 		"${D}"/usr/include/{db,db_185}.h \
-		"${LIB}"/libdb{,_{cxx,stl,java,tcl}}.a
+		"${LIB}"/libdb{,_{cxx,sql,stl,java,tcl}}.a
 }
 
 db_src_test() {

[gentoo-commits] gentoo-x86 commit in eclass: db.eclass

[Robin H. Johnson (robbat2)]

robbat2     12/10/08 19:59:59

  Modified:             db.eclass
  Log:
  Fix typo in src_test runner: makeopts_jobs not makeopts_job.

Revision  Changes    Path
1.47                 eclass/db.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/db.eclass?r1=1.46&r2=1.47

Index: db.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/db.eclass,v
retrieving revision 1.46
retrieving revision 1.47
diff -p -w -b -B -u -u -r1.46 -r1.47
--- db.eclass	2 Jun 2012 19:16:31 -0000	1.46
+++ db.eclass	8 Oct 2012 19:59:59 -0000	1.47
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.46 2012/06/02 19:16:31 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.47 2012/10/08 19:59:59 robbat2 Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 #
 # Bugs: pauldv@gentoo.org
@@ -177,7 +177,7 @@ db_src_test() {
 			[[ -f "${t}" ]] && testbase="${t}" && break
 		done
 		echo "source ${t}" > testrunner.tcl
-		echo "run_parallel $(makeopts_job) run_std" >> testrunner.tcl
+		echo "run_parallel $(makeopts_jobs) run_std" >> testrunner.tcl
 
 		tclsh testrunner.tcl
 		egrep -qs '^FAIL' ALL.OUT* && die "Some tests failed, please see ${S}/ALL.OUT*"