commit:     5a0cdbcf4e1c63c482429a2098de3101fd4aff93
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 01:30:35 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> 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 <ionen <AT> 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"
 }

Reply via email to