commit: 3ba7c056c26a277d46f9a113ca1c19da01f976ea
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 22 01:50:12 2021 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 22 01:50:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba7c056
dev-python/PyQt-builder: don't install Windows DLLs; fix deps; add USE=doc
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
.../PyQt-builder-1.10.1-r1.ebuild} | 20 +++++++++++++-------
dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild | 22 ----------------------
dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild | 2 +-
dev-python/sip/sip-5.5.0-r2.ebuild | 2 +-
dev-python/sip/sip-6.1.1.ebuild | 2 +-
5 files changed, 16 insertions(+), 32 deletions(-)
diff --git a/dev-python/sip/sip-5.5.0-r2.ebuild
b/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
similarity index 53%
copy from dev-python/sip/sip-5.5.0-r2.ebuild
copy to dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
index 4441c9dae79..2ab93714484 100644
--- a/dev-python/sip/sip-5.5.0-r2.ebuild
+++ b/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/
https://pypi.org/project/sip/";
+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
@@ -17,15 +17,21 @@ else
fi
S=${WORKDIR}/${MY_P}
-SLOT="5"
LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
RDEPEND="
- !<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
- !=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/toml[${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 c7f4ec9ff35..00000000000
--- 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
-}
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
index c7239b0887e..7b6eacca3cc 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
@@ -17,6 +17,6 @@ else
fi
S=${WORKDIR}/${MY_P}
-SLOT="0/$(ver_cut 1)"
LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0/$(ver_cut 1)"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
diff --git a/dev-python/sip/sip-5.5.0-r2.ebuild
b/dev-python/sip/sip-5.5.0-r2.ebuild
index 4441c9dae79..a541809c48f 100644
--- a/dev-python/sip/sip-5.5.0-r2.ebuild
+++ b/dev-python/sip/sip-5.5.0-r2.ebuild
@@ -17,8 +17,8 @@ else
fi
S=${WORKDIR}/${MY_P}
-SLOT="5"
LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="
diff --git a/dev-python/sip/sip-6.1.1.ebuild b/dev-python/sip/sip-6.1.1.ebuild
index 4441c9dae79..a541809c48f 100644
--- a/dev-python/sip/sip-6.1.1.ebuild
+++ b/dev-python/sip/sip-6.1.1.ebuild
@@ -17,8 +17,8 @@ else
fi
S=${WORKDIR}/${MY_P}
-SLOT="5"
LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="
