Reworked Makefile patch, simplified ebuild. Closes bug #336091.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 29 insertions, 22 deletions

diff --git a/x11-plugins/wmacpimon/ChangeLog b/x11-plugins/wmacpimon/ChangeLog
index 155e6ffda20f..cf04fc6a39e9 100644
--- a/x11-plugins/wmacpimon/ChangeLog
+++ b/x11-plugins/wmacpimon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmacpimon
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/ChangeLog,v 1.8 2008/12/02 11:29:52 s4t4n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/ChangeLog,v 1.9 2010/09/06 07:48:33 s4t4n Exp $
+
+  06 Sep 2010; Michele Noberasco <s4t4n@gentoo.org>; wmacpimon-0.2.1.ebuild, files/Makefile.patch:
+  Reworked Makefile patch, simplified ebuild. Closes bug #336091.
 
   02 Dec 2008; Michele Noberasco <s4t4n@gentoo.org>; wmacpimon-0.2.1.ebuild, files/Makefile.patch:
   Fixed LDFLAGS ordering. See bug #248618.
diff --git a/x11-plugins/wmacpimon/Manifest b/x11-plugins/wmacpimon/Manifest
index 47c752631f70..f0490012f140 100644
--- a/x11-plugins/wmacpimon/Manifest
+++ b/x11-plugins/wmacpimon/Manifest
@@ -1,7 +1,7 @@
-AUX Makefile.patch 353 RMD160 63664f3245d4dd2e7cdbecd10bd1643ff11a3a95 SHA1 76377fc887e60265de262728da5cbae39b9b626c SHA256 023e57df70beb4fe7bde93333c1a266773675c9e91b3d3e59ca83235f6fdb8ff
+AUX Makefile.patch 650 RMD160 c13d448377a320f6bc1ff1a7add1bd6d371c7391 SHA1 1f8b6ea96e87db5d4bd573cc0dc7fdfa254299c6 SHA256 d54efe95ec83e625f43869f7625cf90c127869a77b23a89b408af10a07431dfd
 AUX wmacpimon.c.patch 968 RMD160 de0342b75efdace8b51a0d93d405da85ac722734 SHA1 f9ecb2aaad86cccb3bfb5f678c472a46f4c6f30c SHA256 8a34b4ea0e5f9a2d663741345c2831875342ac1ce7f92c3afcc5a4f8365ad3ed
 AUX wmacpimon.initscript 406 RMD160 6b58764a0aa4201ffc38165baf3114076b4b7448 SHA1 9be4a1960294eb9087725411c8c65310351dca13 SHA256 e8cc6157ca8c5d767973a5b1ae68ce3fcb907b3eaff503db93c1f65f6734d2b5
 DIST wmacpimon-0.2.1.tar.gz 26498 RMD160 f75aee0d14adcc0f6039ba5ba016e3f25f881e0c SHA1 f8f80a5bbfd836afc1b15afcdcf06594a5bc0c97 SHA256 73754555bb313a06ff1956d721aad5efa34ead013cfe10f58cddad3f04d5ed3f
-EBUILD wmacpimon-0.2.1.ebuild 1330 RMD160 1341b8268ed425caa5158b6f771dc3ee3f37b076 SHA1 8b82b7407679e219f3d8ea928577daa389f924ef SHA256 8a3a7edec7f0b09d0b9e36a2c9d8cb33c5bbe6b8f0e081f193662839f3abf0bc
-MISC ChangeLog 1145 RMD160 4fc5f8333288c71db22a9ebfa809bedfe68de16b SHA1 d1426d9e1961068654ac20b49fb111d5576c268c SHA256 a181ad7634e45105a2f01fee4ef2bbaf095074dfca3ff9ad895373fa64ab8aa8
+EBUILD wmacpimon-0.2.1.ebuild 1242 RMD160 b94be7495cd944b33c3a12eb1afa5dd0c6b33837 SHA1 bca1e94de638e5885c94d9c93dc84aa835201df8 SHA256 8d03f6b29beba0186723ef4693145f9842bd2baddfed8140e7e982270bf877eb
+MISC ChangeLog 1311 RMD160 b1700f3fbb99d2aa69b4c28d908e09c62427493b SHA1 41b03a2ea6a6cfff342d8216dcf93435dc87ef0d SHA256 83b04d401e8467569056e99626b6082b4073fbe9c478c856efa3be7c214ab911
 MISC metadata.xml 404 RMD160 1fad35799807350c0c6e17cf7ac2dc1e0bf4d382 SHA1 4761d96a8be4b8d1c64982e133ec8a5bb3bb95e5 SHA256 5a5ae0806f4637a4a0b941e16e0f665158e751120e65162fdba83c1f96367af2
diff --git a/x11-plugins/wmacpimon/files/Makefile.patch b/x11-plugins/wmacpimon/files/Makefile.patch
index e4a759b83ebd..aab28fc89392 100644
--- a/x11-plugins/wmacpimon/files/Makefile.patch
+++ b/x11-plugins/wmacpimon/files/Makefile.patch
@@ -1,13 +1,24 @@
---- Makefile	2002-11-26 22:53:07.000000000 +0100
-+++ Makefile.new	2008-12-02 12:25:29.000000000 +0100
-@@ -11,8 +11,10 @@
+--- Makefile	2010-09-06 11:33:16.000000000 +0200
++++ Makefile.new	2010-09-06 11:36:28.000000000 +0200
+@@ -1,8 +1,5 @@
+-OPT	= -O3 -DACPI
+-
+-CC	= gcc
+-CFLAGS	= $(OPT) -Wall -I/usr/X11R6/include
+-LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext
++CFLAGS	+= -DACPI -Wall -I/usr/X11R6/include
++LIBS = -DACPI -L/usr/X11R6/lib -lX11 -lXpm -lXext
+ 
+ SRCS	= wmacpimon.c libacpi.c
+ OBJS	= wmacpimon.o libacpi.o
+@@ -11,8 +8,10 @@
  all:	wmacpimon wmacpimond
  
  wmacpimon:	$(OBJS)
-+	$(CC) $(CFLAGS) -o wmacpimon $^ $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o wmacpimon $^ $(LIBS)
  
  wmacpimond:	$(OBJZ)
-+	$(CC) $(CFLAGS) -o wmacpimond $^ $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o wmacpimond $^ $(LIBS)
  
  clean:
  	rm -f *.o *~ wmacpimon wmacpimond trace *.out *.bb *.bbg
diff --git a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
index eb5a3f5a57cd..b0a33819171a 100644
--- a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
+++ b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild,v 1.8 2008/12/02 11:29:52 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild,v 1.9 2010/09/06 07:48:33 s4t4n Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="WMaker DockApp that monitors the temperature and Speedstep features in new ACPI-based systems."
@@ -20,24 +21,16 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto
 	x11-proto/xextproto"
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	# patch wmacpimon.c file to set default path for
 	# wmacpimon.prc to /var/tmp/
-	cd "${S}"
 	epatch "${FILESDIR}"/wmacpimon.c.patch
 
 	# fix LDFLAGS ordering. See bug #248618.
+	# fix LDFLAGS ordering again and other stuff. See bug #336091.
 	epatch "${FILESDIR}"/Makefile.patch
 }
 
-src_compile() {
-	emake CFLAGS="${CFLAGS} -DACPI -Wall" \
-		LDFLAGS="${CFLAGS} -DACPI -lX11 -lXpm -lXext" \
-		|| die "emake failed."
-}
-
 src_install() {
 	dobin wmacpimond wmacpimon || die "dobin failed."
 	dodoc AUTHORS ChangeLog README