x11-plugins/wmlpq: Revbump. Fix respect for toolchain. Fix respect for LDFLAGS wrt bug 351012.

Package-Manager: portage-2.2.0_alpha34/cvs/Linux x86_64

5 files changed, 111 insertions, 6 deletions

diff --git a/x11-plugins/wmlpq/ChangeLog b/x11-plugins/wmlpq/ChangeLog
index f17d64e5e22c..e6dc37aca48d 100644
--- a/x11-plugins/wmlpq/ChangeLog
+++ b/x11-plugins/wmlpq/ChangeLog
@@ -1,6 +1,15 @@
 # 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.8 2009/01/16 16:21:10 s4t4n Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlpq/ChangeLog,v 1.9 2011/05/19 19:11:04 c1pher Exp $
+
+*wmlpq-0.2.1-r2 (19 May 2011)
+
+  19 May 2011; Dane Smith <c1pher@gentoo.org> +wmlpq-0.2.1-r2.ebuild,
+  +files/wmlpq-makefile-ldflags.patch:
+  QA: Revision bump. Add new patch.
+  New patch allows for fixing of toolchain respect which is then used in -r2.
+  The new revision also respects LDFLAGS wrt bug 351012.
+  Update copyright lines.
 
   16 Jan 2009; Michele Noberasco <s4t4n@gentoo.org> wmlpq-0.2.1-r1.ebuild,
   files/wmlpq-makefile.patch:
diff --git a/x11-plugins/wmlpq/Manifest b/x11-plugins/wmlpq/Manifest
index 62cb0a60e2c4..901dea61749f 100644
--- a/x11-plugins/wmlpq/Manifest
+++ b/x11-plugins/wmlpq/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX wmlpq-makefile-ldflags.patch 859 RMD160 9972693f000fa131f19f4b2527e941ab57ecb187 SHA1 493b038e38d8b7c065f658a90a826dbc6669fd95 SHA256 480ffafe77d8f33c4109b0beaa42e365e8f42dd7e22abb47926fef236603f128
 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 843 RMD160 c15aa1b7822190349295634a966ad49363bd7a33 SHA1 542f7fff0bb333340cd0bdd02de3bab2f2b040ec SHA256 58e4ab951d310a387ec128d7c09bd0275ec62fe75bd04047e90a184cada74db4
