[gentoo-lisp] [PATCH 05/11] dev-lisp/cffi: add 0.24.1, drop 0.18.0 and live

[Anna (cybertailor) Vyalkova]

From: Anna “CyberTailor” <cyber@×××××.in>

---
 dev-lisp/cffi/Manifest                        |  2 +-
 ...{cffi-0.18.0.ebuild => cffi-0.24.1.ebuild} | 42 ++++++++---------
 dev-lisp/cffi/cffi-9999.ebuild                | 47 -------------------
 3 files changed, 22 insertions(+), 69 deletions(-)
 rename dev-lisp/cffi/{cffi-0.18.0.ebuild => cffi-0.24.1.ebuild} (51%)
 delete mode 100644 dev-lisp/cffi/cffi-9999.ebuild

diff --git a/dev-lisp/cffi/Manifest b/dev-lisp/cffi/Manifest
index 79c0e90..6c1d19e 100644
--- a/dev-lisp/cffi/Manifest
+++ b/dev-lisp/cffi/Manifest
@@ -1,2 +1,2 @@
 DIST cffi-0.19.0.tar.gz 248822 BLAKE2B a9dec38d67c6ecc8d9ed372d98360c29fb5ba178714183dee65fd334cc19b9941c3ca544438caae32c91300dcd0694f0e089ba633f10f8623fd901ce64ad8c2e SHA512 02af9ea01a909f1ec2d21ab79acbbd09167ae34cde91085fc1b276e85736451102098543727724698ac459eb8161dd4061fb86832b8ce374e327168acc0073e4
-DIST cffi.tar.gz 249345 BLAKE2B 79e3c0e2525f7cf0cde80feb22a21791ab48e9e89c78708ae1c6f4ffbf3c44d3c0640db5e7339f6685450b9bd7a13e3800d0f650c47ffb814343f4733dad3096 SHA512 b7d0ec511ca434c2c8bb9b6a0a4404ce06aeec040e285353c386d805d0175a3b1830a7ab0c5fb47a6231793eb4df8f3844bf7f5779d0099c3fb25ea85bb28ff5
+DIST cffi-0.24.1.tar.gz 254450 BLAKE2B f377ee8e0e93978e4af1a9b8ac3d253daad0fa2064bde3c9ce7faa9bcdb54cfdb068bf1f28d7dee560ebcb125d28df8e51a48000db76eef252facd2c9c84496f SHA512 acbc3a29e00ea14520a3dd4beae78ac62091d87c432cfc9097d2f8e8f6e79f832d3ae768a9be105c86c1472f5057f3c20630f6edf79cbd7fd9f24762bb09a1e1
diff --git a/dev-lisp/cffi/cffi-0.18.0.ebuild b/dev-lisp/cffi/cffi-0.24.1.ebuild
similarity index 51%
rename from dev-lisp/cffi/cffi-0.18.0.ebuild
rename to dev-lisp/cffi/cffi-0.24.1.ebuild
index 87527e8..bcd2d5a 100644
--- a/dev-lisp/cffi/cffi-0.18.0.ebuild
+++ b/dev-lisp/cffi/cffi-0.24.1.ebuild
@@ -1,36 +1,40 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit common-lisp-3
 
-MY_P=${PN}_${PV}
-
 DESCRIPTION="The Common Foreign Function Interface (CFFI)"
 HOMEPAGE="http://common-lisp.net/project/cffi/"
-SRC_URI="http://common-lisp.net/project/${PN}/releases/${MY_P}.tar.gz -> ${PN}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc"
-
-DEPEND="doc? ( dev-lisp/sbcl virtual/texi2dvi )"
-RDEPEND="!dev-lisp/cl-${PN}
-		dev-lisp/alexandria
-		dev-lisp/babel
-		dev-lisp/trivial-features"
+RESTRICT="test"
+
+RDEPEND="
+	!dev-lisp/cl-${PN}
+	dev-lisp/alexandria
+	dev-lisp/babel
+	dev-lisp/trivial-features
+"
+BDEPEND="doc? (
+	dev-lisp/sbcl
+	virtual/texi2dvi
+)"
 
 CLSYSTEMS="cffi.asd cffi-tests.asd cffi-examples.asd cffi-grovel.asd \
 		cffi-uffi-compat.asd cffi-toolchain cffi-libffi"
 
-S="${WORKDIR}"/${MY_P}
+DOCS=( README.md TODO )
 
 src_compile() {
 	if use doc ; then
-		VARTEXFONTS="${T}"/fonts \
-			make -C doc manual spec || die "Cannot build docs"
+		VARTEXFONTS="${T}"/fonts emake -C doc manual spec
+		HTML_DOCS=( doc/{spec,manual} )
 	fi
 }
 
@@ -38,11 +42,7 @@ src_install() {
 	common-lisp-install-sources examples/ src/ uffi-compat/
 	common-lisp-install-sources -t all grovel/ tests/ toolchain/ libffi/
 	common-lisp-install-asdf
-	dodoc README.md TODO doc/*.txt
-	if use doc; then
-		doinfo doc/*.info
-		rm doc/{spec,manual}/cffi*
-		insinto /usr/share/doc/${PF}/html
-		doins -r doc/{spec,manual}
-	fi
+	dodoc doc/*.txt
+	doinfo doc/*.info
+	einstalldocs
 }
diff --git a/dev-lisp/cffi/cffi-9999.ebuild b/dev-lisp/cffi/cffi-9999.ebuild
deleted file mode 100644
index b237a12..0000000
--- a/dev-lisp/cffi/cffi-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit common-lisp-3 git-r3
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="The Common Foreign Function Interface (CFFI)"
-HOMEPAGE="http://common-lisp.net/project/cffi/"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc"
-
-DEPEND="doc? ( dev-lisp/sbcl virtual/texi2dvi )"
-RDEPEND="!dev-lisp/cl-${PN}
-		dev-lisp/alexandria
-		dev-lisp/babel
-		dev-lisp/trivial-features"
-
-CLSYSTEMS="cffi.asd cffi-tests.asd cffi-examples.asd cffi-grovel.asd \
-		cffi-uffi-compat.asd cffi-toolchain.asd"
-
-S="${WORKDIR}"/${MY_P}
-
-src_compile() {
-	if use doc ; then
-		VARTEXFONTS="${T}"/fonts \
-			make -C doc manual spec || die "Cannot build docs"
-	fi
-}
-
-src_install() {
-	common-lisp-install-sources examples/ src/ uffi-compat/ toolchain/
-	common-lisp-install-sources -t all grovel/ tests/
-	common-lisp-install-asdf
-	dodoc README.md TODO doc/*.txt
-	if use doc; then
-		doinfo doc/*.info
-		rm doc/{spec,manual}/cffi* || die
-		insinto /usr/share/doc/${PF}/html
-		doins -r doc/{spec,manual}
-	fi
-}
-- 
2.34.1