bump to 3.6. Added API for countries and languages (depend on iso-codes).

Package-Manager: portage-2.1.5

3 files changed, 71 insertions, 6 deletions

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 8b6c13e75b41..ea2d084ac32c 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.108 2008/03/17 23:24:13 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.109 2008/05/22 21:28:38 eva Exp $
+
+*libxklavier-3.6 (22 May 2008)
+
+  22 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +libxklavier-3.6.ebuild:
+  bump to 3.6. Added API for countries and languages (depend on iso-codes).
 
 *libxklavier-3.5 (17 Mar 2008)
 
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 3f41cfbf638b..c9bdac98d5aa 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -7,16 +7,18 @@ DIST libxklavier-2.2.tar.gz 467577 RMD160 875a14ee466133f033266924de4d95749d1a43
 DIST libxklavier-3.2.tar.gz 466656 RMD160 4d4654b6fffe5cedd6c6f268ffe364b40417e881 SHA1 4169a021201e8ccb9a771d1321a8d1e5bba1fd51 SHA256 a82f36b5a7a766e66b46866b81c9a20a23c9de33cc0ee6e2480b560d1e50d942
 DIST libxklavier-3.3.tar.gz 475629 RMD160 70f38f3212a5c14f9894582ee41f65c72a917a82 SHA1 19312997d5ec929f4057cb33c3806d494606c5cf SHA256 050a14ddeda0bbf5c742cb60dee56de48736968d050543fc2e46bcd2e1837870
 DIST libxklavier-3.5.tar.gz 448663 RMD160 b1b9fc5f700f356ad4f369411cee9fa6d64e5528 SHA1 c9e318f31c5ac5895aae01069c53c7f7ab554b13 SHA256 adac155e4d6be6b5bf6283eb265048e20c37c1caa49f39845532914151172706
+DIST libxklavier-3.6.tar.gz 462046 RMD160 34f68b11f523cab3b9c6b1da75f19c787ead932c SHA1 fdbf95a615a8daea7d9f417f42cb8ea6ecfcb192 SHA256 92e2044414b86b820f85333ae626f3ca9d5bd0b1be35148f3c50f88a87c4d5ce
 EBUILD libxklavier-2.2.ebuild 1343 RMD160 4f86b06a28cfc798831f971cb9c494cef840d1be SHA1 af6cea7f25b3658dd0ebda339d36ad5824124011 SHA256 9a2d1b996f49c67e5818820aaa8a6aad2e1235d1bb798d30bf4403990d43888b
 EBUILD libxklavier-3.2.ebuild 1211 RMD160 bb1093cf08b8e5450a475edadb77ba244fba9c87 SHA1 9b40af9ae94c3d031f1d0135ce17fc43b224684e SHA256 aaf6c10f9492d0d341fae7aebb8f5065110e431e4a099e09818232c1f8e6107b
 EBUILD libxklavier-3.3.ebuild 1218 RMD160 1eb2f71d97d32cf613f19a3b3341da32d1ce4aca SHA1 ad0aafee1bbc4338c1bc6afd1484f30614af2a28 SHA256 a320f96ade1707a5a76d47d2e5f464a1fe6844026108f54519ad5aad081af6cb
 EBUILD libxklavier-3.5.ebuild 1491 RMD160 d50a09e11d7d76acaa2bfc97d8e4000a28c2e3d4 SHA1 090fa6f7fad29ceaea7906a4926b6ca1c1aca5cb SHA256 8e4076bab07aca62ef6e8ea3394519a043785296b123f8bfcdae8caba07e152f
-MISC ChangeLog 12608 RMD160 5873dc06dc47f258f419a6c23952195ea532bc2b SHA1 79890d07dcaa9201fe9985b8b1f1e5fca0577891 SHA256 529257ac79fc45906195b2ec822937440e3c1f7cd2c46a7edf91b8edc58be7d7
+EBUILD libxklavier-3.6.ebuild 1512 RMD160 9deb87fb94f56bb3070fdd27271a1ff9f6b98b04 SHA1 be4e1d6fa6d4b7f7aba2bce8ff1408c7318cad0c SHA256 3c3e3f60bfb634330a44afe4fcc36db24c14f77e32868dd6353510fa3186b801
+MISC ChangeLog 12797 RMD160 b1724763c5ef8691db363c4c0e7591e2992df3d8 SHA1 253cae8898d3922b4d67b2bdcd684ed88e77ad61 SHA256 8f8665c0acc4db8dd380bf981b842785aa6bcd7e936c013d61dd64b2a09d2385
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIAoPsj9hvisErhMIRAnz7AKDALRQ8jShEuNxnWbnlRvYYhphCMgCgxloF
-VrzrNrDf39z86CrJfnOgTyk=
-=X75N
+iEYEARECAAYFAkg15ZMACgkQ1fmVwcYIWAYlrgCg1HEkJZ5KOFKD+LEfbr1rmaV5
+E8sAnjXc40DEw7qYC4kSm7Qa13A/lO/5
+=Boaz
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libxklavier/libxklavier-3.6.ebuild b/x11-libs/libxklavier/libxklavier-3.6.ebuild
new file mode 100644
index 000000000000..c902945de923
--- /dev/null
+++ b/x11-libs/libxklavier/libxklavier-3.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.6.ebuild,v 1.1 2008/05/22 21:28:38 eva 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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+		 x11-libs/libX11
+		 x11-apps/xkbcomp
+		 x11-libs/libxkbfile
+		 >=dev-libs/glib-2.6
+		 >=dev-libs/libxml2-2.0
+		 app-text/iso-codes"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		doc? ( app-doc/doxygen )"
+
+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() {
+	emake install DESTDIR="${D}" || die
+
+	insinto /usr/share/libxklavier
+	use sparc && doins "${FILESDIR}/sun.xml"
+
+	dodoc AUTHORS CREDITS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	ewarn "Please note that the soname of the library changed!"
+	ewarn "If you are upgrading from a version prior to 3.4 you need"
+	ewarn "to fix dynamic linking inconsistencies by executing:"
+	ewarn "revdep-rebuild -X --library libxklavier.so.11"
+}