Version bump.

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

3 files changed, 66 insertions, 6 deletions

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index d143e18d0745..3fb41fb3211a 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.155 2012/01/24 12:52:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.156 2012/02/01 01:43:46 ssuominen Exp $
+
+*xkeyboard-config-2.5.1 (01 Feb 2012)
+
+  01 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xkeyboard-config-2.5.1.ebuild:
+  Version bump.
 
   24 Jan 2012; Jeroen Roovers <jer@gentoo.org>
   xkeyboard-config-2.4.1-r3.ebuild:
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index a0aa3b561b61..69ae44c202f1 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -8,19 +8,25 @@ 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.1.tar.bz2 833871 RMD160 b9244c671def2fd2e2d85c23139275ea74bf1485 SHA1 80f241325fed23278730a8cb565aa6c0e094b912 SHA256 eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
 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 1487 RMD160 93cb915cb82330937c1d4b781ab15965c2806b7c SHA1 319a160d0d7900476b47e529e30c562251062bb2 SHA256 01b935a3b7ff633cf70e79683fba7fa0a7397ae09e518a22e124f8834d1cfd09
+EBUILD xkeyboard-config-2.5.1.ebuild 1331 RMD160 a51fb0cc049223a00ef980cafb004c149abff58f SHA1 42852dd045afeb5284d2b450bf2943e2d218eb52 SHA256 a0e91d96c4476aea0c9d46db396732469df0fe4f1562df5e29f8cc7f86c01f20
 EBUILD xkeyboard-config-2.5.ebuild 1329 RMD160 9ed2b63f274ae9b5b52f50530fe2a31d6543b619 SHA1 31807b7cc305b845590922a55b2dbb57aed3148c SHA256 66525a716dff858defc11a89e59ca9570e3e7b81f129539dff2f1b888a3988f1
-MISC ChangeLog 22153 RMD160 f248780712a68e97472d373bf8e4526a657260a7 SHA1 b2729a386412823a9c25260d72bf764511b9a59e SHA256 ad29e1320788afc4f345c3185d2738852424b6bf32fa82b888e7a0a93cc0091c
+MISC ChangeLog 22303 RMD160 607ff8f18d65051173bad582bb1d471218fcc274 SHA1 0bdd78963596f38aaec111c70bdfd46d6587e3b4 SHA256 b67966e87ebec26704947aa6ec01363845a1df54145a2d112a61152fd522a8f3
 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)
 
-iEYEARECAAYFAk8eqbEACgkQVWmRsqeSphMTWQCfWFfhsrqfGsF1tmS8auGdCVEB
-78EAnjqEn/D2YZlyygHRZshrhT+eTf7/
-=+gXG
+iQEcBAEBAgAGBQJPKJg7AAoJEEdUh39IaPFNChsH/1zpno3fn3A500ZEanIsRDsr
+yAbKxTKOVmdQ0cZnXikiFLaYAaFcnY0aiM56uNLLJDgE4PXUH95pV/vsdhtEKQXl
++dfTP0NVAQ3s8w7Uy9FY0mU7zaImH+qYU8ajkxePXIHpZ9jsr/N2LerjhX0p5F/v
+M1Usk6LBkzq1YdFbSqOpdfuw2apbF5LogjLNi0tA70IUxWZGPYoGUFtr99kLN7l5
+P2pB41l8qGZu/uJsp31ApCGNd0ALv3df5Z1sfKQ+UvYNq9cXSQXiMwjMmyfxErjf
+zrvDX7FVC9L+9VdsenYsKVFIs4HH21miGSTQ8GL9GcI1SZFkDcNVcllt0HyEXYQ=
+=IZan
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.5.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.5.1.ebuild
new file mode 100644
index 000000000000..3472cb92c24c
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.5.1.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.1.ebuild,v 1.1 2012/02/01 01:43:46 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.3
+	>=x11-libs/libX11-1.4.3"
+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
+}