[gentoo-commits] repo/gentoo:master commit in: x11-base/xcb-proto/, x11-base/xcb-proto/files/

2020-12-31 Thread Matt Turner 
commit: d95080615f386be38d9b76710149683e751549c6
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Dec 31 16:56:05 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Dec 31 16:58:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9508061

x11-base/xcb-proto: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 x11-base/xcb-proto/Manifest|  1 -
 .../xcb-proto/files/xcb-proto-1.14-python3_9.patch | 54 --
 x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild| 54 --
 3 files changed, 109 deletions(-)

diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index b49c3f1b654..8a02025c775 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,2 +1 @@
 DIST xcb-proto-1.14.1.tar.xz 143588 BLAKE2B 
24983ec26632e93ef2d0c854cd41272925b6f3aab2642701232b73bc37d200d794c46f438e4a4102484e6ac9723e78c923b99cc78ada3541f43eaf0ad7ebc863
 SHA512 
140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d
-DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 
60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d
 SHA512 
de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690

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
deleted file mode 100644
index 358cd629eb6..000
--- a/x11-base/xcb-proto/files/xcb-proto-1.14-python3_9.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/xcbgen/align.py b/xcbgen/align.py
-index 
d4c12ee40195cb1986796bed009f5ba70dede1d3..5c4f5177dcb14753dabe6f0c8fee57781202efba
 100644
 a/xcbgen/align.py
-+++ b/xcbgen/align.py
-@@ -2,7 +2,12 @@
- This module contains helper classes for alignment arithmetic and checks
- '''
- 
--from fractions import gcd
-+from sys import version_info
-+
-+if version_info[:2] >= (3, 5):
-+from math import gcd
-+else:
-+from fractions import gcd
- 
- class Alignment(object):
- 
-diff --git a/xcbgen/matcher.py b/xcbgen/matcher.py
-index 
97a8b43bb24d29b6414b1e139c73cde966118ea8..a13ef2846fda2d2be249ca0c5dd06d35b90cf6cc
 100644
 a/xcbgen/matcher.py
-+++ b/xcbgen/matcher.py
-@@ -7,7 +7,12 @@ we do not create a new type object, we just record the 
existing one under a new
- '''
- 
- from os.path import join
--from xml.etree.cElementTree import parse
-+from sys import version_info
-+
-+if version_info[:2] >= (3, 9):
-+from xml.etree.ElementTree import parse
-+else:
-+from xml.etree.cElementTree import parse
- 
- from xcbgen.xtypes import *
- 
-diff --git a/xcbgen/state.py b/xcbgen/state.py
-index 
0dbecdc7b6f96bbf5f0e549787b20f9986039f1b..3b7eeb42bec1b00e5253aa93e58e0cd1fb7a3389
 100644
 a/xcbgen/state.py
