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" }
