Version bump, see bug #214353.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

5 files changed, 135 insertions, 2 deletions

diff --git a/x11-misc/xkbd/ChangeLog b/x11-misc/xkbd/ChangeLog
index 0a77176c51d1..6f0aad8aafb6 100644
--- a/x11-misc/xkbd/ChangeLog
+++ b/x11-misc/xkbd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xkbd
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbd/ChangeLog,v 1.15 2009/01/05 14:02:40 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbd/ChangeLog,v 1.16 2009/02/11 21:42:08 nelchael Exp $
+
+*xkbd-0.8.15 (11 Feb 2009)
+
+  11 Feb 2009; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xkbd-0.8.15-fix-geometry.patch,
+  +files/xkbd-0.8.15-increase-delay.patch, +xkbd-0.8.15.ebuild:
+  Version bump, see bug #214353.
 
   05 Jan 2009; Rémi Cardona <remi@gentoo.org> xkbd-0.8.12.ebuild:
   Change virtual/xft dependency to x11-libs/libXft, bug 253771.
diff --git a/x11-misc/xkbd/Manifest b/x11-misc/xkbd/Manifest
index fb226dc90685..b6537af8ea4f 100644
--- a/x11-misc/xkbd/Manifest
+++ b/x11-misc/xkbd/Manifest
@@ -1,4 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xkbd-0.8.15-fix-geometry.patch 1145 RMD160 551098d4b34005330db1f2ca4896e37c2975dd0d SHA1 17a2f05113cd69e081ea2b49a67630b619ad22d8 SHA256 279f5c6f9f2262aa62f925ae08807b3389367ade2c9dae9f0e1771b6ae4a547e
+AUX xkbd-0.8.15-increase-delay.patch 770 RMD160 c78e73f8971b4d17417fa7f816d0f3c6e20587bd SHA1 09bafe2ab3f4a63ce034c1dd50a9676fc1c36ed4 SHA256 9be58a299820e70bb0289c26ce0bf20fd973f0351974b8493a145c89ce6cecc0
 DIST xkbd-0.8.12.tar.gz 223030 RMD160 44610175090e463a371e5953af46480b7e645384 SHA1 6760d949adbcbe48dc2e0eea58003bddad1a2315 SHA256 74d783797662cd5f76a07265496a42e0d4ade34f0e91ab0c89c6e7c5e716ad55
+DIST xkbd-0.8.15-CVS.tar.gz 344790 RMD160 f09960cd044e7135f5700290a1b0c74ea59fa5c8 SHA1 f047609e4710bb20b1fdab40c1f2dc850c78fe04 SHA256 04bc9f6ea423f7fbd9150767cef6a1bc5c70c545eeb923539a93a549905457de
 EBUILD xkbd-0.8.12.ebuild 999 RMD160 d9be0e594892a7fba79edd8064306586c227f84f SHA1 f51694f9c16ca81cfcd9094b2a1ac866ddf38b5b SHA256 ccd827619f7dac7590679ad02baed682f67e041d4006e68a3d727b8e50fa2340
-MISC ChangeLog 1784 RMD160 8dd28ca701d4215f4004aae26dc1ada20ce4829f SHA1 c7c637d2ca4e42ced2d40133669218da5714feac SHA256 8e3124126f56364cf2cc656a67e2fe0841cf4a85b32173960bdb69d5c51ddf8c
+EBUILD xkbd-0.8.15.ebuild 1315 RMD160 48d72d17029ad3ed5897b704d168d754c3d2c8fb SHA1 5bb08cd380080596cf239fa922d4c64d673e063a SHA256 868e7ebe6fc152fb807845268f07c20851364cb92075959cb7852abeade8b595
+MISC ChangeLog 2008 RMD160 db5a5649febeb2254fd57785d68148e14e46ac5f SHA1 2f448faf5a85d88a845c8a96c8895b1263c74670 SHA256 b77bef9fb9dc166d03e33dfe79cd610b8d8e092429d779c310c4e929a5ec8c0a
 MISC metadata.xml 165 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc SHA1 87fed26b774e4dd2226bea04c4bcc8ba39fcc4c3 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmTRjUACgkQgo/w9rxVVVF+LACfZA/RqAZ8RkafnR/VKnXjEJy3
