[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@g.o
@@ -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
 }