-MISC ChangeLog 1297 RMD160 11283ca457778499b7ac0fd6ba6817a3359e3a8d SHA1 51e5fad9a90e053907b63d1ee6ba37fff0cb2447 SHA256 62e8b8842e41acb80b325878d0bbf0af8e454a05982ed0e21bc627207249c2a8
+EBUILD wmlpq-0.2.1-r1.ebuild 844 RMD160 585f05a99a12d162943d89477bed939372124392 SHA1 ba214d34b25692e4867449f842239f2e909e4d77 SHA256 85a561c5bad0ec69404b4ba8c2a97313d67aaf37115fff25065436f67f92451a
+EBUILD wmlpq-0.2.1-r2.ebuild 1010 RMD160 a1b3018196d701b23198bc83c7fc758cea8939b5 SHA1 2c0c2921cf8673cd41c354c70d51ee3793bdfd86 SHA256 7085be7fcc2266bef9f51c4f40b87117f04aa4a52e29ea77d4ce632032c0c350
+MISC ChangeLog 1636 RMD160 39bc0cc5e94ca56cdfa81308c8b9446ec06118b4 SHA1 9d4eade860453aa481cf679b6708c658a47d5cc8 SHA256 40441f4e0fc9b2142811b7405a6441988722f91ba7d15fea7680216f7c6ccb66
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJN1WpLAAoJEEsurZwMLhUxjpMQAITvHwxRQZWbCVb4gWwlwbyv
+WOVXLPoLE3jiFJo85P59wpN+A2t9g6hFaATrdcLm0ts8mmRYcaP0e2wHoc1FI/SI
+i+06Vbwobmg/kyCNctNNxwP5rKFTLqvcvNEBs+AC3w1atHymZ2HS1kJE4Zmk8eGj
+aDldZ1roSC+5nPzC+ICdKAJ5ONN2bZRSdxKOQtMG8/0BJXJm+AYf7jSBC0BEzp5B
+HBg0xkSGVQJO9B8v1mSj6PWNgnz5lw8mpHVXMcaYNJpRaWCUh6tnAZ1yG/U25y9y
+8MR8+vsREGl/9wZsF0+sF5NV7U1ZUlhCetZNgts/vmZCf44szqaVWfYRpdmZUQsr
+9A9a9PsFqWSyIXxsDX/H71faGRmdsoKy/j7A338twiXpW0dEP3tD5Fdkla7cA9wy
+sJpdSWMJY11bmbQ4HxQXkedgeUoYMkS5wqt6gGiOtrA7kTs0tUTh2sGHKovLBH49
+MxvCgsFcBquw45ZAanRkqUMgcDnUfOmmA42K9zdcl1BrPo+vWXQPU5DjzqGkmzsE
+Xvzbp9psDd27fysVtGY3LtzkVNzmDK+/6BQ2aytnqQzQpigKehaPX4EdzB3yB6SX
+Wv/mNuHRLHmrIsq4U7qzHsVcI5UXetg8XftpliaLsFzZ7nQL1x308nl2D3JlISK3
+TGtBUU9NkjUT6btbUrvN
+=fSa+
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmlpq/files/wmlpq-makefile-ldflags.patch b/x11-plugins/wmlpq/files/wmlpq-makefile-ldflags.patch
new file mode 100644
index 000000000000..308e7f4e687e
--- /dev/null
+++ b/x11-plugins/wmlpq/files/wmlpq-makefile-ldflags.patch
@@ -0,0 +1,30 @@
+--- /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
+-CFLAGS = -O2 -Wall
++CFLAGS = -Wall
+ DFLAGS = -ggdb3 -Wall
++DESTDIR = /usr/bin/
+ 
+ wmlpq: wmlpq.c wmlpq-master.xpm
+-	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 
+ 
+ install: wmlpq
+-	cp -f wmlpq /usr/local/bin/
+-	chmod 755 /usr/local/bin/wmlpq
+-	cp -f wmlpq.1x /usr/local/man/man1/
+-	chmod 644 /usr/local/man/man1/wmlpq.1x
++	cp -f wmlpq ${DESTDIR}
++	chmod 755 ${DESTDIR}/wmlpq
+ 
+ install-debian: wmlpq
+ 	cp -f wmlpq $(prefix)/usr/X11R6/bin/
diff --git a/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild b/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild
index 55a676b8c5a1..2e095fd436a2 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-2009 Gentoo Foundation
+# Copyright 1999-2011 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.3 2009/01/16 16:21:10 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild,v 1.4 2011/05/19 19:11:04 c1pher Exp $
 
 inherit eutils
 
diff --git a/x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild b/x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild
new file mode 100644
index 000000000000..4e01c3667a15
--- /dev/null
+++ b/x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 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-r2.ebuild,v 1.1 2011/05/19 19:11:04 c1pher Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+IUSE=""
+
+DESCRIPTION="Windowmaker dockapp which monitors up to 5 printqueues"
+SRC_URI="http://www.ur.uklinux.net/wmlpq/dl/wmlpq_0.2.1.tar.gz"
+HOMEPAGE="http://www.ur.uklinux.net/wmlpq/"
+
+DEPEND="x11-libs/libdockapp"
+
+RDEPEND=""
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~x86"
+
+src_unpack()
+{
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-makefile-ldflags.patch"
+}
+
+src_compile()
+{
+	append-ldflags "-L/usr/X11R6/lib -L/usr/local/lib"
+	emake CC=$(tc-getCC) LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install()
+{
+	dodir /usr/bin || die
+	emake DESTDIR="${D}/usr/bin" install || die "Installation failed"
+
+	dodoc README sample.wmlpqrc || die
+	newman wmlpq.1x wmlpq.1 || die
+
+	insinto /usr/share/applications
+	doins "${FILESDIR}/${PN}.desktop" || die
+}