From b89a664f266dab3b9b5ddac2cb874f8869142370 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 13 Oct 2022 01:41:21 +0100
Subject: gentoo auto-resync : 13:10:2022 - 01:41:21

---
 dev-util/pkgdev/Manifest           |  2 +-
 dev-util/pkgdev/pkgdev-9999.ebuild | 28 +++++-----------------------
 2 files changed, 6 insertions(+), 24 deletions(-)

(limited to 'dev-util/pkgdev')

diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index e98918530e31..87bb43690e79 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -5,5 +5,5 @@ DIST pkgdev-0.2.2-docs.tar.xz 5496 BLAKE2B 46df2c14370dbe1312e43e08388aa9a3f13e9
 DIST pkgdev-0.2.2.tar.gz 66977 BLAKE2B 50b7c06339438ada28ffc9e8e8ba0c472342cbe447790ec7df7506979a1865ebdcd317071833b05091e3749f78857867729e905c1a971bf04e44137337106abe SHA512 f154c7442c40fb1ef5fe9917079db4ddf5bfda4b4d7ca964b9a11fad2a273e79971455142e99905e2293babf73b45d26974480faf0c5c1b25057afc6d658bdc2
 EBUILD pkgdev-0.2.1-r3.ebuild 2441 BLAKE2B 99cdd71ce398fc02d96ae8cdae0cced060e3854aaa802dd3fa118166f60726d26181ee8a76c191c8b8c8daa4e2028600e92e5f257ff7d93b5626aa59e8897261 SHA512 632fbc60b508672044e7981f9fcb9e9b9df64a187bb371fc2f7e579f5a7e1f21ccb03794288e1808b395b5e6b949fa4824240f85add9210453cb39ae529d5bb8
 EBUILD pkgdev-0.2.2.ebuild 2398 BLAKE2B d226f59a1674e3726c7b4cfb162470243e5435c5d23711381e359ac7687f55faaa7fd0d5913a23a07e8372ac2e7034ec8d29ab1c001fd7a0f36b2e9689597010 SHA512 dc3026258c5f3f9bf84cfa05a9322bc797bc49c90b22c0adeef4c0604a6af3e39c2034e772c6637024c287525842fe98835bc18f280f67fadac336a9fc312bac
-EBUILD pkgdev-9999.ebuild 2392 BLAKE2B c56f5f559c8a4b4b4726c6f92a764069410af473d07aaa44cea78ead6eaa590fd282859eafe7262fc471cd6f42bc5ba9e261e79e96aeefd0ddc70ace9e9d733d SHA512 73f384ed2b5aee56ed5c24ae0b9ed46dfa10b33807d36e36af3208704a02b056df0c9304c3139332f27b2646f9eb30b2290a3ee7c93a4e5e2bc708a0c7d75759
+EBUILD pkgdev-9999.ebuild 1633 BLAKE2B 3f13b2a4108d5005cdf614ecb8b394c4014f4a4e18d0ef77f0d792d2d3608e66186b345abf4fc5b77240af1168f9a3b5e08fa6389f6f6f9f7588fd10abfe3bc5 SHA512 348e552b87ed615fbc73c8dbda0259804715c76fd0f8b509ec0302b52bda60a4fd5d4f6bda4f1f16fbe5ea016f19b8bb3d457d4f80de62004cc9d7954a93b989
 MISC metadata.xml 606 BLAKE2B 9c87b0b058df2a15ad455e54499d6a52e31e5c8f51187d36a42a775f1fa03745c69c99179a21f8c44f64562f78ddade051a2a4568b7984600fc529f35e36811a SHA512 5c7151cd72132faf4d47837a58812aefb919edca3fb613a6751de265994bff327515a07d80dfe175069bde7097581f10cb453dde1545383e300735dfcac09bec
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 2dd46fdefcc4..7fdd98f7203c 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -3,18 +3,8 @@
 
 EAPI=8
 
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-pkgdev-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${PKGDEV_DOCS_PREBUILT:=1}
-
-PKGDEV_DOCS_PREBUILT_DEV=sam
-PKGDEV_DOCS_VERSION=$(ver_cut 1-3)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-PKGDEV_DOCS_USEFLAG="+doc"
-
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
@@ -24,11 +14,6 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-	if [[ ${PKGDEV_DOCS_PREBUILT} -eq 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${PKGDEV_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${PKGDEV_DOCS_VERSION}-docs.tar.xz )"
-	fi
-
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
@@ -37,10 +22,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgdev"
 
 LICENSE="BSD MIT"
 SLOT="0"
-
-[[ ${PKGDEV_DOCS_PREBUILT} == 1 ]] && PKGDEV_DOCS_USEFLAG="doc"
-
-IUSE="${PKGDEV_DOCS_USEFLAG}"
+IUSE="doc"
 
 if [[ ${PV} == *9999 ]] ; then
 	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
@@ -74,10 +56,10 @@ python_compile_all() {
 
 python_install_all() {
 	# If USE=doc, there'll be newly generated docs which we install instead.
-	if use doc ; then
+	if use doc; then
 		doman doc/_build/man/*
-	elif ! use doc && [[ ${PKGDEV_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${PKGDEV_DOCS_VERSION}-docs/man/*.[0-8]
+	elif [[ ${PV} != *9999 ]]; then
+		doman man/*.[0-8]
 	fi
 
 	distutils-r1_python_install_all
-- 
cgit v1.2.3