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

Package-Manager: portage-2.1.2_rc2-r5

6 files changed, 125 insertions, 20 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/Manifest b/app-misc/lcdproc/Manifest
index 0f35b016e5e3..b6edb91dd2ce 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -17,6 +17,10 @@ AUX 0.5.0-LCDd.initd 632 RMD160 abfa16d7d73673b10b9dcea755545a5979e3607b SHA1 62
 MD5 157743664817a6b0ee85341eabeef19e files/0.5.0-LCDd.initd 632
 RMD160 abfa16d7d73673b10b9dcea755545a5979e3607b files/0.5.0-LCDd.initd 632
 SHA256 c3dc938a0be2958ef469a2c6a6e209aef4f6488e57b51f516d4c0353bdce526e files/0.5.0-LCDd.initd 632
+AUX 0.5.0-as-needed.patch 1999 RMD160 4a94c1a7cb60897a6b2feb32a24e4841e98b94a5 SHA1 1c150e97487e87f7abb8e9358f3785d3528d58b7 SHA256 a13f71f210bc9323508d2605cdc996ade8f1d6879b46ba7472cfb7d68351aac2
+MD5 15c2fc11350992dabb51faa451c66402 files/0.5.0-as-needed.patch 1999
+RMD160 4a94c1a7cb60897a6b2feb32a24e4841e98b94a5 files/0.5.0-as-needed.patch 1999
+SHA256 a13f71f210bc9323508d2605cdc996ade8f1d6879b46ba7472cfb7d68351aac2 files/0.5.0-as-needed.patch 1999
 AUX 0.5.0-docs-doctype.patch 1594 RMD160 02282ab44a254131b9150986c4b5280fc0a5c71e SHA1 e0d2498f475af308c1ff0b54e55014e457f74520 SHA256 7900f2adc22a03c22a430b85c5a9d5226bc647470248bda568f588bfe5387202
 MD5 df9dd8e16da3669aa32d3078f33cc663 files/0.5.0-docs-doctype.patch 1594
 RMD160 02282ab44a254131b9150986c4b5280fc0a5c71e files/0.5.0-docs-doctype.patch 1594
@@ -33,6 +37,10 @@ AUX 0.5.1-LCDd.initd 645 RMD160 69b059023b665ecfcce9306dd9be2933da38b12a SHA1 85
 MD5 cce5adc33e6e671cede2f8f58337a6ac files/0.5.1-LCDd.initd 645
 RMD160 69b059023b665ecfcce9306dd9be2933da38b12a files/0.5.1-LCDd.initd 645
 SHA256 782142cc26b433bbfe1ac1ae152a8ecf62985e78c03e674f699f76847e6465b6 files/0.5.1-LCDd.initd 645
+AUX 0.5.1-as-needed.patch 2683 RMD160 efd047eae0615d50cc38a689637a5e71a85c93bf SHA1 56e7a18617c870bb1d84a3b09ab9ce370b9766cc SHA256 1ed27f3dd00031499a80d3d0e2ab35b0b35c2f90a6aa7530913c7f87acae70e0
+MD5 0af610c21e75fe504a3b9cdc3bd56560 files/0.5.1-as-needed.patch 2683
+RMD160 efd047eae0615d50cc38a689637a5e71a85c93bf files/0.5.1-as-needed.patch 2683
+SHA256 1ed27f3dd00031499a80d3d0e2ab35b0b35c2f90a6aa7530913c7f87acae70e0 files/0.5.1-as-needed.patch 2683
 AUX 0.5.1-lcdproc.initd 480 RMD160 27bea68560caee6e23e2d1742eff5fe01627602a SHA1 b471457107dcea79be328a6856a1111af63debf6 SHA256 0db323adbebad0cac3dc9cb9fa28788546dc9b8b620e4e4f7332f5d98e77409f
 MD5 f7fa34302843a0cd4980466fc3dbda1a files/0.5.1-lcdproc.initd 480
 RMD160 27bea68560caee6e23e2d1742eff5fe01627602a files/0.5.1-lcdproc.initd 480
@@ -44,18 +52,18 @@ EBUILD lcdproc-0.4.5.ebuild 2674 RMD160 cd6f848de9b5ebae191d83ccb9e8e58ff88de3b0
 MD5 ec8742dd9baf6c8a07c99fc99a76ec61 lcdproc-0.4.5.ebuild 2674
 RMD160 cd6f848de9b5ebae191d83ccb9e8e58ff88de3b0 lcdproc-0.4.5.ebuild 2674
 SHA256 e7b9fa8ddb11969844c77546e751169fa04662eb47a6076a274e06bf171e1326 lcdproc-0.4.5.ebuild 2674
