5 files changed, 7 insertions, 69 deletions
diff --git a/app-emacs/company-ebuild/Manifest b/app-emacs/company-ebuild/Manifest
index 10b5ea0e6787..e8bf7e712a6d 100644
--- a/app-emacs/company-ebuild/Manifest
+++ b/app-emacs/company-ebuild/Manifest
@@ -1,3 +1 @@
-DIST company-ebuild-0.1.0.tar.gz 10938 BLAKE2B e89e389b49b32057a6acd72cf7a0eb68b10d005824287c112528e3136e7d969e3b678450fc997800d83b3c8f226030b0e2724c63b3ae82d78ad16af49bc10984 SHA512 bc7fec05fbc3600ce6b5111b4e1817bfe04f7185a6a33bf5b83291feb795f47b91f827960b29f844f2627e885a05cc156b755a468e5eb0c314345c869678ea17
-DIST company-ebuild-0.1.1.tar.gz 11059 BLAKE2B 5eba661f1956a019a133d3e61f997dcf2d9340c4a5f6d05920cba07e06e493e4358fabab6e16a48d1c081fc2c71f548e06511adf46b55a2fb30cef4ba2df71f5 SHA512 09bed101dcef18b07c2b51aa916b358f6e2ea526bd80dc997b280516ee074a62e006f3a0d748d77848f5e43412d4971841771cf40abe5b80a95477a21ad9d847
-DIST company-ebuild-0.1.2.tar.gz 11697 BLAKE2B e376626d13aa32a4df09ecdae2245b9c961a6e2cd615febfaaa626ac48ccd420b462a6195d9f769d64c37629c34929ba87e3ea6543e2344b62b217a51695870a SHA512 2a67c6ea6e53f78a6c41b2251b928cf7e97bb3f71c7c03057c540c699bd275898bdf8840d723cf5d8846dbbe82cc531f1cc2707181825fe05c4433ea80039011
+DIST company-ebuild-0.1.4.tar.gz 11819 BLAKE2B 7697d6b7c6056f482a92fbe716f73e7318d93a3c187f733a251717dabdc947677b4c69db6422c31905b26510e53124ba45bdc6c46a79bcef6723b0e3d4f5fb02 SHA512 7bc2ac87fa95958a01a99debb13a4bb40ec95bd397d3f02e7bd1f509db965bd3f9e95489a0af726d899b2a3533df334364c79abf3d63ae673de60dbb98790660
diff --git a/app-emacs/company-ebuild/company-ebuild-0.1.0.ebuild b/app-emacs/company-ebuild/company-ebuild-0.1.0.ebuild
deleted file mode 100644
index febf2b249a55..000000000000
--- a/app-emacs/company-ebuild/company-ebuild-0.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS=25.1
-
-inherit elisp
-
-DESCRIPTION="Company backend for editing Ebuild files"
-HOMEPAGE="https://gitweb.gentoo.org/proj/company-ebuild.git"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-SITEFILE="50${PN}-gentoo.el"
-
-RDEPEND="
-	app-emacs/company-mode
-	app-emacs/ebuild-mode
-"
-BDEPEND="${RDEPEND}"
diff --git a/app-emacs/company-ebuild/company-ebuild-0.1.1.ebuild b/app-emacs/company-ebuild/company-ebuild-0.1.1.ebuild
deleted file mode 100644
index febf2b249a55..000000000000
--- a/app-emacs/company-ebuild/company-ebuild-0.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS=25.1
-
-inherit elisp
-
-DESCRIPTION="Company backend for editing Ebuild files"
-HOMEPAGE="https://gitweb.gentoo.org/proj/company-ebuild.git"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-SITEFILE="50${PN}-gentoo.el"
-
-RDEPEND="
-	app-emacs/company-mode
-	app-emacs/ebuild-mode
-"
-BDEPEND="${RDEPEND}"
diff --git a/app-emacs/company-ebuild/company-ebuild-0.1.2.ebuild b/app-emacs/company-ebuild/company-ebuild-0.1.4.ebuild
index 678f43ec2830..66db76c329b8 100644
--- a/app-emacs/company-ebuild/company-ebuild-0.1.2.ebuild
+++ b/app-emacs/company-ebuild/company-ebuild-0.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 fi
 
 LICENSE="GPL-2+"
@@ -24,7 +24,7 @@ SLOT="0"
 SITEFILE="50${PN}-gentoo.el"
 
 RDEPEND="
+	>=app-emacs/ebuild-mode-1.64
 	app-emacs/company-mode
-	app-emacs/ebuild-mode
 "
 BDEPEND="${RDEPEND}"
diff --git a/app-emacs/company-ebuild/company-ebuild-9999.ebuild b/app-emacs/company-ebuild/company-ebuild-9999.ebuild
index 678f43ec2830..11810d301043 100644
--- a/app-emacs/company-ebuild/company-ebuild-9999.ebuild
+++ b/app-emacs/company-ebuild/company-ebuild-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="GPL-2+"
@@ -24,7 +24,7 @@ SLOT="0"
 SITEFILE="50${PN}-gentoo.el"
 
 RDEPEND="
+	>=app-emacs/ebuild-mode-1.64
 	app-emacs/company-mode
-	app-emacs/ebuild-mode
 "
 BDEPEND="${RDEPEND}"