Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in xfce-extra/xfce4-xkb-plugin: xfce4-xkb-plugin-0.5.3.3-r1.ebuild
Date: Sun, 31 Oct 2010 19:40:59
Message-Id: 20101031194052.80F3D20051@flycatcher.gentoo.org
1 ssuominen 10/10/31 19:40:52
2
3 Modified: xfce4-xkb-plugin-0.5.3.3-r1.ebuild
4 Log:
5 drop ugly has_version hack
6
7 (Portage version: 2.2.0_alpha1/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.13 xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild?rev=1.13&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild?rev=1.13&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild?r1=1.12&r2=1.13
15
16 Index: xfce4-xkb-plugin-0.5.3.3-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild,v
19 retrieving revision 1.12
20 retrieving revision 1.13
21 diff -u -r1.12 -r1.13
22 --- xfce4-xkb-plugin-0.5.3.3-r1.ebuild 5 Aug 2010 21:51:38 -0000 1.12
23 +++ xfce4-xkb-plugin-0.5.3.3-r1.ebuild 31 Oct 2010 19:40:52 -0000 1.13
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild,v 1.12 2010/08/05 21:51:38 ssuominen Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild,v 1.13 2010/10/31 19:40:52 ssuominen Exp $
29
30 EAPI=2
31 inherit xfconf
32 @@ -18,7 +18,7 @@
33 >=xfce-base/xfce4-panel-4.3.20
34 >=xfce-base/libxfce4util-4.3.90.2
35 >=xfce-base/libxfcegui4-4.3.90.2
36 - >=x11-libs/libxklavier-4
37 + >=x11-libs/libxklavier-5
38 x11-libs/libwnck"
39 DEPEND="${RDEPEND}
40 dev-util/pkgconfig
41 @@ -27,13 +27,8 @@
42 >=gnome-base/librsvg-2.18"
43
44 pkg_setup() {
45 + PATCHES=( "${FILESDIR}/${P}-libxklavier-5.patch" )
46 DOCS="AUTHORS ChangeLog README"
47 XFCONF="--disable-dependency-tracking
48 $(xfconf_use_debug)"
49 -
50 - if has_version ">=x11-libs/libxklavier-5"; then
51 - PATCHES=( "${FILESDIR}/${P}-libxklavier-5.patch" )
52 - else
53 - PATCHES=( "${FILESDIR}/${P}-libxklavier.patch" )
54 - fi
55 }