Fixed build on amd64. Thanks to angelos and vapier. bug \#153575

(Portage version: 2.1.2.7)

1 files changed, 19 insertions, 22 deletions

diff --git a/x11-wm/wm2/wm2-4.ebuild b/x11-wm/wm2/wm2-4.ebuild
index eacb8d4c92a3..4f3c2c8f7aff 100644
--- a/x11-wm/wm2/wm2-4.ebuild
+++ b/x11-wm/wm2/wm2-4.ebuild
@@ -1,29 +1,27 @@
-# 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-wm/wm2/wm2-4.ebuild,v 1.8 2006/03/15 08:17:16 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wm2/wm2-4.ebuild,v 1.9 2007/06/30 13:14:15 coldwind Exp $
 
 inherit eutils
 
-IUSE=""
-
 DESCRIPTION="Small, unconfigurable window manager"
 HOMEPAGE="http://www.all-day-breakfast.com/wm2/"
 SRC_URI="http://www.all-day-breakfast.com/wm2/${P}.tar.gz"
 
-RDEPEND="|| ( x11-libs/libXmu virtual/x11 )"
+RDEPEND="x11-libs/libXmu"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 SLOT="0"
 LICENSE="freedist"
 KEYWORDS="amd64 ppc x86"
+IUSE=""
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	EPATCH_OPTS="-R"
-	epatch ${FILESDIR}/${PF}-gentoo.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${PF}-gentoo.patch"
 
 	sed 's/^#//' Config.h > wm2.conf
 	if [ -e "/etc/wm2.conf" ]; then
@@ -33,24 +31,23 @@ src_unpack() {
 }
 
 src_compile() {
-	make CFLAGS="${CFLAGS}" || die
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	exeinto /usr/bin
-	doexe wm2
+	dobin wm2 || die
 	insinto /etc
-	doins wm2.conf
-	dodoc README
+	doins wm2.conf || die
+	dodoc README || die
 }
 
 pkg_postinst() {
-	einfo
-	einfo "wm2 is unconfigurable after you have installed. If you want to"
-	einfo "change settings of wm2, please have a look at /etc/wm2.conf"
-	einfo "and rewrite it, then emerge wm2 again (wm2 ebuild uses settings"
-	einfo "from that file automatically). If you think wm2 lacks some important"
-	einfo "features that you want to use (such as background pixmaps),"
-	einfo "consider using wmx, written by the same author."
-	einfo
+	echo
+	elog "wm2 is unconfigurable after you have installed. If you want to"
+	elog "change settings of wm2, please have a look at /etc/wm2.conf"
+	elog "and rewrite it, then emerge wm2 again (wm2 ebuild uses settings"
+	elog "from that file automatically). If you think wm2 lacks some important"
+	elog "features that you want to use (such as background pixmaps),"
+	elog "consider using wmx, written by the same author."
+	echo
 }