-+++ b/xcbgen/state.py
-@@ -2,7 +2,12 @@
- This module contains the namespace class and the singleton module class.
- '''
- from os.path import dirname, basename
--from xml.etree.cElementTree import parse
-+from sys import version_info
-+
-+if version_info[:2] >= (3, 9):
-+from xml.etree.ElementTree import parse
-+else:
-+from xml.etree.cElementTree import parse
- 
- from xcbgen import matcher
- from xcbgen.error import *

diff --git a/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild 
b/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
deleted file mode 100644
index f4a157035f9..000
--- a/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-XORG_TARBALL_SUFFIX="xz"
-XORG_MODULE=proto/
-XORG_MULTILIB=yes
-XORG_STATIC=no
-
-inherit python-r1 xorg-3
-
-DESCRIPTION="X C-language Bindings protocol headers"
-HOMEPAGE="https://xcb.freedesktop.org/ 
https://gitlab.freedesktop.org/xorg/proto/xcbproto;
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git;
-
-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"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="
-   ${PYTHON_DEPS}
-"
-BDEPEND="
-   ${PYTHON_DEPS}
-   dev-libs/libxml2
-"
-
-ECONF_SOURCE="${S}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.14-python3_9.patch )
-
-multilib_src_configure() {
-   # Don't use Python to find sitedir here.
-   PYTHON=true default
-}
-
-src_compile() {
-   :
-}
-
-xcbgen_install() {
-   # Use eclass to find sitedir instead.
-   emake -C xcbgen install DESTDIR="${D}" pythondir="$(python_get_sitedir)"
-   python_optimize
-}
-
-multilib_src_install() {
-   # Restrict SUBDIRS to prevent xcbgen with empty sitedir.
-

[gentoo-commits] repo/gentoo:master commit in: x11-base/xcb-proto/, x11-base/xcb-proto/files/

2020-10-05 Thread Matt Turner 
commit: 7dead252ab22cf77f2a5960ba9dfb35eefd1b748
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Oct  5 12:38:47 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Oct  6 03:41:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dead252

x11-base/xcb-proto: python3_9

Closes: https://bugs.gentoo.org/746548
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17799
Signed-off-by: Matt Turner  gentoo.org>

 .../xcb-proto/files/xcb-proto-1.14-python3_9.patch | 54 ++
 x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild|  4 +-
 2 files changed, 57 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..358cd629eb6
--- /dev/null
+++ b/x11-base/xcb-proto/files/xcb-proto-1.14-python3_9.patch
@@ -0,0 +1,54 @@
+diff --git a/xcbgen/align.py b/xcbgen/align.py
+index 
d4c12ee40195cb1986796bed009f5ba70dede1d3..5c4f5177dcb14753dabe6f0c8fee57781202efba
 100644
+--- a/xcbgen/align.py
 b/xcbgen/align.py
+@@ -2,7 +2,12 @@
+ This module contains helper classes for alignment arithmetic and checks
+ '''
+ 
+-from fractions import gcd
++from sys import version_info
++
++if version_info[:2] >= (3, 5):
++from math import gcd
++else:
++from fractions import gcd
+ 
+ class Alignment(object):
+ 
+diff --git a/xcbgen/matcher.py b/xcbgen/matcher.py
+index 
97a8b43bb24d29b6414b1e139c73cde966118ea8..a13ef2846fda2d2be249ca0c5dd06d35b90cf6cc
 100644
+--- a/xcbgen/matcher.py
 b/xcbgen/matcher.py
+@@ -7,7 +7,12 @@ we do not create a new type object, we just record the 
existing one under a new
+ '''
+ 
+ from os.path import join
+-from xml.etree.cElementTree import parse
++from sys import version_info
++
++if version_info[:2] >= (3, 9):
++from xml.etree.ElementTree import parse
++else:
++from xml.etree.cElementTree import parse
+ 
+ from xcbgen.xtypes import *
+ 
+diff --git a/xcbgen/state.py b/xcbgen/state.py
+index 
0dbecdc7b6f96bbf5f0e549787b20f9986039f1b..3b7eeb42bec1b00e5253aa93e58e0cd1fb7a3389
 100644
+--- a/xcbgen/state.py
 b/xcbgen/state.py
+@@ -2,7 +2,12 @@
+ This module contains the namespace class and the singleton module class.
+ '''
+ from os.path import dirname, basename
+-from xml.etree.cElementTree import parse
++from sys import version_info
++
++if version_info[:2] >= (3, 9):
++from xml.etree.ElementTree import parse
++else:
++from xml.etree.cElementTree import parse
+ 
+ from xcbgen import matcher
+ from xcbgen.error import *

diff --git a/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild 
b/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
index db6a3ce9991..c110c43bc10 100644
--- a/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 XORG_TARBALL_SUFFIX="xz"
 XORG_MODULE=proto/
 XORG_MULTILIB=yes
@@ -30,6 +30,8 @@ BDEPEND="
 
 ECONF_SOURCE="${S}"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.14-python3_9.patch )
