Gentoo Archives: gentoo-commits

From: Chi-Thanh Christopher Nguyen <chithanh@××××××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/x11:master commit in: x11-misc/xkeyboard-config/
Date: Wed, 30 May 2012 09:58:59
Message-Id: 1338371940.0a21b1975e0acf01d94d0fb1a8677be1861e42f9.chithead@gentoo
1 commit: 0a21b1975e0acf01d94d0fb1a8677be1861e42f9
2 Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 30 09:59:00 2012 +0000
4 Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
5 CommitDate: Wed May 30 09:59:00 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=0a21b197
7
8 x11-misc/xkeyboard-config: sync with portage.
9
10 ---
11 .../xkeyboard-config/xkeyboard-config-9999.ebuild | 17 ++++++++---------
12 1 files changed, 8 insertions(+), 9 deletions(-)
13
14 diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
15 index 0eceb0c..5c45130 100644
16 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
17 +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
18 @@ -1,6 +1,6 @@
19 -# Copyright 1999-2011 Gentoo Foundation
20 +# Copyright 1999-2012 Gentoo Foundation
21 # Distributed under the terms of the GNU General Public License v2
22 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.2.ebuild,v 1.1 2011/04/04 09:48:39 scarabeus Exp $
23 +# $Header: $
24
25 EAPI=4
26
27 @@ -11,20 +11,19 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
28
29 DESCRIPTION="X keyboard configuration database"
30 HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
31 -[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
32 +[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2"
33
34 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
35 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
36 IUSE=""
37
38 LICENSE="MIT"
39 SLOT="0"
40
41 -RDEPEND=">=x11-apps/xkbcomp-1.2.1
42 - >=x11-libs/libX11-1.4.2"
43 +RDEPEND=">=x11-apps/xkbcomp-1.2.3
44 + >=x11-libs/libX11-1.4.3"
45 DEPEND="${RDEPEND}
46 - x11-proto/xproto
47 - >=dev-util/intltool-0.30
48 - dev-perl/XML-Parser"
49 + dev-util/intltool
50 + >=x11-proto/xproto-7.0.20"
51
52 XORG_CONFIGURE_OPTIONS=(
53 --with-xkb-base="${EPREFIX}/usr/share/X11/xkb"