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 2934E138334 for ; Sun, 1 Jul 2018 00:04:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C201E084E; Sun, 1 Jul 2018 00:04:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADD71E084E for ; Sun, 1 Jul 2018 00:03:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 46861335C89 for ; Sun, 1 Jul 2018 00:03:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31686348 for ; Sun, 1 Jul 2018 00:03:54 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1530403415.8964f5a3b1b70c9dcb403c5296fd63a2c04f315a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/soci/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/soci/soci-3.2.3.ebuild X-VCS-Directories: dev-db/soci/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8964f5a3b1b70c9dcb403c5296fd63a2c04f315a X-VCS-Branch: master Date: Sun, 1 Jul 2018 00:03:54 +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: 14e66370-fe4f-4dde-8290-a5d5db87e3e3 X-Archives-Hash: 990311d29011d0314644fdbccacc4e08 commit: 8964f5a3b1b70c9dcb403c5296fd63a2c04f315a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 30 21:30:46 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 1 00:03:35 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8964f5a3 dev-db/soci: EAPI-6 bump Package-Manager: Portage-2.3.41, Repoman-2.3.9 dev-db/soci/soci-3.2.3.ebuild | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/dev-db/soci/soci-3.2.3.ebuild b/dev-db/soci/soci-3.2.3.ebuild index 390012ef0f7..ba430f65be3 100644 --- a/dev-db/soci/soci-3.2.3.ebuild +++ b/dev-db/soci/soci-3.2.3.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 inherit cmake-utils -KEYWORDS="~amd64 ~x86" - DESCRIPTION="Makes the illusion of embedding SQL queries in the regular C++ code" HOMEPAGE="http://soci.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.zip" + LICENSE="Boost-1.0" SLOT="0" +KEYWORDS="~amd64 ~x86" IUSE="boost doc +empty firebird mysql odbc oracle postgres sqlite" -DEPEND="boost? ( dev-libs/boost ) +DEPEND=" + boost? ( dev-libs/boost ) firebird? ( dev-db/firebird ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) @@ -22,25 +23,25 @@ DEPEND="boost? ( dev-libs/boost ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) " -RDEPEND=${DEPEND} +RDEPEND="${DEPEND}" src_configure() { - local mycmakeargs="$(cmake-utils_use_with boost ) - $(cmake-utils_use empty SOCI_EMPTY) - $(cmake-utils_use_with firebird FIREBIRD) - $(cmake-utils_use_with mysql MYSQL) - $(cmake-utils_use_with odbc ODBC) - $(cmake-utils_use_with oracle ORACLE) - $(cmake-utils_use_with postgres POSTGRESQL) - $(cmake-utils_use_with sqlite SQLITE3) - -DWITH_DB2=OFF" #use MYCMAKEARGS if you want enable IBM DB2 support + local mycmakeargs=( + -DWITH_BOOST=$(usex boost) + -DSOCI_EMPTY=$(usex empty) + -DWITH_FIREBIRD=$(usex firebird) + -DWITH_MYSQL=$(usex mysql) + -DWITH_ODBC=$(usex odbc) + -DWITH_ORACLE=$(usex oracle) + -DWITH_POSTGRESQL=$(usex postgres) + -DWITH_SQLITE3=$(usex sqlite) + -DWITH_DB2=OFF + ) + #use MYCMAKEARGS if you want enable IBM DB2 support cmake-utils_src_configure } src_install() { + use doc && local HTML_DOCS=( doc/. ) cmake-utils_src_install - dodoc AUTHORS CHANGES - if use doc; then - dohtml -r doc/* - fi }