Use correct install program (bug #176100), use domenu and clean *DEPEND

Package-Manager: portage-2.1.2.7

6 files changed, 80 insertions, 87 deletions

diff --git a/x11-plugins/wmsystray/ChangeLog b/x11-plugins/wmsystray/ChangeLog
index 0694ae00f6d6..d4ff6d9dc19c 100644
--- a/x11-plugins/wmsystray/ChangeLog
+++ b/x11-plugins/wmsystray/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmsystray
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsystray/ChangeLog,v 1.10 2007/02/21 23:50:33 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsystray/ChangeLog,v 1.11 2007/06/30 14:20:37 coldwind Exp $
+
+  30 Jun 2007; Santiago M. Mola <coldwind@gentoo.org>
+  +files/wmsystray-0.1.1-Makefile.patch,
+  +files/wmsystray-0.1.1-gcc-3.4.patch, -files/wmsystray-gcc-3.4.patch,
+  -files/wmsystray-cflags.patch, wmsystray-0.1.1.ebuild:
+  Use correct install program (bug #176100), use domenu and clean *DEPEND
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmsystray/Manifest b/x11-plugins/wmsystray/Manifest
index c239b3d402c1..774081e85a80 100644
--- a/x11-plugins/wmsystray/Manifest
+++ b/x11-plugins/wmsystray/Manifest
@@ -1,27 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX wmsystray-cflags.patch 1149 RMD160 27fed70237f2f17be3f0d2493b097f8bedcd7d7c SHA1 5ad0acf584a8676b09aa7ce15cc8444ebb777964 SHA256 a8d35440d7019dcb1cf5302bd4edeeb855a7225dfd4ad4c2de44860b7f08865a
-MD5 34195165ec752a9c8fcfda9a233d49cc files/wmsystray-cflags.patch 1149
-RMD160 27fed70237f2f17be3f0d2493b097f8bedcd7d7c files/wmsystray-cflags.patch 1149
-SHA256 a8d35440d7019dcb1cf5302bd4edeeb855a7225dfd4ad4c2de44860b7f08865a files/wmsystray-cflags.patch 1149
-AUX wmsystray-gcc-3.4.patch 270 RMD160 b5aebe769928669622993c6f04b8ee0a71b4b9d4 SHA1 cc637be0ab4d175c42a061bc1d9e570274ca4dd0 SHA256 92268628a43d62a0b1ba2a1d85f45a352cfd3745db355ba0e8b7863a31208064
-MD5 c0df4c20ac27375666dbb28ae85281af files/wmsystray-gcc-3.4.patch 270
-RMD160 b5aebe769928669622993c6f04b8ee0a71b4b9d4 files/wmsystray-gcc-3.4.patch 270
-SHA256 92268628a43d62a0b1ba2a1d85f45a352cfd3745db355ba0e8b7863a31208064 files/wmsystray-gcc-3.4.patch 270
+AUX wmsystray-0.1.1-Makefile.patch 1551 RMD160 74736f8ebba7de83ef5f818cfba613fb172da9bd SHA1 4344ee2b2e9b03c25f733e5612715a9ac6b3c963 SHA256 0a28c97618e89e1b74544663da34b8cc8316df2e4a801974a08fa074bb0056db
+MD5 d47d011aceb5fb6541b5610a220e1d96 files/wmsystray-0.1.1-Makefile.patch 1551
+RMD160 74736f8ebba7de83ef5f818cfba613fb172da9bd files/wmsystray-0.1.1-Makefile.patch 1551
+SHA256 0a28c97618e89e1b74544663da34b8cc8316df2e4a801974a08fa074bb0056db files/wmsystray-0.1.1-Makefile.patch 1551
+AUX wmsystray-0.1.1-gcc-3.4.patch 270 RMD160 b5aebe769928669622993c6f04b8ee0a71b4b9d4 SHA1 cc637be0ab4d175c42a061bc1d9e570274ca4dd0 SHA256 92268628a43d62a0b1ba2a1d85f45a352cfd3745db355ba0e8b7863a31208064
+MD5 c0df4c20ac27375666dbb28ae85281af files/wmsystray-0.1.1-gcc-3.4.patch 270
+RMD160 b5aebe769928669622993c6f04b8ee0a71b4b9d4 files/wmsystray-0.1.1-gcc-3.4.patch 270
+SHA256 92268628a43d62a0b1ba2a1d85f45a352cfd3745db355ba0e8b7863a31208064 files/wmsystray-0.1.1-gcc-3.4.patch 270
 AUX wmsystray.desktop 208 RMD160 a556368853dad9e6de89edf9bf476bde318ec699 SHA1 e19360ab8f9378813e97c189366696546c849a4f SHA256 10a8996432ff7fedefa687fe9ba0fc495a3f7f178c0d906e4cb98098520cd75b
 MD5 91c60c856956631ac35d934b07350aaa files/wmsystray.desktop 208
 RMD160 a556368853dad9e6de89edf9bf476bde318ec699 files/wmsystray.desktop 208
 SHA256 10a8996432ff7fedefa687fe9ba0fc495a3f7f178c0d906e4cb98098520cd75b files/wmsystray.desktop 208
 DIST wmsystray-0.1.1.tar.bz2 18261 RMD160 61ef6fa5f8053cfb1339f4d1f770660c05002314 SHA1 0385d5cede11fbbf08e79ade1433976466d554a1 SHA256 d24a9cb25f4394eecb6e9215b88dde0d9debf203fbf1e501fb02e3e0571c37f7
-EBUILD wmsystray-0.1.1.ebuild 1135 RMD160 6a081b1c6347049d26042125538389313c5c871e SHA1 25217e8761fc7975d9afd67114d410f584fd289c SHA256 d0b76496a5039a47d8609e988297e589e26fe801755886201d94117b405a29bf
-MD5 b2053134e94bf9168465afa15bf31069 wmsystray-0.1.1.ebuild 1135
-RMD160 6a081b1c6347049d26042125538389313c5c871e wmsystray-0.1.1.ebuild 1135
-SHA256 d0b76496a5039a47d8609e988297e589e26fe801755886201d94117b405a29bf wmsystray-0.1.1.ebuild 1135
-MISC ChangeLog 1304 RMD160 7226b5deb9eb2489ef70e4a0543815a5a6aaefd6 SHA1 289086175bcf96d993f85c642d82115a7782ec54 SHA256 beaec9e46c05ad9a03b5401e04eb0f08cbf97216ed866b5ba6f0e7d38be4dd1c
-MD5 08a5e9267c29a1d426e9e854fcf82ec1 ChangeLog 1304
-RMD160 7226b5deb9eb2489ef70e4a0543815a5a6aaefd6 ChangeLog 1304
-SHA256 beaec9e46c05ad9a03b5401e04eb0f08cbf97216ed866b5ba6f0e7d38be4dd1c ChangeLog 1304
+EBUILD wmsystray-0.1.1.ebuild 1107 RMD160 bd498d64ec4a6cf7e4593c90b3de4c03059b9a55 SHA1 05238d7a4589bb82d184b6a43d9a8d6cae39191a SHA256 40cbf982c0fdfbbb560e5e17c81f0b4c6182b3d022071727dd86e223c2a1073c
+MD5 2e2b3f373e447953d9b0363131afb785 wmsystray-0.1.1.ebuild 1107
+RMD160 bd498d64ec4a6cf7e4593c90b3de4c03059b9a55 wmsystray-0.1.1.ebuild 1107
+SHA256 40cbf982c0fdfbbb560e5e17c81f0b4c6182b3d022071727dd86e223c2a1073c wmsystray-0.1.1.ebuild 1107
+MISC ChangeLog 1606 RMD160 ccf3f667c59c43b48fded652c7668cf8c9216e98 SHA1 e5287e2f15f34ab81dd9ec63fc7da39effdf063a SHA256 4b46137de9901e5dba7411ce91136ae01b79b23e161d70dd031681bad0bf1cb9
+MD5 466fca8461f11211ac76c9802d01550d ChangeLog 1606
+RMD160 ccf3f667c59c43b48fded652c7668cf8c9216e98 ChangeLog 1606
+SHA256 4b46137de9901e5dba7411ce91136ae01b79b23e161d70dd031681bad0bf1cb9 ChangeLog 1606
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c metadata.xml 165
@@ -29,10 +26,3 @@ SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b metadata
 MD5 555a349ae5379ba4d4cc827e0f9cd309 files/digest-wmsystray-0.1.1 247
 RMD160 768d7c7b870da7c87b1426fda17b33b6a6912026 files/digest-wmsystray-0.1.1 247
 SHA256 b8e32649dcaee13d211f4ea458630818eed598adfbad205cb1b1d41b6405d061 files/digest-wmsystray-0.1.1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF3Nphz974XjDVpbkRAvs4AKCoOjJ7HM0IRb1cSjPDoyrWhB8oRACfaqXx
-2tyng+n+zItAy50pfnPRBVc=
-=nemS
------END PGP SIGNATURE-----
diff --git a/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch b/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch
new file mode 100644
index 000000000000..19afa355b229
--- /dev/null
+++ b/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch
@@ -0,0 +1,44 @@
+diff -ur wmsystray-0.1.1/Makefile wmsystray-0.1.1.new/Makefile
+--- wmsystray-0.1.1/Makefile	2004-03-01 05:35:47.000000000 +0100
++++ wmsystray-0.1.1.new/Makefile	2007-06-30 18:09:59.000000000 +0200
+@@ -1,13 +1,14 @@
+ prefix=/usr
+ bindir = ${prefix}/bin
+ mandir = ${prefix}/share/man
+-INSTALL = /bin/install
++INSTALL = install
+ INSTALLPROG = ${INSTALL} -m 0755
+ INSTALLMAN = ${INSTALL} -m 0644
++EXTRACFLAGS = 
+ 
+ all:
+-	make -C xembed xembed.o
+-	make -C wmsystray
++	make EXTRACFLAGS="${EXTRACFLAGS}" -C xembed xembed.o
++	make EXTRACFLAGS="${EXTRACFLAGS}" -C wmsystray
+ 
+ clean:
+ 	make -C xembed clean
+diff -ur wmsystray-0.1.1/wmsystray/Makefile wmsystray-0.1.1.new/wmsystray/Makefile
+--- wmsystray-0.1.1/wmsystray/Makefile	2004-03-01 04:54:44.000000000 +0100
++++ wmsystray-0.1.1.new/wmsystray/Makefile	2007-06-30 18:09:59.000000000 +0200
+@@ -1,7 +1,7 @@
+ include ../Rules.make
+ 
+ CC = gcc
+-CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -Wall -g
++CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -g ${EXTRACFLAGS}
+ LDFLAGS = ${X11LDFLAGS} -lXpm
+ 
+ OBJS = main.o ui.o systray.o xpms.o
+diff -ur wmsystray-0.1.1/xembed/Makefile wmsystray-0.1.1.new/xembed/Makefile
+--- wmsystray-0.1.1/xembed/Makefile	2004-03-01 04:54:44.000000000 +0100
++++ wmsystray-0.1.1.new/xembed/Makefile	2007-06-30 18:09:59.000000000 +0200
+@@ -1,6 +1,6 @@
+ include ../Rules.make
+ 
+-CFLAGS = -DTRACE_LEVEL=${TRACE_LEVEL} ${X11CFLAGS} -Wall -g
++CFLAGS = -DTRACE_LEVEL=${TRACE_LEVEL} ${X11CFLAGS} -g ${EXTRACFLAGS}
+ LDFLAGS = ${X11LDFLAGS}
+ 
+ all: xembed.o
diff --git a/x11-plugins/wmsystray/files/wmsystray-gcc-3.4.patch b/x11-plugins/wmsystray/files/wmsystray-0.1.1-gcc-3.4.patch
index 538a7ce0aa6a..538a7ce0aa6a 100644
--- a/x11-plugins/wmsystray/files/wmsystray-gcc-3.4.patch
+++ b/x11-plugins/wmsystray/files/wmsystray-0.1.1-gcc-3.4.patch
diff --git a/x11-plugins/wmsystray/files/wmsystray-cflags.patch b/x11-plugins/wmsystray/files/wmsystray-cflags.patch
deleted file mode 100644
index 8c31d19342a4..000000000000
--- a/x11-plugins/wmsystray/files/wmsystray-cflags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile.orig	2004-06-22 22:14:53.691406496 +0000
-+++ Makefile	2004-06-22 22:15:18.383652704 +0000
-@@ -4,10 +4,11 @@
- INSTALL = /bin/install
- INSTALLPROG = ${INSTALL} -m 0755
- INSTALLMAN = ${INSTALL} -m 0644
-+EXTRACFLAGS = 
- 
- all:
--	make -C xembed xembed.o
--	make -C wmsystray
-+	make EXTRACFLAGS="${EXTRACFLAGS}" -C xembed xembed.o
-+	make EXTRACFLAGS="${EXTRACFLAGS}" -C wmsystray
- 
- clean:
- 	make -C xembed clean
---- xembed/Makefile.orig	2004-03-01 03:54:44.000000000 +0000
-+++ xembed/Makefile	2004-06-22 22:01:44.760342248 +0000
-@@ -1,6 +1,6 @@
- include ../Rules.make
- 
--CFLAGS = -DTRACE_LEVEL=${TRACE_LEVEL} ${X11CFLAGS} -Wall -g
-+CFLAGS = -DTRACE_LEVEL=${TRACE_LEVEL} ${X11CFLAGS} -g ${EXTRACFLAGS}
- LDFLAGS = ${X11LDFLAGS}
- 
- all: xembed.o
---- wmsystray/Makefile.orig	2004-06-22 22:02:26.062063432 +0000
-+++ wmsystray/Makefile	2004-06-22 22:02:36.822427608 +0000
-@@ -1,7 +1,7 @@
- include ../Rules.make
- 
- CC = gcc
--CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -Wall -g
-+CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -g ${EXTRACFLAGS}
- LDFLAGS = ${X11LDFLAGS} -lXpm
- 
- OBJS = main.o ui.o systray.o xpms.o
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
index 8f93cc9cd67c..758310288ba7 100644
--- a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
+++ b/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
@@ -1,51 +1,41 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild,v 1.9 2006/07/16 21:49:14 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild,v 1.10 2007/06/30 14:20:37 coldwind Exp $
 
 inherit eutils
 
-IUSE=""
-
 DESCRIPTION="Window Maker dock app that provides a system tray for GNOME/KDE applications"
 SRC_URI="http://kai.vm.bytemark.co.uk/~arashi/wmsystray/release/${P}.tar.bz2"
 HOMEPAGE="http://kai.vm.bytemark.co.uk/~arashi/wmsystray/"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
 
 src_unpack() {
-
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	# Let's honour Gentoo CFLAGS
-	epatch ${FILESDIR}/${PN}-cflags.patch
+	# Let's honour Gentoo CFLAGS and use correct install program
+	epatch "${FILESDIR}/${P}-Makefile.patch"
 
 	# Fix for #61704, cannot compile with gcc 3.4.1:
 	# it's a trivial change and does not affect other compilers...
-	epatch ${FILESDIR}/${PN}-gcc-3.4.patch
-
+	epatch "${FILESDIR}/${P}-gcc-3.4.patch"
 }
 
 src_compile() {
-
-	emake EXTRACFLAGS="${CFLAGS}" || die "Compilation failed"
-
+	emake EXTRACFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
+	einstall || die "einstall failed"
+	dodoc AUTHORS HACKING README || die
 
-	einstall || die "Installation failed"
-	dodoc AUTHORS HACKING README
-
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
-
+	domenu "${FILESDIR}/${PN}.desktop"
 }