Version bump, fixed HOMEPAGE (reported by df, bug 415647)

(Portage version: 2.1.10.63/cvs/Linux x86_64)

3 files changed, 100 insertions, 2 deletions

diff --git a/x11-misc/xkbd/ChangeLog b/x11-misc/xkbd/ChangeLog
index 5d4198c7c53b..fff2f5021759 100644
--- a/x11-misc/xkbd/ChangeLog
+++ b/x11-misc/xkbd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xkbd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbd/ChangeLog,v 1.20 2011/12/21 18:02:54 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbd/ChangeLog,v 1.21 2012/06/04 22:01:46 xmw Exp $
+
+*xkbd-0.8.16 (04 Jun 2012)
+
+  04 Jun 2012; Michael Weber <xmw@gentoo.org>
+  +files/xkbd-0.8.16-fix-geometry.patch, +xkbd-0.8.16.ebuild:
+  Version bump, fixed HOMEPAGE (reported by df, bug 415647)
 
   21 Dec 2011; Tim Harder <radhermit@gentoo.org> -xkbd-0.8.12.ebuild,
   -xkbd-0.8.15.ebuild:
diff --git a/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch b/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch
new file mode 100644
index 000000000000..d90824085ea4
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch
@@ -0,0 +1,36 @@
+--- xkbd-0.8.16/src/xkbd.c
++++ xkbd-0.8.16/src/xkbd.c
+@@ -307,21 +307,22 @@
+ 				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;
++
+       // deactivate geometry for 0.8.16 release - mb
+       geometry = NULL;
+       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/xkbd-0.8.16.ebuild b/x11-misc/xkbd/xkbd-0.8.16.ebuild
new file mode 100644
index 000000000000..5238382ef7b7
--- /dev/null
+++ b/x11-misc/xkbd/xkbd-0.8.16.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbd/xkbd-0.8.16.ebuild,v 1.1 2012/06/04 22:01:44 xmw Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="onscreen soft keyboard for X11"
+HOMEPAGE="http://trac.hackable1.org/trac/wiki/Xkbd"
+SRC_URI="http://trac.hackable1.org/trac/raw-attachment/wiki/Xkbd/${P}.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_prepare() {
+	# 2008-03-23 gi1242: Fix handling of -geometry argument
+	epatch "${FILESDIR}"/${P}-fix-geometry.patch
+	# 2008-03-23 gi1242: Increase default repeat delay
+	epatch "${FILESDIR}"/${PN}-0.8.15-increase-delay.patch
+	epatch "${FILESDIR}"/${PN}-0.8.15-fix-keysyms-search.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug)
+}
+
+src_compile() {
+	default
+
+	use doc && docbook2html README
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/html
+		doins *.html
+	fi
+}