Fix for bug #155587 thanks to zzam for providing the patch

(Portage version: 2.1.2_rc2-r5)

5 files changed, 102 insertions, 5 deletions

diff --git a/app-misc/lcdproc/ChangeLog b/app-misc/lcdproc/ChangeLog
index 1a7c65483342..c14cc0fa43a8 100644
--- a/app-misc/lcdproc/ChangeLog
+++ b/app-misc/lcdproc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/lcdproc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.40 2006/11/16 15:03:26 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.41 2006/12/06 11:42:59 jokey Exp $
+
+  06 Dec 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/0.5.0-as-needed.patch, +files/0.5.1-as-needed.patch,
+  lcdproc-0.5.0-r2.ebuild, lcdproc-0.5.1.ebuild:
+  Fix for bug #155587 thanks to zzam for providing the patch
 
   16 Nov 2006; Joseph Jezak <josejx@gentoo.org> lcdproc-0.5.0-r2.ebuild:
   Marked ~ppc for bug #148072.
diff --git a/app-misc/lcdproc/files/0.5.0-as-needed.patch b/app-misc/lcdproc/files/0.5.0-as-needed.patch
new file mode 100644
index 000000000000..166c4298e43e
--- /dev/null
+++ b/app-misc/lcdproc/files/0.5.0-as-needed.patch
@@ -0,0 +1,36 @@
+diff -Nuar lcdproc-0.5.0-orig/clients/lcdexec/Makefile.am lcdproc-0.5.0/clients/lcdexec/Makefile.am
+--- lcdproc-0.5.0-orig/clients/lcdexec/Makefile.am	2006-01-16 20:30:03.000000000 +0100
++++ lcdproc-0.5.0/clients/lcdexec/Makefile.am	2006-11-19 20:55:30.000000000 +0100
+@@ -4,7 +4,7 @@
+ 
+ lcdexec_SOURCES = lcdexec.c menu.c menu.h
+ 
+-lcdexec_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a
++lcdexec_LDADD = ../../shared/libLCDstuff.a @ldap_libs@
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)
+ 
+diff -Nuar lcdproc-0.5.0-orig/clients/lcdproc/Makefile.am lcdproc-0.5.0/clients/lcdproc/Makefile.am
+--- lcdproc-0.5.0-orig/clients/lcdproc/Makefile.am	2006-02-18 15:46:45.000000000 +0100
++++ lcdproc-0.5.0/clients/lcdproc/Makefile.am	2006-11-19 20:55:42.000000000 +0100
+@@ -4,7 +4,7 @@
+ 
+ lcdproc_SOURCES = main.c main.h mode.c mode.h batt.c batt.h chrono.c chrono.h cpu.c cpu.h cpu_smp.c cpu_smp.h disk.c disk.h load.c load.h mem.c mem.h machine.h machine_Linux.c machine_OpenBSD.c machine_FreeBSD.c machine_NetBSD.c machine_Darwin.c machine_SunOS.c util.c util.h
+ 
+-lcdproc_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a
++lcdproc_LDADD =  ../../shared/libLCDstuff.a @ldap_libs@
+ 
+ if DARWIN
+ AM_LDFLAGS = -framework CoreFoundation -framework IOKit
+diff -Nuar lcdproc-0.5.0-orig/server/Makefile.am lcdproc-0.5.0/server/Makefile.am
+--- lcdproc-0.5.0-orig/server/Makefile.am	2006-02-04 20:06:43.000000000 +0100
++++ lcdproc-0.5.0/server/Makefile.am	2006-11-19 20:55:09.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ LCDd_SOURCES= client.c client.h clients.c clients.h input.c input.h main.c main.h menuitem.c menuitem.h menu.c menu.h menuscreens.c menuscreens.h parse.c parse.h render.c render.h screen.c screen.h screenlist.c screenlist.h serverscreens.c serverscreens.h sock.c sock.h widget.c widget.h drivers.c drivers.h driver.c driver.h
+ 
+-LDADD = @ldap_libs@ ../shared/libLCDstuff.a commands/libLCDcommands.a
++LDADD = ../shared/libLCDstuff.a commands/libLCDcommands.a @ldap_libs@
+ 
+ if !DARWIN
+ AM_LDFLAGS = -rdynamic -uget_args
diff --git a/app-misc/lcdproc/files/0.5.1-as-needed.patch b/app-misc/lcdproc/files/0.5.1-as-needed.patch
new file mode 100644
index 000000000000..bf84bb0b66f2
--- /dev/null
+++ b/app-misc/lcdproc/files/0.5.1-as-needed.patch
@@ -0,0 +1,48 @@
+diff -ru --exclude=Makefile.in lcdproc-0.5.1-orig/clients/lcdexec/Makefile.am lcdproc-0.5.1/clients/lcdexec/Makefile.am
+--- lcdproc-0.5.1-orig/clients/lcdexec/Makefile.am	2006-11-18 15:50:52.000000000 +0100
++++ lcdproc-0.5.1/clients/lcdexec/Makefile.am	2006-11-18 16:02:48.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ lcdexec_SOURCES = lcdexec.c menu.c menu.h
+ 
+-lcdexec_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a
++lcdexec_LDADD = ../../shared/libLCDstuff.a @ldap_libs@  
+ 
+ AM_CPPFLAGS = -I$(top_srcdir) -DSYSCONFDIR=\"$(sysconfdir)\"
+ 
+diff -ru --exclude=Makefile.in lcdproc-0.5.1-orig/clients/lcdproc/Makefile.am lcdproc-0.5.1/clients/lcdproc/Makefile.am
+--- lcdproc-0.5.1-orig/clients/lcdproc/Makefile.am	2006-11-18 15:50:52.000000000 +0100
++++ lcdproc-0.5.1/clients/lcdproc/Makefile.am	2006-11-18 16:04:31.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ lcdproc_SOURCES = main.c main.h mode.c mode.h batt.c batt.h chrono.c chrono.h cpu.c cpu.h cpu_smp.c cpu_smp.h disk.c disk.h load.c load.h mem.c mem.h eyebox.c eyebox.h machine.h machine_Linux.c machine_OpenBSD.c machine_FreeBSD.c machine_NetBSD.c machine_Darwin.c machine_SunOS.c util.c util.h iface.c iface.h
+ 
+-lcdproc_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a
++lcdproc_LDADD = ../../shared/libLCDstuff.a @ldap_libs@ 
+ 
+ if DARWIN
+ AM_LDFLAGS = -framework CoreFoundation -framework IOKit
+diff -ru --exclude=Makefile.in lcdproc-0.5.1-orig/clients/lcdvc/Makefile.am lcdproc-0.5.1/clients/lcdvc/Makefile.am
+--- lcdproc-0.5.1-orig/clients/lcdvc/Makefile.am	2006-11-18 15:50:52.000000000 +0100
++++ lcdproc-0.5.1/clients/lcdvc/Makefile.am	2006-11-18 16:05:05.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ lcdvc_SOURCES = lcdvc.c lcdvc.h lcd_link.c lcd_link.h vc_link.c vc_link.h 
+ 
+-lcdvc_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a
++lcdvc_LDADD = ../../shared/libLCDstuff.a @ldap_libs@  
+ 
+ if DARWIN
+ AM_LDFLAGS = -framework CoreFoundation -framework IOKit
+diff -ru --exclude=Makefile.in lcdproc-0.5.1-orig/server/Makefile.am lcdproc-0.5.1/server/Makefile.am
+--- lcdproc-0.5.1-orig/server/Makefile.am	2006-11-18 15:50:52.000000000 +0100
++++ lcdproc-0.5.1/server/Makefile.am	2006-11-18 16:07:07.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ LCDd_SOURCES= client.c client.h clients.c clients.h input.c input.h main.c main.h menuitem.c menuitem.h menu.c menu.h menuscreens.c menuscreens.h parse.c parse.h render.c render.h screen.c screen.h screenlist.c screenlist.h serverscreens.c serverscreens.h sock.c sock.h widget.c widget.h drivers.c drivers.h driver.c driver.h
+ 
+-LDADD = @ldap_libs@ ../shared/libLCDstuff.a commands/libLCDcommands.a
++LDADD = ../shared/libLCDstuff.a commands/libLCDcommands.a @ldap_libs@
+ 
+ if !DARWIN
+ AM_LDFLAGS = -rdynamic -uget_args
diff --git a/app-misc/lcdproc/lcdproc-0.5.0-r2.ebuild b/app-misc/lcdproc/lcdproc-0.5.0-r2.ebuild
index c96a7e85ec51..1660448996b5 100644
--- a/app-misc/lcdproc/lcdproc-0.5.0-r2.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.0-r2.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.0-r2.ebuild,v 1.3 2006/11/16 15:03:26 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.0-r2.ebuild,v 1.4 2006/12/06 11:42:59 jokey Exp $
 
