1 |
commit: 3ba7c056c26a277d46f9a113ca1c19da01f976ea |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 22 01:50:12 2021 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 22 01:50:12 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba7c056 |
7 |
|
8 |
dev-python/PyQt-builder: don't install Windows DLLs; fix deps; add USE=doc |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org> |
12 |
|
13 |
.../PyQt-builder-1.10.1-r1.ebuild} | 20 +++++++++++++------- |
14 |
dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild | 22 ---------------------- |
15 |
dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild | 2 +- |
16 |
dev-python/sip/sip-5.5.0-r2.ebuild | 2 +- |
17 |
dev-python/sip/sip-6.1.1.ebuild | 2 +- |
18 |
5 files changed, 16 insertions(+), 32 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/sip/sip-5.5.0-r2.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild |
21 |
similarity index 53% |
22 |
copy from dev-python/sip/sip-5.5.0-r2.ebuild |
23 |
copy to dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild |
24 |
index 4441c9dae79..2ab93714484 100644 |
25 |
--- a/dev-python/sip/sip-5.5.0-r2.ebuild |
26 |
+++ b/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild |
27 |
@@ -6,8 +6,8 @@ EAPI=7 |
28 |
PYTHON_COMPAT=( python3_{8..10} ) |
29 |
inherit distutils-r1 |
30 |
|
31 |
-DESCRIPTION="Python bindings generator for C/C++ libraries" |
32 |
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/" |
33 |
+DESCRIPTION="The PEP 517 compliant PyQt build system" |
34 |
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/" |
35 |
|
36 |
MY_P=${PN}-${PV/_pre/.dev} |
37 |
if [[ ${PV} == *_pre* ]]; then |
38 |
@@ -17,15 +17,21 @@ else |
39 |
fi |
40 |
S=${WORKDIR}/${MY_P} |
41 |
|
42 |
-SLOT="5" |
43 |
LICENSE="|| ( GPL-2 GPL-3 SIP )" |
44 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
45 |
+SLOT="0" |
46 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
47 |
|
48 |
RDEPEND=" |
49 |
- !<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}] |
50 |
- !=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}] |
51 |
dev-python/packaging[${PYTHON_USEDEP}] |
52 |
- dev-python/toml[${PYTHON_USEDEP}] |
53 |
+ >=dev-python/sip-5.5[${PYTHON_USEDEP}] |
54 |
" |
55 |
|
56 |
distutils_enable_sphinx doc --no-autodoc |
57 |
+ |
58 |
+python_prepare_all() { |
59 |
+ # don't install prebuilt Windows DLLs |
60 |
+ sed -i -e "s:'dlls/\*/\*',::" setup.py || die |
61 |
+ rm -r "${PN/-/_}.egg-info" || die |
62 |
+ |
63 |
+ distutils-r1_python_prepare_all |
64 |
+} |
65 |
|
66 |
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild |
67 |
deleted file mode 100644 |
68 |
index c7f4ec9ff35..00000000000 |
69 |
--- a/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild |
70 |
+++ /dev/null |
71 |
@@ -1,22 +0,0 @@ |
72 |
-# Copyright 2021 Gentoo Authors |
73 |
-# Distributed under the terms of the GNU General Public License v2 |
74 |
- |
75 |
-EAPI=7 |
76 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
77 |
-PYTHON_COMPAT=( python3_{7..10} ) |
78 |
- |
79 |
-inherit distutils-r1 |
80 |
- |
81 |
-DESCRIPTION="The PEP 517 compliant PyQt build system" |
82 |
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/ https://www.riverbankcomputing.com/static/Docs/PyQt-builder/" |
83 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
84 |
- |
85 |
-LICENSE="|| ( GPL-2 GPL-3 SIP )" |
86 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
87 |
-SLOT="0" |
88 |
-RDEPEND="dev-python/sip[${PYTHON_USEDEP}]" |
89 |
-BDEPEND="${RDEPEND}" |
90 |
- |
91 |
-src_install() { |
92 |
- distutils-r1_src_install |
93 |
-} |
94 |
|
95 |
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild |
96 |
index c7239b0887e..7b6eacca3cc 100644 |
97 |
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild |
98 |
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild |
99 |
@@ -17,6 +17,6 @@ else |
100 |
fi |
101 |
S=${WORKDIR}/${MY_P} |
102 |
|
103 |
-SLOT="0/$(ver_cut 1)" |
104 |
LICENSE="|| ( GPL-2 GPL-3 SIP )" |
105 |
+SLOT="0/$(ver_cut 1)" |
106 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
107 |
|
108 |
diff --git a/dev-python/sip/sip-5.5.0-r2.ebuild b/dev-python/sip/sip-5.5.0-r2.ebuild |
109 |
index 4441c9dae79..a541809c48f 100644 |
110 |
--- a/dev-python/sip/sip-5.5.0-r2.ebuild |
111 |
+++ b/dev-python/sip/sip-5.5.0-r2.ebuild |
112 |
@@ -17,8 +17,8 @@ else |
113 |
fi |
114 |
S=${WORKDIR}/${MY_P} |
115 |
|
116 |
-SLOT="5" |
117 |
LICENSE="|| ( GPL-2 GPL-3 SIP )" |
118 |
+SLOT="5" |
119 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
120 |
|
121 |
RDEPEND=" |
122 |
|
123 |
diff --git a/dev-python/sip/sip-6.1.1.ebuild b/dev-python/sip/sip-6.1.1.ebuild |
124 |
index 4441c9dae79..a541809c48f 100644 |
125 |
--- a/dev-python/sip/sip-6.1.1.ebuild |
126 |
+++ b/dev-python/sip/sip-6.1.1.ebuild |
127 |
@@ -17,8 +17,8 @@ else |
128 |
fi |
129 |
S=${WORKDIR}/${MY_P} |
130 |
|
131 |
-SLOT="5" |
132 |
LICENSE="|| ( GPL-2 GPL-3 SIP )" |
133 |
+SLOT="5" |
134 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
135 |
|
136 |
RDEPEND=" |