[gentoo-commits] gentoo-x86 commit in x11-misc/xkeyboard-config: ChangeLog xkeyboard-config-2.1.ebuild

[Tomas Chvatal (scarabeus)]

scarabeus    11/01/26 11:05:05

  Modified:             ChangeLog xkeyboard-config-2.1.ebuild
  Log:
  Sync with live version.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.110                x11-misc/xkeyboard-config/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?r1=1.109&r2=1.110

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- ChangeLog	26 Jan 2011 11:01:58 -0000	1.109
+++ ChangeLog	26 Jan 2011 11:05:04 -0000	1.110
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xkeyboard-config
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.109 2011/01/26 11:01:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.110 2011/01/26 11:05:04 scarabeus Exp $
+
+  26 Jan 2011; Tomáš Chvátal <scarabeus@g.o>
+  xkeyboard-config-2.1.ebuild:
+  Sync with live version.
 
 *xkeyboard-config-2.1 (26 Jan 2011)
 



1.2                  x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild?r1=1.1&r2=1.2

Index: xkeyboard-config-2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeyboard-config-2.1.ebuild	26 Jan 2011 11:01:58 -0000	1.1
+++ xkeyboard-config-2.1.ebuild	26 Jan 2011 11:05:04 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild,v 1.1 2011/01/26 11:01:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild,v 1.2 2011/01/26 11:05:04 scarabeus Exp $
 
 EAPI=3
 
@@ -12,9 +12,9 @@
 
 DESCRIPTION="X keyboard configuration database"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-SRC_URI="${BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
+[[ ${PV} == *9999* ]] || SRC_URI="${BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
 
-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"
+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"
 IUSE=""
 
 LICENSE="MIT"
@@ -26,7 +26,7 @@
 	dev-perl/XML-Parser"
 
 CONFIGURE_OPTIONS="
-	--with-xkb-base=${EPREFIX}/usr/share/X11/xkb
+	--with-xkb-base=\"${EPREFIX}/usr/share/X11/xkb\"
 	--enable-compat-rules
 	--with-xkb-rules-symlink=xorg"