-inherit eutils flag-o-matic
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit eutils flag-o-matic autotools
 
 DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
 HOMEPAGE="http://lcdproc.org/"
@@ -104,9 +106,11 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${PV}-LCDd-conf-driver-path.patch"
+	epatch "${FILESDIR}/${PV}-as-needed.patch"
 	if use doc; then
 		epatch "${FILESDIR}/${PV}-docs-doctype.patch"
 	fi
+	eautoreconf
 }
 
 src_compile() {
diff --git a/app-misc/lcdproc/lcdproc-0.5.1.ebuild b/app-misc/lcdproc/lcdproc-0.5.1.ebuild
index 0378a8431e3e..f8eabc4ca450 100644
--- a/app-misc/lcdproc/lcdproc-0.5.1.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.1.ebuild,v 1.3 2006/10/24 08:14:35 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.1.ebuild,v 1.4 2006/12/06 11:42:59 jokey Exp $
 
-inherit eutils flag-o-matic
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit eutils flag-o-matic autotools
 
 DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
 HOMEPAGE="http://lcdproc.org/"
@@ -119,6 +121,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${PV}-LCDd-conf-driver-path.patch"
+	epatch "${FILESDIR}/${PV}-as-needed.patch"
+	eautoreconf
 }
 
 src_compile() {