From: | "Donnie Berkholz (dberkholz)" <dberkholz@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in x11-misc/xkeyboard-config: ChangeLog xkeyboard-config-1.4.ebuild |
Date: | Tue, 14 Oct 2008 17:10:01 |
Message-Id: | E1KpnPD-0004aN-2u@stork.gentoo.org |
1 | dberkholz 08/10/14 17:09:59 |
2 | |
3 | Modified: ChangeLog |
4 | Added: xkeyboard-config-1.4.ebuild |
5 | Log: |
6 | Version bump. |
7 | (Portage version: 2.2_rc12/cvs/Linux 2.6.27-rc9 x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.51 x11-misc/xkeyboard-config/ChangeLog |
11 | |
12 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?rev=1.51&view=markup |
13 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?rev=1.51&content-type=text/plain |
14 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?r1=1.50&r2=1.51 |
15 | |
16 | Index: ChangeLog |
17 | =================================================================== |
18 | RCS file: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v |
19 | retrieving revision 1.50 |
20 | retrieving revision 1.51 |
21 | diff -u -r1.50 -r1.51 |
22 | --- ChangeLog 10 Jun 2008 06:58:04 -0000 1.50 |
23 | +++ ChangeLog 14 Oct 2008 17:09:59 -0000 1.51 |
24 | @@ -1,6 +1,12 @@ |
25 | # ChangeLog for x11-misc/xkeyboard-config |
26 | # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 | -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.50 2008/06/10 06:58:04 dberkholz Exp $ |
28 | +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.51 2008/10/14 17:09:59 dberkholz Exp $ |
29 | + |
30 | +*xkeyboard-config-1.4 (14 Oct 2008) |
31 | + |
32 | + 14 Oct 2008; Donnie Berkholz <dberkholz@g.o>; |
33 | + +xkeyboard-config-1.4.ebuild: |
34 | + Version bump. |
35 | |
36 | *xkeyboard-config-1.3 (10 Jun 2008) |
37 | |
38 | |
39 | |
40 | |
41 | 1.1 x11-misc/xkeyboard-config/xkeyboard-config-1.4.ebuild |
42 | |
43 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.4.ebuild?rev=1.1&view=markup |
44 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.4.ebuild?rev=1.1&content-type=text/plain |
45 | |
46 | Index: xkeyboard-config-1.4.ebuild |
47 | =================================================================== |
48 | # Copyright 1999-2008 Gentoo Foundation |
49 | # Distributed under the terms of the GNU General Public License v2 |
50 | # $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.4.ebuild,v 1.1 2008/10/14 17:09:59 dberkholz Exp $ |
51 | |
52 | inherit eutils multilib |
53 | |
54 | DESCRIPTION="X keyboard configuration database" |
55 | KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
56 | HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" |
57 | SRC_URI="http://xlibs.freedesktop.org/xkbdesc/${P}.tar.bz2" |
58 | |
59 | LICENSE="MIT" |
60 | SLOT="0" |
61 | |
62 | RDEPEND="x11-apps/xkbcomp |
63 | !x11-misc/xkbdata" |
64 | DEPEND="${RDEPEND} |
65 | dev-perl/XML-Parser" |
66 | |
67 | pkg_setup() { |
68 | # (#130590) The old XKB directory can screw stuff up |
69 | local DIR="${ROOT}usr/$(get_libdir)/X11/xkb" |
70 | if [[ -d ${DIR} ]] ; then |
71 | eerror "Directory ${DIR} should be" |
72 | eerror "manually deleted/renamed/relocated before installing!" |
73 | die "Manually remove ${DIR}" |
74 | fi |
75 | |
76 | # The old xkbdata 'pc' directory can screw stuff up, because portage won't |
77 | # let us overwrite a directory with a file |
78 | local PC="${ROOT}usr/share/X11/xkb/symbols/pc" |
79 | if [[ -d ${PC} ]] ; then |
80 | eerror "Directory ${PC} should be" |
81 | eerror "manually deleted/renamed/relocated before installing!" |
82 | die "Manually remove ${PC}" |
83 | fi |
84 | } |
85 | |
86 | src_compile() { |
87 | econf \ |
88 | --with-xkb-base=/usr/share/X11/xkb \ |
89 | --enable-compat-rules \ |
90 | --disable-xkbcomp-symlink \ |
91 | --with-xkb-rules-symlink=xorg \ |
92 | || die "configure failed" |
93 | |
94 | emake || die "make failed" |
95 | } |
96 | |
97 | src_install() { |
98 | emake DESTDIR="${D}" install || die "install failed" |
99 | } |