summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2011-02-03 21:51:57 +0100
committerMichał Górny <mgorny@gentoo.org>2011-02-03 21:51:57 +0100
commite3da3b43f883be67212a1b1ff2176897f857c40f (patch)
treeafe71699130d42def83a40d06be40438b600a8e4 /x11-misc
parentx11-misc/xkeyboard-config: Import metadata.xml. (diff)
downloadx11-e3da3b43f883be67212a1b1ff2176897f857c40f.tar.gz
x11-e3da3b43f883be67212a1b1ff2176897f857c40f.tar.bz2
x11-e3da3b43f883be67212a1b1ff2176897f857c40f.zip
x11-misc/xkeyboard-config: Run intltoolize in the live ebuild. Fix building in build-dir.
(Portage version: 2.2.0_alpha19_p78/git/Linux x86_64, signed Manifest commit with key 05DE07BB)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xkeyboard-config/Manifest8
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild12
2 files changed, 13 insertions, 7 deletions
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index fb81a8d8..67117dcf 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,12 +1,12 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-EBUILD xkeyboard-config-9999.ebuild 970 RMD160 8b11ed41b062692d7a8de3cba4a4ece25669a6ab SHA1 0931fc2ae4ecf7a2438bfb775e093edb2e4a8d64 SHA256 92a7c0fff0f453d744d47f8bbd1a11395a95a5a15061a35c8210e354ec7c58d3
+EBUILD xkeyboard-config-9999.ebuild 1091 RMD160 a5c47e78240945b94eac93cc280cabd9df212ef5 SHA1 d8d0d6e06d8b0ab5db49eed12f5dd2d1b6e77abc SHA256 130e90cbd2a84864b2156e783ecbe1aa99ee772eec6acd588f678176b4b2f5bc
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk1LFRQACgkQnGSe5QXeB7srMgCeOej4yzDM7+5a9vGArpvaCg9Q
-DZsAoIB3xxODDPECsuqRgXh6QCsguGfi
-=eo8q
+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 5662d5f7..05b16ca4 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -30,9 +30,15 @@ CONFIGURE_OPTIONS="
--enable-compat-rules
--with-xkb-rules-symlink=xorg"
+src_prepare() {
+ xorg-2_src_prepare
+ if [[ ${XORG_EAUTORECONF} != no ]]; then
+ intltoolize --copy --automake || die
+ fi
+}
+
src_compile() {
# cleanup to make sure .dir files are regenerated
# bug #328455 c#26
- emake clean
- xorg-2_src_compile
+ xorg-2_src_compile clean all
}