--- /usr/portage/sys-apps/irda-utils/irda-utils-0.9.15.ebuild	2004-09-03 23:06:18.000000000 +0200
+++ irda-utils-0.9.16.ebuild	2004-09-06 19:14:29.000000000 +0200
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/irda-utils/irda-utils-0.9.15.ebuild,v 1.14 2004/09/03 21:03:23 pvdabeel Exp $
+# $Header: $
 
 DESCRIPTION="IrDA Utilities, tools for IrDA communication"
 HOMEPAGE="http://irda.sourceforge.net/"
@@ -8,30 +8,32 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc amd64"
-IUSE=""
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="gtk"
 
 DEPEND="virtual/libc
-	>=dev-libs/glib-1.2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	export WANT_AUTOCONF=2.5
-}
+	=dev-libs/glib-1.2*
+	gtk? ( =x11-libs/gtk+-1.2* )"
 
 src_compile() {
-	make ROOT="${D}" RPM_BUILD_ROOT="${D}" || die "Making failed."
-	cd irsockets
-	make || die "Making irsockets failed."
+	export WANT_AUTOMAKE=1.4
+
+	emake ROOT="${D}" RPM_BUILD_ROOT="${D}" || die "Making failed."
+
+	cd ${S}/irsockets
+	emake || die "Making irsockets failed."
+
+	if use gtk; then
+		cd ${S}/findchip
+		emake gfindchip || die "Making gfindchip failed."
+	fi
 }
 
 src_install () {
 	dodir /usr/bin
 	dodir /usr/sbin
-	dodir /usr/X11R6/bin
 
-	make install PREFIX="${D}" ROOT="${D}" || die "Couldn't install from ${S}"
+	emake install PREFIX="${D}" ROOT="${D}" || die "Couldn't install from ${S}"
 
 	# irda-utils's install-etc installs files in /etc/sysconfig if
 	# that directory exists on the system, so clean up just in case.
@@ -47,6 +49,10 @@
 	dobin irsockets/recv_ultra
 	dobin irsockets/send_ultra
 
+	if use gtk; then
+		dosbin findchip/gfindchip
+	fi
+
 	# install README's into /usr/share/doc
 	for i in *
 	do