Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pycups/
Date: Wed, 05 Feb 2020 19:37:26
Message-Id: 1580931421.006c567482a3a7b426a033ec0a674d470e57877c.mgorny@gentoo
1 commit: 006c567482a3a7b426a033ec0a674d470e57877c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 5 19:19:09 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 5 19:37:01 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=006c5674
7
8 dev-python/pycups: Remove py2
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/pycups/pycups-1.9.73-r1.ebuild | 31 ++-----------------------------
13 dev-python/pycups/pycups-1.9.73-r2.ebuild | 31 ++-----------------------------
14 2 files changed, 4 insertions(+), 58 deletions(-)
15
16 diff --git a/dev-python/pycups/pycups-1.9.73-r1.ebuild b/dev-python/pycups/pycups-1.9.73-r1.ebuild
17 index 739e5b77d60..2fc406f3ca5 100644
18 --- a/dev-python/pycups/pycups-1.9.73-r1.ebuild
19 +++ b/dev-python/pycups/pycups-1.9.73-r1.ebuild
20 @@ -3,7 +3,7 @@
21
22 EAPI=6
23
24 -PYTHON_COMPAT=( python{2_7,3_6} )
25 +PYTHON_COMPAT=( python3_6 )
26 inherit distutils-r1
27
28 DESCRIPTION="Python bindings for the CUPS API"
29 @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
30 LICENSE="GPL-2"
31 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
32 SLOT="0"
33 -IUSE="doc examples"
34 +IUSE="examples"
35
36 RDEPEND="
37 net-print/cups
38 @@ -23,33 +23,6 @@ DEPEND="
39 ${RDEPEND}
40 "
41
42 -# epydoc kinda sucks and supports python2 only (it's dead too),
43 -# and since we're dealing with a binary module we need exact version
44 -# match. therefore, docbuilding *requires* any python2 being enabled.
45 -
46 -DEPEND="${RDEPEND}
47 - doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )
48 -"
49 -
50 -REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
51 -
52 -pkg_setup() {
53 - use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
54 -}
55 -
56 -python_compile() {
57 - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
58 - distutils-r1_python_compile
59 -}
60 -
61 -python_compile_all() {
62 - if use doc; then
63 - # we can't use Makefile since it relies on hardcoded paths
64 - epydoc -o html --html cups || die "doc build failed"
65 - HTML_DOCS=( html/. )
66 - fi
67 -}
68 -
69 python_install_all() {
70 if use examples; then
71 dodoc -r examples
72
73 diff --git a/dev-python/pycups/pycups-1.9.73-r2.ebuild b/dev-python/pycups/pycups-1.9.73-r2.ebuild
74 index 5cc54abd0a7..f1ce8a33d07 100644
75 --- a/dev-python/pycups/pycups-1.9.73-r2.ebuild
76 +++ b/dev-python/pycups/pycups-1.9.73-r2.ebuild
77 @@ -3,7 +3,7 @@
78
79 EAPI=7
80
81 -PYTHON_COMPAT=( python{2_7,3_6,3_7} )
82 +PYTHON_COMPAT=( python{3_6,3_7} )
83 inherit distutils-r1
84
85 DESCRIPTION="Python bindings for the CUPS API"
86 @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
87 LICENSE="GPL-2"
88 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
89 SLOT="0"
90 -IUSE="doc examples"
91 +IUSE="examples"
92
93 RDEPEND="
94 net-print/cups
95 @@ -23,33 +23,6 @@ DEPEND="
96 ${RDEPEND}
97 "
98
99 -# epydoc kinda sucks and supports python2 only (it's dead too),
100 -# and since we're dealing with a binary module we need exact version
101 -# match. therefore, docbuilding *requires* any python2 being enabled.
102 -
103 -DEPEND="${RDEPEND}
104 - doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )
105 -"
106 -
107 -REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
108 -
109 -pkg_setup() {
110 - use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
111 -}
112 -
113 -python_compile() {
114 - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
115 - distutils-r1_python_compile
116 -}
117 -
118 -python_compile_all() {
119 - if use doc; then
120 - # we can't use Makefile since it relies on hardcoded paths
121 - epydoc -o html --html cups || die "doc build failed"
122 - HTML_DOCS=( html/. )
123 - fi
124 -}
125 -
126 python_install_all() {
127 if use examples; then
128 dodoc -r examples