From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 590BC139172 for ; Tue, 25 Oct 2016 13:45:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFD85E08A1; Tue, 25 Oct 2016 13:45:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C6F3AE08A1 for ; Tue, 25 Oct 2016 13:45:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B2B234155D for ; Tue, 25 Oct 2016 13:45:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 355F2308 for ; Tue, 25 Oct 2016 13:45:01 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1477403089.a8a22ce242f1d1c389de6208b070c10d986cfa56.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/Ice/Ice-3.6.3.ebuild X-VCS-Directories: dev-libs/Ice/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a8a22ce242f1d1c389de6208b070c10d986cfa56 X-VCS-Branch: master Date: Tue, 25 Oct 2016 13:45:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e15b256c-b521-4d6b-a33c-fb6e457b1c7d X-Archives-Hash: b6f60ae7afcc4ebc052c267c595d4e1b commit: a8a22ce242f1d1c389de6208b070c10d986cfa56 Author: Lars Wendler gentoo org> AuthorDate: Tue Oct 25 13:09:15 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Oct 25 13:44:49 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8a22ce2 dev-libs/Ice: Better sys-libs/db support. Package-Manager: portage-2.3.2 Signed-off-by: Lars Wendler gentoo.org> dev-libs/Ice/Ice-3.6.3.ebuild | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dev-libs/Ice/Ice-3.6.3.ebuild b/dev-libs/Ice/Ice-3.6.3.ebuild index 4cd1ef9..b9b237d 100644 --- a/dev-libs/Ice/Ice-3.6.3.ebuild +++ b/dev-libs/Ice/Ice-3.6.3.ebuild @@ -17,6 +17,10 @@ PHP_EXT_OPTIONAL_USE=php USE_PHP="php7-0" +# This variable does not belong to any eclass. It is solely used in this ebuild +# db:6.2 breaks the build process +BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 ) + inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator DESCRIPTION="ICE middleware C++ library and generator tools" @@ -33,8 +37,7 @@ RDEPEND=">=dev-libs/expat-2.0.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) || ( - sys-libs/db:5.3[cxx] - sys-libs/db:5.1[cxx] + $(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done) ) dev-cpp/libmcpp python? ( ${PYTHON_DEPS} ) @@ -131,8 +134,8 @@ src_prepare() { src_configure() { suitable_db_version() { - local ver tested_slots=(5.3 5.1) - for ver in "${tested_slots[@]}"; do + local ver + for ver in "${BERKDB_SLOTS[@]}"; do if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then echo "${ver}" return 0