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 | 1e2938a7531b1f7ae972b3824643f3c0557614ac (patch) | |
| tree | 4badafa767c187831466f08946477f717b74ac1e /x11-misc | |
| parent | Version bump (diff) | |
| download | historical-1e2938a7531b1f7ae972b3824643f3c0557614ac.tar.gz historical-1e2938a7531b1f7ae972b3824643f3c0557614ac.tar.bz2 historical-1e2938a7531b1f7ae972b3824643f3c0557614ac.zip | |
Sync with live version.
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild | 8 |
3 files changed, 11 insertions, 7 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/Manifest b/x11-misc/xkeyboard-config/Manifest index 198bd11506ae..68aaa9ecf475 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -5,6 +5,6 @@ DIST xkeyboard-config-2.1.tar.bz2 699368 RMD160 235b20c991666a45f1af6d76633679e6 EBUILD xkeyboard-config-1.7.ebuild 1304 RMD160 637e07ca3cabd46b11eb8b84901be87301c0cf0c SHA1 629d56d8401d6b409d6760c4d906eaf9f757361c SHA256 bb6684f2ef035137f2d359037adf6cbaafd2aac314cbce5a98163aa99ef5a696 EBUILD xkeyboard-config-1.9.ebuild 1091 RMD160 aec332abe52accd234be58a13756b7f7507eb9d9 SHA1 4c01386892e1117141d3d7154aab84c15f75b885 SHA256 dcdb33aa641a774c77d12aca9bf2049c29bfde10be3ac124785202148ad181d3 EBUILD xkeyboard-config-2.0-r1.ebuild 1068 RMD160 10426ab664b1c927ca307dc89d7e8f7c952c0c24 SHA1 586814847867c0960ce4ba90eb6e75bfdf13523c SHA256 fb42c6b7a8074115d492ca2647565a6e950fa2d5001246ee13b8bc7596f6b82a -EBUILD xkeyboard-config-2.1.ebuild 1066 RMD160 0f59ef783325dea70355aeb9aaaa17630f8bc64f SHA1 d4888a3e71f5a49cd47a4c3c8aaff5b4761814e4 SHA256 0311a13cab201aae26d74bcb6b8ca33e7c81db10a3fcf6e6c2cbc01acd2d1d59 -MISC ChangeLog 15468 RMD160 9e39732004e2073d013c8f0ce4e1b19e12b0db2c SHA1 376315a78de278eb129a7967f8152db183448538 SHA256 b3f027b49d1fb418219c60d6a3fb65554b1d600217d8c26f445ea0562cf2da1c +EBUILD xkeyboard-config-2.1.ebuild 1090 RMD160 2ef5552da6eb5ad0c64e60978fc750e55c770faf SHA1 192b7ea45b53d917454b566597928bf4e5efb88a SHA256 42431f400f1cf4d6165bfd7445d6f90a0553d8c65fa400fe9403faba66a0dde9 +MISC ChangeLog 15581 RMD160 2d0a5c3877ad9570d1c78823ddd2199f86e8ab57 SHA1 359c62e228b59b3809200387f6b4fc50a0cd8fb5 SHA256 03e41ec4d02389bb18d095fb4c7d60452f62c90c265e5c4a585f75888707fa61 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 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" |