1 |
commit: d95080615f386be38d9b76710149683e751549c6 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 31 16:56:05 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 31 16:58:55 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9508061 |
7 |
|
8 |
x11-base/xcb-proto: Drop old versions |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
x11-base/xcb-proto/Manifest | 1 - |
13 |
.../xcb-proto/files/xcb-proto-1.14-python3_9.patch | 54 ---------------------- |
14 |
x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild | 54 ---------------------- |
15 |
3 files changed, 109 deletions(-) |
16 |
|
17 |
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest |
18 |
index b49c3f1b654..8a02025c775 100644 |
19 |
--- a/x11-base/xcb-proto/Manifest |
20 |
+++ b/x11-base/xcb-proto/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
DIST xcb-proto-1.14.1.tar.xz 143588 BLAKE2B 24983ec26632e93ef2d0c854cd41272925b6f3aab2642701232b73bc37d200d794c46f438e4a4102484e6ac9723e78c923b99cc78ada3541f43eaf0ad7ebc863 SHA512 140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d |
23 |
-DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d SHA512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690 |
24 |
|
25 |
diff --git a/x11-base/xcb-proto/files/xcb-proto-1.14-python3_9.patch b/x11-base/xcb-proto/files/xcb-proto-1.14-python3_9.patch |
26 |
deleted file mode 100644 |
27 |
index 358cd629eb6..00000000000 |
28 |
--- a/x11-base/xcb-proto/files/xcb-proto-1.14-python3_9.patch |
29 |
+++ /dev/null |
30 |
@@ -1,54 +0,0 @@ |
31 |
-diff --git a/xcbgen/align.py b/xcbgen/align.py |
32 |
-index d4c12ee40195cb1986796bed009f5ba70dede1d3..5c4f5177dcb14753dabe6f0c8fee57781202efba 100644 |
33 |
---- a/xcbgen/align.py |
34 |
-+++ b/xcbgen/align.py |
35 |
-@@ -2,7 +2,12 @@ |
36 |
- This module contains helper classes for alignment arithmetic and checks |
37 |
- ''' |
38 |
- |
39 |
--from fractions import gcd |
40 |
-+from sys import version_info |
41 |
-+ |
42 |
-+if version_info[:2] >= (3, 5): |
43 |
-+ from math import gcd |
44 |
-+else: |
45 |
-+ from fractions import gcd |
46 |
- |
47 |
- class Alignment(object): |
48 |
- |
49 |
-diff --git a/xcbgen/matcher.py b/xcbgen/matcher.py |
50 |
-index 97a8b43bb24d29b6414b1e139c73cde966118ea8..a13ef2846fda2d2be249ca0c5dd06d35b90cf6cc 100644 |
51 |
---- a/xcbgen/matcher.py |
52 |
-+++ b/xcbgen/matcher.py |
53 |
-@@ -7,7 +7,12 @@ we do not create a new type object, we just record the existing one under a new |
54 |
- ''' |
55 |
- |
56 |
- from os.path import join |
57 |
--from xml.etree.cElementTree import parse |
58 |
-+from sys import version_info |
59 |
-+ |
60 |
-+if version_info[:2] >= (3, 9): |
61 |
-+ from xml.etree.ElementTree import parse |
62 |
-+else: |
63 |
-+ from xml.etree.cElementTree import parse |
64 |
- |
65 |
- from xcbgen.xtypes import * |
66 |
- |
67 |
-diff --git a/xcbgen/state.py b/xcbgen/state.py |
68 |
-index 0dbecdc7b6f96bbf5f0e549787b20f9986039f1b..3b7eeb42bec1b00e5253aa93e58e0cd1fb7a3389 100644 |
69 |
---- a/xcbgen/state.py |
70 |
-+++ b/xcbgen/state.py |
71 |
-@@ -2,7 +2,12 @@ |
72 |
- This module contains the namespace class and the singleton module class. |
73 |
- ''' |
74 |
- from os.path import dirname, basename |
75 |
--from xml.etree.cElementTree import parse |
76 |
-+from sys import version_info |
77 |
-+ |
78 |
-+if version_info[:2] >= (3, 9): |
79 |
-+ from xml.etree.ElementTree import parse |
80 |
-+else: |
81 |
-+ from xml.etree.cElementTree import parse |
82 |
- |
83 |
- from xcbgen import matcher |
84 |
- from xcbgen.error import * |
85 |
|
86 |
diff --git a/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild b/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild |
87 |
deleted file mode 100644 |
88 |
index f4a157035f9..00000000000 |
89 |
--- a/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild |
90 |
+++ /dev/null |
91 |
@@ -1,54 +0,0 @@ |
92 |
-# Copyright 1999-2020 Gentoo Authors |
93 |
-# Distributed under the terms of the GNU General Public License v2 |
94 |
- |
95 |
-EAPI=7 |
96 |
- |
97 |
-PYTHON_COMPAT=( python3_{6,7,8,9} ) |
98 |
-XORG_TARBALL_SUFFIX="xz" |
99 |
-XORG_MODULE=proto/ |
100 |
-XORG_MULTILIB=yes |
101 |
-XORG_STATIC=no |
102 |
- |
103 |
-inherit python-r1 xorg-3 |
104 |
- |
105 |
-DESCRIPTION="X C-language Bindings protocol headers" |
106 |
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto" |
107 |
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git" |
108 |
- |
109 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
110 |
-IUSE="" |
111 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
112 |
- |
113 |
-DEPEND="" |
114 |
-RDEPEND=" |
115 |
- ${PYTHON_DEPS} |
116 |
-" |
117 |
-BDEPEND=" |
118 |
- ${PYTHON_DEPS} |
119 |
- dev-libs/libxml2 |
120 |
-" |
121 |
- |
122 |
-ECONF_SOURCE="${S}" |
123 |
- |
124 |
-PATCHES=( "${FILESDIR}"/${PN}-1.14-python3_9.patch ) |
125 |
- |
126 |
-multilib_src_configure() { |
127 |
- # Don't use Python to find sitedir here. |
128 |
- PYTHON=true default |
129 |
-} |
130 |
- |
131 |
-src_compile() { |
132 |
- : |
133 |
-} |
134 |
- |
135 |
-xcbgen_install() { |
136 |
- # Use eclass to find sitedir instead. |
137 |
- emake -C xcbgen install DESTDIR="${D}" pythondir="$(python_get_sitedir)" |
138 |
- python_optimize |
139 |
-} |
140 |
- |
141 |
-multilib_src_install() { |
142 |
- # Restrict SUBDIRS to prevent xcbgen with empty sitedir. |
143 |
- emake install DESTDIR="${D}" SUBDIRS=src |
144 |
- multilib_is_native_abi && python_foreach_impl xcbgen_install |
145 |
-} |