6 files changed, 56 insertions, 43 deletions
diff --git a/app-emacs/wgrep/Manifest b/app-emacs/wgrep/Manifest
index ed43c71ee617..1db21b5c70ed 100644
--- a/app-emacs/wgrep/Manifest
+++ b/app-emacs/wgrep/Manifest
@@ -1,2 +1 @@
-DIST wgrep-2.3.0.tar.gz 16241 BLAKE2B 83802934b36dfcad17e3486a7405cdd170b20bd6574d92032c92aa2a8ae84a2b6ce47313c8ca70327982bebc4fb78363181c66d1c745d2179ba84fc655c617be SHA512 2f817ef482d8ce98531494a5f19f477d7544bcc8b2747ebe184194a058c6cb26d571ba7de22f7e4307aa110806fa45f683b2363b1520b8fe5edaa05ce5ba8d61
-DIST wgrep-2.3.2.tar.gz 28908 BLAKE2B 992557cd59ac6887cec71c7dceac27ad5cfc153a09b68a1e312466077dfa08a6efb7e49ba24b06196daf41b2781f17a5d3f0c3f7b6ee28590d42db5a7de2a141 SHA512 a0a00f1d845c45f5de0e707ea5c8c14f9b01807533d7124be9fe0bfdd2d28c3e6fce2a4695daa1de880dd5ff5986b0533b3a5688790a7674576599fb2667ae76
+DIST wgrep-3.0.0.tar.gz 29569 BLAKE2B 0113c790e9903840e8dd421def45bc73b914b61d9beb7b178275efb623d735cdadcc3d96c361a88a293f437d906528d84c3876be5aee46caad22f0743ed40549 SHA512 8e93e824bafe8b9018e82d5fb57104c2324df62798214d848ff98bb86865d4a8e56df1e4efede49966555cb9af5059699c2d178722d8462ddc5977a5abd3d799
diff --git a/app-emacs/wgrep/files/50wgrep-gentoo.el b/app-emacs/wgrep/files/50wgrep-gentoo.el
deleted file mode 100644
index 431f7e90ae73..000000000000
--- a/app-emacs/wgrep/files/50wgrep-gentoo.el
+++ /dev/null
@@ -1 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/wgrep/metadata.xml b/app-emacs/wgrep/metadata.xml
index 17aeabbf12e6..1c55026da3ed 100644
--- a/app-emacs/wgrep/metadata.xml
+++ b/app-emacs/wgrep/metadata.xml
@@ -11,6 +11,7 @@
 </longdescription>
 <stabilize-allarches/>
 <upstream>
+  <bugs-to>https://github.com/mhayashi1120/Emacs-wgrep/issues/</bugs-to>
   <remote-id type="github">mhayashi1120/Emacs-wgrep</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/app-emacs/wgrep/wgrep-2.3.0.ebuild b/app-emacs/wgrep/wgrep-2.3.0.ebuild
deleted file mode 100644
index 49a49ce55175..000000000000
--- a/app-emacs/wgrep/wgrep-2.3.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="Writable grep buffer and apply the changes to files"
-HOMEPAGE="https://github.com/mhayashi1120/Emacs-wgrep"
-SRC_URI="https://github.com/mhayashi1120/Emacs-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/Emacs-${P}"
-SITEFILE="50${PN}-gentoo.el"
-DOC_CONTENTS="See commentary in ${SITELISP}/${PN}/wgrep.el for documentation.
-	\n\nTo activate wgrep, add the following line to your ~/.emacs file:
-	\n\t(require 'wgrep)"
diff --git a/app-emacs/wgrep/wgrep-2.3.2.ebuild b/app-emacs/wgrep/wgrep-2.3.2.ebuild
deleted file mode 100644
index 0833f3eca7da..000000000000
--- a/app-emacs/wgrep/wgrep-2.3.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="Writable grep buffer and apply the changes to files"
-HOMEPAGE="https://github.com/mhayashi1120/Emacs-wgrep"
-SRC_URI="https://github.com/mhayashi1120/Emacs-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/Emacs-${P}"
-SITEFILE="50${PN}-gentoo.el"
-DOC_CONTENTS="See commentary in ${SITELISP}/${PN}/wgrep.el for documentation.
-	\n\nTo activate wgrep, add the following line to your ~/.emacs file:
-	\n\t(require 'wgrep)"
diff --git a/app-emacs/wgrep/wgrep-3.0.0-r1.ebuild b/app-emacs/wgrep/wgrep-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..6eeca706896b
--- /dev/null
+++ b/app-emacs/wgrep/wgrep-3.0.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Writable grep buffer and apply the changes to files"
+HOMEPAGE="https://github.com/mhayashi1120/Emacs-wgrep/"
+SRC_URI="https://github.com/mhayashi1120/Emacs-${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/Emacs-${P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-emacs/s
+		app-emacs/dash
+	)
+"
+
+ELISP_REMOVE="${PN}-subtest.el"
+
+DOCS=( README.md )
+DOC_CONTENTS="See commentary in ${SITELISP}/${PN}/wgrep.el for documentation.
+	\n\nTo activate wgrep, add the following line to your ~/.emacs file:
+	\n\t(require 'wgrep)"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	if ! use test ; then
+		rm ${PN}-test.el || die
+	fi
+
+	elisp_src_prepare
+}
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -l ${PN}.el -l ${PN}-test.el    \
+		-f ert-run-tests-batch-and-exit || die "tests failed"
+}
+
+src_install() {
+	if use test ; then
+	   rm ${PN}-test.el{,c} || die
+	fi
+
+	elisp_src_install
+}