gentoo resync : 28.04.2021

4 files changed, 69 insertions, 6 deletions

diff --git a/dev-util/edi/Manifest b/dev-util/edi/Manifest
index a3c8e7109f44..bf06acd6514f 100644
--- a/dev-util/edi/Manifest
+++ b/dev-util/edi/Manifest
@@ -1,3 +1,4 @@
 DIST edi-0.8.0.tar.gz 1076134 BLAKE2B b422493a1786f6dd2865adfdc88d756e7ced7681d8ccfbb6d0befcf04b035435134b168752d47dc25f86b1ee59c659a23b04b392787f8863f772e90a5f6f55fb SHA512 88d4ff3f5a4c56c3de7392024022a505907b6d6a16854254f227e457157fd7abd35eff1916842c77fcd6b81d42ec2fa15deceee632bf67d22ab272f8e755215c
-EBUILD edi-0.8.0.ebuild 1328 BLAKE2B 4255935c6060119a6ba90686d4bd285f187adbfe4d573799a61948ecd49aac30d85ce5976c9ed2012515766096b125397355670f76dc1e2076db45ec5fb41359 SHA512 cfd13120fcfc29743e6989bf0586362c4efa6ff01f0e82a09b0295b6007e202776663389b33a3bd36650c225cc5d36627b2dac9aae15c18ab2db29aef877cdc1
-MISC metadata.xml 409 BLAKE2B 7a44e226411a90d7104f1413fbb30bf85c2e99b2ee19bece2b4d61d93427e17d0a235a88beb874f117a016299b8bdf1d1897daa4d36fcc4e2e7b9d5e45d83873 SHA512 4e1748940fb40bf5ef343f82a57794d42d9d3733d544a122d3ad8200118869902e241a4adfb38c481c69842dba2915d6b30ec96713b35019ef4615fd1298a70b
+EBUILD edi-0.8.0-r1.ebuild 1336 BLAKE2B 16d75dfbb607cd10af2d707936a72a7fabac3f0f0e87020f7811b3db684b911e07c1ed4563b0094824e064d6c1d741ac516072e8a3b82a0eb9f22743be4d42de SHA512 376fc6f5a5069aa200373a4c521a35d6fbcb3a98767f05df1c5e1928f5f43d8ba73db5eab34365e70e07326d9dd5375c405b3c8c292cd2841d3bfa6c490586c2
+EBUILD edi-0.8.0.ebuild 1326 BLAKE2B 8d19fb97573d407745245e831b17773c5bee155793a57e1cd52476fbe21df94e31348a4dda50542930167168282f9aee8d0a35638c1e0d1439a2767a6ae748ac SHA512 c62d9ac269f371c58b0e582a447d76a610a1c0dcdeb22c08dfb5ede0d4ba11e8f9f5c99374b6a7be11c10f7554641cbff3cf2c68553fd9667545e0397b55fad5
+MISC metadata.xml 483 BLAKE2B a74b8edb150be764ce0e5a23ca284ae487c98c192be96842286dac979a2c32a34aab96a0a285e87f486ed73e329c6c21d0604ac3ffe41cc4f83feaef18118646 SHA512 85bafe3c82b7d5e0a6f5dacf976e8a0f2cc5d336ac769a1dfb2bb3730ce057a6762e845b4a2a35832b9cf1d3d7c4e6c71be5b5613539e7957b0809fbb3f4ac0f
diff --git a/dev-util/edi/edi-0.8.0-r1.ebuild b/dev-util/edi/edi-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..5f9ff81adc18
--- /dev/null
+++ b/dev-util/edi/edi-0.8.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 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/pkgconfig"
+
+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/edi-0.8.0.ebuild b/dev-util/edi/edi-0.8.0.ebuild
index b90faeeb5e6f..7d927fc23d22 100644
--- a/dev-util/edi/edi-0.8.0.ebuild
+++ b/dev-util/edi/edi-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Enlightenment/edi/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="clang"
 
 RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
diff --git a/dev-util/edi/metadata.xml b/dev-util/edi/metadata.xml
index 9fbd2808478f..50630f4a3f49 100644
--- a/dev-util/edi/metadata.xml
+++ b/dev-util/edi/metadata.xml
@@ -7,8 +7,9 @@
   </maintainer>
   <use>
     <flag name="clang">
-      Provide integration with <pkg>sys-devel/clang</pkg> for autocompletion and inline 
-      errors
+      Provide integration with <pkg>sys-devel/clang</pkg> and 
+      <pkg>dev-util/bear</pkg> for autocompletion, inline errors and 
+      information about compilation units.
     </flag>
   </use>
 </pkgmetadata>