gentoo resync : 20.03.2022

3 files changed, 81 insertions, 0 deletions

diff --git a/dev-util/edi/Manifest b/dev-util/edi/Manifest
index 6529d5327232..b6754ae8b5d5 100644
--- a/dev-util/edi/Manifest
+++ b/dev-util/edi/Manifest
@@ -1,3 +1,5 @@
+AUX edi-0.8.0-meson-0.61.1-fix.patch 745 BLAKE2B 7eaff5755930079142923c58dcff4877184050ac4b6d058b2a52d1180a92e667f2424d40ff40cadd90201e97e8a4ed56e05f69f9c858da109e2d5c1e362bd08c SHA512 146b1b1c1f078ce21cb61c73874d9b8c5d9b9ee83031b3b85754e055d324e849a2e89cd52a935b052837647502b91e7d5d0712acdf220c4c545bfb5add459cb0
 DIST edi-0.8.0.tar.gz 1076134 BLAKE2B b422493a1786f6dd2865adfdc88d756e7ced7681d8ccfbb6d0befcf04b035435134b168752d47dc25f86b1ee59c659a23b04b392787f8863f772e90a5f6f55fb SHA512 88d4ff3f5a4c56c3de7392024022a505907b6d6a16854254f227e457157fd7abd35eff1916842c77fcd6b81d42ec2fa15deceee632bf67d22ab272f8e755215c
 EBUILD edi-0.8.0-r1.ebuild 1351 BLAKE2B 0dc5846a8c0ddfc48d22522d599c2e51d761bc6bb3010db40b055aa1b4a8ca5fbfdedca73d0e03c13512f4ef3e29b1f85ad9d60c3ab4b34ad9f476cab135aa34 SHA512 7ba44bd9a47fb48b568e2d5c91008294e61e408324f5ef322b2ba3253426eea3b5a3871cf961bb850470cd1963468e5f69daca5b0c1cd07dcb90f18f55501e04
+EBUILD edi-0.8.0-r2.ebuild 1413 BLAKE2B 8db58962d9226658ac6bb412480bfd97a54b7cbad714b3b5272a12cd651f2c45f4028aabe51b7649b37f73e67f4b9932ca0e707ada9b33dea7e75494e85d4a84 SHA512 d69f26130de3d9b6dcc755eed19da2d4fcf38784233a3b6c943cada3a2d61c9b776e4cf640e342fa27b6810e39df7a871572124e0a12eb6235e4192f44b15e86
 MISC metadata.xml 484 BLAKE2B f8b79e0c6fdd8c6917988c8bdac916d7473592e791d7a7fbd652b6640aa033868c8c88ac46c11418e7f2e3e28c131540d408524935ccc8669d5d3d73cb6faa01 SHA512 f3b6508bb912230b29347cb14e91917b5716b464292f37b0b9ef78487c830090eaa90228251ec589ce497de68d20abc94d1fb73c55562e4606b6f083e7071d3b
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,