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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 99555158094 for ; Thu, 6 Oct 2022 01:46:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE2B9E08BD; Thu, 6 Oct 2022 01:46:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B047AE08BD for ; Thu, 6 Oct 2022 01:46:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C0678340D88 for ; Thu, 6 Oct 2022 01:46:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DDAC0605 for ; Thu, 6 Oct 2022 01:46:34 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1665020743.5a0cdbcf4e1c63c482429a2098de3101fd4aff93.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/convertlit/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/convertlit/convertlit-1.8-r3.ebuild app-text/convertlit/convertlit-1.8-r4.ebuild X-VCS-Directories: app-text/convertlit/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 5a0cdbcf4e1c63c482429a2098de3101fd4aff93 X-VCS-Branch: master Date: Thu, 6 Oct 2022 01:46:34 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 89f7e682-2da9-4ef9-a035-1fd310da61ed X-Archives-Hash: fc8031887553bffc440b68d37151dfda commit: 5a0cdbcf4e1c63c482429a2098de3101fd4aff93 Author: Ionen Wolkens gentoo org> AuthorDate: Thu Oct 6 01:30:35 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Oct 6 01:45:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a0cdbcf app-text/convertlit: EAPI6->8, fix license, direct AR Closes: https://bugs.gentoo.org/718570 Signed-off-by: Ionen Wolkens gentoo.org> ...tlit-1.8-r3.ebuild => convertlit-1.8-r4.ebuild} | 31 +++++++++------------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/app-text/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r4.ebuild similarity index 54% rename from app-text/convertlit/convertlit-1.8-r3.ebuild rename to app-text/convertlit/convertlit-1.8-r4.ebuild index 840c6a5c1e1e..2f2dc3f48f30 100644 --- a/app-text/convertlit/convertlit-1.8-r3.ebuild +++ b/app-text/convertlit/convertlit-1.8-r4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -10,35 +10,30 @@ MY_P="clit${PV//./}" DESCRIPTION="CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)" HOMEPAGE="http://www.convertlit.com/" SRC_URI="http://www.convertlit.com/${MY_P}src.zip" +S="${WORKDIR}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" RDEPEND=">=dev-libs/libtommath-0.36-r1" - -DEPEND="${RDEPEND} - app-arch/unzip" - -S="${WORKDIR}" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip" PATCHES=( - "${FILESDIR}/${P}-respectflags-r1.patch" - "${FILESDIR}/fix-Wformat-security-warnings.patch" - "${FILESDIR}/support-ar-variable.patch" + "${FILESDIR}"/${P}-respectflags-r1.patch + "${FILESDIR}"/fix-Wformat-security-warnings.patch + "${FILESDIR}"/support-ar-variable.patch ) src_compile() { - tc-export CC + tc-export AR CC - cd "${S}/lib" || die "failed to change into ${S}/lib directory" - emake - cd "${S}/${MY_P}" || die "failed to change into ${S}/${MY_P} directory" - emake + emake -C lib + emake -C ${MY_P} } src_install() { + dobin ${MY_P}/clit einstalldocs - dobin "${MY_P}/clit" }