diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-03-22 18:32:16 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-03-22 18:32:16 +0000 |
| commit | 30042ae9ba0c92d6225874d5b6cee9b17b236053 (patch) | |
| tree | f6786455f71c478eb08bbea37751a7293f2658ee /dev-util | |
| parent | Stable on alpha, bug #252430 (diff) | |
| download | historical-30042ae9ba0c92d6225874d5b6cee9b17b236053.tar.gz historical-30042ae9ba0c92d6225874d5b6cee9b17b236053.tar.bz2 historical-30042ae9ba0c92d6225874d5b6cee9b17b236053.zip | |
Don't print messages related to Berkeley DB when USE="-berkdb".
Package-Manager: portage-13142-svn/cvs/Linux x86_64
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/subversion/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/subversion/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/subversion/subversion-1.6.0.ebuild | 30 |
3 files changed, 23 insertions, 17 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index e937ce9095f6..4ceed46b5e2e 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -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@gentoo.org> + subversion-1.6.0.ebuild: + Don't print messages related to Berkeley DB when USE="-berkdb". 22 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> subversion-1.6.0.ebuild: diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index 4942d6e83580..409554d55f8b 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -26,6 +26,6 @@ EBUILD subversion-1.4.6.ebuild 13825 RMD160 de7a9ddc2f1444c16d5a1916c322e1d9464b EBUILD subversion-1.5.4.ebuild 13393 RMD160 476861d4d198a3f48c5e3e463719973275e08c59 SHA1 a1f4bf2f95e2fa4353a35ae58a398e8434d3f538 SHA256 8266ab65ccc52aeced0ad9f0162631c88aa0a1de6b5f7a55e272477305cd522d EBUILD subversion-1.5.5.ebuild 13389 RMD160 7919e6076dc2340f69a53b263eef90b752d5ad75 SHA1 c1daa6c240f93b5e4865a09568645e026df2233d SHA256 1d4b0e1cd10f7e61bcee2aa4fefbb62ee7d1ec972f951d2fc0af6b3f976ac072 EBUILD subversion-1.5.6.ebuild 13438 RMD160 3f98459072fcc1f33f7985d89fdcbaf6693a7052 SHA1 2677e4f37ca85b5af7ced1afdcbbfffd1739bbd0 SHA256 ef8056b50424466ca646586658d541a6422961384fc7dc0570cba89336d27962 -EBUILD subversion-1.6.0.ebuild 17437 RMD160 04b5b699235c67ff01252ca9edd982b9a7a2b376 SHA1 f16264dde0ed646020297a73179b3afc2bacc636 SHA256 615b3227ae779086294a6cee1ce1f8500d5d2202cc5f247ab1b97a034177729a -MISC ChangeLog 59149 RMD160 11e75b997c4f8d69cbcc083257f11daab374f55a SHA1 d7fec9e1423586b43ddb3194595ce9951d1e6cc7 SHA256 0d18e941b47d5ee52cc4ad3ab87e41eaa4905e675a2613a986b36e36f5c40715 +EBUILD subversion-1.6.0.ebuild 17476 RMD160 1beef5cdfa3d9b95d171219923def5393b83a564 SHA1 f481426b72a4c5369a4503e47f15109e7b120c0c SHA256 2f0a763c8e7ed0437d91d7df4e35dd69c4441f2298ac4bbbaeeb69c55a302db3 +MISC ChangeLog 59316 RMD160 73bb89d6fbaff66cfff8e1a26678e1b99b6085d6 SHA1 dd0f2aca13b1030b7e52b29b1acd09addbd3cc7f SHA256 1058dd2933fcdee250591ddfac6fed12f8757827af7682c0089c396c8f6904f7 MISC metadata.xml 1067 RMD160 74b69ae2e7b643131a29bf7ffcf6c783167f1511 SHA1 181bd9996c1d9d91f5ee3a99e3ecebbf1ce7cdd5 SHA256 e1aadbab30df2b99f0f7ec407a3c59ae33e62354aad4b71973f76250e83f7359 diff --git a/dev-util/subversion/subversion-1.6.0.ebuild b/dev-util/subversion/subversion-1.6.0.ebuild index 6a978321a93c..0bb318666426 100644 --- a/dev-util/subversion/subversion-1.6.0.ebuild +++ b/dev-util/subversion/subversion-1.6.0.ebuild @@ -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 @@ src_compile() { 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)" \ |