[gentoo-commits] repo/user/gerislay:master commit in: gui-apps/organicmaps/

[gerion]

commit:     6cf055e14799547c05fedca90804442711927300
Author:     Gerion Entrup <gerion.entrup <AT> flump <DOT> de>
AuthorDate: Wed Apr  2 21:30:14 2025 +0000
Commit:     gerion <gerion.entrup <AT> flump <DOT> de>
CommitDate: Wed Apr  2 21:30:14 2025 +0000
URL:        https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=6cf055e1

gui-apps/organicmaps: switch to new repo

Signed-off-by: Gerion Entrup <gerion.entrup <AT> flump.de>

 gui-apps/organicmaps/Manifest                |  2 +-
 gui-apps/organicmaps/organicmaps-9999.ebuild | 18 ++----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/gui-apps/organicmaps/Manifest b/gui-apps/organicmaps/Manifest
index 03e6790..dfff40f 100644
--- a/gui-apps/organicmaps/Manifest
+++ b/gui-apps/organicmaps/Manifest
@@ -2,5 +2,5 @@ AUX fix-3party.patch 700 BLAKE2B 
ea980cb2a53222eb0e276344e12d30689d1705debbb3b8d
 AUX fix-integration-of-search_tests_support.patch 712 BLAKE2B 
b2ea45a6047eb90b614d975289a5264d743399f9c6d319c9ec88b75f09049d9f72d5dcae8a6744944b73c3af7550436bf3ea4c2b15bcb23f8af0dff95b41cd13
 SHA512 
b7243dd041c725992709f1d75ad251394196d201e509a1177d7db0e20eab83cda842956cb44607a331d32c87873216bafa700c7f7c6155d3b588472416a94408
 AUX fix-jansson.patch 1119 BLAKE2B 
5988c85b94c919dc9c98bb103e0f3c4e6829463aad9e050e99303874d0198611604a5bb9fe7c69d73a2550a23b063302d216187f520bfa7b58421d195fcce3dd
 SHA512 
a796cdc6066e88b20375246f2c4f4ff8b2d5d510f1f2f56b7e9ff8864f31b158795f603cc15eac880bc5ad444dc8aafb822968292ab4ec1315b45c43bea19824
 AUX make-DEV_SANDBOX-optional.patch 2608 BLAKE2B 
2177625c0e75d46fe883207fceffb882b7ca951b9f88e54d2c3b57696ecb4dec69dd4c8cfb3d9a7ea46d67eca4dce2368d6ecc90d5f6048fac4469fbfc4916be
 SHA512 
109a7c31021790a10c23a83ac7457b67a2c192cc8f3dbde0240fc4ac89cd4c09506cdfb75eef050aee34bc3a6191420fce7a0eb76f6f73d58f7317feea18d1c3
-EBUILD organicmaps-9999.ebuild 2638 BLAKE2B 
0b9e8c08038a8fe0e3d34a23024957327d826dd38f3f6e9dd76736cf44623e78d9049259b0371d9741c642d9b0519428aa33ded9eedbc6c3cc0eadbd7e3163eb
 SHA512 
685a501f8197d579cab1b39f46d12af2e00de9a3376eeae6703d8fe4497371a0833d083f98a064285b7e38f981b1604096844f3edff067489434b56fadb40efa
+EBUILD organicmaps-9999.ebuild 2008 BLAKE2B 
6607c9d486f74b029aa4f11db23c68122808be021fc9c10fb2790dcf35d9ee44b3748ce5a5e8b1af92f8fa6e0ed4cef2d76a26f61f949247e9ee208b191f1d08
 SHA512 
297615c824ca7213d56a2ada9c400d5229278b457e62dd13375be79beb2037f2efe823a4a707ae5bb0a1c3930c34f920d760937c241c192fa795b9dd0bb23cd1
 MISC metadata.xml 269 BLAKE2B 
de28959b3090173e0b4fc0b61b311af4af3c51764f0eb173e71874e684eb8b459a0d8cff52018479b58e0e0e9602f27f715c538c7dda9c055c52e97b8c1b14be
 SHA512 
fa1cf7ea32065ae5b70250aa532b1599b89b695dd8eae7e2aa22ef427036c3b6e56d2ab349963fc39115559b92a817bf198424a41264a86fd4c8cec26746c4f9

diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild 
b/gui-apps/organicmaps/organicmaps-9999.ebuild
index 2a83c0a..cf88eda 100644
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -5,12 +5,8 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{11..13} )
 inherit git-r3 python-r1 xdg cmake
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git";
-# this URL is to make the tests compile since organicmaps usually dynamically 
clones the repo
-# maybe a better way would be to skip the test
-EGIT_WORLD_FEED_REPO_URI="https://github.com/${PN}/world_feed_integration_tests_data.git";
-# organicmaps gets more and more system libraries, we use as many
-# as currently possible, use submodules for the rest
+EGIT_REPO_URI="https://git.omaps.dev/${PN}/${PN}.git";
+
 EGIT_SUBMODULES=(
        3party/just_gtfs  # header contains #include 3party/just_gtfs
        3party/protobuf/protobuf # wait for 
https://github.com/organicmaps/organicmaps/pull/6310
@@ -55,15 +51,6 @@ PATCHES=(
        "${FILESDIR}"/fix-integration-of-search_tests_support.patch
 )
 
-WORLD_FEED_TESTS_S="${WORKDIR}/world_feed_integration_tests_data-${PV}"
-
-src_unpack() {
-       git-r3_fetch
-       git-r3_checkout
-       git-r3_fetch "${EGIT_WORLD_FEED_REPO_URI}"
-       git-r3_checkout "${EGIT_WORLD_FEED_REPO_URI}" "${WORLD_FEED_TESTS_S}"
-}
-
 src_configure() {
        CMAKE_BUILD_TYPE="RelWithDebInfo"
        local mycmakeargs=(
@@ -72,7 +59,6 @@ src_configure() {
                -DSKIP_TOOLS=yes # TODO: mostly tests, enable with use flag
                -DSKIP_TESTS=yes # TODO: mostly tests, enable with use flag
                -DBUILD_SHARED_LIBS=off
-               -DTEST_DATA_REPO_URL="${WORLD_FEED_TESTS_S}"
        )
        cmake_src_configure
 }