[gentoo-commits] repo/gentoo:master commit in: sys-libs/tapi/

[gentoo-commits] repo/gentoo:master commit in: sys-libs/tapi/

[Fabian Groffen]

commit:     353da60003022823a64948adc2662bf75e91679a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 20:30:29 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 20:30:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=353da600

sys-libs/tapi: simplify by using S

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sys-libs/tapi/tapi-2.0.0.ebuild | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/sys-libs/tapi/tapi-2.0.0.ebuild b/sys-libs/tapi/tapi-2.0.0.ebuild
index 586bd1d95c2..a789277cf7a 100644
--- a/sys-libs/tapi/tapi-2.0.0.ebuild
+++ b/sys-libs/tapi/tapi-2.0.0.ebuild
@@ -61,10 +61,7 @@ CLANG_S="${WORKDIR}"/${CLANG_P}.src
 
 APPLE_LLVM_S="${WORKDIR}/${APPLE_LLVM_P}"/src
 
-TAPI_S="${WORKDIR}"/${TAPI_P}
-
-# to avoid ebuild dying
-S=${WORKDIR}
+S="${WORKDIR}"/${TAPI_P}
 
 TAPI_BUILD="${WORKDIR}"/${P}_build
 
@@ -88,7 +85,7 @@ src_prepare() {
 	CMAKE_USE_DIR="${PWD}" \
 		cmake-utils_src_prepare
 
-	cd "${TAPI_S}" || die
+	cd "${S}" || die
 	eapply "${FILESDIR}"/${PN}-2.0.0-standalone.patch
 	CMAKE_USE_DIR="${PWD}" \
 		cmake-utils_src_prepare
@@ -147,7 +144,7 @@ src_configure() {
 		-DOBJCMETADATA_LIBRARY_DIRS="${OBJCMD_ROOT}"/lib
 	)
 
-	cd "${TAPI_S}" || die
+	cd "${S}" || die
 	BUILD_DIR="${TAPI_BUILD}/" \
 		CMAKE_USE_DIR="${PWD}" \
 		cmake-utils_src_configure
@@ -170,7 +167,7 @@ src_compile() {
 		${CMAKE_MAKEFILE_GENERATOR} install
 
 	# finally build tapi
-	cd "${TAPI_S}" || die
+	cd "${S}" || die
 	BUILD_DIR="${TAPI_BUILD}" \
 		CMAKE_USE_DIR="${PWD}" \
 		cmake-utils_src_compile

[gentoo-commits] repo/gentoo:master commit in: sys-libs/tapi/

[Fabian Groffen]

commit:     c0a3702a2ec1541b35347c8ee1ff0437f714d4dd
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 15:35:05 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 15:35:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0a3702a

sys-libs/tapi: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-libs/tapi/tapi-1.30.ebuild  | 4 ++--
 sys-libs/tapi/tapi-2.0.0.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-libs/tapi/tapi-1.30.ebuild b/sys-libs/tapi/tapi-1.30.ebuild
index c3f24900a40..1b087540133 100644
--- a/sys-libs/tapi/tapi-1.30.ebuild
+++ b/sys-libs/tapi/tapi-1.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~x64-macos ~x86-macos"
+KEYWORDS="~x64-macos"
 
 DOCS=( Readme.md )
 

diff --git a/sys-libs/tapi/tapi-2.0.0.ebuild b/sys-libs/tapi/tapi-2.0.0.ebuild
index a789277cf7a..1eb844c2cde 100644
--- a/sys-libs/tapi/tapi-2.0.0.ebuild
+++ b/sys-libs/tapi/tapi-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,7 +46,7 @@ fi
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~x64-macos ~x86-macos"
+KEYWORDS="~x64-macos"
 
 DEPEND="sys-devel/llvm:=
 	sys-devel/clang:="