| 1 |
commit: a06d96cfdc4d632adb86e5d519f7a337da5d9331 |
| 2 |
Author: Keri Harris <keri <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 15 15:16:27 2021 +0000 |
| 4 |
Commit: Keri Harris <keri <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 15 15:16:49 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06d96cf |
| 7 |
|
| 8 |
dev-lang/yap: migrate to cmake.eclass |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Signed-off-by: Keri Harris <keri <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/yap/yap-6.3.4.ebuild | 15 ++++++--------- |
| 14 |
1 file changed, 6 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-lang/yap/yap-6.3.4.ebuild b/dev-lang/yap/yap-6.3.4.ebuild |
| 17 |
index ffa33f60439..f45b3f336d3 100644 |
| 18 |
--- a/dev-lang/yap/yap-6.3.4.ebuild |
| 19 |
+++ b/dev-lang/yap/yap-6.3.4.ebuild |
| 20 |
@@ -7,7 +7,7 @@ MY_P=YAP-${PV} |
| 21 |
|
| 22 |
PYTHON_COMPAT=( python3_{7,8} ) |
| 23 |
|
| 24 |
-inherit cmake-utils flag-o-matic multilib python-r1 |
| 25 |
+inherit cmake flag-o-matic python-r1 |
| 26 |
|
| 27 |
PATCHSET_VER="0" |
| 28 |
|
| 29 |
@@ -45,14 +45,11 @@ DEPEND="${RDEPEND} |
| 30 |
python? ( dev-lang/swig )" |
| 31 |
|
| 32 |
S="${WORKDIR}"/yap-6.3-${MY_P} |
| 33 |
-BUILD_DIR="${S}"/build |
| 34 |
-CMAKE_USE_DIR="${S}" |
| 35 |
|
| 36 |
src_prepare() { |
| 37 |
if [[ -d "${WORKDIR}"/${PV} ]] ; then |
| 38 |
eapply "${WORKDIR}"/${PV} |
| 39 |
fi |
| 40 |
- eapply_user |
| 41 |
|
| 42 |
sed -i \ |
| 43 |
-e "s|\(set ( libdir \"\${exec_prefix}\)/lib\")|\1/$(get_libdir)\")|" \ |
| 44 |
@@ -61,7 +58,7 @@ src_prepare() { |
| 45 |
CMakeLists.txt || die |
| 46 |
rm -rf "${S}"/yap || die "failed to remove yap xcode project" |
| 47 |
|
| 48 |
- cmake-utils_src_prepare |
| 49 |
+ cmake_src_prepare |
| 50 |
} |
| 51 |
|
| 52 |
src_configure() { |
| 53 |
@@ -92,14 +89,14 @@ src_configure() { |
| 54 |
-DWITH_Matlab=no |
| 55 |
) |
| 56 |
|
| 57 |
- cmake-utils_src_configure |
| 58 |
+ cmake_src_configure |
| 59 |
} |
| 60 |
|
| 61 |
src_compile() { |
| 62 |
- cmake-utils_src_compile |
| 63 |
+ cmake_src_compile |
| 64 |
|
| 65 |
if use doc ; then |
| 66 |
- cmake-utils_src_compile doc |
| 67 |
+ cmake_src_compile doc |
| 68 |
fi |
| 69 |
} |
| 70 |
|
| 71 |
@@ -110,7 +107,7 @@ src_test() { |
| 72 |
} |
| 73 |
|
| 74 |
src_install() { |
| 75 |
- cmake-utils_src_install |
| 76 |
+ cmake_src_install |
| 77 |
|
| 78 |
dodoc changes*.html README |
Archives