x11-libs/libxcb: revbump + add patch to fix bug #533906

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 901AB08A)

3 files changed, 321 insertions, 1 deletions

diff --git a/x11-libs/libxcb/ChangeLog b/x11-libs/libxcb/ChangeLog
index da96d6e64efc..5380ecb63552 100644
--- a/x11-libs/libxcb/ChangeLog
+++ b/x11-libs/libxcb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libxcb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/ChangeLog,v 1.147 2014/12/21 09:42:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/ChangeLog,v 1.148 2014/12/30 00:29:26 remi Exp $
+
+*libxcb-1.11-r1 (30 Dec 2014)
+
+  30 Dec 2014; Rémi Cardona <remi@gentoo.org> +libxcb-1.11-r1.ebuild,
+  +files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch
+  :
+  Don't install headers/man pages for disabled extension, see bug #533906.
 
   21 Dec 2014; Michał Górny <mgorny@gentoo.org> files/xcb-rebuilder.sh:
   Use sys-apps/gentoo-functions in xcb-rebuilder, bug #504420.
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
new file mode 100644
index 000000000000..0f8aa1198234
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch
@@ -0,0 +1,257 @@
+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/libxcb-1.11-r1.ebuild b/x11-libs/libxcb/libxcb-1.11-r1.ebuild
new file mode 100644
index 000000000000..ef9bdf7c4219
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.11-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.11-r1.ebuild,v 1.1 2014/12/30 00:29:26 remi Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,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="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="http://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 ~x86-freebsd ~x86-interix ~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"
+	"${FILESDIR}/${PN}-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch"
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc build-docs)
+		$(use_enable selinux)
+		$(use_enable xkb)
+		--enable-xinput
+	)
+	xorg-2_src_configure
+}