gentoo auto-resync : 30:10:2022 - 15:03:33

4 files changed, 26 insertions, 115 deletions

diff --git a/dev-util/gef/Manifest b/dev-util/gef/Manifest
index e58ba3d6f6e5..2ccfd8ee4ddd 100644
--- a/dev-util/gef/Manifest
+++ b/dev-util/gef/Manifest
@@ -1,6 +1,4 @@
-DIST gef-2022.01.tar.gz 211779 BLAKE2B 1cb501cc7e05b1f96bb1d3ea42c8970273aea717b927f90120dbc5d0b5d9d7e28a89d1b1eb8a969406dfcd4f06f23e703e3aaa27a5a294b0d454d41b82b7bd12 SHA512 4e89ab889933464711c7a990df7fe6a6c014b80e9f5ad5e77382c3938413d31d03838e2215225defae88008b2ca0e577edeb01189189ea5e37d07204375fb47b
 DIST gef-2022.06.tar.gz 217503 BLAKE2B b7038e0519f216669c38bdda7e12375fb1c9e5278c8b617df73932a750ee6552531929eebcac22321607f51592834ece70c850ce0ba4629bc383731bc8803bb3 SHA512 585bad8655a5208d060b1ccf455ab87527e47949fce1df188a5ac970ccd1bbfbdd87151f7a940edcfb879dd0ea846b5c4a8650fed856cd5dcaec0ddd3581f100
-EBUILD gef-2022.01.ebuild 1661 BLAKE2B 83010f4388cb5093d4e2c8bba19520ea1d6427f38f2a0f1c77d1c87e152c9358fa9e5c4f841a8cc77f8a3653ecd6ba5a06f3ea36a24b81ef9857382a972671a1 SHA512 6123c66afd5deb56c6059ac3e40919518ddcbc7b80f214210b70192da8a0ab912b431c451e28838e42d673d19c5fe853b22643d1b5c3a04136a8a3f2a5c4b3d2
-EBUILD gef-2022.06.ebuild 1685 BLAKE2B 29c74027d0fe370c1b61916bf217ffe5707df6b6124b0e28e88d772db107a8697694b241109fef6b94f8515d08d5bc8ffb63193ed1bd8c6b847a7dcb8b7c73ea SHA512 bfd14004f672d8604f7f6552d00236dcbb38e2ffa031ef64bcce834c5cd7a8c6764c6f3706bb2b2b525a87e935bbb4f5bfdc1986cee65678c60649bc39cb7aa3
-EBUILD gef-9999.ebuild 1685 BLAKE2B 29c74027d0fe370c1b61916bf217ffe5707df6b6124b0e28e88d772db107a8697694b241109fef6b94f8515d08d5bc8ffb63193ed1bd8c6b847a7dcb8b7c73ea SHA512 bfd14004f672d8604f7f6552d00236dcbb38e2ffa031ef64bcce834c5cd7a8c6764c6f3706bb2b2b525a87e935bbb4f5bfdc1986cee65678c60649bc39cb7aa3
+EBUILD gef-2022.06-r1.ebuild 1581 BLAKE2B adbd5b8a92cc4c00017a3198d5bdc20159835690f03c110db86cfe9c63ab9d6b8c1b646bb21a0f5c274b4952c2636a964666389f091e50fc8a31477bc6909139 SHA512 6d600abdecc59fad693c48b17bda5753a2c66de61878fe12073ffa919887520ea9c0726098b0900c6e0796763660e9511d54efabb23aa52fb8a365b26e8137f6
+EBUILD gef-9999.ebuild 1581 BLAKE2B adbd5b8a92cc4c00017a3198d5bdc20159835690f03c110db86cfe9c63ab9d6b8c1b646bb21a0f5c274b4952c2636a964666389f091e50fc8a31477bc6909139 SHA512 6d600abdecc59fad693c48b17bda5753a2c66de61878fe12073ffa919887520ea9c0726098b0900c6e0796763660e9511d54efabb23aa52fb8a365b26e8137f6
 MISC metadata.xml 995 BLAKE2B f4c30ac2ea932c90b74800c44389169199cdc189e69584a3873c91b36086eb30b5d463a12a5b08cc45196aa57e939d00806e3d1e96fbb647c997ab891a312ea0 SHA512 b4e09578a7f5656688dced42d1f924ba928b59abcb8345fe143be11ae30b553cda26663c6771a99e44ffc9f72c187b871ee2d1c096bf49d37b1e0fd460653ad4
diff --git a/dev-util/gef/gef-2022.01.ebuild b/dev-util/gef/gef-2022.01.ebuild
deleted file mode 100644
index e29ca85b5b66..000000000000
--- a/dev-util/gef/gef-2022.01.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit python-single-r1 wrapper
-
-DESCRIPTION="A GDB Enhanced Features for exploit devs & reversers"
-HOMEPAGE="https://github.com/hugsy/gef"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hugsy/gef"
-else
-	SRC_URI="https://github.com/hugsy/gef/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-# Seem to hang right now?
-RESTRICT="!test? ( test ) test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-util/ropper[${PYTHON_SINGLE_USEDEP}]
-	sys-devel/gdb[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-libs/capstone[python,${PYTHON_USEDEP}]
-		dev-libs/keystone[python,${PYTHON_USEDEP}]
-		dev-python/pylint[${PYTHON_USEDEP}]
-		dev-util/unicorn[python,${PYTHON_USEDEP}]
-	')"
-
-BDEPEND="doc? ( dev-python/mkdocs )
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		')
-	)"
-
-src_prepare() {
-	default
-
-	sed -i -e '/pylint/d' requirements.txt || die
-}
-
-src_compile() {
-	# Tries to compile tests
-	:
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r *.py
-
-	python_optimize "${ED}"/usr/share/${PN}
-
-	make_wrapper "gdb-gef" \
-	"gdb -ex \"source ${EPREFIX}/usr/share/${PN}/gef.py\"" || die
-
-	if use doc; then
-		# TODO: docs.eclass?
-		mkdocs build -d html || die
-
-		rm "${WORKDIR}"/${P}/html/sitemap.xml.gz || die
-		dodoc -r html/
-	fi
-
-	dodoc README.md
-}
-
-pkg_postinst() {
-	einfo "\nUsage:"
-	einfo "    ~$ gdb-gef <program>\n"
-}
diff --git a/dev-util/gef/gef-2022.06.ebuild b/dev-util/gef/gef-2022.06-r1.ebuild
index f6f2afc9a0ad..9e741b58d560 100644
--- a/dev-util/gef/gef-2022.06.ebuild
+++ b/dev-util/gef/gef-2022.06-r1.ebuild
@@ -5,7 +5,12 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit python-single-r1 wrapper
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material
+"
+
+inherit python-single-r1 docs wrapper
 
 DESCRIPTION="A GDB Enhanced Features for exploit devs & reversers"
 HOMEPAGE="https://github.com/hugsy/gef"
@@ -20,7 +25,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc test"
+IUSE="test"
 # Seem to hang right now?
 RESTRICT="!test? ( test ) test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -37,10 +42,6 @@ RDEPEND="
 	')"
 
 BDEPEND="
-	doc? (
-		dev-python/mkdocs
-		dev-python/mkdocs-material
-	)
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/pytest[${PYTHON_USEDEP}]
@@ -48,6 +49,8 @@ BDEPEND="
 		')
 	)"
 
+DOCS=( README.md )
+
 src_prepare() {
 	default
 
@@ -57,6 +60,8 @@ src_prepare() {
 src_compile() {
 	# Tries to compile tests
 	:
+
+	docs_compile
 }
 
 src_install() {
@@ -68,15 +73,7 @@ src_install() {
 	make_wrapper "gdb-gef" \
 		"gdb -x \"/usr/share/${PN}/gef.py\"" || die
 
-	if use doc; then
-		# TODO: docs.eclass?
-		mkdocs build -d html || die
-
-		rm "${WORKDIR}/${P}/html/sitemap.xml.gz" || die
-		dodoc -r html/
-	fi
-
-	dodoc README.md
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/dev-util/gef/gef-9999.ebuild b/dev-util/gef/gef-9999.ebuild
index f6f2afc9a0ad..9e741b58d560 100644
--- a/dev-util/gef/gef-9999.ebuild
+++ b/dev-util/gef/gef-9999.ebuild
@@ -5,7 +5,12 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit python-single-r1 wrapper
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material
+"
+
+inherit python-single-r1 docs wrapper
 
 DESCRIPTION="A GDB Enhanced Features for exploit devs & reversers"
 HOMEPAGE="https://github.com/hugsy/gef"
@@ -20,7 +25,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc test"
+IUSE="test"
 # Seem to hang right now?
 RESTRICT="!test? ( test ) test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -37,10 +42,6 @@ RDEPEND="
 	')"
 
 BDEPEND="
-	doc? (
-		dev-python/mkdocs
-		dev-python/mkdocs-material
-	)
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/pytest[${PYTHON_USEDEP}]
@@ -48,6 +49,8 @@ BDEPEND="
 		')
 	)"
 
+DOCS=( README.md )
+
 src_prepare() {
 	default
 
@@ -57,6 +60,8 @@ src_prepare() {
 src_compile() {
 	# Tries to compile tests
 	:
+
+	docs_compile
 }
 
 src_install() {
@@ -68,15 +73,7 @@ src_install() {
 	make_wrapper "gdb-gef" \
 		"gdb -x \"/usr/share/${PN}/gef.py\"" || die
 
-	if use doc; then
-		# TODO: docs.eclass?
-		mkdocs build -d html || die
-
-		rm "${WORKDIR}/${P}/html/sitemap.xml.gz" || die
-		dodoc -r html/
-	fi
-
-	dodoc README.md
+	einstalldocs
 }
 
 pkg_postinst() {