Version bump.

Package-Manager: portage-2.2.0_alpha53/cvs/Linux x86_64

3 files changed, 59 insertions, 12 deletions

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index fca9cc6bcad2..98dccfe99853 100644
--- a/x11-misc/xkeyboard-config/ChangeLog
+++ b/x11-misc/xkeyboard-config/ChangeLog
@@ -1,6 +1,12 @@
 # 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.139 2011/09/21 00:39:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.140 2011/10/02 01:05:44 chithanh Exp $
+
+*xkeyboard-config-2.4 (02 Oct 2011)
+
+  02 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkeyboard-config-2.4.ebuild:
+  Version bump.
 
   21 Sep 2011; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-2.3.ebuild:
   Stable for HPPA (bug #380421).
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 302437e40c95..ae31fe99b1ef 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST xkeyboard-config-2.1.tar.bz2 699368 RMD160 235b20c991666a45f1af6d76633679e6eae08d81 SHA1 4e96e0704b2a17b291f98b2240611390e7a99f9e SHA256 f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075
 DIST xkeyboard-config-2.2.1.tar.bz2 739766 RMD160 f9e6147e664a8834b49ddb36eb553c49c81ffd65 SHA1 3962f1e92e9defb0382ce46ec0cc86cc30ff897f SHA256 642feb6e39096be1e081c5ba952c93fdfd93d41355dd6f88c20458a8251c6bd0
 DIST xkeyboard-config-2.3.tar.bz2 771953 RMD160 a89d10bfbab88c8c1f1330bcfe82cb38f32918f8 SHA1 a49c4cce9cfb7003aa04a32114f369c6bd7a9077 SHA256 d8a5dd169adca52dea3f751b99c500608c05894d759102521fd4ea9e8e284c80
+DIST xkeyboard-config-2.4.tar.bz2 812741 RMD160 66c07ce75eff6aecab506fee903905e8ef04d452 SHA1 1ddffae9af937a40d6da8a943c5f44abead8cfa0 SHA256 03aecae149c58942d6937ec417162f64e5a846947b98535fff1433c933f12a88
 EBUILD xkeyboard-config-2.1.ebuild 1103 RMD160 155ae87d8c1f97ff4d1f32b842a5421ae7fc0e0c SHA1 ef50975ed8e526f9fead4d47b6ffa22714da5023 SHA256 e73a3bfd0f395673a779fd2dcb59379221eebb91d2451798d74865a27fc90020
 EBUILD xkeyboard-config-2.2.1-r1.ebuild 1334 RMD160 c7d1b60830c370e7d81b4ac1c20f925cbfb25d48 SHA1 e223aa5b78589a17df2499e08828792bdb0689a2 SHA256 5b62d2bc959ee5098cb1bc98a70cdb511b98e13997d4d0ff81dca609f81ab08d
 EBUILD xkeyboard-config-2.3.ebuild 1344 RMD160 56b2b43d42f689e0afb5806857e3d9c00610e73a SHA1 408b261e5ef0b7868a5748465967057daf321b9c SHA256 925314c39a0c915960dddaa4bfcdd6bb4b370d21250fa7a6c42c41eb0cbaeb0b
-MISC ChangeLog 19582 RMD160 0d4317e343767d85ee89a7b017269957eb1a2fd5 SHA1 a5a5f17eb43c10592f20e6cfb0481854b43f6826 SHA256 12e410e58dfd6fc768d7435649fc2600cae2ba7b489ea0c6bf0c967fa33f7161
+EBUILD xkeyboard-config-2.4.ebuild 1353 RMD160 f74bb00f9b26156be889bed020fc9baf36bb2aeb SHA1 55338fa8d77a0b5810cfb87544302594800f321e SHA256 d6894b27c2355b7d2aebd58448b5a68387d3cd5e013b6ce0599e27311ef0b987
+MISC ChangeLog 19742 RMD160 e7e5a1afbfed063759573239f84f9c13c10010db SHA1 ea5d765157cda423f1dfcbff3f5b716ae2cf7a30 SHA256 c47edcab9603725b340b962f1b28964d2e0f11d3d37caac59d57a56a764b7997
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk55MksACgkQVWmRsqeSphMP2wCcC9KmIR4UszARL/pR/ROzK5aV
-FGgAnR93xZW0dmaNRGxUroFCG1oJXYd/
-=wr2p
------END PGP SIGNATURE-----
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.ebuild
new file mode 100644
index 000000000000..e9bff3e31370
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.ebuild
@@ -0,0 +1,49 @@
+# 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.4.ebuild,v 1.1 2011/10/02 01:05:44 chithanh 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="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=x11-apps/xkbcomp-1.2.1
+	>=x11-libs/libX11-1.4.2"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	>=dev-util/intltool-0.30
+	dev-perl/XML-Parser"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+	--enable-compat-rules
+	# do not check for runtime deps
+	--disable-runtime-deps
+	--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
+	xorg-2_src_compile clean
+	xorg-2_src_compile
+}