diff options
| author |   Chi-Thanh Christopher Nguyen <chithanh@gentoo.org> | 2014-05-08 15:00:27 +0200 |
|---|---|---|
| committer | Chi-Thanh Christopher Nguyen <chithanh@gentoo.org> | 2014-05-08 15:00:27 +0200 |
| commit | bdf55d021299039f7b1df35060332890e42e78aa (patch) | |
| tree | a86170e4815f150874c4b671a39feab6bc8d468d /x11-libs | |
| parent | x11-libs/libSM: Depend on multilib util-linux. Sync the conditionals with gx86. (diff) | |
| download | x11-bdf55d021299039f7b1df35060332890e42e78aa.tar.gz x11-bdf55d021299039f7b1df35060332890e42e78aa.tar.bz2 x11-bdf55d021299039f7b1df35060332890e42e78aa.zip | |
x11-libs/libxkbcommon: Import multilib changes from portage
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=496696
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/libxkbcommon/Manifest | 1 | ||||
| -rw-r--r-- | x11-libs/libxkbcommon/libxkbcommon-0.3.1-r1.ebuild | 37 | ||||
| -rw-r--r-- | x11-libs/libxkbcommon/libxkbcommon-9999.ebuild | 5 |
3 files changed, 3 insertions, 40 deletions
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest deleted file mode 100644 index a9856709..00000000 --- a/x11-libs/libxkbcommon/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libxkbcommon-0.3.1.tar.xz 605756 SHA256 9c973581bba0c883a301fa6474d9c3e4f3a06c34e4ae4f1f4e113692cb18b38e SHA512 d5682f3663560d54bd3227ca0fdf52e651f2a14af46f49b4e7a5df2dc2e52748748f42c6334d6fd7328be72bd0c7e673e9783aa91d65a55a71266236f8b6a504 WHIRLPOOL f6472fa24c16c6f263e2ace807e4b2c7d4442d82e8d76ec047d4b9c312eaf889be26518fe3ffbd343610a5d966cf6b5df95cc47120ea60811cea4b687cc831ed 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 fffb844c..00000000 --- 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 3d74669c..839457d2 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 |