-EBUILD lcdproc-0.5.0-r2.ebuild 5686 RMD160 c942b9d95b4afe9e20b193d0ee11fc03239a083a SHA1 cd77ae5a6c29bf50df49db86cf65b09814d8a019 SHA256 02e2e12b3d31ec94290c9350d9f40c728324f49874e73823c90e4ec51bd3982d
-MD5 e5bf55ffb42887a837b10276eea81159 lcdproc-0.5.0-r2.ebuild 5686
-RMD160 c942b9d95b4afe9e20b193d0ee11fc03239a083a lcdproc-0.5.0-r2.ebuild 5686
-SHA256 02e2e12b3d31ec94290c9350d9f40c728324f49874e73823c90e4ec51bd3982d lcdproc-0.5.0-r2.ebuild 5686
-EBUILD lcdproc-0.5.1.ebuild 5798 RMD160 2a8ee3eea91bf7d4ccf33ac70efa220ffddae0e1 SHA1 213646f0d35f984a4a8b113b8863347d8297ed26 SHA256 3750f48f80079647a21d1ca5883be3f861d1bfac3a3a60ed6ac89677cf4a29cc
-MD5 8b3246a8531f9d724cc22fc0df972f14 lcdproc-0.5.1.ebuild 5798
-RMD160 2a8ee3eea91bf7d4ccf33ac70efa220ffddae0e1 lcdproc-0.5.1.ebuild 5798
-SHA256 3750f48f80079647a21d1ca5883be3f861d1bfac3a3a60ed6ac89677cf4a29cc lcdproc-0.5.1.ebuild 5798
-MISC ChangeLog 6976 RMD160 86bfe6f10e18ba5d6712b8077c16887e619fa43b SHA1 ac141c6352be94f56772fd7be862d6893abce6f4 SHA256 a0f95db043898aacf7d4f6465e40c0d19a8079c603ea82f62756824ef873c075
-MD5 2e6d66b1296960f6d65e04210d2979e5 ChangeLog 6976
-RMD160 86bfe6f10e18ba5d6712b8077c16887e619fa43b ChangeLog 6976
-SHA256 a0f95db043898aacf7d4f6465e40c0d19a8079c603ea82f62756824ef873c075 ChangeLog 6976
+EBUILD lcdproc-0.5.0-r2.ebuild 5798 RMD160 345e0a3d62dc62c1e8e94b822822890914dc32ee SHA1 7a4cd820ded9c2a91fa8980963141ada0828d7ea SHA256 7202fa08ad4d26e2e262591eaaedf030694d963c1525e79e0ce3ff979491a31f
+MD5 b3b7fdff71335e9ee5bcb428ace1c275 lcdproc-0.5.0-r2.ebuild 5798
+RMD160 345e0a3d62dc62c1e8e94b822822890914dc32ee lcdproc-0.5.0-r2.ebuild 5798
+SHA256 7202fa08ad4d26e2e262591eaaedf030694d963c1525e79e0ce3ff979491a31f lcdproc-0.5.0-r2.ebuild 5798
+EBUILD lcdproc-0.5.1.ebuild 5911 RMD160 7729c787e89384da08be98a953d422f34d7b231a SHA1 284f34b65ab4577534636e1397d02e9aef8036fc SHA256 4b38b494416d69e98898ce696b95b9ad3a36c9deb66bb942aea454261db2e347
+MD5 f2f828348aa2fd1be442ec99886d88f9 lcdproc-0.5.1.ebuild 5911
+RMD160 7729c787e89384da08be98a953d422f34d7b231a lcdproc-0.5.1.ebuild 5911
+SHA256 4b38b494416d69e98898ce696b95b9ad3a36c9deb66bb942aea454261db2e347 lcdproc-0.5.1.ebuild 5911
+MISC ChangeLog 7197 RMD160 7179c4332f016e56a3cd34d3b8eb3c9b231a5f55 SHA1 5c76fee186746918881c25460c85e3ba4614ebbb SHA256 8ed404785a8f8395ce9d9f15cc02e8e814bdba95c012e4ebb5a39f0d69fddb9e
+MD5 d7e48e8874098a16b5e7b85508b4f29c ChangeLog 7197
+RMD160 7179c4332f016e56a3cd34d3b8eb3c9b231a5f55 ChangeLog 7197
+SHA256 8ed404785a8f8395ce9d9f15cc02e8e814bdba95c012e4ebb5a39f0d69fddb9e ChangeLog 7197
 MISC metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 SHA1 c212d5a20354a60471162a82c403f1a5235d1d9d SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a
 MD5 be4a34ac317e81ea820c84bc04b9c0d8 metadata.xml 250
 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 metadata.xml 250
@@ -72,7 +80,7 @@ SHA256 9756a02fc35bbb6fd64b59252ad8f42b68c6994e8f45569438c739e4b48b4977 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFXH3EcsIHjyDViGQRAgoWAKCYCstvTVo4GyA14IJrEsxu/EsLdQCfRrQ0
-7kXJn3RXH1NWolsuqDTr9iw=
-=H9xO
+iD8DBQFFdqzLz974XjDVpbkRAvawAJ9dH0WS8GqcQ7FNxwYHKa/r2Gyh6wCdEBHZ
+S1Af6K016OuXrbM37/iEU64=
+=A7DY
 -----END PGP SIGNATURE-----
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() {