commit: bdf55d021299039f7b1df35060332890e42e78aa Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org> AuthorDate: Thu May 8 13:00:27 2014 +0000 Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de> CommitDate: Thu May 8 13:00:27 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=bdf55d02
x11-libs/libxkbcommon: Import multilib changes from portage Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=496696 --- x11-libs/libxkbcommon/libxkbcommon-0.3.1-r1.ebuild | 37 ---------------------- x11-libs/libxkbcommon/libxkbcommon-9999.ebuild | 5 +-- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.3.1-r1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.3.1-r1.ebuild deleted file mode 100644 index fffb844..0000000 --- a/x11-libs/libxkbcommon/libxkbcommon-0.3.1-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -XORG_EAUTORECONF="yes" -XORG_MULTILIB="yes" - -if [[ ${PV} = *9999* ]]; then - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" - EGIT_REPO_URI="git://github.com/xkbcommon/${PN}" -else - XORG_BASE_INDIVIDUAL_URI="" - SRC_URI="http://xkbcommon.org/download/${P}.tar.xz"; -fi - -inherit xorg-2 ${GIT_ECLASS} - -DESCRIPTION="X.Org xkbcommon library" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc" - -DEPEND="sys-devel/bison - sys-devel/flex - x11-proto/xproto[${MULTILIB_USEDEP}] - >=x11-proto/kbproto-1.0.5[${MULTILIB_USEDEP}] - doc? ( app-doc/doxygen )" -RDEPEND="" - -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - --with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb" - $(use_with doc doxygen) - ) - xorg-2_pkg_setup -} diff --git a/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild b/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild index 3d74669..839457d 100644 --- a/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild +++ b/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild @@ -19,11 +19,11 @@ inherit xorg-2 ${GIT_ECLASS} DESCRIPTION="X.Org xkbcommon library" KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc" +IUSE="X doc" DEPEND="sys-devel/bison sys-devel/flex - x11-libs/libxcb[${MULTILIB_USEDEP},xkb] + X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] ) x11-proto/xproto[${MULTILIB_USEDEP}] >=x11-proto/kbproto-1.0.5[${MULTILIB_USEDEP}] doc? ( app-doc/doxygen )" @@ -32,6 +32,7 @@ RDEPEND="" pkg_setup() { XORG_CONFIGURE_OPTIONS=( --with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb" + $(use X || use_enable X x11) $(use_with doc doxygen) ) xorg-2_pkg_setup
