diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-01-26 11:05:04 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-01-26 11:05:04 +0000 |
| commit | 9846d2d86420cf82e564b425a3e2d299ef07b19d (patch) | |
| tree | 14f21d96c113c41f5a20d97d14ed28642ce51f15 /x11-misc | |
| parent | Version bump (diff) | |
| download | gentoo-2-9846d2d86420cf82e564b425a3e2d299ef07b19d.tar.gz gentoo-2-9846d2d86420cf82e564b425a3e2d299ef07b19d.tar.bz2 gentoo-2-9846d2d86420cf82e564b425a3e2d299ef07b19d.zip | |
Sync with live version.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xkeyboard-config/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog index 99dc97a4ab0f..aaaea8a76318 100644 --- a/x11-misc/xkeyboard-config/ChangeLog +++ b/x11-misc/xkeyboard-config/ChangeLog @@ -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@gentoo.org> + xkeyboard-config-2.1.ebuild: + Sync with live version. *xkeyboard-config-2.1 (26 Jan 2011) diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild index 14bcba41e669..65567392e27c 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild @@ -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 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config" 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 @@ DEPEND="${RDEPEND} 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" |