diff options
author | Takuya Wakazono <pastalian46@gmail.com> | 2024-01-10 00:03:59 +0900 |
---|---|---|
committer | Takuya Wakazono <pastalian46@gmail.com> | 2024-01-10 00:03:59 +0900 |
commit | af47feee3439aae97ed4485246c32abc7d4cd95e (patch) | |
tree | 716908331c0d5059bbf98f0984e08c55ce7b2ba0 /dev-vcs/gitahead | |
parent | app-misc/corectrl: fix QA warnings (diff) | |
download | guru-af47feee3439aae97ed4485246c32abc7d4cd95e.tar.gz guru-af47feee3439aae97ed4485246c32abc7d4cd95e.tar.bz2 guru-af47feee3439aae97ed4485246c32abc7d4cd95e.zip |
dev-vcs/gitahead: fix dependencies
Closes: https://bugs.gentoo.org/833826
Closes: https://bugs.gentoo.org/833827
Closes: https://bugs.gentoo.org/921154
Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
Diffstat (limited to 'dev-vcs/gitahead')
-rw-r--r-- | dev-vcs/gitahead/Manifest | 5 | ||||
-rw-r--r-- | dev-vcs/gitahead/gitahead-2.7.1.ebuild | 41 |
2 files changed, 20 insertions, 26 deletions
diff --git a/dev-vcs/gitahead/Manifest b/dev-vcs/gitahead/Manifest index 4a1b41fcf..110740de2 100644 --- a/dev-vcs/gitahead/Manifest +++ b/dev-vcs/gitahead/Manifest @@ -1,5 +1,4 @@ -DIST gitahead-2.7.1-dep_cmark_cmark.tar.gz 231023 BLAKE2B b3e5768c04d33a6273befa8f1aa121b1f4df7ab1c4791c093681186b74b9a819824ff7d6369b456fe94e121344eecd704e71657d8004b1ef66b54ec4cb2a6abd SHA512 65fe291cfc9d163dff8ae69f98cb3449434405a50835056d2bf4aff43131f23d7d837c4ec7aa9bec93df184ff5d1210bff522d702fbddc96844dcf98f515d0b7 DIST gitahead-2.7.1-dep_git_git.tar.gz 7968616 BLAKE2B 7d2ea9e1ca1faa1a8b66a9db6b213c02be966cec74abe085139e3e966adcff9efbd74fb942ad145ddea64bab94a6006b91b512c96aa645cb124bcaf6e5a488eb SHA512 37a77870e0df748b023f5381aa969f1126b142a3470c9df4e01d86cf3418a0b0e4cb16a37ef7b162f285bdd540559a3511488ec8591b2f88e495626df019c03f -DIST gitahead-2.7.1-dep_libgit2_libgit2.tar.gz 5322459 BLAKE2B 2a5a4e98e3d6f2883f60604ea5721a56fbc9f3c2403686cda5b65e3fe859bbbe773d30d7fbf8a9d1549aeeda3367526d8604047a27cde490edc8f3fb982fa0c6 SHA512 068be7000e8c9f01073ffa315e398b687e937fbd63fb77021a307cfefc8382ddb085a36f6a2b40bade355d6ffcb1772de8551b9eb6f9eb56877805883804114d -DIST gitahead-2.7.1-dep_libssh2_libssh2.tar.gz 464738 BLAKE2B 6520c4df6584798505da8e14bfb4fe43389d0b3702d7eee6ce6b604d3260df7fda5c79cef8f69614035efeb31e516da63464313e11f64b6e8995a39c814683e8 SHA512 e86c0787e2aa7be5e9f19356e543493e53c7d1b51b585c46facfb05f769e6491209f820b207bf594348f4760c492c32dda3fcc94fc0af93cb09c736492a8e231 +DIST gitahead-2.7.1-dep_hunspell_hunspell.tar.gz 506908 BLAKE2B 810117701b16506ab18f3834cbbe6c75c970632a24b504b0fe914d77407e7379000826897aa03584edb7b87d207e26297709dd70613b6dd49731aa0aed1416b4 SHA512 6e0f4fe0a30e3824cff51ab507e3a836021e8b7542c86ed2950689fe9724b3c017648eb9928d1bb86fddcff113903164c25a1725a4fe7c8b94a833c4bf36279d +DIST gitahead-2.7.1-dep_libgit2_libgit2.tar.gz 7535416 BLAKE2B 220249adafac30fdd329e65eabc0a7dc0f533b2242d2e75743c781d80d427d8aca5abc7c7d6f6874ebb6b379cee1bf2569a57a769b8a00a4d15ff5a94a218ad0 SHA512 eb0d66840210d1a73b11c7374fa2745afded753d5e8a87483efb5dcf76973469b705279e3ddca15874423123f387384f752aec614951ef4185d334b171d78779 DIST gitahead-2.7.1.tar.gz 37248607 BLAKE2B 0f1399f84b92717c898708859a2b5c70d88dc52885b12ad915becb9943fc8037ec4ff498888b769603da163408a635bc111f0d5302a8631bb07c9683915e11e1 SHA512 c58ba55e0a0e9d11a0f777bd9d2e51cc7e2c93d0d58d266ae5a1c1271b962d5ac479124234b162983ff56870262e356969b841d59b375ae22e39301e689f3ab9 diff --git a/dev-vcs/gitahead/gitahead-2.7.1.ebuild b/dev-vcs/gitahead/gitahead-2.7.1.ebuild index 3023121df..5408b298d 100644 --- a/dev-vcs/gitahead/gitahead-2.7.1.ebuild +++ b/dev-vcs/gitahead/gitahead-2.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,9 +9,10 @@ DESCRIPTION="Graphical Git client to help understand and manage source code hist HOMEPAGE="https://github.com/gitahead/gitahead" SRC_URI=" https://github.com/gitahead/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/stinb/libgit2/archive/90af68bbe2690998f015f18b7c890f5868bcd3ee.tar.gz -> ${P}-dep_libgit2_libgit2.tar.gz - https://github.com/libssh2/libssh2/archive/42d37aa63129a1b2644bf6495198923534322d64.tar.gz -> ${P}-dep_libssh2_libssh2.tar.gz - https://github.com/commonmark/cmark/archive/f0793895eefc8ca14499831a24abee549a5af53e.tar.gz -> ${P}-dep_cmark_cmark.tar.gz + https://github.com/stinb/libgit2/archive/834d652bcb932af447d7f0acd1214a4057cb0771.tar.gz + -> ${P}-dep_libgit2_libgit2.tar.gz + https://github.com/hunspell/hunspell/archive/8a2fdfe5a6bb1cbafc04b0c8486abcefd17ad903.tar.gz + -> ${P}-dep_hunspell_hunspell.tar.gz gnome-keyring? ( https://github.com/git/git/archive/0d0ac3826a3bbb9247e39e12623bbcfdd722f24c.tar.gz -> ${P}-dep_git_git.tar.gz ) @@ -24,30 +25,23 @@ RESTRICT="test" IUSE="gnome-keyring" RDEPEND=" - app-crypt/mit-krb5 - app-text/cmark - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5[jpeg] - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 + app-text/cmark:= + dev-libs/openssl:= + dev-qt/qt5compat:6 + dev-qt/qtbase:6[concurrent,gui,network,widgets] net-libs/libssh2 gnome-keyring? ( app-crypt/libsecret ) " -DEPEND=" - ${RDEPEND} - dev-qt/linguist-tools:5 +DEPEND="${RDEPEND}" +BDEPEND=" + dev-qt/qttools:6[linguist] + virtual/pkgconfig " -QA_FLAGS_IGNORED=" - usr/share/GitAhead/Plugins/imageformats/libqjpeg.so - usr/share/GitAhead/Plugins/platforms/libqxcb.so - usr/share/GitAhead/Plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so -" +QA_FLAGS_IGNORED="usr/share/GitAhead/Plugins/.*" +QA_PRESTRIPPED="usr/share/GitAhead/Plugins/.*" src_unpack() { unpack "${P}.tar.gz" @@ -55,8 +49,7 @@ src_unpack() { cd "${S}" || die local i list=( dep_libgit2_libgit2 - dep_libssh2_libssh2 - dep_cmark_cmark + dep_hunspell_hunspell ) use gnome-keyring && list+=( dep_git_git ) for i in "${list[@]}"; do @@ -70,6 +63,8 @@ src_prepare() { sed -i 's/add_subdirectory(git)//' ./dep/CMakeLists.txt || die fi sed -i 's/add_subdirectory(openssl)//' ./dep/CMakeLists.txt || die + # Respect LDFLAGS + sed -i '/CMAKE_EXE_LINKER_FLAGS/d' CMakeLists.txt || die cmake_src_prepare } |