commit: 32de5ce7069d8a8f5a5fbc874fd5aca761bd9f7b Author: Rémi Cardona <remi <AT> gentoo <DOT> org> AuthorDate: Mon Nov 3 07:28:48 2014 +0000 Commit: Remi Cardona <remi <AT> gentoo <DOT> org> CommitDate: Mon Nov 3 07:33:44 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=32de5ce7
x11-libs/libxcb: Sync with portage - remove 1.11 that's in portage - indenting in metadata.xml - sync -9999 with latest ~arch from portage - remove thick manifest --- .../files/libxcb-1.11-xevie-xprint_removal.patch | 30 ------------ x11-libs/libxcb/libxcb-1.11.ebuild | 53 ---------------------- x11-libs/libxcb/libxcb-9999.ebuild | 14 +++--- x11-libs/libxcb/metadata.xml | 8 ++-- 4 files changed, 12 insertions(+), 93 deletions(-) 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 e8c24d3..0000000 --- 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 <jcris...@debian.org> -Signed-off-by: Daniel Martin <consume.no...@gmail.com> -Signed-off-by: Uli Schlachter <psyc...@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/libxcb-1.11.ebuild b/x11-libs/libxcb/libxcb-1.11.ebuild deleted file mode 100644 index 5d4b500..0000000 --- a/x11-libs/libxcb/libxcb-1.11.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_2,3_3} ) -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" ) - -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-9999.ebuild b/x11-libs/libxcb/libxcb-9999.ebuild index fd627b4..7b42d8f 100644 --- a/x11-libs/libxcb/libxcb-9999.ebuild +++ b/x11-libs/libxcb/libxcb-9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_1,3_2,3_3} ) +PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) PYTHON_REQ_USE=xml XORG_DOC=doc @@ -17,20 +17,22 @@ 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 ~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" +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}]" +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[${MULTILIB_USEDEP},${PYTHON_USEDEP}]" + has_version --host-root ">=x11-proto/xcb-proto-1.11[${PYTHON_USEDEP}]" } pkg_setup() { diff --git a/x11-libs/libxcb/metadata.xml b/x11-libs/libxcb/metadata.xml index 4a117f6..6d157b5 100644 --- a/x11-libs/libxcb/metadata.xml +++ b/x11-libs/libxcb/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<herd>x11</herd> -<use> -<flag name="xkb">Enable the XCB keyboard extension</flag> -</use> + <herd>x11</herd> + <use> + <flag name="xkb">Enable the XCB keyboard extension</flag> + </use> </pkgmetadata>
