From 22e4183d9d284d81497f5fa7763f7209e7c14bcb Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <zx2c4@gentoo.org>
Date: Tue, 13 Sep 2016 03:53:38 +0200
Subject: x11-libs/xcb-util-cursor: use gentoo-specific cursor paths from
 libXcursor

Gentoo has a long strange tradition of using /usr/share/cursors/xorg-x11
for cursors. Love it or hate it, that's how it is. x11-libs/libXcursor has
respected this. However, until recently -- commit here [1] -- xcb-util-cursor
did not support this. Now, finally, it does. So, we copy over the same paths
as with libXcursor. This fixes numerous bugs.

Package-Manager: portage-2.3.0
---
 .../xcb-util-cursor-0.1.3-r1.ebuild                | 38 ++++++++++++++++++++++
 .../xcb-util-cursor/xcb-util-cursor-0.1.3.ebuild   | 37 ---------------------
 2 files changed, 38 insertions(+), 37 deletions(-)
 create mode 100644 x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild
 delete mode 100644 x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3.ebuild

(limited to 'x11-libs/xcb-util-cursor')

diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..ab567b835b1e
--- /dev/null
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-cursor"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/"
+
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
+	>=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.1
+	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc doxygen)
+		--with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3.ebuild
deleted file mode 100644
index 13afbcabf621..000000000000
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-cursor"
-EGIT_HAS_SUBMODULES=yes
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
-
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
-	>=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-
-	xorg-2_src_configure
-}
-- 
cgit v1.2.3-65-gdbad