commit: aa763bb2108ffd6ba30c1081013350df04349887 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Sun Jul 3 10:55:31 2022 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sun Jul 3 10:55:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=aa763bb2
gui-apps/organicmaps: cmake-utils --> cmake, inherit xdg Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> gui-apps/organicmaps/Manifest | 2 -- gui-apps/organicmaps/organicmaps-9999.ebuild | 11 +++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gui-apps/organicmaps/Manifest b/gui-apps/organicmaps/Manifest deleted file mode 100644 index 401d1c228..000000000 --- a/gui-apps/organicmaps/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -AUX organicmaps-9999-zlib-compile.patch 291 BLAKE2B 627e0897134993fab63357dbaf59e16ca26fc180edfc0e05aefe557fa32d666ecdb6ad5a168b4564f2b9ef9a3b32200552faf0521594ce17a501b9b884b3b506 SHA512 a52c2a0068f929154a7c31479531db66c545328e2c069fe62cf8b3a41cc0eaf501a4885128d11be30a1037006f67b879015adcf4b126b0a13e316bffb5971e75 -EBUILD organicmaps-9999.ebuild 693 BLAKE2B a7a70da1baa43091bbfe47d6c49059a8f5cfc52e48abe3962a7f7fa141ed2301e6e3dbc31061f7f34791acfeb178c3603bbcfc607f47bfe27480d2d7fa2034b3 SHA512 94cc54583b77be1dbf54c421263c1580b05dd1dd166fa867d9e20c3f98bdafa9140581a212b47e617f8def08f8d2f0c2eb5de6137374b4e3b5427bb1bb464fa2 diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild index 473859fe4..966fe58a2 100644 --- a/gui-apps/organicmaps/organicmaps-9999.ebuild +++ b/gui-apps/organicmaps/organicmaps-9999.ebuild @@ -1,6 +1,6 @@ EAPI=7 -inherit git-r3 cmake-utils +inherit git-r3 cmake xdg EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"; DESCRIPTION="Offline maps and navigation using OpenStreetMap data" @@ -21,10 +21,9 @@ DEPEND="sys-devel/clang sys-libs/zlib[minizip]" RDEPEND="" -src_prepare() { - eapply "${FILESDIR}/${P}-zlib-compile.patch" - cmake-utils_src_prepare -} +PATCHES=( + "${FILESDIR}/${P}-zlib-compile.patch" +) src_configure() { CMAKE_BUILD_TYPE="RelWithDebInfo" @@ -35,7 +34,7 @@ src_configure() { echo | ./configure.sh - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() {
