commit: e3d5e26c56739a1e29c8273bcee37cf6ab504ed1 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Wed Feb 23 09:39:29 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Feb 23 09:41:52 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d5e26c
dev-util/edi: meson-0.61.1 fix Closes: https://bugs.gentoo.org/831771 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> dev-util/edi/edi-0.8.0-r2.ebuild | 64 ++++++++++++++++++++++ .../edi/files/edi-0.8.0-meson-0.61.1-fix.patch | 15 +++++ 2 files changed, 79 insertions(+) diff --git a/dev-util/edi/edi-0.8.0-r2.ebuild b/dev-util/edi/edi-0.8.0-r2.ebuild new file mode 100644 index 000000000000..0c099bffe9de --- /dev/null +++ b/dev-util/edi/edi-0.8.0-r2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit llvm meson xdg + +DESCRIPTION="An EFL-based IDE" +HOMEPAGE="https://www.enlightenment.org/about-edi + https://phab.enlightenment.org/w/projects/edi/ + https://github.com/Enlightenment/edi"; +SRC_URI="https://github.com/Enlightenment/edi/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2 GPL-3 LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="clang" + +RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] ) + >=dev-libs/efl-1.22.0[eet] + clang? ( + dev-util/bear + sys-devel/clang:= + )" +DEPEND="${RDEPEND} + dev-libs/check" +BDEPEND="virtual/libintl + virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/edi-0.8.0-meson-0.61.1-fix.patch ) + +llvm_check_deps() { + has_version "sys-devel/clang:${LLVM_SLOT}" +} + +pkg_setup() { + use clang && llvm_pkg_setup +} + +src_prepare() { + default + + # fix a QA issue with .desktop file, https://phab.enlightenment.org/T7368 + sed -i '/Version=/d' data/desktop/edi.desktop* || die + + # fix 'unexpected path' QA warning + sed -i 's|share/doc/edi/|share/doc/'${PF}'/|g' doc/meson.build || die +} + +src_configure() { + local emesonargs=( + $(meson_use clang bear) + $(meson_use clang libclang) + ) + + if use clang; then + emesonargs+=( + -D libclang-headerdir="$(llvm-config --includedir)" + -D libclang-libdir="$(llvm-config --libdir)" + ) + fi + + meson_src_configure +} diff --git a/dev-util/edi/files/edi-0.8.0-meson-0.61.1-fix.patch b/dev-util/edi/files/edi-0.8.0-meson-0.61.1-fix.patch new file mode 100644 index 000000000000..8b829b5364ee --- /dev/null +++ b/dev-util/edi/files/edi-0.8.0-meson-0.61.1-fix.patch @@ -0,0 +1,15 @@ +diff -Naur a/data/extra/templates/meson.build b/data/extra/templates/meson.build +--- a/data/extra/templates/meson.build 2020-04-29 16:40:58.000000000 +0300 ++++ b/data/extra/templates/meson.build 2022-02-23 11:27:30.271380219 +0200 +@@ -6,10 +6,9 @@ + foreach skeleton_name : skeleton_names + + custom_target('skeleton ' + skeleton_name, +- command : [tar, 'zcf', '@OUTPUT@', '-C', ++ command : [tar, 'zcf', '@OUTPUT@', '-C', + join_paths(meson.source_root(), 'data', 'extra', 'templates', 'skeletons'), + skeleton_name], +- input : join_paths('skeletons', skeleton_name), + output : skeleton_name + '.tar.gz', + install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'edi', 'templates'), + install : true,
