Version bump and raise xkeyboard-config dependency to non-vulnerable version.

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

3 files changed, 66 insertions, 9 deletions

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index d51c002854da..6bbb50506af2 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.162 2012/01/23 18:58:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.163 2012/02/17 09:40:07 ssuominen Exp $
+
+*libxklavier-5.2.1 (17 Feb 2012)
+
+  17 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +libxklavier-5.2.1.ebuild:
+  Version bump and raise xkeyboard-config dependency to non-vulnerable version.
 
   23 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> libxklavier-5.2.ebuild,
   +files/libxklavier-5.2-include-top_srcdir.patch:
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 5e7005aa78c0..a4afbd3ab317 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -3,19 +3,21 @@ Hash: SHA1
 
 AUX libxklavier-5.2-include-top_srcdir.patch 1019 RMD160 e65fa8d721e4850c7a3526a73e65c138f40ba460 SHA1 01aab4c8562e42fc48f0077b28b72923a43b361d SHA256 d2caabab0c46f6bd122ac7842005b85538f26ed1ee63b2b11febabb580fa8a1a
 DIST libxklavier-5.1.tar.bz2 346858 RMD160 b11190aaca9cfad31b9795d904c7581af24e262b SHA1 9ea0e705fbfa2c816babe8db632a59ccf98f6607 SHA256 1d7e8a6ed842d415d2f95b827e7d04ecf515ed5be2aaee262a8dd1c5cbe10ff1
+DIST libxklavier-5.2.1.tar.xz 312944 RMD160 ecebe25520ac28fce4ab414f8d371975d8741b7e SHA1 c32290e25a60d10e585fcfc80b590c6028ae0fab SHA256 a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e
 DIST libxklavier-5.2.tar.xz 312864 RMD160 c42227a9ad5c5d52c91e0bcb25e05e6614073a2d SHA1 829b64e63a3d4d4463554f4f9e75a0059daa5396 SHA256 7c1f04a80035e03cec992e16b89bc708a32b3578d6e133343d2cb56385d25dfe
 EBUILD libxklavier-5.1.ebuild 1345 RMD160 965cead70378d37f0fe71a514e6ad8d0d8a6ae5d SHA1 91223c8059fbc9fc4bf83e94e19471c023ba167d SHA256 b6df50c459af6844fc1949b1b84f7fb35ca48a7247c52e94c020e1ad1103cce4
+EBUILD libxklavier-5.2.1.ebuild 1335 RMD160 4699ef3d9e9c61a20cb26438d950b7b3cbd2e0a9 SHA1 07f17f9a70776e52f76fb43a6719798ed1d57be5 SHA256 7292d4055a664f2f32023a21a3825e6dd599216dff44b0536a38b4c9a977dd9c
 EBUILD libxklavier-5.2.ebuild 1445 RMD160 09fcd2e8e9459a7b7685c8b3d67c104dcf79905e SHA1 463cfdce4413d7c6fa060c04d824611078aca0db SHA256 a59d241353e63d2209a401190757ad501c44ed596bfb85fb06a8fac59d55ab89
-MISC ChangeLog 19626 RMD160 875ae5ca84393c40a5b3563b34c7f9d9be242f18 SHA1 be1f6c9baee7b5515e767d787913c4dffbb88b5d SHA256 81d927ef92ff030db918e2bd0d8bf65ef43db5332be466809bc4d4a2fd9ef18f
+MISC ChangeLog 19824 RMD160 cc587e3b6db6f933566ab685c15ebfecc06cc218 SHA1 f0f7c6e492a97cf65ca43203999fe3ebf8d35112 SHA256 a21a0184da04fe15037d55b106294bbe9753c640ac998b34341674fdae96181f
 MISC metadata.xml 363 RMD160 4dbc4f853ac6c39fbd8201e80e36f65c790a517b SHA1 b5925d77a0803a96b2160ae4c4661c96d53c53e3 SHA256 f1b88f406775d90ec7d414d51e38c4742fdc4dcf4ab0282df8c44e7a2f180543
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPHa1CAAoJEEdUh39IaPFNoVwH/R4vAdFq6a3k7xwvBLVAf3vL
-hvfUtMJI0cTemjdD7W4gPn1SpGokRkAmgv5O4bDIk4Yd7psmi1BH5YOmgPjjUKI8
-XNbC21EFTyQvNweEjOR5mL2QSBao3WcEnTMuMZA8Cu+w0Q+YCcXSfddqTpn5rZqd
-NxD3aPBXEWMG0wr9YyofbBSLxyiEK9+4qr7PcAw3FfrYNQBFrzXU9qb5pfqCZfhW
-OZLnXl1p1fsKcj8v5fc/5viY7VhZieoI5s6hw9D+lQ0GzV9qz7tHeBbSndeLwJAo
-/xa6cKS7NOr8FF6LM3VXM8AeXeCDSm+Ajd6YBni1ZVphYiNbvmecPuLK2dD3H6Y=
-=HE0D
+iQEcBAEBAgAGBQJPPh+4AAoJEEdUh39IaPFNpBMIAKAEUGl7x7U3EFkDy/qRuPRZ
+GV84SRrtvMZtSZ2WmReFQAL4oRWHL9agdzn1itGq5aV+KQA4gv/Wq7/JZknCDfgB
+EMZgl4AyJ9nRE57gQwVfz6bEWIwTHxbw0FiKMeLPQV9nCCUEJ97+/ayOvqcRg4QK
+YP9qt5iGwB00WGFEWQafUHFC6Mb51lVPWtngxTd9r95v2whT/8MxmW0equcMqKPz
+B3+mcmKxflud6yj6qP0vefeIuiAfKM92e6/PL6cxQPKbjqqI9JyVeNt8L/jJgvfq
++x3jLpkcw1eqHv+LG1CPBUcS+I2i6lh9/veRYcqoUIO+Qnm8YYD0HyLQdiRh6Ag=
+=yU8i
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libxklavier/libxklavier-5.2.1.ebuild b/x11-libs/libxklavier/libxklavier-5.2.1.ebuild
new file mode 100644
index 000000000000..86b53ca6b705
--- /dev/null
+++ b/x11-libs/libxklavier/libxklavier-5.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-5.2.1.ebuild,v 1.1 2012/02/17 09:40:07 ssuominen Exp $
+
+EAPI=4
+inherit gnome.org libtool
+
+DESCRIPTION="A library for the X Keyboard Extension (high-level API)"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LibXklavier"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc +introspection"
+
+RDEPEND="app-text/iso-codes
+	>=dev-libs/glib-2.16
+	dev-libs/libxml2
+	x11-apps/xkbcomp
+	x11-libs/libX11
+	>=x11-libs/libXi-1.1.3
+	x11-libs/libxkbfile
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+
+DOCS="AUTHORS ChangeLog CREDITS NEWS README"
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable doc gtk-doc) \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
+		--with-xkb-bin-base="${EPREFIX}"/usr/bin
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}