arfrever    09/03/22 18:32:16

  Modified:             ChangeLog subversion-1.6.0.ebuild
  Log:
  Don't print messages related to Berkeley DB when USE="-berkdb".
  (Portage version: 13142-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.354                dev-util/subversion/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.354&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.354&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?r1=1.353&r2=1.354

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- ChangeLog	22 Mar 2009 14:40:03 -0000	1.353
+++ ChangeLog	22 Mar 2009 18:32:16 -0000	1.354
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/subversion
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.353 2009/03/22 14:40:03 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.354 2009/03/22 18:32:16 arfrever Exp $
+
+  22 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  subversion-1.6.0.ebuild:
+  Don't print messages related to Berkeley DB when USE="-berkdb".
 
   22 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
   subversion-1.6.0.ebuild:



1.3                  dev-util/subversion/subversion-1.6.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?r1=1.2&r2=1.3

Index: subversion-1.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- subversion-1.6.0.ebuild	22 Mar 2009 14:40:03 -0000	1.2
+++ subversion-1.6.0.ebuild	22 Mar 2009 18:32:16 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.2 2009/03/22 14:40:03 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.3 2009/03/22 18:32:16 arfrever Exp $
 
 EAPI="1"
 
@@ -119,20 +119,22 @@
 		myconf="${myconf} --without-swig"
 	fi
 
-	einfo
-	if [[ -z "${SVN_BDB_VERSION}" ]]; then
-		SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
-		einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
-	fi
-	einfo "Using Berkeley DB ${SVN_BDB_VERSION}"
-	einfo
+	if use berkdb; then
+		einfo
+		if [[ -z "${SVN_BDB_VERSION}" ]]; then
+			SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
+			einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
+		fi
+		einfo "Using Berkeley DB ${SVN_BDB_VERSION}"
+		einfo
 
-	local apu_bdb_version="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-	if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
-		eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
-		eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
-		eerror "Aborting to avoid possible run-time crashes."
-		die "Berkeley DB version mismatch"
+		local apu_bdb_version="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
+			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
+			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
+			eerror "Aborting to avoid possible run-time crashes."
+			die "Berkeley DB version mismatch"
+		fi
 	fi
 
 	econf --libdir="/usr/$(get_libdir)" \