Version bump. Solves bug 157934 too

Package-Manager: portage-2.1.2_rc4-r9

4 files changed, 87 insertions, 9 deletions

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index ae262ec61821..e91ff7e3e543 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.79 2007/01/06 06:46:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.80 2007/01/14 22:06:54 leio Exp $
+
+*libxklavier-3.1 (14 Jan 2007)
+
+  14 Jan 2007; Mart Raudsepp <leio@gentoo.org> +libxklavier-3.1.ebuild:
+  Version bump. Solves bug 157934 too
 
   06 Jan 2007; Bryan Østergaard <kloeri@gentoo.org>
   libxklavier-3.0-r1.ebuild:
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 39e45f50565b..c66180355145 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -20,6 +20,7 @@ SHA256 ba4be6b7737b09875adf109384fb375377540fbb213d62b647ba36baad28a7a0 files/su
 DIST libxklavier-2.0.tar.gz 435898 RMD160 a8f219a61f47ed1bb0f801d0e78512b4275e0082 SHA1 2eae2b8013be972172374fb5cc71a4f368c41d76 SHA256 fe3347ec6c58ba579d8c0ab0afcfa1058fe40850ac745107e5b4199b463e2cbe
 DIST libxklavier-2.2.tar.gz 467577 RMD160 875a14ee466133f033266924de4d95749d1a434f SHA1 f4f125ac71b734369b1e1cc843a357005c57355d SHA256 ccfa44ca1128018939906ef32b3a0e85a08efacbc00a32d49628fee7026cc2de
 DIST libxklavier-3.0.tar.gz 460992 RMD160 7835f0a4369198a9fc91077687917c2b29b05d80 SHA1 22e4499d86abc4afc9fe1d6a07b29fafa782cc78 SHA256 53ff8b00f80c8e35e3e800268d35fc5901329dc81515d18a9dc359ceeeda4df8
+DIST libxklavier-3.1.tar.gz 472712 RMD160 c01999d88faf3e8bb8409c26d391ed6ea442f5bf SHA1 7fc0ddc2e4470b26de2783ab65bca5a8a101c9fe SHA256 0aa3bbc4d374cb5b24cf081eabe9b79d1caa5e5c1ea80c57ebd82f08eb56670e
 EBUILD libxklavier-2.0-r1.ebuild 1267 RMD160 33b99e288c5ccd1d06e8a2c0a017c54214fa41c6 SHA1 12b6eb9ce9ea2a8bd916e31ccdb5c4de2f722f94 SHA256 91c4503b998f2d09cf244b6ede5d0c1e590fd4ed0860d73c06168b19f7058ef7
 MD5 b3ac2bb465c3d5519e7f25aed13b057b libxklavier-2.0-r1.ebuild 1267
 RMD160 33b99e288c5ccd1d06e8a2c0a017c54214fa41c6 libxklavier-2.0-r1.ebuild 1267
@@ -40,10 +41,14 @@ EBUILD libxklavier-3.0.ebuild 1235 RMD160 87b706dc3b434845f7a1308555a2a991a96882
 MD5 875fbdb48d950ced35936b44e569460a libxklavier-3.0.ebuild 1235
 RMD160 87b706dc3b434845f7a1308555a2a991a9688244 libxklavier-3.0.ebuild 1235
 SHA256 dbb575a25af2acc77ba04ab58ca0aeefc8dd1c19c6010f3b68e121b1c0f1d8cb libxklavier-3.0.ebuild 1235
