Version bump.

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

3 files changed, 67 insertions, 7 deletions

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index 44893e24e1e6..a20f0fcad6cd 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.153 2012/01/19 21:40:16 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.154 2012/01/20 23:50:35 ssuominen Exp $
+
+*xkeyboard-config-2.5 (20 Jan 2012)
+
+  20 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xkeyboard-config-2.5.ebuild:
+  Version bump.
 
   19 Jan 2012; Michael Weber <xmw@gentoo.org> xkeyboard-config-2.4.1-r3.ebuild:
   arm stable (security bug 399347)
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index cd413135c249..b0fb9756b161 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX xkeyboard-config-2.4.1-extended-function-keys.patch 8001 RMD160 d9ce813b423462167112f17b04f8105eb9c67682 SHA1 9edcc0013c89d8e439dcdc49569f5522ddd5b35d SHA256 04c46922f2b495016230dbe8f4b85e4e5f520eb0dc649ab170039fda85120497
 AUX xkeyboard-config-2.4.1-shift-backspace.patch 1397 RMD160 99df457599d66c9886241ab573b8cf451082ef3c SHA1 d8a5a2ec6fd63c33415d50dc1640027ab09d90a5 SHA256 b789e3fab3c4581f0b87a26ad4b38248cc6c69db48bd8a074b3289157f6b055e
@@ -8,17 +8,23 @@ DIST xkeyboard-config-2.1.tar.bz2 699368 RMD160 235b20c991666a45f1af6d76633679e6
 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.1.tar.bz2 813373 RMD160 942692b54f0c9e06d95063bd90ce0fedfad5f108 SHA1 0596017597a6ead04ada1dda7e0b2de2ce597adb SHA256 f048bdd6e3d71c621b5a47a7ee72d691eda1922e0e07808b157b292e0c857a0a
+DIST xkeyboard-config-2.5.tar.bz2 835731 RMD160 fbb91b59e62feb49d28b4678b9c502c1277ca935 SHA1 53e0680622cfa3e29f210fcbef88bc20d9e082eb SHA256 0f50579d34e56d817a1bf7ff26582984dd7262209e9e74862237cfae5a7a2961
 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 1340 RMD160 1e43ea3af05c70acbf4aae1ad78e23fdb53107f9 SHA1 7d511eed3fed65869859579d8d81820aa44a7339 SHA256 57a04ac5d1a22c5e93bd93ffe1f91186969cd407039bab55145d5d86214b103d
 EBUILD xkeyboard-config-2.4.1-r2.ebuild 1450 RMD160 71bc277cee55664774ecc1f634310badea926169 SHA1 3cfac7b014cd4b5008853348498609e5e5dfca4d SHA256 b2c3fde50abb98485227f592d31a532b0a29c6f0d44a1f9cb96feb62c378b06c
 EBUILD xkeyboard-config-2.4.1-r3.ebuild 1488 RMD160 fbe3293f4c4bba103d09fcb125b45bba4f29844e SHA1 e6bfcddf157e2bf4b31842f55b967bffa00fb62b SHA256 ac45a47da40bd9e0cc794912acc2bde408f619821c0bf3b39ae10f0c4c0091c4
-MISC ChangeLog 21896 RMD160 0b25699bd85b82e139456f77562409a8a3d94fb4 SHA1 296eb83ea3c0dff182241a7c1b7d51e8fedfd73c SHA256 50ade0f7c3b7a4c7d02b4f670aca5a4bddaebe5a25296bd7e9bfd6c55896a752
+EBUILD xkeyboard-config-2.5.ebuild 1329 RMD160 b1746b8126db1dacfee9b1fd5664dd330ef25d2b SHA1 fbdd9f3fd0ba4381bd63c089e1cbc7f9c27ab578 SHA256 5793dc57579a33de15dcdb84791cc9f1ae141fc795b41c9455ed877920448335
+MISC ChangeLog 22042 RMD160 3cf2bb73d8bad0bff1cdd0ecc4087e5c9879be4c SHA1 0c26efb3a446590a908388c34bf135f18ed66622 SHA256 7ce42033f65575c4050146d87ac246a9f9b8ebb31e347c2c201b7e1f90b49f3e
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8YjdcACgkQknrdDGLu8JCuhAD/SKMwk/Oc/tDGNn5FWX/SFLho
-i2LZ8U8Ji5JaOeWtOg4A/jE89EDVU9ENV/gEzd6BQdFV/ExVdcg3ojkk/hgT4HRw
-=HdVO
+iQEcBAEBAgAGBQJPGf1NAAoJEEdUh39IaPFN1EsH/Ariom4iq9d7n+iZ0waumtlk
+P8WzhJ/Ynh3SS57UVEv4gT1Tii6FELP7YXnJrFIB1tHwfSl6nVE2pkeZPFSC/u+E
+FVNiGFr/5eQTupFo1r1DPjWiUH3gjCbeUM8O5L6WwxQsXxIV9oKyJgMrdnJqN6rn
+Hh4apMtv6qlfZLdFIsbV/uJu1dZUae6N9FTb/O9DRXhLl+b9Z0FM+6P17t/byM5D
+Tn3kBHjA55d3DFLRMOPK8sod9NaEmn/vJd/UnrVPVjWSvyQ1UIAwp/L3rR4iMBa9
+Fbw7NL64ycB1hIUt1+txmn8vsEGcCWQ9X7RY1zoPJ2/lCOOS4kAeUE28glNfOXg=
+=fv1w
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.5.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.5.ebuild
new file mode 100644
index 000000000000..f4e2a16eefa7
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 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.5.ebuild,v 1.1 2012/01/20 23:50:35 ssuominen 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/${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}
+	dev-util/intltool
+	>=x11-proto/xproto-7.0.20"
+
+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
+}