Version bump.

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

3 files changed, 58 insertions, 12 deletions

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index 842d463c362a..4ba74df75c0b 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.160 2012/05/10 17:12:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.161 2012/05/30 08:50:17 chithanh Exp $
+
+*xkeyboard-config-2.6 (30 May 2012)
+
+  30 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkeyboard-config-2.6.ebuild:
+  Version bump.
 
   10 May 2012; Alexis Ballier <aballier@gentoo.org>
   xkeyboard-config-2.5.1.ebuild:
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 39a24e118f13..aca770103161 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-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
 AUX xorg-cve-2012-0064.patch 2492 RMD160 42ad7eb8b73f7adaa00a86bff0834c6f399fab68 SHA1 8d86a3910c60f1250518f56fbc31b7f8b506c42d SHA256 4a06188c20f4707afaffd95663d0277541c790eb34907e7ac0cb96202c003afd
@@ -10,6 +7,7 @@ DIST xkeyboard-config-2.3.tar.bz2 771953 RMD160 a89d10bfbab88c8c1f1330bcfe82cb38
 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
+DIST xkeyboard-config-2.6.tar.bz2 857799 RMD160 0efa86fc3f3ba73942925bba4af6da6462caac20 SHA1 9a07cf04b1a7a13be7a86ce37c9f7efe1ec5fbc2 SHA256 22a1594116bf0ee3165f48487bdca4e5f25b2a1436e35e188b3ee38c543dabda
 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
@@ -17,12 +15,6 @@ EBUILD xkeyboard-config-2.4.1-r2.ebuild 1450 RMD160 71bc277cee55664774ecc1f63431
 EBUILD xkeyboard-config-2.4.1-r3.ebuild 1483 RMD160 9db7d64e00a30531f3aea615d9b27955183b4a33 SHA1 ae2c614a0d758046e5b81e60869115837853d227 SHA256 48ddf55bb52aba5df24c1c3b26cca036a9ff0dde3bc320c601cbf4df9b3adff8
 EBUILD xkeyboard-config-2.5.1.ebuild 1342 RMD160 1caf1c7beac7d078a371f03fee77486808cb2626 SHA1 0b59657292a52070213a06bc1513994b04b10ea2 SHA256 951a28517e3b8fec15ed2a3cb2dd7888292874b9996063cc896e58ab13db4583
 EBUILD xkeyboard-config-2.5.ebuild 1329 RMD160 9ed2b63f274ae9b5b52f50530fe2a31d6543b619 SHA1 31807b7cc305b845590922a55b2dbb57aed3148c SHA256 66525a716dff858defc11a89e59ca9570e3e7b81f129539dff2f1b888a3988f1
-MISC ChangeLog 22836 RMD160 c5e8bed52a582b6525308175f9c2fcec1db0c132 SHA1 420d09e76ba19bd716aabaf8d168d34fcc076d5c SHA256 c2d347e834016ff0285e1ded8ec6b4a5456dda0143589285d149e02bbb976394
+EBUILD xkeyboard-config-2.6.ebuild 1346 RMD160 30b52a3cc557b6ea0db6ffe15e2e3365809d6447 SHA1 a2dc4721705308192d24785db3654cc5b47dacc8 SHA256 4a6b638cb9146c096637a7ff6596525ed57cc6c5e57cb6ec0cab5a71208ae07f
+MISC ChangeLog 22991 RMD160 52293f5bba5b01a6bd5323f1de14037651514422 SHA1 7b0292edfb4c361003f6a8d34e837f44596be1a3 SHA256 e446640c37e449870f773ae6de0de836e2247f647af26cf9f0e04ee5094ea665
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk+r9wYACgkQvFcC4BYPU0py8gCgseuvBDXdy48iLmzMVNSgvTnB
-zFUAoJv02qcGHbcIlrXEgGFHDVUWTgjG
-=vvcu
------END PGP SIGNATURE-----
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.6.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.6.ebuild
new file mode 100644
index 000000000000..de063ee66fc9
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.6.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.6.ebuild,v 1.1 2012/05/30 08:50:17 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 ~amd64-fbsd ~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
+}