Revision bump, with patch to honour LDFLAGS, crosscompile, and general QA. Wiped out oldest version. Closes bug #207945

Package-Manager: portage-2.1.3.19

5 files changed, 80 insertions, 33 deletions

diff --git a/x11-plugins/wmalms/ChangeLog b/x11-plugins/wmalms/ChangeLog
index 38e5652fced3..5a7a2816976d 100644
--- a/x11-plugins/wmalms/ChangeLog
+++ b/x11-plugins/wmalms/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/wmalms
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/ChangeLog,v 1.12 2008/01/14 13:25:18 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/ChangeLog,v 1.13 2008/02/01 12:21:12 s4t4n Exp $
+
+*wmalms-1.1.1-r1 (01 Feb 2008)
+
+  01 Feb 2008; Michele Noberasco <s4t4n@gentoo.org>
+  +files/wmalms-1.1.1-makefile.patch, +wmalms-1.1.1-r1.ebuild:
+  Revision bump, with fixes to respect LDFLAGS, crosscompile, and QA.
+  Closes bug #207945.
+  -wmalms-1.0.0a-r1.ebuild:
+  Wiped out oldest version.
 
   14 Jan 2008; Christian Faulhammer <opfer@gentoo.org> wmalms-1.1.1.ebuild:
   stable x86, bug 129273
diff --git a/x11-plugins/wmalms/Manifest b/x11-plugins/wmalms/Manifest
index 00dba0e5f0b9..8cca0fe5295c 100644
--- a/x11-plugins/wmalms/Manifest
+++ b/x11-plugins/wmalms/Manifest
@@ -1,7 +1,7 @@
 AUX wmalms-1.1.1-configure.patch 1318 RMD160 ebb9f0359a36c26f562e5b458b0c95a0ad4dd70e SHA1 1ba370f51a583f9adec358fc14cc55b6a8f07263 SHA256 43eb532f2bf617ac146debd042cc944ef849c7235e593b327462aeca14361255
-DIST wmalms-1.0.0a.tar.gz 52588 RMD160 8e1b016d5c05e12884bd5e15d67798e43d372c27 SHA1 187b9c149052ca7f22af8049a873854c0abd1e4a SHA256 365d5440e67fc90436f3886828c3d3610d80e863a7d5eef579b1073a835d64cc
+AUX wmalms-1.1.1-makefile.patch 995 RMD160 b3107787c2d5208d89db2c7db95f1f091e9b4217 SHA1 02b2ca761685747f9ecdba0bc1920f2e2225ce1f SHA256 bf01578942422a65e7748c244864f20daed4166f4e1a61f5ada5eab3c9d3ec55
 DIST wmalms-1.1.1.tar.gz 74267 RMD160 85a24c00c23dfcb17ab4b224429945f57701c863 SHA1 2c4e504288e9bb1e2dccf79e12c1c90fff82b4e9 SHA256 b78b7298ee7300ae58c9df42fae243fc66805612eda6aaf9ecb65ec7c1a2906e
-EBUILD wmalms-1.0.0a-r1.ebuild 725 RMD160 da718ab77129341ae72b5d3c12404d900c478cdd SHA1 7c8dfe935a042eac53aff2b4433aebed653841d6 SHA256 a23dac9fd25d4061cc4c2f45473be97184a3788feb21474dabd66de6558878a7
+EBUILD wmalms-1.1.1-r1.ebuild 907 RMD160 5b41f9a58970282448f41623dc2e90fc87a62515 SHA1 7d7ba14ed8c3a9a3441bd8d9afe9972307f0e737 SHA256 7c91fa50bdd2aca64e6b03a00ae461776ec525ca17bdb1c8e32611e3bc5cd786
 EBUILD wmalms-1.1.1.ebuild 762 RMD160 805db7d95a9b79ab2269e69d531a2ade86781963 SHA1 78330fa44461d8bb07792982e7e5050eb4abff70 SHA256 3886013de4c72e08ad4170a16992f3c070fc0027df9100d4798e729ce0e0bbdb
