Fixed compilation with --as-needed. Closes bug #248642.

Prevent automatic stripping of binaries.
Some ebuild QA fixing.
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.24-tuxonice-r9 i686

4 files changed, 24 insertions, 14 deletions

diff --git a/x11-plugins/wmlpq/ChangeLog b/x11-plugins/wmlpq/ChangeLog
index f234a1156fb3..f17d64e5e22c 100644
--- a/x11-plugins/wmlpq/ChangeLog
+++ b/x11-plugins/wmlpq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmlpq
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlpq/ChangeLog,v 1.7 2007/02/06 02:02:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlpq/ChangeLog,v 1.8 2009/01/16 16:21:10 s4t4n Exp $
+
+  16 Jan 2009; Michele Noberasco <s4t4n@gentoo.org> wmlpq-0.2.1-r1.ebuild,
+  files/wmlpq-makefile.patch:
+  Fixed compilation with --as-needed. Closes bug #248642.
+  Prevent automatic stripping of binaries.
+  Some ebuild QA fixing.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmlpq/Manifest b/x11-plugins/wmlpq/Manifest
index 821942ae5be0..62cb0a60e2c4 100644
--- a/x11-plugins/wmlpq/Manifest
+++ b/x11-plugins/wmlpq/Manifest
@@ -1,6 +1,6 @@
-AUX wmlpq-makefile.patch 740 RMD160 c1cd7aa21523e7f5f992ea8fc02b70fa6a106238 SHA1 1cdcb95390813d811214dcdc1cd7e2286ada7f74 SHA256 e2c8247ff2c316cea1c3d590057ae99733f3264eb6a493c4b7e8798de52a682e
+AUX wmlpq-makefile.patch 856 RMD160 f4a4ca06c015eeaf4e4dab5b7da61a8837dc5ea2 SHA1 2b348de681dc79a677c44f1dad8bac9425db2295 SHA256 0283ba62911287361595de9b0c4bba508f6f4ac4f470af40c33fdba9ac7e8398
 AUX wmlpq.desktop 177 RMD160 c37c52205f142d8afc4b5ac1934ee726c7415ad6 SHA1 d36bdb3e706b0dbf5fa778aece58db7a37199010 SHA256 d100212968f9423247d4068c2f2dc90cdfde723c00c4c8b1006c6c7090aebeff
 DIST wmlpq_0.2.1.tar.gz 15180 RMD160 d3e61761ddb9c95315574728c7d171f41e62601d SHA1 54832b54ccd20a323715842af3b3d8fac8575b3a SHA256 6dba6ed7b61baa6060f4646a230477970dec2fd06d01dab7dbdf064bed348e83
-EBUILD wmlpq-0.2.1-r1.ebuild 838 RMD160 4eb030b0a2a7897230cc90d93194e1513b55e178 SHA1 efeba1bb5c1f059671c53d3c7a5df9d67c116fe8 SHA256 789959a67acba4f538dcf506f63609db54f771fb9a918b12166ad6460f54f6bb
-MISC ChangeLog 1069 RMD160 66b9c3178e53526db94a6a00f5de221e8a9c92ac SHA1 5adb58452ab1351555433220453326e6b62132e9 SHA256 11ffb6fd7fb37f72932339a0b8e8ecf755ca80b968a06073164f36b14c16857b
+EBUILD wmlpq-0.2.1-r1.ebuild 843 RMD160 c15aa1b7822190349295634a966ad49363bd7a33 SHA1 542f7fff0bb333340cd0bdd02de3bab2f2b040ec SHA256 58e4ab951d310a387ec128d7c09bd0275ec62fe75bd04047e90a184cada74db4
+MISC ChangeLog 1297 RMD160 11283ca457778499b7ac0fd6ba6817a3359e3a8d SHA1 51e5fad9a90e053907b63d1ee6ba37fff0cb2447 SHA256 62e8b8842e41acb80b325878d0bbf0af8e454a05982ed0e21bc627207249c2a8
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
diff --git a/x11-plugins/wmlpq/files/wmlpq-makefile.patch b/x11-plugins/wmlpq/files/wmlpq-makefile.patch
index 953d18ff4798..4dc00bd97cdb 100644
--- a/x11-plugins/wmlpq/files/wmlpq-makefile.patch
+++ b/x11-plugins/wmlpq/files/wmlpq-makefile.patch
@@ -1,6 +1,6 @@
---- Makefile.orig	2001-03-27 22:19:12.000000000 +0000
-+++ Makefile	2004-06-20 18:52:17.513090584 +0000
-@@ -2,8 +2,9 @@
+--- /Makefile.orig	2009-01-16 17:01:47.000000000 +0100
++++ /Makefile	2009-01-16 17:04:18.000000000 +0100
+@@ -2,11 +2,11 @@
  CPPFLAGS = -I/usr/X11R6/include -I/usr/local/include
  LIBS = -lXpm -lX11 -ldockapp  
  LDFLAGS = -L/usr/X11R6/lib -L/usr/local/lib
@@ -10,7 +10,11 @@
 +DESTDIR = /usr/bin/
  
  wmlpq: wmlpq.c wmlpq-master.xpm
- 	cc $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -o wmlpq $(LIBS) wmlpq.c
+-	cc $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -o wmlpq $(LIBS) wmlpq.c
++	cc $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) wmlpq.c -o wmlpq $(LIBS)
+-	strip wmlpq
+ 
+ debug: wmlpq.c wmlpq-master.xpm
 @@ -18,10 +19,8 @@
  	rm -f wmlpq 
  
diff --git a/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild b/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild
index bf04a0dea76b..55a676b8c5a1 100644
--- a/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild
+++ b/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild,v 1.2 2006/01/15 17:47:42 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild,v 1.3 2009/01/16 16:21:10 s4t4n Exp $
 
 inherit eutils
 
@@ -21,18 +21,18 @@ KEYWORDS="x86 ppc"
 src_unpack()
 {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-makefile.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-makefile.patch"
 }
 
 src_install()
 {
 	dodir /usr/bin/
-	einstall DESTDIR=${D}/usr/bin/ CFLAGS="${CFLAGS} -Wall" || die "Installation failed"
+	einstall DESTDIR="${D}/usr/bin/" CFLAGS="${CFLAGS} -Wall" || die "Installation failed"
 
 	dodoc README sample.wmlpqrc
 	newman wmlpq.1x wmlpq.1
 
 	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
+	doins "${FILESDIR}/${PN}.desktop"
 }