Version bump, updating translation scheme to work with xkeyboard-config-1.2. The upgrade from 3.3 to 3.5 will have an ABI break and revdep-rebuilding is required, see ewarn message after upgrade for details

Package-Manager: portage-2.1.4.4

3 files changed, 77 insertions, 2 deletions

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 9a7513f71307..8b6c13e75b41 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,13 @@
 # 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.107 2008/02/04 04:21:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.108 2008/03/17 23:24:13 leio Exp $
+
+*libxklavier-3.5 (17 Mar 2008)
+
+  17 Mar 2008; Mart Raudsepp <leio@gentoo.org> +libxklavier-3.5.ebuild:
+  Version bump, updating translation scheme to work with xkeyboard-config-1.2.
+  The upgrade from 3.3 to 3.5 will have an ABI break and revdep-rebuilding is
+  required, see ewarn message after upgrade for details
 
   04 Feb 2008; Jeroen Roovers <jer@gentoo.org> libxklavier-3.3.ebuild:
   Stable for HPPA (bug #208366).
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 846fff2740d8..0e7731150756 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libxklavier-1.14-werror.patch 1189 RMD160 92529e908cb97926227ae1f9cf62e69b8d4c7b05 SHA1 2acbefd8a206e5df44ced85a4f7f60c8ff541a00 SHA256 1397df8a206d2f1ea1878694e7113831d040d8665ea0fbee6a291b31bc0cc7bb
 AUX sun.xml 4572 RMD160 3255a22dafebb60df1fb115a39eccf349f63d658 SHA1 cb9fb9f87879090ef20082054b0fa730b067a89f SHA256 ba4be6b7737b09875adf109384fb375377540fbb213d62b647ba36baad28a7a0
 DIST libxklavier-2.2.tar.gz 467577 RMD160 875a14ee466133f033266924de4d95749d1a434f SHA1 f4f125ac71b734369b1e1cc843a357005c57355d SHA256 ccfa44ca1128018939906ef32b3a0e85a08efacbc00a32d49628fee7026cc2de
 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
 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 1217 RMD160 40144c141cb9e4b4ef1562ebe4307ada05e31b55 SHA1 23f204ff70801dcf97d9e4eaa0c17ebfd1fa0a8b SHA256 004ce13c5cd1f7a379653d46864531808c982f930e1fd66cb9f7e4126d3f7cf2
-MISC ChangeLog 12289 RMD160 b648d5bdf89065004cadf756f8b8507fd87c031c SHA1 972998ead61652cce88ae52874a865935541d2ad SHA256 25f06d14c11bb72e8cb5f3e46ca8147a687576190c32124377ec60c17065761f
+EBUILD libxklavier-3.5.ebuild 1491 RMD160 d50a09e11d7d76acaa2bfc97d8e4000a28c2e3d4 SHA1 090fa6f7fad29ceaea7906a4926b6ca1c1aca5cb SHA256 8e4076bab07aca62ef6e8ea3394519a043785296b123f8bfcdae8caba07e152f
+MISC ChangeLog 12608 RMD160 5873dc06dc47f258f419a6c23952195ea532bc2b SHA1 79890d07dcaa9201fe9985b8b1f1e5fca0577891 SHA256 529257ac79fc45906195b2ec822937440e3c1f7cd2c46a7edf91b8edc58be7d7
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkfe/ZcACgkQkeYb6olFHJeJuACeLPSENXjHPRH+tGSsyW9j5zlC
+pNQAnRm/gGxJQzOY74swNAM1g5DdxWJq
+=Jynd
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/libxklavier/libxklavier-3.5.ebuild b/x11-libs/libxklavier/libxklavier-3.5.ebuild
new file mode 100644
index 000000000000..e9f0b0411641
--- /dev/null
+++ b/x11-libs/libxklavier/libxklavier-3.5.ebuild
@@ -0,0 +1,56 @@
+# 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.5.ebuild,v 1.1 2008/03/17 23:24:13 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 ~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"
+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"
+}