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

(Portage version: 2.1.2.7)

5 files changed, 64 insertions, 61 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/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"
 }