+
 multilib_src_configure() {
# Don't use Python to find sitedir here.
PYTHON=true default

[gentoo-commits] repo/gentoo:master commit in: x11-base/xcb-proto/, x11-base/xcb-proto/files/

2018-05-20 Thread Matt Turner 
commit: ddce5189e0240e0bda0e30b0a24e591434b2d3ef
Author: Matt Turner  gentoo  org>
AuthorDate: Sun May 20 18:30:31 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun May 20 18:30:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddce5189

x11-base/xcb-proto: Drop old versions

 x11-base/xcb-proto/Manifest|   1 -
 ...oto-1.12-make-whitespace-usage-consistent.patch | 208 -
 ...print-is-a-function-and-needs-parentheses.patch |  68 ---
 .../files/xcb-proto-1.12-update-xml-schema.patch   | 120 
 x11-base/xcb-proto/xcb-proto-1.12-r2.ebuild|  70 ---
 5 files changed, 467 deletions(-)

diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index e4b1cc4e7be..f69c09e1b89 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,2 +1 @@
-DIST xcb-proto-1.12.tar.bz2 153890 BLAKE2B 
cdb4b245e838ca56bfdcaa9a0618ce45e5d4da8ee10f7ae3389ff297325c3d81ba446a6385737cc9b053ecb06a0c829d99ab27dceecfec49ac1591c25c832c46
 SHA512 
1f427eaf223971b25b56c9f641350e03f5ebeb17a1fc212ce2a0c892de7aba7e53d5e3958b073a122bb344c387c0ff394cf96f542ff046f33de4e1cd27fb9e5c
 DIST xcb-proto-1.13.tar.bz2 151981 BLAKE2B 
04d90838f8a892103e6d7aa807f1b0b6794f1538c6c986ad3cba67cff3a963ff680e45c2137c5d6330736a3aa1a387d61fc247f23487de9dada2f4013590b4a1
 SHA512 
002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7

diff --git 
a/x11-base/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch
 
b/x11-base/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch
deleted file mode 100644
index 695794864da..000
--- 
a/x11-base/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From ea7a3ac6c658164690e0febb55f4467cb9e0bcac Mon Sep 17 00:00:00 2001
-From: Thomas Klausner 
-Date: Thu, 19 May 2016 17:30:04 +0200
-Subject: Make whitespace use consistent.
-
-At least python-3.5.x complains about this forcefully.
-
-Signed-off-by: Thomas Klausner 
-Signed-off-by: Uli Schlachter 
-
-diff --git a/xcbgen/align.py b/xcbgen/align.py
-index 5e31838..d4c12ee 100644
 a/xcbgen/align.py
-+++ b/xcbgen/align.py
-@@ -16,12 +16,12 @@ class Alignment(object):
- return self.align == other.align and self.offset == other.offset
- 
- def __str__(self):
--  return "(align=%d, offset=%d)" % (self.align, self.offset)
-+return "(align=%d, offset=%d)" % (self.align, self.offset)
- 
- @staticmethod
- def for_primitive_type(size):
--  # compute the required start_alignment based on the size of the type
--  if size % 8 == 0:
-+# compute the required start_alignment based on the size of the type
-+if size % 8 == 0:
- # do 8-byte primitives require 8-byte alignment in X11?
- return Alignment(8,0)
- elif size % 4 == 0:
-@@ -33,7 +33,7 @@ class Alignment(object):
- 
- 
- def align_after_fixed_size(self, size):
--  new_offset = (self.offset + size) % self.align
-+new_offset = (self.offset + size) % self.align
- return Alignment(self.align, new_offset)
- 
- 
-@@ -41,7 +41,7 @@ class Alignment(object):
- '''
- Assuming the given external_align, checks whether
- self is fulfilled for all cases.
--  Returns True if yes, False otherwise.
-+Returns True if yes, False otherwise.
- '''
- if self.align == 1 and self.offset == 0:
- # alignment 1 with offset 0 is always fulfilled
-@@ -55,9 +55,9 @@ class Alignment(object):
- # the external align guarantees less alignment -> not guaranteed
- return False
- 
--  if external_align.align % self.align != 0:
-+if external_align.align % self.align != 0:
- # the external align cannot be divided by our align
--  # -> not guaranteed
-+# -> not guaranteed
- # (this can only happen if there are alignments that are not
- # a power of 2, which is highly discouraged. But better be
- # safe and check for it)
-@@ -72,7 +72,7 @@ class Alignment(object):
- 
- def combine_with(self, other):
- # returns the alignment that is guaranteed when
--  # both, self or other, can happen
-+# both, self or other, can happen
- new_align = gcd(self.align, other.align)
- new_offset_candidate1 = self.offset % new_align
- new_offset_candidate2 = other.offset % new_align
-@@ -83,8 +83,8 @@ class Alignment(object):
- new_align = gcd(new_align, offset_diff)
- new_offset_candidate1 = self.offset % new_align
- new_offset_candidate2 = other.offset % new_align
--  assert new_offset_candidate1 == new_offset_candidate2
--  new_offset = new_offset_candidate1