gentoo resync : 11.05.2021

3 files changed, 2 insertions, 62 deletions

diff --git a/dev-util/edi/Manifest b/dev-util/edi/Manifest
index bf06acd6514f..439536525128 100644
--- a/dev-util/edi/Manifest
+++ b/dev-util/edi/Manifest
@@ -1,4 +1,3 @@
 DIST edi-0.8.0.tar.gz 1076134 BLAKE2B b422493a1786f6dd2865adfdc88d756e7ced7681d8ccfbb6d0befcf04b035435134b168752d47dc25f86b1ee59c659a23b04b392787f8863f772e90a5f6f55fb SHA512 88d4ff3f5a4c56c3de7392024022a505907b6d6a16854254f227e457157fd7abd35eff1916842c77fcd6b81d42ec2fa15deceee632bf67d22ab272f8e755215c
-EBUILD edi-0.8.0-r1.ebuild 1336 BLAKE2B 16d75dfbb607cd10af2d707936a72a7fabac3f0f0e87020f7811b3db684b911e07c1ed4563b0094824e064d6c1d741ac516072e8a3b82a0eb9f22743be4d42de SHA512 376fc6f5a5069aa200373a4c521a35d6fbcb3a98767f05df1c5e1928f5f43d8ba73db5eab34365e70e07326d9dd5375c405b3c8c292cd2841d3bfa6c490586c2
-EBUILD edi-0.8.0.ebuild 1326 BLAKE2B 8d19fb97573d407745245e831b17773c5bee155793a57e1cd52476fbe21df94e31348a4dda50542930167168282f9aee8d0a35638c1e0d1439a2767a6ae748ac SHA512 c62d9ac269f371c58b0e582a447d76a610a1c0dcdeb22c08dfb5ede0d4ba11e8f9f5c99374b6a7be11c10f7554641cbff3cf2c68553fd9667545e0397b55fad5
+EBUILD edi-0.8.0-r1.ebuild 1334 BLAKE2B 0221ed226091ba13f7a89469274248aa8a3ee997eb485244258ed67645037cd50efc8f557183d05677178a3c817067824ea07566241add4974640e8a14ba7004 SHA512 f83cc9c36ae10e12cc9e1b63682334386c9ec4d11f9c7b7814132486058a5386147373628d55075379646d3ad5c64b59357a3373b14b97ad74894352b7e49ea2
 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
index 5f9ff81adc18..920db6c168b1 100644
--- a/dev-util/edi/edi-0.8.0-r1.ebuild
+++ b/dev-util/edi/edi-0.8.0-r1.ebuild
@@ -13,7 +13,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/edi-0.8.0.ebuild b/dev-util/edi/edi-0.8.0.ebuild
deleted file mode 100644
index 7d927fc23d22..000000000000
--- a/dev-util/edi/edi-0.8.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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="http://edi-ide.com/
-	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? ( 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=(
-		-D bear=false
-		$(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
-}