| 1 |
arfrever 09/03/22 18:32:16 |
| 2 |
|
| 3 |
Modified: ChangeLog subversion-1.6.0.ebuild |
| 4 |
Log: |
| 5 |
Don't print messages related to Berkeley DB when USE="-berkdb". |
| 6 |
(Portage version: 13142-svn/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.354 dev-util/subversion/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.354&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.354&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?r1=1.353&r2=1.354 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v |
| 18 |
retrieving revision 1.353 |
| 19 |
retrieving revision 1.354 |
| 20 |
diff -u -r1.353 -r1.354 |
| 21 |
--- ChangeLog 22 Mar 2009 14:40:03 -0000 1.353 |
| 22 |
+++ ChangeLog 22 Mar 2009 18:32:16 -0000 1.354 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-util/subversion |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.353 2009/03/22 14:40:03 arfrever Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.354 2009/03/22 18:32:16 arfrever Exp $ |
| 28 |
+ |
| 29 |
+ 22 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 30 |
+ subversion-1.6.0.ebuild: |
| 31 |
+ Don't print messages related to Berkeley DB when USE="-berkdb". |
| 32 |
|
| 33 |
22 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 34 |
subversion-1.6.0.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 dev-util/subversion/subversion-1.6.0.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: subversion-1.6.0.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- subversion-1.6.0.ebuild 22 Mar 2009 14:40:03 -0000 1.2 |
| 51 |
+++ subversion-1.6.0.ebuild 22 Mar 2009 18:32:16 -0000 1.3 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2009 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.2 2009/03/22 14:40:03 arfrever Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.3 2009/03/22 18:32:16 arfrever Exp $ |
| 57 |
|
| 58 |
EAPI="1" |
| 59 |
|
| 60 |
@@ -119,20 +119,22 @@ |
| 61 |
myconf="${myconf} --without-swig" |
| 62 |
fi |
| 63 |
|
| 64 |
- einfo |
| 65 |
- if [[ -z "${SVN_BDB_VERSION}" ]]; then |
| 66 |
- SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" |
| 67 |
- einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." |
| 68 |
- fi |
| 69 |
- einfo "Using Berkeley DB ${SVN_BDB_VERSION}" |
| 70 |
- einfo |
| 71 |
+ if use berkdb; then |
| 72 |
+ einfo |
| 73 |
+ if [[ -z "${SVN_BDB_VERSION}" ]]; then |
| 74 |
+ SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" |
| 75 |
+ einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." |
| 76 |
+ fi |
| 77 |
+ einfo "Using Berkeley DB ${SVN_BDB_VERSION}" |
| 78 |
+ einfo |
| 79 |
|
| 80 |
- local apu_bdb_version="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" |
| 81 |
- if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then |
| 82 |
- eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" |
| 83 |
- eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." |
| 84 |
- eerror "Aborting to avoid possible run-time crashes." |
| 85 |
- die "Berkeley DB version mismatch" |
| 86 |
+ local apu_bdb_version="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" |
| 87 |
+ if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then |
| 88 |
+ eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" |
| 89 |
+ eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." |
| 90 |
+ eerror "Aborting to avoid possible run-time crashes." |
| 91 |
+ die "Berkeley DB version mismatch" |
| 92 |
+ fi |
| 93 |
fi |
| 94 |
|
| 95 |
econf --libdir="/usr/$(get_libdir)" \ |
Archives