+D9oAoJL1uExSSkEkFqbYOs9rxZLuSp+B
+=eoFZ
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch b/x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch
new file mode 100644
index 000000000000..3620dc5d6f2a
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch
@@ -0,0 +1,35 @@
+diff -ruN xkbd-0.8.15/src/xkbd.c xkbd-0.8.15-new/src/xkbd.c
+--- xkbd-0.8.15/src/xkbd.c	2003-09-29 10:29:35.000000000 -0700
++++ xkbd-0.8.15-new/src/xkbd.c	2008-03-23 02:43:20.000000000 -0700
+@@ -307,19 +307,20 @@
+ 				0, BlackPixel(display, screen_num),
+ 				WhitePixel(display, screen_num));
+       
++      wret = DisplayWidth(display, screen_num);
++      hret = DisplayHeight(display, screen_num)/4;
++      xret = 0;
++      yret = DisplayHeight(display, screen_num) - hret;
++
+       if (geometry != NULL)
+ 	{
+-	  XParseGeometry(geometry, &xret, &yret, &wret, &hret );
+-	}
+-      else
+-	{
+-	  if (wm_type != WM_MATCHBOX)
+-	    {
+-	      wret = DisplayWidth(display, screen_num);
+-	      hret = DisplayHeight(display, screen_num)/4;
+-	      xret = 0;
+-	      yret = DisplayHeight(display, screen_num) - hret;
+-	    }
++	  int flags;
++
++	  flags = XParseGeometry(geometry, &xret, &yret, &wret, &hret );
++	  if( flags & XNegative )
++	      xret += DisplayWidth( display, screen_num ) - wret;
++	  if( flags & YNegative )
++	      yret += DisplayHeight( display, screen_num ) - hret;
+ 	}
+       
+       /* check for user selected keyboard conf file */
diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch b/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch
new file mode 100644
index 000000000000..deadcd7cddb1
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch
@@ -0,0 +1,22 @@
+diff -ruN xkbd-0.8.15/data/en_GB.qwerty.xkbd.in xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in
+--- xkbd-0.8.15/data/en_GB.qwerty.xkbd.in	2003-08-10 10:46:29.000000000 -0700
++++ xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in	2008-03-23 02:52:52.000000000 -0700
+@@ -24,6 +24,7 @@
+ 
+ # button style, can be rounded ( default ), square or plain
+ button_style square
++repeat_delay 50
+ 
+ </global>
+ #
+diff -ruN xkbd-0.8.15/data/en_US.qwerty.xkbd.in xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in
+--- xkbd-0.8.15/data/en_US.qwerty.xkbd.in	2002-11-28 03:46:04.000000000 -0800
++++ xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in	2008-03-23 02:50:39.000000000 -0700
+@@ -26,6 +26,7 @@
+ 
+ # button style, can be rounded ( default ), square or plain
+ # button_style plain
++repeat_delay 50
+ 
+ </global>
+ 
diff --git a/x11-misc/xkbd/xkbd-0.8.15.ebuild b/x11-misc/xkbd/xkbd-0.8.15.ebuild
new file mode 100644
index 000000000000..f733dfdb0bbf
--- /dev/null
+++ b/x11-misc/xkbd/xkbd-0.8.15.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbd/xkbd-0.8.15.ebuild,v 1.1 2009/02/11 21:42:08 nelchael Exp $
+
+inherit eutils
+
+DESCRIPTION="Xkbd - onscreen soft keyboard for X11"
+HOMEPAGE="http://handhelds.org/"
+SRC_URI="ftp://ftp.yzu.edu.tw/mirror/pub2/ftp.handhelds.org/distributions/familiar/source/v0.8.4-rc1/sources/${P}-CVS.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc debug"
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXtst
+	x11-libs/libXpm
+	media-libs/freetype
+	dev-libs/expat
+	sys-libs/zlib
+	doc? ( app-text/docbook-sgml-utils )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 2008-03-23 gi1242: Fix handling of -geometry argument
+	epatch "${FILESDIR}/xkbd-0.8.15-fix-geometry.patch"
+
+	# 2008-03-23 gi1242: Increase default repeat delay
+	epatch "${FILESDIR}/xkbd-0.8.15-increase-delay.patch"
+}
+
+src_compile() {
+	econf $(use_enable debug) || die "econf failed"
+	emake || die "emake failed"
+
+	use doc && docbook2html README
+}
+
+src_install() {
+	einstall || die "einstall failed"
+	dodoc AUTHORS NEWS README
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/html
+		doins *.html
+	fi
+}