--- aewm++-1.0.24.ebuild	2007-08-02 17:06:10.000000000 +0200
+++ aewm++-1.1.5.ebuild	2008-05-03 22:19:56.000000000 +0200
@@ -1,18 +1,18 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++/aewm++-1.0.24.ebuild,v 1.12 2007/08/02 14:37:26 uberlord Exp $
 
 inherit eutils
 
 DESCRIPTION="A window manager with more modern features than aewm but with the same look and feel."
-HOMEPAGE="http://aewmpp.sunsite.dk/"
-SRC_URI="mirror://sourceforge/sapphire/${P}.tar.bz2"
+HOMEPAGE="http://frankhale.org/"
+SRC_URI="http://frankhale.org/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
@@ -20,17 +20,20 @@
 	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}/gcc-3.4.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	#Makefile strips aewm++
+	sed -i \
+		-e "s:install -s:install:" \
+		Makefile
 }
 
 src_compile() {
-	make CFLAGS="${CXXFLAGS}" || die "make failed"
+	emake CFLAGS="${CXXFLAGS}" || die "make failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog README LICENSE
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog README
 }