diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-04 11:43:16 +0200 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-04 11:43:16 +0200 |
| commit | ec974e66d42f5404d674f3f21110397de0a0956a (patch) | |
| tree | 406a9ac63e3cc3b41a3c5b30729432b9d5c2bae7 /x11-misc | |
| parent | fix typo (diff) | |
| download | x11-ec974e66d42f5404d674f3f21110397de0a0956a.tar.gz x11-ec974e66d42f5404d674f3f21110397de0a0956a.tar.bz2 x11-ec974e66d42f5404d674f3f21110397de0a0956a.zip | |
[x11-misc/xkeyboard-config] sync with main tree
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xkeyboard-config/Manifest | 12 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild | 14 |
2 files changed, 10 insertions, 16 deletions
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index 67117dcf..63836e97 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1,12 +1,2 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -EBUILD xkeyboard-config-9999.ebuild 1091 RMD160 a5c47e78240945b94eac93cc280cabd9df212ef5 SHA1 d8d0d6e06d8b0ab5db49eed12f5dd2d1b6e77abc SHA256 130e90cbd2a84864b2156e783ecbe1aa99ee772eec6acd588f678176b4b2f5bc +EBUILD xkeyboard-config-9999.ebuild 1328 RMD160 0b84e4a39b82fa0d5d2e4a8ecc85b5ba5984969d SHA1 53b4e2cff0388689e758c72038984f44951c529f SHA256 2a0f0b71d40f86e19e8fe439f2d30f6693eabdd6aec2afa53b339c540ed01c3c MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk1LFW0ACgkQnGSe5QXeB7svBACg2DMpnQe4RhwIgFL25tsVkIPl -zDMAoIsqJrJse4fJ9EX+bhx3JLTxrDqM -=Kwkg ------END PGP SIGNATURE----- diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild index 05b16ca4..d222741e 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild @@ -1,18 +1,17 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.2.ebuild,v 1.1 2011/04/04 09:48:39 scarabeus Exp $ EAPI=4 XORG_STATIC=no - inherit xorg-2 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config" DESCRIPTION="X keyboard configuration database" HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" -[[ ${PV} == *9999* ]] || SRC_URI="${BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2" +[[ ${PV} == *9999* ]] || SRC_URI="${XORG_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" IUSE="" @@ -20,14 +19,18 @@ IUSE="" LICENSE="MIT" SLOT="0" -RDEPEND="x11-apps/xkbcomp" +RDEPEND="x11-apps/xkbcomp + >=x11-libs/libX11-1.4.2" DEPEND="${RDEPEND} + x11-proto/xproto >=dev-util/intltool-0.30 dev-perl/XML-Parser" +# do not check for runtime deps CONFIGURE_OPTIONS=" --with-xkb-base=\"${EPREFIX}/usr/share/X11/xkb\" --enable-compat-rules + --disable-runtime-deps --with-xkb-rules-symlink=xorg" src_prepare() { @@ -40,5 +43,6 @@ src_prepare() { src_compile() { # cleanup to make sure .dir files are regenerated # bug #328455 c#26 - xorg-2_src_compile clean all + xorg-2_src_compile clean + xorg-2_src_compile } |