Gentoo Archives: gentoo-commits

From: Anna Vyalkova <cyber+gentoo@×××××.in>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-python/clickgen/files/, dev-python/clickgen/
Date: Sat, 08 Jan 2022 14:18:28
Message-Id: 1641651491.f969fea41b4c03d45595f6ce4f34c3abc885a102.cybertailor@gentoo
1 commit: f969fea41b4c03d45595f6ce4f34c3abc885a102
2 Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
3 AuthorDate: Sat Jan 8 13:56:26 2022 +0000
4 Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
5 CommitDate: Sat Jan 8 14:18:11 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f969fea4
7
8 dev-python/clickgen: fix flags
9
10 Closes: https://bugs.gentoo.org/830153
11 Closes: https://bugs.gentoo.org/830152
12 Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
13
14 dev-python/clickgen/Manifest | 2 +-
15 dev-python/clickgen/clickgen-1.1.9.ebuild | 32 ++++++++++++++++++++------
16 dev-python/clickgen/files/clickgen-flags.patch | 17 ++++++++++++++
17 3 files changed, 43 insertions(+), 8 deletions(-)
18
19 diff --git a/dev-python/clickgen/Manifest b/dev-python/clickgen/Manifest
20 index 7e2c82392..5bad63454 100644
21 --- a/dev-python/clickgen/Manifest
22 +++ b/dev-python/clickgen/Manifest
23 @@ -1 +1 @@
24 -DIST clickgen-1.1.9.tar.gz 29614 BLAKE2B 12a5b0846388331c2a066f11033b523421ac7cd9ca2d882f49d7bdacd28af9d373511a9be9201756a0feca171541cd9dcc57a1c9372a2aa98e054fff0767ee74 SHA512 620a9b10897a0fbd5e70eb70ce0d6f6cb7f71f3e2523b50eb53014e837c3b426c690cf3941d105bc56a188b83ab52b6169932c2a01a85e3bd68a6f67b77a8024
25 +DIST clickgen-1.1.9.tar.gz 1616607 BLAKE2B f16dabff6ded51833b79de5441753959643e1542ae56b979f2a88532e29e3a37d1454d3317027e265774ac4140f957b56d7d8c373991485e27f546d208893e4f SHA512 6823733a73cc4f023641325d4b53ea54b579b8168906680d2e5b071a27974b63dac9828c13d14fc73ae8c16844f47f1ed477e8de76352522bfd9abe4de53ffd3
26
27 diff --git a/dev-python/clickgen/clickgen-1.1.9.ebuild b/dev-python/clickgen/clickgen-1.1.9.ebuild
28 index 0f0685c76..f43097573 100644
29 --- a/dev-python/clickgen/clickgen-1.1.9.ebuild
30 +++ b/dev-python/clickgen/clickgen-1.1.9.ebuild
31 @@ -3,20 +3,38 @@
32
33 EAPI=8
34
35 -PYTHON_COMPAT=( python3_{9..10} pypy3 )
36 -inherit distutils-r1
37 +PYTHON_COMPAT=( python3_{8..10} )
38 +inherit distutils-r1 toolchain-funcs
39
40 DESCRIPTION="X11 & Windows cursor building API"
41 -HOMEPAGE="https://github.com/ful1e5/clickgen"
42 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
43 +HOMEPAGE="https://github.com/ful1e5/clickgen https://pypi.org/project/clickgen"
44 +SRC_URI="https://github.com/ful1e5/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
45
46 LICENSE="MIT"
47 SLOT="0"
48 KEYWORDS="~amd64 ~x86"
49
50 -RDEPEND="
51 - dev-python/pillow[${PYTHON_USEDEP}]
52 +DEPEND="
53 media-libs/libpng
54 x11-libs/libX11
55 x11-libs/libXcursor
56 - "
57 +"
58 +RDEPEND="${DEPEND}
59 + dev-python/pillow[${PYTHON_USEDEP}]
60 +"
61 +
62 +PATCHES=( "${FILESDIR}"/${PN}-flags.patch )
63 +
64 +distutils_enable_tests pytest
65 +
66 +distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
67 +
68 +src_configure() {
69 + distutils-r1_src_configure
70 + tc-export CC
71 +}
72 +
73 +python_compile() {
74 + emake -C xcursorgen
75 + distutils-r1_python_compile
76 +}
77
78 diff --git a/dev-python/clickgen/files/clickgen-flags.patch b/dev-python/clickgen/files/clickgen-flags.patch
79 new file mode 100644
80 index 000000000..427f7beb7
81 --- /dev/null
82 +++ b/dev-python/clickgen/files/clickgen-flags.patch
83 @@ -0,0 +1,17 @@
84 +--- a/xcursorgen/makefile
85 ++++ b/xcursorgen/makefile
86 +@@ -1,12 +1,12 @@
87 + all: xcursorgen.so
88 +
89 +-CC= gcc
90 ++CC ?= gcc
91 + LIBS= -lX11 -lXcursor -lpng -lz
92 + OUT_DIR= ../clickgen
93 + CP= cp -f
94 +
95 + xcursorgen.so: xcursorgen.c
96 +- $(CC) -Wl,-zdefs -shared -o xcursorgen.so -fPIC xcursorgen.c $(LIBS)
97 ++ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-zdefs -shared -o xcursorgen.so -fPIC xcursorgen.c $(LIBS)
98 + $(CP) xcursorgen.so $(OUT_DIR)/xcursorgen.so
99 +
100 + clean: