Fix xkbd's pkg-config usage for cross-compilation.

7 files changed, 209 insertions, 0 deletions

diff --git a/x11-misc/xkbd/ChangeLog b/x11-misc/xkbd/ChangeLog
new file mode 100644
index 0000000..6f0aad8
--- /dev/null
+++ b/x11-misc/xkbd/ChangeLog
@@ -0,0 +1,54 @@
+# 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.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.
+
+  21 Dec 2008; <solar@gentoo.org> xkbd-0.8.12.ebuild:
+  - keyword ~arm
+
+  17 Jun 2008; Krzysiek Pawlik <nelchael@gentoo.org> xkbd-0.8.12.ebuild:
+  Add missing x11-proto/inputproto to DEPEND, bug #227667.
+
+  22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
+  Redigest for Manifest2
+
+  21 Oct 2006; David Shakaryan <omp@gentoo.org> xkbd-0.8.12.ebuild:
+  Remove monolithic X from dependencies, `` to $() and other minor cleanup.
+
+  14 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xkbd-0.8.12.ebuild:
+  Removed sys-devel/libtool from RDEPEND.
+
+  13 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xkbd-0.8.12.ebuild:
+  Fixed DEPEND for modular X, bug #118300.
+
+  03 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> xkbd-0.8.12.ebuild:
+  Fixed dodoc not to install COPYING and/or INSTALL.
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> xkbd-0.8.12.ebuild:
+  Added to ~ppc.
+
+  09 Aug 2004; Tom Martin <slarti@gentoo.org> xkbd-0.8.12.ebuild:
+  Marked ~amd64 for bug 58972
+
+  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> xkbd-0.8.12.ebuild:
+  QA - fix use invocation
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> xkbd-0.8.12.ebuild:
+  Add die following econf for bug 48950
+
+  11 Apr 2004; Markus Nigbur <pyrania@gentoo.org> xkbd-0.8.12.ebuild:
+  Marked stable. Ebuild fixups.
+
+*xkbd-0.8.12 (24 Nov 2003)
+
+  24 Nov 2003; Abhishek Amit <abhishek@gentoo.org> xkbd-0.8.12.ebuild:
+  Initial import.  Ebuild submitted by Rene Wagner <reenoo@gmx.de>.
diff --git a/x11-misc/xkbd/Manifest b/x11-misc/xkbd/Manifest
new file mode 100644
index 0000000..b822295
--- /dev/null
+++ b/x11-misc/xkbd/Manifest
@@ -0,0 +1,7 @@
+AUX xkbd-0.8.15-configure-pkgconf.patch 1000 RMD160 5a6978cf9736e32bc09beac15475d66520b1fb29 SHA1 52a82f1dc32c92325db8e71b98e81cf8f05e8185 SHA256 f1b9bf1618cb4309f80f8a37c171181d9b2ba37bfbab6238ca4009e2fbf593f8
+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.15-CVS.tar.gz 344790 RMD160 f09960cd044e7135f5700290a1b0c74ea59fa5c8 SHA1 f047609e4710bb20b1fdab40c1f2dc850c78fe04 SHA256 04bc9f6ea423f7fbd9150767cef6a1bc5c70c545eeb923539a93a549905457de
+EBUILD xkbd-0.8.15.ebuild 1425 RMD160 180834180e53001ee43523ee8646de02989546d4 SHA1 85f32b5accf1662ca89a93a5a3b79787d764c3ed SHA256 7a8fe60c070e0d8d0154e37f0da322f0f770a78d09a33b90fbdddbd04202099c
+MISC ChangeLog 2008 RMD160 db5a5649febeb2254fd57785d68148e14e46ac5f SHA1 2f448faf5a85d88a845c8a96c8895b1263c74670 SHA256 b77bef9fb9dc166d03e33dfe79cd610b8d8e092429d779c310c4e929a5ec8c0a
+MISC metadata.xml 165 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc SHA1 87fed26b774e4dd2226bea04c4bcc8ba39fcc4c3 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec
diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-configure-pkgconf.patch b/x11-misc/xkbd/files/xkbd-0.8.15-configure-pkgconf.patch
new file mode 100644
index 0000000..5bde826
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-0.8.15-configure-pkgconf.patch
@@ -0,0 +1,27 @@
+--- configure.ac	2009-06-05 19:54:16.000000000 +0000
++++ configure.ac.new	2009-06-05 19:56:53.000000000 +0000
+@@ -12,22 +12,8 @@
+   enable_xft=$enableval, enable_xft=yes)
+ 
+ if test x$enable_xft != xno; then
+-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)	
+-  if test x$PKG_CONFIG != xno && $PKG_CONFIG --exists xft; then
+-      CFLAGS="$CFLAGS -DUSE_XFT `pkg-config --cflags xft`"
+-      XFT_LIBS="`pkg-config --libs xft`"
+-  else
+-    AC_MSG_WARN([*** Could not find pkg-config entry for xft in your path, build may fail***])
+-    AC_PATH_PROG(XFT_CONFIG, xft-config, no)
+-      if test x$XFT_CONFIG = xno; then
+-        AC_MSG_WARN([***Could not find xft-config, build may fail. You may want --disable-xft ***])
+-        CFLAGS="$CFLAGS -DUSE_XFT"
+-        XFT_LIBS=" -lXft"
+-      else
+-        CFLAGS="$CFLAGS -DUSE_XFT `xft-config --cflags`"
+-        XFT_LIBS="`xft-config --libs`"
+-     fi
+-  fi
++   PKG_CHECK_MODULES(XFT, xft)
++   CFLAGS="$CFLAGS -DUSE_XFT $XFT_CFLAGS"
+ fi
+ 
+ AC_ARG_ENABLE(xpm,
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 0000000..3620dc5
--- /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 0000000..deadcd7
--- /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/metadata.xml b/x11-misc/xkbd/metadata.xml
new file mode 100644
index 0000000..40838bc
--- /dev/null
+++ b/x11-misc/xkbd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+</pkgmetadata>
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 0000000..0e69f01
--- /dev/null
+++ b/x11-misc/xkbd/xkbd-0.8.15.ebuild
@@ -0,0 +1,59 @@
+# 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 autotools
+
+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"
+
+	# Use the cross-pkg-config
+	epatch "${FILESDIR}/xkbd-0.8.15-configure-pkgconf.patch"
+	eautoreconf
+}
+
+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
+}