-MISC ChangeLog 8926 RMD160 2f7d5e5dc9960d94de7a3a1a3c62249f11b13be1 SHA1 dff176efa8fa0e1ab89304796f887ea0673a012e SHA256 1d7434927d4b53ff52efbfdb6ad28c1fa83eee67c6721eaeea58fd6d8517601b
-MD5 88f6890aa5f3684757afa40876529940 ChangeLog 8926
-RMD160 2f7d5e5dc9960d94de7a3a1a3c62249f11b13be1 ChangeLog 8926
-SHA256 1d7434927d4b53ff52efbfdb6ad28c1fa83eee67c6721eaeea58fd6d8517601b ChangeLog 8926
+EBUILD libxklavier-3.1.ebuild 1325 RMD160 32b2b036405ac3d4c2021d689b47c853198d591d SHA1 342841cc4ad9dcea13eccd127aca2a328fb2bdad SHA256 ffe724ce10037b135a131dc0723286da4a0ee2d4484c5407506dc73828493b6e
+MD5 dc88212daec47c0b307693d63a02a154 libxklavier-3.1.ebuild 1325
+RMD160 32b2b036405ac3d4c2021d689b47c853198d591d libxklavier-3.1.ebuild 1325
+SHA256 ffe724ce10037b135a131dc0723286da4a0ee2d4484c5407506dc73828493b6e libxklavier-3.1.ebuild 1325
+MISC ChangeLog 9067 RMD160 cc679a8d5cd937fcca35a8a7c3aceccdff1c4321 SHA1 8c80ca46735f115ed20dbfc196c449c53753a23c SHA256 00da65298b7d8b716b1128f582485ab54a3c45d9dbf7683865805ba0be80d2c6
+MD5 95814813dd76010faa2c55e16074a2ce ChangeLog 9067
+RMD160 cc679a8d5cd937fcca35a8a7c3aceccdff1c4321 ChangeLog 9067
+SHA256 00da65298b7d8b716b1128f582485ab54a3c45d9dbf7683865805ba0be80d2c6 ChangeLog 9067
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -63,10 +68,13 @@ SHA256 5c7a38e1255f7b35228b7e8fe410e8b08607120bb4cd19ec0a990888c6d2c2e0 files/di
 MD5 ae853a43f61d7cea8cd25c976e721fe3 files/digest-libxklavier-3.0-r1 247
 RMD160 14b9953eb8e947640ef0339ec2b047b56a1f8921 files/digest-libxklavier-3.0-r1 247
 SHA256 5c7a38e1255f7b35228b7e8fe410e8b08607120bb4cd19ec0a990888c6d2c2e0 files/digest-libxklavier-3.0-r1 247
+MD5 d7e1ff7e54fae694010a6bf5117dbacc files/digest-libxklavier-3.1 247
+RMD160 82c316cc06e235f1f8d613f1d782a084659ed1da files/digest-libxklavier-3.1 247
+SHA256 aaa383a3cfc79cb33e1c78a05daffd7ec739cd88ace23b2700c6d808d767be2e files/digest-libxklavier-3.1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFn0XJugEuf3OQ0akRAktBAKCHxIYYrx0xu0LzAcjDWr5Imsz70gCfXidH
-reCQPKyi1r1ylDfWXUrCWr4=
-=kryG
+iD8DBQFFqql4keYb6olFHJcRAh6xAKDAuQkSxPyHqQ9m41guW1mDBmZV9QCg5i4C
+efzuPxZ8I6Xi8Wq+VKj+rb4=
+=NtLC
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libxklavier/files/digest-libxklavier-3.1 b/x11-libs/libxklavier/files/digest-libxklavier-3.1
new file mode 100644
index 000000000000..8a4667e558d2
--- /dev/null
+++ b/x11-libs/libxklavier/files/digest-libxklavier-3.1
@@ -0,0 +1,3 @@
+MD5 56c4bea91ccbd0d09e3bcf58dff5732a libxklavier-3.1.tar.gz 472712
+RMD160 c01999d88faf3e8bb8409c26d391ed6ea442f5bf libxklavier-3.1.tar.gz 472712
+SHA256 0aa3bbc4d374cb5b24cf081eabe9b79d1caa5e5c1ea80c57ebd82f08eb56670e libxklavier-3.1.tar.gz 472712
diff --git a/x11-libs/libxklavier/libxklavier-3.1.ebuild b/x11-libs/libxklavier/libxklavier-3.1.ebuild
new file mode 100644
index 000000000000..029e8af695cc
--- /dev/null
+++ b/x11-libs/libxklavier/libxklavier-3.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.1.ebuild,v 1.1 2007/01/14 22:06:54 leio Exp $
+
+inherit eutils
+
+DESCRIPTION="High level XKB library"
+HOMEPAGE="http://www.freedesktop.org/Software/LibXklavier"
+SRC_URI="mirror://sourceforge/gswitchit/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="||	(
+				(
+					||	( x11-misc/xkeyboard-config x11-misc/xkbdata )
+					x11-apps/xkbcomp
+					x11-libs/libX11
+					x11-libs/libxkbfile
+				)
+				virtual/x11
+			)
+		dev-libs/libxml2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-3.0-libxml.diff"
+}
+
+
+src_compile() {
+	local xkbbase
+
+	# see bug #113108
+	if has_version x11-apps/xkbcomp; then
+		xkbbase=/usr/share/X11/xkb
+	else
+		xkbbase=/usr/$(get_libdir)/X11/xkb
+	fi
+
+	econf --with-xkb-base=${xkbbase} --with-xkb-bin-base=/usr/bin \
+		  $(use_enable doc doxygen) || die
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die
+
+	insinto /usr/share/libxklavier
+	use sparc && doins "${FILESDIR}/sun.xml"
+
+	dodoc AUTHORS CREDITS ChangeLog NEWS README
+}