4 files changed, 61 insertions, 49 deletions
diff --git a/app-misc/lcd4linux/ChangeLog b/app-misc/lcd4linux/ChangeLog
index 5c406f4d4dde..b9f953f43f43 100644
--- a/app-misc/lcd4linux/ChangeLog
+++ b/app-misc/lcd4linux/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/lcd4linux
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.2 2002/05/20 10:54:06 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.3 2002/05/27 10:07:14 seemant Exp $
+
+*lcd4linux-0.98-r2 (27 May 2002)
+
+  27 May 2002; Seemant Kulleen <seemant@gentoo.org> lcd4linux-0.98-r2.ebuild
+  files/digest-lcd4linux-0.98-r2 :
+
+  I goofed on the touch thing.  Thanks to Francisco Gimeno
+  <kikov@fco-gimeno.com> in bug #2390 for the fix.
 
 *lcd4linux-0.98-r1 (20 May 2002)
 
diff --git a/app-misc/lcd4linux/files/digest-lcd4linux-0.98 b/app-misc/lcd4linux/files/digest-lcd4linux-0.98-r2
index 6bf413539e11..6bf413539e11 100644
--- a/app-misc/lcd4linux/files/digest-lcd4linux-0.98
+++ b/app-misc/lcd4linux/files/digest-lcd4linux-0.98-r2
diff --git a/app-misc/lcd4linux/lcd4linux-0.98-r2.ebuild b/app-misc/lcd4linux/lcd4linux-0.98-r2.ebuild
new file mode 100644
index 000000000000..ded0ce29ed8a
--- /dev/null
+++ b/app-misc/lcd4linux/lcd4linux-0.98-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Jens Blaesche <mr.big@pc-trouble.de>
+# /space/gentoo/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.98-r1.ebuild,v 1.1 2002/05/20 10:54:06 seemant Exp
+
+S=${WORKDIR}/${P}
+DESCRIPTION="system and ISDN information is shown on an external display or in a X11 window."
+SRC_URI="http://download.sourceforge.net/lcd4linux/${P}.tar.gz"
+HOMEPAGE="http://lcd4linux.sourceforge.net"
+
+DEPEND="png? ( media-libs/libpng
+		sys-libs/zlib
+		media-libs/libgd )"
+
+src_compile() {
+
+	local myconf
+	
+	use png || myconf=",!PNG"
+	use pda || myconf="${myconf},!PalmPilot"
+
+	econf \
+		--sysconfdir=/etc/lcd4linux \
+		--with-drivers="all${myconf}" || die
+		
+	emake || die
+
+}
+
+src_install () {
+
+	einstall || die
+
+	insinto /etc/lcd4linux
+	cp lcd4linux.conf.sample lcd4linux.conf 
+	insopts -o root -g root -m 0600
+	doins lcd4linux.conf
+	dodoc README* NEWS COPYING INSTALL TODO CREDITS FAQ
+	dodoc lcd4linux.conf.sample lcd4linux.kdelnk lcd4linux.xpm
+
+	use kde && ( \
+		insinto /etc/lcd4linux
+		insopts -o root -g root -m 0600
+		doins lcd4kde.conf
+		insinto ${KDEDIR}/share/applnk/apps/System
+		doins lcd4linux.kdelnk 
+		insinto ${KDEDIR}/share/icons
+		doins lcd4linux.xpm 
+		touch ${D}/etc/lcd4linux/lcd4X11.conf 
+	)
+
+}
diff --git a/app-misc/lcd4linux/lcd4linux-0.98.ebuild b/app-misc/lcd4linux/lcd4linux-0.98.ebuild
deleted file mode 100644
index 547ab4947023..000000000000
--- a/app-misc/lcd4linux/lcd4linux-0.98.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Jens Blaesche <mr.big@pc-trouble.de>
-# /home/cvsroot/gentoo-x86/skel.build,v 1.7 2001/08/25 21:15:08 chadh Exp
-# 21 Sept.2001 / 0.30 CET
-
-S=${WORKDIR}/${P}
-DESCRIPTION="system and ISDN information is shown on an external display or in a X11 window."
-SRC_URI="http://download.sourceforge.net/lcd4linux/${P}.tar.gz"
-HOMEPAGE="http://lcd4linux.sourceforge.net"
-
-DEPEND=""
-
-src_compile() {
-
-	./configure \
-		--with-drivers=all,\!PNG \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--host=${CHOST} || die
-	make || die
-
-}
-
-src_install () {
-
-	exeinto /usr/local/bin
-	doexe lcd4linux 
-	insinto /etc
-	cp lcd4linux.conf.sample lcd4linux.conf 
-	insopts -o root -g root -m 0600
-	doins lcd4linux.conf
-	dodoc README README.* ChangeLog COPYING INSTALL 
-	dodoc lcd4kde.conf lcd4linux.conf.sample lcd4linux.kdelnk lcd4linux.xpm
-
-  if [ "`use kde`" ] ; then
-	insinto /etc
-	insopts -o root -g root -m 0600
-	doins lcd4kde.conf
-	insinto /opt/kde2.2/share/applnk/apps/System
-	doins lcd4linux.kdelnk 
-	insinto /opt/kde2.2/share/icons
-	doins lcd4linux.xpm 
-	touch /etc/lcd4X11.conf 
-  fi
-
-}