Fixing compile errors as described in bug #151289 thanks to Robert Buchholz for providing a fix and cleanup

Package-Manager: portage-2.1.2_pre3-r7

6 files changed, 60 insertions, 9 deletions

diff --git a/app-misc/lcd4linux/ChangeLog b/app-misc/lcd4linux/ChangeLog
index 229c131d89f8..eaaef5daae2c 100644
--- a/app-misc/lcd4linux/ChangeLog
+++ b/app-misc/lcd4linux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/lcd4linux
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.15 2006/05/25 09:18:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.16 2006/10/24 07:20:46 jokey Exp $
+
+  24 Oct 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/lcd4linux-0.9.11-modular-x.patch, +metadata.xml,
+  -lcd4linux-0.9.9.ebuild, -lcd4linux-0.9.10.ebuild,
+  lcd4linux-0.9.11.ebuild, lcd4linux-0.10.0.ebuild:
+  Fixing compile errors as described in bug #151289 thanks to Robert Buchholz
+  for providing a fix and cleanup
 
 *lcd4linux-0.10.0 (25 May 2006)
 
diff --git a/app-misc/lcd4linux/files/digest-lcd4linux-0.9.11 b/app-misc/lcd4linux/files/digest-lcd4linux-0.9.11
index 4ceef7802660..835ec66b6046 100644
--- a/app-misc/lcd4linux/files/digest-lcd4linux-0.9.11
+++ b/app-misc/lcd4linux/files/digest-lcd4linux-0.9.11
@@ -1 +1,3 @@
 MD5 fabbc58e9118570c1f57ae90743e4859 lcd4linux-0.9.11.tar.gz 218557
+RMD160 55257d7c5951938ce7a1b878935139e436514ef0 lcd4linux-0.9.11.tar.gz 218557
+SHA256 7d90fd3fbd5907c1db56f78b88eddaf80cef9b2012214ad3118f9b6f72c35627 lcd4linux-0.9.11.tar.gz 218557
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.9.11-modular-x.patch b/app-misc/lcd4linux/files/lcd4linux-0.9.11-modular-x.patch
new file mode 100644
index 000000000000..dc7651517f1d
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.9.11-modular-x.patch
@@ -0,0 +1,15 @@
+--- configure.in.orig	2006-10-23 02:23:15.000000000 +0200
++++ configure.in	2006-10-23 02:24:45.000000000 +0200
+@@ -228,7 +228,11 @@
+       AC_MSG_ERROR(X11 headers or libraries not available: X11 driver disabled)
+    else
+       DRIVERS="$DRIVERS XWindow.o"
+-      DRVLIBS="$DRVLIBS -L$ac_x_libraries -lX11"
++      if test "x$ac_x_libraries" = "x"; then
++         DRVLIBS="$DRVLIBS -lX11"
++      else
++         DRVLIBS="$DRVLIBS -L$ac_x_libraries -lX11"
++      fi
+       AC_DEFINE(WITH_X11,1,[junk])
+    fi
+ fi
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild
index 5940133964b0..40a5edf07d33 100644
--- a/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild,v 1.1 2006/05/25 09:18:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild,v 1.2 2006/10/24 07:20:46 jokey Exp $
 
 #inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lcd4linux/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 # contains x86 asm, upstream is working on a portable version
-KEYWORDS="-* ~x86"
+KEYWORDS="~x86"
 IUSE="kde png X usb mysql python"
 
 DEPEND="png? ( media-libs/libpng
diff --git a/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild b/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild
index f8c2c477b652..d668f6ad43d0 100644
--- a/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild,v 1.9 2005/01/25 15:27:45 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild,v 1.10 2006/10/24 07:20:46 jokey Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit eutils autotools
 
 DESCRIPTION="system and ISDN information is shown on an external display or in a X11 window"
 HOMEPAGE="http://lcd4linux.sourceforge.net/"
@@ -11,9 +15,19 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE="kde pda png X usb"
 
-DEPEND="png? ( media-libs/libpng
-	sys-libs/zlib
-	media-libs/gd )"
+RDEPEND="sys-libs/ncurses
+	x11-libs/libX11
+	png? ( media-libs/libpng )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-modular-x.patch"
+	eautoreconf
+}
 
 src_compile() {
 	local myconf
@@ -38,7 +52,7 @@ src_install() {
 	cp lcd4linux.conf.sample lcd4linux.conf
 	insopts -o root -g root -m 0600
 	doins lcd4linux.conf
-	dodoc README* NEWS INSTALL TODO CREDITS FAQ
+	dodoc README* NEWS TODO CREDITS FAQ
 	dodoc lcd4linux.conf.sample lcd4linux.kdelnk lcd4linux.xpm
 
 	if use kde ; then
diff --git a/app-misc/lcd4linux/metadata.xml b/app-misc/lcd4linux/metadata.xml
new file mode 100644
index 000000000000..c818f42807b8
--- /dev/null
+++ b/app-misc/lcd4linux/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>jokey@gentoo.org</email>
+		<name>Markus Ullmann</name>
+	</maintainer>
+	<maintainer>
+		<email>rob@thetruth.de</email>
+		<name>Robert Buchholz</name>
+	</maintainer>
+</pkgmetadata>