gentoo resync : 24.06.2021

3 files changed, 38 insertions, 23 deletions

diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index ecd1805e9047..39251018df21 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,3 +1,3 @@
 DIST PyQt-builder-1.10.1.tar.gz 5725429 BLAKE2B e7aaa0a3c1eb8aeea0aa5f2d5d7beda1edc46e90c0a21b608d2dffe205a67170daaa6615253706b5f9856a27d66715692ceffe81b9b45eafd4d608df79741d6f SHA512 2e48c1066bb12c1f50700933b0f489158f29f62a1239b570dc053cb042eca9bd4ee83f66b855b0596cfb6dc2e844434c15563abbb3846bf5960d03441f497b83
-EBUILD PyQt-builder-1.10.1.ebuild 697 BLAKE2B 051cc303748b9ac79b2beade93c91cf3dfccde5c859d1d3f9f92a4c5d7c06bc37b92cf4080fb46d0611fcc6f199b74808797fec220f9a4dacb53e7b161618cfe SHA512 e88d0310d1ab22d1cc47fc0c4d246ed53fa0a92f678c9e34e0254f46eec075f58a9ad51ed032a93fef89473bca2b8cb1f81c7c795b9a47884b8cdb5be4d23ca1
+EBUILD PyQt-builder-1.10.1-r1.ebuild 946 BLAKE2B bc1cf71df7e275343282ac06e499ee38115689322adc45dc207bd857c39f180943aae8ceffeae8c81138bfc6b0edb3c1a3f9c189f4287cfe911762f7bb2d47b8 SHA512 6ea580d1b7b7304e4d948b500a9d4af3f2b35be743e723cac25dbd97883fc94259074561781b69d3e99e305fdbcfe7350f0825eec178b1a2f647371a68197f89
 MISC metadata.xml 665 BLAKE2B 156bcbd9a31940a4074d395521e71452f45fc725c88825e412a73751bb869621ba3ac8fa8a96cd269130468ca28d7fbf04525b6a2caf9b871f426040e6d6c9d1 SHA512 56505229aa14dd577033cd534a837fcc3584cb4d1b482e59d65ee439b49a42cd21e3ae1ca7a02227e6183e265506910e7993d52a8c4ec9e17e44273204aedfc6
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
new file mode 100644
index 000000000000..2ab937144848
--- /dev/null
+++ b/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The PEP 517 compliant PyQt build system"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/sip-5.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc --no-autodoc
+
+python_prepare_all() {
+	# don't install prebuilt Windows DLLs
+	sed -i -e "s:'dlls/\*/\*',::" setup.py || die
+	rm -r "${PN/-/_}.egg-info" || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild
deleted file mode 100644
index c7f4ec9ff355..000000000000
--- a/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="The PEP 517 compliant PyQt build system"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/ https://www.riverbankcomputing.com/static/Docs/PyQt-builder/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-RDEPEND="dev-python/sip[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-}