From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1279680-garchives=archives.gentoo.org@lists.gentoo.org>
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 1C35E1382C5
for <garchives@archives.gentoo.org>; Sat, 8 May 2021 15:49:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 54CFAE077C;
Sat, 8 May 2021 15:49:23 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 E8A33E077C
for <gentoo-commits@lists.gentoo.org>; Sat, 8 May 2021 15:49:22 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 CEB44340B23
for <gentoo-commits@lists.gentoo.org>; Sat, 8 May 2021 15:49:21 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 10F5C4D2
for <gentoo-commits@lists.gentoo.org>; Sat, 8 May 2021 15:49:20 +0000 (UTC)
From: "Keri Harris" <keri@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Keri Harris" <keri@gentoo.org>
Message-ID: <1620488933.06eb7f8905cd46c682db68df34436d2052693bfc.keri@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/swi-prolog/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/swi-prolog/swi-prolog-8.2.3.ebuild dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild
X-VCS-Directories: dev-lang/swi-prolog/
X-VCS-Committer: keri
X-VCS-Committer-Name: Keri Harris
X-VCS-Revision: 06eb7f8905cd46c682db68df34436d2052693bfc
X-VCS-Branch: master
Date: Sat, 8 May 2021 15:49:20 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 8bf45885-7f03-414a-8c5c-15ed01e45f95
X-Archives-Hash: c6df7820572ac688fffd2d185d335085
commit: 06eb7f8905cd46c682db68df34436d2052693bfc
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat May 8 15:48:53 2021 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat May 8 15:48:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06eb7f89
dev-lang/swi-prolog: switch to cmake.eclass. Bug 780366.
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Keri Harris <keri <AT> gentoo.org>
dev-lang/swi-prolog/swi-prolog-8.2.3.ebuild | 14 ++++++--------
dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild | 14 ++++++--------
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.3.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.3.ebuild
index fd14de31d5c..f5cb5489517 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.2.3.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.2.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake-utils flag-o-matic multilib
+inherit cmake flag-o-matic multilib
PATCHSET_VER="0"
@@ -27,9 +27,7 @@ RDEPEND="sys-libs/ncurses:=
readline? ( sys-libs/readline:= )
libedit? ( dev-libs/libedit )
gmp? ( dev-libs/gmp:0 )
- ssl? (
- dev-libs/openssl:0
- )
+ ssl? ( dev-libs/openssl:0 )
java? ( >=virtual/jdk-1.8:* )
uuid? ( dev-libs/ossp-uuid )
qt5? (
@@ -64,7 +62,7 @@ src_prepare() {
sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die
sed -i -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" CMakeLists.txt || die
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -88,17 +86,17 @@ src_configure() {
-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
XDG_CONFIG_DIRS="${HOME}" \
XDG_DATA_DIRS="${HOME}" \
- cmake-utils_src_compile
+ cmake_src_compile
}
src_test() {
USE_PUBLIC_NETWORK_TESTS=false \
USE_ODBC_TESTS=false \
- cmake-utils_src_test -V
+ cmake_src_test -V
}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild
index 2ea9f0c72e9..81dffeb547e 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake-utils flag-o-matic multilib
+inherit cmake flag-o-matic multilib
PATCHSET_VER="0"
@@ -26,9 +26,7 @@ RDEPEND="sys-libs/ncurses:=
readline? ( sys-libs/readline:= )
libedit? ( dev-libs/libedit )
gmp? ( dev-libs/gmp:0 )
- ssl? (
- dev-libs/openssl:0
- )
+ ssl? ( dev-libs/openssl:0 )
java? ( >=virtual/jdk-1.8:* )
uuid? ( dev-libs/ossp-uuid )
qt5? (
@@ -63,7 +61,7 @@ src_prepare() {
sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die
sed -i -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" CMakeLists.txt || die
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -87,17 +85,17 @@ src_configure() {
-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
XDG_CONFIG_DIRS="${HOME}" \
XDG_DATA_DIRS="${HOME}" \
- cmake-utils_src_compile
+ cmake_src_compile
}
src_test() {
USE_PUBLIC_NETWORK_TESTS=false \
USE_ODBC_TESTS=false \
- cmake-utils_src_test -V
+ cmake_src_test -V
}