[gentoo-commits] repo/gentoo:master commit in: dev-lang/yap/

["Keri Harris" <keri@gentoo.org>]

commit:     a06d96cfdc4d632adb86e5d519f7a337da5d9331
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat May 15 15:16:27 2021 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat May 15 15:16:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06d96cf

dev-lang/yap: migrate to cmake.eclass

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 dev-lang/yap/yap-6.3.4.ebuild | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/dev-lang/yap/yap-6.3.4.ebuild b/dev-lang/yap/yap-6.3.4.ebuild
index ffa33f60439..f45b3f336d3 100644
--- a/dev-lang/yap/yap-6.3.4.ebuild
+++ b/dev-lang/yap/yap-6.3.4.ebuild
@@ -7,7 +7,7 @@ MY_P=YAP-${PV}
 
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit cmake-utils flag-o-matic multilib python-r1
+inherit cmake flag-o-matic python-r1
 
 PATCHSET_VER="0"
 
@@ -45,14 +45,11 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )"
 
 S="${WORKDIR}"/yap-6.3-${MY_P}
-BUILD_DIR="${S}"/build
-CMAKE_USE_DIR="${S}"
 
 src_prepare() {
 	if [[ -d "${WORKDIR}"/${PV} ]] ; then
 		eapply "${WORKDIR}"/${PV}
 	fi
-	eapply_user
 
 	sed -i \
 		-e "s|\(set ( libdir \"\${exec_prefix}\)/lib\")|\1/$(get_libdir)\")|" \
@@ -61,7 +58,7 @@ src_prepare() {
 		CMakeLists.txt || die
 	rm -rf "${S}"/yap || die "failed to remove yap xcode project"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -92,14 +89,14 @@ src_configure() {
 		-DWITH_Matlab=no
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use doc ; then
-		cmake-utils_src_compile doc
+		cmake_src_compile doc
 	fi
 }
 
@@ -110,7 +107,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	dodoc changes*.html README