Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/xkeyboard-config: ChangeLog xkeyboard-config-2.2.ebuild xkeyboard-config-2.0-r1.ebuild xkeyboard-config-1.9.ebuild
Date: Mon, 04 Apr 2011 09:48:49
Message-Id: 20110404094839.4F65520054@flycatcher.gentoo.org
1 scarabeus 11/04/04 09:48:39
2
3 Modified: ChangeLog
4 Added: xkeyboard-config-2.2.ebuild
5 Removed: xkeyboard-config-2.0-r1.ebuild
6 xkeyboard-config-1.9.ebuild
7 Log:
8 Version bump. Drop older.
9
10 (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.123 x11-misc/xkeyboard-config/ChangeLog
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?rev=1.123&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?rev=1.123&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?r1=1.122&r2=1.123
18
19 Index: ChangeLog
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v
22 retrieving revision 1.122
23 retrieving revision 1.123
24 diff -u -r1.122 -r1.123
25 --- ChangeLog 18 Mar 2011 15:34:05 -0000 1.122
26 +++ ChangeLog 4 Apr 2011 09:48:39 -0000 1.123
27 @@ -1,6 +1,13 @@
28 # ChangeLog for x11-misc/xkeyboard-config
29 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
30 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.122 2011/03/18 15:34:05 scarabeus Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.123 2011/04/04 09:48:39 scarabeus Exp $
32 +
33 +*xkeyboard-config-2.2 (04 Apr 2011)
34 +
35 + 04 Apr 2011; Tomáš Chvátal <scarabeus@g.o>
36 + -xkeyboard-config-1.9.ebuild, -xkeyboard-config-2.0-r1.ebuild,
37 + +xkeyboard-config-2.2.ebuild:
38 + Version bump. Drop older.
39
40 18 Mar 2011; Tomáš Chvátal <scarabeus@g.o>
41 xkeyboard-config-1.9.ebuild, xkeyboard-config-2.0-r1.ebuild:
42
43
44
45 1.1 x11-misc/xkeyboard-config/xkeyboard-config-2.2.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.2.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.2.ebuild?rev=1.1&content-type=text/plain
49
50 Index: xkeyboard-config-2.2.ebuild
51 ===================================================================
52 # Copyright 1999-2011 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $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 $
55
56 EAPI=4
57
58 XORG_STATIC=no
59 inherit xorg-2
60
61 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
62
63 DESCRIPTION="X keyboard configuration database"
64 HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
65 [[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
66
67 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"
68 IUSE=""
69
70 LICENSE="MIT"
71 SLOT="0"
72
73 RDEPEND="x11-apps/xkbcomp
74 >=x11-libs/libX11-1.4.2"
75 DEPEND="${RDEPEND}
76 x11-proto/xproto
77 >=dev-util/intltool-0.30
78 dev-perl/XML-Parser"
79
80 # do not check for runtime deps
81 CONFIGURE_OPTIONS="
82 --with-xkb-base=\"${EPREFIX}/usr/share/X11/xkb\"
83 --enable-compat-rules
84 --disable-runtime-deps
85 --with-xkb-rules-symlink=xorg"
86
87 src_prepare() {
88 xorg-2_src_prepare
89 if [[ ${XORG_EAUTORECONF} != no ]]; then
90 intltoolize --copy --automake || die
91 fi
92 }
93
94 src_compile() {
95 # cleanup to make sure .dir files are regenerated
96 # bug #328455 c#26
97 xorg-2_src_compile clean
98 xorg-2_src_compile
99 }