From d95080615f386be38d9b76710149683e751549c6 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Thu, 31 Dec 2020 11:56:05 -0500
Subject: x11-base/xcb-proto: Drop old versions

Signed-off-by: Matt Turner <mattst88@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(-)
 delete mode 100644 x11-base/xcb-proto/files/xcb-proto-1.14-python3_9.patch
 delete mode 100644 x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild

(limited to 'x11-base/xcb-proto')

diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index b49c3f1b654a..8a02025c775e 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 358cd629eb6d..000000000000
--- 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 f4a157035f98..000000000000
--- 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.
-	emake install DESTDIR="${D}" SUBDIRS=src
-	multilib_is_native_abi && python_foreach_impl xcbgen_install
-}
-- 
cgit v1.2.3-65-gdbad