public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libxcb/, x11-libs/libxcb/files/
@ 2017-03-16 20:37 Matt Turner
  0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2017-03-16 20:37 UTC (permalink / raw
  To: gentoo-commits

commit:     dedcc9328c85590dea6b46eeb64a6afd914b0f41
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 03:33:39 2017 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 20:36:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dedcc932

x11-libs/libxcb: Drop old versions

 x11-libs/libxcb/Manifest                           |  5 --
 .../files/libxcb-1.11-xevie-xprint_removal.patch   | 30 ---------
 ....9.1-conflicting-types-for-xcb_ge_event_t.patch | 18 ------
 ...ist-object-has-no-attribute-lenfield_name.patch | 29 ---------
 x11-libs/libxcb/files/xcb-rebuilder.sh             | 71 ----------------------
 x11-libs/libxcb/libxcb-1.10.ebuild                 | 48 ---------------
 x11-libs/libxcb/libxcb-1.11-r1.ebuild              | 57 -----------------
 x11-libs/libxcb/libxcb-1.11.1.ebuild               | 56 -----------------
 x11-libs/libxcb/libxcb-1.11.ebuild                 | 52 ----------------
 x11-libs/libxcb/libxcb-1.12.ebuild                 | 57 -----------------
 x11-libs/libxcb/libxcb-1.9.1-r1.ebuild             | 60 ------------------
 x11-libs/libxcb/libxcb-1.9.1.ebuild                | 45 --------------
 x11-libs/libxcb/libxcb-1.9.3-r1.ebuild             | 48 ---------------
 x11-libs/libxcb/libxcb-1.9.3.ebuild                | 46 --------------
 14 files changed, 622 deletions(-)

diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index c5bef712867..dc3c23b8b5c 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,6 +1 @@
-DIST libxcb-1.10.tar.bz2 475211 SHA256 98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5 SHA512 c29ab5027498635d58fd7bfcd77899a406116b25fa8c4ec6513fc1395d8a0f99f602ad20b507660a62000b6fc879860d182cafd29af590e8b14f55150a064f7a WHIRLPOOL 4e11ffa276ef717e8f14183385413b30b52e8848669bf0f3075fb82adf4a4e94d8a98a2505797be055ff9f546e4fc11e94ba148099b6a0c2998da3e0f20fe99a
-DIST libxcb-1.11.1.tar.bz2 519517 SHA256 b720fd6c7d200e5371affdb3f049cc8f88cff9aed942ff1b824d95eedbf69d30 SHA512 30471b053097d68008142bada9ca3efd9121305f0180d28a5ca9b62821f711a3ad63a667bdfb31f8f97020ed7aa9509f8248effbd65c80e6cda7375135dc96eb WHIRLPOOL 3e4fe9611e80d81652f375219829f19d4fa8e8a8e8d3b48cc217f7d652fcf84754ac735ce5adbc7092df079a6329a3af4cbdee7bd29e3009a35abbdb6ffc6792
-DIST libxcb-1.11.tar.bz2 517700 SHA256 03635d70045b9ede90778e67516135828a57de87ac508f987024f43c03620ff7 SHA512 718f9a44a621daae93eb94dc7b795743253c801ea98efd2041794823fdc8f5eeb031b1fa7d34b72e7a8fccf850d98f2373a49927c8d3198c1d4850af6ae14bb1 WHIRLPOOL 11e9bf3445977570884006de01a2ed44caf273c27d7d9908307cc81d82bba9995de6a0a3c3ef62bd9a06f56e977310616dc7eda909409d199b52305b2b4b0e36
 DIST libxcb-1.12.tar.bz2 613822 SHA256 4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b SHA512 4ce3e3f62b7e1c3a9e61c149c720ef2a4a760539ea615d7d52ae39e7f5a08456dc87d7a1ac5d85ca15dcc468a9a02d56fb8f8f6361c959af9b8780f011995896 WHIRLPOOL b2dd2d6e441c20458c9a4a372f9bb336dd2bbd2865de7b63cc223977af86cf80f13f0afb42f3e71bb1ad6b9ea10dc62df9df5e12c54f7822087fad0c107adf87
-DIST libxcb-1.9.1.tar.bz2 373312 SHA256 d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f SHA512 541d6e07b1a0da61c3cc1dbdae50ce4e55f1a27e79e277db5af192d02c8360bb3958c597d6692f2c6afcf009ae7b312459f65e8c8d2f1bcc446f7f512bacdd41 WHIRLPOOL cc2af531d5beddec577507d4cf983262069144d7e9667958ce03bba6ceebb907488ddf475253e856b879e81333cfac8bfbc2c8092d60fbfa49a3b447af6e6f68
-DIST libxcb-1.9.3.tar.bz2 400283 SHA256 aad09d223fcb5bd345ce4d1737f178a557b6f2e201128e1ee3c83af46028018b SHA512 796673c8df6bf0e3e1f847a3d565502b4ff4e4981c9104c6ca0367d7a15bffd266860dfb545366a4d96695efd060afe205b990983e08b4da8470a7f0a8d4a7a1 WHIRLPOOL 6de787900ef93c13d304739862b04d6c582dbafeebadf9b260064da92821f0681198364265fe5bcaf12f34f9a9020e3ad7e2dbbdb7cd627a909d803105df2f8b

diff --git a/x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch b/x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch
deleted file mode 100644
index e8c24d34b23..00000000000
--- a/x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Both extensions have been dropped from the X-Server in 2008:
-    http://cgit.freedesktop.org/xorg/xserver/commit/?id=1c8bd31
-    http://cgit.freedesktop.org/xorg/xserver/commit/?id=f4036f6
-
-Don't build them by default.
-
-Reviewed-by: Julien Cristau <jcristau@debian.org>
-Signed-off-by: Daniel Martin <consume.noise@gmail.com>
-Signed-off-by: Uli Schlachter <psychon@znc.in>
-
-diff --git a/a/configure.ac b/b/configure.ac
-index eb4a971..c9a1e91 100644
---- a/a/configure.ac
-+++ b/b/configure.ac
-@@ -227,13 +227,13 @@ XCB_EXTENSION(Screensaver, "yes")
- XCB_EXTENSION(Shape, "yes")
- XCB_EXTENSION(Shm, "yes")
- XCB_EXTENSION(Sync, "yes")
--XCB_EXTENSION(Xevie, "yes")
-+XCB_EXTENSION(Xevie, "no")
- XCB_EXTENSION(XFixes, "yes")
- XCB_EXTENSION(XFree86-DRI, "yes")
- XCB_EXTENSION(Xinerama, "yes")
- XCB_EXTENSION(XInput, "no")
- XCB_EXTENSION(XKB, "yes")
--XCB_EXTENSION(Xprint, "yes")
-+XCB_EXTENSION(Xprint, "no")
- XCB_EXTENSION(SELinux, "no")
- XCB_EXTENSION(XTest, "yes")
- XCB_EXTENSION(Xv, "yes")

diff --git a/x11-libs/libxcb/files/libxcb-1.9.1-conflicting-types-for-xcb_ge_event_t.patch b/x11-libs/libxcb/files/libxcb-1.9.1-conflicting-types-for-xcb_ge_event_t.patch
deleted file mode 100644
index 2c884d79626..00000000000
--- a/x11-libs/libxcb/files/libxcb-1.9.1-conflicting-types-for-xcb_ge_event_t.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- libxcb-1.9.1-orig/src/xcb.h	2013-05-31 01:38:01.000000000 +1000
-+++ libxcb-1.9.1/src/xcb.h	2013-11-17 18:30:27.664675840 +1100
-@@ -143,6 +143,7 @@
-  * An event as sent by the XGE extension. The length field specifies the
-  * number of 4-byte blocks trailing the struct.
-  */
-+#if 0
- typedef struct {
-     uint8_t  response_type;  /**< Type of the response */
-     uint8_t  pad0;           /**< Padding */
-@@ -153,6 +154,7 @@
-     uint32_t pad[5];         /**< Padding */
-     uint32_t full_sequence;  /**< full sequence */
- } xcb_ge_event_t;
-+#endif
- 
- /**
-  * @brief Generic error.

diff --git a/x11-libs/libxcb/files/libxcb-1.9.1-list-object-has-no-attribute-lenfield_name.patch b/x11-libs/libxcb/files/libxcb-1.9.1-list-object-has-no-attribute-lenfield_name.patch
deleted file mode 100644
index 3ad63ffef2c..00000000000
--- a/x11-libs/libxcb/files/libxcb-1.9.1-list-object-has-no-attribute-lenfield_name.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/c_client.py b/src/c_client.py
-index ec66223..942e78a 100644
---- a/src/c_client.py
-+++ b/src/c_client.py
-@@ -687,10 +687,20 @@ def _c_serialize_helper_switch(context, self, complex_name,
-     switch_expr = _c_accessor_get_expr(self.expr, None)
- 
-     for b in self.bitcases:            
--        bitcase_expr = _c_accessor_get_expr(b.type.expr, None)
--        code_lines.append('    if(%s & %s) {' % (switch_expr, bitcase_expr))
--#        code_lines.append('        printf("switch %s: entering bitcase section %s (mask=%%%%d)...\\n", %s);' % 
--#                          (self.name[-1], b.type.name[-1], bitcase_expr))
-+        len_expr = len(b.type.expr)
-+        for n, expr in enumerate(b.type.expr):
-+            bitcase_expr = _c_accessor_get_expr(expr, None)
-+            # only one <enumref> in the <bitcase>
-+            if len_expr == 1:
-+                code_lines.append('    if(%s & %s) {' % (switch_expr, bitcase_expr))
-+            # multiple <enumref> in the <bitcase>
-+            elif n == 0: # first
-+                code_lines.append('    if((%s & %s) ||' % (switch_expr, bitcase_expr))
-+            elif len_expr == (n + 1): # last
-+                code_lines.append('       (%s & %s)) {' % (switch_expr, bitcase_expr))
-+            else: # between first and last
-+                code_lines.append('       (%s & %s) ||' % (switch_expr, bitcase_expr))
-+
-         b_prefix = prefix
-         if b.type.has_name:
-             b_prefix = prefix + [(b.c_field_name, '.', b.type)]

diff --git a/x11-libs/libxcb/files/xcb-rebuilder.sh b/x11-libs/libxcb/files/xcb-rebuilder.sh
deleted file mode 100644
index 43625622303..00000000000
--- a/x11-libs/libxcb/files/xcb-rebuilder.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-# To use something besides `emerge` to install packages, set
-# XCB_REBUILDER_INSTALL to that binary.
-
-if ! . /lib/gentoo/functions.sh 2>/dev/null; then
-	echo 'Please install sys-apps/gentoo-functions and rerun this script.'
-	exit 1
-fi
-
-case ${1} in
-	'') ;;
-	*)
-		einfo 'Rebuilds broken packages from the XCB library renaming'
-		einfo
-		einfo 'To use something besides `emerge`, set the INSTALL variable to their binary.'
-		exit 1
-		;;
-esac
-
-if ! type -p qfile >/dev/null; then
-	einfo "Please install app-portage/portage-utils."
-	exit 1
-fi
-
-if ! type -p scanelf >/dev/null; then
-	einfo "Please install app-misc/pax-utils."
-	exit 1
-fi
-
-einfo "Fixing broken libtool archives (.la)"
-for i in $(qlist -a | grep "\.la$"); do
-	sed -i \
-		-e "s:[^[:space:]]*xcb-xlib[^[:space:]]*::g" \
-		"${i}" 2>/dev/null
-done
-
-einfo "Scanning for libraries requiring libxcb-xlib.so..."
-for i in $(qlist -a | grep "\.so$"); do
-	scanelf -n $i \
-	| grep -q xcb-xlib \
-	&& XCB_LIBS="${XCB_LIBS} ${i}"
-done
-
-if [[ -n ${XCB_LIBS} ]]; then
-	einfo "Broken libraries:"
-	for lib in ${XCB_LIBS}; do
-		echo "  ${lib}"
-	done
-	ebegin "Scanning for packages installing broken libraries"
-	XCB_PACKAGES=$(qfile -qC ${XCB_LIBS} | sort | uniq)
-	eend 0
-else
-	einfo "No broken libraries detected"
-	exit 0
-fi
-
-
-einfo "Broken packages:"
-for pkg in ${XCB_PACKAGES}; do
-	echo "  ${pkg}"
-done
-
-echo
-ewarn "Please read the libxcb upgrade guide for further instructions"
-ewarn "http://www.gentoo.org/proj/en/desktop/x/x11/libxcb-1.4-upgrade-guide.xml"
-
-#
-#ebegin "Rebuilding broken packages"
-#${XCB_REBUILDER_INSTALL:-emerge -1} ${XCB_PACKAGES}
-#eend $?

diff --git a/x11-libs/libxcb/libxcb-1.10.ebuild b/x11-libs/libxcb/libxcb-1.10.ebuild
deleted file mode 100644
index 015e893bdf8..00000000000
--- a/x11-libs/libxcb/libxcb-1.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit python-any-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="selinux xkb"
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-	$(python_gen_any_dep \
-		">=x11-proto/xcb-proto-1.10[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
-
-python_check_deps() {
-	has_version --host-root ">=x11-proto/xcb-proto-1.10[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc build-docs)
-		$(use_enable selinux)
-		$(use_enable xkb)
-		--enable-xinput
-	)
-	xorg-2_src_configure
-}

diff --git a/x11-libs/libxcb/libxcb-1.11-r1.ebuild b/x11-libs/libxcb/libxcb-1.11-r1.ebuild
deleted file mode 100644
index 2288d7be56a..00000000000
--- a/x11-libs/libxcb/libxcb-1.11-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-XORG_EAUTORECONF=yes
-inherit python-any-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc selinux test xkb"
-SLOT="0/${PV}"
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-	doc? ( app-doc/doxygen[dot] )
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-	$(python_gen_any_dep \
-		">=x11-proto/xcb-proto-1.11[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
-
-python_check_deps() {
-	has_version --host-root ">=x11-proto/xcb-proto-1.11[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}/${P}-xevie-xprint_removal.patch"
-	"${FILESDIR}/${PN}-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch"
-)
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc devel-docs)
-		$(use_enable selinux)
-		$(use_enable xkb)
-		--enable-xinput
-	)
-	xorg-2_src_configure
-}

diff --git a/x11-libs/libxcb/libxcb-1.11.1.ebuild b/x11-libs/libxcb/libxcb-1.11.1.ebuild
deleted file mode 100644
index 0335eff6608..00000000000
--- a/x11-libs/libxcb/libxcb-1.11.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-XORG_EAUTORECONF=yes
-inherit python-any-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc selinux test xkb"
-SLOT="0/${PV}"
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-	doc? ( app-doc/doxygen[dot] )
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-	$(python_gen_any_dep \
-		">=x11-proto/xcb-proto-1.11[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
-
-python_check_deps() {
-	has_version --host-root ">=x11-proto/xcb-proto-1.11[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch"
-)
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc devel-docs)
-		$(use_enable selinux)
-		$(use_enable xkb)
-		--enable-xinput
-	)
-	xorg-2_src_configure
-}

diff --git a/x11-libs/libxcb/libxcb-1.11.ebuild b/x11-libs/libxcb/libxcb-1.11.ebuild
deleted file mode 100644
index 6e45a747e4e..00000000000
--- a/x11-libs/libxcb/libxcb-1.11.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-XORG_EAUTORECONF=yes
-inherit python-any-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="selinux xkb"
-SLOT="0/${PV}"
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-	$(python_gen_any_dep \
-		">=x11-proto/xcb-proto-1.11[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
-
-python_check_deps() {
-	has_version --host-root ">=x11-proto/xcb-proto-1.11[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-PATCHES=( "${FILESDIR}/${P}-xevie-xprint_removal.patch" )
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc build-docs)
-		$(use_enable selinux)
-		$(use_enable xkb)
-		--enable-xinput
-	)
-	xorg-2_src_configure
-}

diff --git a/x11-libs/libxcb/libxcb-1.12.ebuild b/x11-libs/libxcb/libxcb-1.12.ebuild
deleted file mode 100644
index b602247aacf..00000000000
--- a/x11-libs/libxcb/libxcb-1.12.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-XORG_EAUTORECONF=yes
-inherit python-any-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc selinux test xkb"
-SLOT="0/${PV}"
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-	doc? ( app-doc/doxygen[dot] )
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-	$(python_gen_any_dep \
-		">=x11-proto/xcb-proto-1.12-r1[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
-
-python_check_deps() {
-	has_version --host-root ">=x11-proto/xcb-proto-1.11[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch"
-	"${FILESDIR}/${P}-fix-inconsistent-use-tabs-space.patch"
-)
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc devel-docs)
-		$(use_enable selinux)
-		$(use_enable xkb)
-		--enable-xinput
-	)
-	xorg-2_src_configure
-}

diff --git a/x11-libs/libxcb/libxcb-1.9.1-r1.ebuild b/x11-libs/libxcb/libxcb-1.9.1-r1.ebuild
deleted file mode 100644
index 1d1fe2cdc3b..00000000000
--- a/x11-libs/libxcb/libxcb-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit eutils python-single-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="selinux xkb"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-lang/python[xml]
-	dev-libs/libxslt
-	>=x11-proto/xcb-proto-1.9-r1[${MULTILIB_USEDEP},${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=472032
-	sed -e 's@x$(HTML_CHECK_RESULT)@xfalse@' \
-		-i "${S}/tests/Makefile.am" \
-		-i "${S}/tests/Makefile.in" \
-		|| die "Could not patch tests/Makefile.am and tests/Makefile.in to fix tests"
-	# https://patchwork.freedesktop.org/patch/15185/
-	# Sounds like this commit is missing:
-	# c_client.py: Handle multiple expr. in a bitcase
-	# https://cgit.freedesktop.org/xcb/libxcb/commit/?id=e602b65
-	epatch "${FILESDIR}/${PN}-1.9.1-list-object-has-no-attribute-lenfield_name.patch"
-	# https://bugs.freedesktop.org/show_bug.cgi?id=71502
-	epatch "${FILESDIR}/${PN}-1.9.1-conflicting-types-for-xcb_ge_event_t.patch"
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc build-docs)
-		$(use_enable selinux)
-		$(use_enable xkb)
-		--enable-xinput
-	)
-	xorg-2_src_configure
-}

diff --git a/x11-libs/libxcb/libxcb-1.9.1.ebuild b/x11-libs/libxcb/libxcb-1.9.1.ebuild
deleted file mode 100644
index 91d16ecbc6b..00000000000
--- a/x11-libs/libxcb/libxcb-1.9.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit python-single-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="selinux xkb"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-lang/python[xml]
-	dev-libs/libxslt
-	>=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP},${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc build-docs)
-		$(use_enable selinux)
-		$(use_enable xkb)
-		--enable-xinput
-	)
-	xorg-2_src_configure
-}

diff --git a/x11-libs/libxcb/libxcb-1.9.3-r1.ebuild b/x11-libs/libxcb/libxcb-1.9.3-r1.ebuild
deleted file mode 100644
index 952e7a85b83..00000000000
--- a/x11-libs/libxcb/libxcb-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit python-any-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="selinux xkb"
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	$(python_gen_any_dep \
-		">=x11-proto/xcb-proto-1.9-r1[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
-
-python_check_deps() {
-	has_version --host-root ">=x11-proto/xcb-proto-1.9-r1[${MULTILIB_USEDEP},${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc build-docs)
-		$(use_enable selinux)
-		$(use_enable xkb)
-		--enable-sendfds
-		--enable-xinput
-	)
-	xorg-2_src_configure
-}

diff --git a/x11-libs/libxcb/libxcb-1.9.3.ebuild b/x11-libs/libxcb/libxcb-1.9.3.ebuild
deleted file mode 100644
index de7ec23df4e..00000000000
--- a/x11-libs/libxcb/libxcb-1.9.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit python-single-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="selinux xkb"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-lang/python[xml]
-	dev-libs/libxslt
-	>=x11-proto/xcb-proto-1.9-r1[${MULTILIB_USEDEP},${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc build-docs)
-		$(use_enable selinux)
-		$(use_enable xkb)
-		--enable-sendfds
-		--enable-xinput
-	)
-	xorg-2_src_configure
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libxcb/, x11-libs/libxcb/files/
@ 2018-05-20 18:37 Matt Turner
  0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2018-05-20 18:37 UTC (permalink / raw
  To: gentoo-commits

commit:     62a5fd84f037cc2848ae888810c12c1a0be9d1dc
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 18:33:09 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May 20 18:33:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62a5fd84

x11-libs/libxcb: Drop old versions

 x11-libs/libxcb/Manifest                           |   1 -
 ...ll-headers-man-pages-for-disabled-extensi.patch | 257 ---------------------
 ...bxcb-1.12-fix-inconsistent-use-tabs-space.patch |  55 -----
 x11-libs/libxcb/libxcb-1.12-r2.ebuild              |  57 -----
 4 files changed, 370 deletions(-)

diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 9f78262395e..aea3ef1bfbc 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,2 +1 @@
-DIST libxcb-1.12.tar.bz2 613822 BLAKE2B 61f164ba6fb9493fe0692badc74a2866ee08ce3c3499773be0bddf742d0ffc69bb876233aae46a7e76cb9263485eb007d105b16091a73750d490da0528482ff2 SHA512 4ce3e3f62b7e1c3a9e61c149c720ef2a4a760539ea615d7d52ae39e7f5a08456dc87d7a1ac5d85ca15dcc468a9a02d56fb8f8f6361c959af9b8780f011995896
 DIST libxcb-1.13.tar.bz2 510453 BLAKE2B 2bdae7610cb8b3fdefeded6cf457e1c397666d235114439caba114b9e7a6b2af50f2cd8363ebaa3ddfa5c5040b8cdf2960150e1f4db141c572e12b1a2fb0ca9a SHA512 d99bbe386a65f60fcc0cc2935e4a365bc0577b5e90433e18778a665a5aee8ebc8e9e8cb0aedac0ac4a276147c0507e759a716874ea4f80792b2fc18eefbc128c

diff --git a/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch b/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch
deleted file mode 100644
index 0f8aa119823..00000000000
--- a/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From e9b5234b3b0b53bd3a35f947ddb8a72d03cf1825 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Mon, 29 Dec 2014 20:18:22 +0100
-Subject: [PATCH] Don't install headers/man pages for disabled extensions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugs.gentoo.org/show_bug.cgi?id=533906
-
-Signed-off-by: Rémi Cardona <remi@gentoo.org>
----
- src/Makefile.am | 52 ++++++++++++++++++++++++++--------------------------
- 1 file changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5a3c52a..774ad8e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -24,208 +24,208 @@ XCB_LIBS = libxcb.la
- 
- # FIXME: find a way to autogenerate this from the XML files.
- 
--EXTSOURCES += composite.c
- if BUILD_COMPOSITE
-+EXTSOURCES += composite.c
- lib_LTLIBRARIES += libxcb-composite.la
- libxcb_composite_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_composite_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_composite_la_SOURCES = composite.c composite.h
- endif
- 
--EXTSOURCES += damage.c
- if BUILD_DAMAGE
-+EXTSOURCES += damage.c
- lib_LTLIBRARIES += libxcb-damage.la
- libxcb_damage_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_damage_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_damage_la_SOURCES = damage.c damage.h
- endif
- 
--EXTSOURCES += dpms.c
- if BUILD_DPMS
-+EXTSOURCES += dpms.c
- lib_LTLIBRARIES += libxcb-dpms.la
- libxcb_dpms_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_dpms_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_dpms_la_SOURCES = dpms.c dpms.h
- endif
- 
--EXTSOURCES += dri2.c
- if BUILD_DRI2
-+EXTSOURCES += dri2.c
- lib_LTLIBRARIES += libxcb-dri2.la
- libxcb_dri2_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_dri2_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_dri2_la_SOURCES = dri2.c dri2.h
- endif
- 
--EXTSOURCES += dri3.c
- if BUILD_DRI3
-+EXTSOURCES += dri3.c
- lib_LTLIBRARIES += libxcb-dri3.la
- libxcb_dri3_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_dri3_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_dri3_la_SOURCES = dri3.c dri3.h
- endif
- 
--EXTSOURCES += present.c
- if BUILD_PRESENT
-+EXTSOURCES += present.c
- lib_LTLIBRARIES += libxcb-present.la
- libxcb_present_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_present_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_present_la_SOURCES = present.c present.h
- endif
- 
--EXTSOURCES += glx.c
- if BUILD_GLX
- lib_LTLIBRARIES += libxcb-glx.la
-+EXTSOURCES += glx.c
- libxcb_glx_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_glx_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_glx_la_SOURCES = glx.c glx.h
- endif
- 
--EXTSOURCES += randr.c
- if BUILD_RANDR
-+EXTSOURCES += randr.c
- lib_LTLIBRARIES += libxcb-randr.la
- libxcb_randr_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@
- libxcb_randr_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_randr_la_SOURCES = randr.c randr.h
- endif
- 
--EXTSOURCES += record.c
- if BUILD_RECORD
-+EXTSOURCES += record.c
- lib_LTLIBRARIES += libxcb-record.la
- libxcb_record_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_record_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_record_la_SOURCES = record.c record.h
- endif
- 
--EXTSOURCES += render.c
- if BUILD_RENDER
-+EXTSOURCES += render.c
- lib_LTLIBRARIES += libxcb-render.la
- libxcb_render_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_render_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_render_la_SOURCES = render.c render.h
- endif
- 
--EXTSOURCES += res.c
- if BUILD_RESOURCE
-+EXTSOURCES += res.c
- lib_LTLIBRARIES += libxcb-res.la
- libxcb_res_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_res_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_res_la_SOURCES = res.c res.h
- endif
- 
--EXTSOURCES += screensaver.c
- if BUILD_SCREENSAVER
-+EXTSOURCES += screensaver.c
- lib_LTLIBRARIES += libxcb-screensaver.la
- libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_screensaver_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_screensaver_la_SOURCES = screensaver.c screensaver.h
- endif
- 
--EXTSOURCES += shape.c
- if BUILD_SHAPE
-+EXTSOURCES += shape.c
- lib_LTLIBRARIES += libxcb-shape.la
- libxcb_shape_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_shape_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_shape_la_SOURCES = shape.c shape.h
- endif
- 
--EXTSOURCES += shm.c
- if BUILD_SHM
-+EXTSOURCES += shm.c
- lib_LTLIBRARIES += libxcb-shm.la
- libxcb_shm_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_shm_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_shm_la_SOURCES = shm.c shm.h
- endif
- 
--EXTSOURCES += sync.c
- if BUILD_SYNC
-+EXTSOURCES += sync.c
- lib_LTLIBRARIES += libxcb-sync.la
- libxcb_sync_la_LDFLAGS = -version-info 1:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_sync_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_sync_la_SOURCES = sync.c sync.h
- endif
- 
--EXTSOURCES += xevie.c
- if BUILD_XEVIE
-+EXTSOURCES += xevie.c
- lib_LTLIBRARIES += libxcb-xevie.la
- libxcb_xevie_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xevie_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xevie_la_SOURCES = xevie.c xevie.h
- endif
- 
--EXTSOURCES += xf86dri.c
- if BUILD_XFREE86_DRI
-+EXTSOURCES += xf86dri.c
- lib_LTLIBRARIES += libxcb-xf86dri.la
- libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xf86dri_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xf86dri_la_SOURCES = xf86dri.c xf86dri.h
- endif
- 
--EXTSOURCES += xfixes.c
- if BUILD_XFIXES
-+EXTSOURCES += xfixes.c
- lib_LTLIBRARIES += libxcb-xfixes.la
- libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xfixes_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xfixes_la_SOURCES = xfixes.c xfixes.h
- endif
- 
--EXTSOURCES += xinerama.c
- if BUILD_XINERAMA
-+EXTSOURCES += xinerama.c
- lib_LTLIBRARIES += libxcb-xinerama.la
- libxcb_xinerama_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xinerama_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xinerama_la_SOURCES = xinerama.c xinerama.h
- endif
- 
--EXTSOURCES += xinput.c
- if BUILD_XINPUT
-+EXTSOURCES += xinput.c
- lib_LTLIBRARIES += libxcb-xinput.la
- libxcb_xinput_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@
- libxcb_xinput_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xinput_la_SOURCES = xinput.c xinput.h
- endif
- 
--EXTSOURCES += xkb.c
- if BUILD_XKB
-+EXTSOURCES += xkb.c
- lib_LTLIBRARIES += libxcb-xkb.la
- libxcb_xkb_la_LDFLAGS = -version-info 1:0:0 -no-undefined
- libxcb_xkb_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xkb_la_SOURCES = xkb.c xkb.h
- endif
- 
--EXTSOURCES += xprint.c
- if BUILD_XPRINT
-+EXTSOURCES += xprint.c
- lib_LTLIBRARIES += libxcb-xprint.la
- libxcb_xprint_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xprint_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xprint_la_SOURCES = xprint.c xprint.h
- endif
- 
--EXTSOURCES += xselinux.c
- if BUILD_SELINUX
-+EXTSOURCES += xselinux.c
- lib_LTLIBRARIES += libxcb-xselinux.la
- libxcb_xselinux_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xselinux_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xselinux_la_SOURCES = xselinux.c xselinux.h
- endif
- 
--EXTSOURCES += xtest.c
- if BUILD_XTEST
-+EXTSOURCES += xtest.c
- lib_LTLIBRARIES += libxcb-xtest.la
- libxcb_xtest_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xtest_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xtest_la_SOURCES = xtest.c xtest.h
- endif
- 
--EXTSOURCES += xv.c
- if BUILD_XV
-+EXTSOURCES += xv.c
- lib_LTLIBRARIES += libxcb-xv.la
- libxcb_xv_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xv_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xv_la_SOURCES = xv.c xv.h
- endif
- 
--EXTSOURCES += xvmc.c
- if BUILD_XVMC
-+EXTSOURCES += xvmc.c
- lib_LTLIBRARIES += libxcb-xvmc.la
- libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xvmc_la_LIBADD = $(XCB_LIBS)
--- 
-2.2.1
-

diff --git a/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch b/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch
deleted file mode 100644
index bbac9a96fc3..00000000000
--- a/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <wiz@NetBSD.org>
-Date: Thu, 19 May 2016 17:31:18 +0200
-Subject: Fix inconsistent use of tabs vs. space.
-
-Needed for at least python-3.5.x.
-
-Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
-Signed-off-by: Uli Schlachter <psychon@znc.in>
-
-diff --git a/src/c_client.py b/src/c_client.py
-index 57de3fb..043338d 100644
---- a/src/c_client.py
-+++ b/src/c_client.py
-@@ -1364,7 +1364,7 @@ def _c_serialize(context, self):
-             _c('    unsigned int xcb_align_to = 0;')
-         if self.is_switch:
-             _c('    unsigned int xcb_padding_offset = %d;',
--	       self.get_align_offset() )
-+               self.get_align_offset() )
-         prefix = [('_aux', '->', self)]
-         aux_ptr = 'xcb_out'
- 
-@@ -1390,7 +1390,7 @@ def _c_serialize(context, self):
-         _c('    unsigned int xcb_align_to = 0;')
-         if self.is_switch:
-             _c('    unsigned int xcb_padding_offset = %d;',
--	       self.get_align_offset() )
-+               self.get_align_offset() )
- 
-     elif 'sizeof' == context:
-         param_names = [p[2] for p in params]
-@@ -1930,14 +1930,14 @@ def _c_accessors_list(self, field):
-                     # from the request size and divide that by the member size
-                     return '(((R->length * 4) - sizeof('+ self.c_type + '))/'+'sizeof('+field.type.member.c_wiretype+'))'
-                 else:
--		    # use the accessor to get the start of the list, then
--		    # compute the length of it by subtracting it from
-+                    # use the accessor to get the start of the list, then
-+                    # compute the length of it by subtracting it from
-                     # the adress of the first byte after the end of the
-                     # request
--		    after_end_of_request = '(((char*)R) + R->length * 4)'
--		    start_of_list = '%s(R)' % (field.c_accessor_name)
-+                    after_end_of_request = '(((char*)R) + R->length * 4)'
-+                    start_of_list = '%s(R)' % (field.c_accessor_name)
-                     bytesize_of_list = '%s - (char*)(%s)' % (after_end_of_request, start_of_list)
--		    return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype)
-+                    return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype)
-             else:
-                 raise Exception(
-                     "lengthless lists with varsized members are not supported. Fieldname '%s'"
--- 
-cgit v0.10.2
-

diff --git a/x11-libs/libxcb/libxcb-1.12-r2.ebuild b/x11-libs/libxcb/libxcb-1.12-r2.ebuild
deleted file mode 100644
index 922c0eb9855..00000000000
--- a/x11-libs/libxcb/libxcb-1.12-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-XORG_EAUTORECONF=yes
-inherit python-any-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/libxcb.git"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc selinux test xkb"
-SLOT="0/1.12" # Locked down for now to 1.12 to avoid further rebuilds on no ABI changes (e.g with any upcoming 1.12.1 bugfix release), bug 576890
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-	doc? ( app-doc/doxygen[dot] )
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-	$(python_gen_any_dep \
-		"~x11-base/xcb-proto-1.12[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
-
-python_check_deps() {
-	has_version --host-root ">=x11-base/xcb-proto-1.11[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch"
-	"${FILESDIR}/${P}-fix-inconsistent-use-tabs-space.patch"
-)
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc devel-docs)
-		$(use_enable selinux)
-		$(use_enable xkb)
-		--enable-xinput
-	)
-	xorg-2_src_configure
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libxcb/, x11-libs/libxcb/files/
@ 2020-11-19  4:14 Matt Turner
  0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2020-11-19  4:14 UTC (permalink / raw
  To: gentoo-commits

commit:     195e1a3fde15d42f068a398f95c1211ff1f2fa09
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 04:12:04 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 04:14:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=195e1a3f

x11-libs/libxcb: Fix tests with dev-libs/check >= 0.15

Closes: https://bugs.gentoo.org/746884
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ...on-t-use-deprecated-fail_unless-check-API.patch | 86 ++++++++++++++++++++++
 x11-libs/libxcb/libxcb-1.14.ebuild                 |  4 +
 2 files changed, 90 insertions(+)

diff --git a/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch b/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch
new file mode 100644
index 00000000000..cc7f22ba4e9
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch
@@ -0,0 +1,86 @@
+From f01f3c378eb0168fbb055c7be1c2d08a7acd3752 Mon Sep 17 00:00:00 2001
+From: Ran Benita <ran@unusedvar.com>
+Date: Tue, 17 Nov 2020 23:43:06 +0200
+Subject: [PATCH] tests: don't use deprecated fail_unless check API
+
+It causes errors like this when running make check:
+
+check_public.c:40:24: error: too many arguments for format [-Werror=format-extra-args]
+   40 |   fail_unless(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
+
+Closes: https://gitlab.freedesktop.org/xorg/lib/libxcb/-/issues/49
+Tested-by: Matt Turner <mattst88@gmail.com>
+Signed-off-by: Ran Benita <ran@unusedvar.com>
+---
+ configure.ac         |  2 +-
+ tests/check_public.c | 30 +++++++++++++++---------------
+ 2 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/tests/check_public.c b/tests/check_public.c
+index 2094bfe..aed40c8 100644
+--- a/tests/check_public.c
++++ b/tests/check_public.c
+@@ -37,18 +37,18 @@ static void parse_display_pass(const char *name, const char *host, const int dis
+ 		got_display = got_screen = -42;
+ 		mark_point();
+ 		success = xcb_parse_display(argument, &got_host, &got_display, &got_screen);
+-		fail_unless(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
+-		fail_unless(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
+-		fail_unless(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
+-		fail_unless(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen);
++		ck_assert_msg(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
++		ck_assert_msg(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
++		ck_assert_msg(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
++		ck_assert_msg(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen);
+ 
+ 		got_host = (char *) -1;
+ 		got_display = got_screen = -42;
+ 		mark_point();
+ 		success = xcb_parse_display(argument, &got_host, &got_display, 0);
+-		fail_unless(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name);
+-		fail_unless(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
+-		fail_unless(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
++		ck_assert_msg(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name);
++		ck_assert_msg(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
++		ck_assert_msg(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
+ 	}
+ 	putenv("DISPLAY=");
+ }
+@@ -79,18 +79,18 @@ static void parse_display_fail(const char *name)
+ 		got_display = got_screen = -42;
+ 		mark_point();
+ 		success = xcb_parse_display(argument, &got_host, &got_display, &got_screen);
+-		fail_unless(!success, "unexpected parse success %sfor '%s'", test_string[test_type], name);
+-		fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
+-		fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
+-		fail_unless(got_screen == -42, "screen changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_screen);
++		ck_assert_msg(!success, "unexpected parse success %sfor '%s'", test_string[test_type], name);
++		ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
++		ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
++		ck_assert_msg(got_screen == -42, "screen changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_screen);
+ 
+ 		got_host = (char *) -1;
+ 		got_display = got_screen = -42;
+ 		mark_point();
+ 		success = xcb_parse_display(argument, &got_host, &got_display, 0);
+-		fail_unless(!success, "unexpected screenless parse success %sfor '%s'", test_string[test_type], name);
+-		fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
+-		fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
++		ck_assert_msg(!success, "unexpected screenless parse success %sfor '%s'", test_string[test_type], name);
++		ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
++		ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
+ 	}
+ 	putenv("DISPLAY=");
+ }
+@@ -183,7 +183,7 @@ END_TEST
+ 
+ static void popcount_eq(uint32_t bits, int count)
+ {
+-	fail_unless(xcb_popcount(bits) == count, "unexpected popcount(%08x) != %d", bits, count);
++	ck_assert_msg(xcb_popcount(bits) == count, "unexpected popcount(%08x) != %d", bits, count);
+ }
+ 
+ START_TEST(popcount)
+-- 
+2.26.2
+

diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index fce6c58c9a1..979e3d9e189 100644
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ b/x11-libs/libxcb/libxcb-1.14.ebuild
@@ -34,6 +34,10 @@ BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep '>=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]')
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tests-don-t-use-deprecated-fail_unless-check-API.patch
+)
+
 python_check_deps() {
 	has_version -b ">=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]"
 }


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-19  4:14 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-16 20:37 [gentoo-commits] repo/gentoo:master commit in: x11-libs/libxcb/, x11-libs/libxcb/files/ Matt Turner
  -- strict thread matches above, loose matches on Subject: below --
2018-05-20 18:37 Matt Turner
2020-11-19  4:14 Matt Turner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox