From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1266298-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 CCA131382C5
	for <garchives@archives.gentoo.org>; Thu,  1 Apr 2021 00:43:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id B3617E09D7;
	Thu,  1 Apr 2021 00:43:54 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 88164E09D4
	for <gentoo-commits@lists.gentoo.org>; Thu,  1 Apr 2021 00:43:54 +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 BC9B8340928
	for <gentoo-commits@lists.gentoo.org>; Thu,  1 Apr 2021 00:43:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id EE66F5B8
	for <gentoo-commits@lists.gentoo.org>; Thu,  1 Apr 2021 00:43:50 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1617237802.a009cde154a1a6d2c68de9fbc093917ddc940506.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libvterm/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild dev-libs/libvterm/libvterm-0.1.1.ebuild dev-libs/libvterm/libvterm-0.1.2.ebuild dev-libs/libvterm/libvterm-0.1.3.ebuild
X-VCS-Directories: dev-libs/libvterm/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: a009cde154a1a6d2c68de9fbc093917ddc940506
X-VCS-Branch: master
Date: Thu,  1 Apr 2021 00:43:50 +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: 2422ea91-7aa2-4aca-bb8f-2289b93f7e7c
X-Archives-Hash: 6fee56f3709728cc9498dd6956541201

commit:     a009cde154a1a6d2c68de9fbc093917ddc940506
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  1 00:22:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr  1 00:43:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a009cde1

dev-libs/libvterm: port to EAPI 7 for old, respect CC

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild | 18 ++++++++++--------
 dev-libs/libvterm/libvterm-0.1.1.ebuild           | 12 +++++++-----
 dev-libs/libvterm/libvterm-0.1.2.ebuild           | 11 +++++++----
 dev-libs/libvterm/libvterm-0.1.3.ebuild           |  9 ++++++---
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild b/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
index 00da1e7c066..75e2b16d3eb 100644
--- a/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
+++ b/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic ltprune multilib
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
 SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
+S="${WORKDIR}"/libvterm-0.0
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
-DEPEND="
+BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig"
-
 RDEPEND="!dev-libs/libvterm-neovim"
 
-S=${WORKDIR}/libvterm-0.0
-
 src_compile() {
+	tc-export CC
 	append-cflags -fPIC
+
 	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
 
@@ -30,5 +31,6 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
 }

diff --git a/dev-libs/libvterm/libvterm-0.1.1.ebuild b/dev-libs/libvterm/libvterm-0.1.1.ebuild
index a9f83554b9e..64440bd5eae 100644
--- a/dev-libs/libvterm/libvterm-0.1.1.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
@@ -11,18 +12,18 @@ SRC_URI="https://launchpad.net/${PN}/trunk/v$(ver_cut 1-2)/+download/${P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
 BDEPEND="
 	dev-lang/perl
 	sys-devel/libtool
 	virtual/pkgconfig
 "
-DEPEND=""
 RDEPEND="!dev-libs/libvterm-neovim"
 
 src_compile() {
+	tc-export CC
 	append-cflags -fPIC
+
 	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
 
@@ -32,5 +33,6 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
+
+	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
 }

diff --git a/dev-libs/libvterm/libvterm-0.1.2.ebuild b/dev-libs/libvterm/libvterm-0.1.2.ebuild
index 6802cf9d98a..d4ac11e08b8 100644
--- a/dev-libs/libvterm/libvterm-0.1.2.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
@@ -17,11 +18,12 @@ BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig
 "
-DEPEND=""
 RDEPEND="!dev-libs/libvterm-neovim"
 
 src_compile() {
+	tc-export CC
 	append-cflags -fPIC
+
 	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
@@ -32,5 +34,6 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
+
+	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
 }

diff --git a/dev-libs/libvterm/libvterm-0.1.3.ebuild b/dev-libs/libvterm/libvterm-0.1.3.ebuild
index fbc62d84bc3..b228336dfdb 100644
--- a/dev-libs/libvterm/libvterm-0.1.3.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit flag-o-matic
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
@@ -17,10 +18,11 @@ BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig
 "
-DEPEND=""
 RDEPEND="!dev-libs/libvterm-neovim"
 
 src_compile() {
+	tc-export CC
+
 	append-cflags -fPIC
 	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
@@ -32,5 +34,6 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
+
+	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
 }