-MISC ChangeLog 1652 RMD160 459964bb178e10810a7a339922c70bdf29a9015d SHA1 8b6228315cb824043ffe6f5505324fb83b99c2ca SHA256 980f2c4f6ea471b1df4970e2730c13c4b6276eee12b3b978e154a4f75cb3360b
+MISC ChangeLog 1948 RMD160 68c9c26928378fec768e434df681cdf14ec611b9 SHA1 361feddd208605a0d06dadcb72af38318561b1b1 SHA256 4e947b6dd6ddc254f4a83b737bfd48381e9ac850d266d3d9e4a0b65ba0d32863
 MISC metadata.xml 770 RMD160 4cd8eba8101116aa3c49a0ac9e1e96e70fb8ca25 SHA1 fad273ac078ec1c0599cd94b3237816e1db64662 SHA256 e3ad3b9b2bcb3c720ef46b805efa5ec935a7d8a916734d3348f0f939d4b315ce
diff --git a/x11-plugins/wmalms/files/wmalms-1.1.1-makefile.patch b/x11-plugins/wmalms/files/wmalms-1.1.1-makefile.patch
new file mode 100644
index 000000000000..cff1374a1df9
--- /dev/null
+++ b/x11-plugins/wmalms/files/wmalms-1.1.1-makefile.patch
@@ -0,0 +1,27 @@
+--- Makefile.in.orig	2003-10-12 23:42:01.000000000 +0200
++++ Makefile.in	2008-01-28 19:49:08.000000000 +0100
+@@ -45,7 +45,7 @@
+ 	rm -rf *.cache 
+ 
+ wmalms: wmalms.dep  $(MODULES)
+-	gcc -o wmalms $(CFLAGS) $(MODULES) $(LIBDIR) -lX11 -lXpm $(LIBEXT) $(LIBLMS)
++	$(CC) -o wmalms $(CFLAGS) $(MODULES) $(LIBDIR) $(LDFLAGS) -lX11 -lXpm $(LIBEXT) $(LIBLMS)
+ 	@echo $(SEP)
+ 	@echo "You've done it!"
+ 	@echo "Now log in as root and type 'make install' to install the binary and documents"
+@@ -60,11 +60,11 @@
+ 	$(CC) $(CFLAGS) $(INCLUDES) -MM $(patsubst %.o,%.c,$(MODULES)) > wmalms.dep
+ 
+ install:
+-	$(INSTALL) -d  ${BINDIR}
+-	$(INSTALL) -s  wmalms  ${BINDIR}
++	$(INSTALL) -d  $(DESTDIR)${BINDIR}
++	$(INSTALL) wmalms  $(DESTDIR)${BINDIR}
+ ifneq ("$(WITH_RPM)", "yes")
+-	$(INSTALL) -d  ${DOCDIR}
+-	$(INSTALL)  README *.html  ${DOCDIR}
++	$(INSTALL) -d  $(DESTDIR)${DOCDIR}
++	$(INSTALL)  README manual.html  $(DESTDIR)${DOCDIR}
+ endif
+ 	@echo $(SEP)
+ 	@echo "Installation of wmalms ${VERSION}  completed."
diff --git a/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild b/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild
deleted file mode 100644
index 72d0b33b0fa2..000000000000
--- a/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild,v 1.11 2007/07/22 05:29:19 dberkholz Exp $
-
-IUSE=""
-DESCRIPTION="wmalms X-windows hardware sensors applet"
-HOMEPAGE="http://www.geocities.com/wmalms"
-SRC_URI="http://www.geocities.com/wmalms/wmalms-1.0.0a.tar.gz"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	sys-apps/lm_sensors"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -sparc amd64"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make BINDIR=${D}/usr/bin DOCDIR=${D}/usr/share/doc/${P} install
-}
diff --git a/x11-plugins/wmalms/wmalms-1.1.1-r1.ebuild b/x11-plugins/wmalms/wmalms-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..d0eefbe6fdbd
--- /dev/null
+++ b/x11-plugins/wmalms/wmalms-1.1.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/wmalms-1.1.1-r1.ebuild,v 1.1 2008/02/01 12:21:12 s4t4n Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="lm_sensors monitoring docklet."
+HOMEPAGE="http://www.geocities.com/wmalms"
+SRC_URI="http://www.geocities.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libX11
+	sys-apps/lm_sensors"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-libs/libXt"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf --docdir="/usr/share/doc/${PF}"
+	emake || die "compile failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+}